Upgrade to Darwin NDK to 23.1.7779620

Downloaded from:
https://dl.google.com/android/repository/android-ndk-r23b-darwin.zip

Test: ./gradlew bOS
Change-Id: I570d3b977ce2c7fe28d83aeffc6844e896cfe6c8
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c4a0c4..7df6a5a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,9 +11,10 @@
 
 * GNU binutils, excluding the GNU Assembler (GAS), has been removed. GAS will be
   removed in the next release. If you are building with `-fno-integrated-as`,
-  file bugs if anything is preventing you from removing that flag.
+  file bugs if anything is preventing you from removing that flag. See
+  [Clang Migration Notes] for advice about making assembly compatible with LLVM.
 
-* Support for GDB has ended. GDB will be removed from the next release. Use LLDB
+* Support for GDB has ended. GDB will be removed in the next release. Use LLDB
   instead. Note that `ndk-gdb` uses LLDB by default.
 
 * NDK r23 is the last release that will support non-Neon. Beginning with NDK
@@ -25,6 +26,53 @@
   release. The minimum OS supported by the NDK for r24 will be KitKat (API level
   19).
 
+[Clang Migration Notes]: ClangMigration.md
+
+## r23b
+
+* Update LLVM to clang-r416183c1, based on LLVM 12 development.
+  * [Issue 1540]: Fixed compiler crash when using coroutines.
+  * [Issue 1544]: Now uses universal binaries for M1 Macs.
+  * [Issue 1551]: Prevent each translation unit from receiving its own copy of
+    emulated thread-local global variables.
+  * [Issue 1555]: Fixed compiler crash for armeabi-v7a.
+* [Issue 1492]: ndk-build.cmd: Stop using make's `-O` (`--output-sync`) flag on
+  Windows to avoid `fcntl(): Bad file descriptor` error.
+* [Issue 1553]: Updated sysroot to latest Android 12.
+* [Issue 1569]: Fixed `-fno-integrated-as` not being able to find the assembler.
+* CMake changes:
+  * [Issue 1536]: Make optimization flags used with CMake more consistent.
+    Historically thumb release builds used `-Oz`, but AGP switched to using
+    `RelWithDebInfo` for release builds in the latest release which was not
+    using `-Oz`. To reduce per-arch differences and behavior differences
+    compared to CMake's defaults, `-Oz` use was removed. You may see code size
+    increases for armeabi-v7a due to this, but also increased optimization. To
+    restore the prior behavior, add `-Oz` to your cflags.
+  * [Issue 1560]: Fixed pull-up of unsupported API levels when using the new
+    CMake toolchain file. This affects CMake 3.21 and
+    `ANDROID_USE_LEGACY_TOOLCHAIN_FILE=ON` use cases, and was the common case
+    for AGP users with a `minSdkVersion` below 21.
+  * [Issue 1573]: Fixed `ANDROID_USE_LEGACY_TOOLCHAIN_FILE` not being obeyed
+    during CMake try-compile.
+  * [Issue 1581]: Added workaround for [CMake Issue 22647], which was causing
+    `MINGW` to be incorrectly defined by CMake when building for Android on a
+    Windows host. This only affected those using the Android toolchain file when
+    CMake 3.21 or newer was used. This likely was not a regression for users not
+    using the Android toolchain. The change will fix both use cases.
+
+[CMake Issue 22647]: https://gitlab.kitware.com/cmake/cmake/-/issues/22647
+[Issue 1492]: https://github.com/android/ndk/issues/1492
+[Issue 1536]: https://github.com/android/ndk/issues/1536
+[Issue 1540]: https://github.com/android/ndk/issues/1540
+[Issue 1544]: https://github.com/android/ndk/issues/1544
+[Issue 1551]: https://github.com/android/ndk/issues/1551
+[Issue 1553]: https://github.com/android/ndk/issues/1553
+[Issue 1555]: https://github.com/android/ndk/issues/1555
+[Issue 1560]: https://github.com/android/ndk/issues/1560
+[Issue 1569]: https://github.com/android/ndk/issues/1569
+[Issue 1573]: https://github.com/android/ndk/issues/1573
+[Issue 1581]: https://github.com/android/ndk/issues/1581
+
 ## Changes
 
 * Includes Android 12 APIs.
diff --git a/NOTICE b/NOTICE
index f54f1a9..e56a15a 100644
--- a/NOTICE
+++ b/NOTICE
@@ -2177,286 +2177,6 @@
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
-==============================================================================
-The LLVM Project is under the Apache License v2.0 with LLVM Exceptions:
-==============================================================================
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-    1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-    2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-    3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-    4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-    5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-    6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-    7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-    8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-    9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-    END OF TERMS AND CONDITIONS
-
-    APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-    Copyright [yyyy] [name of copyright owner]
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-
----- LLVM Exceptions to the Apache 2.0 License ----
-
-As an exception, if, as a result of your compiling your source code, portions
-of this Software are embedded into an Object form of such source code, you
-may redistribute such embedded portions in such Object form without complying
-with the conditions of Sections 4(a), 4(b) and 4(d) of the License.
-
-In addition, if you combine or link compiled forms of this Software with
-software that is licensed under the GPLv2 ("Combined Software") and if a
-court of competent jurisdiction determines that the patent provision (Section
-3), the indemnity provision (Section 9) or other Section of the License
-conflicts with the conditions of the GPLv2, you may retroactively and
-prospectively choose to deem waived or otherwise exclude such Section(s) of
-the License, but only in their entirety and only with respect to the Combined
-Software.
-
-==============================================================================
-Software from third parties included in the LLVM Project:
-==============================================================================
-The LLVM Project contains third party software which is under different license
-terms. All such code will be identified clearly using at least one of two
-mechanisms:
-1) It will be in a separate directory tree with its own `LICENSE.txt` or
-   `LICENSE` file at the top containing the specific license and restrictions
-   which apply to that software, or
-2) It will contain specific license and restriction terms at the top of every
-   file.
-
-==============================================================================
-Legacy LLVM License (https://llvm.org/docs/DeveloperPolicy.html#legacy):
-==============================================================================
-University of Illinois/NCSA
-Open Source License
-
-Copyright (c) 2003-2019 University of Illinois at Urbana-Champaign.
-All rights reserved.
-
-Developed by:
-
-    LLVM Team
-
-    University of Illinois at Urbana-Champaign
-
-    http://llvm.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal with
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimers.
-
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimers in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the names of the LLVM Team, University of Illinois at
-      Urbana-Champaign, nor the names of its contributors may be used to
-      endorse or promote products derived from this Software without specific
-      prior written permission.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
-SOFTWARE.
-
-
 Copyright (C) 2009 The Android Open Source Project
 All rights reserved.
 
@@ -3463,22 +3183,6 @@
 -------------------------------------------------------------------
 
 Copyright (C) 2021 The Android Open Source Project
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
--------------------------------------------------------------------
-
-Copyright (C) 2021 The Android Open Source Project
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/NOTICE.toolchain b/NOTICE.toolchain
index 70257db..63ccd2e 100644
--- a/NOTICE.toolchain
+++ b/NOTICE.toolchain
@@ -7642,22 +7642,6 @@
 -------------------------------------------------------------------
 
 Copyright (C) 2021 The Android Open Source Project
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
--------------------------------------------------------------------
-
-Copyright (C) 2021 The Android Open Source Project
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/build/cmake/adjust_api_level.cmake b/build/cmake/adjust_api_level.cmake
new file mode 100644
index 0000000..780d76c
--- /dev/null
+++ b/build/cmake/adjust_api_level.cmake
@@ -0,0 +1,63 @@
+include(${CMAKE_ANDROID_NDK}/build/cmake/platforms.cmake)
+
+function(adjust_api_level api_level result_name)
+  # If no platform version was chosen by the user, default to the minimum
+  # version supported by this NDK.
+  if(NOT api_level)
+    message(STATUS
+      "ANDROID_PLATFORM not set. Defaulting to minimum supported version "
+      "${NDK_MIN_PLATFORM_LEVEL}.")
+
+    set(api_level "android-${NDK_MIN_PLATFORM_LEVEL}")
+  endif()
+
+  if(api_level STREQUAL "latest")
+    message(STATUS
+      "Using latest available ANDROID_PLATFORM: ${NDK_MAX_PLATFORM_LEVEL}.")
+    set(api_level "android-${NDK_MAX_PLATFORM_LEVEL}")
+  endif()
+
+  string(REPLACE "android-" "" result ${api_level})
+
+  # Aliases defined by meta/platforms.json include codename aliases for platform
+  # API levels as well as cover any gaps in platforms that may not have had NDK
+  # APIs.
+  if(NOT "${NDK_PLATFORM_ALIAS_${result}}" STREQUAL "")
+    message(STATUS
+      "${api_level} is an alias for ${NDK_PLATFORM_ALIAS_${result}}. Adjusting "
+      "ANDROID_PLATFORM to match.")
+    set(api_level "${NDK_PLATFORM_ALIAS_${result}}")
+    string(REPLACE "android-" "" result ${api_level})
+  endif()
+
+  # Pull up to the minimum supported version if an old API level was requested.
+  if(result LESS NDK_MIN_PLATFORM_LEVEL)
+    message(STATUS
+      "${api_level} is unsupported. Using minimum supported version "
+      "${NDK_MIN_PLATFORM_LEVEL}.")
+    set(api_level "android-${NDK_MIN_PLATFORM_LEVEL}")
+    string(REPLACE "android-" "" result ${api_level})
+  endif()
+
+  # And for LP64 we need to pull up to 21. No diagnostic is provided here
+  # because minSdkVersion < 21 is valid for the project even though it may not
+  # be for this ABI.
+  if(ANDROID_ABI MATCHES "64(-v8a)?$" AND result LESS 21)
+    message(STATUS
+      "android-${result} is not supported for ${ANDROID_ABI}. Using minimum "
+      "supported LP64 version 21.")
+    set(api_level android-21)
+    set(result 21)
+  endif()
+
+  # ANDROID_PLATFORM beyond the maximum is an error. The correct way to specify
+  # the latest version is ANDROID_PLATFORM=latest.
+  if(result GREATER NDK_MAX_PLATFORM_LEVEL)
+    message(SEND_ERROR
+      "${api_level} is above the maximum supported version "
+      "${NDK_MAX_PLATFORM_LEVEL}. Choose a supported API level or set "
+      "ANDROID_PLATFORM to \"latest\".")
+  endif()
+
+  set(${result_name} ${result} PARENT_SCOPE)
+endfunction()
diff --git a/build/cmake/android-legacy.toolchain.cmake b/build/cmake/android-legacy.toolchain.cmake
index aac7750..b2fdd10 100644
--- a/build/cmake/android-legacy.toolchain.cmake
+++ b/build/cmake/android-legacy.toolchain.cmake
@@ -456,12 +456,6 @@
 list(APPEND ANDROID_LINKER_FLAGS_EXE -Wl,--gc-sections)
 
 # Debug and release flags.
-list(APPEND ANDROID_COMPILER_FLAGS_DEBUG -O0)
-if(ANDROID_ABI MATCHES "^armeabi" AND ANDROID_ARM_MODE STREQUAL thumb)
-  list(APPEND ANDROID_COMPILER_FLAGS_RELEASE -Oz)
-else()
-  list(APPEND ANDROID_COMPILER_FLAGS_RELEASE -O2)
-endif()
 list(APPEND ANDROID_COMPILER_FLAGS_RELEASE -DNDEBUG)
 if(ANDROID_TOOLCHAIN STREQUAL clang)
   list(APPEND ANDROID_COMPILER_FLAGS_DEBUG -fno-limit-debug-info)
diff --git a/build/cmake/android.toolchain.cmake b/build/cmake/android.toolchain.cmake
index 2467cad..b01340e 100644
--- a/build/cmake/android.toolchain.cmake
+++ b/build/cmake/android.toolchain.cmake
@@ -166,34 +166,8 @@
   "https://android.googlesource.com/platform/ndk/+/master/docs/ClangMigration.md.")
 endif()
 
-include(${CMAKE_ANDROID_NDK}/build/cmake/platforms.cmake)
-
-if(ANDROID_NATIVE_API_LEVEL AND NOT ANDROID_PLATFORM)
-  if(ANDROID_NATIVE_API_LEVEL MATCHES "^android-[0-9]+$")
-    set(ANDROID_PLATFORM ${ANDROID_NATIVE_API_LEVEL})
-  elseif(ANDROID_NATIVE_API_LEVEL MATCHES "^[0-9]+$")
-    set(ANDROID_PLATFORM android-${ANDROID_NATIVE_API_LEVEL})
-  endif()
-endif()
-if(NOT CMAKE_SYSTEM_VERSION AND ANDROID_PLATFORM)
-  if(ANDROID_PLATFORM STREQUAL "latest")
-    message(STATUS
-      "Using latest available ANDROID_PLATFORM: ${NDK_MAX_PLATFORM_LEVEL}.")
-    set(CMAKE_SYSTEM_VERSION "${NDK_MAX_PLATFORM_LEVEL}")
-  else()
-    string(REPLACE "android-" "" CMAKE_SYSTEM_VERSION ${ANDROID_PLATFORM})
-    # Aliases defined by meta/platforms.json include codename aliases for platform
-    # API levels as well as cover any gaps in platforms that may not have had NDK
-    # APIs.
-    if(NOT "${NDK_PLATFORM_ALIAS_${CMAKE_SYSTEM_VERSION}}" STREQUAL "")
-      message(STATUS "\
-        ${CMAKE_SYSTEM_VERSION} is an alias for \
-        ${NDK_PLATFORM_ALIAS_${CMAKE_SYSTEM_VERSION}}.")
-      string(REPLACE "android-" "" CMAKE_SYSTEM_VERSION
-             "${NDK_PLATFORM_ALIAS_${CMAKE_SYSTEM_VERSION}}")
-    endif()
-  endif()
-endif()
+include(${CMAKE_ANDROID_NDK}/build/cmake/adjust_api_level.cmake)
+adjust_api_level("${ANDROID_PLATFORM}" CMAKE_SYSTEM_VERSION)
 
 if(NOT DEFINED CMAKE_ANDROID_STL_TYPE AND DEFINED ANDROID_STL)
   set(CMAKE_ANDROID_STL_TYPE ${ANDROID_STL})
@@ -265,6 +239,7 @@
   ANDROID_PLATFORM
   ANDROID_STL
   ANDROID_TOOLCHAIN
+  ANDROID_USE_LEGACY_TOOLCHAIN_FILE
 )
 
 if(DEFINED ANDROID_NO_UNDEFINED AND NOT DEFINED ANDROID_ALLOW_UNDEFINED_SYMBOLS)
@@ -278,11 +253,6 @@
   set(ANDROID_ALLOW_UNDEFINED_SYMBOLS "${ANDROID_SO_UNDEFINED}")
 endif()
 
-# https://github.com/android/ndk/issues/133
-if(CMAKE_ANDROID_ARCH_ABI MATCHES "^armeabi" AND NOT CMAKE_ANDROID_ARM_MODE)
-  string(APPEND _ANDROID_NDK_INIT_CFLAGS_RELEASE " -Oz")
-endif()
-
 # Exports compatible variables defined in exports.cmake.
 set(_ANDROID_EXPORT_COMPATIBILITY_VARIABLES TRUE)
 
diff --git a/build/cmake/compiler_id.cmake b/build/cmake/compiler_id.cmake
index 6454938..8e740f3 100644
--- a/build/cmake/compiler_id.cmake
+++ b/build/cmake/compiler_id.cmake
@@ -1,3 +1,3 @@
 # The file is automatically generated when the NDK is built.
-set(CMAKE_C_COMPILER_VERSION 12.0.5)
-set(CMAKE_CXX_COMPILER_VERSION 12.0.5)
+set(CMAKE_C_COMPILER_VERSION 12.0.8)
+set(CMAKE_CXX_COMPILER_VERSION 12.0.8)
diff --git a/build/cmake/hooks/pre/Determine-Compiler.cmake b/build/cmake/hooks/pre/Determine-Compiler.cmake
index b8ed1bf..ef0228f 100644
--- a/build/cmake/hooks/pre/Determine-Compiler.cmake
+++ b/build/cmake/hooks/pre/Determine-Compiler.cmake
@@ -15,3 +15,26 @@
 # This is a hook file that will be included by cmake at the beginning of
 # Modules/Platform/Android/Determine-Compiler.cmake.
 
+# Skip hook for the legacy toolchain workflow.
+if(CMAKE_SYSTEM_VERSION EQUAL 1)
+  return()
+endif()
+
+# If we don't explicitly set the target CMake will ID the compiler using the
+# default target, causing MINGW to be defined when a Windows host is used.
+# https://github.com/android/ndk/issues/1581
+# https://gitlab.kitware.com/cmake/cmake/-/issues/22647
+if(CMAKE_ANDROID_ARCH_ABI STREQUAL armeabi-v7a)
+  set(ANDROID_LLVM_TRIPLE armv7-none-linux-androideabi)
+elseif(CMAKE_ANDROID_ARCH_ABI STREQUAL arm64-v8a)
+  set(ANDROID_LLVM_TRIPLE aarch64-none-linux-android)
+elseif(CMAKE_ANDROID_ARCH_ABI STREQUAL x86)
+  set(ANDROID_LLVM_TRIPLE i686-none-linux-android)
+elseif(CMAKE_ANDROID_ARCH_ABI STREQUAL x86_64)
+  set(ANDROID_LLVM_TRIPLE x86_64-none-linux-android)
+else()
+  message(FATAL_ERROR "Invalid Android ABI: ${ANDROID_ABI}.")
+endif()
+set(CMAKE_ASM_COMPILER_TARGET "${ANDROID_LLVM_TRIPLE}${CMAKE_SYSTEM_VERSION}")
+set(CMAKE_C_COMPILER_TARGET "${ANDROID_LLVM_TRIPLE}${CMAKE_SYSTEM_VERSION}")
+set(CMAKE_CXX_COMPILER_TARGET "${ANDROID_LLVM_TRIPLE}${CMAKE_SYSTEM_VERSION}")
diff --git a/build/core/version.mk b/build/core/version.mk
index a42ab89..6ac7191 100644
--- a/build/core/version.mk
+++ b/build/core/version.mk
@@ -1,4 +1,4 @@
 NDK_MAJOR := 23
-NDK_MINOR := 0
+NDK_MINOR := 1
 NDK_BETA := 0
 NDK_CANARY := false
diff --git a/build/ndk-build.cmd b/build/ndk-build.cmd
index c7e86b1..3f5be58 100755
--- a/build/ndk-build.cmd
+++ b/build/ndk-build.cmd
@@ -6,4 +6,6 @@
 set PYTHONPATH=
 set NDK_ROOT=%~dp0\..
 set PREBUILT_PATH=%NDK_ROOT%\prebuilt\windows-x86_64
-"%PREBUILT_PATH%\bin\make.exe" -O -f "%NDK_ROOT%\build\core\build-local.mk" SHELL=cmd %*
+rem TODO: Reenable -O when make.exe's output-sync is fixed.
+rem See https://github.com/android/ndk/issues/1492.
+"%PREBUILT_PATH%\bin\make.exe" -f "%NDK_ROOT%\build\core\build-local.mk" SHELL=cmd %*
diff --git a/prebuilt/darwin-x86_64/bin/vsyasm b/prebuilt/darwin-x86_64/bin/vsyasm
index d789357..b2df64b 100755
--- a/prebuilt/darwin-x86_64/bin/vsyasm
+++ b/prebuilt/darwin-x86_64/bin/vsyasm
Binary files differ
diff --git a/prebuilt/darwin-x86_64/bin/yasm b/prebuilt/darwin-x86_64/bin/yasm
index 788cbf2..77ddc69 100755
--- a/prebuilt/darwin-x86_64/bin/yasm
+++ b/prebuilt/darwin-x86_64/bin/yasm
Binary files differ
diff --git a/prebuilt/darwin-x86_64/bin/ytasm b/prebuilt/darwin-x86_64/bin/ytasm
index 20981a7..5c6683b 100755
--- a/prebuilt/darwin-x86_64/bin/ytasm
+++ b/prebuilt/darwin-x86_64/bin/ytasm
Binary files differ
diff --git a/prebuilt/darwin-x86_64/include/libyasm-stdint.h b/prebuilt/darwin-x86_64/include/libyasm-stdint.h
index 55a52fa..487d96c 100644
--- a/prebuilt/darwin-x86_64/include/libyasm-stdint.h
+++ b/prebuilt/darwin-x86_64/include/libyasm-stdint.h
@@ -2,7 +2,7 @@
 #define _YASM_LIBYASM_STDINT_H 1
 #ifndef _GENERATED_STDINT_H
 #define _GENERATED_STDINT_H "yasm 1.3.0"
-/* generated using /Volumes/Android/buildbot/src/android/ndk-release-r23/prebuilts/clang/host/darwin-x86/clang-r416183b/bin/clang --target=x86_64-apple-darwin -B/Volumes/Android/buildbot/src/android/ndk-release-r23/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1/x86_64-apple-darwin11/bin -mmacosx-version-min=10.9 -DMACOSX_DEPLOYMENT_TARGET=10.9 -isysroot/Applications/Xcode9.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk -Wl,-syslibroot,/Applications/Xcode9.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk -mlinker-version=305 -Os -fomit-frame-pointer -w -s */
+/* generated using /Volumes/Android/buildbot/src/android/ndk-release-r23/prebuilts/clang/host/darwin-x86/clang-r416183c1/bin/clang --target=x86_64-apple-darwin -B/Volumes/Android/buildbot/src/android/ndk-release-r23/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1/x86_64-apple-darwin11/bin -mmacosx-version-min=10.9 -DMACOSX_DEPLOYMENT_TARGET=10.9 -isysroot/Applications/Xcode9.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk -Wl,-syslibroot,/Applications/Xcode9.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk -mlinker-version=305 -Os -fomit-frame-pointer -w -s */
 #define _STDINT_HAVE_STDINT_H 1
 #include <stdint.h>
 #endif
diff --git a/prebuilt/darwin-x86_64/lib/libyasm.a b/prebuilt/darwin-x86_64/lib/libyasm.a
index ab64765..a02cf66 100644
--- a/prebuilt/darwin-x86_64/lib/libyasm.a
+++ b/prebuilt/darwin-x86_64/lib/libyasm.a
Binary files differ
diff --git a/python-packages/OWNERS b/python-packages/OWNERS
deleted file mode 100644
index 08bfeaf..0000000
--- a/python-packages/OWNERS
+++ /dev/null
@@ -1,4 +0,0 @@
-danalbert@google.com
-enh@google.com
-# jmgao@google.com
-rprichard@google.com
diff --git a/source.properties b/source.properties
index ed49748..80b44d3 100644
--- a/source.properties
+++ b/source.properties
@@ -1,2 +1,2 @@
 Pkg.Desc = Android NDK
-Pkg.Revision = 23.0.7599858
+Pkg.Revision = 23.1.7779620
diff --git a/sources/cxx-stl/llvm-libc++/libs/arm64-v8a/libc++_shared.so b/sources/cxx-stl/llvm-libc++/libs/arm64-v8a/libc++_shared.so
index 5b6bc3f..0605f00 100755
--- a/sources/cxx-stl/llvm-libc++/libs/arm64-v8a/libc++_shared.so
+++ b/sources/cxx-stl/llvm-libc++/libs/arm64-v8a/libc++_shared.so
Binary files differ
diff --git a/sources/cxx-stl/llvm-libc++/libs/arm64-v8a/libc++_static.a b/sources/cxx-stl/llvm-libc++/libs/arm64-v8a/libc++_static.a
index 84e59a0..5bed4ee 100644
--- a/sources/cxx-stl/llvm-libc++/libs/arm64-v8a/libc++_static.a
+++ b/sources/cxx-stl/llvm-libc++/libs/arm64-v8a/libc++_static.a
Binary files differ
diff --git a/sources/cxx-stl/llvm-libc++/libs/arm64-v8a/libc++abi.a b/sources/cxx-stl/llvm-libc++/libs/arm64-v8a/libc++abi.a
index a002e79..db71778 100644
--- a/sources/cxx-stl/llvm-libc++/libs/arm64-v8a/libc++abi.a
+++ b/sources/cxx-stl/llvm-libc++/libs/arm64-v8a/libc++abi.a
Binary files differ
diff --git a/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/libandroid_support.a b/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/libandroid_support.a
index bdf2307..f5f0546 100644
--- a/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/libandroid_support.a
+++ b/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/libandroid_support.a
Binary files differ
diff --git a/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/libc++_shared.so b/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/libc++_shared.so
index fa6f19d..bd8e7d6 100755
--- a/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/libc++_shared.so
+++ b/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/libc++_shared.so
Binary files differ
diff --git a/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/libc++_static.a b/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/libc++_static.a
index 97be983..dcfc573 100644
--- a/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/libc++_static.a
+++ b/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/libc++_static.a
Binary files differ
diff --git a/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/libc++abi.a b/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/libc++abi.a
index aabe7ef..409206c 100644
--- a/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/libc++abi.a
+++ b/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/libc++abi.a
Binary files differ
diff --git a/sources/cxx-stl/llvm-libc++/libs/x86/libandroid_support.a b/sources/cxx-stl/llvm-libc++/libs/x86/libandroid_support.a
index abe7192..1d7f5de 100644
--- a/sources/cxx-stl/llvm-libc++/libs/x86/libandroid_support.a
+++ b/sources/cxx-stl/llvm-libc++/libs/x86/libandroid_support.a
Binary files differ
diff --git a/sources/cxx-stl/llvm-libc++/libs/x86/libc++_shared.so b/sources/cxx-stl/llvm-libc++/libs/x86/libc++_shared.so
index fc398f5..de32cdb 100755
--- a/sources/cxx-stl/llvm-libc++/libs/x86/libc++_shared.so
+++ b/sources/cxx-stl/llvm-libc++/libs/x86/libc++_shared.so
Binary files differ
diff --git a/sources/cxx-stl/llvm-libc++/libs/x86/libc++_static.a b/sources/cxx-stl/llvm-libc++/libs/x86/libc++_static.a
index 9017908..898c073 100644
--- a/sources/cxx-stl/llvm-libc++/libs/x86/libc++_static.a
+++ b/sources/cxx-stl/llvm-libc++/libs/x86/libc++_static.a
Binary files differ
diff --git a/sources/cxx-stl/llvm-libc++/libs/x86/libc++abi.a b/sources/cxx-stl/llvm-libc++/libs/x86/libc++abi.a
index 29ba7c9..177857b 100644
--- a/sources/cxx-stl/llvm-libc++/libs/x86/libc++abi.a
+++ b/sources/cxx-stl/llvm-libc++/libs/x86/libc++abi.a
Binary files differ
diff --git a/sources/cxx-stl/llvm-libc++/libs/x86_64/libc++_shared.so b/sources/cxx-stl/llvm-libc++/libs/x86_64/libc++_shared.so
index 0648865..12693d3 100755
--- a/sources/cxx-stl/llvm-libc++/libs/x86_64/libc++_shared.so
+++ b/sources/cxx-stl/llvm-libc++/libs/x86_64/libc++_shared.so
Binary files differ
diff --git a/sources/cxx-stl/llvm-libc++/libs/x86_64/libc++_static.a b/sources/cxx-stl/llvm-libc++/libs/x86_64/libc++_static.a
index 72bbbfb..c312bf0 100644
--- a/sources/cxx-stl/llvm-libc++/libs/x86_64/libc++_static.a
+++ b/sources/cxx-stl/llvm-libc++/libs/x86_64/libc++_static.a
Binary files differ
diff --git a/sources/cxx-stl/llvm-libc++/libs/x86_64/libc++abi.a b/sources/cxx-stl/llvm-libc++/libs/x86_64/libc++abi.a
index 586cb76..12f9dd2 100644
--- a/sources/cxx-stl/llvm-libc++/libs/x86_64/libc++abi.a
+++ b/sources/cxx-stl/llvm-libc++/libs/x86_64/libc++abi.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/AndroidVersion.txt b/toolchains/llvm/prebuilt/darwin-x86_64/AndroidVersion.txt
index 76b2048..7ea19e2 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/AndroidVersion.txt
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/AndroidVersion.txt
@@ -1,2 +1,2 @@
-12.0.5
-based on r416183b
+12.0.8
+based on r416183c1
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/aarch64-linux-android/bin/as b/toolchains/llvm/prebuilt/darwin-x86_64/aarch64-linux-android/bin/as
new file mode 120000
index 0000000..ac78d8b
--- /dev/null
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/aarch64-linux-android/bin/as
@@ -0,0 +1 @@
+/Volumes/Android/buildbot/src/android/ndk-release-r23/out/darwin/android-ndk-r23b/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-android-as
\ No newline at end of file
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/arm-linux-androideabi/bin/as b/toolchains/llvm/prebuilt/darwin-x86_64/arm-linux-androideabi/bin/as
new file mode 120000
index 0000000..404fa7d
--- /dev/null
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/arm-linux-androideabi/bin/as
@@ -0,0 +1 @@
+/Volumes/Android/buildbot/src/android/ndk-release-r23/out/darwin/android-ndk-r23b/toolchains/llvm/prebuilt/darwin-x86_64/bin/arm-linux-androideabi-as
\ No newline at end of file
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/bin/bisect_driver.py b/toolchains/llvm/prebuilt/darwin-x86_64/bin/bisect_driver.py
deleted file mode 100644
index 95d0ad1..0000000
--- a/toolchains/llvm/prebuilt/darwin-x86_64/bin/bisect_driver.py
+++ /dev/null
@@ -1,337 +0,0 @@
-# Copyright 2016 Google Inc. All Rights Reserved.
-#
-# This script is used to help the compiler wrapper in the Android build system
-# bisect for bad object files.
-"""Utilities for bisection of Android object files.
-
-This module contains a set of utilities to allow bisection between
-two sets (good and bad) of object files. Mostly used to find compiler
-bugs.
-
-Reference page:
-https://sites.google.com/a/google.com/chromeos-toolchain-team-home2/home/team-tools-and-scripts/bisecting-chromeos-compiler-problems/bisection-compiler-wrapper
-
-Design doc:
-https://docs.google.com/document/d/1yDgaUIa2O5w6dc3sSTe1ry-1ehKajTGJGQCbyn0fcEM
-"""
-
-from __future__ import print_function
-
-import contextlib
-import fcntl
-import os
-import shutil
-import subprocess
-import sys
-
-VALID_MODES = ['POPULATE_GOOD', 'POPULATE_BAD', 'TRIAGE']
-GOOD_CACHE = 'good'
-BAD_CACHE = 'bad'
-LIST_FILE = os.path.join(GOOD_CACHE, '_LIST')
-
-CONTINUE_ON_MISSING = os.environ.get('BISECT_CONTINUE_ON_MISSING', None) == '1'
-WRAPPER_SAFE_MODE = os.environ.get('BISECT_WRAPPER_SAFE_MODE', None) == '1'
-
-
-class Error(Exception):
-  """The general compiler wrapper error class."""
-  pass
-
-
-@contextlib.contextmanager
-def lock_file(path, mode):
-  """Lock file and block if other process has lock on file.
-
-  Acquire exclusive lock for file. Only blocks other processes if they attempt
-  to also acquire lock through this method. If only reading (modes 'r' and 'rb')
-  then the lock is shared (i.e. many reads can happen concurrently, but only one
-  process may write at a time).
-
-  This function is a contextmanager, meaning it's meant to be used with the
-  "with" statement in Python. This is so cleanup and setup happens automatically
-  and cleanly. Execution of the outer "with" statement happens at the "yield"
-  statement. Execution resumes after the yield when the outer "with" statement
-  ends.
-
-  Args:
-    path: path to file being locked
-    mode: mode to open file with ('w', 'r', etc.)
-  """
-  with open(path, mode) as f:
-    # Share the lock if just reading, make lock exclusive if writing
-    if f.mode == 'r' or f.mode == 'rb':
-      lock_type = fcntl.LOCK_SH
-    else:
-      lock_type = fcntl.LOCK_EX
-
-    try:
-      fcntl.lockf(f, lock_type)
-      yield f
-      f.flush()
-    except:
-      raise
-    finally:
-      fcntl.lockf(f, fcntl.LOCK_UN)
-
-
-def log_to_file(path, execargs, link_from=None, link_to=None):
-  """Common logging function.
-
-  Log current working directory, current execargs, and a from-to relationship
-  between files.
-  """
-  with lock_file(path, 'a') as log:
-    log.write('cd: %s; %s\n' % (os.getcwd(), ' '.join(execargs)))
-    if link_from and link_to:
-      log.write('%s -> %s\n' % (link_from, link_to))
-
-
-def exec_and_return(execargs):
-  """Execute process and return.
-
-  Execute according to execargs and return immediately. Don't inspect
-  stderr or stdout.
-  """
-  return subprocess.call(execargs)
-
-
-def which_cache(obj_file):
-  """Determine which cache an object belongs to.
-
-  The binary search tool creates two files for each search iteration listing
-  the full set of bad objects and full set of good objects. We use this to
-  determine where an object file should be linked from (good or bad).
-  """
-  bad_set_file = os.environ.get('BISECT_BAD_SET')
-  ret = subprocess.call(['grep', '-x', '-q', obj_file, bad_set_file])
-  if ret == 0:
-    return BAD_CACHE
-  else:
-    return GOOD_CACHE
-
-
-def makedirs(path):
-  """Try to create directories in path."""
-  try:
-    os.makedirs(path)
-  except os.error:
-    if not os.path.isdir(path):
-      raise
-
-
-def get_obj_path(execargs):
-  """Get the object path for the object file in the list of arguments.
-
-  Returns:
-    Absolute object path from execution args (-o argument). If no object being
-    outputted or output doesn't end in ".o" then return empty string.
-  """
-  try:
-    i = execargs.index('-o')
-  except ValueError:
-    return ''
-
-  obj_path = execargs[i + 1]
-  if not obj_path.endswith(('.o',)):
-    # TODO: what suffixes do we need to contemplate
-    # TODO: add this as a warning
-    # TODO: need to handle -r compilations
-    return ''
-
-  return os.path.abspath(obj_path)
-
-
-def get_dep_path(execargs):
-  """Get the dep file path for the dep file in the list of arguments.
-
-  Returns:
-    Absolute path of dependency file path from execution args (-o argument). If
-    no dependency being outputted then return empty string.
-  """
-  if '-MD' not in execargs and '-MMD' not in execargs:
-    return ''
-
-  # If -MF given this is the path of the dependency file. Otherwise the
-  # dependency file is the value of -o but with a .d extension
-  if '-MF' in execargs:
-    i = execargs.index('-MF')
-    dep_path = execargs[i + 1]
-    return os.path.abspath(dep_path)
-
-  full_obj_path = get_obj_path(execargs)
-  if not full_obj_path:
-    return ''
-
-  return full_obj_path[:-2] + '.d'
-
-
-def get_dwo_path(execargs):
-  """Get the dwo file path for the dwo file in the list of arguments.
-
-  Returns:
-    Absolute dwo file path from execution args (-gsplit-dwarf argument) If no
-    dwo file being outputted then return empty string.
-  """
-  if '-gsplit-dwarf' not in execargs:
-    return ''
-
-  full_obj_path = get_obj_path(execargs)
-  if not full_obj_path:
-    return ''
-
-  return full_obj_path[:-2] + '.dwo'
-
-
-def in_object_list(obj_name, list_filename):
-  """Check if object file name exist in file with object list."""
-  if not obj_name:
-    return False
-
-  with lock_file(list_filename, 'r') as list_file:
-    for line in list_file:
-      if line.strip() == obj_name:
-        return True
-
-    return False
-
-
-def get_side_effects(execargs):
-  """Determine side effects generated by compiler
-
-  Returns:
-    List of paths of objects that the compiler generates as side effects.
-  """
-  side_effects = []
-
-  # Cache dependency files
-  full_dep_path = get_dep_path(execargs)
-  if full_dep_path:
-    side_effects.append(full_dep_path)
-
-  # Cache dwo files
-  full_dwo_path = get_dwo_path(execargs)
-  if full_dwo_path:
-    side_effects.append(full_dwo_path)
-
-  return side_effects
-
-
-def cache_file(execargs, bisect_dir, cache, abs_file_path):
-  """Cache compiler output file (.o/.d/.dwo)."""
-  # os.path.join fails with absolute paths, use + instead
-  bisect_path = os.path.join(bisect_dir, cache) + abs_file_path
-  bisect_path_dir = os.path.dirname(bisect_path)
-  makedirs(bisect_path_dir)
-  pop_log = os.path.join(bisect_dir, cache, '_POPULATE_LOG')
-  log_to_file(pop_log, execargs, abs_file_path, bisect_path)
-
-  try:
-    if os.path.exists(abs_file_path):
-      shutil.copy2(abs_file_path, bisect_path)
-  except Exception:
-    print('Could not cache file %s' % abs_file_path, file=sys.stderr)
-    raise
-
-
-def restore_file(bisect_dir, cache, abs_file_path):
-  """Restore file from cache (.o/.d/.dwo)."""
-  # os.path.join fails with absolute paths, use + instead
-  cached_path = os.path.join(bisect_dir, cache) + abs_file_path
-  if os.path.exists(cached_path):
-    if os.path.exists(abs_file_path):
-      os.remove(abs_file_path)
-    try:
-      os.link(cached_path, abs_file_path)
-    except OSError:
-      shutil.copyfile(cached_path, abs_file_path)
-  else:
-    raise Error(('%s is missing from %s cache! Unsure how to proceed. Make '
-                 'will now crash.' % (cache, cached_path)))
-
-
-def bisect_populate(execargs, bisect_dir, population_name):
-  """Add necessary information to the bisect cache for the given execution.
-
-  Extract the necessary information for bisection from the compiler
-  execution arguments and put it into the bisection cache. This
-  includes copying the created object file, adding the object
-  file path to the cache list and keeping a log of the execution.
-
-  Args:
-    execargs: compiler execution arguments.
-    bisect_dir: bisection directory.
-    population_name: name of the cache being populated (good/bad).
-  """
-  retval = exec_and_return(execargs)
-  if retval:
-    return retval
-
-  full_obj_path = get_obj_path(execargs)
-  # If not a normal compiler call then just exit
-  if not full_obj_path:
-    return
-
-  cache_file(execargs, bisect_dir, population_name, full_obj_path)
-
-  population_dir = os.path.join(bisect_dir, population_name)
-  with lock_file(os.path.join(population_dir, '_LIST'), 'a') as object_list:
-    object_list.write('%s\n' % full_obj_path)
-
-  for side_effect in get_side_effects(execargs):
-    cache_file(execargs, bisect_dir, population_name, side_effect)
-
-
-def bisect_triage(execargs, bisect_dir):
-  full_obj_path = get_obj_path(execargs)
-  obj_list = os.path.join(bisect_dir, LIST_FILE)
-
-  # If the output isn't an object file just call compiler
-  if not full_obj_path:
-    return exec_and_return(execargs)
-
-  # If this isn't a bisected object just call compiler
-  # This shouldn't happen!
-  if not in_object_list(full_obj_path, obj_list):
-    if CONTINUE_ON_MISSING:
-      log_file = os.path.join(bisect_dir, '_MISSING_CACHED_OBJ_LOG')
-      log_to_file(log_file, execargs, '? compiler', full_obj_path)
-      return exec_and_return(execargs)
-    else:
-      raise Error(('%s is missing from cache! To ignore export '
-                   'BISECT_CONTINUE_ON_MISSING=1. See documentation for more '
-                   'details on this option.' % full_obj_path))
-
-  cache = which_cache(full_obj_path)
-
-  # If using safe WRAPPER_SAFE_MODE option call compiler and overwrite the
-  # result from the good/bad cache. This option is safe and covers all compiler
-  # side effects, but is very slow!
-  if WRAPPER_SAFE_MODE:
-    retval = exec_and_return(execargs)
-    if retval:
-      return retval
-    os.remove(full_obj_path)
-    restore_file(bisect_dir, cache, full_obj_path)
-    return
-
-  # Generate compiler side effects. Trick Make into thinking compiler was
-  # actually executed.
-  for side_effect in get_side_effects(execargs):
-    restore_file(bisect_dir, cache, side_effect)
-
-  # If generated object file happened to be pruned/cleaned by Make then link it
-  # over from cache again.
-  if not os.path.exists(full_obj_path):
-    restore_file(bisect_dir, cache, full_obj_path)
-
-
-def bisect_driver(bisect_stage, bisect_dir, execargs):
-  """Call appropriate bisection stage according to value in bisect_stage."""
-  if bisect_stage == 'POPULATE_GOOD':
-    bisect_populate(execargs, bisect_dir, GOOD_CACHE)
-  elif bisect_stage == 'POPULATE_BAD':
-    bisect_populate(execargs, bisect_dir, BAD_CACHE)
-  elif bisect_stage == 'TRIAGE':
-    bisect_triage(execargs, bisect_dir)
-  else:
-    raise ValueError('wrong value for BISECT_STAGE: %s' % bisect_stage)
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang-12 b/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang-12
index 1a08a42..15636eb 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang-12
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang-12
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang-check b/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang-check
index 8a18c14..9368483 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang-check
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang-check
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang-cl b/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang-cl
new file mode 120000
index 0000000..060d289
--- /dev/null
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang-cl
@@ -0,0 +1 @@
+clang
\ No newline at end of file
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang-format b/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang-format
index 216f2b3..da3ebf2 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang-format
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang-format
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang-tidy b/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang-tidy
index 5da1dca..41d40e8 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang-tidy
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang-tidy
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang-tidy.real b/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang-tidy.real
deleted file mode 100755
index 7fb687e..0000000
--- a/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang-tidy.real
+++ /dev/null
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/bin/clangd b/toolchains/llvm/prebuilt/darwin-x86_64/bin/clangd
index e239a4c..55acfc6 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/bin/clangd
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/bin/clangd
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/bin/dsymutil b/toolchains/llvm/prebuilt/darwin-x86_64/bin/dsymutil
index 60731f3..f9f51f0 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/bin/dsymutil
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/bin/dsymutil
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/bin/ld b/toolchains/llvm/prebuilt/darwin-x86_64/bin/ld
index afd8a6a..0077748 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/bin/ld
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/bin/ld
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/bin/lld b/toolchains/llvm/prebuilt/darwin-x86_64/bin/lld
index afd8a6a..0077748 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/bin/lld
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/bin/lld
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/bin/lldb b/toolchains/llvm/prebuilt/darwin-x86_64/bin/lldb
index 5adb19d..9d7d635 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/bin/lldb
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/bin/lldb
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/bin/lldb-argdumper b/toolchains/llvm/prebuilt/darwin-x86_64/bin/lldb-argdumper
index ef96e9c..e8ef6bb 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/bin/lldb-argdumper
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/bin/lldb-argdumper
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar
index 2d29022..c678561 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-as b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-as
index a39e3d9..b405706 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-as
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-as
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-cfi-verify b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-cfi-verify
index 2ef50f6..225b502 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-cfi-verify
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-cfi-verify
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-config b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-config
index 075a284..a38c5b2 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-config
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-config
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-cov b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-cov
index aa05ca0..17133f8 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-cov
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-cov
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-cxxfilt b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-cxxfilt
index 7002642..f04981c 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-cxxfilt
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-cxxfilt
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-dis b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-dis
index cbc6d20..bb3134c 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-dis
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-dis
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-dwarfdump b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-dwarfdump
index 3599a97..9f5c983 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-dwarfdump
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-dwarfdump
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-dwp b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-dwp
index af9813e..df8a673 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-dwp
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-dwp
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-link b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-link
index 37a0fd9..686a9c1 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-link
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-link
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-lipo b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-lipo
index 56f8524..b300eb2 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-lipo
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-lipo
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-modextract b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-modextract
index db786c8..e7afa2c 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-modextract
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-modextract
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-nm b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-nm
index f7cd8a8..b8f7a58 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-nm
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-nm
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-objcopy b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-objcopy
index a0499a7..5e3de10 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-objcopy
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-objcopy
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-objdump b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-objdump
index 48dd67d..0e70597 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-objdump
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-objdump
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-profdata b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-profdata
index 1fce566..4ca5552 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-profdata
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-profdata
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-rc b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-rc
index 59e5ff1..7fedb5f 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-rc
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-rc
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-readobj b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-readobj
index f9a4aad..a21804a 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-readobj
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-readobj
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-size b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-size
index 03cb980..caf8ee7 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-size
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-size
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-strings b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-strings
index 66bdb34..733b632 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-strings
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-strings
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-symbolizer b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-symbolizer
index 9c643cb..b854556 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-symbolizer
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-symbolizer
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/bin/sancov b/toolchains/llvm/prebuilt/darwin-x86_64/bin/sancov
index 5896fad..56189ea 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/bin/sancov
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/bin/sancov
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/bin/sanstats b/toolchains/llvm/prebuilt/darwin-x86_64/bin/sanstats
index 5c13564..8b9ad3b 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/bin/sanstats
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/bin/sanstats
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/bin/yasm b/toolchains/llvm/prebuilt/darwin-x86_64/bin/yasm
index 788cbf2..77ddc69 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/bin/yasm
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/bin/yasm
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/i686-linux-android/bin/as b/toolchains/llvm/prebuilt/darwin-x86_64/i686-linux-android/bin/as
new file mode 120000
index 0000000..d17cf99
--- /dev/null
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/i686-linux-android/bin/as
@@ -0,0 +1 @@
+/Volumes/Android/buildbot/src/android/ndk-release-r23/out/darwin/android-ndk-r23b/toolchains/llvm/prebuilt/darwin-x86_64/bin/i686-linux-android-as
\ No newline at end of file
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib/gcc/aarch64-linux-android/4.9.x/crtbegin.o b/toolchains/llvm/prebuilt/darwin-x86_64/lib/gcc/aarch64-linux-android/4.9.x/crtbegin.o
new file mode 100644
index 0000000..0d6a191
--- /dev/null
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib/gcc/aarch64-linux-android/4.9.x/crtbegin.o
@@ -0,0 +1 @@
+This file cannot be used but is needed for Clang to find GAS.
\ No newline at end of file
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib/gcc/arm-linux-androideabi/4.9.x/crtbegin.o b/toolchains/llvm/prebuilt/darwin-x86_64/lib/gcc/arm-linux-androideabi/4.9.x/crtbegin.o
new file mode 100644
index 0000000..0d6a191
--- /dev/null
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib/gcc/arm-linux-androideabi/4.9.x/crtbegin.o
@@ -0,0 +1 @@
+This file cannot be used but is needed for Clang to find GAS.
\ No newline at end of file
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib/gcc/i686-linux-android/4.9.x/crtbegin.o b/toolchains/llvm/prebuilt/darwin-x86_64/lib/gcc/i686-linux-android/4.9.x/crtbegin.o
new file mode 100644
index 0000000..0d6a191
--- /dev/null
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib/gcc/i686-linux-android/4.9.x/crtbegin.o
@@ -0,0 +1 @@
+This file cannot be used but is needed for Clang to find GAS.
\ No newline at end of file
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib/gcc/x86_64-linux-android/4.9.x/crtbegin.o b/toolchains/llvm/prebuilt/darwin-x86_64/lib/gcc/x86_64-linux-android/4.9.x/crtbegin.o
new file mode 100644
index 0000000..0d6a191
--- /dev/null
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib/gcc/x86_64-linux-android/4.9.x/crtbegin.o
@@ -0,0 +1 @@
+This file cannot be used but is needed for Clang to find GAS.
\ No newline at end of file
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/LLVMPolly.so b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/LLVMPolly.so
index 6431202..916b6d6 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/LLVMPolly.so
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/LLVMPolly.so
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/LLVMgold.dylib b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/LLVMgold.dylib
index 4b88138..6e7bfbb 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/LLVMgold.dylib
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/LLVMgold.dylib
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-preinit-arm-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-preinit-arm-android.a
deleted file mode 100644
index 85d1144..0000000
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-preinit-arm-android.a
+++ /dev/null
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.builtins-arm-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.builtins-arm-android.a
deleted file mode 100644
index 006d874..0000000
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.builtins-arm-android.a
+++ /dev/null
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer_no_main-i686-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer_no_main-i686-android.a
deleted file mode 100644
index d5d5048..0000000
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer_no_main-i686-android.a
+++ /dev/null
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo-aarch64-android.so b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo-aarch64-android.so
deleted file mode 100644
index 6871e81..0000000
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo-aarch64-android.so
+++ /dev/null
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo-arm-android.so b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo-arm-android.so
deleted file mode 100644
index 52bf233..0000000
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo-arm-android.so
+++ /dev/null
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo-i686-android.so b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo-i686-android.so
deleted file mode 100644
index c1bd16a..0000000
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo-i686-android.so
+++ /dev/null
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo-x86_64-android.so b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo-x86_64-android.so
deleted file mode 100644
index 67484c6..0000000
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo-x86_64-android.so
+++ /dev/null
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/bin/asan_device_setup b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/bin/asan_device_setup
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/bin/asan_device_setup
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/bin/asan_device_setup
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/bin/hwasan_symbolize b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/bin/hwasan_symbolize
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/bin/hwasan_symbolize
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/bin/hwasan_symbolize
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/__clang_cuda_builtin_vars.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/__clang_cuda_builtin_vars.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/__clang_cuda_builtin_vars.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/__clang_cuda_builtin_vars.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/__clang_cuda_cmath.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/__clang_cuda_cmath.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/__clang_cuda_cmath.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/__clang_cuda_cmath.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/__clang_cuda_complex_builtins.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/__clang_cuda_complex_builtins.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/__clang_cuda_complex_builtins.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/__clang_cuda_complex_builtins.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/__clang_cuda_device_functions.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/__clang_cuda_device_functions.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/__clang_cuda_device_functions.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/__clang_cuda_device_functions.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/__clang_cuda_intrinsics.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/__clang_cuda_intrinsics.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/__clang_cuda_intrinsics.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/__clang_cuda_intrinsics.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/__clang_cuda_libdevice_declares.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/__clang_cuda_libdevice_declares.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/__clang_cuda_libdevice_declares.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/__clang_cuda_libdevice_declares.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/__clang_cuda_math.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/__clang_cuda_math.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/__clang_cuda_math.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/__clang_cuda_math.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/__clang_cuda_math_forward_declares.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/__clang_cuda_math_forward_declares.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/__clang_cuda_math_forward_declares.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/__clang_cuda_math_forward_declares.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/__clang_cuda_runtime_wrapper.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/__clang_cuda_runtime_wrapper.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/__clang_cuda_runtime_wrapper.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/__clang_cuda_runtime_wrapper.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/__clang_hip_cmath.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/__clang_hip_cmath.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/__clang_hip_cmath.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/__clang_hip_cmath.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/__clang_hip_libdevice_declares.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/__clang_hip_libdevice_declares.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/__clang_hip_libdevice_declares.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/__clang_hip_libdevice_declares.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/__clang_hip_math.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/__clang_hip_math.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/__clang_hip_math.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/__clang_hip_math.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/__clang_hip_runtime_wrapper.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/__clang_hip_runtime_wrapper.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/__clang_hip_runtime_wrapper.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/__clang_hip_runtime_wrapper.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/__stddef_max_align_t.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/__stddef_max_align_t.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/__stddef_max_align_t.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/__stddef_max_align_t.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/__wmmintrin_aes.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/__wmmintrin_aes.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/__wmmintrin_aes.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/__wmmintrin_aes.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/__wmmintrin_pclmul.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/__wmmintrin_pclmul.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/__wmmintrin_pclmul.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/__wmmintrin_pclmul.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/adxintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/adxintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/adxintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/adxintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/altivec.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/altivec.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/altivec.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/altivec.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/ammintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/ammintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/ammintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/ammintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/amxintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/amxintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/amxintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/amxintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/arm64intr.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/arm64intr.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/arm64intr.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/arm64intr.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/arm_acle.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/arm_acle.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/arm_acle.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/arm_acle.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/arm_bf16.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/arm_bf16.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/arm_bf16.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/arm_bf16.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/arm_cde.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/arm_cde.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/arm_cde.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/arm_cde.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/arm_cmse.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/arm_cmse.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/arm_cmse.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/arm_cmse.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/arm_fp16.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/arm_fp16.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/arm_fp16.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/arm_fp16.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/arm_mve.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/arm_mve.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/arm_mve.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/arm_mve.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/arm_neon.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/arm_neon.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/arm_neon.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/arm_neon.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/arm_sve.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/arm_sve.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/arm_sve.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/arm_sve.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/armintr.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/armintr.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/armintr.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/armintr.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx2intrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx2intrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx2intrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx2intrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512bf16intrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512bf16intrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512bf16intrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512bf16intrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512bitalgintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512bitalgintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512bitalgintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512bitalgintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512bwintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512bwintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512bwintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512bwintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512cdintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512cdintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512cdintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512cdintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512dqintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512dqintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512dqintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512dqintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512erintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512erintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512erintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512erintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512fintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512fintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512fintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512fintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512ifmaintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512ifmaintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512ifmaintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512ifmaintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512ifmavlintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512ifmavlintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512ifmavlintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512ifmavlintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512pfintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512pfintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512pfintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512pfintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512vbmi2intrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512vbmi2intrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512vbmi2intrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512vbmi2intrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512vbmiintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512vbmiintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512vbmiintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512vbmiintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512vbmivlintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512vbmivlintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512vbmivlintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512vbmivlintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512vlbf16intrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512vlbf16intrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512vlbf16intrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512vlbf16intrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512vlbitalgintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512vlbitalgintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512vlbitalgintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512vlbitalgintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512vlbwintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512vlbwintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512vlbwintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512vlbwintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512vlcdintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512vlcdintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512vlcdintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512vlcdintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512vldqintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512vldqintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512vldqintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512vldqintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512vlintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512vlintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512vlintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512vlintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512vlvbmi2intrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512vlvbmi2intrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512vlvbmi2intrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512vlvbmi2intrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512vlvnniintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512vlvnniintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512vlvnniintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512vlvnniintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512vlvp2intersectintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512vlvp2intersectintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512vlvp2intersectintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512vlvp2intersectintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512vnniintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512vnniintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512vnniintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512vnniintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512vp2intersectintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512vp2intersectintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512vp2intersectintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512vp2intersectintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512vpopcntdqintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512vpopcntdqintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512vpopcntdqintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512vpopcntdqintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512vpopcntdqvlintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512vpopcntdqvlintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avx512vpopcntdqvlintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avx512vpopcntdqvlintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avxintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avxintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avxintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avxintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avxvnniintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avxvnniintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/avxvnniintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/avxvnniintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/bits/stdatomic.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/bits/stdatomic.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/bits/stdatomic.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/bits/stdatomic.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/bmi2intrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/bmi2intrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/bmi2intrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/bmi2intrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/bmiintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/bmiintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/bmiintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/bmiintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/cet.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/cet.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/cet.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/cet.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/cetintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/cetintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/cetintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/cetintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/cldemoteintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/cldemoteintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/cldemoteintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/cldemoteintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/clflushoptintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/clflushoptintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/clflushoptintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/clflushoptintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/clwbintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/clwbintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/clwbintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/clwbintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/clzerointrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/clzerointrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/clzerointrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/clzerointrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/cpuid.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/cpuid.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/cpuid.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/cpuid.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/cuda_wrappers/algorithm b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/cuda_wrappers/algorithm
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/cuda_wrappers/algorithm
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/cuda_wrappers/algorithm
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/cuda_wrappers/complex b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/cuda_wrappers/complex
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/cuda_wrappers/complex
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/cuda_wrappers/complex
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/cuda_wrappers/new b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/cuda_wrappers/new
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/cuda_wrappers/new
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/cuda_wrappers/new
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/emmintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/emmintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/emmintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/emmintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/enqcmdintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/enqcmdintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/enqcmdintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/enqcmdintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/f16cintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/f16cintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/f16cintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/f16cintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/float.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/float.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/float.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/float.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/fma4intrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/fma4intrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/fma4intrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/fma4intrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/fmaintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/fmaintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/fmaintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/fmaintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/fuzzer/FuzzedDataProvider.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/fuzzer/FuzzedDataProvider.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/fuzzer/FuzzedDataProvider.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/fuzzer/FuzzedDataProvider.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/fxsrintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/fxsrintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/fxsrintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/fxsrintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/gfniintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/gfniintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/gfniintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/gfniintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/hresetintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/hresetintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/hresetintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/hresetintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/htmintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/htmintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/htmintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/htmintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/htmxlintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/htmxlintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/htmxlintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/htmxlintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/ia32intrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/ia32intrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/ia32intrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/ia32intrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/immintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/immintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/immintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/immintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/intrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/intrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/intrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/intrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/inttypes.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/inttypes.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/inttypes.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/inttypes.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/invpcidintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/invpcidintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/invpcidintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/invpcidintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/iso646.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/iso646.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/iso646.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/iso646.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/keylockerintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/keylockerintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/keylockerintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/keylockerintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/limits.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/limits.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/limits.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/limits.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/lwpintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/lwpintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/lwpintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/lwpintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/lzcntintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/lzcntintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/lzcntintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/lzcntintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/mm3dnow.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/mm3dnow.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/mm3dnow.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/mm3dnow.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/mm_malloc.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/mm_malloc.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/mm_malloc.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/mm_malloc.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/mmintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/mmintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/mmintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/mmintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/module.modulemap b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/module.modulemap
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/module.modulemap
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/module.modulemap
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/movdirintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/movdirintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/movdirintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/movdirintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/msa.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/msa.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/msa.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/msa.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/mwaitxintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/mwaitxintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/mwaitxintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/mwaitxintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/nmmintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/nmmintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/nmmintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/nmmintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/omp-tools.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/omp-tools.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/omp-tools.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/omp-tools.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/omp.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/omp.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/omp.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/omp.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/ompt.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/ompt.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/ompt.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/ompt.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/opencl-c-base.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/opencl-c-base.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/opencl-c-base.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/opencl-c-base.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/opencl-c.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/opencl-c.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/opencl-c.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/opencl-c.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/openmp_wrappers/__clang_openmp_device_functions.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/openmp_wrappers/__clang_openmp_device_functions.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/openmp_wrappers/__clang_openmp_device_functions.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/openmp_wrappers/__clang_openmp_device_functions.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/openmp_wrappers/cmath b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/openmp_wrappers/cmath
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/openmp_wrappers/cmath
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/openmp_wrappers/cmath
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/openmp_wrappers/complex b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/openmp_wrappers/complex
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/openmp_wrappers/complex
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/openmp_wrappers/complex
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/openmp_wrappers/complex.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/openmp_wrappers/complex.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/openmp_wrappers/complex.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/openmp_wrappers/complex.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/openmp_wrappers/complex_cmath.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/openmp_wrappers/complex_cmath.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/openmp_wrappers/complex_cmath.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/openmp_wrappers/complex_cmath.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/openmp_wrappers/math.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/openmp_wrappers/math.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/openmp_wrappers/math.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/openmp_wrappers/math.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/openmp_wrappers/new b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/openmp_wrappers/new
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/openmp_wrappers/new
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/openmp_wrappers/new
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/pconfigintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/pconfigintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/pconfigintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/pconfigintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/pkuintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/pkuintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/pkuintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/pkuintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/pmmintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/pmmintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/pmmintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/pmmintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/popcntintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/popcntintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/popcntintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/popcntintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/ppc_wrappers/emmintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/ppc_wrappers/emmintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/ppc_wrappers/emmintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/ppc_wrappers/emmintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/ppc_wrappers/mm_malloc.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/ppc_wrappers/mm_malloc.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/ppc_wrappers/mm_malloc.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/ppc_wrappers/mm_malloc.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/ppc_wrappers/mmintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/ppc_wrappers/mmintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/ppc_wrappers/mmintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/ppc_wrappers/mmintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/ppc_wrappers/pmmintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/ppc_wrappers/pmmintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/ppc_wrappers/pmmintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/ppc_wrappers/pmmintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/ppc_wrappers/smmintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/ppc_wrappers/smmintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/ppc_wrappers/smmintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/ppc_wrappers/smmintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/ppc_wrappers/tmmintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/ppc_wrappers/tmmintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/ppc_wrappers/tmmintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/ppc_wrappers/tmmintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/ppc_wrappers/xmmintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/ppc_wrappers/xmmintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/ppc_wrappers/xmmintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/ppc_wrappers/xmmintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/prfchwintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/prfchwintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/prfchwintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/prfchwintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/profile/InstrProfData.inc b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/profile/InstrProfData.inc
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/profile/InstrProfData.inc
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/profile/InstrProfData.inc
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/ptwriteintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/ptwriteintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/ptwriteintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/ptwriteintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/rdseedintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/rdseedintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/rdseedintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/rdseedintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/rtmintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/rtmintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/rtmintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/rtmintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/s390intrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/s390intrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/s390intrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/s390intrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/sanitizer/allocator_interface.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/sanitizer/allocator_interface.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/sanitizer/allocator_interface.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/sanitizer/allocator_interface.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/sanitizer/asan_interface.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/sanitizer/asan_interface.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/sanitizer/asan_interface.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/sanitizer/asan_interface.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/sanitizer/common_interface_defs.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/sanitizer/common_interface_defs.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/sanitizer/common_interface_defs.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/sanitizer/common_interface_defs.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/sanitizer/coverage_interface.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/sanitizer/coverage_interface.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/sanitizer/coverage_interface.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/sanitizer/coverage_interface.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/sanitizer/dfsan_interface.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/sanitizer/dfsan_interface.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/sanitizer/dfsan_interface.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/sanitizer/dfsan_interface.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/sanitizer/hwasan_interface.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/sanitizer/hwasan_interface.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/sanitizer/hwasan_interface.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/sanitizer/hwasan_interface.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/sanitizer/linux_syscall_hooks.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/sanitizer/linux_syscall_hooks.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/sanitizer/linux_syscall_hooks.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/sanitizer/linux_syscall_hooks.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/sanitizer/lsan_interface.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/sanitizer/lsan_interface.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/sanitizer/lsan_interface.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/sanitizer/lsan_interface.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/sanitizer/msan_interface.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/sanitizer/msan_interface.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/sanitizer/msan_interface.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/sanitizer/msan_interface.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/sanitizer/netbsd_syscall_hooks.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/sanitizer/netbsd_syscall_hooks.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/sanitizer/netbsd_syscall_hooks.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/sanitizer/netbsd_syscall_hooks.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/sanitizer/scudo_interface.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/sanitizer/scudo_interface.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/sanitizer/scudo_interface.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/sanitizer/scudo_interface.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/sanitizer/tsan_interface.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/sanitizer/tsan_interface.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/sanitizer/tsan_interface.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/sanitizer/tsan_interface.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/sanitizer/tsan_interface_atomic.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/sanitizer/tsan_interface_atomic.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/sanitizer/tsan_interface_atomic.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/sanitizer/tsan_interface_atomic.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/sanitizer/ubsan_interface.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/sanitizer/ubsan_interface.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/sanitizer/ubsan_interface.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/sanitizer/ubsan_interface.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/serializeintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/serializeintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/serializeintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/serializeintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/sgxintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/sgxintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/sgxintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/sgxintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/shaintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/shaintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/shaintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/shaintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/smmintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/smmintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/smmintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/smmintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/stdalign.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/stdalign.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/stdalign.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/stdalign.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/stdarg.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/stdarg.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/stdarg.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/stdarg.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/stdatomic.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/stdatomic.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/stdatomic.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/stdatomic.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/stdbool.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/stdbool.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/stdbool.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/stdbool.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/stddef.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/stddef.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/stddef.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/stddef.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/stdint.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/stdint.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/stdint.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/stdint.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/stdnoreturn.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/stdnoreturn.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/stdnoreturn.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/stdnoreturn.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/tbmintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/tbmintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/tbmintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/tbmintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/tgmath.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/tgmath.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/tgmath.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/tgmath.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/tmmintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/tmmintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/tmmintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/tmmintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/tsxldtrkintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/tsxldtrkintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/tsxldtrkintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/tsxldtrkintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/uintrintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/uintrintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/uintrintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/uintrintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/unwind.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/unwind.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/unwind.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/unwind.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/vadefs.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/vadefs.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/vadefs.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/vadefs.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/vaesintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/vaesintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/vaesintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/vaesintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/varargs.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/varargs.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/varargs.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/varargs.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/vecintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/vecintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/vecintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/vecintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/vpclmulqdqintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/vpclmulqdqintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/vpclmulqdqintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/vpclmulqdqintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/waitpkgintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/waitpkgintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/waitpkgintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/waitpkgintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/wasm_simd128.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/wasm_simd128.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/wasm_simd128.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/wasm_simd128.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/wbnoinvdintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/wbnoinvdintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/wbnoinvdintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/wbnoinvdintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/wmmintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/wmmintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/wmmintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/wmmintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/x86gprintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/x86gprintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/x86gprintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/x86gprintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/x86intrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/x86intrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/x86intrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/x86intrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/xmmintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/xmmintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/xmmintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/xmmintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/xopintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/xopintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/xopintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/xopintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/xsavecintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/xsavecintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/xsavecintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/xsavecintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/xsaveintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/xsaveintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/xsaveintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/xsaveintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/xsaveoptintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/xsaveoptintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/xsaveoptintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/xsaveoptintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/xsavesintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/xsavesintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/xsavesintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/xsavesintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/xtestintrin.h b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/xtestintrin.h
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/include/xtestintrin.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/include/xtestintrin.h
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/aarch64/libFuzzer.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/aarch64/libFuzzer.a
similarity index 90%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/aarch64/libFuzzer.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/aarch64/libFuzzer.a
index 0850a4e..c9dd020 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/aarch64/libFuzzer.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/aarch64/libFuzzer.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/aarch64/libatomic.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/aarch64/libatomic.a
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/aarch64/libatomic.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/aarch64/libatomic.a
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/aarch64/libomp.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/aarch64/libomp.a
similarity index 99%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/aarch64/libomp.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/aarch64/libomp.a
index f831a44..fe43420 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/aarch64/libomp.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/aarch64/libomp.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/aarch64/libomp.so b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/aarch64/libomp.so
similarity index 99%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/aarch64/libomp.so
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/aarch64/libomp.so
index b3f27cb..e6f75af 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/aarch64/libomp.so
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/aarch64/libomp.so
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/aarch64/libunwind.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/aarch64/libunwind.a
similarity index 96%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/aarch64/libunwind.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/aarch64/libunwind.a
index e438e02..c8b47e8 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/aarch64/libunwind.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/aarch64/libunwind.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/aarch64/lldb-server b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/aarch64/lldb-server
similarity index 76%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/aarch64/lldb-server
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/aarch64/lldb-server
index 058eba7..e357d2c 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/aarch64/lldb-server
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/aarch64/lldb-server
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/arm/libFuzzer.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/arm/libFuzzer.a
similarity index 87%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/arm/libFuzzer.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/arm/libFuzzer.a
index 3eea008..767de32 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/arm/libFuzzer.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/arm/libFuzzer.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/arm/libatomic.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/arm/libatomic.a
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/arm/libatomic.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/arm/libatomic.a
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/arm/libomp.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/arm/libomp.a
similarity index 93%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/arm/libomp.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/arm/libomp.a
index ec75259..535a9be 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/arm/libomp.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/arm/libomp.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/arm/libomp.so b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/arm/libomp.so
similarity index 99%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/arm/libomp.so
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/arm/libomp.so
index e655117..c152331 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/arm/libomp.so
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/arm/libomp.so
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/arm/libunwind.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/arm/libunwind.a
similarity index 81%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/arm/libunwind.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/arm/libunwind.a
index c56de6b..712de9c 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/arm/libunwind.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/arm/libunwind.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/arm/lldb-server b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/arm/lldb-server
similarity index 98%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/arm/lldb-server
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/arm/lldb-server
index 1d3b932..6476660 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/arm/lldb-server
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/arm/lldb-server
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/i386/libFuzzer.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/i386/libFuzzer.a
similarity index 88%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/i386/libFuzzer.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/i386/libFuzzer.a
index c57cf30..0e8355a 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/i386/libFuzzer.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/i386/libFuzzer.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/i386/libatomic.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/i386/libatomic.a
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/i386/libatomic.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/i386/libatomic.a
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/i386/libomp.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/i386/libomp.a
similarity index 97%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/i386/libomp.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/i386/libomp.a
index 42da19d..056d5bd 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/i386/libomp.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/i386/libomp.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/i386/libomp.so b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/i386/libomp.so
similarity index 99%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/i386/libomp.so
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/i386/libomp.so
index e4de9bf..b1a0074 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/i386/libomp.so
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/i386/libomp.so
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/i386/libunwind.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/i386/libunwind.a
similarity index 96%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/i386/libunwind.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/i386/libunwind.a
index 595e8e2..707b06f 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/i386/libunwind.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/i386/libunwind.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/i386/lldb-server b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/i386/lldb-server
similarity index 96%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/i386/lldb-server
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/i386/lldb-server
index 2d2e0b5..f966f5a 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/i386/lldb-server
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/i386/lldb-server
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-aarch64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-aarch64-android.a
similarity index 90%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-aarch64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-aarch64-android.a
index e66a0c2..2c08be5 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-aarch64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-aarch64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-aarch64-android.a.syms b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-aarch64-android.a.syms
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-aarch64-android.a.syms
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-aarch64-android.a.syms
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-aarch64-android.so b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-aarch64-android.so
similarity index 93%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-aarch64-android.so
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-aarch64-android.so
index c405167..7a8528b 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-aarch64-android.so
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-aarch64-android.so
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-arm-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-arm-android.a
similarity index 89%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-arm-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-arm-android.a
index 1b0d675..afafeb7 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-arm-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-arm-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-arm-android.a.syms b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-arm-android.a.syms
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-arm-android.a.syms
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-arm-android.a.syms
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-arm-android.so b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-arm-android.so
similarity index 93%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-arm-android.so
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-arm-android.so
index 26c32ea..1121aa0 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-arm-android.so
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-arm-android.so
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-i686-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-i686-android.a
similarity index 85%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-i686-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-i686-android.a
index 699383b..71df4e6 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-i686-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-i686-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-i686-android.so b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-i686-android.so
similarity index 92%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-i686-android.so
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-i686-android.so
index 2ac943d..721ef0c 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-i686-android.so
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-i686-android.so
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-preinit-aarch64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-preinit-aarch64-android.a
similarity index 77%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-preinit-aarch64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-preinit-aarch64-android.a
index 6134953..c2838a7 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-preinit-aarch64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-preinit-aarch64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-preinit-arm-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-preinit-arm-android.a
new file mode 100644
index 0000000..45610ab
--- /dev/null
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-preinit-arm-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-preinit-i686-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-preinit-i686-android.a
similarity index 66%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-preinit-i686-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-preinit-i686-android.a
index 99a5c62..ace26e4 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-preinit-i686-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-preinit-i686-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-preinit-x86_64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-preinit-x86_64-android.a
similarity index 73%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-preinit-x86_64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-preinit-x86_64-android.a
index e30da77..0a36423 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-preinit-x86_64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-preinit-x86_64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-x86_64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-x86_64-android.a
similarity index 91%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-x86_64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-x86_64-android.a
index 722de5e..e03eaaa 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-x86_64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-x86_64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-x86_64-android.a.syms b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-x86_64-android.a.syms
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-x86_64-android.a.syms
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-x86_64-android.a.syms
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-x86_64-android.so b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-x86_64-android.so
similarity index 93%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-x86_64-android.so
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-x86_64-android.so
index 37b7c76..31bec29 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan-x86_64-android.so
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan-x86_64-android.so
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan_cxx-aarch64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan_cxx-aarch64-android.a
similarity index 89%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan_cxx-aarch64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan_cxx-aarch64-android.a
index c105eae..7bbce79 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan_cxx-aarch64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan_cxx-aarch64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan_cxx-aarch64-android.a.syms b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan_cxx-aarch64-android.a.syms
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan_cxx-aarch64-android.a.syms
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan_cxx-aarch64-android.a.syms
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan_cxx-arm-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan_cxx-arm-android.a
similarity index 80%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan_cxx-arm-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan_cxx-arm-android.a
index 9f34897..523d4ea 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan_cxx-arm-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan_cxx-arm-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan_cxx-arm-android.a.syms b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan_cxx-arm-android.a.syms
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan_cxx-arm-android.a.syms
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan_cxx-arm-android.a.syms
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan_cxx-i686-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan_cxx-i686-android.a
similarity index 84%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan_cxx-i686-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan_cxx-i686-android.a
index 15b5f63..676446f 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan_cxx-i686-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan_cxx-i686-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan_cxx-x86_64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan_cxx-x86_64-android.a
similarity index 89%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan_cxx-x86_64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan_cxx-x86_64-android.a
index 27ca86a..e784932 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan_cxx-x86_64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan_cxx-x86_64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan_cxx-x86_64-android.a.syms b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan_cxx-x86_64-android.a.syms
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.asan_cxx-x86_64-android.a.syms
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.asan_cxx-x86_64-android.a.syms
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.builtins-aarch64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.builtins-aarch64-android.a
similarity index 84%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.builtins-aarch64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.builtins-aarch64-android.a
index d6366f1..8f00279 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.builtins-aarch64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.builtins-aarch64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.builtins-arm-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.builtins-arm-android.a
new file mode 100644
index 0000000..68b8381
--- /dev/null
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.builtins-arm-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.builtins-i686-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.builtins-i686-android.a
similarity index 72%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.builtins-i686-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.builtins-i686-android.a
index 85de3f1..c089dd8 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.builtins-i686-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.builtins-i686-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.builtins-x86_64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.builtins-x86_64-android.a
similarity index 78%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.builtins-x86_64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.builtins-x86_64-android.a
index 15c351c..c1018d9 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.builtins-x86_64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.builtins-x86_64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer-aarch64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.fuzzer-aarch64-android.a
similarity index 90%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer-aarch64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.fuzzer-aarch64-android.a
index 0850a4e..c9dd020 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer-aarch64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.fuzzer-aarch64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer-arm-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.fuzzer-arm-android.a
similarity index 87%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer-arm-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.fuzzer-arm-android.a
index 3eea008..767de32 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer-arm-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.fuzzer-arm-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer-i686-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.fuzzer-i686-android.a
similarity index 88%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer-i686-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.fuzzer-i686-android.a
index c57cf30..0e8355a 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer-i686-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.fuzzer-i686-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer-x86_64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.fuzzer-x86_64-android.a
similarity index 91%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer-x86_64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.fuzzer-x86_64-android.a
index 89b3c9c..c6f0aec 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer-x86_64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.fuzzer-x86_64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer_interceptors-aarch64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.fuzzer_interceptors-aarch64-android.a
similarity index 89%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer_interceptors-aarch64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.fuzzer_interceptors-aarch64-android.a
index 67313c8..1126134 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer_interceptors-aarch64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.fuzzer_interceptors-aarch64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer_interceptors-arm-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.fuzzer_interceptors-arm-android.a
similarity index 70%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer_interceptors-arm-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.fuzzer_interceptors-arm-android.a
index 325e932..f49ca23 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer_interceptors-arm-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.fuzzer_interceptors-arm-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer_interceptors-i686-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.fuzzer_interceptors-i686-android.a
similarity index 67%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer_interceptors-i686-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.fuzzer_interceptors-i686-android.a
index ce6ac43..2eb2e6f 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer_interceptors-i686-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.fuzzer_interceptors-i686-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer_interceptors-x86_64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.fuzzer_interceptors-x86_64-android.a
similarity index 88%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer_interceptors-x86_64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.fuzzer_interceptors-x86_64-android.a
index 5e02c2f..306cf8d 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer_interceptors-x86_64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.fuzzer_interceptors-x86_64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer_no_main-aarch64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.fuzzer_no_main-aarch64-android.a
similarity index 90%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer_no_main-aarch64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.fuzzer_no_main-aarch64-android.a
index 9cc7ffa..80c8ffb 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer_no_main-aarch64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.fuzzer_no_main-aarch64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer_no_main-arm-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.fuzzer_no_main-arm-android.a
similarity index 87%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer_no_main-arm-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.fuzzer_no_main-arm-android.a
index 9f501a5..2c8808d 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer_no_main-arm-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.fuzzer_no_main-arm-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer-i686-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.fuzzer_no_main-i686-android.a
similarity index 85%
copy from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer-i686-android.a
copy to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.fuzzer_no_main-i686-android.a
index c57cf30..6808303 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer-i686-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.fuzzer_no_main-i686-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer_no_main-x86_64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.fuzzer_no_main-x86_64-android.a
similarity index 91%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer_no_main-x86_64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.fuzzer_no_main-x86_64-android.a
index a05fa45..fb6f6f2 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.fuzzer_no_main-x86_64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.fuzzer_no_main-x86_64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.hwasan-aarch64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.hwasan-aarch64-android.a
similarity index 87%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.hwasan-aarch64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.hwasan-aarch64-android.a
index a04f506..c101225 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.hwasan-aarch64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.hwasan-aarch64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.hwasan-aarch64-android.a.syms b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.hwasan-aarch64-android.a.syms
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.hwasan-aarch64-android.a.syms
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.hwasan-aarch64-android.a.syms
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.hwasan-aarch64-android.so b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.hwasan-aarch64-android.so
similarity index 87%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.hwasan-aarch64-android.so
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.hwasan-aarch64-android.so
index eb8c740..df01bcf 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.hwasan-aarch64-android.so
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.hwasan-aarch64-android.so
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.hwasan-x86_64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.hwasan-x86_64-android.a
similarity index 88%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.hwasan-x86_64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.hwasan-x86_64-android.a
index 990485b..04512e3 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.hwasan-x86_64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.hwasan-x86_64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.hwasan-x86_64-android.a.syms b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.hwasan-x86_64-android.a.syms
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.hwasan-x86_64-android.a.syms
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.hwasan-x86_64-android.a.syms
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.hwasan-x86_64-android.so b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.hwasan-x86_64-android.so
similarity index 89%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.hwasan-x86_64-android.so
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.hwasan-x86_64-android.so
index c1e98cd..5ccb904 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.hwasan-x86_64-android.so
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.hwasan-x86_64-android.so
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.hwasan_cxx-aarch64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.hwasan_cxx-aarch64-android.a
similarity index 87%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.hwasan_cxx-aarch64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.hwasan_cxx-aarch64-android.a
index 3b19f69..083cf01 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.hwasan_cxx-aarch64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.hwasan_cxx-aarch64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.hwasan_cxx-aarch64-android.a.syms b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.hwasan_cxx-aarch64-android.a.syms
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.hwasan_cxx-aarch64-android.a.syms
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.hwasan_cxx-aarch64-android.a.syms
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.hwasan_cxx-x86_64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.hwasan_cxx-x86_64-android.a
similarity index 82%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.hwasan_cxx-x86_64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.hwasan_cxx-x86_64-android.a
index 2c8f0e9..3ae2990 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.hwasan_cxx-x86_64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.hwasan_cxx-x86_64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.hwasan_cxx-x86_64-android.a.syms b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.hwasan_cxx-x86_64-android.a.syms
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.hwasan_cxx-x86_64-android.a.syms
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.hwasan_cxx-x86_64-android.a.syms
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.lsan-aarch64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.lsan-aarch64-android.a
similarity index 86%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.lsan-aarch64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.lsan-aarch64-android.a
index f3572a5..6ec741b 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.lsan-aarch64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.lsan-aarch64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.lsan-arm-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.lsan-arm-android.a
similarity index 81%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.lsan-arm-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.lsan-arm-android.a
index 60a7dda..e138540 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.lsan-arm-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.lsan-arm-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.lsan-i686-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.lsan-i686-android.a
similarity index 84%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.lsan-i686-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.lsan-i686-android.a
index 1f1145c..5ec9f90 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.lsan-i686-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.lsan-i686-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.lsan-x86_64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.lsan-x86_64-android.a
similarity index 87%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.lsan-x86_64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.lsan-x86_64-android.a
index 278e1f5..b0c57cf 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.lsan-x86_64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.lsan-x86_64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.profile-aarch64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.profile-aarch64-android.a
similarity index 95%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.profile-aarch64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.profile-aarch64-android.a
index 6397ba3..e5dfad6 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.profile-aarch64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.profile-aarch64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.profile-arm-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.profile-arm-android.a
similarity index 69%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.profile-arm-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.profile-arm-android.a
index f4e53b0..7f9cbbf 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.profile-arm-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.profile-arm-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.profile-i686-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.profile-i686-android.a
similarity index 94%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.profile-i686-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.profile-i686-android.a
index 3ed2171..dce8c3f 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.profile-i686-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.profile-i686-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.profile-x86_64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.profile-x86_64-android.a
similarity index 95%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.profile-x86_64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.profile-x86_64-android.a
index f85cbee..d70c3c1 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.profile-x86_64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.profile-x86_64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo-aarch64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo-aarch64-android.a
similarity index 86%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo-aarch64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo-aarch64-android.a
index fab142d..eeedc9a 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo-aarch64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo-aarch64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo-aarch64-android.so b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo-aarch64-android.so
new file mode 100644
index 0000000..b080c50
--- /dev/null
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo-aarch64-android.so
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo-arm-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo-arm-android.a
similarity index 83%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo-arm-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo-arm-android.a
index fafd40b..f88bbeb 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo-arm-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo-arm-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo-arm-android.so b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo-arm-android.so
new file mode 100644
index 0000000..1cde28b
--- /dev/null
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo-arm-android.so
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo-i686-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo-i686-android.a
similarity index 80%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo-i686-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo-i686-android.a
index 51be181..57baae3 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo-i686-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo-i686-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo-i686-android.so b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo-i686-android.so
new file mode 100644
index 0000000..c0cee4f
--- /dev/null
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo-i686-android.so
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo-x86_64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo-x86_64-android.a
similarity index 88%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo-x86_64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo-x86_64-android.a
index c0e9fa2..c32b6f5 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo-x86_64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo-x86_64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo-x86_64-android.so b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo-x86_64-android.so
new file mode 100644
index 0000000..c14c9be
--- /dev/null
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo-x86_64-android.so
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_cxx-aarch64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_cxx-aarch64-android.a
similarity index 90%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_cxx-aarch64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_cxx-aarch64-android.a
index 97eb410..71572d4 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_cxx-aarch64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_cxx-aarch64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_cxx-arm-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_cxx-arm-android.a
similarity index 80%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_cxx-arm-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_cxx-arm-android.a
index b2c3ef4..d135e3c 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_cxx-arm-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_cxx-arm-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_cxx-i686-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_cxx-i686-android.a
similarity index 83%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_cxx-i686-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_cxx-i686-android.a
index 5702239..569ff5b 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_cxx-i686-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_cxx-i686-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_cxx-x86_64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_cxx-x86_64-android.a
similarity index 87%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_cxx-x86_64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_cxx-x86_64-android.a
index cda0006..8e991db 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_cxx-x86_64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_cxx-x86_64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_cxx_minimal-aarch64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_cxx_minimal-aarch64-android.a
similarity index 94%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_cxx_minimal-aarch64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_cxx_minimal-aarch64-android.a
index 11dff0b..66a8523 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_cxx_minimal-aarch64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_cxx_minimal-aarch64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_cxx_minimal-arm-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_cxx_minimal-arm-android.a
similarity index 89%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_cxx_minimal-arm-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_cxx_minimal-arm-android.a
index 5b21c40..551509a 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_cxx_minimal-arm-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_cxx_minimal-arm-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_cxx_minimal-i686-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_cxx_minimal-i686-android.a
similarity index 92%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_cxx_minimal-i686-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_cxx_minimal-i686-android.a
index f30f0bc..48e74b5 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_cxx_minimal-i686-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_cxx_minimal-i686-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_cxx_minimal-x86_64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_cxx_minimal-x86_64-android.a
similarity index 93%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_cxx_minimal-x86_64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_cxx_minimal-x86_64-android.a
index 04cfd71..830f42c 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_cxx_minimal-x86_64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_cxx_minimal-x86_64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_minimal-aarch64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_minimal-aarch64-android.a
similarity index 87%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_minimal-aarch64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_minimal-aarch64-android.a
index fb793a1..fb485f7 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_minimal-aarch64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_minimal-aarch64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_minimal-aarch64-android.so b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_minimal-aarch64-android.so
similarity index 88%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_minimal-aarch64-android.so
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_minimal-aarch64-android.so
index db0199b..2011994 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_minimal-aarch64-android.so
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_minimal-aarch64-android.so
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_minimal-arm-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_minimal-arm-android.a
similarity index 83%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_minimal-arm-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_minimal-arm-android.a
index aad603e..a8250dd 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_minimal-arm-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_minimal-arm-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_minimal-arm-android.so b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_minimal-arm-android.so
similarity index 88%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_minimal-arm-android.so
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_minimal-arm-android.so
index 7d737e2..10a624b 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_minimal-arm-android.so
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_minimal-arm-android.so
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_minimal-i686-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_minimal-i686-android.a
similarity index 86%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_minimal-i686-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_minimal-i686-android.a
index 3edd33b..b511b97 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_minimal-i686-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_minimal-i686-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_minimal-i686-android.so b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_minimal-i686-android.so
similarity index 88%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_minimal-i686-android.so
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_minimal-i686-android.so
index 56816ea..f344f8d 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_minimal-i686-android.so
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_minimal-i686-android.so
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_minimal-x86_64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_minimal-x86_64-android.a
similarity index 87%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_minimal-x86_64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_minimal-x86_64-android.a
index fd3bd5c..eecdafd 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_minimal-x86_64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_minimal-x86_64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_minimal-x86_64-android.so b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_minimal-x86_64-android.so
similarity index 88%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_minimal-x86_64-android.so
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_minimal-x86_64-android.so
index 7f1b0f6..79b602a 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.scudo_minimal-x86_64-android.so
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.scudo_minimal-x86_64-android.so
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.stats-aarch64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.stats-aarch64-android.a
similarity index 85%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.stats-aarch64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.stats-aarch64-android.a
index 5253fbb..0a6b9a0 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.stats-aarch64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.stats-aarch64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.stats-arm-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.stats-arm-android.a
similarity index 83%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.stats-arm-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.stats-arm-android.a
index d91f5d3..daaac08 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.stats-arm-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.stats-arm-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.stats-i686-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.stats-i686-android.a
similarity index 85%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.stats-i686-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.stats-i686-android.a
index b52d0db..e6e9568 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.stats-i686-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.stats-i686-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.stats-x86_64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.stats-x86_64-android.a
similarity index 87%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.stats-x86_64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.stats-x86_64-android.a
index 65532ba..a9ab558 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.stats-x86_64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.stats-x86_64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.stats_client-aarch64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.stats_client-aarch64-android.a
similarity index 64%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.stats_client-aarch64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.stats_client-aarch64-android.a
index 8c4b252..2d94dd3 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.stats_client-aarch64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.stats_client-aarch64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.stats_client-arm-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.stats_client-arm-android.a
similarity index 74%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.stats_client-arm-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.stats_client-arm-android.a
index 77dd61f..2a1e610 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.stats_client-arm-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.stats_client-arm-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.stats_client-i686-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.stats_client-i686-android.a
similarity index 78%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.stats_client-i686-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.stats_client-i686-android.a
index e136498..ac6ac5f 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.stats_client-i686-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.stats_client-i686-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.stats_client-x86_64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.stats_client-x86_64-android.a
similarity index 63%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.stats_client-x86_64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.stats_client-x86_64-android.a
index aea2ba2..8bf1dcd 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.stats_client-x86_64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.stats_client-x86_64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.tsan-aarch64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.tsan-aarch64-android.a
similarity index 91%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.tsan-aarch64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.tsan-aarch64-android.a
index 5de7f7b..d04a755 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.tsan-aarch64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.tsan-aarch64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.tsan-aarch64-android.a.syms b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.tsan-aarch64-android.a.syms
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.tsan-aarch64-android.a.syms
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.tsan-aarch64-android.a.syms
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.tsan-x86_64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.tsan-x86_64-android.a
similarity index 87%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.tsan-x86_64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.tsan-x86_64-android.a
index 9cbb80e..923ad37 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.tsan-x86_64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.tsan-x86_64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.tsan-x86_64-android.a.syms b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.tsan-x86_64-android.a.syms
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.tsan-x86_64-android.a.syms
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.tsan-x86_64-android.a.syms
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.tsan_cxx-aarch64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.tsan_cxx-aarch64-android.a
similarity index 90%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.tsan_cxx-aarch64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.tsan_cxx-aarch64-android.a
index 3285e75..a149a14 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.tsan_cxx-aarch64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.tsan_cxx-aarch64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.tsan_cxx-aarch64-android.a.syms b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.tsan_cxx-aarch64-android.a.syms
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.tsan_cxx-aarch64-android.a.syms
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.tsan_cxx-aarch64-android.a.syms
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.tsan_cxx-x86_64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.tsan_cxx-x86_64-android.a
similarity index 88%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.tsan_cxx-x86_64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.tsan_cxx-x86_64-android.a
index 954f82a..930901f 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.tsan_cxx-x86_64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.tsan_cxx-x86_64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.tsan_cxx-x86_64-android.a.syms b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.tsan_cxx-x86_64-android.a.syms
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.tsan_cxx-x86_64-android.a.syms
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.tsan_cxx-x86_64-android.a.syms
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_minimal-aarch64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_minimal-aarch64-android.a
similarity index 79%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_minimal-aarch64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_minimal-aarch64-android.a
index b4a6f52..fff8a48 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_minimal-aarch64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_minimal-aarch64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_minimal-aarch64-android.a.syms b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_minimal-aarch64-android.a.syms
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_minimal-aarch64-android.a.syms
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_minimal-aarch64-android.a.syms
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_minimal-aarch64-android.so b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_minimal-aarch64-android.so
similarity index 86%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_minimal-aarch64-android.so
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_minimal-aarch64-android.so
index 58abbd2..0a573cd 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_minimal-aarch64-android.so
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_minimal-aarch64-android.so
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_minimal-arm-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_minimal-arm-android.a
similarity index 69%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_minimal-arm-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_minimal-arm-android.a
index 942a3b1..71a924b 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_minimal-arm-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_minimal-arm-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_minimal-arm-android.a.syms b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_minimal-arm-android.a.syms
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_minimal-arm-android.a.syms
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_minimal-arm-android.a.syms
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_minimal-arm-android.so b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_minimal-arm-android.so
similarity index 81%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_minimal-arm-android.so
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_minimal-arm-android.so
index 88eac90..a5dcb3e 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_minimal-arm-android.so
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_minimal-arm-android.so
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_minimal-i686-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_minimal-i686-android.a
similarity index 69%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_minimal-i686-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_minimal-i686-android.a
index 5581476..ba8a4e7 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_minimal-i686-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_minimal-i686-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_minimal-i686-android.so b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_minimal-i686-android.so
similarity index 85%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_minimal-i686-android.so
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_minimal-i686-android.so
index 92aeef1..80675d9 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_minimal-i686-android.so
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_minimal-i686-android.so
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_minimal-x86_64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_minimal-x86_64-android.a
similarity index 78%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_minimal-x86_64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_minimal-x86_64-android.a
index 4c8d1c2..6935f18 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_minimal-x86_64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_minimal-x86_64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_minimal-x86_64-android.a.syms b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_minimal-x86_64-android.a.syms
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_minimal-x86_64-android.a.syms
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_minimal-x86_64-android.a.syms
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_minimal-x86_64-android.so b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_minimal-x86_64-android.so
similarity index 79%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_minimal-x86_64-android.so
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_minimal-x86_64-android.so
index 284fdf2..66242e2 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_minimal-x86_64-android.so
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_minimal-x86_64-android.so
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone-aarch64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone-aarch64-android.a
similarity index 86%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone-aarch64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone-aarch64-android.a
index b419cdd..62fcf05 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone-aarch64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone-aarch64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone-aarch64-android.a.syms b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone-aarch64-android.a.syms
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone-aarch64-android.a.syms
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone-aarch64-android.a.syms
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone-aarch64-android.so b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone-aarch64-android.so
similarity index 84%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone-aarch64-android.so
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone-aarch64-android.so
index c4a4d4d..ca57a3f 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone-aarch64-android.so
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone-aarch64-android.so
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone-arm-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone-arm-android.a
similarity index 82%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone-arm-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone-arm-android.a
index a50c9e4..dbcbf06 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone-arm-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone-arm-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone-arm-android.a.syms b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone-arm-android.a.syms
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone-arm-android.a.syms
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone-arm-android.a.syms
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone-arm-android.so b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone-arm-android.so
similarity index 75%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone-arm-android.so
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone-arm-android.so
index 847b279..167d18a 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone-arm-android.so
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone-arm-android.so
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone-i686-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone-i686-android.a
similarity index 84%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone-i686-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone-i686-android.a
index 196dd3d..21df01c 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone-i686-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone-i686-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone-i686-android.so b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone-i686-android.so
similarity index 81%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone-i686-android.so
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone-i686-android.so
index 6610ef6..056740c 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone-i686-android.so
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone-i686-android.so
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone-x86_64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone-x86_64-android.a
similarity index 84%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone-x86_64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone-x86_64-android.a
index 1db7611..0299ab3 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone-x86_64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone-x86_64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone-x86_64-android.a.syms b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone-x86_64-android.a.syms
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone-x86_64-android.a.syms
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone-x86_64-android.a.syms
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone-x86_64-android.so b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone-x86_64-android.so
similarity index 83%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone-x86_64-android.so
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone-x86_64-android.so
index 60d4be9..b23c33f 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone-x86_64-android.so
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone-x86_64-android.so
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone_cxx-aarch64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone_cxx-aarch64-android.a
similarity index 90%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone_cxx-aarch64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone_cxx-aarch64-android.a
index 3cecf18..1ce1b40 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone_cxx-aarch64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone_cxx-aarch64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone_cxx-aarch64-android.a.syms b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone_cxx-aarch64-android.a.syms
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone_cxx-aarch64-android.a.syms
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone_cxx-aarch64-android.a.syms
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone_cxx-arm-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone_cxx-arm-android.a
similarity index 78%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone_cxx-arm-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone_cxx-arm-android.a
index a85ee32..4ca1a20 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone_cxx-arm-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone_cxx-arm-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone_cxx-arm-android.a.syms b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone_cxx-arm-android.a.syms
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone_cxx-arm-android.a.syms
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone_cxx-arm-android.a.syms
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone_cxx-i686-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone_cxx-i686-android.a
similarity index 80%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone_cxx-i686-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone_cxx-i686-android.a
index cbd9a03..585e554 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone_cxx-i686-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone_cxx-i686-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone_cxx-x86_64-android.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone_cxx-x86_64-android.a
similarity index 86%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone_cxx-x86_64-android.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone_cxx-x86_64-android.a
index 428ea31..0db1b86 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone_cxx-x86_64-android.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone_cxx-x86_64-android.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone_cxx-x86_64-android.a.syms b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone_cxx-x86_64-android.a.syms
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/libclang_rt.ubsan_standalone_cxx-x86_64-android.a.syms
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/libclang_rt.ubsan_standalone_cxx-x86_64-android.a.syms
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/x86_64/libFuzzer.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/x86_64/libFuzzer.a
similarity index 91%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/x86_64/libFuzzer.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/x86_64/libFuzzer.a
index 89b3c9c..c6f0aec 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/x86_64/libFuzzer.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/x86_64/libFuzzer.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/x86_64/libatomic.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/x86_64/libatomic.a
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/x86_64/libatomic.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/x86_64/libatomic.a
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/x86_64/libomp.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/x86_64/libomp.a
similarity index 98%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/x86_64/libomp.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/x86_64/libomp.a
index cae9286..58c5b41 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/x86_64/libomp.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/x86_64/libomp.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/x86_64/libomp.so b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/x86_64/libomp.so
similarity index 99%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/x86_64/libomp.so
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/x86_64/libomp.so
index af73e3b..c0ff99d 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/x86_64/libomp.so
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/x86_64/libomp.so
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/x86_64/libunwind.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/x86_64/libunwind.a
similarity index 97%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/x86_64/libunwind.a
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/x86_64/libunwind.a
index c2e9f62..dd609b9 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/x86_64/libunwind.a
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/x86_64/libunwind.a
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/x86_64/lldb-server b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/x86_64/lldb-server
similarity index 97%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/x86_64/lldb-server
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/x86_64/lldb-server
index 114b27b..d54fec5 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/lib/linux/x86_64/lldb-server
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/lib/linux/x86_64/lldb-server
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/share/asan_blacklist.txt b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/share/asan_blacklist.txt
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/share/asan_blacklist.txt
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/share/asan_blacklist.txt
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/share/cfi_blacklist.txt b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/share/cfi_blacklist.txt
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/share/cfi_blacklist.txt
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/share/cfi_blacklist.txt
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/share/dfsan_abilist.txt b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/share/dfsan_abilist.txt
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/share/dfsan_abilist.txt
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/share/dfsan_abilist.txt
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/share/hwasan_blacklist.txt b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/share/hwasan_blacklist.txt
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/share/hwasan_blacklist.txt
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/share/hwasan_blacklist.txt
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/share/msan_blacklist.txt b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/share/msan_blacklist.txt
similarity index 100%
rename from toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.5/share/msan_blacklist.txt
rename to toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/12.0.8/share/msan_blacklist.txt
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libClangdXPCLib.dylib b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libClangdXPCLib.dylib
index 1779d41..ead52e7 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libClangdXPCLib.dylib
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libClangdXPCLib.dylib
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libLLVM.dylib b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libLLVM.dylib
index 1a7cba4..5ab3f93 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libLLVM.dylib
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libLLVM.dylib
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libLTO.dylib b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libLTO.dylib
index d6faf53..e82b7d0 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libLTO.dylib
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libLTO.dylib
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libRemarks.dylib b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libRemarks.dylib
index ad180f1..38f8235 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libRemarks.dylib
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libRemarks.dylib
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libc++.1.dylib b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libc++.1.dylib
index 6a27c34..d59d9e4 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libc++.1.dylib
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libc++.1.dylib
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libc++.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libc++.a
deleted file mode 100644
index 10074c1..0000000
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libc++.a
+++ /dev/null
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libc++abi.1.dylib b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libc++abi.1.dylib
index a114d9f..a3ad5fe 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libc++abi.1.dylib
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libc++abi.1.dylib
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libc++abi.a b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libc++abi.a
deleted file mode 100644
index eec28d3..0000000
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libc++abi.a
+++ /dev/null
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libclang-cpp.dylib b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libclang-cpp.dylib
index b12bd13..c2c19cb 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libclang-cpp.dylib
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libclang-cpp.dylib
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libclang.dylib b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libclang.dylib
index 57727a1..9443a69 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libclang.dylib
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libclang.dylib
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libclang_cxx.dylib b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libclang_cxx.dylib
index c9b0257..d6081c7 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libclang_cxx.dylib
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libclang_cxx.dylib
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libedit.0.dylib b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libedit.0.dylib
index 7441af4..61e5d98 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libedit.0.dylib
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libedit.0.dylib
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libform.6.dylib b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libform.6.dylib
index 868563e..bcf5ff8 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libform.6.dylib
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libform.6.dylib
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/liblldb.12.0.5git.dylib b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/liblldb.12.0.5git.dylib
deleted file mode 100755
index 90bad99..0000000
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/liblldb.12.0.5git.dylib
+++ /dev/null
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/liblldb.12.0.8git.dylib b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/liblldb.12.0.8git.dylib
new file mode 100755
index 0000000..1c17060
--- /dev/null
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/liblldb.12.0.8git.dylib
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/liblldb.dylib b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/liblldb.dylib
index 1861508..c96cb6b 120000
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/liblldb.dylib
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/liblldb.dylib
@@ -1 +1 @@
-liblldb.12.0.5git.dylib
\ No newline at end of file
+liblldb.12.0.8git.dylib
\ No newline at end of file
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libncurses.6.dylib b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libncurses.6.dylib
index 7b10407..911f60a 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libncurses.6.dylib
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libncurses.6.dylib
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libpanel.6.dylib b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libpanel.6.dylib
index ffba842..d837922 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libpanel.6.dylib
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libpanel.6.dylib
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libxml2.2.9.10.dylib b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libxml2.2.9.10.dylib
index 86a35cf..535df8e 100755
--- a/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libxml2.2.9.10.dylib
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libxml2.2.9.10.dylib
Binary files differ
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/manifest_7284624.xml b/toolchains/llvm/prebuilt/darwin-x86_64/manifest_7714059.xml
similarity index 89%
rename from toolchains/llvm/prebuilt/darwin-x86_64/manifest_7284624.xml
rename to toolchains/llvm/prebuilt/darwin-x86_64/manifest_7714059.xml
index 41b5015..14c6800 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/manifest_7284624.xml
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/manifest_7714059.xml
@@ -1,19 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
 <manifest>
-  <remote name="aosp" fetch="https://android-review.googlesource.com/" review="https://android-review.googlesource.com/" />
+  <remote name="aosp" fetch="https://android.googlesource.com/" review="https://android.googlesource.com/" />
 
-  <default revision="master" remote="aosp" />
+  <default revision="llvm-r416183" remote="aosp" sync-j="4" />
 
-  <project path="bionic" name="platform/bionic" revision="166efcb4960fe4752b1d8c331643e1fe3c732bb4" />
+  <project path="bionic" name="platform/bionic" revision="926ab6b50c079050be0f61d56c11fadea5cbe005" />
 
   <project path="toolchain/binutils" name="toolchain/binutils" revision="c19795e958ed532462948fd14b1bdfd4f6e96e03" />
 
   <project path="toolchain/llvm-project" name="toolchain/llvm-project" revision="c935d99d7cf2016289302412d708641d52d2f7ee" />
 
-  <project path="toolchain/llvm_android" name="toolchain/llvm_android" revision="07e984be2f6074fb044e0ae06b9027f350fe8844" />
+  <project path="toolchain/llvm_android" name="toolchain/llvm_android" revision="3b1cd92a292672cc2c13b032a660cb8e3be56ba6" />
 
-  <project path="external/toolchain-utils" name="platform/external/toolchain-utils" revision="f5cc9231be5ecd6d0159b352dfb014926bfa77e6" />
+  <project path="external/toolchain-utils" name="platform/external/toolchain-utils" revision="b56a2d502a4fa74f82ad763ada2b771d89c8a448" />
 
   <project path="prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" groups="pdk,darwin,arm" clone-depth="1" revision="292406b9ebb0f63243a87ee73077467a12d66ee1" />
 
@@ -29,7 +29,7 @@
 
   <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" clone-depth="1" revision="3e1d1fd459f5bb401479602c44448764f54ffe57" />
 
-  <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" clone-depth="1" revision="dfb6e9559b7cd76a5d5f4c9c0822ce1de470a1ff" />
+  <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" clone-depth="1" revision="4bda09b9d7a51e2ff2859ddabce16e9c6c680d36" />
 
   <project path="prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" clone-depth="1" revision="4db7b9b6b4d77549a6caffe5edfeef46d83ebc2b" />
 
@@ -51,7 +51,7 @@
 
   <project path="toolchain/xz" name="toolchain/xz" revision="47426872d1366c32538a8e9c8f559b03cb45b648" />
 
-  <project path="external/libxml2" name="platform/external/libxml2" revision="aa9baca6c580bbe229f169b40610e352ccaad9dc" />
+  <project path="external/libxml2" name="platform/external/libxml2" revision="5cfa742deb47c82ebb74de006f09b70c93d12c61" />
 
   <project path="external/libncurses" name="platform/external/ncurses" revision="34428ddf7f4f6a0af2285038ea1c9d9fcb108de9" />
 
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/NOTICE b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/NOTICE
index bad1949..f16b06b 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/NOTICE
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/NOTICE
@@ -896,22 +896,6 @@
 -------------------------------------------------------------------
 
 Copyright (C) 2021 The Android Open Source Project
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
--------------------------------------------------------------------
-
-Copyright (C) 2021 The Android Open Source Project
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/aarch64-linux-android/asm/kvm.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/aarch64-linux-android/asm/kvm.h
index 014504a..74aa7c6 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/aarch64-linux-android/asm/kvm.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/aarch64-linux-android/asm/kvm.h
@@ -115,6 +115,15 @@
   } exception;
   __u32 reserved[12];
 };
+struct kvm_arm_copy_mte_tags {
+  __u64 guest_ipa;
+  __u64 length;
+  void __user * addr;
+  __u64 flags;
+  __u64 reserved[2];
+};
+#define KVM_ARM_TAGS_TO_GUEST 0
+#define KVM_ARM_TAGS_FROM_GUEST 1
 #define KVM_REG_ARM_COPROC_MASK 0x000000000FFF0000
 #define KVM_REG_ARM_COPROC_SHIFT 16
 #define KVM_REG_ARM_CORE (0x0010 << KVM_REG_ARM_COPROC_SHIFT)
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/aarch64-linux-android/asm/unistd.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/aarch64-linux-android/asm/unistd.h
index e93f3f1..06b85ed 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/aarch64-linux-android/asm/unistd.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/aarch64-linux-android/asm/unistd.h
@@ -21,4 +21,5 @@
 #define __ARCH_WANT_SET_GET_RLIMIT
 #define __ARCH_WANT_TIME32_SYSCALLS
 #define __ARCH_WANT_SYS_CLONE3
+#define __ARCH_WANT_MEMFD_SECRET
 #include <asm-generic/unistd.h>
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/android/NeuralNetworks.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/android/NeuralNetworks.h
index a6a10d0..1f9583e 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/android/NeuralNetworks.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/android/NeuralNetworks.h
@@ -42,7 +42,6 @@
  *   - DO NOT CHANGE THE LAYOUT OR SIZE OF STRUCTURES
  */
 
-#include <android/hardware_buffer.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
@@ -50,6 +49,10 @@
 
 #include "NeuralNetworksTypes.h"
 
+#ifdef __ANDROID__
+#include <android/hardware_buffer.h>
+#endif  // __ANDROID__
+
 // This is required for building libneuralnetworks_cl,
 // the symbols have same names as in NDK, but
 // they are not bounded by API availability.
@@ -756,9 +759,11 @@
  *
  * @see AHardwareBuffer
  */
+#ifdef __ANDROID__
 int ANeuralNetworksMemory_createFromAHardwareBuffer(const AHardwareBuffer* ahwb,
                                                     ANeuralNetworksMemory** memory)
         __NNAPI_INTRODUCED_IN(29);
+#endif  // __ANDROID__
 
 /**
 
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/android/NeuralNetworksTypes.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/android/NeuralNetworksTypes.h
index 5edf942..7823384 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/android/NeuralNetworksTypes.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/android/NeuralNetworksTypes.h
@@ -42,12 +42,15 @@
  *   - DO NOT CHANGE THE LAYOUT OR SIZE OF STRUCTURES
  */
 
-#include <android/hardware_buffer.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <sys/cdefs.h>
 
+#ifdef __ANDROID__
+#include <android/hardware_buffer.h>
+#endif  // __ANDROID__
+
 __BEGIN_DECLS
 
 /**
@@ -194,7 +197,6 @@
      * Available since NNAPI feature level 4.
      */
     ANEURALNETWORKS_TENSOR_QUANT8_ASYMM_SIGNED = 14,
-
     /**
      * A reference to a model.
      *
@@ -5578,7 +5580,7 @@
      * The output is calculated using the following formula:
      *
      *     h-swish(x) = x * max(0, min(6, (x + 3))) / 6
-
+     *
      * Supported tensor {@link OperandCode}:
      * * {@link ANEURALNETWORKS_TENSOR_FLOAT16}
      * * {@link ANEURALNETWORKS_TENSOR_FLOAT32}
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/android/api-level.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/android/api-level.h
index c1f394d..e80b08a 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/android/api-level.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/android/api-level.h
@@ -151,6 +151,9 @@
 /** Names the "S" API level (31), for comparison against `__ANDROID_API__`. */
 #define __ANDROID_API_S__ 31
 
+/** Names the "T" API level (33), for comparison against `__ANDROID_API__`. */
+#define __ANDROID_API_T__ 33
+
 /* This file is included in <features.h>, and might be used from .S files. */
 #if !defined(__ASSEMBLY__)
 
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/android/binder_ibinder.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/android/binder_ibinder.h
index 78f2d3a..b881c2c 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/android/binder_ibinder.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/android/binder_ibinder.h
@@ -219,6 +219,21 @@
 void AIBinder_Class_setOnDump(AIBinder_Class* clazz, AIBinder_onDump onDump) __INTRODUCED_IN(29);
 
 /**
+ * This tells users of this class not to use a transaction header. By default, libbinder_ndk users
+ * read/write transaction headers implicitly (in the SDK, this must be manually written by
+ * android.os.Parcel#writeInterfaceToken, and it is read/checked with
+ * android.os.Parcel#enforceInterface). This method is provided in order to talk to legacy code
+ * which does not write an interface token. When this is disabled, type safety is reduced, so you
+ * must have a separate way of determining the binder you are talking to is the right type. Must
+ * be called before any instance of the class is created.
+ *
+ * Available since API level 33.
+ *
+ * \param clazz class to disable interface header on.
+ */
+void AIBinder_Class_disableInterfaceTokenHeader(AIBinder_Class* clazz) __INTRODUCED_IN(33);
+
+/**
  * Creates a new binder object of the appropriate class.
  *
  * Ownership of args is passed to this object. The lifecycle is implemented with AIBinder_incStrong
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/android/binder_interface_utils.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/android/binder_interface_utils.h
index 6c44726..5de64f8 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/android/binder_interface_utils.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/android/binder_interface_utils.h
@@ -55,6 +55,12 @@
         std::call_once(mFlagThis, [&]() {
             __assert(__FILE__, __LINE__, "SharedRefBase: no ref created during lifetime");
         });
+
+        if (ref() != nullptr) {
+            __assert(__FILE__, __LINE__,
+                     "SharedRefBase: destructed but still able to lock weak_ptr. Is this object "
+                     "double-owned?");
+        }
     }
 
     /**
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/android/binder_parcel.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/android/binder_parcel.h
index 527b151..a2f5c93 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/android/binder_parcel.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/android/binder_parcel.h
@@ -1163,6 +1163,41 @@
  * \return A parcel which is not related to any IBinder objects.
  */
 AParcel* AParcel_create() __INTRODUCED_IN(31);
+
+/**
+ * Marshals the raw bytes of the Parcel to a buffer.
+ *
+ * The parcel must not contain any binders or file descriptors.
+ *
+ * The data you retrieve here must not be placed in any kind of persistent storage. (on local disk,
+ * across a network, etc). For that, you should use standard serialization or another kind of
+ * general serialization mechanism. The Parcel marshalled representation is highly optimized for
+ * local IPC, and as such does not attempt to maintain compatibility with data created in different
+ * versions of the platform.
+ *
+ * \param parcel The parcel of which to get the data.
+ * \param buffer The buffer to copy the raw bytes to.
+ * \param start The start position in the buffer to copy from.
+ * \param len The size of the data to copy, buffer size must be larger or equal to this.
+ *
+ * \return STATUS_OK on success, STATUS_INVALID_OPERATION if parcel contains binders or file
+ * descriptors. STATUS_BAD_VALUE if the buffer size is less than parcel size.
+ */
+binder_status_t AParcel_marshal(const AParcel* parcel, uint8_t* buffer, size_t start, size_t len)
+        __INTRODUCED_IN(33);
+
+/**
+ * Set the data in the parcel to the raw bytes from the buffer.
+ *
+ * \param parcel The parcel to set data.
+ * \param buffer The data buffer to set.
+ * \param len The size of the data to set.
+ *
+ * \return STATUS_OK on success.
+ */
+binder_status_t AParcel_unmarshal(AParcel* parcel, const uint8_t* buffer, size_t len)
+        __INTRODUCED_IN(33);
+
 __END_DECLS
 
 /** @} */
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/android/binder_parcel_utils.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/android/binder_parcel_utils.h
index 5092d87..563d011 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/android/binder_parcel_utils.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/android/binder_parcel_utils.h
@@ -469,6 +469,22 @@
 }
 
 /**
+ * Convenience API for writing a nullable parcelable.
+ */
+template <typename P>
+static inline binder_status_t AParcel_writeNullableParcelable(AParcel* parcel,
+                                                              const std::unique_ptr<P>& p) {
+    if (!p) {
+        return AParcel_writeInt32(parcel, 0);  // null
+    }
+    binder_status_t status = AParcel_writeInt32(parcel, 1);  // non-null
+    if (status != STATUS_OK) {
+        return status;
+    }
+    return p->writeToParcel(parcel);
+}
+
+/**
  * Convenience API for reading a nullable parcelable.
  */
 template <typename P>
@@ -488,6 +504,25 @@
 }
 
 /**
+ * Convenience API for reading a nullable parcelable.
+ */
+template <typename P>
+static inline binder_status_t AParcel_readNullableParcelable(const AParcel* parcel,
+                                                             std::unique_ptr<P>* p) {
+    int32_t null;
+    binder_status_t status = AParcel_readInt32(parcel, &null);
+    if (status != STATUS_OK) {
+        return status;
+    }
+    if (null == 0) {
+        p->reset();
+        return STATUS_OK;
+    }
+    *p = std::make_unique<P>();
+    return (*p)->readFromParcel(parcel);
+}
+
+/**
  * Writes a parcelable object of type P inside a std::vector<P> at index 'index' to 'parcel'.
  */
 template <typename P>
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/android/input.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/android/input.h
index bb98beb..7642215 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/android/input.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/android/input.h
@@ -947,9 +947,10 @@
  * and {@link AMotionEvent_fromJava()}.
  * After returning, the specified AInputEvent* object becomes invalid and should no longer be used.
  * The underlying Java object remains valid and does not change its state.
+ *
+ * Available since API level 31.
  */
-
-void AInputEvent_release(const AInputEvent* event);
+void AInputEvent_release(const AInputEvent* event) __INTRODUCED_IN(31);
 
 /*** Accessors for key events only. ***/
 
@@ -1001,8 +1002,10 @@
  * Creates a native AInputEvent* object that is a copy of the specified Java android.view.KeyEvent.
  * The result may be used with generic and KeyEvent-specific AInputEvent_* functions. The object
  * returned by this function must be disposed using {@link AInputEvent_release()}.
+ *
+ * Available since API level 31.
  */
-const AInputEvent* AKeyEvent_fromJava(JNIEnv* env, jobject keyEvent);
+const AInputEvent* AKeyEvent_fromJava(JNIEnv* env, jobject keyEvent) __INTRODUCED_IN(31);
 
 /*** Accessors for motion events only. ***/
 
@@ -1324,8 +1327,10 @@
  * android.view.MotionEvent. The result may be used with generic and MotionEvent-specific
  * AInputEvent_* functions. The object returned by this function must be disposed using
  * {@link AInputEvent_release()}.
+ *
+ * Available since API level 31.
  */
-const AInputEvent* AMotionEvent_fromJava(JNIEnv* env, jobject motionEvent);
+const AInputEvent* AMotionEvent_fromJava(JNIEnv* env, jobject motionEvent) __INTRODUCED_IN(31);
 
 struct AInputQueue;
 /**
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/android/ndk-version.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/android/ndk-version.h
index c0a6ad6..f4cf92f 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/android/ndk-version.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/android/ndk-version.h
@@ -18,7 +18,7 @@
  *
  * For example: 0 for r16 and 1 for r16b.
  */
-#define __NDK_MINOR__ 0
+#define __NDK_MINOR__ 1
 
 /**
  * Set to 0 if this is a release build, or 1 for beta 1,
@@ -31,7 +31,7 @@
  *
  * For a local development build of the NDK, this is -1.
  */
-#define __NDK_BUILD__ 7599858
+#define __NDK_BUILD__ 7779620
 
 /**
  * Set to 1 if this is a canary build, 0 if not.
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/arm-linux-androideabi/asm/unistd-eabi.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/arm-linux-androideabi/asm/unistd-eabi.h
index 9be294b..b49f72f 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/arm-linux-androideabi/asm/unistd-eabi.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/arm-linux-androideabi/asm/unistd-eabi.h
@@ -414,6 +414,7 @@
 #define __NR_process_madvise (__NR_SYSCALL_BASE + 440)
 #define __NR_epoll_pwait2 (__NR_SYSCALL_BASE + 441)
 #define __NR_mount_setattr (__NR_SYSCALL_BASE + 442)
+#define __NR_quotactl_fd (__NR_SYSCALL_BASE + 443)
 #define __NR_landlock_create_ruleset (__NR_SYSCALL_BASE + 444)
 #define __NR_landlock_add_rule (__NR_SYSCALL_BASE + 445)
 #define __NR_landlock_restrict_self (__NR_SYSCALL_BASE + 446)
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/arm-linux-androideabi/asm/unistd-oabi.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/arm-linux-androideabi/asm/unistd-oabi.h
index 499377e..2e8769d 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/arm-linux-androideabi/asm/unistd-oabi.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/arm-linux-androideabi/asm/unistd-oabi.h
@@ -426,6 +426,7 @@
 #define __NR_process_madvise (__NR_SYSCALL_BASE + 440)
 #define __NR_epoll_pwait2 (__NR_SYSCALL_BASE + 441)
 #define __NR_mount_setattr (__NR_SYSCALL_BASE + 442)
+#define __NR_quotactl_fd (__NR_SYSCALL_BASE + 443)
 #define __NR_landlock_create_ruleset (__NR_SYSCALL_BASE + 444)
 #define __NR_landlock_add_rule (__NR_SYSCALL_BASE + 445)
 #define __NR_landlock_restrict_self (__NR_SYSCALL_BASE + 446)
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/asm-generic/mman-common.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/asm-generic/mman-common.h
index a088ce5..9440576 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/asm-generic/mman-common.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/asm-generic/mman-common.h
@@ -60,6 +60,8 @@
 #define MADV_KEEPONFORK 19
 #define MADV_COLD 20
 #define MADV_PAGEOUT 21
+#define MADV_POPULATE_READ 22
+#define MADV_POPULATE_WRITE 23
 #define MAP_FILE 0
 #define PKEY_DISABLE_ACCESS 0x1
 #define PKEY_DISABLE_WRITE 0x2
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/asm-generic/socket.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/asm-generic/socket.h
index 7372be8..9ee2ada 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/asm-generic/socket.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/asm-generic/socket.h
@@ -97,6 +97,7 @@
 #define SO_DETACH_REUSEPORT_BPF 68
 #define SO_PREFER_BUSY_POLL 69
 #define SO_BUSY_POLL_BUDGET 70
+#define SO_NETNS_COOKIE 71
 #if __BITS_PER_LONG == 64 || defined(__x86_64__) && defined(__ILP32__)
 #define SO_TIMESTAMP SO_TIMESTAMP_OLD
 #define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/asm-generic/unistd.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/asm-generic/unistd.h
index 648099b..ff41c68 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/asm-generic/unistd.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/asm-generic/unistd.h
@@ -403,11 +403,15 @@
 #define __NR_process_madvise 440
 #define __NR_epoll_pwait2 441
 #define __NR_mount_setattr 442
+#define __NR_quotactl_fd 443
 #define __NR_landlock_create_ruleset 444
 #define __NR_landlock_add_rule 445
 #define __NR_landlock_restrict_self 446
+#ifdef __ARCH_WANT_MEMFD_SECRET
+#define __NR_memfd_secret 447
+#endif
 #undef __NR_syscalls
-#define __NR_syscalls 447
+#define __NR_syscalls 448
 #if __BITS_PER_LONG == 64 && !defined(__SYSCALL_COMPAT)
 #define __NR_fcntl __NR3264_fcntl
 #define __NR_statfs __NR3264_statfs
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/bits/glibc-syscalls.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/bits/glibc-syscalls.h
index 4e5bdc0..9b9a119 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/bits/glibc-syscalls.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/bits/glibc-syscalls.h
@@ -576,6 +576,9 @@
 #if defined(__NR_memfd_create)
   #define SYS_memfd_create __NR_memfd_create
 #endif
+#if defined(__NR_memfd_secret)
+  #define SYS_memfd_secret __NR_memfd_secret
+#endif
 #if defined(__NR_migrate_pages)
   #define SYS_migrate_pages __NR_migrate_pages
 #endif
@@ -837,6 +840,9 @@
 #if defined(__NR_quotactl)
   #define SYS_quotactl __NR_quotactl
 #endif
+#if defined(__NR_quotactl_fd)
+  #define SYS_quotactl_fd __NR_quotactl_fd
+#endif
 #if defined(__NR_read)
   #define SYS_read __NR_read
 #endif
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/camera/NdkCameraMetadataTags.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/camera/NdkCameraMetadataTags.h
index 52cd4b4..86781e5 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/camera/NdkCameraMetadataTags.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/camera/NdkCameraMetadataTags.h
@@ -9005,7 +9005,12 @@
      * <code>android.scaler.streamConfigurationMap</code> describes the streams supported in 'default'
      * mode.
      * The stream configurations supported in 'max resolution' mode are described by
-     * <code>android.scaler.streamConfigurationMapMaximumResolution</code>.</p>
+     * <code>android.scaler.streamConfigurationMapMaximumResolution</code>.
+     * The maximum resolution mode pixel array size of a camera device
+     * (<code>ACAMERA_SENSOR_INFO_PIXEL_ARRAY_SIZE</code>) with this capability,
+     * will be at least 24 megapixels.</p>
+     *
+     * @see ACAMERA_SENSOR_INFO_PIXEL_ARRAY_SIZE
      */
     ACAMERA_REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR
                                                                       = 16,
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/drm/amdgpu_drm.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/drm/amdgpu_drm.h
index 09a9ea2..6f74fa3 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/drm/amdgpu_drm.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/drm/amdgpu_drm.h
@@ -65,13 +65,13 @@
 #define AMDGPU_GEM_CREATE_NO_CPU_ACCESS (1 << 1)
 #define AMDGPU_GEM_CREATE_CPU_GTT_USWC (1 << 2)
 #define AMDGPU_GEM_CREATE_VRAM_CLEARED (1 << 3)
-#define AMDGPU_GEM_CREATE_SHADOW (1 << 4)
 #define AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS (1 << 5)
 #define AMDGPU_GEM_CREATE_VM_ALWAYS_VALID (1 << 6)
 #define AMDGPU_GEM_CREATE_EXPLICIT_SYNC (1 << 7)
 #define AMDGPU_GEM_CREATE_CP_MQD_GFX9 (1 << 8)
 #define AMDGPU_GEM_CREATE_VRAM_WIPE_ON_RELEASE (1 << 9)
 #define AMDGPU_GEM_CREATE_ENCRYPTED (1 << 10)
+#define AMDGPU_GEM_CREATE_PREEMPTIBLE (1 << 11)
 struct drm_amdgpu_gem_create_in {
   __u64 bo_size;
   __u64 alignment;
@@ -452,6 +452,7 @@
 #define AMDGPU_INFO_VBIOS 0x1B
 #define AMDGPU_INFO_VBIOS_SIZE 0x1
 #define AMDGPU_INFO_VBIOS_IMAGE 0x2
+#define AMDGPU_INFO_VBIOS_INFO 0x3
 #define AMDGPU_INFO_NUM_HANDLES 0x1C
 #define AMDGPU_INFO_SENSOR 0x1D
 #define AMDGPU_INFO_SENSOR_GFX_SCLK 0x1
@@ -555,6 +556,14 @@
   __u32 ver;
   __u32 feature;
 };
+struct drm_amdgpu_info_vbios {
+  __u8 name[64];
+  __u8 vbios_pn[64];
+  __u32 version;
+  __u32 pad;
+  __u8 vbios_ver_str[32];
+  __u8 date[32];
+};
 #define AMDGPU_VRAM_TYPE_UNKNOWN 0
 #define AMDGPU_VRAM_TYPE_GDDR1 1
 #define AMDGPU_VRAM_TYPE_DDR2 2
@@ -672,6 +681,7 @@
 #define AMDGPU_FAMILY_RV 142
 #define AMDGPU_FAMILY_NV 143
 #define AMDGPU_FAMILY_VGH 144
+#define AMDGPU_FAMILY_YC 146
 #ifdef __cplusplus
 }
 #endif
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/drm/drm_fourcc.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/drm/drm_fourcc.h
index 4574c1c..099791c 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/drm/drm_fourcc.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/drm/drm_fourcc.h
@@ -70,6 +70,10 @@
 #define DRM_FORMAT_ABGR2101010 fourcc_code('A', 'B', '3', '0')
 #define DRM_FORMAT_RGBA1010102 fourcc_code('R', 'A', '3', '0')
 #define DRM_FORMAT_BGRA1010102 fourcc_code('B', 'A', '3', '0')
+#define DRM_FORMAT_XRGB16161616 fourcc_code('X', 'R', '4', '8')
+#define DRM_FORMAT_XBGR16161616 fourcc_code('X', 'B', '4', '8')
+#define DRM_FORMAT_ARGB16161616 fourcc_code('A', 'R', '4', '8')
+#define DRM_FORMAT_ABGR16161616 fourcc_code('A', 'B', '4', '8')
 #define DRM_FORMAT_XRGB16161616F fourcc_code('X', 'R', '4', 'H')
 #define DRM_FORMAT_XBGR16161616F fourcc_code('X', 'B', '4', 'H')
 #define DRM_FORMAT_ARGB16161616F fourcc_code('A', 'R', '4', 'H')
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/drm/etnaviv_drm.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/drm/etnaviv_drm.h
index c92d110..7f8d5fa 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/drm/etnaviv_drm.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/drm/etnaviv_drm.h
@@ -53,6 +53,9 @@
 #define ETNAVIV_PARAM_GPU_NUM_CONSTANTS 0x19
 #define ETNAVIV_PARAM_GPU_NUM_VARYINGS 0x1a
 #define ETNAVIV_PARAM_SOFTPIN_START_ADDR 0x1b
+#define ETNAVIV_PARAM_GPU_PRODUCT_ID 0x1c
+#define ETNAVIV_PARAM_GPU_CUSTOMER_ID 0x1d
+#define ETNAVIV_PARAM_GPU_ECO_ID 0x1e
 #define ETNA_MAX_PIPES 4
 struct drm_etnaviv_param {
   __u32 pipe;
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/drm/i915_drm.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/drm/i915_drm.h
index f265d92..225c1da 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/drm/i915_drm.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/drm/i915_drm.h
@@ -217,6 +217,7 @@
 #define DRM_I915_QUERY 0x39
 #define DRM_I915_GEM_VM_CREATE 0x3a
 #define DRM_I915_GEM_VM_DESTROY 0x3b
+#define DRM_I915_GEM_CREATE_EXT 0x3c
 #define DRM_IOCTL_I915_INIT DRM_IOW(DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t)
 #define DRM_IOCTL_I915_FLUSH DRM_IO(DRM_COMMAND_BASE + DRM_I915_FLUSH)
 #define DRM_IOCTL_I915_FLIP DRM_IO(DRM_COMMAND_BASE + DRM_I915_FLIP)
@@ -247,6 +248,7 @@
 #define DRM_IOCTL_I915_GEM_ENTERVT DRM_IO(DRM_COMMAND_BASE + DRM_I915_GEM_ENTERVT)
 #define DRM_IOCTL_I915_GEM_LEAVEVT DRM_IO(DRM_COMMAND_BASE + DRM_I915_GEM_LEAVEVT)
 #define DRM_IOCTL_I915_GEM_CREATE DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_CREATE, struct drm_i915_gem_create)
+#define DRM_IOCTL_I915_GEM_CREATE_EXT DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_CREATE_EXT, struct drm_i915_gem_create_ext)
 #define DRM_IOCTL_I915_GEM_PREAD DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_PREAD, struct drm_i915_gem_pread)
 #define DRM_IOCTL_I915_GEM_PWRITE DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_PWRITE, struct drm_i915_gem_pwrite)
 #define DRM_IOCTL_I915_GEM_MMAP DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP, struct drm_i915_gem_mmap)
@@ -886,6 +888,7 @@
 #define DRM_I915_QUERY_TOPOLOGY_INFO 1
 #define DRM_I915_QUERY_ENGINE_INFO 2
 #define DRM_I915_QUERY_PERF_CONFIG 3
+#define DRM_I915_QUERY_MEMORY_REGIONS 4
   __s32 length;
   __u32 flags;
 #define DRM_I915_QUERY_PERF_CONFIG_LIST 1
@@ -932,6 +935,39 @@
   __u32 flags;
   __u8 data[];
 };
+enum drm_i915_gem_memory_class {
+  I915_MEMORY_CLASS_SYSTEM = 0,
+  I915_MEMORY_CLASS_DEVICE,
+};
+struct drm_i915_gem_memory_class_instance {
+  __u16 memory_class;
+  __u16 memory_instance;
+};
+struct drm_i915_memory_region_info {
+  struct drm_i915_gem_memory_class_instance region;
+  __u32 rsvd0;
+  __u64 probed_size;
+  __u64 unallocated_size;
+  __u64 rsvd1[8];
+};
+struct drm_i915_query_memory_regions {
+  __u32 num_regions;
+  __u32 rsvd[3];
+  struct drm_i915_memory_region_info regions[];
+};
+struct drm_i915_gem_create_ext {
+  __u64 size;
+  __u32 handle;
+  __u32 flags;
+#define I915_GEM_CREATE_EXT_MEMORY_REGIONS 0
+  __u64 extensions;
+};
+struct drm_i915_gem_create_ext_memory_regions {
+  struct i915_user_extension base;
+  __u32 pad;
+  __u32 num_regions;
+  __u64 regions;
+};
 #ifdef __cplusplus
 }
 #endif
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/drm/msm_drm.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/drm/msm_drm.h
index 189c291..5aabc18 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/drm/msm_drm.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/drm/msm_drm.h
@@ -54,7 +54,8 @@
 #define MSM_BO_CACHED 0x00010000
 #define MSM_BO_WC 0x00020000
 #define MSM_BO_UNCACHED 0x00040000
-#define MSM_BO_FLAGS (MSM_BO_SCANOUT | MSM_BO_GPU_READONLY | MSM_BO_CACHED | MSM_BO_WC | MSM_BO_UNCACHED)
+#define MSM_BO_CACHED_COHERENT 0x080000
+#define MSM_BO_FLAGS (MSM_BO_SCANOUT | MSM_BO_GPU_READONLY | MSM_BO_CACHE_MASK)
 struct drm_msm_gem_new {
   __u64 size;
   __u32 flags;
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/drm/panfrost_drm.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/drm/panfrost_drm.h
index f8b8aa1..1f4473d 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/drm/panfrost_drm.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/drm/panfrost_drm.h
@@ -110,6 +110,7 @@
   DRM_PANFROST_PARAM_JS_FEATURES15,
   DRM_PANFROST_PARAM_NR_CORE_GROUPS,
   DRM_PANFROST_PARAM_THREAD_TLS_ALLOC,
+  DRM_PANFROST_PARAM_AFBC_FEATURES,
 };
 struct drm_panfrost_get_param {
   __u32 param;
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/i686-linux-android/asm/auxvec.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/i686-linux-android/asm/auxvec.h
index 4fd53f0..dd86783 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/i686-linux-android/asm/auxvec.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/i686-linux-android/asm/auxvec.h
@@ -22,5 +22,5 @@
 #define AT_SYSINFO 32
 #endif
 #define AT_SYSINFO_EHDR 33
-#define AT_VECTOR_SIZE_ARCH 2
+#define AT_VECTOR_SIZE_ARCH 3
 #endif
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/i686-linux-android/asm/hwcap2.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/i686-linux-android/asm/hwcap2.h
index a6dbfb9..9f715c9 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/i686-linux-android/asm/hwcap2.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/i686-linux-android/asm/hwcap2.h
@@ -18,6 +18,7 @@
  ****************************************************************************/
 #ifndef _ASM_X86_HWCAP2_H
 #define _ASM_X86_HWCAP2_H
-#define HWCAP2_RING3MWAIT (1 << 0)
-#define HWCAP2_FSGSBASE BIT(1)
+#include <linux/const.h>
+#define HWCAP2_RING3MWAIT _BITUL(0)
+#define HWCAP2_FSGSBASE _BITUL(1)
 #endif
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/i686-linux-android/asm/kvm.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/i686-linux-android/asm/kvm.h
index 313fe23..4eb8901 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/i686-linux-android/asm/kvm.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/i686-linux-android/asm/kvm.h
@@ -146,6 +146,17 @@
   __u64 apic_base;
   __u64 interrupt_bitmap[(KVM_NR_INTERRUPTS + 63) / 64];
 };
+struct kvm_sregs2 {
+  struct kvm_segment cs, ds, es, fs, gs, ss;
+  struct kvm_segment tr, ldt;
+  struct kvm_dtable gdt, idt;
+  __u64 cr0, cr2, cr3, cr4, cr8;
+  __u64 efer;
+  __u64 apic_base;
+  __u64 flags;
+  __u64 pdptrs[4];
+};
+#define KVM_SREGS2_FLAGS_PDPTRS_VALID 1
 struct kvm_fpu {
   __u8 fpr[8][16];
   __u16 fcw;
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/i686-linux-android/asm/kvm_para.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/i686-linux-android/asm/kvm_para.h
index 091fb27..4407a85 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/i686-linux-android/asm/kvm_para.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/i686-linux-android/asm/kvm_para.h
@@ -36,6 +36,8 @@
 #define KVM_FEATURE_PV_SCHED_YIELD 13
 #define KVM_FEATURE_ASYNC_PF_INT 14
 #define KVM_FEATURE_MSI_EXT_DEST_ID 15
+#define KVM_FEATURE_HC_MAP_GPA_RANGE 16
+#define KVM_FEATURE_MIGRATION_CONTROL 17
 #define KVM_HINTS_REALTIME 0
 #define KVM_FEATURE_CLOCKSOURCE_STABLE_BIT 24
 #define MSR_KVM_WALL_CLOCK 0x11
@@ -49,6 +51,7 @@
 #define MSR_KVM_POLL_CONTROL 0x4b564d05
 #define MSR_KVM_ASYNC_PF_INT 0x4b564d06
 #define MSR_KVM_ASYNC_PF_ACK 0x4b564d07
+#define MSR_KVM_MIGRATION_CONTROL 0x4b564d08
 struct kvm_steal_time {
   __u64 steal;
   __u32 version;
@@ -76,6 +79,13 @@
 #define KVM_ASYNC_PF_DELIVERY_AS_PF_VMEXIT (1 << 2)
 #define KVM_ASYNC_PF_DELIVERY_AS_INT (1 << 3)
 #define KVM_ASYNC_PF_VEC_MASK GENMASK(7, 0)
+#define KVM_MIGRATION_READY (1 << 0)
+#define KVM_MAP_GPA_RANGE_PAGE_SZ_4K 0
+#define KVM_MAP_GPA_RANGE_PAGE_SZ_2M (1 << 0)
+#define KVM_MAP_GPA_RANGE_PAGE_SZ_1G (1 << 1)
+#define KVM_MAP_GPA_RANGE_ENC_STAT(n) (n << 4)
+#define KVM_MAP_GPA_RANGE_ENCRYPTED KVM_MAP_GPA_RANGE_ENC_STAT(1)
+#define KVM_MAP_GPA_RANGE_DECRYPTED KVM_MAP_GPA_RANGE_ENC_STAT(0)
 #define KVM_MMU_OP_WRITE_PTE 1
 #define KVM_MMU_OP_FLUSH_TLB 2
 #define KVM_MMU_OP_RELEASE_PT 3
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/i686-linux-android/asm/svm.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/i686-linux-android/asm/svm.h
index db9918b..d051481 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/i686-linux-android/asm/svm.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/i686-linux-android/asm/svm.h
@@ -123,6 +123,7 @@
 #define SVM_VMGEXIT_SET_AP_JUMP_TABLE 0
 #define SVM_VMGEXIT_GET_AP_JUMP_TABLE 1
 #define SVM_VMGEXIT_UNSUPPORTED_EVENT 0x8000ffff
+#define SVM_EXIT_SW 0xf0000000
 #define SVM_EXIT_ERR - 1
 #define SVM_EXIT_REASONS { SVM_EXIT_READ_CR0, "read_cr0" }, { SVM_EXIT_READ_CR2, "read_cr2" }, { SVM_EXIT_READ_CR3, "read_cr3" }, { SVM_EXIT_READ_CR4, "read_cr4" }, { SVM_EXIT_READ_CR8, "read_cr8" }, { SVM_EXIT_WRITE_CR0, "write_cr0" }, { SVM_EXIT_WRITE_CR2, "write_cr2" }, { SVM_EXIT_WRITE_CR3, "write_cr3" }, { SVM_EXIT_WRITE_CR4, "write_cr4" }, { SVM_EXIT_WRITE_CR8, "write_cr8" }, { SVM_EXIT_READ_DR0, "read_dr0" }, { SVM_EXIT_READ_DR1, "read_dr1" }, { SVM_EXIT_READ_DR2, "read_dr2" }, { SVM_EXIT_READ_DR3, "read_dr3" }, { SVM_EXIT_READ_DR4, "read_dr4" }, { SVM_EXIT_READ_DR5, "read_dr5" }, { SVM_EXIT_READ_DR6, "read_dr6" }, { SVM_EXIT_READ_DR7, "read_dr7" }, { SVM_EXIT_WRITE_DR0, "write_dr0" }, { SVM_EXIT_WRITE_DR1, "write_dr1" }, { SVM_EXIT_WRITE_DR2, "write_dr2" }, { SVM_EXIT_WRITE_DR3, "write_dr3" }, { SVM_EXIT_WRITE_DR4, "write_dr4" }, { SVM_EXIT_WRITE_DR5, "write_dr5" }, { SVM_EXIT_WRITE_DR6, "write_dr6" }, { SVM_EXIT_WRITE_DR7, "write_dr7" }, { SVM_EXIT_EXCP_BASE + DE_VECTOR, "DE excp" }, { SVM_EXIT_EXCP_BASE + DB_VECTOR, "DB excp" }, { SVM_EXIT_EXCP_BASE + BP_VECTOR, "BP excp" }, { SVM_EXIT_EXCP_BASE + OF_VECTOR, "OF excp" }, { SVM_EXIT_EXCP_BASE + BR_VECTOR, "BR excp" }, { SVM_EXIT_EXCP_BASE + UD_VECTOR, "UD excp" }, { SVM_EXIT_EXCP_BASE + NM_VECTOR, "NM excp" }, { SVM_EXIT_EXCP_BASE + DF_VECTOR, "DF excp" }, { SVM_EXIT_EXCP_BASE + TS_VECTOR, "TS excp" }, { SVM_EXIT_EXCP_BASE + NP_VECTOR, "NP excp" }, { SVM_EXIT_EXCP_BASE + SS_VECTOR, "SS excp" }, { SVM_EXIT_EXCP_BASE + GP_VECTOR, "GP excp" }, { SVM_EXIT_EXCP_BASE + PF_VECTOR, "PF excp" }, { SVM_EXIT_EXCP_BASE + MF_VECTOR, "MF excp" }, { SVM_EXIT_EXCP_BASE + AC_VECTOR, "AC excp" }, { SVM_EXIT_EXCP_BASE + MC_VECTOR, "MC excp" }, { SVM_EXIT_EXCP_BASE + XM_VECTOR, "XF excp" }, { SVM_EXIT_INTR, "interrupt" }, { SVM_EXIT_NMI, "nmi" }, { SVM_EXIT_SMI, "smi" }, { SVM_EXIT_INIT, "init" }, { SVM_EXIT_VINTR, "vintr" }, { SVM_EXIT_CR0_SEL_WRITE, "cr0_sel_write" }, { SVM_EXIT_IDTR_READ, "read_idtr" }, { SVM_EXIT_GDTR_READ, "read_gdtr" }, { SVM_EXIT_LDTR_READ, "read_ldtr" }, { SVM_EXIT_TR_READ, "read_rt" }, { SVM_EXIT_IDTR_WRITE, "write_idtr" }, { SVM_EXIT_GDTR_WRITE, "write_gdtr" }, { SVM_EXIT_LDTR_WRITE, "write_ldtr" }, { SVM_EXIT_TR_WRITE, "write_rt" }, { SVM_EXIT_RDTSC, "rdtsc" }, { SVM_EXIT_RDPMC, "rdpmc" }, { SVM_EXIT_PUSHF, "pushf" }, { SVM_EXIT_POPF, "popf" }, { SVM_EXIT_CPUID, "cpuid" }, { SVM_EXIT_RSM, "rsm" }, { SVM_EXIT_IRET, "iret" }, { SVM_EXIT_SWINT, "swint" }, { SVM_EXIT_INVD, "invd" }, { SVM_EXIT_PAUSE, "pause" }, { SVM_EXIT_HLT, "hlt" }, { SVM_EXIT_INVLPG, "invlpg" }, { SVM_EXIT_INVLPGA, "invlpga" }, { SVM_EXIT_IOIO, "io" }, { SVM_EXIT_MSR, "msr" }, { SVM_EXIT_TASK_SWITCH, "task_switch" }, { SVM_EXIT_FERR_FREEZE, "ferr_freeze" }, { SVM_EXIT_SHUTDOWN, "shutdown" }, { SVM_EXIT_VMRUN, "vmrun" }, { SVM_EXIT_VMMCALL, "hypercall" }, { SVM_EXIT_VMLOAD, "vmload" }, { SVM_EXIT_VMSAVE, "vmsave" }, { SVM_EXIT_STGI, "stgi" }, { SVM_EXIT_CLGI, "clgi" }, { SVM_EXIT_SKINIT, "skinit" }, { SVM_EXIT_RDTSCP, "rdtscp" }, { SVM_EXIT_ICEBP, "icebp" }, { SVM_EXIT_WBINVD, "wbinvd" }, { SVM_EXIT_MONITOR, "monitor" }, { SVM_EXIT_MWAIT, "mwait" }, { SVM_EXIT_XSETBV, "xsetbv" }, { SVM_EXIT_EFER_WRITE_TRAP, "write_efer_trap" }, { SVM_EXIT_CR0_WRITE_TRAP, "write_cr0_trap" }, { SVM_EXIT_CR4_WRITE_TRAP, "write_cr4_trap" }, { SVM_EXIT_CR8_WRITE_TRAP, "write_cr8_trap" }, { SVM_EXIT_INVPCID, "invpcid" }, { SVM_EXIT_NPF, "npf" }, { SVM_EXIT_AVIC_INCOMPLETE_IPI, "avic_incomplete_ipi" }, { SVM_EXIT_AVIC_UNACCELERATED_ACCESS, "avic_unaccelerated_access" }, { SVM_EXIT_VMGEXIT, "vmgexit" }, { SVM_VMGEXIT_MMIO_READ, "vmgexit_mmio_read" }, { SVM_VMGEXIT_MMIO_WRITE, "vmgexit_mmio_write" }, { SVM_VMGEXIT_NMI_COMPLETE, "vmgexit_nmi_complete" }, { SVM_VMGEXIT_AP_HLT_LOOP, "vmgexit_ap_hlt_loop" }, { SVM_VMGEXIT_AP_JUMP_TABLE, "vmgexit_ap_jump_table" }, { SVM_EXIT_ERR, "invalid_guest_state" }
 #endif
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/i686-linux-android/asm/unistd_32.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/i686-linux-android/asm/unistd_32.h
index f8b9c1c..fc9528f 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/i686-linux-android/asm/unistd_32.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/i686-linux-android/asm/unistd_32.h
@@ -16,8 +16,8 @@
  ***
  ****************************************************************************
  ****************************************************************************/
-#ifndef _ASM_X86_UNISTD_32_H
-#define _ASM_X86_UNISTD_32_H 1
+#ifndef _UAPI_ASM_UNISTD_32_H
+#define _UAPI_ASM_UNISTD_32_H
 #define __NR_restart_syscall 0
 #define __NR_exit 1
 #define __NR_fork 2
@@ -450,7 +450,9 @@
 #define __NR_process_madvise 440
 #define __NR_epoll_pwait2 441
 #define __NR_mount_setattr 442
+#define __NR_quotactl_fd 443
 #define __NR_landlock_create_ruleset 444
 #define __NR_landlock_add_rule 445
 #define __NR_landlock_restrict_self 446
+#define __NR_memfd_secret 447
 #endif
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/i686-linux-android/asm/unistd_64.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/i686-linux-android/asm/unistd_64.h
index 9e7ac02..f02b898 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/i686-linux-android/asm/unistd_64.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/i686-linux-android/asm/unistd_64.h
@@ -16,8 +16,8 @@
  ***
  ****************************************************************************
  ****************************************************************************/
-#ifndef _ASM_X86_UNISTD_64_H
-#define _ASM_X86_UNISTD_64_H 1
+#ifndef _UAPI_ASM_UNISTD_64_H
+#define _UAPI_ASM_UNISTD_64_H
 #define __NR_read 0
 #define __NR_write 1
 #define __NR_open 2
@@ -372,7 +372,9 @@
 #define __NR_process_madvise 440
 #define __NR_epoll_pwait2 441
 #define __NR_mount_setattr 442
+#define __NR_quotactl_fd 443
 #define __NR_landlock_create_ruleset 444
 #define __NR_landlock_add_rule 445
 #define __NR_landlock_restrict_self 446
+#define __NR_memfd_secret 447
 #endif
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/i686-linux-android/asm/unistd_x32.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/i686-linux-android/asm/unistd_x32.h
index 25840d0..9b26317 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/i686-linux-android/asm/unistd_x32.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/i686-linux-android/asm/unistd_x32.h
@@ -16,8 +16,8 @@
  ***
  ****************************************************************************
  ****************************************************************************/
-#ifndef _ASM_X86_UNISTD_X32_H
-#define _ASM_X86_UNISTD_X32_H 1
+#ifndef _UAPI_ASM_UNISTD_X32_H
+#define _UAPI_ASM_UNISTD_X32_H
 #define __NR_read (__X32_SYSCALL_BIT + 0)
 #define __NR_write (__X32_SYSCALL_BIT + 1)
 #define __NR_open (__X32_SYSCALL_BIT + 2)
@@ -325,9 +325,11 @@
 #define __NR_process_madvise (__X32_SYSCALL_BIT + 440)
 #define __NR_epoll_pwait2 (__X32_SYSCALL_BIT + 441)
 #define __NR_mount_setattr (__X32_SYSCALL_BIT + 442)
+#define __NR_quotactl_fd (__X32_SYSCALL_BIT + 443)
 #define __NR_landlock_create_ruleset (__X32_SYSCALL_BIT + 444)
 #define __NR_landlock_add_rule (__X32_SYSCALL_BIT + 445)
 #define __NR_landlock_restrict_self (__X32_SYSCALL_BIT + 446)
+#define __NR_memfd_secret (__X32_SYSCALL_BIT + 447)
 #define __NR_rt_sigaction (__X32_SYSCALL_BIT + 512)
 #define __NR_rt_sigreturn (__X32_SYSCALL_BIT + 513)
 #define __NR_ioctl (__X32_SYSCALL_BIT + 514)
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/auxvec.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/auxvec.h
index e8c2336..c80c170 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/auxvec.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/auxvec.h
@@ -42,4 +42,7 @@
 #define AT_RANDOM 25
 #define AT_HWCAP2 26
 #define AT_EXECFN 31
+#ifndef AT_MINSIGSTKSZ
+#define AT_MINSIGSTKSZ 51
+#endif
 #endif
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/bpf.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/bpf.h
index 9da6b44..d243b97 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/bpf.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/bpf.h
@@ -91,6 +91,7 @@
   BPF_PROG_ATTACH,
   BPF_PROG_DETACH,
   BPF_PROG_TEST_RUN,
+  BPF_PROG_RUN = BPF_PROG_TEST_RUN,
   BPF_PROG_GET_NEXT_ID,
   BPF_MAP_GET_NEXT_ID,
   BPF_PROG_GET_FD_BY_ID,
@@ -181,6 +182,7 @@
   BPF_PROG_TYPE_EXT,
   BPF_PROG_TYPE_LSM,
   BPF_PROG_TYPE_SK_LOOKUP,
+  BPF_PROG_TYPE_SYSCALL,
 };
 enum bpf_attach_type {
   BPF_CGROUP_INET_INGRESS,
@@ -222,6 +224,8 @@
   BPF_SK_LOOKUP,
   BPF_XDP,
   BPF_SK_SKB_VERDICT,
+  BPF_SK_REUSEPORT_SELECT,
+  BPF_SK_REUSEPORT_SELECT_OR_MIGRATE,
   __MAX_BPF_ATTACH_TYPE
 };
 #define MAX_BPF_ATTACH_TYPE __MAX_BPF_ATTACH_TYPE
@@ -244,7 +248,9 @@
 #define BPF_F_TEST_STATE_FREQ (1U << 3)
 #define BPF_F_SLEEPABLE (1U << 4)
 #define BPF_PSEUDO_MAP_FD 1
+#define BPF_PSEUDO_MAP_IDX 5
 #define BPF_PSEUDO_MAP_VALUE 2
+#define BPF_PSEUDO_MAP_IDX_VALUE 6
 #define BPF_PSEUDO_BTF_ID 3
 #define BPF_PSEUDO_FUNC 4
 #define BPF_PSEUDO_CALL 1
@@ -350,6 +356,8 @@
       __u32 attach_prog_fd;
       __u32 attach_btf_obj_fd;
     };
+    __u32 : 32;
+    __aligned_u64 fd_array;
   };
   struct {
     __aligned_u64 pathname;
@@ -463,7 +471,7 @@
     __u32 flags;
   } prog_bind_map;
 } __attribute__((aligned(8)));
-#define __BPF_FUNC_MAPPER(FN) FN(unspec), FN(map_lookup_elem), FN(map_update_elem), FN(map_delete_elem), FN(probe_read), FN(ktime_get_ns), FN(trace_printk), FN(get_prandom_u32), FN(get_smp_processor_id), FN(skb_store_bytes), FN(l3_csum_replace), FN(l4_csum_replace), FN(tail_call), FN(clone_redirect), FN(get_current_pid_tgid), FN(get_current_uid_gid), FN(get_current_comm), FN(get_cgroup_classid), FN(skb_vlan_push), FN(skb_vlan_pop), FN(skb_get_tunnel_key), FN(skb_set_tunnel_key), FN(perf_event_read), FN(redirect), FN(get_route_realm), FN(perf_event_output), FN(skb_load_bytes), FN(get_stackid), FN(csum_diff), FN(skb_get_tunnel_opt), FN(skb_set_tunnel_opt), FN(skb_change_proto), FN(skb_change_type), FN(skb_under_cgroup), FN(get_hash_recalc), FN(get_current_task), FN(probe_write_user), FN(current_task_under_cgroup), FN(skb_change_tail), FN(skb_pull_data), FN(csum_update), FN(set_hash_invalid), FN(get_numa_node_id), FN(skb_change_head), FN(xdp_adjust_head), FN(probe_read_str), FN(get_socket_cookie), FN(get_socket_uid), FN(set_hash), FN(setsockopt), FN(skb_adjust_room), FN(redirect_map), FN(sk_redirect_map), FN(sock_map_update), FN(xdp_adjust_meta), FN(perf_event_read_value), FN(perf_prog_read_value), FN(getsockopt), FN(override_return), FN(sock_ops_cb_flags_set), FN(msg_redirect_map), FN(msg_apply_bytes), FN(msg_cork_bytes), FN(msg_pull_data), FN(bind), FN(xdp_adjust_tail), FN(skb_get_xfrm_state), FN(get_stack), FN(skb_load_bytes_relative), FN(fib_lookup), FN(sock_hash_update), FN(msg_redirect_hash), FN(sk_redirect_hash), FN(lwt_push_encap), FN(lwt_seg6_store_bytes), FN(lwt_seg6_adjust_srh), FN(lwt_seg6_action), FN(rc_repeat), FN(rc_keydown), FN(skb_cgroup_id), FN(get_current_cgroup_id), FN(get_local_storage), FN(sk_select_reuseport), FN(skb_ancestor_cgroup_id), FN(sk_lookup_tcp), FN(sk_lookup_udp), FN(sk_release), FN(map_push_elem), FN(map_pop_elem), FN(map_peek_elem), FN(msg_push_data), FN(msg_pop_data), FN(rc_pointer_rel), FN(spin_lock), FN(spin_unlock), FN(sk_fullsock), FN(tcp_sock), FN(skb_ecn_set_ce), FN(get_listener_sock), FN(skc_lookup_tcp), FN(tcp_check_syncookie), FN(sysctl_get_name), FN(sysctl_get_current_value), FN(sysctl_get_new_value), FN(sysctl_set_new_value), FN(strtol), FN(strtoul), FN(sk_storage_get), FN(sk_storage_delete), FN(send_signal), FN(tcp_gen_syncookie), FN(skb_output), FN(probe_read_user), FN(probe_read_kernel), FN(probe_read_user_str), FN(probe_read_kernel_str), FN(tcp_send_ack), FN(send_signal_thread), FN(jiffies64), FN(read_branch_records), FN(get_ns_current_pid_tgid), FN(xdp_output), FN(get_netns_cookie), FN(get_current_ancestor_cgroup_id), FN(sk_assign), FN(ktime_get_boot_ns), FN(seq_printf), FN(seq_write), FN(sk_cgroup_id), FN(sk_ancestor_cgroup_id), FN(ringbuf_output), FN(ringbuf_reserve), FN(ringbuf_submit), FN(ringbuf_discard), FN(ringbuf_query), FN(csum_level), FN(skc_to_tcp6_sock), FN(skc_to_tcp_sock), FN(skc_to_tcp_timewait_sock), FN(skc_to_tcp_request_sock), FN(skc_to_udp6_sock), FN(get_task_stack), FN(load_hdr_opt), FN(store_hdr_opt), FN(reserve_hdr_opt), FN(inode_storage_get), FN(inode_storage_delete), FN(d_path), FN(copy_from_user), FN(snprintf_btf), FN(seq_printf_btf), FN(skb_cgroup_classid), FN(redirect_neigh), FN(per_cpu_ptr), FN(this_cpu_ptr), FN(redirect_peer), FN(task_storage_get), FN(task_storage_delete), FN(get_current_task_btf), FN(bprm_opts_set), FN(ktime_get_coarse_ns), FN(ima_inode_hash), FN(sock_from_file), FN(check_mtu), FN(for_each_map_elem), FN(snprintf),
+#define __BPF_FUNC_MAPPER(FN) FN(unspec), FN(map_lookup_elem), FN(map_update_elem), FN(map_delete_elem), FN(probe_read), FN(ktime_get_ns), FN(trace_printk), FN(get_prandom_u32), FN(get_smp_processor_id), FN(skb_store_bytes), FN(l3_csum_replace), FN(l4_csum_replace), FN(tail_call), FN(clone_redirect), FN(get_current_pid_tgid), FN(get_current_uid_gid), FN(get_current_comm), FN(get_cgroup_classid), FN(skb_vlan_push), FN(skb_vlan_pop), FN(skb_get_tunnel_key), FN(skb_set_tunnel_key), FN(perf_event_read), FN(redirect), FN(get_route_realm), FN(perf_event_output), FN(skb_load_bytes), FN(get_stackid), FN(csum_diff), FN(skb_get_tunnel_opt), FN(skb_set_tunnel_opt), FN(skb_change_proto), FN(skb_change_type), FN(skb_under_cgroup), FN(get_hash_recalc), FN(get_current_task), FN(probe_write_user), FN(current_task_under_cgroup), FN(skb_change_tail), FN(skb_pull_data), FN(csum_update), FN(set_hash_invalid), FN(get_numa_node_id), FN(skb_change_head), FN(xdp_adjust_head), FN(probe_read_str), FN(get_socket_cookie), FN(get_socket_uid), FN(set_hash), FN(setsockopt), FN(skb_adjust_room), FN(redirect_map), FN(sk_redirect_map), FN(sock_map_update), FN(xdp_adjust_meta), FN(perf_event_read_value), FN(perf_prog_read_value), FN(getsockopt), FN(override_return), FN(sock_ops_cb_flags_set), FN(msg_redirect_map), FN(msg_apply_bytes), FN(msg_cork_bytes), FN(msg_pull_data), FN(bind), FN(xdp_adjust_tail), FN(skb_get_xfrm_state), FN(get_stack), FN(skb_load_bytes_relative), FN(fib_lookup), FN(sock_hash_update), FN(msg_redirect_hash), FN(sk_redirect_hash), FN(lwt_push_encap), FN(lwt_seg6_store_bytes), FN(lwt_seg6_adjust_srh), FN(lwt_seg6_action), FN(rc_repeat), FN(rc_keydown), FN(skb_cgroup_id), FN(get_current_cgroup_id), FN(get_local_storage), FN(sk_select_reuseport), FN(skb_ancestor_cgroup_id), FN(sk_lookup_tcp), FN(sk_lookup_udp), FN(sk_release), FN(map_push_elem), FN(map_pop_elem), FN(map_peek_elem), FN(msg_push_data), FN(msg_pop_data), FN(rc_pointer_rel), FN(spin_lock), FN(spin_unlock), FN(sk_fullsock), FN(tcp_sock), FN(skb_ecn_set_ce), FN(get_listener_sock), FN(skc_lookup_tcp), FN(tcp_check_syncookie), FN(sysctl_get_name), FN(sysctl_get_current_value), FN(sysctl_get_new_value), FN(sysctl_set_new_value), FN(strtol), FN(strtoul), FN(sk_storage_get), FN(sk_storage_delete), FN(send_signal), FN(tcp_gen_syncookie), FN(skb_output), FN(probe_read_user), FN(probe_read_kernel), FN(probe_read_user_str), FN(probe_read_kernel_str), FN(tcp_send_ack), FN(send_signal_thread), FN(jiffies64), FN(read_branch_records), FN(get_ns_current_pid_tgid), FN(xdp_output), FN(get_netns_cookie), FN(get_current_ancestor_cgroup_id), FN(sk_assign), FN(ktime_get_boot_ns), FN(seq_printf), FN(seq_write), FN(sk_cgroup_id), FN(sk_ancestor_cgroup_id), FN(ringbuf_output), FN(ringbuf_reserve), FN(ringbuf_submit), FN(ringbuf_discard), FN(ringbuf_query), FN(csum_level), FN(skc_to_tcp6_sock), FN(skc_to_tcp_sock), FN(skc_to_tcp_timewait_sock), FN(skc_to_tcp_request_sock), FN(skc_to_udp6_sock), FN(get_task_stack), FN(load_hdr_opt), FN(store_hdr_opt), FN(reserve_hdr_opt), FN(inode_storage_get), FN(inode_storage_delete), FN(d_path), FN(copy_from_user), FN(snprintf_btf), FN(seq_printf_btf), FN(skb_cgroup_classid), FN(redirect_neigh), FN(per_cpu_ptr), FN(this_cpu_ptr), FN(redirect_peer), FN(task_storage_get), FN(task_storage_delete), FN(get_current_task_btf), FN(bprm_opts_set), FN(ktime_get_coarse_ns), FN(ima_inode_hash), FN(sock_from_file), FN(check_mtu), FN(for_each_map_elem), FN(snprintf), FN(sys_bpf), FN(btf_find_by_name_kind), FN(sys_close),
 #define __BPF_ENUM_FN(x) BPF_FUNC_ ##x
 enum bpf_func_id {
   __BPF_FUNC_MAPPER(__BPF_ENUM_FN) __BPF_FUNC_MAX_ID,
@@ -572,6 +580,10 @@
 enum {
   BPF_F_BPRM_SECUREEXEC = (1ULL << 0),
 };
+enum {
+  BPF_F_BROADCAST = (1ULL << 3),
+  BPF_F_EXCLUDE_INGRESS = (1ULL << 4),
+};
 #define __bpf_md_ptr(type,name) union { type name; __u64 : 64; \
 } __attribute__((aligned(8)))
 struct __sk_buff {
@@ -753,6 +765,8 @@
   __u32 ip_protocol;
   __u32 bind_inany;
   __u32 hash;
+  __bpf_md_ptr(struct bpf_sock *, sk);
+  __bpf_md_ptr(struct bpf_sock *, migrating_sk);
 };
 #define BPF_TAG_SIZE 8
 struct bpf_prog_info {
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/can.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/can.h
index 59fc31e..30eeca2 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/can.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/can.h
@@ -48,6 +48,7 @@
 };
 #define CANFD_BRS 0x01
 #define CANFD_ESI 0x02
+#define CANFD_FDF 0x04
 struct canfd_frame {
   canid_t can_id;
   __u8 len;
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/cxl_mem.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/cxl_mem.h
index 851bd79..2deb45e 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/cxl_mem.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/cxl_mem.h
@@ -21,7 +21,7 @@
 #include <linux/types.h>
 #define CXL_MEM_QUERY_COMMANDS _IOR(0xCE, 1, struct cxl_mem_query_commands)
 #define CXL_MEM_SEND_COMMAND _IOWR(0xCE, 2, struct cxl_send_command)
-#define CXL_CMDS ___C(INVALID, "Invalid Command"), ___C(IDENTIFY, "Identify Command"), ___C(RAW, "Raw device command"), ___C(GET_SUPPORTED_LOGS, "Get Supported Logs"), ___C(GET_FW_INFO, "Get FW Info"), ___C(GET_PARTITION_INFO, "Get Partition Information"), ___C(GET_LSA, "Get Label Storage Area"), ___C(GET_HEALTH_INFO, "Get Health Info"), ___C(GET_LOG, "Get Log"), ___C(MAX, "invalid / last command")
+#define CXL_CMDS ___C(INVALID, "Invalid Command"), ___C(IDENTIFY, "Identify Command"), ___C(RAW, "Raw device command"), ___C(GET_SUPPORTED_LOGS, "Get Supported Logs"), ___C(GET_FW_INFO, "Get FW Info"), ___C(GET_PARTITION_INFO, "Get Partition Information"), ___C(GET_LSA, "Get Label Storage Area"), ___C(GET_HEALTH_INFO, "Get Health Info"), ___C(GET_LOG, "Get Log"), ___C(SET_PARTITION_INFO, "Set Partition Information"), ___C(SET_LSA, "Set Label Storage Area"), ___C(GET_ALERT_CONFIG, "Get Alert Configuration"), ___C(SET_ALERT_CONFIG, "Set Alert Configuration"), ___C(GET_SHUTDOWN_STATE, "Get Shutdown State"), ___C(SET_SHUTDOWN_STATE, "Set Shutdown State"), ___C(GET_POISON, "Get Poison List"), ___C(INJECT_POISON, "Inject Poison"), ___C(CLEAR_POISON, "Clear Poison"), ___C(GET_SCAN_MEDIA_CAPS, "Get Scan Media Capabilities"), ___C(SCAN_MEDIA, "Scan Media"), ___C(GET_SCAN_MEDIA, "Get Scan Media Results"), ___C(MAX, "invalid / last command")
 #define ___C(a,b) CXL_MEM_COMMAND_ID_ ##a
 enum {
   CXL_CMDS
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/devlink.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/devlink.h
index e6e006f..cf2365f 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/devlink.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/devlink.h
@@ -99,6 +99,10 @@
   DEVLINK_CMD_TRAP_POLICER_NEW,
   DEVLINK_CMD_TRAP_POLICER_DEL,
   DEVLINK_CMD_HEALTH_REPORTER_TEST,
+  DEVLINK_CMD_RATE_GET,
+  DEVLINK_CMD_RATE_SET,
+  DEVLINK_CMD_RATE_NEW,
+  DEVLINK_CMD_RATE_DEL,
   __DEVLINK_CMD_MAX,
   DEVLINK_CMD_MAX = __DEVLINK_CMD_MAX - 1
 };
@@ -141,6 +145,10 @@
   DEVLINK_PORT_FLAVOUR_UNUSED,
   DEVLINK_PORT_FLAVOUR_PCI_SF,
 };
+enum devlink_rate_type {
+  DEVLINK_RATE_TYPE_LEAF,
+  DEVLINK_RATE_TYPE_NODE,
+};
 enum devlink_param_cmode {
   DEVLINK_PARAM_CMODE_RUNTIME,
   DEVLINK_PARAM_CMODE_DRIVERINIT,
@@ -370,6 +378,11 @@
   DEVLINK_ATTR_RELOAD_ACTION_INFO,
   DEVLINK_ATTR_RELOAD_ACTION_STATS,
   DEVLINK_ATTR_PORT_PCI_SF_NUMBER,
+  DEVLINK_ATTR_RATE_TYPE,
+  DEVLINK_ATTR_RATE_TX_SHARE,
+  DEVLINK_ATTR_RATE_TX_MAX,
+  DEVLINK_ATTR_RATE_NODE_NAME,
+  DEVLINK_ATTR_RATE_PARENT_NODE_NAME,
   __DEVLINK_ATTR_MAX,
   DEVLINK_ATTR_MAX = __DEVLINK_ATTR_MAX - 1
 };
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/ethtool_netlink.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/ethtool_netlink.h
index 3ac2cd3..1507a4f 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/ethtool_netlink.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/ethtool_netlink.h
@@ -53,6 +53,7 @@
   ETHTOOL_MSG_FEC_SET,
   ETHTOOL_MSG_MODULE_EEPROM_GET,
   ETHTOOL_MSG_STATS_GET,
+  ETHTOOL_MSG_PHC_VCLOCKS_GET,
   __ETHTOOL_MSG_USER_CNT,
   ETHTOOL_MSG_USER_MAX = __ETHTOOL_MSG_USER_CNT - 1
 };
@@ -91,6 +92,7 @@
   ETHTOOL_MSG_FEC_NTF,
   ETHTOOL_MSG_MODULE_EEPROM_GET_REPLY,
   ETHTOOL_MSG_STATS_GET_REPLY,
+  ETHTOOL_MSG_PHC_VCLOCKS_GET_REPLY,
   __ETHTOOL_MSG_KERNEL_CNT,
   ETHTOOL_MSG_KERNEL_MAX = __ETHTOOL_MSG_KERNEL_CNT - 1
 };
@@ -330,6 +332,14 @@
   ETHTOOL_A_TSINFO_MAX = (__ETHTOOL_A_TSINFO_CNT - 1)
 };
 enum {
+  ETHTOOL_A_PHC_VCLOCKS_UNSPEC,
+  ETHTOOL_A_PHC_VCLOCKS_HEADER,
+  ETHTOOL_A_PHC_VCLOCKS_NUM,
+  ETHTOOL_A_PHC_VCLOCKS_INDEX,
+  __ETHTOOL_A_PHC_VCLOCKS_CNT,
+  ETHTOOL_A_PHC_VCLOCKS_MAX = (__ETHTOOL_A_PHC_VCLOCKS_CNT - 1)
+};
+enum {
   ETHTOOL_A_CABLE_TEST_UNSPEC,
   ETHTOOL_A_CABLE_TEST_HEADER,
   __ETHTOOL_A_CABLE_TEST_CNT,
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/fuse.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/fuse.h
index 728b202..114931e 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/fuse.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/fuse.h
@@ -20,7 +20,7 @@
 #define _LINUX_FUSE_H
 #include <stdint.h>
 #define FUSE_KERNEL_VERSION 7
-#define FUSE_KERNEL_MINOR_VERSION 33
+#define FUSE_KERNEL_MINOR_VERSION 34
 #define FUSE_ROOT_ID 1
 struct fuse_attr {
   uint64_t ino;
@@ -176,6 +176,7 @@
   FUSE_COPY_FILE_RANGE = 47,
   FUSE_SETUPMAPPING = 48,
   FUSE_REMOVEMAPPING = 49,
+  FUSE_SYNCFS = 50,
   FUSE_CANONICAL_PATH = 2016,
   CUSE_INIT = 4096,
   CUSE_INIT_BSWAP_RESERVED = 1048576,
@@ -546,4 +547,7 @@
   uint64_t len;
 };
 #define FUSE_REMOVEMAPPING_MAX_ENTRY (PAGE_SIZE / sizeof(struct fuse_removemapping_one))
+struct fuse_syncfs_in {
+  uint64_t padding;
+};
 #endif
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/futex.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/futex.h
index 6176f38..aa0dac1 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/futex.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/futex.h
@@ -33,6 +33,7 @@
 #define FUTEX_WAKE_BITSET 10
 #define FUTEX_WAIT_REQUEUE_PI 11
 #define FUTEX_CMP_REQUEUE_PI 12
+#define FUTEX_LOCK_PI2 13
 #define FUTEX_PRIVATE_FLAG 128
 #define FUTEX_CLOCK_REALTIME 256
 #define FUTEX_CMD_MASK ~(FUTEX_PRIVATE_FLAG | FUTEX_CLOCK_REALTIME)
@@ -42,6 +43,7 @@
 #define FUTEX_CMP_REQUEUE_PRIVATE (FUTEX_CMP_REQUEUE | FUTEX_PRIVATE_FLAG)
 #define FUTEX_WAKE_OP_PRIVATE (FUTEX_WAKE_OP | FUTEX_PRIVATE_FLAG)
 #define FUTEX_LOCK_PI_PRIVATE (FUTEX_LOCK_PI | FUTEX_PRIVATE_FLAG)
+#define FUTEX_LOCK_PI2_PRIVATE (FUTEX_LOCK_PI2 | FUTEX_PRIVATE_FLAG)
 #define FUTEX_UNLOCK_PI_PRIVATE (FUTEX_UNLOCK_PI | FUTEX_PRIVATE_FLAG)
 #define FUTEX_TRYLOCK_PI_PRIVATE (FUTEX_TRYLOCK_PI | FUTEX_PRIVATE_FLAG)
 #define FUTEX_WAIT_BITSET_PRIVATE (FUTEX_WAIT_BITSET | FUTEX_PRIVATE_FLAG)
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/icmp.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/icmp.h
index d8c089c..8847a48 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/icmp.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/icmp.h
@@ -20,7 +20,6 @@
 #define _UAPI_LINUX_ICMP_H
 #include <linux/types.h>
 #include <asm/byteorder.h>
-#include <linux/in.h>
 #include <linux/if.h>
 #include <linux/in6.h>
 #define ICMP_ECHOREPLY 0
@@ -124,7 +123,7 @@
     struct {
       struct icmp_ext_echo_ctype3_hdr ctype3_hdr;
       union {
-        struct in_addr ipv4_addr;
+        __be32 ipv4_addr;
         struct in6_addr ipv6_addr;
       } ip_addr;
     } addr;
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/if_bridge.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/if_bridge.h
index 570c09e..6b825ce 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/if_bridge.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/if_bridge.h
@@ -496,6 +496,8 @@
   MDBA_ROUTER_PATTR_UNSPEC,
   MDBA_ROUTER_PATTR_TIMER,
   MDBA_ROUTER_PATTR_TYPE,
+  MDBA_ROUTER_PATTR_INET_TIMER,
+  MDBA_ROUTER_PATTR_INET6_TIMER,
   __MDBA_ROUTER_PATTR_MAX
 };
 #define MDBA_ROUTER_PATTR_MAX (__MDBA_ROUTER_PATTR_MAX - 1)
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/if_link.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/if_link.h
index edda87c..0d06cbb 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/if_link.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/if_link.h
@@ -148,6 +148,8 @@
   IFLA_ALT_IFNAME,
   IFLA_PERM_ADDRESS,
   IFLA_PROTO_DOWN_REASON,
+  IFLA_PARENT_DEV_NAME,
+  IFLA_PARENT_DEV_BUS_NAME,
   __IFLA_MAX
 };
 #define IFLA_MAX (__IFLA_MAX - 1)
@@ -836,6 +838,8 @@
 #define RMNET_FLAGS_INGRESS_MAP_COMMANDS (1U << 1)
 #define RMNET_FLAGS_INGRESS_MAP_CKSUMV4 (1U << 2)
 #define RMNET_FLAGS_EGRESS_MAP_CKSUMV4 (1U << 3)
+#define RMNET_FLAGS_INGRESS_MAP_CKSUMV5 (1U << 4)
+#define RMNET_FLAGS_EGRESS_MAP_CKSUMV5 (1U << 5)
 enum {
   IFLA_RMNET_UNSPEC,
   IFLA_RMNET_MUX_ID,
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/io_uring.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/io_uring.h
index f26751e..622f772 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/io_uring.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/io_uring.h
@@ -53,16 +53,12 @@
   };
   __u64 user_data;
   union {
-    struct {
-      union {
-        __u16 buf_index;
-        __u16 buf_group;
-      } __attribute__((packed));
-      __u16 personality;
-      __s32 splice_fd_in;
-    };
-    __u64 __pad2[3];
-  };
+    __u16 buf_index;
+    __u16 buf_group;
+  } __attribute__((packed));
+  __u16 personality;
+  __s32 splice_fd_in;
+  __u64 __pad2[2];
 };
 enum {
   IOSQE_FIXED_FILE_BIT,
@@ -215,6 +211,8 @@
   IORING_REGISTER_FILES_UPDATE2 = 14,
   IORING_REGISTER_BUFFERS2 = 15,
   IORING_REGISTER_BUFFERS_UPDATE = 16,
+  IORING_REGISTER_IOWQ_AFF = 17,
+  IORING_UNREGISTER_IOWQ_AFF = 18,
   IORING_REGISTER_LAST
 };
 struct io_uring_files_update {
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/kfd_ioctl.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/kfd_ioctl.h
index f3c6176..eb355a9 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/kfd_ioctl.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/kfd_ioctl.h
@@ -21,7 +21,7 @@
 #include <drm/drm.h>
 #include <linux/ioctl.h>
 #define KFD_IOCTL_MAJOR_VERSION 1
-#define KFD_IOCTL_MINOR_VERSION 4
+#define KFD_IOCTL_MINOR_VERSION 5
 struct kfd_ioctl_get_version_args {
   __u32 major_version;
   __u32 minor_version;
@@ -304,6 +304,44 @@
   KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL = 0,
   KFD_MMIO_REMAP_HDP_REG_FLUSH_CNTL = 4,
 };
+#define KFD_IOCTL_SVM_FLAG_HOST_ACCESS 0x00000001
+#define KFD_IOCTL_SVM_FLAG_COHERENT 0x00000002
+#define KFD_IOCTL_SVM_FLAG_HIVE_LOCAL 0x00000004
+#define KFD_IOCTL_SVM_FLAG_GPU_RO 0x00000008
+#define KFD_IOCTL_SVM_FLAG_GPU_EXEC 0x00000010
+#define KFD_IOCTL_SVM_FLAG_GPU_READ_MOSTLY 0x00000020
+enum kfd_ioctl_svm_op {
+  KFD_IOCTL_SVM_OP_SET_ATTR,
+  KFD_IOCTL_SVM_OP_GET_ATTR
+};
+enum kfd_ioctl_svm_location {
+  KFD_IOCTL_SVM_LOCATION_SYSMEM = 0,
+  KFD_IOCTL_SVM_LOCATION_UNDEFINED = 0xffffffff
+};
+enum kfd_ioctl_svm_attr_type {
+  KFD_IOCTL_SVM_ATTR_PREFERRED_LOC,
+  KFD_IOCTL_SVM_ATTR_PREFETCH_LOC,
+  KFD_IOCTL_SVM_ATTR_ACCESS,
+  KFD_IOCTL_SVM_ATTR_ACCESS_IN_PLACE,
+  KFD_IOCTL_SVM_ATTR_NO_ACCESS,
+  KFD_IOCTL_SVM_ATTR_SET_FLAGS,
+  KFD_IOCTL_SVM_ATTR_CLR_FLAGS,
+  KFD_IOCTL_SVM_ATTR_GRANULARITY
+};
+struct kfd_ioctl_svm_attribute {
+  __u32 type;
+  __u32 value;
+};
+struct kfd_ioctl_svm_args {
+  __u64 start_addr;
+  __u64 size;
+  __u32 op;
+  __u32 nattr;
+  struct kfd_ioctl_svm_attribute attrs[0];
+};
+struct kfd_ioctl_set_xnack_mode_args {
+  __s32 xnack_enabled;
+};
 #define AMDKFD_IOCTL_BASE 'K'
 #define AMDKFD_IO(nr) _IO(AMDKFD_IOCTL_BASE, nr)
 #define AMDKFD_IOR(nr,type) _IOR(AMDKFD_IOCTL_BASE, nr, type)
@@ -340,6 +378,8 @@
 #define AMDKFD_IOC_IMPORT_DMABUF AMDKFD_IOWR(0x1D, struct kfd_ioctl_import_dmabuf_args)
 #define AMDKFD_IOC_ALLOC_QUEUE_GWS AMDKFD_IOWR(0x1E, struct kfd_ioctl_alloc_queue_gws_args)
 #define AMDKFD_IOC_SMI_EVENTS AMDKFD_IOWR(0x1F, struct kfd_ioctl_smi_events_args)
+#define AMDKFD_IOC_SVM AMDKFD_IOWR(0x20, struct kfd_ioctl_svm_args)
+#define AMDKFD_IOC_SET_XNACK_MODE AMDKFD_IOWR(0x21, struct kfd_ioctl_set_xnack_mode_args)
 #define AMDKFD_COMMAND_START 0x01
-#define AMDKFD_COMMAND_END 0x20
+#define AMDKFD_COMMAND_END 0x22
 #endif
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/kvm.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/kvm.h
index 01e98dd..81e752c 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/kvm.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/kvm.h
@@ -219,6 +219,7 @@
 #define KVM_INTERNAL_ERROR_SIMUL_EX 2
 #define KVM_INTERNAL_ERROR_DELIVERY_EV 3
 #define KVM_INTERNAL_ERROR_UNEXPECTED_EXIT_REASON 4
+#define KVM_INTERNAL_ERROR_EMULATION_FLAG_INSTRUCTION_BYTES (1ULL << 0)
 struct kvm_run {
   __u8 request_interrupt_window;
   __u8 immediate_exit;
@@ -301,6 +302,13 @@
       __u64 data[16];
     } internal;
     struct {
+      __u32 suberror;
+      __u32 ndata;
+      __u64 flags;
+      __u8 insn_size;
+      __u8 insn_bytes[15];
+    } emulation_failure;
+    struct {
       __u64 gprs[32];
     } osi;
     struct {
@@ -859,6 +867,13 @@
 #define KVM_CAP_SGX_ATTRIBUTE 196
 #define KVM_CAP_VM_COPY_ENC_CONTEXT_FROM 197
 #define KVM_CAP_PTP_KVM 198
+#define KVM_CAP_HYPERV_ENFORCE_CPUID 199
+#define KVM_CAP_SREGS2 200
+#define KVM_CAP_EXIT_HYPERCALL 201
+#define KVM_CAP_PPC_RPT_INVALIDATE 202
+#define KVM_CAP_BINARY_STATS_FD 203
+#define KVM_CAP_EXIT_ON_EMULATION_FAILURE 204
+#define KVM_CAP_ARM_MTE 205
 #ifdef KVM_CAP_IRQ_ROUTING
 struct kvm_irq_routing_irqchip {
   __u32 irqchip;
@@ -1110,6 +1125,7 @@
 #define KVM_PPC_GET_CPU_CHAR _IOR(KVMIO, 0xb1, struct kvm_ppc_cpu_char)
 #define KVM_SET_PMU_EVENT_FILTER _IOW(KVMIO, 0xb2, struct kvm_pmu_event_filter)
 #define KVM_PPC_SVM_OFF _IO(KVMIO, 0xb3)
+#define KVM_ARM_MTE_COPY_TAGS _IOR(KVMIO, 0xb4, struct kvm_arm_copy_mte_tags)
 #define KVM_CREATE_DEVICE _IOWR(KVMIO, 0xe0, struct kvm_create_device)
 #define KVM_SET_DEVICE_ATTR _IOW(KVMIO, 0xe1, struct kvm_device_attr)
 #define KVM_GET_DEVICE_ATTR _IOW(KVMIO, 0xe2, struct kvm_device_attr)
@@ -1235,6 +1251,8 @@
 #define KVM_XEN_ATTR_TYPE_UPCALL_VECTOR 0x2
 #define KVM_XEN_VCPU_GET_ATTR _IOWR(KVMIO, 0xca, struct kvm_xen_vcpu_attr)
 #define KVM_XEN_VCPU_SET_ATTR _IOW(KVMIO, 0xcb, struct kvm_xen_vcpu_attr)
+#define KVM_GET_SREGS2 _IOR(KVMIO, 0xcc, struct kvm_sregs2)
+#define KVM_SET_SREGS2 _IOW(KVMIO, 0xcd, struct kvm_sregs2)
 struct kvm_xen_vcpu_attr {
   __u16 type;
   __u16 pad[3];
@@ -1432,4 +1450,39 @@
 };
 #define KVM_BUS_LOCK_DETECTION_OFF (1 << 0)
 #define KVM_BUS_LOCK_DETECTION_EXIT (1 << 1)
+struct kvm_stats_header {
+  __u32 flags;
+  __u32 name_size;
+  __u32 num_desc;
+  __u32 id_offset;
+  __u32 desc_offset;
+  __u32 data_offset;
+};
+#define KVM_STATS_TYPE_SHIFT 0
+#define KVM_STATS_TYPE_MASK (0xF << KVM_STATS_TYPE_SHIFT)
+#define KVM_STATS_TYPE_CUMULATIVE (0x0 << KVM_STATS_TYPE_SHIFT)
+#define KVM_STATS_TYPE_INSTANT (0x1 << KVM_STATS_TYPE_SHIFT)
+#define KVM_STATS_TYPE_PEAK (0x2 << KVM_STATS_TYPE_SHIFT)
+#define KVM_STATS_TYPE_MAX KVM_STATS_TYPE_PEAK
+#define KVM_STATS_UNIT_SHIFT 4
+#define KVM_STATS_UNIT_MASK (0xF << KVM_STATS_UNIT_SHIFT)
+#define KVM_STATS_UNIT_NONE (0x0 << KVM_STATS_UNIT_SHIFT)
+#define KVM_STATS_UNIT_BYTES (0x1 << KVM_STATS_UNIT_SHIFT)
+#define KVM_STATS_UNIT_SECONDS (0x2 << KVM_STATS_UNIT_SHIFT)
+#define KVM_STATS_UNIT_CYCLES (0x3 << KVM_STATS_UNIT_SHIFT)
+#define KVM_STATS_UNIT_MAX KVM_STATS_UNIT_CYCLES
+#define KVM_STATS_BASE_SHIFT 8
+#define KVM_STATS_BASE_MASK (0xF << KVM_STATS_BASE_SHIFT)
+#define KVM_STATS_BASE_POW10 (0x0 << KVM_STATS_BASE_SHIFT)
+#define KVM_STATS_BASE_POW2 (0x1 << KVM_STATS_BASE_SHIFT)
+#define KVM_STATS_BASE_MAX KVM_STATS_BASE_POW2
+struct kvm_stats_desc {
+  __u32 flags;
+  __s16 exponent;
+  __u16 size;
+  __u32 offset;
+  __u32 unused;
+  char name[];
+};
+#define KVM_GET_STATS_FD _IO(KVMIO, 0xce)
 #endif
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/kvm_para.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/kvm_para.h
index 9a4dd29..85084c2 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/kvm_para.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/kvm_para.h
@@ -35,5 +35,6 @@
 #define KVM_HC_CLOCK_PAIRING 9
 #define KVM_HC_SEND_IPI 10
 #define KVM_HC_SCHED_YIELD 11
+#define KVM_HC_MAP_GPA_RANGE 12
 #include <asm/kvm_para.h>
 #endif
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/magic.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/magic.h
index 479ae81..6d583f3 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/magic.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/magic.h
@@ -100,4 +100,5 @@
 #define DEVMEM_MAGIC 0x454d444d
 #define Z3FOLD_MAGIC 0x33
 #define PPC_CMM_MAGIC 0xc7571590
+#define SECRETMEM_MAGIC 0x5345434d
 #endif
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/mempolicy.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/mempolicy.h
index eb210fa..4f8c02f 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/mempolicy.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/mempolicy.h
@@ -41,7 +41,6 @@
 #define MPOL_MF_INTERNAL (1 << 4)
 #define MPOL_MF_VALID (MPOL_MF_STRICT | MPOL_MF_MOVE | MPOL_MF_MOVE_ALL)
 #define MPOL_F_SHARED (1 << 0)
-#define MPOL_F_LOCAL (1 << 1)
 #define MPOL_F_MOF (1 << 3)
 #define MPOL_F_MORON (1 << 4)
 #define RECLAIM_ZONE (1 << 0)
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/mount.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/mount.h
index 5a112c9..13d0581 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/mount.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/mount.h
@@ -89,6 +89,7 @@
 #define MOUNT_ATTR_STRICTATIME 0x00000020
 #define MOUNT_ATTR_NODIRATIME 0x00000080
 #define MOUNT_ATTR_IDMAP 0x00100000
+#define MOUNT_ATTR_NOSYMFOLLOW 0x00200000
 struct mount_attr {
   __u64 attr_set;
   __u64 attr_clr;
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/mptcp.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/mptcp.h
index 4a44a90..cf156dd 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/mptcp.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/mptcp.h
@@ -99,6 +99,7 @@
   __u64 mptcpi_rcv_nxt;
   __u8 mptcpi_local_addr_used;
   __u8 mptcpi_local_addr_max;
+  __u8 mptcpi_csum_enabled;
 };
 enum mptcp_event_type {
   MPTCP_EVENT_UNSPEC = 0,
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/n_r3964.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/n_r3964.h
deleted file mode 100644
index 5a7cccc..0000000
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/n_r3964.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ***   To edit the content of this header, modify the corresponding
- ***   source file (e.g. under external/kernel-headers/original/) then
- ***   run bionic/libc/kernel/tools/update_all.py
- ***
- ***   Any manual change here will be lost the next time this script will
- ***   be run. You've been warned!
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _UAPI__LINUX_N_R3964_H__
-#define _UAPI__LINUX_N_R3964_H__
-#define R3964_ENABLE_SIGNALS 0x5301
-#define R3964_SETPRIORITY 0x5302
-#define R3964_USE_BCC 0x5303
-#define R3964_READ_TELEGRAM 0x5304
-#define R3964_MASTER 0
-#define R3964_SLAVE 1
-#define R3964_SIG_ACK 0x0001
-#define R3964_SIG_DATA 0x0002
-#define R3964_SIG_ALL 0x000f
-#define R3964_SIG_NONE 0x0000
-#define R3964_USE_SIGIO 0x1000
-enum {
-  R3964_MSG_ACK = 1,
-  R3964_MSG_DATA
-};
-#define R3964_MAX_MSG_COUNT 32
-#define R3964_OK 0
-#define R3964_TX_FAIL - 1
-#define R3964_OVERFLOW - 2
-struct r3964_client_message {
-  int msg_id;
-  int arg;
-  int error_code;
-};
-#define R3964_MTU 256
-#endif
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/nbd-netlink.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/nbd-netlink.h
index 9faf689..dffb077 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/nbd-netlink.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/nbd-netlink.h
@@ -32,6 +32,7 @@
   NBD_ATTR_SOCKETS,
   NBD_ATTR_DEAD_CONN_TIMEOUT,
   NBD_ATTR_DEVICE_LIST,
+  NBD_ATTR_BACKEND_IDENTIFIER,
   __NBD_ATTR_MAX,
 };
 #define NBD_ATTR_MAX (__NBD_ATTR_MAX - 1)
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/net_tstamp.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/net_tstamp.h
index 373d1bb..949bcad 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/net_tstamp.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/net_tstamp.h
@@ -36,10 +36,15 @@
   SOF_TIMESTAMPING_OPT_STATS = (1 << 12),
   SOF_TIMESTAMPING_OPT_PKTINFO = (1 << 13),
   SOF_TIMESTAMPING_OPT_TX_SWHW = (1 << 14),
-  SOF_TIMESTAMPING_LAST = SOF_TIMESTAMPING_OPT_TX_SWHW,
+  SOF_TIMESTAMPING_BIND_PHC = (1 << 15),
+  SOF_TIMESTAMPING_LAST = SOF_TIMESTAMPING_BIND_PHC,
   SOF_TIMESTAMPING_MASK = (SOF_TIMESTAMPING_LAST - 1) | SOF_TIMESTAMPING_LAST
 };
 #define SOF_TIMESTAMPING_TX_RECORD_MASK (SOF_TIMESTAMPING_TX_HARDWARE | SOF_TIMESTAMPING_TX_SOFTWARE | SOF_TIMESTAMPING_TX_SCHED | SOF_TIMESTAMPING_TX_ACK)
+struct so_timestamping {
+  int flags;
+  int bind_phc;
+};
 struct hwtstamp_config {
   int flags;
   int tx_type;
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/netfilter/nf_tables.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/netfilter/nf_tables.h
index df7bc81..49ae9df 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/netfilter/nf_tables.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/netfilter/nf_tables.h
@@ -415,6 +415,7 @@
   NFT_EXTHDR_OP_IPV6,
   NFT_EXTHDR_OP_TCPOPT,
   NFT_EXTHDR_OP_IPV4,
+  NFT_EXTHDR_OP_SCTP,
   __NFT_EXTHDR_OP_MAX
 };
 #define NFT_EXTHDR_OP_MAX (__NFT_EXTHDR_OP_MAX - 1)
@@ -604,6 +605,14 @@
   __NFTA_COUNTER_MAX
 };
 #define NFTA_COUNTER_MAX (__NFTA_COUNTER_MAX - 1)
+enum nft_last_attributes {
+  NFTA_LAST_UNSPEC,
+  NFTA_LAST_SET,
+  NFTA_LAST_MSECS,
+  NFTA_LAST_PAD,
+  __NFTA_LAST_MAX
+};
+#define NFTA_LAST_MAX (__NFTA_LAST_MAX - 1)
 enum nft_log_attributes {
   NFTA_LOG_UNSPEC,
   NFTA_LOG_GROUP,
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/netfilter/nfnetlink.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/netfilter/nfnetlink.h
index 9145552..705de74 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/netfilter/nfnetlink.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/netfilter/nfnetlink.h
@@ -64,7 +64,8 @@
 #define NFNL_SUBSYS_CTHELPER 9
 #define NFNL_SUBSYS_NFTABLES 10
 #define NFNL_SUBSYS_NFT_COMPAT 11
-#define NFNL_SUBSYS_COUNT 12
+#define NFNL_SUBSYS_HOOK 12
+#define NFNL_SUBSYS_COUNT 13
 #define NFNL_MSG_BATCH_BEGIN NLMSG_MIN_TYPE
 #define NFNL_MSG_BATCH_END NLMSG_MIN_TYPE + 1
 enum nfnl_batch_attributes {
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/netfilter/nfnetlink_hook.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/netfilter/nfnetlink_hook.h
new file mode 100644
index 0000000..ce1692c
--- /dev/null
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/netfilter/nfnetlink_hook.h
@@ -0,0 +1,54 @@
+/****************************************************************************
+ ****************************************************************************
+ ***
+ ***   This header was automatically generated from a Linux kernel header
+ ***   of the same name, to make information necessary for userspace to
+ ***   call into the kernel available to libc.  It contains only constants,
+ ***   structures, and macros generated from the original header, and thus,
+ ***   contains no copyrightable information.
+ ***
+ ***   To edit the content of this header, modify the corresponding
+ ***   source file (e.g. under external/kernel-headers/original/) then
+ ***   run bionic/libc/kernel/tools/update_all.py
+ ***
+ ***   Any manual change here will be lost the next time this script will
+ ***   be run. You've been warned!
+ ***
+ ****************************************************************************
+ ****************************************************************************/
+#ifndef _NFNL_HOOK_H_
+#define _NFNL_HOOK_H_
+enum nfnl_hook_msg_types {
+  NFNL_MSG_HOOK_GET,
+  NFNL_MSG_HOOK_MAX,
+};
+enum nfnl_hook_attributes {
+  NFNLA_HOOK_UNSPEC,
+  NFNLA_HOOK_HOOKNUM,
+  NFNLA_HOOK_PRIORITY,
+  NFNLA_HOOK_DEV,
+  NFNLA_HOOK_FUNCTION_NAME,
+  NFNLA_HOOK_MODULE_NAME,
+  NFNLA_HOOK_CHAIN_INFO,
+  __NFNLA_HOOK_MAX
+};
+#define NFNLA_HOOK_MAX (__NFNLA_HOOK_MAX - 1)
+enum nfnl_hook_chain_info_attributes {
+  NFNLA_HOOK_INFO_UNSPEC,
+  NFNLA_HOOK_INFO_DESC,
+  NFNLA_HOOK_INFO_TYPE,
+  __NFNLA_HOOK_INFO_MAX,
+};
+#define NFNLA_HOOK_INFO_MAX (__NFNLA_HOOK_INFO_MAX - 1)
+enum nfnl_hook_chain_desc_attributes {
+  NFNLA_CHAIN_UNSPEC,
+  NFNLA_CHAIN_TABLE,
+  NFNLA_CHAIN_FAMILY,
+  NFNLA_CHAIN_NAME,
+  __NFNLA_CHAIN_MAX,
+};
+#define NFNLA_CHAIN_MAX (__NFNLA_CHAIN_MAX - 1)
+enum nfnl_hook_chaintype {
+  NFNL_HOOK_TYPE_NFTABLES = 0x1,
+};
+#endif
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/netlink.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/netlink.h
index da6a46b..77825cc 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/netlink.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/netlink.h
@@ -80,7 +80,7 @@
 #define NLMSG_HDRLEN ((int) NLMSG_ALIGN(sizeof(struct nlmsghdr)))
 #define NLMSG_LENGTH(len) ((len) + NLMSG_HDRLEN)
 #define NLMSG_SPACE(len) NLMSG_ALIGN(NLMSG_LENGTH(len))
-#define NLMSG_DATA(nlh) ((void *) (((char *) nlh) + NLMSG_LENGTH(0)))
+#define NLMSG_DATA(nlh) ((void *) (((char *) nlh) + NLMSG_HDRLEN))
 #define NLMSG_NEXT(nlh,len) ((len) -= NLMSG_ALIGN((nlh)->nlmsg_len), (struct nlmsghdr *) (((char *) (nlh)) + NLMSG_ALIGN((nlh)->nlmsg_len)))
 #define NLMSG_OK(nlh,len) ((len) >= (int) sizeof(struct nlmsghdr) && (nlh)->nlmsg_len >= sizeof(struct nlmsghdr) && (nlh)->nlmsg_len <= (len))
 #define NLMSG_PAYLOAD(nlh,len) ((nlh)->nlmsg_len - NLMSG_SPACE((len)))
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/nl80211.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/nl80211.h
index e95f2e6..68ee90c 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/nl80211.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/nl80211.h
@@ -738,6 +738,7 @@
   NL80211_BAND_IFTYPE_ATTR_HE_CAP_MCS_SET,
   NL80211_BAND_IFTYPE_ATTR_HE_CAP_PPE,
   NL80211_BAND_IFTYPE_ATTR_HE_6GHZ_CAPA,
+  NL80211_BAND_IFTYPE_ATTR_VENDOR_ELEMS,
   __NL80211_BAND_IFTYPE_ATTR_AFTER_LAST,
   NL80211_BAND_IFTYPE_ATTR_MAX = __NL80211_BAND_IFTYPE_ATTR_AFTER_LAST - 1
 };
@@ -1725,6 +1726,7 @@
   NL80211_PMSR_FTM_REQ_ATTR_TRIGGER_BASED,
   NL80211_PMSR_FTM_REQ_ATTR_NON_TRIGGER_BASED,
   NL80211_PMSR_FTM_REQ_ATTR_LMR_FEEDBACK,
+  NL80211_PMSR_FTM_REQ_ATTR_BSS_COLOR,
   NUM_NL80211_PMSR_FTM_REQ_ATTR,
   NL80211_PMSR_FTM_REQ_ATTR_MAX = NUM_NL80211_PMSR_FTM_REQ_ATTR - 1
 };
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/prctl.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/prctl.h
index 1c3b5c6..907064d 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/prctl.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/prctl.h
@@ -169,6 +169,12 @@
 #define SYSCALL_DISPATCH_FILTER_BLOCK 1
 #define PR_PAC_SET_ENABLED_KEYS 60
 #define PR_PAC_GET_ENABLED_KEYS 61
+#define PR_SCHED_CORE 62
+#define PR_SCHED_CORE_GET 0
+#define PR_SCHED_CORE_CREATE 1
+#define PR_SCHED_CORE_SHARE_TO 2
+#define PR_SCHED_CORE_SHARE_FROM 3
+#define PR_SCHED_CORE_MAX 4
 #define PR_SET_VMA 0x53564d41
 #define PR_SET_VMA_ANON_NAME 0
 #endif
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/sctp.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/sctp.h
index 883920b..765d6c9 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/sctp.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/sctp.h
@@ -94,6 +94,7 @@
 #define SCTP_EXPOSE_POTENTIALLY_FAILED_STATE 131
 #define SCTP_EXPOSE_PF_STATE SCTP_EXPOSE_POTENTIALLY_FAILED_STATE
 #define SCTP_REMOTE_UDP_ENCAPS_PORT 132
+#define SCTP_PLPMTUD_PROBE_INTERVAL 133
 #define SCTP_PR_SCTP_NONE 0x0000
 #define SCTP_PR_SCTP_TTL 0x0010
 #define SCTP_PR_SCTP_RTX 0x0020
@@ -710,4 +711,9 @@
   SCTP_SS_RR,
   SCTP_SS_MAX = SCTP_SS_RR
 };
+struct sctp_probeinterval {
+  sctp_assoc_t spi_assoc_id;
+  struct sockaddr_storage spi_address;
+  __u32 spi_interval;
+};
 #endif
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/seccomp.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/seccomp.h
index 0ae0e12..e58b421 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/seccomp.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/seccomp.h
@@ -69,6 +69,7 @@
   __u32 flags;
 };
 #define SECCOMP_ADDFD_FLAG_SETFD (1UL << 0)
+#define SECCOMP_ADDFD_FLAG_SEND (1UL << 1)
 struct seccomp_notif_addfd {
   __u64 id;
   __u32 flags;
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/seg6_local.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/seg6_local.h
index dfb9374..61a8d97 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/seg6_local.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/seg6_local.h
@@ -51,6 +51,7 @@
   SEG6_LOCAL_ACTION_END_AS = 13,
   SEG6_LOCAL_ACTION_END_AM = 14,
   SEG6_LOCAL_ACTION_END_BPF = 15,
+  SEG6_LOCAL_ACTION_END_DT46 = 16,
   __SEG6_LOCAL_ACTION_MAX,
 };
 #define SEG6_LOCAL_ACTION_MAX (__SEG6_LOCAL_ACTION_MAX - 1)
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/smc.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/smc.h
index 88eef62..83e0bfe 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/smc.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/smc.h
@@ -45,6 +45,8 @@
   SMC_NETLINK_GET_LGR_SMCD,
   SMC_NETLINK_GET_DEV_SMCD,
   SMC_NETLINK_GET_DEV_SMCR,
+  SMC_NETLINK_GET_STATS,
+  SMC_NETLINK_GET_FBACK_STATS,
 };
 enum {
   SMC_GEN_UNSPEC,
@@ -54,6 +56,8 @@
   SMC_GEN_LGR_SMCD,
   SMC_GEN_DEV_SMCD,
   SMC_GEN_DEV_SMCR,
+  SMC_GEN_STATS,
+  SMC_GEN_FBACK_STATS,
   __SMC_GEN_MAX,
   SMC_GEN_MAX = __SMC_GEN_MAX - 1
 };
@@ -140,4 +144,73 @@
   __SMC_NLA_DEV_MAX,
   SMC_NLA_DEV_MAX = __SMC_NLA_DEV_MAX - 1
 };
+enum {
+  SMC_NLA_STATS_PLOAD_PAD,
+  SMC_NLA_STATS_PLOAD_8K,
+  SMC_NLA_STATS_PLOAD_16K,
+  SMC_NLA_STATS_PLOAD_32K,
+  SMC_NLA_STATS_PLOAD_64K,
+  SMC_NLA_STATS_PLOAD_128K,
+  SMC_NLA_STATS_PLOAD_256K,
+  SMC_NLA_STATS_PLOAD_512K,
+  SMC_NLA_STATS_PLOAD_1024K,
+  SMC_NLA_STATS_PLOAD_G_1024K,
+  __SMC_NLA_STATS_PLOAD_MAX,
+  SMC_NLA_STATS_PLOAD_MAX = __SMC_NLA_STATS_PLOAD_MAX - 1
+};
+enum {
+  SMC_NLA_STATS_RMB_PAD,
+  SMC_NLA_STATS_RMB_SIZE_SM_PEER_CNT,
+  SMC_NLA_STATS_RMB_SIZE_SM_CNT,
+  SMC_NLA_STATS_RMB_FULL_PEER_CNT,
+  SMC_NLA_STATS_RMB_FULL_CNT,
+  SMC_NLA_STATS_RMB_REUSE_CNT,
+  SMC_NLA_STATS_RMB_ALLOC_CNT,
+  SMC_NLA_STATS_RMB_DGRADE_CNT,
+  __SMC_NLA_STATS_RMB_MAX,
+  SMC_NLA_STATS_RMB_MAX = __SMC_NLA_STATS_RMB_MAX - 1
+};
+enum {
+  SMC_NLA_STATS_T_PAD,
+  SMC_NLA_STATS_T_TX_RMB_SIZE,
+  SMC_NLA_STATS_T_RX_RMB_SIZE,
+  SMC_NLA_STATS_T_TXPLOAD_SIZE,
+  SMC_NLA_STATS_T_RXPLOAD_SIZE,
+  SMC_NLA_STATS_T_TX_RMB_STATS,
+  SMC_NLA_STATS_T_RX_RMB_STATS,
+  SMC_NLA_STATS_T_CLNT_V1_SUCC,
+  SMC_NLA_STATS_T_CLNT_V2_SUCC,
+  SMC_NLA_STATS_T_SRV_V1_SUCC,
+  SMC_NLA_STATS_T_SRV_V2_SUCC,
+  SMC_NLA_STATS_T_SENDPAGE_CNT,
+  SMC_NLA_STATS_T_SPLICE_CNT,
+  SMC_NLA_STATS_T_CORK_CNT,
+  SMC_NLA_STATS_T_NDLY_CNT,
+  SMC_NLA_STATS_T_URG_DATA_CNT,
+  SMC_NLA_STATS_T_RX_BYTES,
+  SMC_NLA_STATS_T_TX_BYTES,
+  SMC_NLA_STATS_T_RX_CNT,
+  SMC_NLA_STATS_T_TX_CNT,
+  __SMC_NLA_STATS_T_MAX,
+  SMC_NLA_STATS_T_MAX = __SMC_NLA_STATS_T_MAX - 1
+};
+enum {
+  SMC_NLA_STATS_PAD,
+  SMC_NLA_STATS_SMCD_TECH,
+  SMC_NLA_STATS_SMCR_TECH,
+  SMC_NLA_STATS_CLNT_HS_ERR_CNT,
+  SMC_NLA_STATS_SRV_HS_ERR_CNT,
+  __SMC_NLA_STATS_MAX,
+  SMC_NLA_STATS_MAX = __SMC_NLA_STATS_MAX - 1
+};
+enum {
+  SMC_NLA_FBACK_STATS_PAD,
+  SMC_NLA_FBACK_STATS_TYPE,
+  SMC_NLA_FBACK_STATS_SRV_CNT,
+  SMC_NLA_FBACK_STATS_CLNT_CNT,
+  SMC_NLA_FBACK_STATS_RSN_CODE,
+  SMC_NLA_FBACK_STATS_RSN_CNT,
+  __SMC_NLA_FBACK_STATS_MAX,
+  SMC_NLA_FBACK_STATS_MAX = __SMC_NLA_FBACK_STATS_MAX - 1
+};
 #endif
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/snmp.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/snmp.h
index 40e8fa5..a503a7e 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/snmp.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/snmp.h
@@ -257,6 +257,8 @@
   LINUX_MIB_TCPDUPLICATEDATAREHASH,
   LINUX_MIB_TCPDSACKRECVSEGS,
   LINUX_MIB_TCPDSACKIGNOREDDUBIOUS,
+  LINUX_MIB_TCPMIGRATEREQSUCCESS,
+  LINUX_MIB_TCPMIGRATEREQFAILURE,
   __LINUX_MIB_MAX
 };
 enum {
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/surface_aggregator/cdev.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/surface_aggregator/cdev.h
index 25bfd8d..2e097f0 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/surface_aggregator/cdev.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/surface_aggregator/cdev.h
@@ -42,5 +42,34 @@
     __u8 __pad[6];
   } response;
 } __attribute__((__packed__));
+struct ssam_cdev_notifier_desc {
+  __s32 priority;
+  __u8 target_category;
+} __attribute__((__packed__));
+struct ssam_cdev_event_desc {
+  struct {
+    __u8 target_category;
+    __u8 target_id;
+    __u8 cid_enable;
+    __u8 cid_disable;
+  } reg;
+  struct {
+    __u8 target_category;
+    __u8 instance;
+  } id;
+  __u8 flags;
+} __attribute__((__packed__));
+struct ssam_cdev_event {
+  __u8 target_category;
+  __u8 target_id;
+  __u8 command_id;
+  __u8 instance_id;
+  __u16 length;
+  __u8 data[];
+} __attribute__((__packed__));
 #define SSAM_CDEV_REQUEST _IOWR(0xA5, 1, struct ssam_cdev_request)
+#define SSAM_CDEV_NOTIF_REGISTER _IOW(0xA5, 2, struct ssam_cdev_notifier_desc)
+#define SSAM_CDEV_NOTIF_UNREGISTER _IOW(0xA5, 3, struct ssam_cdev_notifier_desc)
+#define SSAM_CDEV_EVENT_ENABLE _IOW(0xA5, 4, struct ssam_cdev_event_desc)
+#define SSAM_CDEV_EVENT_DISABLE _IOW(0xA5, 5, struct ssam_cdev_event_desc)
 #endif
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/userfaultfd.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/userfaultfd.h
index 9a7fcef..ca7b7a5 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/userfaultfd.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/userfaultfd.h
@@ -21,7 +21,7 @@
 #include <linux/types.h>
 #define UFFD_API ((__u64) 0xAA)
 #define UFFD_API_REGISTER_MODES (UFFDIO_REGISTER_MODE_MISSING | UFFDIO_REGISTER_MODE_WP | UFFDIO_REGISTER_MODE_MINOR)
-#define UFFD_API_FEATURES (UFFD_FEATURE_PAGEFAULT_FLAG_WP | UFFD_FEATURE_EVENT_FORK | UFFD_FEATURE_EVENT_REMAP | UFFD_FEATURE_EVENT_REMOVE | UFFD_FEATURE_EVENT_UNMAP | UFFD_FEATURE_MISSING_HUGETLBFS | UFFD_FEATURE_MISSING_SHMEM | UFFD_FEATURE_SIGBUS | UFFD_FEATURE_THREAD_ID | UFFD_FEATURE_MINOR_HUGETLBFS)
+#define UFFD_API_FEATURES (UFFD_FEATURE_PAGEFAULT_FLAG_WP | UFFD_FEATURE_EVENT_FORK | UFFD_FEATURE_EVENT_REMAP | UFFD_FEATURE_EVENT_REMOVE | UFFD_FEATURE_EVENT_UNMAP | UFFD_FEATURE_MISSING_HUGETLBFS | UFFD_FEATURE_MISSING_SHMEM | UFFD_FEATURE_SIGBUS | UFFD_FEATURE_THREAD_ID | UFFD_FEATURE_MINOR_HUGETLBFS | UFFD_FEATURE_MINOR_SHMEM)
 #define UFFD_API_IOCTLS ((__u64) 1 << _UFFDIO_REGISTER | (__u64) 1 << _UFFDIO_UNREGISTER | (__u64) 1 << _UFFDIO_API)
 #define UFFD_API_RANGE_IOCTLS ((__u64) 1 << _UFFDIO_WAKE | (__u64) 1 << _UFFDIO_COPY | (__u64) 1 << _UFFDIO_ZEROPAGE | (__u64) 1 << _UFFDIO_WRITEPROTECT | (__u64) 1 << _UFFDIO_CONTINUE)
 #define UFFD_API_RANGE_IOCTLS_BASIC ((__u64) 1 << _UFFDIO_WAKE | (__u64) 1 << _UFFDIO_COPY | (__u64) 1 << _UFFDIO_CONTINUE)
@@ -94,6 +94,7 @@
 #define UFFD_FEATURE_SIGBUS (1 << 7)
 #define UFFD_FEATURE_THREAD_ID (1 << 8)
 #define UFFD_FEATURE_MINOR_HUGETLBFS (1 << 9)
+#define UFFD_FEATURE_MINOR_SHMEM (1 << 10)
   __u64 features;
   __u64 ioctls;
 };
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/v4l2-controls.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/v4l2-controls.h
index cd8ef92..28ee31d 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/v4l2-controls.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/v4l2-controls.h
@@ -18,6 +18,7 @@
  ****************************************************************************/
 #ifndef __LINUX_V4L2_CONTROLS_H
 #define __LINUX_V4L2_CONTROLS_H
+#include <linux/const.h>
 #include <linux/types.h>
 #define V4L2_CTRL_CLASS_USER 0x00980000
 #define V4L2_CTRL_CLASS_CODEC 0x00990000
@@ -1166,17 +1167,17 @@
   __u32 flags;
 };
 #define V4L2_FWHT_VERSION 3
-#define V4L2_FWHT_FL_IS_INTERLACED BIT(0)
-#define V4L2_FWHT_FL_IS_BOTTOM_FIRST BIT(1)
-#define V4L2_FWHT_FL_IS_ALTERNATE BIT(2)
-#define V4L2_FWHT_FL_IS_BOTTOM_FIELD BIT(3)
-#define V4L2_FWHT_FL_LUMA_IS_UNCOMPRESSED BIT(4)
-#define V4L2_FWHT_FL_CB_IS_UNCOMPRESSED BIT(5)
-#define V4L2_FWHT_FL_CR_IS_UNCOMPRESSED BIT(6)
-#define V4L2_FWHT_FL_CHROMA_FULL_HEIGHT BIT(7)
-#define V4L2_FWHT_FL_CHROMA_FULL_WIDTH BIT(8)
-#define V4L2_FWHT_FL_ALPHA_IS_UNCOMPRESSED BIT(9)
-#define V4L2_FWHT_FL_I_FRAME BIT(10)
+#define V4L2_FWHT_FL_IS_INTERLACED _BITUL(0)
+#define V4L2_FWHT_FL_IS_BOTTOM_FIRST _BITUL(1)
+#define V4L2_FWHT_FL_IS_ALTERNATE _BITUL(2)
+#define V4L2_FWHT_FL_IS_BOTTOM_FIELD _BITUL(3)
+#define V4L2_FWHT_FL_LUMA_IS_UNCOMPRESSED _BITUL(4)
+#define V4L2_FWHT_FL_CB_IS_UNCOMPRESSED _BITUL(5)
+#define V4L2_FWHT_FL_CR_IS_UNCOMPRESSED _BITUL(6)
+#define V4L2_FWHT_FL_CHROMA_FULL_HEIGHT _BITUL(7)
+#define V4L2_FWHT_FL_CHROMA_FULL_WIDTH _BITUL(8)
+#define V4L2_FWHT_FL_ALPHA_IS_UNCOMPRESSED _BITUL(9)
+#define V4L2_FWHT_FL_I_FRAME _BITUL(10)
 #define V4L2_FWHT_FL_COMPONENTS_NUM_MSK GENMASK(18, 16)
 #define V4L2_FWHT_FL_COMPONENTS_NUM_OFFSET 16
 #define V4L2_FWHT_FL_PIXENC_MSK GENMASK(20, 19)
@@ -1274,6 +1275,49 @@
   __u64 alt_frame_ts;
   __u64 flags;
 };
+#define V4L2_MPEG2_SEQ_FLAG_PROGRESSIVE 0x01
+#define V4L2_CID_STATELESS_MPEG2_SEQUENCE (V4L2_CID_CODEC_STATELESS_BASE + 220)
+struct v4l2_ctrl_mpeg2_sequence {
+  __u16 horizontal_size;
+  __u16 vertical_size;
+  __u32 vbv_buffer_size;
+  __u16 profile_and_level_indication;
+  __u8 chroma_format;
+  __u8 flags;
+};
+#define V4L2_MPEG2_PIC_CODING_TYPE_I 1
+#define V4L2_MPEG2_PIC_CODING_TYPE_P 2
+#define V4L2_MPEG2_PIC_CODING_TYPE_B 3
+#define V4L2_MPEG2_PIC_CODING_TYPE_D 4
+#define V4L2_MPEG2_PIC_TOP_FIELD 0x1
+#define V4L2_MPEG2_PIC_BOTTOM_FIELD 0x2
+#define V4L2_MPEG2_PIC_FRAME 0x3
+#define V4L2_MPEG2_PIC_FLAG_TOP_FIELD_FIRST 0x0001
+#define V4L2_MPEG2_PIC_FLAG_FRAME_PRED_DCT 0x0002
+#define V4L2_MPEG2_PIC_FLAG_CONCEALMENT_MV 0x0004
+#define V4L2_MPEG2_PIC_FLAG_Q_SCALE_TYPE 0x0008
+#define V4L2_MPEG2_PIC_FLAG_INTRA_VLC 0x0010
+#define V4L2_MPEG2_PIC_FLAG_ALT_SCAN 0x0020
+#define V4L2_MPEG2_PIC_FLAG_REPEAT_FIRST 0x0040
+#define V4L2_MPEG2_PIC_FLAG_PROGRESSIVE 0x0080
+#define V4L2_CID_STATELESS_MPEG2_PICTURE (V4L2_CID_CODEC_STATELESS_BASE + 221)
+struct v4l2_ctrl_mpeg2_picture {
+  __u64 backward_ref_ts;
+  __u64 forward_ref_ts;
+  __u32 flags;
+  __u8 f_code[2][2];
+  __u8 picture_coding_type;
+  __u8 picture_structure;
+  __u8 intra_dc_precision;
+  __u8 reserved[5];
+};
+#define V4L2_CID_STATELESS_MPEG2_QUANTISATION (V4L2_CID_CODEC_STATELESS_BASE + 222)
+struct v4l2_ctrl_mpeg2_quantisation {
+  __u8 intra_quantiser_matrix[64];
+  __u8 non_intra_quantiser_matrix[64];
+  __u8 chroma_intra_quantiser_matrix[64];
+  __u8 chroma_non_intra_quantiser_matrix[64];
+};
 #define V4L2_CID_COLORIMETRY_CLASS_BASE (V4L2_CTRL_CLASS_COLORIMETRY | 0x900)
 #define V4L2_CID_COLORIMETRY_CLASS (V4L2_CTRL_CLASS_COLORIMETRY | 1)
 #define V4L2_CID_COLORIMETRY_HDR10_CLL_INFO (V4L2_CID_COLORIMETRY_CLASS_BASE + 0)
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/version.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/version.h
index 7dd0902..a2528a6 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/version.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/version.h
@@ -16,8 +16,8 @@
  ***
  ****************************************************************************
  ****************************************************************************/
-#define LINUX_VERSION_CODE 331008
+#define LINUX_VERSION_CODE 331264
 #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + ((c) > 255 ? 255 : (c)))
 #define LINUX_VERSION_MAJOR 5
-#define LINUX_VERSION_PATCHLEVEL 13
+#define LINUX_VERSION_PATCHLEVEL 14
 #define LINUX_VERSION_SUBLEVEL 0
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/videodev2.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/videodev2.h
index 793822e..8e856ac 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/videodev2.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/videodev2.h
@@ -891,6 +891,9 @@
     struct v4l2_ctrl_h264_decode_params __user * p_h264_decode_params;
     struct v4l2_ctrl_fwht_params __user * p_fwht_params;
     struct v4l2_ctrl_vp8_frame __user * p_vp8_frame;
+    struct v4l2_ctrl_mpeg2_sequence __user * p_mpeg2_sequence;
+    struct v4l2_ctrl_mpeg2_picture __user * p_mpeg2_picture;
+    struct v4l2_ctrl_mpeg2_quantisation __user * p_mpeg2_quantisation;
     void __user * ptr;
   };
 } __attribute__((packed));
@@ -938,6 +941,9 @@
   V4L2_CTRL_TYPE_H264_PRED_WEIGHTS = 0x0205,
   V4L2_CTRL_TYPE_FWHT_PARAMS = 0x0220,
   V4L2_CTRL_TYPE_VP8_FRAME = 0x0240,
+  V4L2_CTRL_TYPE_MPEG2_QUANTISATION = 0x0250,
+  V4L2_CTRL_TYPE_MPEG2_SEQUENCE = 0x0251,
+  V4L2_CTRL_TYPE_MPEG2_PICTURE = 0x0252,
 };
 struct v4l2_queryctrl {
   __u32 id;
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/virtio_ids.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/virtio_ids.h
index da53352..cf2c864 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/virtio_ids.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/virtio_ids.h
@@ -45,4 +45,11 @@
 #define VIRTIO_ID_PMEM 27
 #define VIRTIO_ID_MAC80211_HWSIM 29
 #define VIRTIO_ID_BT 40
+#define VIRTIO_TRANS_ID_NET 1000
+#define VIRTIO_TRANS_ID_BLOCK 1001
+#define VIRTIO_TRANS_ID_BALLOON 1002
+#define VIRTIO_TRANS_ID_CONSOLE 1003
+#define VIRTIO_TRANS_ID_SCSI 1004
+#define VIRTIO_TRANS_ID_RNG 1005
+#define VIRTIO_TRANS_ID_9P 1009
 #endif
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/raw.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/virtio_pcidev.h
similarity index 68%
copy from toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/raw.h
copy to toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/virtio_pcidev.h
index bb45c3d..01c5869 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/raw.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/virtio_pcidev.h
@@ -16,14 +16,26 @@
  ***
  ****************************************************************************
  ****************************************************************************/
-#ifndef __LINUX_RAW_H
-#define __LINUX_RAW_H
+#ifndef _UAPI_LINUX_VIRTIO_PCIDEV_H
+#define _UAPI_LINUX_VIRTIO_PCIDEV_H
 #include <linux/types.h>
-#define RAW_SETBIND _IO(0xac, 0)
-#define RAW_GETBIND _IO(0xac, 1)
-struct raw_config_request {
-  int raw_minor;
-  __u64 block_major;
-  __u64 block_minor;
+enum virtio_pcidev_ops {
+  VIRTIO_PCIDEV_OP_RESERVED = 0,
+  VIRTIO_PCIDEV_OP_CFG_READ,
+  VIRTIO_PCIDEV_OP_CFG_WRITE,
+  VIRTIO_PCIDEV_OP_MMIO_READ,
+  VIRTIO_PCIDEV_OP_MMIO_WRITE,
+  VIRTIO_PCIDEV_OP_MMIO_MEMSET,
+  VIRTIO_PCIDEV_OP_INT,
+  VIRTIO_PCIDEV_OP_MSI,
+  VIRTIO_PCIDEV_OP_PME,
+};
+struct virtio_pcidev_msg {
+  __u8 op;
+  __u8 bar;
+  __u16 reserved;
+  __u32 size;
+  __u64 addr;
+  __u8 data[];
 };
 #endif
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/virtio_vsock.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/virtio_vsock.h
index 7a9e259..bff6164 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/virtio_vsock.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/virtio_vsock.h
@@ -21,6 +21,7 @@
 #include <linux/types.h>
 #include <linux/virtio_ids.h>
 #include <linux/virtio_config.h>
+#define VIRTIO_VSOCK_F_SEQPACKET 1
 struct virtio_vsock_config {
   __le64 guest_cid;
 } __attribute__((packed));
@@ -44,6 +45,7 @@
 } __attribute__((packed));
 enum virtio_vsock_type {
   VIRTIO_VSOCK_TYPE_STREAM = 1,
+  VIRTIO_VSOCK_TYPE_SEQPACKET = 2,
 };
 enum virtio_vsock_op {
   VIRTIO_VSOCK_OP_INVALID = 0,
@@ -59,4 +61,7 @@
   VIRTIO_VSOCK_SHUTDOWN_RCV = 1,
   VIRTIO_VSOCK_SHUTDOWN_SEND = 2,
 };
+enum virtio_vsock_rw {
+  VIRTIO_VSOCK_SEQ_EOR = 1,
+};
 #endif
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/raw.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/wwan.h
similarity index 81%
copy from toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/raw.h
copy to toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/wwan.h
index bb45c3d..9f68713 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/raw.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/wwan.h
@@ -16,14 +16,12 @@
  ***
  ****************************************************************************
  ****************************************************************************/
-#ifndef __LINUX_RAW_H
-#define __LINUX_RAW_H
-#include <linux/types.h>
-#define RAW_SETBIND _IO(0xac, 0)
-#define RAW_GETBIND _IO(0xac, 1)
-struct raw_config_request {
-  int raw_minor;
-  __u64 block_major;
-  __u64 block_minor;
+#ifndef _UAPI_WWAN_H_
+#define _UAPI_WWAN_H_
+enum {
+  IFLA_WWAN_UNSPEC,
+  IFLA_WWAN_LINK_ID,
+  __IFLA_WWAN_MAX
 };
+#define IFLA_WWAN_MAX (__IFLA_WWAN_MAX - 1)
 #endif
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/misc/habanalabs.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/misc/habanalabs.h
index dd0b216..ba905f8 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/misc/habanalabs.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/misc/habanalabs.h
@@ -254,6 +254,7 @@
 #define HL_INFO_TOTAL_ENERGY 15
 #define HL_INFO_PLL_FREQUENCY 16
 #define HL_INFO_POWER 17
+#define HL_INFO_OPEN_STATS 18
 #define HL_INFO_VERSION_MAX_LEN 128
 #define HL_INFO_CARD_NAME_MAX_LEN 16
 struct hl_info_hw_ip_info {
@@ -327,6 +328,10 @@
 struct hl_pll_frequency_info {
   __u16 output[HL_PLL_NUM_OUTPUTS];
 };
+struct hl_open_stats_info {
+  __u64 open_counter;
+  __u64 last_open_period_ms;
+};
 struct hl_power_info {
   __u64 power;
 };
@@ -417,6 +422,7 @@
 #define HL_CS_FLAGS_STAGED_SUBMISSION_FIRST 0x80
 #define HL_CS_FLAGS_STAGED_SUBMISSION_LAST 0x100
 #define HL_CS_FLAGS_CUSTOM_TIMEOUT 0x200
+#define HL_CS_FLAGS_SKIP_RESET_ON_TIMEOUT 0x400
 #define HL_CS_STATUS_SUCCESS 0
 #define HL_MAX_JOBS_PER_CS 512
 struct hl_cs_in {
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/rdma/bnxt_re-abi.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/rdma/bnxt_re-abi.h
index 3e45dc3..62ba685 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/rdma/bnxt_re-abi.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/rdma/bnxt_re-abi.h
@@ -24,7 +24,13 @@
 #define BNXT_RE_CHIP_ID0_CHIP_REV_SFT 0x10
 #define BNXT_RE_CHIP_ID0_CHIP_MET_SFT 0x18
 enum {
-  BNXT_RE_UCNTX_CMASK_HAVE_CCTX = 0x1ULL
+  BNXT_RE_UCNTX_CMASK_HAVE_CCTX = 0x1ULL,
+  BNXT_RE_UCNTX_CMASK_HAVE_MODE = 0x02ULL,
+};
+enum bnxt_re_wqe_mode {
+  BNXT_QPLIB_WQE_MODE_STATIC = 0x00,
+  BNXT_QPLIB_WQE_MODE_VARIABLE = 0x01,
+  BNXT_QPLIB_WQE_MODE_INVALID = 0x02,
 };
 struct bnxt_re_uctx_resp {
   __u32 dev_id;
@@ -36,6 +42,8 @@
   __aligned_u64 comp_mask;
   __u32 chip_id0;
   __u32 chip_id1;
+  __u32 mode;
+  __u32 rsvd1;
 };
 struct bnxt_re_pd_resp {
   __u32 pdid;
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/rdma/i40iw-abi.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/rdma/i40iw-abi.h
deleted file mode 100644
index 60a17f5..0000000
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/rdma/i40iw-abi.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ***   To edit the content of this header, modify the corresponding
- ***   source file (e.g. under external/kernel-headers/original/) then
- ***   run bionic/libc/kernel/tools/update_all.py
- ***
- ***   Any manual change here will be lost the next time this script will
- ***   be run. You've been warned!
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef I40IW_ABI_H
-#define I40IW_ABI_H
-#include <linux/types.h>
-#define I40IW_ABI_VER 5
-struct i40iw_alloc_ucontext_req {
-  __u32 reserved32;
-  __u8 userspace_ver;
-  __u8 reserved8[3];
-};
-struct i40iw_alloc_ucontext_resp {
-  __u32 max_pds;
-  __u32 max_qps;
-  __u32 wq_size;
-  __u8 kernel_ver;
-  __u8 reserved[3];
-};
-struct i40iw_alloc_pd_resp {
-  __u32 pd_id;
-  __u8 reserved[4];
-};
-struct i40iw_create_cq_req {
-  __aligned_u64 user_cq_buffer;
-  __aligned_u64 user_shadow_area;
-};
-struct i40iw_create_qp_req {
-  __aligned_u64 user_wqe_buffers;
-  __aligned_u64 user_compl_ctx;
-  __aligned_u64 user_sq_phb;
-  __aligned_u64 user_rq_phb;
-};
-enum i40iw_memreg_type {
-  IW_MEMREG_TYPE_MEM = 0x0000,
-  IW_MEMREG_TYPE_QP = 0x0001,
-  IW_MEMREG_TYPE_CQ = 0x0002,
-};
-struct i40iw_mem_reg_req {
-  __u16 reg_type;
-  __u16 cq_pages;
-  __u16 rq_pages;
-  __u16 sq_pages;
-};
-struct i40iw_create_cq_resp {
-  __u32 cq_id;
-  __u32 cq_size;
-  __u32 mmap_db_index;
-  __u32 reserved;
-};
-struct i40iw_create_qp_resp {
-  __u32 qp_id;
-  __u32 actual_sq_size;
-  __u32 actual_rq_size;
-  __u32 i40iw_drv_opt;
-  __u16 push_idx;
-  __u8 lsmm;
-  __u8 rsvd2;
-};
-#endif
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/rdma/ib_user_ioctl_verbs.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/rdma/ib_user_ioctl_verbs.h
index c443738..3b94907 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/rdma/ib_user_ioctl_verbs.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/rdma/ib_user_ioctl_verbs.h
@@ -181,6 +181,7 @@
   RDMA_DRIVER_OCRDMA,
   RDMA_DRIVER_NES,
   RDMA_DRIVER_I40IW,
+  RDMA_DRIVER_IRDMA = RDMA_DRIVER_I40IW,
   RDMA_DRIVER_VMW_PVRDMA,
   RDMA_DRIVER_QEDR,
   RDMA_DRIVER_HNS,
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/rdma/ib_user_mad.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/rdma/ib_user_mad.h
index dadb590..04b9f08 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/rdma/ib_user_mad.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/rdma/ib_user_mad.h
@@ -61,7 +61,7 @@
 };
 struct ib_user_mad {
   struct ib_user_mad_hdr hdr;
-  __aligned_u64 data[0];
+  __aligned_u64 data[];
 };
 typedef unsigned long __attribute__((aligned(4))) packed_ulong;
 #define IB_USER_MAD_LONGS_PER_METHOD_MASK (128 / (8 * sizeof(long)))
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/rdma/irdma-abi.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/rdma/irdma-abi.h
new file mode 100644
index 0000000..b6840cf
--- /dev/null
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/rdma/irdma-abi.h
@@ -0,0 +1,103 @@
+/****************************************************************************
+ ****************************************************************************
+ ***
+ ***   This header was automatically generated from a Linux kernel header
+ ***   of the same name, to make information necessary for userspace to
+ ***   call into the kernel available to libc.  It contains only constants,
+ ***   structures, and macros generated from the original header, and thus,
+ ***   contains no copyrightable information.
+ ***
+ ***   To edit the content of this header, modify the corresponding
+ ***   source file (e.g. under external/kernel-headers/original/) then
+ ***   run bionic/libc/kernel/tools/update_all.py
+ ***
+ ***   Any manual change here will be lost the next time this script will
+ ***   be run. You've been warned!
+ ***
+ ****************************************************************************
+ ****************************************************************************/
+#ifndef IRDMA_ABI_H
+#define IRDMA_ABI_H
+#include <linux/types.h>
+#define IRDMA_ABI_VER 5
+enum irdma_memreg_type {
+  IRDMA_MEMREG_TYPE_MEM = 0,
+  IRDMA_MEMREG_TYPE_QP = 1,
+  IRDMA_MEMREG_TYPE_CQ = 2,
+};
+struct irdma_alloc_ucontext_req {
+  __u32 rsvd32;
+  __u8 userspace_ver;
+  __u8 rsvd8[3];
+};
+struct irdma_alloc_ucontext_resp {
+  __u32 max_pds;
+  __u32 max_qps;
+  __u32 wq_size;
+  __u8 kernel_ver;
+  __u8 rsvd[3];
+  __aligned_u64 feature_flags;
+  __aligned_u64 db_mmap_key;
+  __u32 max_hw_wq_frags;
+  __u32 max_hw_read_sges;
+  __u32 max_hw_inline;
+  __u32 max_hw_rq_quanta;
+  __u32 max_hw_wq_quanta;
+  __u32 min_hw_cq_size;
+  __u32 max_hw_cq_size;
+  __u16 max_hw_sq_chunk;
+  __u8 hw_rev;
+  __u8 rsvd2;
+};
+struct irdma_alloc_pd_resp {
+  __u32 pd_id;
+  __u8 rsvd[4];
+};
+struct irdma_resize_cq_req {
+  __aligned_u64 user_cq_buffer;
+};
+struct irdma_create_cq_req {
+  __aligned_u64 user_cq_buf;
+  __aligned_u64 user_shadow_area;
+};
+struct irdma_create_qp_req {
+  __aligned_u64 user_wqe_bufs;
+  __aligned_u64 user_compl_ctx;
+};
+struct irdma_mem_reg_req {
+  __u16 reg_type;
+  __u16 cq_pages;
+  __u16 rq_pages;
+  __u16 sq_pages;
+};
+struct irdma_modify_qp_req {
+  __u8 sq_flush;
+  __u8 rq_flush;
+  __u8 rsvd[6];
+};
+struct irdma_create_cq_resp {
+  __u32 cq_id;
+  __u32 cq_size;
+};
+struct irdma_create_qp_resp {
+  __u32 qp_id;
+  __u32 actual_sq_size;
+  __u32 actual_rq_size;
+  __u32 irdma_drv_opt;
+  __u16 push_idx;
+  __u8 lsmm;
+  __u8 rsvd;
+  __u32 qp_caps;
+};
+struct irdma_modify_qp_resp {
+  __aligned_u64 push_wqe_mmap_key;
+  __aligned_u64 push_db_mmap_key;
+  __u16 push_offset;
+  __u8 push_valid;
+  __u8 rsvd[5];
+};
+struct irdma_create_ah_resp {
+  __u32 ah_id;
+  __u8 rsvd[4];
+};
+#endif
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/rdma/mlx5-abi.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/rdma/mlx5-abi.h
index 59a9f53..292c258 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/rdma/mlx5-abi.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/rdma/mlx5-abi.h
@@ -67,6 +67,8 @@
   MLX5_IB_ALLOC_UCONTEXT_RESP_MASK_CORE_CLOCK_OFFSET = 1UL << 0,
   MLX5_IB_ALLOC_UCONTEXT_RESP_MASK_DUMP_FILL_MKEY = 1UL << 1,
   MLX5_IB_ALLOC_UCONTEXT_RESP_MASK_ECE = 1UL << 2,
+  MLX5_IB_ALLOC_UCONTEXT_RESP_MASK_SQD2RTS = 1UL << 3,
+  MLX5_IB_ALLOC_UCONTEXT_RESP_MASK_REAL_TIME_TS = 1UL << 4,
 };
 enum mlx5_user_cmds_supp_uhw {
   MLX5_USER_CMDS_SUPP_UHW_QUERY_DEVICE = 1 << 0,
@@ -193,6 +195,7 @@
 enum mlx5_ib_create_cq_flags {
   MLX5_IB_CREATE_CQ_FLAGS_CQE_128B_PAD = 1 << 0,
   MLX5_IB_CREATE_CQ_FLAGS_UAR_PAGE_INDEX = 1 << 1,
+  MLX5_IB_CREATE_CQ_FLAGS_REAL_TIME_TS = 1 << 2,
 };
 struct mlx5_ib_create_cq {
   __aligned_u64 buf_addr;
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/rdma/rdma_user_rxe.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/rdma/rdma_user_rxe.h
index 9fd21d7..098bf6c 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/rdma/rdma_user_rxe.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/rdma/rdma_user_rxe.h
@@ -78,13 +78,13 @@
       __u16 pkey_index;
     } ud;
     struct {
-      union {
-        struct ib_mr * mr;
-        __aligned_u64 reserved;
-      };
-      __u32 key;
+      __aligned_u64 addr;
+      __aligned_u64 length;
+      __u32 mr_lkey;
+      __u32 mw_rkey;
+      __u32 rkey;
       __u32 access;
-    } reg;
+    } mw;
   } wr;
 };
 struct rxe_sge {
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/scsi/scsi.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/scsi/scsi.h
index 2ea16a3..a91a7f6 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/scsi/scsi.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/scsi/scsi.h
@@ -20,6 +20,7 @@
 #define _SCSI_SCSI_H
 #include <linux/types.h>
 #include <scsi/scsi_proto.h>
+#include <scsi/scsi_status.h>
 struct ccs_modesel_head {
   __u8 _r1;
   __u8 medium;
@@ -66,8 +67,6 @@
 #define IGNORE_WIDE_RESIDUE 0x23
 #define ACA 0x24
 #define QAS_REQUEST 0x55
-#define BUS_DEVICE_RESET TARGET_RESET
-#define ABORT ABORT_TASK_SET
 #define SCSI_IOCTL_GET_IDLUN 0x5382
 #define SCSI_IOCTL_PROBE_HOST 0x5385
 #define SCSI_IOCTL_GET_BUS_NUMBER 0x5386
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/scsi/scsi_proto.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/scsi/scsi_proto.h
index a77eded..eea87a0 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/scsi/scsi_proto.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/scsi/scsi_proto.h
@@ -124,17 +124,6 @@
 #define SERVICE_ACTION_BIDIRECTIONAL 0x9d
 #define SERVICE_ACTION_IN_16 0x9e
 #define SERVICE_ACTION_OUT_16 0x9f
-#define GOOD 0x00
-#define CHECK_CONDITION 0x01
-#define CONDITION_GOOD 0x02
-#define BUSY 0x04
-#define INTERMEDIATE_GOOD 0x08
-#define INTERMEDIATE_C_GOOD 0x0a
-#define RESERVATION_CONFLICT 0x0c
-#define COMMAND_TERMINATED 0x11
-#define QUEUE_FULL 0x14
-#define ACA_ACTIVE 0x18
-#define TASK_ABORTED 0x20
 #define STATUS_MASK 0xfe
 #define NO_SENSE 0x00
 #define RECOVERED_ERROR 0x01
@@ -205,4 +194,14 @@
   ZBC_ZONE_COND_FULL = 0xe,
   ZBC_ZONE_COND_OFFLINE = 0xf,
 };
+enum scsi_version_descriptor {
+  SCSI_VERSION_DESCRIPTOR_FCP4 = 0x0a40,
+  SCSI_VERSION_DESCRIPTOR_ISCSI = 0x0960,
+  SCSI_VERSION_DESCRIPTOR_SAM5 = 0x00a0,
+  SCSI_VERSION_DESCRIPTOR_SAS3 = 0x0c60,
+  SCSI_VERSION_DESCRIPTOR_SBC3 = 0x04c0,
+  SCSI_VERSION_DESCRIPTOR_SBP3 = 0x0980,
+  SCSI_VERSION_DESCRIPTOR_SPC4 = 0x0460,
+  SCSI_VERSION_DESCRIPTOR_SRP = 0x0940
+};
 #endif
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/raw.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/scsi/scsi_status.h
similarity index 82%
rename from toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/raw.h
rename to toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/scsi/scsi_status.h
index bb45c3d..6a7fc10 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/linux/raw.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/scsi/scsi_status.h
@@ -16,14 +16,8 @@
  ***
  ****************************************************************************
  ****************************************************************************/
-#ifndef __LINUX_RAW_H
-#define __LINUX_RAW_H
+#ifndef _SCSI_SCSI_STATUS_H
+#define _SCSI_SCSI_STATUS_H
 #include <linux/types.h>
-#define RAW_SETBIND _IO(0xac, 0)
-#define RAW_GETBIND _IO(0xac, 1)
-struct raw_config_request {
-  int raw_minor;
-  __u64 block_major;
-  __u64 block_minor;
-};
+#include <scsi/scsi_proto.h>
 #endif
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/scsi/sg.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/scsi/sg.h
index 828b2c6..a7a1944 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/scsi/sg.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/scsi/sg.h
@@ -66,6 +66,20 @@
 #define SG_INFO_INDIRECT_IO 0x0
 #define SG_INFO_DIRECT_IO 0x2
 #define SG_INFO_MIXED_IO 0x4
+#define DRIVER_SENSE 0x08
+#define driver_byte(result) (((result) >> 24) & 0xff)
+#define GOOD 0x00
+#define CHECK_CONDITION 0x01
+#define CONDITION_GOOD 0x02
+#define BUSY 0x04
+#define INTERMEDIATE_GOOD 0x08
+#define INTERMEDIATE_C_GOOD 0x0a
+#define RESERVATION_CONFLICT 0x0c
+#define COMMAND_TERMINATED 0x11
+#define QUEUE_FULL 0x14
+#define ACA_ACTIVE 0x18
+#define TASK_ABORTED 0x20
+#define status_byte(result) (((result) >> 1) & 0x7f)
 typedef struct sg_scsi_id {
   int host_no;
   int channel;
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/sound/asound.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/sound/asound.h
index 397cccc..ef3c311 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/sound/asound.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/sound/asound.h
@@ -562,7 +562,7 @@
 #define SNDRV_PCM_IOCTL_READN_FRAMES _IOR('A', 0x53, struct snd_xfern)
 #define SNDRV_PCM_IOCTL_LINK _IOW('A', 0x60, int)
 #define SNDRV_PCM_IOCTL_UNLINK _IO('A', 0x61)
-#define SNDRV_RAWMIDI_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 1)
+#define SNDRV_RAWMIDI_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 2)
 enum {
   SNDRV_RAWMIDI_STREAM_OUTPUT = 0,
   SNDRV_RAWMIDI_STREAM_INPUT,
@@ -584,12 +584,32 @@
   unsigned int subdevices_avail;
   unsigned char reserved[64];
 };
+#define SNDRV_RAWMIDI_MODE_FRAMING_MASK (7 << 0)
+#define SNDRV_RAWMIDI_MODE_FRAMING_SHIFT 0
+#define SNDRV_RAWMIDI_MODE_FRAMING_NONE (0 << 0)
+#define SNDRV_RAWMIDI_MODE_FRAMING_TSTAMP (1 << 0)
+#define SNDRV_RAWMIDI_MODE_CLOCK_MASK (7 << 3)
+#define SNDRV_RAWMIDI_MODE_CLOCK_SHIFT 3
+#define SNDRV_RAWMIDI_MODE_CLOCK_NONE (0 << 3)
+#define SNDRV_RAWMIDI_MODE_CLOCK_REALTIME (1 << 3)
+#define SNDRV_RAWMIDI_MODE_CLOCK_MONOTONIC (2 << 3)
+#define SNDRV_RAWMIDI_MODE_CLOCK_MONOTONIC_RAW (3 << 3)
+#define SNDRV_RAWMIDI_FRAMING_DATA_LENGTH 16
+struct snd_rawmidi_framing_tstamp {
+  __u8 frame_type;
+  __u8 length;
+  __u8 reserved[2];
+  __u32 tv_nsec;
+  __u64 tv_sec;
+  __u8 data[SNDRV_RAWMIDI_FRAMING_DATA_LENGTH];
+} __packed;
 struct snd_rawmidi_params {
   int stream;
   size_t buffer_size;
   size_t avail_min;
   unsigned int no_active_sensing : 1;
-  unsigned char reserved[16];
+  unsigned int mode;
+  unsigned char reserved[12];
 };
 struct snd_rawmidi_status {
   int stream;
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/unicode/char16ptr.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/unicode/char16ptr.h
index 1de1796..9209b62 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/unicode/char16ptr.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/unicode/char16ptr.h
@@ -14,6 +14,8 @@
 #include <cstddef>
 
 /**
+ * @addtogroup ICU4C
+ * @{
  * \file
  * \brief C++ API: char16_t pointer wrappers with
  *        implicit conversion from bit-compatible raw pointer types.
@@ -25,7 +27,7 @@
 /**
  * \def U_ALIASING_BARRIER
  * Barrier for pointer anti-aliasing optimizations even across function boundaries.
- * @internal
+ * \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only.
  */
 #ifdef U_ALIASING_BARRIER
     // Use the predefined value.
@@ -37,21 +39,21 @@
 
 /**
  * char16_t * wrapper with implicit conversion from distinct but bit-compatible pointer types.
- * @stable ICU 59
+ * \xrefitem stable "Stable" "Stable List" ICU 59
  */
 class U_COMMON_API Char16Ptr U_FINAL {
 public:
     /**
      * Copies the pointer.
      * @param p pointer
-     * @stable ICU 59
+     * \xrefitem stable "Stable" "Stable List" ICU 59
      */
     inline Char16Ptr(char16_t *p);
 #if !U_CHAR16_IS_TYPEDEF
     /**
      * Converts the pointer to char16_t *.
      * @param p pointer to be converted
-     * @stable ICU 59
+     * \xrefitem stable "Stable" "Stable List" ICU 59
      */
     inline Char16Ptr(uint16_t *p);
 #endif
@@ -60,32 +62,32 @@
      * Converts the pointer to char16_t *.
      * (Only defined if U_SIZEOF_WCHAR_T==2.)
      * @param p pointer to be converted
-     * @stable ICU 59
+     * \xrefitem stable "Stable" "Stable List" ICU 59
      */
     inline Char16Ptr(wchar_t *p);
 #endif
     /**
      * nullptr constructor.
      * @param p nullptr
-     * @stable ICU 59
+     * \xrefitem stable "Stable" "Stable List" ICU 59
      */
     inline Char16Ptr(std::nullptr_t p);
     /**
      * Destructor.
-     * @stable ICU 59
+     * \xrefitem stable "Stable" "Stable List" ICU 59
      */
     inline ~Char16Ptr();
 
     /**
      * Pointer access.
      * @return the wrapped pointer
-     * @stable ICU 59
+     * \xrefitem stable "Stable" "Stable List" ICU 59
      */
     inline char16_t *get() const;
     /**
      * char16_t pointer access via type conversion (e.g., static_cast).
      * @return the wrapped pointer
-     * @stable ICU 59
+     * \xrefitem stable "Stable" "Stable List" ICU 59
      */
     inline operator char16_t *() const { return get(); }
 
@@ -144,21 +146,21 @@
 
 /**
  * const char16_t * wrapper with implicit conversion from distinct but bit-compatible pointer types.
- * @stable ICU 59
+ * \xrefitem stable "Stable" "Stable List" ICU 59
  */
 class U_COMMON_API ConstChar16Ptr U_FINAL {
 public:
     /**
      * Copies the pointer.
      * @param p pointer
-     * @stable ICU 59
+     * \xrefitem stable "Stable" "Stable List" ICU 59
      */
     inline ConstChar16Ptr(const char16_t *p);
 #if !U_CHAR16_IS_TYPEDEF
     /**
      * Converts the pointer to char16_t *.
      * @param p pointer to be converted
-     * @stable ICU 59
+     * \xrefitem stable "Stable" "Stable List" ICU 59
      */
     inline ConstChar16Ptr(const uint16_t *p);
 #endif
@@ -167,33 +169,33 @@
      * Converts the pointer to char16_t *.
      * (Only defined if U_SIZEOF_WCHAR_T==2.)
      * @param p pointer to be converted
-     * @stable ICU 59
+     * \xrefitem stable "Stable" "Stable List" ICU 59
      */
     inline ConstChar16Ptr(const wchar_t *p);
 #endif
     /**
      * nullptr constructor.
      * @param p nullptr
-     * @stable ICU 59
+     * \xrefitem stable "Stable" "Stable List" ICU 59
      */
     inline ConstChar16Ptr(const std::nullptr_t p);
 
     /**
      * Destructor.
-     * @stable ICU 59
+     * \xrefitem stable "Stable" "Stable List" ICU 59
      */
     inline ~ConstChar16Ptr();
 
     /**
      * Pointer access.
      * @return the wrapped pointer
-     * @stable ICU 59
+     * \xrefitem stable "Stable" "Stable List" ICU 59
      */
     inline const char16_t *get() const;
     /**
      * char16_t pointer access via type conversion (e.g., static_cast).
      * @return the wrapped pointer
-     * @stable ICU 59
+     * \xrefitem stable "Stable" "Stable List" ICU 59
      */
     inline operator const char16_t *() const { return get(); }
 
@@ -255,7 +257,7 @@
  * Includes an aliasing barrier if available.
  * @param p pointer
  * @return p as const UChar *
- * @stable ICU 59
+ * \xrefitem stable "Stable" "Stable List" ICU 59
  */
 inline const UChar *toUCharPtr(const char16_t *p) {
 #ifdef U_ALIASING_BARRIER
@@ -269,7 +271,7 @@
  * Includes an aliasing barrier if available.
  * @param p pointer
  * @return p as UChar *
- * @stable ICU 59
+ * \xrefitem stable "Stable" "Stable List" ICU 59
  */
 inline UChar *toUCharPtr(char16_t *p) {
 #ifdef U_ALIASING_BARRIER
@@ -283,7 +285,7 @@
  * Includes an aliasing barrier if available.
  * @param p pointer
  * @return p as const OldUChar *
- * @stable ICU 59
+ * \xrefitem stable "Stable" "Stable List" ICU 59
  */
 inline const OldUChar *toOldUCharPtr(const char16_t *p) {
 #ifdef U_ALIASING_BARRIER
@@ -297,7 +299,7 @@
  * Includes an aliasing barrier if available.
  * @param p pointer
  * @return p as OldUChar *
- * @stable ICU 59
+ * \xrefitem stable "Stable" "Stable List" ICU 59
  */
 inline OldUChar *toOldUCharPtr(char16_t *p) {
 #ifdef U_ALIASING_BARRIER
@@ -311,3 +313,5 @@
 #endif /* LIBICU_U_SHOW_CPLUSPLUS_API */
 
 #endif  // __CHAR16PTR_H__
+
+/** @} */ // addtogroup
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/unicode/platform.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/unicode/platform.h
index 2bb2f8b..47bb1e6 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/unicode/platform.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/unicode/platform.h
@@ -54,12 +54,12 @@
 
 /**
  * Define some things so that they can be documented.
- * @internal
+ * \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only.
  */
 #ifdef U_IN_DOXYGEN
 /*
  * Problem: "platform.h:335: warning: documentation for unknown define U_HAVE_STD_STRING found." means that U_HAVE_STD_STRING is not documented.
- * Solution: #define any defines for non @internal API here, so that they are visible in the docs.  If you just set PREDEFINED in Doxyfile.in,  they won't be documented.
+ * Solution: #define any defines for non \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only. API here, so that they are visible in the docs.  If you just set PREDEFINED in Doxyfile.in,  they won't be documented.
  */
 
 /* None for now. */
@@ -82,31 +82,31 @@
  * on the market at that time: BSD, System V, and Xenix.
  * This became Unix System V Release 4 (SVR4).
  *
- * @internal
+ * \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only.
  */
 
-/** Unknown platform. @internal */
+/** Unknown platform. \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only. */
 #define U_PF_UNKNOWN 0
-/** Windows @internal */
+/** Windows \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only. */
 #define U_PF_WINDOWS 1000
-/** MinGW. Windows, calls to Win32 API, but using GNU gcc and binutils. @internal */
+/** MinGW. Windows, calls to Win32 API, but using GNU gcc and binutils. \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only. */
 #define U_PF_MINGW 1800
 /**
  * Cygwin. Windows, calls to cygwin1.dll for Posix functions,
  * using MSVC or GNU gcc and binutils.
- * @internal
+ * \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only.
  */
 #define U_PF_CYGWIN 1900
 /* Reserve 2000 for U_PF_UNIX? */
-/** HP-UX is based on UNIX System V. @internal */
+/** HP-UX is based on UNIX System V. \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only. */
 #define U_PF_HPUX 2100
-/** Solaris is a Unix operating system based on SVR4. @internal */
+/** Solaris is a Unix operating system based on SVR4. \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only. */
 #define U_PF_SOLARIS 2600
-/** BSD is a UNIX operating system derivative. @internal */
+/** BSD is a UNIX operating system derivative. \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only. */
 #define U_PF_BSD 3000
-/** AIX is based on UNIX System V Releases and 4.3 BSD. @internal */
+/** AIX is based on UNIX System V Releases and 4.3 BSD. \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only. */
 #define U_PF_AIX 3100
-/** IRIX is based on UNIX System V with BSD extensions. @internal */
+/** IRIX is based on UNIX System V with BSD extensions. \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only. */
 #define U_PF_IRIX 3200
 /**
  * Darwin is a POSIX-compliant operating system, composed of code developed by Apple,
@@ -114,25 +114,25 @@
  * built around the Mach kernel.
  * Darwin forms the core set of components upon which Mac OS X, Apple TV, and iOS are based.
  * (Original description modified from WikiPedia.)
- * @internal
+ * \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only.
  */
 #define U_PF_DARWIN 3500
-/** iPhone OS (iOS) is a derivative of Mac OS X. @internal */
+/** iPhone OS (iOS) is a derivative of Mac OS X. \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only. */
 #define U_PF_IPHONE 3550
-/** QNX is a commercial Unix-like real-time operating system related to BSD. @internal */
+/** QNX is a commercial Unix-like real-time operating system related to BSD. \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only. */
 #define U_PF_QNX 3700
-/** Linux is a Unix-like operating system. @internal */
+/** Linux is a Unix-like operating system. \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only. */
 #define U_PF_LINUX 4000
 /**
  * Native Client is pretty close to Linux.
  * See https://developer.chrome.com/native-client and
  *  http://www.chromium.org/nativeclient
- *  @internal
+ *  \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only.
  */
 #define U_PF_BROWSER_NATIVE_CLIENT 4020
-/** Android is based on Linux. @internal */
+/** Android is based on Linux. \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only. */
 #define U_PF_ANDROID 4050
-/** Fuchsia is a POSIX-ish platform. @internal */
+/** Fuchsia is a POSIX-ish platform. \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only. */
 #define U_PF_FUCHSIA 4100
 /* Maximum value for Linux-based platform is 4499 */
 /**
@@ -140,12 +140,12 @@
  * WebAssembly. It provides some POSIX-compatible wrappers and stubs and
  * some Linux-like functionality, but is not fully compatible with
  * either.
- * @internal
+ * \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only.
  */
 #define U_PF_EMSCRIPTEN 5010
-/** z/OS is the successor to OS/390 which was the successor to MVS. @internal */
+/** z/OS is the successor to OS/390 which was the successor to MVS. \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only. */
 #define U_PF_OS390 9000
-/** "IBM i" is the current name of what used to be i5/OS and earlier OS/400. @internal */
+/** "IBM i" is the current name of what used to be i5/OS and earlier OS/400. \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only. */
 #define U_PF_OS400 9400
 
 #ifdef U_PLATFORM
@@ -210,7 +210,7 @@
  * \def CYGWINMSVC
  * Defined if this is Windows with Cygwin, but using MSVC rather than gcc.
  * Otherwise undefined.
- * @internal
+ * \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only.
  */
 /* Commented out because this is already set in mh-cygwin-msvc
 #if U_PLATFORM == U_PF_CYGWIN && defined(_MSC_VER)
@@ -225,7 +225,7 @@
  * \def U_PLATFORM_USES_ONLY_WIN32_API
  * Defines whether the platform uses only the Win32 API.
  * Set to 1 for Windows/MSVC and MinGW but not Cygwin.
- * @internal
+ * \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only.
  */
 #ifdef U_PLATFORM_USES_ONLY_WIN32_API
     /* Use the predefined value. */
@@ -240,7 +240,7 @@
  * \def U_PLATFORM_HAS_WIN32_API
  * Defines whether the Win32 API is available on the platform.
  * Set to 1 for Windows/MSVC, MinGW and Cygwin.
- * @internal
+ * \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only.
  */
 #ifdef U_PLATFORM_HAS_WIN32_API
     /* Use the predefined value. */
@@ -254,7 +254,7 @@
  * \def U_PLATFORM_HAS_WINUWP_API
  * Defines whether target is intended for Universal Windows Platform API
  * Set to 1 for Windows10 Release Solution Configuration
- * @internal
+ * \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only.
  */
 #ifdef U_PLATFORM_HAS_WINUWP_API
     /* Use the predefined value. */
@@ -266,7 +266,7 @@
  * \def U_PLATFORM_IMPLEMENTS_POSIX
  * Defines whether the platform implements (most of) the POSIX API.
  * Set to 1 for Cygwin and most other platforms.
- * @internal
+ * \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only.
  */
 #ifdef U_PLATFORM_IMPLEMENTS_POSIX
     /* Use the predefined value. */
@@ -279,7 +279,7 @@
 /**
  * \def U_PLATFORM_IS_LINUX_BASED
  * Defines whether the platform is Linux or one of its derivatives.
- * @internal
+ * \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only.
  */
 #ifdef U_PLATFORM_IS_LINUX_BASED
     /* Use the predefined value. */
@@ -292,7 +292,7 @@
 /**
  * \def U_PLATFORM_IS_DARWIN_BASED
  * Defines whether the platform is Darwin or one of its derivatives.
- * @internal
+ * \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only.
  */
 #ifdef U_PLATFORM_IS_DARWIN_BASED
     /* Use the predefined value. */
@@ -307,7 +307,7 @@
  * Defines whether stdint.h is available. It is a C99 standard header.
  * We used to include inttypes.h which includes stdint.h but we usually do not need
  * the additional definitions from inttypes.h.
- * @internal
+ * \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only.
  */
 #ifdef U_HAVE_STDINT_H
     /* Use the predefined value. */
@@ -332,7 +332,7 @@
  * \def U_HAVE_INTTYPES_H
  * Defines whether inttypes.h is available. It is a C99 standard header.
  * We include inttypes.h where it is available but stdint.h is not.
- * @internal
+ * \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only.
  */
 #ifdef U_HAVE_INTTYPES_H
     /* Use the predefined value. */
@@ -359,7 +359,7 @@
  *
  * For example, for testing for whether we have gcc, and whether it's 4.6 or higher,
  * use "#if U_GCC_MAJOR_MINOR >= 406".
- * @internal
+ * \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only.
  */
 #ifdef __GNUC__
 #   define U_GCC_MAJOR_MINOR (__GNUC__ * 100 + __GNUC_MINOR__)
@@ -370,7 +370,7 @@
 /**
  * \def U_IS_BIG_ENDIAN
  * Determines the endianness of the platform.
- * @internal
+ * \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only.
  */
 #ifdef U_IS_BIG_ENDIAN
     /* Use the predefined value. */
@@ -399,7 +399,7 @@
 /**
  * \def U_HAVE_PLACEMENT_NEW
  * Determines whether to override placement new and delete for STL.
- * @stable ICU 2.6
+ * \xrefitem stable "Stable" "Stable List" ICU 2.6
  */
 #ifdef U_HAVE_PLACEMENT_NEW
     /* Use the predefined value. */
@@ -413,7 +413,7 @@
  * \def U_HAVE_DEBUG_LOCATION_NEW 
  * Define this to define the MFC debug version of the operator new.
  *
- * @stable ICU 3.4
+ * \xrefitem stable "Stable" "Stable List" ICU 3.4
  */
 #ifdef U_HAVE_DEBUG_LOCATION_NEW
     /* Use the predefined value. */
@@ -463,7 +463,7 @@
 /**
  * \def U_MALLOC_ATTR
  * Attribute to mark functions as malloc-like
- * @internal
+ * \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only.
  */
 #if defined(__GNUC__) && __GNUC__>=3
 #    define U_MALLOC_ATTR __attribute__ ((__malloc__))
@@ -474,7 +474,7 @@
 /**
  * \def U_ALLOC_SIZE_ATTR
  * Attribute to specify the size of the allocated buffer for malloc-like functions
- * @internal
+ * \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only.
  */
 #if (defined(__GNUC__) &&                                            \
         (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))) || \
@@ -490,7 +490,7 @@
  * \def U_CPLUSPLUS_VERSION
  * 0 if no C++; 1, 11, 14, ... if C++.
  * Support for specific features cannot always be determined by the C++ version alone.
- * @internal
+ * \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only.
  */
 #ifdef U_CPLUSPLUS_VERSION
 #   if U_CPLUSPLUS_VERSION != 0 && !defined(__cplusplus)
@@ -521,7 +521,7 @@
  * "noexcept" if supported, otherwise empty.
  * Some code, especially STL containers, uses move semantics of objects only
  * if the move constructor and the move operator are declared as not throwing exceptions.
- * @internal
+ * \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only.
  */
 #ifdef U_NOEXCEPT
     /* Use the predefined value. */
@@ -533,7 +533,7 @@
  * \def U_FALLTHROUGH
  * Annotate intentional fall-through between switch labels.
  * http://clang.llvm.org/docs/AttributeReference.html#fallthrough-clang-fallthrough
- * @internal
+ * \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only.
  */
 #ifndef __cplusplus
     // Not for C.
@@ -563,13 +563,13 @@
 
 /**
  * U_CHARSET_FAMILY is equal to this value when the platform is an ASCII based platform.
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 #define U_ASCII_FAMILY 0
 
 /**
  * U_CHARSET_FAMILY is equal to this value when the platform is an EBCDIC based platform.
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 #define U_EBCDIC_FAMILY 1
 
@@ -613,7 +613,7 @@
  *    '@' <commercial at>
  *    '`' <grave accent>
  * \endcode
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 #ifdef U_CHARSET_FAMILY
     /* Use the predefined value. */
@@ -642,7 +642,7 @@
  *   configuration option (see unicode/uconfig.h)
  * - the UCONFIG_NO_CONVERSION build option in uconfig.h is more usable
  *
- * @stable ICU 4.2
+ * \xrefitem stable "Stable" "Stable List" ICU 4.2
  * @see UCONFIG_NO_CONVERSION
  */
 #ifdef U_CHARSET_IS_UTF8
@@ -664,7 +664,7 @@
  * \def U_HAVE_WCHAR_H
  * Indicates whether <wchar.h> is available (1) or not (0). Set to 1 by default.
  *
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 #ifdef U_HAVE_WCHAR_H
     /* Use the predefined value. */
@@ -683,7 +683,7 @@
  * \def U_SIZEOF_WCHAR_T
  * U_SIZEOF_WCHAR_T==sizeof(wchar_t)
  *
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 #ifdef U_SIZEOF_WCHAR_T
     /* Use the predefined value. */
@@ -759,7 +759,7 @@
  * and u"abc" UTF-16 string literals are supported.
  * This is a new standard type and standard string literal syntax in C++0x
  * but has been available in some compilers before.
- * @internal
+ * \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only.
  */
 #ifdef U_HAVE_CHAR16_T
     /* Use the predefined value. */
@@ -787,7 +787,7 @@
  * \def U_DECLARE_UTF16
  * Do not use this macro because it is not defined on all platforms.
  * Use the UNICODE_STRING or U_STRING_DECL macros instead.
- * @internal
+ * \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only.
  */
 #ifdef U_DECLARE_UTF16
     /* Use the predefined value. */
@@ -862,7 +862,7 @@
  * NO : "static const char U_CALLCONV *func( . . . )"
  * YES: "static const char* U_CALLCONV func( . . . )"
  *
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 #if U_PLATFORM == U_PF_OS390 && defined(__cplusplus)
 #    define U_CALLCONV __cdecl
@@ -873,13 +873,13 @@
 /**
  * \def U_CALLCONV_FPTR
  * Similar to U_CALLCONV, but only used on function pointers.
- * @internal
+ * \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only.
  */
 #if U_PLATFORM == U_PF_OS390 && defined(__cplusplus)
 #    define U_CALLCONV_FPTR U_CALLCONV
 #else
 #    define U_CALLCONV_FPTR
 #endif
-/* @} */
+/** @} */
 
 #endif  // _PLATFORM_H
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/unicode/ptypes.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/unicode/ptypes.h
index 70324ff..08873c2 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/unicode/ptypes.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/unicode/ptypes.h
@@ -20,6 +20,8 @@
 */
 
 /**
+ * @addtogroup ICU4C
+ * @{
  * \file
  * \brief C API: Definitions of integer types of various widths
  */
@@ -33,7 +35,7 @@
  * macros like INT32_MIN and UINTPTR_MAX should only be defined if explicitly requested.
  * We need to define __STDC_LIMIT_MACROS before including stdint.h in C++ code
  * that uses such limit macros.
- * @internal
+ * \xrefitem internal "Internal"  "Internal List"  Do not use. This API is for internal use only.
  */
 #ifndef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS
@@ -128,3 +130,5 @@
 #endif /* U_HAVE_STDINT_H / U_HAVE_INTTYPES_H */
 
 #endif /* _PTYPES_H */
+
+/** @} */ // addtogroup
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/unicode/putil.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/unicode/putil.h
index 8600149..703521d 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/unicode/putil.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/unicode/putil.h
@@ -28,6 +28,8 @@
 
 #include "unicode/utypes.h"
  /**
+  * @addtogroup ICU4C
+  * @{
   * \file
   * \brief C API: Platform Utilities
   */
@@ -58,7 +60,7 @@
  * @{
  * Filesystem file and path separator characters.
  * Example: '/' and ':' on Unix, '\\' and ';' on Windows.
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 #if U_PLATFORM_USES_ONLY_WIN32_API
 #   define U_FILE_SEP_CHAR '\\'
@@ -83,3 +85,5 @@
 
 
 #endif
+
+/** @} */ // addtogroup
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/unicode/stringoptions.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/unicode/stringoptions.h
index 7b9f709..5f1a1c2 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/unicode/stringoptions.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/unicode/stringoptions.h
@@ -10,6 +10,8 @@
 #include "unicode/utypes.h"
 
 /**
+ * @addtogroup ICU4C
+ * @{
  * \file
  * \brief C API: Bit set option bit constants for various string and character processing functions.
  */
@@ -17,7 +19,7 @@
 /**
  * Option value for case folding: Use default mappings defined in CaseFolding.txt.
  *
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 #define U_FOLD_CASE_DEFAULT 0
 
@@ -35,7 +37,7 @@
  * are to be excluded for default mappings and
  * included for the Turkic-specific mappings.
  *
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 #define U_FOLD_CASE_EXCLUDE_SPECIAL_I 1
 
@@ -48,7 +50,7 @@
  * including both an options bit and an explicit BreakIterator.
  *
  * @see U_TITLECASE_ADJUST_TO_CASED
- * @stable ICU 60
+ * \xrefitem stable "Stable" "Stable List" ICU 60
  */
 #define U_TITLECASE_WHOLE_STRING 0x20
 
@@ -61,7 +63,7 @@
  * including both an options bit and an explicit BreakIterator.
  *
  * @see U_TITLECASE_ADJUST_TO_CASED
- * @stable ICU 60
+ * \xrefitem stable "Stable" "Stable List" ICU 60
  */
 #define U_TITLECASE_SENTENCES 0x40
 
@@ -80,7 +82,7 @@
  * @see ucasemap_setOptions
  * @see ucasemap_toTitle
  * @see ucasemap_utf8ToTitle
- * @stable ICU 3.8
+ * \xrefitem stable "Stable" "Stable List" ICU 3.8
  */
 #define U_TITLECASE_NO_LOWERCASE 0x100
 
@@ -104,7 +106,7 @@
  * @see ucasemap_setOptions
  * @see ucasemap_toTitle
  * @see ucasemap_utf8ToTitle
- * @stable ICU 3.8
+ * \xrefitem stable "Stable" "Stable List" ICU 3.8
  */
 #define U_TITLECASE_NO_BREAK_ADJUSTMENT 0x200
 
@@ -124,7 +126,7 @@
  * It is an error to specify multiple titlecasing adjustment options together.
  *
  * @see U_TITLECASE_NO_BREAK_ADJUSTMENT
- * @stable ICU 60
+ * \xrefitem stable "Stable" "Stable List" ICU 60
  */
 #define U_TITLECASE_ADJUST_TO_CASED 0x400
 
@@ -135,7 +137,7 @@
  * @see CaseMap
  * @see Edits
  * @see Normalizer2
- * @stable ICU 60
+ * \xrefitem stable "Stable" "Stable List" ICU 60
  */
 #define U_EDITS_NO_RESET 0x2000
 
@@ -147,28 +149,28 @@
  * @see CaseMap
  * @see Edits
  * @see Normalizer2
- * @stable ICU 60
+ * \xrefitem stable "Stable" "Stable List" ICU 60
  */
 #define U_OMIT_UNCHANGED_TEXT 0x4000
 
 /**
  * Option bit for u_strCaseCompare, u_strcasecmp, unorm_compare, etc:
  * Compare strings in code point order instead of code unit order.
- * @stable ICU 2.2
+ * \xrefitem stable "Stable" "Stable List" ICU 2.2
  */
 #define U_COMPARE_CODE_POINT_ORDER  0x8000
 
 /**
  * Option bit for unorm_compare:
  * Perform case-insensitive comparison.
- * @stable ICU 2.2
+ * \xrefitem stable "Stable" "Stable List" ICU 2.2
  */
 #define U_COMPARE_IGNORE_CASE       0x10000
 
 /**
  * Option bit for unorm_compare:
  * Both input strings are assumed to fulfill FCD conditions.
- * @stable ICU 2.2
+ * \xrefitem stable "Stable" "Stable List" ICU 2.2
  */
 #define UNORM_INPUT_IS_FCD          0x20000
 
@@ -188,3 +190,5 @@
 // unormcmp.cpp #define _COMPARE_EQUIV 0x80000
 
 #endif  // __STRINGOPTIONS_H__
+
+/** @} */ // addtogroup
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/unicode/ubidi.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/unicode/ubidi.h
index d5a1d74..b55bebf 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/unicode/ubidi.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/unicode/ubidi.h
@@ -27,6 +27,8 @@
 #endif   // U_SHOW_CPLUSPLUS_API
 
 /**
+ * @addtogroup ICU4C
+ * @{
  *\file
  * \brief C API: Bidi algorithm
  *
@@ -334,7 +336,7 @@
  * @see UBIDI_DEFAULT_RTL
  * @see UBIDI_LEVEL_OVERRIDE
  * @see UBIDI_MAX_EXPLICIT_LEVEL
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 typedef uint8_t UBiDiLevel;
 
@@ -360,7 +362,7 @@
  * the original source text).
  * @see UBIDI_REORDER_INVERSE_LIKE_DIRECT
  * @see UBIDI_REORDER_INVERSE_FOR_NUMBERS_SPECIAL
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 #define UBIDI_DEFAULT_LTR 0xfe
 
@@ -387,7 +389,7 @@
  * the original source text).
  * @see UBIDI_REORDER_INVERSE_LIKE_DIRECT
  * @see UBIDI_REORDER_INVERSE_FOR_NUMBERS_SPECIAL
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 #define UBIDI_DEFAULT_RTL 0xff
 
@@ -396,13 +398,13 @@
  * Same as the max_depth value in the
  * <a href="http://www.unicode.org/reports/tr9/#BD2">Unicode Bidirectional Algorithm</a>.
  * (The maximum resolved level can be up to <code>UBIDI_MAX_EXPLICIT_LEVEL+1</code>).
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 #define UBIDI_MAX_EXPLICIT_LEVEL 125
 
 /** Bit flag for level input.
  *  Overrides directional properties.
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 #define UBIDI_LEVEL_OVERRIDE 0x80
 
@@ -417,13 +419,13 @@
  * @see ubidi_getVisualMap
  * @see ubidi_getLogicalIndex
  * @see ubidi_getLogicalMap
- * @stable ICU 3.6
+ * \xrefitem stable "Stable" "Stable List" ICU 3.6
  */
 #define UBIDI_MAP_NOWHERE   (-1)
 
 /**
  * <code>UBiDiDirection</code> values indicate the text direction.
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 enum UBiDiDirection {
   /** Left-to-right text. This is a 0 value.
@@ -435,7 +437,7 @@
    *      means that the first strong character of the source string has
    *      a left-to-right direction.
    * </ul>
-   * @stable ICU 2.0
+   * \xrefitem stable "Stable" "Stable List" ICU 2.0
    */
   UBIDI_LTR,
   /** Right-to-left text. This is a 1 value.
@@ -447,26 +449,26 @@
    *      means that the first strong character of the source string has
    *      a right-to-left direction.
    * </ul>
-   * @stable ICU 2.0
+   * \xrefitem stable "Stable" "Stable List" ICU 2.0
    */
   UBIDI_RTL,
   /** Mixed-directional text.
    * <p>As return value for <code>ubidi_getDirection()</code>, it means
    *    that the source string contains both left-to-right and
    *    right-to-left characters.
-   * @stable ICU 2.0
+   * \xrefitem stable "Stable" "Stable List" ICU 2.0
    */
   UBIDI_MIXED,
   /** No strongly directional text.
    * <p>As return value for <code>ubidi_getBaseDirection()</code>, it means
    *    that the source string is missing or empty, or contains neither left-to-right
    *    nor right-to-left characters.
-   * @stable ICU 4.6
+   * \xrefitem stable "Stable" "Stable List" ICU 4.6
    */
   UBIDI_NEUTRAL
 };
 
-/** @stable ICU 2.0 */
+/** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
 typedef enum UBiDiDirection UBiDiDirection;
 
 /**
@@ -477,11 +479,11 @@
  * such a paragraph.<p>
  * Reordering can be done on a line, or on one or more paragraphs which are
  * then interpreted each as one single line.
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 struct UBiDi;
 
-/** @stable ICU 2.0 */
+/** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
 typedef struct UBiDi UBiDi;
 
 /**
@@ -497,7 +499,7 @@
  * additional memory for internal structures as necessary.
  *
  * @return An empty <code>UBiDi</code> object.
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 U_CAPI UBiDi * U_EXPORT2
 ubidi_open(void) __INTRODUCED_IN(31);
@@ -536,7 +538,7 @@
  * @param pErrorCode must be a valid pointer to an error code value.
  *
  * @return An empty <code>UBiDi</code> object with preallocated memory.
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 U_CAPI UBiDi * U_EXPORT2
 ubidi_openSized(int32_t maxLength, int32_t maxRunCount, UErrorCode *pErrorCode) __INTRODUCED_IN(31);
@@ -561,7 +563,7 @@
  *
  * @see ubidi_setPara
  * @see ubidi_setLine
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 U_CAPI void U_EXPORT2
 ubidi_close(UBiDi *pBiDi) __INTRODUCED_IN(31);
@@ -579,7 +581,7 @@
  *
  * @see LocalPointerBase
  * @see LocalPointer
- * @stable ICU 4.4
+ * \xrefitem stable "Stable" "Stable List" ICU 4.4
  */
 U_DEFINE_LOCAL_OPEN_POINTER(LocalUBiDiPointer, UBiDi, ubidi_close);
 
@@ -633,7 +635,7 @@
  * @see ubidi_setPara
  * @see ubidi_writeReordered
  * @see ubidi_setReorderingMode
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 U_CAPI void U_EXPORT2
 ubidi_setInverse(UBiDi *pBiDi, UBool isInverse) __INTRODUCED_IN(31);
@@ -653,7 +655,7 @@
  *
  * @see ubidi_setInverse
  * @see ubidi_setReorderingMode
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 
 U_CAPI UBool U_EXPORT2
@@ -677,7 +679,7 @@
  * receive level 0, so that successive paragraphs progress from left to right.
  *
  * @see ubidi_setPara
- * @stable ICU 3.4
+ * \xrefitem stable "Stable" "Stable List" ICU 3.4
  */
 U_CAPI void U_EXPORT2
 ubidi_orderParagraphsLTR(UBiDi *pBiDi, UBool orderParagraphsLTR) __INTRODUCED_IN(31);
@@ -693,7 +695,7 @@
  *         separators.
  *
  * @see ubidi_orderParagraphsLTR
- * @stable ICU 3.4
+ * \xrefitem stable "Stable" "Stable List" ICU 3.4
  */
 U_CAPI UBool U_EXPORT2
 ubidi_isOrderParagraphsLTR(UBiDi *pBiDi) __INTRODUCED_IN(31);
@@ -705,20 +707,20 @@
  * algorithm to use.
  *
  * @see ubidi_setReorderingMode
- * @stable ICU 3.6
+ * \xrefitem stable "Stable" "Stable List" ICU 3.6
  */
 typedef enum UBiDiReorderingMode {
     /** Regular Logical to Visual Bidi algorithm according to Unicode.
       * This is a 0 value.
-      * @stable ICU 3.6 */
+      * \xrefitem stable "Stable" "Stable List" ICU 3.6 */
     UBIDI_REORDER_DEFAULT = 0,
     /** Logical to Visual algorithm which handles numbers in a way which
       * mimics the behavior of Windows XP.
-      * @stable ICU 3.6 */
+      * \xrefitem stable "Stable" "Stable List" ICU 3.6 */
     UBIDI_REORDER_NUMBERS_SPECIAL,
     /** Logical to Visual algorithm grouping numbers with adjacent R characters
       * (reversible algorithm).
-      * @stable ICU 3.6 */
+      * \xrefitem stable "Stable" "Stable List" ICU 3.6 */
     UBIDI_REORDER_GROUP_NUMBERS_WITH_R,
     /** Reorder runs only to transform a Logical LTR string to the Logical RTL
       * string with the same display, or vice-versa.<br>
@@ -726,25 +728,25 @@
       * <code>#UBIDI_OPTION_INSERT_MARKS</code>, some Bidi controls in the source
       * text may be removed and other controls may be added to produce the
       * minimum combination which has the required display.
-      * @stable ICU 3.6 */
+      * \xrefitem stable "Stable" "Stable List" ICU 3.6 */
     UBIDI_REORDER_RUNS_ONLY,
     /** Visual to Logical algorithm which handles numbers like L
       * (same algorithm as selected by <code>ubidi_setInverse(true)</code>.
       * @see ubidi_setInverse
-      * @stable ICU 3.6 */
+      * \xrefitem stable "Stable" "Stable List" ICU 3.6 */
     UBIDI_REORDER_INVERSE_NUMBERS_AS_L,
     /** Visual to Logical algorithm equivalent to the regular Logical to Visual
       * algorithm.
-      * @stable ICU 3.6 */
+      * \xrefitem stable "Stable" "Stable List" ICU 3.6 */
     UBIDI_REORDER_INVERSE_LIKE_DIRECT,
     /** Inverse Bidi (Visual to Logical) algorithm for the
       * <code>UBIDI_REORDER_NUMBERS_SPECIAL</code> Bidi algorithm.
-      * @stable ICU 3.6 */
+      * \xrefitem stable "Stable" "Stable List" ICU 3.6 */
     UBIDI_REORDER_INVERSE_FOR_NUMBERS_SPECIAL,
 #ifndef U_HIDE_DEPRECATED_API
     /**
      * Number of values for reordering mode.
-     * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
+     * \xrefitem deprecated "Deprecated" "Deprecated List" ICU 58 The numeric value may change over time, see ICU ticket #12420.
      */
     UBIDI_REORDER_COUNT
 #endif  // U_HIDE_DEPRECATED_API
@@ -899,7 +901,7 @@
  * @see ubidi_setInverse
  * @see ubidi_setPara
  * @see ubidi_writeReordered
- * @stable ICU 3.6
+ * \xrefitem stable "Stable" "Stable List" ICU 3.6
  */
 U_CAPI void U_EXPORT2
 ubidi_setReorderingMode(UBiDi *pBiDi, UBiDiReorderingMode reorderingMode) __INTRODUCED_IN(31);
@@ -912,7 +914,7 @@
  * @param pBiDi is a <code>UBiDi</code> object.
  * @return the current reordering mode of the Bidi object
  * @see ubidi_setReorderingMode
- * @stable ICU 3.6
+ * \xrefitem stable "Stable" "Stable List" ICU 3.6
  */
 U_CAPI UBiDiReorderingMode U_EXPORT2
 ubidi_getReorderingMode(UBiDi *pBiDi) __INTRODUCED_IN(31);
@@ -924,14 +926,14 @@
  * specified to affect the Bidi algorithm.
  *
  * @see ubidi_setReorderingOptions
- * @stable ICU 3.6
+ * \xrefitem stable "Stable" "Stable List" ICU 3.6
  */
 typedef enum UBiDiReorderingOption {
     /**
      * option value for <code>ubidi_setReorderingOptions</code>:
      * disable all the options which can be set with this function
      * @see ubidi_setReorderingOptions
-     * @stable ICU 3.6
+     * \xrefitem stable "Stable" "Stable List" ICU 3.6
      */
     UBIDI_OPTION_DEFAULT = 0,
 
@@ -977,7 +979,7 @@
      *
      * @see ubidi_setReorderingMode
      * @see ubidi_setReorderingOptions
-     * @stable ICU 3.6
+     * \xrefitem stable "Stable" "Stable List" ICU 3.6
      */
     UBIDI_OPTION_INSERT_MARKS = 1,
 
@@ -995,7 +997,7 @@
      *
      * @see ubidi_setReorderingMode
      * @see ubidi_setReorderingOptions
-     * @stable ICU 3.6
+     * \xrefitem stable "Stable" "Stable List" ICU 3.6
      */
     UBIDI_OPTION_REMOVE_CONTROLS = 2,
 
@@ -1043,7 +1045,7 @@
      * @see ubidi_setReorderingOptions
      * @see ubidi_getProcessedLength
      * @see ubidi_orderParagraphsLTR
-     * @stable ICU 3.6
+     * \xrefitem stable "Stable" "Stable List" ICU 3.6
      */
     UBIDI_OPTION_STREAMING = 4
 } UBiDiReorderingOption;
@@ -1059,7 +1061,7 @@
  * <code>#UBIDI_OPTION_REMOVE_CONTROLS</code>, <code>#UBIDI_OPTION_STREAMING</code>.
  *
  * @see ubidi_getReorderingOptions
- * @stable ICU 3.6
+ * \xrefitem stable "Stable" "Stable List" ICU 3.6
  */
 U_CAPI void U_EXPORT2
 ubidi_setReorderingOptions(UBiDi *pBiDi, uint32_t reorderingOptions) __INTRODUCED_IN(31);
@@ -1072,7 +1074,7 @@
  * @param pBiDi is a <code>UBiDi</code> object.
  * @return the current reordering options of the Bidi object
  * @see ubidi_setReorderingOptions
- * @stable ICU 3.6
+ * \xrefitem stable "Stable" "Stable List" ICU 3.6
  */
 U_CAPI uint32_t U_EXPORT2
 ubidi_getReorderingOptions(UBiDi *pBiDi) __INTRODUCED_IN(31);
@@ -1161,7 +1163,7 @@
  * @param pErrorCode must be a valid pointer to an error code value.
  *
  * @see ubidi_setPara
- * @stable ICU 4.8
+ * \xrefitem stable "Stable" "Stable List" ICU 4.8
  */
 U_CAPI void U_EXPORT2
 ubidi_setContext(UBiDi *pBiDi,
@@ -1251,7 +1253,7 @@
  *        value is not necessary.
  *
  * @param pErrorCode must be a valid pointer to an error code value.
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 U_CAPI void U_EXPORT2
 ubidi_setPara(UBiDi *pBiDi, const UChar *text, int32_t length,
@@ -1304,7 +1306,7 @@
  *
  * @see ubidi_setPara
  * @see ubidi_getProcessedLength
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 U_CAPI void U_EXPORT2
 ubidi_setLine(const UBiDi *pParaBiDi,
@@ -1327,7 +1329,7 @@
  * Note -  The value <code>UBIDI_NEUTRAL</code> is never returned from this method.
  *
  * @see UBiDiDirection
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 U_CAPI UBiDiDirection U_EXPORT2
 ubidi_getDirection(const UBiDi *pBiDi) __INTRODUCED_IN(31);
@@ -1359,7 +1361,7 @@
  *          <code>UBIDI_NEUTRAL</code>
  *
  * @see UBiDiDirection
- * @stable ICU 4.6
+ * \xrefitem stable "Stable" "Stable List" ICU 4.6
  */
 U_CAPI UBiDiDirection U_EXPORT2
 ubidi_getBaseDirection(const UChar *text,  int32_t length ) __INTRODUCED_IN(31);
@@ -1375,7 +1377,7 @@
  *
  * @see ubidi_setPara
  * @see ubidi_setLine
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 U_CAPI const UChar * U_EXPORT2
 ubidi_getText(const UBiDi *pBiDi) __INTRODUCED_IN(31);
@@ -1388,7 +1390,7 @@
  * @param pBiDi is the paragraph or line <code>UBiDi</code> object.
  *
  * @return The length of the text that the UBiDi object was created for.
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 U_CAPI int32_t U_EXPORT2
 ubidi_getLength(const UBiDi *pBiDi) __INTRODUCED_IN(31);
@@ -1408,7 +1410,7 @@
  * @see UBiDiLevel
  * @see ubidi_getParagraph
  * @see ubidi_getParagraphByIndex
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 U_CAPI UBiDiLevel U_EXPORT2
 ubidi_getParaLevel(const UBiDi *pBiDi) __INTRODUCED_IN(31);
@@ -1421,7 +1423,7 @@
  * @param pBiDi is the paragraph or line <code>UBiDi</code> object.
  *
  * @return The number of paragraphs.
- * @stable ICU 3.4
+ * \xrefitem stable "Stable" "Stable List" ICU 3.4
  */
 U_CAPI int32_t U_EXPORT2
 ubidi_countParagraphs(UBiDi *pBiDi) __INTRODUCED_IN(31);
@@ -1460,7 +1462,7 @@
  * @return The index of the paragraph containing the specified position.
  *
  * @see ubidi_getProcessedLength
- * @stable ICU 3.4
+ * \xrefitem stable "Stable" "Stable List" ICU 3.4
  */
 U_CAPI int32_t U_EXPORT2
 ubidi_getParagraph(const UBiDi *pBiDi, int32_t charIndex, int32_t *pParaStart,
@@ -1494,7 +1496,7 @@
  *
  * @param pErrorCode must be a valid pointer to an error code value.
  *
- * @stable ICU 3.4
+ * \xrefitem stable "Stable" "Stable List" ICU 3.4
  */
 U_CAPI void U_EXPORT2
 ubidi_getParagraphByIndex(const UBiDi *pBiDi, int32_t paraIndex,
@@ -1516,7 +1518,7 @@
  *
  * @see UBiDiLevel
  * @see ubidi_getProcessedLength
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 U_CAPI UBiDiLevel U_EXPORT2
 ubidi_getLevelAt(const UBiDi *pBiDi, int32_t charIndex) __INTRODUCED_IN(31);
@@ -1539,7 +1541,7 @@
  *
  * @see UBiDiLevel
  * @see ubidi_getProcessedLength
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 U_CAPI const UBiDiLevel * U_EXPORT2
 ubidi_getLevels(UBiDi *pBiDi, UErrorCode *pErrorCode) __INTRODUCED_IN(31);
@@ -1568,7 +1570,7 @@
  *        value is not necessary.
  *
  * @see ubidi_getProcessedLength
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 U_CAPI void U_EXPORT2
 ubidi_getLogicalRun(const UBiDi *pBiDi, int32_t logicalPosition,
@@ -1589,7 +1591,7 @@
  * @param pErrorCode must be a valid pointer to an error code value.
  *
  * @return The number of runs.
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 U_CAPI int32_t U_EXPORT2
 ubidi_countRuns(UBiDi *pBiDi, UErrorCode *pErrorCode) __INTRODUCED_IN(31);
@@ -1650,7 +1652,7 @@
  * Use of <code>ubidi_writeReordered()</code>, optionally with the
  * <code>#UBIDI_KEEP_BASE_COMBINING</code> option, can be considered in order
  * to avoid these issues.
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 U_CAPI UBiDiDirection U_EXPORT2
 ubidi_getVisualRun(UBiDi *pBiDi, int32_t runIndex,
@@ -1693,7 +1695,7 @@
  * @see ubidi_getLogicalMap
  * @see ubidi_getLogicalIndex
  * @see ubidi_getProcessedLength
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 U_CAPI int32_t U_EXPORT2
 ubidi_getVisualIndex(UBiDi *pBiDi, int32_t logicalIndex, UErrorCode *pErrorCode) __INTRODUCED_IN(31);
@@ -1730,7 +1732,7 @@
  * @see ubidi_getVisualMap
  * @see ubidi_getVisualIndex
  * @see ubidi_getResultLength
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 U_CAPI int32_t U_EXPORT2
 ubidi_getLogicalIndex(UBiDi *pBiDi, int32_t visualIndex, UErrorCode *pErrorCode) __INTRODUCED_IN(31);
@@ -1775,7 +1777,7 @@
  * @see ubidi_getVisualIndex
  * @see ubidi_getProcessedLength
  * @see ubidi_getResultLength
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 U_CAPI void U_EXPORT2
 ubidi_getLogicalMap(UBiDi *pBiDi, int32_t *indexMap, UErrorCode *pErrorCode) __INTRODUCED_IN(31);
@@ -1813,7 +1815,7 @@
  * @see ubidi_getLogicalIndex
  * @see ubidi_getProcessedLength
  * @see ubidi_getResultLength
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 U_CAPI void U_EXPORT2
 ubidi_getVisualMap(UBiDi *pBiDi, int32_t *indexMap, UErrorCode *pErrorCode) __INTRODUCED_IN(31);
@@ -1838,7 +1840,7 @@
  *        indexes which will reflect the reordering of the characters.
  *        The array does not need to be initialized.<p>
  *        The index map will result in <code>indexMap[logicalIndex]==visualIndex</code>.
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 U_CAPI void U_EXPORT2
 ubidi_reorderLogical(const UBiDiLevel *levels, int32_t length, int32_t *indexMap) __INTRODUCED_IN(31);
@@ -1863,7 +1865,7 @@
  *        indexes which will reflect the reordering of the characters.
  *        The array does not need to be initialized.<p>
  *        The index map will result in <code>indexMap[visualIndex]==logicalIndex</code>.
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 U_CAPI void U_EXPORT2
 ubidi_reorderVisual(const UBiDiLevel *levels, int32_t length, int32_t *indexMap) __INTRODUCED_IN(31);
@@ -1900,7 +1902,7 @@
  *
  * @param length is the length of each array.
  * @see UBIDI_MAP_NOWHERE
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 U_CAPI void U_EXPORT2
 ubidi_invertMap(const int32_t *srcMap, int32_t *destMap, int32_t length) __INTRODUCED_IN(31);
@@ -1914,7 +1916,7 @@
  * keep combining characters after their base characters in RTL runs
  *
  * @see ubidi_writeReordered
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 #define UBIDI_KEEP_BASE_COMBINING       1
 
@@ -1924,7 +1926,7 @@
  * by their mirror-image mappings
  *
  * @see ubidi_writeReordered
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 #define UBIDI_DO_MIRRORING              2
 
@@ -1938,7 +1940,7 @@
  *
  * @see ubidi_setInverse
  * @see ubidi_writeReordered
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 #define UBIDI_INSERT_LRM_FOR_NUMERIC    4
 
@@ -1951,7 +1953,7 @@
  * mappings.</p>
  *
  * @see ubidi_writeReordered
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 #define UBIDI_REMOVE_BIDI_CONTROLS      8
 
@@ -1967,7 +1969,7 @@
  * is designed for RTL scripts and stores text in reverse order.</p>
  *
  * @see ubidi_writeReordered
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 #define UBIDI_OUTPUT_REVERSE            16
 
@@ -2007,7 +2009,7 @@
  *         the last call to <code>ubidi_setPara</code>.
  * @see ubidi_setPara
  * @see UBIDI_OPTION_STREAMING
- * @stable ICU 3.6
+ * \xrefitem stable "Stable" "Stable List" ICU 3.6
  */
 U_CAPI int32_t U_EXPORT2
 ubidi_getProcessedLength(const UBiDi *pBiDi) __INTRODUCED_IN(31);
@@ -2039,7 +2041,7 @@
  * @see ubidi_setPara
  * @see UBIDI_OPTION_INSERT_MARKS
  * @see UBIDI_OPTION_REMOVE_CONTROLS
- * @stable ICU 3.6
+ * \xrefitem stable "Stable" "Stable List" ICU 3.6
  */
 U_CAPI int32_t U_EXPORT2
 ubidi_getResultLength(const UBiDi *pBiDi) __INTRODUCED_IN(31);
@@ -2056,7 +2058,7 @@
  * This constant is deprecated; use u_getIntPropertyMaxValue(UCHAR_BIDI_CLASS)+1 instead.
  *
  * @see UBiDiClassCallback
- * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
+ * \xrefitem deprecated "Deprecated" "Deprecated List" ICU 58 The numeric value may change over time, see ICU ticket #12420.
  */
 #define U_BIDI_CLASS_DEFAULT  U_CHAR_DIRECTION_COUNT
 #endif  // U_HIDE_DEPRECATED_API
@@ -2079,7 +2081,7 @@
  *         if the standard Bidi class value for <code>c</code> is to be used.
  * @see ubidi_setClassCallback
  * @see ubidi_getClassCallback
- * @stable ICU 3.6
+ * \xrefitem stable "Stable" "Stable List" ICU 3.6
  */
 typedef UCharDirection U_CALLCONV
 UBiDiClassCallback(const void *context, UChar32 c);
@@ -2099,7 +2101,7 @@
  * @return The Bidi class for character <code>c</code> based
  *         on the given <code>pBiDi</code> instance.
  * @see UBiDiClassCallback
- * @stable ICU 3.6
+ * \xrefitem stable "Stable" "Stable List" ICU 3.6
  */
 U_CAPI UCharDirection U_EXPORT2
 ubidi_getCustomizedClass(UBiDi *pBiDi, UChar32 c) __INTRODUCED_IN(31);
@@ -2131,7 +2133,7 @@
  * @param pErrorCode must be a valid pointer to an error code value.
  *
  * @see ubidi_getClassCallback
- * @stable ICU 3.6
+ * \xrefitem stable "Stable" "Stable List" ICU 3.6
  */
 U_CAPI void U_EXPORT2
 ubidi_setClassCallback(UBiDi *pBiDi, UBiDiClassCallback *newFn,
@@ -2150,7 +2152,7 @@
  * @param context fillin: Returns the callback's private context.
  *
  * @see ubidi_setClassCallback
- * @stable ICU 3.6
+ * \xrefitem stable "Stable" "Stable List" ICU 3.6
  */
 U_CAPI void U_EXPORT2
 ubidi_getClassCallback(UBiDi *pBiDi, UBiDiClassCallback **fn, const void **context) __INTRODUCED_IN(31);
@@ -2220,7 +2222,7 @@
  * @return The length of the output string.
  *
  * @see ubidi_getProcessedLength
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 U_CAPI int32_t U_EXPORT2
 ubidi_writeReordered(UBiDi *pBiDi,
@@ -2274,7 +2276,7 @@
  * @param pErrorCode must be a valid pointer to an error code value.
  *
  * @return The length of the output string.
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 U_CAPI int32_t U_EXPORT2
 ubidi_writeReverse(const UChar *src, int32_t srcLength,
@@ -2288,3 +2290,5 @@
 /*@}*/
 
 #endif
+
+/** @} */ // addtogroup
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/unicode/ubrk.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/unicode/ubrk.h
index 2a61f5f..d7c61fd 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/unicode/ubrk.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/unicode/ubrk.h
@@ -26,7 +26,7 @@
 #   define UBRK_TYPEDEF_UBREAK_ITERATOR
     /**
      *  Opaque type representing an ICU Break iterator object.
-     *  @stable ICU 2.0
+     *  \xrefitem stable "Stable" "Stable List" ICU 2.0
      */
     typedef struct UBreakIterator UBreakIterator;
 #endif
@@ -35,6 +35,8 @@
 
 
 /**
+ * @addtogroup ICU4C
+ * @{
  * \file
  * \brief C API: BreakIterator
  *
@@ -97,15 +99,15 @@
  * and in the sample program icu/source/samples/break/break.cpp
  */
 
-/** The possible types of text boundaries.  @stable ICU 2.0 */
+/** The possible types of text boundaries.  \xrefitem stable "Stable" "Stable List" ICU 2.0 */
 typedef enum UBreakIteratorType {
-  /** Character breaks  @stable ICU 2.0 */
+  /** Character breaks  \xrefitem stable "Stable" "Stable List" ICU 2.0 */
   UBRK_CHARACTER = 0,
-  /** Word breaks @stable ICU 2.0 */
+  /** Word breaks \xrefitem stable "Stable" "Stable List" ICU 2.0 */
   UBRK_WORD = 1,
-  /** Line breaks @stable ICU 2.0 */
+  /** Line breaks \xrefitem stable "Stable" "Stable List" ICU 2.0 */
   UBRK_LINE = 2,
-  /** Sentence breaks @stable ICU 2.0 */
+  /** Sentence breaks \xrefitem stable "Stable" "Stable List" ICU 2.0 */
   UBRK_SENTENCE = 3,
 
 #ifndef U_HIDE_DEPRECATED_API
@@ -115,19 +117,19 @@
    * Unicode 3.2 only. For Unicode 4.0 and above title boundary iteration,
    * please use Word Boundary iterator.
    *
-   * @deprecated ICU 2.8 Use the word break iterator for titlecasing for Unicode 4 and later.
+   * \xrefitem deprecated "Deprecated" "Deprecated List" ICU 2.8 Use the word break iterator for titlecasing for Unicode 4 and later.
    */
   UBRK_TITLE = 4,
     /**
      * One more than the highest normal UBreakIteratorType value.
-     * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
+     * \xrefitem deprecated "Deprecated" "Deprecated List" ICU 58 The numeric value may change over time, see ICU ticket #12420.
      */
     UBRK_COUNT = 5
 #endif  // U_HIDE_DEPRECATED_API
 } UBreakIteratorType;
 
 /** Value indicating all text boundaries have been returned.
- *  @stable ICU 2.0
+ *  \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 #define UBRK_DONE ((int32_t) -1)
 
@@ -141,7 +143,7 @@
  *
  * The numeric values of all of these constants are stable (will not change).
  *
- * @stable ICU 2.2
+ * \xrefitem stable "Stable" "Stable List" ICU 2.2
 */
 typedef enum UWordBreak {
     /** Tag value for "words" that do not fit into any of other categories.
@@ -177,7 +179,7 @@
  *
  * The numeric values of all of these constants are stable (will not change).
  *
- * @stable ICU 2.8
+ * \xrefitem stable "Stable" "Stable List" ICU 2.8
 */
 typedef enum ULineBreakTag {
     /** Tag value for soft line breaks, positions at which a line break
@@ -202,7 +204,7 @@
  *
  * The numeric values of all of these constants are stable (will not change).
  *
- * @stable ICU 2.8
+ * \xrefitem stable "Stable" "Stable List" ICU 2.8
 */
 typedef enum USentenceBreakTag {
     /** Tag value for for sentences  ending with a sentence terminator
@@ -238,7 +240,7 @@
  * @param status A UErrorCode to receive any errors.
  * @return A UBreakIterator for the specified locale.
  * @see ubrk_openRules
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 U_CAPI UBreakIterator* U_EXPORT2
 ubrk_open(UBreakIteratorType type,
@@ -265,7 +267,7 @@
  * @param bi iterator to be cloned
  * @param status to indicate whether the operation went on smoothly or there were errors
  * @return pointer to the new clone
- * @stable ICU 69
+ * \xrefitem stable "Stable" "Stable List" ICU 69
  */
 U_CAPI UBreakIterator * U_EXPORT2
 ubrk_clone(const UBreakIterator *bi,
@@ -278,7 +280,7 @@
 
 /**
   * A recommended size (in bytes) for the memory buffer to be passed to ubrk_saveClone().
-  * @deprecated ICU 52. Do not rely on ubrk_safeClone() cloning into any provided buffer.
+  * \xrefitem deprecated "Deprecated" "Deprecated List" ICU 52. Do not rely on ubrk_safeClone() cloning into any provided buffer.
   */
 #define U_BRK_SAFECLONE_BUFFERSIZE 1
 
@@ -288,7 +290,7 @@
 * Close a UBreakIterator.
 * Once closed, a UBreakIterator may no longer be used.
 * @param bi The break iterator to close.
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
 */
 U_CAPI void U_EXPORT2
 ubrk_close(UBreakIterator *bi) __INTRODUCED_IN(31);
@@ -306,7 +308,7 @@
  *
  * @see LocalPointerBase
  * @see LocalPointer
- * @stable ICU 4.4
+ * \xrefitem stable "Stable" "Stable List" ICU 4.4
  */
 U_DEFINE_LOCAL_OPEN_POINTER(LocalUBreakIteratorPointer, UBreakIterator, ubrk_close);
 
@@ -324,7 +326,7 @@
  * @param text The text to be set
  * @param textLength The length of the text
  * @param status The error code
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 U_CAPI void U_EXPORT2
 ubrk_setText(UBreakIterator* bi,
@@ -350,7 +352,7 @@
  *             UText that was passed as a parameter, but that the underlying text itself
  *             must not be altered while being referenced by the break iterator.
  * @param status The error code
- * @stable ICU 3.4
+ * \xrefitem stable "Stable" "Stable List" ICU 3.4
  */
 U_CAPI void U_EXPORT2
 ubrk_setUText(UBreakIterator* bi,
@@ -367,7 +369,7 @@
  * @param bi The break iterator to use.
  * @return The character index most recently returned by \ref ubrk_next, \ref ubrk_previous,
  * \ref ubrk_first, or \ref ubrk_last.
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 U_CAPI int32_t U_EXPORT2
 ubrk_current(const UBreakIterator *bi) __INTRODUCED_IN(31);
@@ -381,7 +383,7 @@
  * @return The character index of the next text boundary, or UBRK_DONE
  * if all text boundaries have been returned.
  * @see ubrk_previous
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 U_CAPI int32_t U_EXPORT2
 ubrk_next(UBreakIterator *bi) __INTRODUCED_IN(31);
@@ -395,7 +397,7 @@
  * @return The character index of the preceding text boundary, or UBRK_DONE
  * if all text boundaries have been returned.
  * @see ubrk_next
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 U_CAPI int32_t U_EXPORT2
 ubrk_previous(UBreakIterator *bi) __INTRODUCED_IN(31);
@@ -407,7 +409,7 @@
  * @param bi The break iterator to use.
  * @return The new iterator position (zero).
  * @see ubrk_last
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 U_CAPI int32_t U_EXPORT2
 ubrk_first(UBreakIterator *bi) __INTRODUCED_IN(31);
@@ -421,7 +423,7 @@
  * @return The character offset immediately <EM>beyond</EM> the last character in the
  * text being scanned.
  * @see ubrk_first
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 U_CAPI int32_t U_EXPORT2
 ubrk_last(UBreakIterator *bi) __INTRODUCED_IN(31);
@@ -435,7 +437,7 @@
  * @param offset The offset to begin scanning.
  * @return The text boundary preceding offset, or UBRK_DONE.
  * @see ubrk_following
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 U_CAPI int32_t U_EXPORT2
 ubrk_preceding(UBreakIterator *bi,
@@ -450,7 +452,7 @@
  * @param offset The offset to begin scanning.
  * @return The text boundary following offset, or UBRK_DONE.
  * @see ubrk_preceding
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 U_CAPI int32_t U_EXPORT2
 ubrk_following(UBreakIterator *bi,
@@ -465,7 +467,7 @@
 * @param index The index of the desired locale.
 * @return A locale for which number text breaking information is available, or 0 if none.
 * @see ubrk_countAvailable
-* @stable ICU 2.0
+* \xrefitem stable "Stable" "Stable List" ICU 2.0
 */
 U_CAPI const char* U_EXPORT2
 ubrk_getAvailable(int32_t index) __INTRODUCED_IN(31);
@@ -478,7 +480,7 @@
 * calls to \ref ubrk_getAvailable.
 * @return The number of locales for which text breaking information is available.
 * @see ubrk_getAvailable
-* @stable ICU 2.0
+* \xrefitem stable "Stable" "Stable List" ICU 2.0
 */
 U_CAPI int32_t U_EXPORT2
 ubrk_countAvailable(void) __INTRODUCED_IN(31);
@@ -493,7 +495,7 @@
 * @param bi The break iterator to use.
 * @param offset the offset to check.
 * @return True if "offset" is a boundary position.
-* @stable ICU 2.0
+* \xrefitem stable "Stable" "Stable List" ICU 2.0
 */
 U_CAPI  UBool U_EXPORT2
 ubrk_isBoundary(UBreakIterator *bi, int32_t offset) __INTRODUCED_IN(31);
@@ -507,7 +509,7 @@
  * status, a default value of 0 is returned.
  * <p>
  * For word break iterators, the possible values are defined in enum UWordBreak.
- * @stable ICU 2.2
+ * \xrefitem stable "Stable" "Stable List" ICU 2.2
  */
 U_CAPI  int32_t U_EXPORT2
 ubrk_getRuleStatus(UBreakIterator *bi) __INTRODUCED_IN(31);
@@ -529,7 +531,7 @@
  * @param status    receives error codes.
  * @return          The number of rule status values from rules that determined
  *                  the most recent boundary returned by the break iterator.
- * @stable ICU 3.0
+ * \xrefitem stable "Stable" "Stable List" ICU 3.0
  */
 U_CAPI  int32_t U_EXPORT2
 ubrk_getRuleStatusVec(UBreakIterator *bi, int32_t *fillInVec, int32_t capacity, UErrorCode *status) __INTRODUCED_IN(31);
@@ -546,3 +548,5 @@
 #endif /* #if !UCONFIG_NO_BREAK_ITERATION */
 
 #endif
+
+/** @} */ // addtogroup
diff --git a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/unicode/uchar.h b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/unicode/uchar.h
index fdb4f58..b8e21f2 100644
--- a/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/unicode/uchar.h
+++ b/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/unicode/uchar.h
@@ -39,7 +39,7 @@
  * APIs are not used.
  *
  * @see ucnv_getUnicodeSet
- * @stable ICU 2.4
+ * \xrefitem stable "Stable" "Stable List" ICU 2.4
  */
 typedef struct USet USet;
 
@@ -58,11 +58,13 @@
  * Call u_getUnicodeVersion to get the actual Unicode version of the data.
  *
  * @see u_getUnicodeVersion
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 #define U_UNICODE_VERSION "13.0"
 
 /**
+ * @addtogroup ICU4C
+ * @{
  * \file
  * \brief C API: Unicode Properties
  *
@@ -153,7 +155,7 @@
  * Constants.
  */
 
-/** The lowest Unicode code point value. Code points are non-negative. @stable ICU 2.0 */
+/** The lowest Unicode code point value. Code points are non-negative. \xrefitem stable "Stable" "Stable List" ICU 2.0 */
 #define UCHAR_MIN_VALUE 0
 
 /**
@@ -162,13 +164,13 @@
  * For a single character, UChar32 is a simple type that can hold any code point value.
  *
  * @see UChar32
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 #define UCHAR_MAX_VALUE 0x10ffff
 
 /**
  * Get a single-bit bit set (a flag) from a bit number 0..31.
- * @stable ICU 2.1
+ * \xrefitem stable "Stable" "Stable List" ICU 2.1
  */
 #define U_MASK(x) ((uint32_t)1<<(x))
 
@@ -190,7 +192,7 @@
  * @see u_hasBinaryProperty
  * @see u_getIntPropertyValue
  * @see u_getUnicodeVersion
- * @stable ICU 2.1
+ * \xrefitem stable "Stable" "Stable List" ICU 2.1
  */
 typedef enum UProperty {
     /*
@@ -205,169 +207,169 @@
     identifiers. */
 
     /** Binary property Alphabetic. Same as u_isUAlphabetic, different from u_isalpha.
-        Lu+Ll+Lt+Lm+Lo+Nl+Other_Alphabetic @stable ICU 2.1 */
+        Lu+Ll+Lt+Lm+Lo+Nl+Other_Alphabetic \xrefitem stable "Stable" "Stable List" ICU 2.1 */
     UCHAR_ALPHABETIC=0,
-    /** First constant for binary Unicode properties. @stable ICU 2.1 */
+    /** First constant for binary Unicode properties. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
     UCHAR_BINARY_START=UCHAR_ALPHABETIC,
-    /** Binary property ASCII_Hex_Digit. 0-9 A-F a-f @stable ICU 2.1 */
+    /** Binary property ASCII_Hex_Digit. 0-9 A-F a-f \xrefitem stable "Stable" "Stable List" ICU 2.1 */
     UCHAR_ASCII_HEX_DIGIT=1,
     /** Binary property Bidi_Control.
         Format controls which have specific functions
-        in the Bidi Algorithm. @stable ICU 2.1 */
+        in the Bidi Algorithm. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
     UCHAR_BIDI_CONTROL=2,
     /** Binary property Bidi_Mirrored.
         Characters that may change display in RTL text.
         Same as u_isMirrored.
-        See Bidi Algorithm, UTR 9. @stable ICU 2.1 */
+        See Bidi Algorithm, UTR 9. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
     UCHAR_BIDI_MIRRORED=3,
-    /** Binary property Dash. Variations of dashes. @stable ICU 2.1 */
+    /** Binary property Dash. Variations of dashes. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
     UCHAR_DASH=4,
     /** Binary property Default_Ignorable_Code_Point (new in Unicode 3.2).
         Ignorable in most processing.
-        <2060..206F, FFF0..FFFB, E0000..E0FFF>+Other_Default_Ignorable_Code_Point+(Cf+Cc+Cs-White_Space) @stable ICU 2.1 */
+        <2060..206F, FFF0..FFFB, E0000..E0FFF>+Other_Default_Ignorable_Code_Point+(Cf+Cc+Cs-White_Space) \xrefitem stable "Stable" "Stable List" ICU 2.1 */
     UCHAR_DEFAULT_IGNORABLE_CODE_POINT=5,
     /** Binary property Deprecated (new in Unicode 3.2).
-        The usage of deprecated characters is strongly discouraged. @stable ICU 2.1 */
+        The usage of deprecated characters is strongly discouraged. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
     UCHAR_DEPRECATED=6,
     /** Binary property Diacritic. Characters that linguistically modify
-        the meaning of another character to which they apply. @stable ICU 2.1 */
+        the meaning of another character to which they apply. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
     UCHAR_DIACRITIC=7,
     /** Binary property Extender.
         Extend the value or shape of a preceding alphabetic character,
-        e.g., length and iteration marks. @stable ICU 2.1 */
+        e.g., length and iteration marks. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
     UCHAR_EXTENDER=8,
     /** Binary property Full_Composition_Exclusion.
         CompositionExclusions.txt+Singleton Decompositions+
-        Non-Starter Decompositions. @stable ICU 2.1 */
+        Non-Starter Decompositions. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
     UCHAR_FULL_COMPOSITION_EXCLUSION=9,
     /** Binary property Grapheme_Base (new in Unicode 3.2).
         For programmatic determination of grapheme cluster boundaries.
-        [0..10FFFF]-Cc-Cf-Cs-Co-Cn-Zl-Zp-Grapheme_Link-Grapheme_Extend-CGJ @stable ICU 2.1 */
+        [0..10FFFF]-Cc-Cf-Cs-Co-Cn-Zl-Zp-Grapheme_Link-Grapheme_Extend-CGJ \xrefitem stable "Stable" "Stable List" ICU 2.1 */
     UCHAR_GRAPHEME_BASE=10,
     /** Binary property Grapheme_Extend (new in Unicode 3.2).
         For programmatic determination of grapheme cluster boundaries.
-        Me+Mn+Mc+Other_Grapheme_Extend-Grapheme_Link-CGJ @stable ICU 2.1 */
+        Me+Mn+Mc+Other_Grapheme_Extend-Grapheme_Link-CGJ \xrefitem stable "Stable" "Stable List" ICU 2.1 */
     UCHAR_GRAPHEME_EXTEND=11,
     /** Binary property Grapheme_Link (new in Unicode 3.2).
-        For programmatic determination of grapheme cluster boundaries. @stable ICU 2.1 */
+        For programmatic determination of grapheme cluster boundaries. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
     UCHAR_GRAPHEME_LINK=12,
     /** Binary property Hex_Digit.
-        Characters commonly used for hexadecimal numbers. @stable ICU 2.1 */
+        Characters commonly used for hexadecimal numbers. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
     UCHAR_HEX_DIGIT=13,
     /** Binary property Hyphen. Dashes used to mark connections
-        between pieces of words, plus the Katakana middle dot. @stable ICU 2.1 */
+        between pieces of words, plus the Katakana middle dot. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
     UCHAR_HYPHEN=14,
     /** Binary property ID_Continue.
         Characters that can continue an identifier.
         DerivedCoreProperties.txt also says "NOTE: Cf characters should be filtered out."
-        ID_Start+Mn+Mc+Nd+Pc @stable ICU 2.1 */
+        ID_Start+Mn+Mc+Nd+Pc \xrefitem stable "Stable" "Stable List" ICU 2.1 */
     UCHAR_ID_CONTINUE=15,
     /** Binary property ID_Start.
         Characters that can start an identifier.
-        Lu+Ll+Lt+Lm+Lo+Nl @stable ICU 2.1 */
+        Lu+Ll+Lt+Lm+Lo+Nl \xrefitem stable "Stable" "Stable List" ICU 2.1 */
     UCHAR_ID_START=16,
     /** Binary property Ideographic.
-        CJKV ideographs. @stable ICU 2.1 */
+        CJKV ideographs. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
     UCHAR_IDEOGRAPHIC=17,
     /** Binary property IDS_Binary_Operator (new in Unicode 3.2).
         For programmatic determination of
-        Ideographic Description Sequences. @stable ICU 2.1 */
+        Ideographic Description Sequences. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
     UCHAR_IDS_BINARY_OPERATOR=18,
     /** Binary property IDS_Trinary_Operator (new in Unicode 3.2).
         For programmatic determination of
-        Ideographic Description Sequences. @stable ICU 2.1 */
+        Ideographic Description Sequences. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
     UCHAR_IDS_TRINARY_OPERATOR=19,
     /** Binary property Join_Control.
-        Format controls for cursive joining and ligation. @stable ICU 2.1 */
+        Format controls for cursive joining and ligation. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
     UCHAR_JOIN_CONTROL=20,
     /** Binary property Logical_Order_Exception (new in Unicode 3.2).
         Characters that do not use logical order and
-        require special handling in most processing. @stable ICU 2.1 */
+        require special handling in most processing. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
     UCHAR_LOGICAL_ORDER_EXCEPTION=21,
     /** Binary property Lowercase. Same as u_isULowercase, different from u_islower.
-        Ll+Other_Lowercase @stable ICU 2.1 */
+        Ll+Other_Lowercase \xrefitem stable "Stable" "Stable List" ICU 2.1 */
     UCHAR_LOWERCASE=22,
-    /** Binary property Math. Sm+Other_Math @stable ICU 2.1 */
+    /** Binary property Math. Sm+Other_Math \xrefitem stable "Stable" "Stable List" ICU 2.1 */
     UCHAR_MATH=23,
     /** Binary property Noncharacter_Code_Point.
         Code points that are explicitly defined as illegal
-        for the encoding of characters. @stable ICU 2.1 */
+        for the encoding of characters. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
     UCHAR_NONCHARACTER_CODE_POINT=24,
-    /** Binary property Quotation_Mark. @stable ICU 2.1 */
+    /** Binary property Quotation_Mark. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
     UCHAR_QUOTATION_MARK=25,
     /** Binary property Radical (new in Unicode 3.2).
         For programmatic determination of
-        Ideographic Description Sequences. @stable ICU 2.1 */
+        Ideographic Description Sequences. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
     UCHAR_RADICAL=26,
     /** Binary property Soft_Dotted (new in Unicode 3.2).
         Characters with a "soft dot", like i or j.
         An accent placed on these characters causes
-        the dot to disappear. @stable ICU 2.1 */
+        the dot to disappear. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
     UCHAR_SOFT_DOTTED=27,
     /** Binary property Terminal_Punctuation.
         Punctuation characters that generally mark
-        the end of textual units. @stable ICU 2.1 */
+        the end of textual units. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
     UCHAR_TERMINAL_PUNCTUATION=28,
     /** Binary property Unified_Ideograph (new in Unicode 3.2).
         For programmatic determination of
-        Ideographic Description Sequences. @stable ICU 2.1 */
+        Ideographic Description Sequences. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
     UCHAR_UNIFIED_IDEOGRAPH=29,
     /** Binary property Uppercase. Same as u_isUUppercase, different from u_isupper.
-        Lu+Other_Uppercase @stable ICU 2.1 */
+        Lu+Other_Uppercase \xrefitem stable "Stable" "Stable List" ICU 2.1 */
     UCHAR_UPPERCASE=30,
     /** Binary property White_Space.
         Same as u_isUWhiteSpace, different from u_isspace and u_isWhitespace.
-        Space characters+TAB+CR+LF-ZWSP-ZWNBSP @stable ICU 2.1 */
+        Space characters+TAB+CR+LF-ZWSP-ZWNBSP \xrefitem stable "Stable" "Stable List" ICU 2.1 */
     UCHAR_WHITE_SPACE=31,
     /** Binary property XID_Continue.
         ID_Continue modified to allow closure under
-        normalization forms NFKC and NFKD. @stable ICU 2.1 */
+        normalization forms NFKC and NFKD. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
     UCHAR_XID_CONTINUE=32,
     /** Binary property XID_Start. ID_Start modified to allow
-        closure under normalization forms NFKC and NFKD. @stable ICU 2.1 */
+        closure under normalization forms NFKC and NFKD. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
     UCHAR_XID_START=33,
     /** Binary property Case_Sensitive. Either the source of a case
         mapping or _in_ the target of a case mapping. Not the same as
-        the general category Cased_Letter. @stable ICU 2.6 */
+        the general category Cased_Letter. \xrefitem stable "Stable" "Stable List" ICU 2.6 */
    UCHAR_CASE_SENSITIVE=34,
     /** Binary property STerm (new in Unicode 4.0.1).
         Sentence Terminal. Used in UAX #29: Text Boundaries
         (http://www.unicode.org/reports/tr29/)
-        @stable ICU 3.0 */
+        \xrefitem stable "Stable" "Stable List" ICU 3.0 */
     UCHAR_S_TERM=35,
     /** Binary property Variation_Selector (new in Unicode 4.0.1).
         Indicates all those characters that qualify as Variation Selectors.
         For details on the behavior of these characters,
         see StandardizedVariants.html and 15.6 Variation Selectors.
-        @stable ICU 3.0 */
+        \xrefitem stable "Stable" "Stable List" ICU 3.0 */
     UCHAR_VARIATION_SELECTOR=36,
     /** Binary property NFD_Inert.
         ICU-specific property for characters that are inert under NFD,
         i.e., they do not interact with adjacent characters.
         See the documentation for the Normalizer2 class and the
         Normalizer2::isInert() method.
-        @stable ICU 3.0 */
+        \xrefitem stable "Stable" "Stable List" ICU 3.0 */
     UCHAR_NFD_INERT=37,
     /** Binary property NFKD_Inert.
         ICU-specific property for characters that are inert under NFKD,
         i.e., they do not interact with adjacent characters.
         See the documentation for the Normalizer2 class and the
         Normalizer2::isInert() method.
-        @stable ICU 3.0 */
+        \xrefitem stable "Stable" "Stable List" ICU 3.0 */
     UCHAR_NFKD_INERT=38,
     /** Binary property NFC_Inert.
         ICU-specific property for characters that are inert under NFC,
         i.e., they do not interact with adjacent characters.
         See the documentation for the Normalizer2 class and the
         Normalizer2::isInert() method.
-        @stable ICU 3.0 */
+        \xrefitem stable "Stable" "Stable List" ICU 3.0 */
     UCHAR_NFC_INERT=39,
     /** Binary property NFKC_Inert.
         ICU-specific property for characters that are inert under NFKC,
         i.e., they do not interact with adjacent characters.
         See the documentation for the Normalizer2 class and the
         Normalizer2::isInert() method.
-        @stable ICU 3.0 */
+        \xrefitem stable "Stable" "Stable List" ICU 3.0 */
     UCHAR_NFKC_INERT=40,
     /** Binary Property Segment_Starter.
         ICU-specific property for characters that are starters in terms of
@@ -378,230 +380,230 @@
         ICU uses this property for segmenting a string for generating a set of
         canonically equivalent strings, e.g. for canonical closure while
         processing collation tailoring rules.
-        @stable ICU 3.0 */
+        \xrefitem stable "Stable" "Stable List" ICU 3.0 */
     UCHAR_SEGMENT_STARTER=41,
     /** Binary property Pattern_Syntax (new in Unicode 4.1).
         See UAX #31 Identifier and Pattern Syntax
         (http://www.unicode.org/reports/tr31/)
-        @stable ICU 3.4 */
+        \xrefitem stable "Stable" "Stable List" ICU 3.4 */
     UCHAR_PATTERN_SYNTAX=42,
     /** Binary property Pattern_White_Space (new in Unicode 4.1).
         See UAX #31 Identifier and Pattern Syntax
         (http://www.unicode.org/reports/tr31/)
-        @stable ICU 3.4 */
+        \xrefitem stable "Stable" "Stable List" ICU 3.4 */
     UCHAR_PATTERN_WHITE_SPACE=43,
     /** Binary property alnum (a C/POSIX character class).
         Implemented according to the UTS #18 Annex C Standard Recommendation.
         See the uchar.h file documentation.
-        @stable ICU 3.4 */
+        \xrefitem stable "Stable" "Stable List" ICU 3.4 */
     UCHAR_POSIX_ALNUM=44,
     /** Binary property blank (a C/POSIX character class).
         Implemented according to the UTS #18 Annex C Standard Recommendation.
         See the uchar.h file documentation.
-        @stable ICU 3.4 */
+        \xrefitem stable "Stable" "Stable List" ICU 3.4 */
     UCHAR_POSIX_BLANK=45,
     /** Binary property graph (a C/POSIX character class).
         Implemented according to the UTS #18 Annex C Standard Recommendation.
         See the uchar.h file documentation.
-        @stable ICU 3.4 */
+        \xrefitem stable "Stable" "Stable List" ICU 3.4 */
     UCHAR_POSIX_GRAPH=46,
     /** Binary property print (a C/POSIX character class).
         Implemented according to the UTS #18 Annex C Standard Recommendation.
         See the uchar.h file documentation.
-        @stable ICU 3.4 */
+        \xrefitem stable "Stable" "Stable List" ICU 3.4 */
     UCHAR_POSIX_PRINT=47,
     /** Binary property xdigit (a C/POSIX character class).
         Implemented according to the UTS #18 Annex C Standard Recommendation.
         See the uchar.h file documentation.
-        @stable ICU 3.4 */
+        \xrefitem stable "Stable" "Stable List" ICU 3.4 */
     UCHAR_POSIX_XDIGIT=48,
-    /** Binary property Cased. For Lowercase, Uppercase and Titlecase characters. @stable ICU 4.4 */
+    /** Binary property Cased. For Lowercase, Uppercase and Titlecase characters. \xrefitem stable "Stable" "Stable List" ICU 4.4 */
     UCHAR_CASED=49,
-    /** Binary property Case_Ignorable. Used in context-sensitive case mappings. @stable ICU 4.4 */
+    /** Binary property Case_Ignorable. Used in context-sensitive case mappings. \xrefitem stable "Stable" "Stable List" ICU 4.4 */
     UCHAR_CASE_IGNORABLE=50,
-    /** Binary property Changes_When_Lowercased. @stable ICU 4.4 */
+    /** Binary property Changes_When_Lowercased. \xrefitem stable "Stable" "Stable List" ICU 4.4 */
     UCHAR_CHANGES_WHEN_LOWERCASED=51,
-    /** Binary property Changes_When_Uppercased. @stable ICU 4.4 */
+    /** Binary property Changes_When_Uppercased. \xrefitem stable "Stable" "Stable List" ICU 4.4 */
     UCHAR_CHANGES_WHEN_UPPERCASED=52,
-    /** Binary property Changes_When_Titlecased. @stable ICU 4.4 */
+    /** Binary property Changes_When_Titlecased. \xrefitem stable "Stable" "Stable List" ICU 4.4 */
     UCHAR_CHANGES_WHEN_TITLECASED=53,
-    /** Binary property Changes_When_Casefolded. @stable ICU 4.4 */
+    /** Binary property Changes_When_Casefolded. \xrefitem stable "Stable" "Stable List" ICU 4.4 */
     UCHAR_CHANGES_WHEN_CASEFOLDED=54,
-    /** Binary property Changes_When_Casemapped. @stable ICU 4.4 */
+    /** Binary property Changes_When_Casemapped. \xrefitem stable "Stable" "Stable List" ICU 4.4 */
     UCHAR_CHANGES_WHEN_CASEMAPPED=55,
-    /** Binary property Changes_When_NFKC_Casefolded. @stable ICU 4.4 */
+    /** Binary property Changes_When_NFKC_Casefolded. \xrefitem stable "Stable" "Stable List" ICU 4.4 */
     UCHAR_CHANGES_WHEN_NFKC_CASEFOLDED=56,
     /**
      * Binary property Emoji.
      * See http://www.unicode.org/reports/tr51/#Emoji_Properties
      *
-     * @stable ICU 57
+     * \xrefitem stable "Stable" "Stable List" ICU 57
      */
     UCHAR_EMOJI=57,
     /**
      * Binary property Emoji_Presentation.
      * See http://www.unicode.org/reports/tr51/#Emoji_Properties
      *
-     * @stable ICU 57
+     * \xrefitem stable "Stable" "Stable List" ICU 57
      */
     UCHAR_EMOJI_PRESENTATION=58,
     /**
      * Binary property Emoji_Modifier.
      * See http://www.unicode.org/reports/tr51/#Emoji_Properties
      *
-     * @stable ICU 57
+     * \xrefitem stable "Stable" "Stable List" ICU 57
      */
     UCHAR_EMOJI_MODIFIER=59,
     /**
      * Binary property Emoji_Modifier_Base.
      * See http://www.unicode.org/reports/tr51/#Emoji_Properties
      *
-     * @stable ICU 57
+     * \xrefitem stable "Stable" "Stable List" ICU 57
      */
     UCHAR_EMOJI_MODIFIER_BASE=60,
     /**
      * Binary property Emoji_Component.
      * See http://www.unicode.org/reports/tr51/#Emoji_Properties
      *
-     * @stable ICU 60
+     * \xrefitem stable "Stable" "Stable List" ICU 60
      */
     UCHAR_EMOJI_COMPONENT=61,
     /**
      * Binary property Regional_Indicator.
-     * @stable ICU 60
+     * \xrefitem stable "Stable" "Stable List" ICU 60
      */
     UCHAR_REGIONAL_INDICATOR=62,
     /**
      * Binary property Prepended_Concatenation_Mark.
-     * @stable ICU 60
+     * \xrefitem stable "Stable" "Stable List" ICU 60
      */
     UCHAR_PREPENDED_CONCATENATION_MARK=63,
     /**
      * Binary property Extended_Pictographic.
      * See http://www.unicode.org/reports/tr51/#Emoji_Properties
      *
-     * @stable ICU 62
+     * \xrefitem stable "Stable" "Stable List" ICU 62
      */
     UCHAR_EXTENDED_PICTOGRAPHIC=64,
 #ifndef U_HIDE_DEPRECATED_API
     /**
      * One more than the last constant for binary Unicode properties.
-     * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
+     * \xrefitem deprecated "Deprecated" "Deprecated List" ICU 58 The numeric value may change over time, see ICU ticket #12420.
      */
     UCHAR_BINARY_LIMIT,
 #endif  // U_HIDE_DEPRECATED_API
 
     /** Enumerated property Bidi_Class.
-        Same as u_charDirection, returns UCharDirection values. @stable ICU 2.2 */
+        Same as u_charDirection, returns UCharDirection values. \xrefitem stable "Stable" "Stable List" ICU 2.2 */
     UCHAR_BIDI_CLASS=0x1000,
-    /** First constant for enumerated/integer Unicode properties. @stable ICU 2.2 */
+    /** First constant for enumerated/integer Unicode properties. \xrefitem stable "Stable" "Stable List" ICU 2.2 */
     UCHAR_INT_START=UCHAR_BIDI_CLASS,
     /** Enumerated property Block.
-        Same as ublock_getCode, returns UBlockCode values. @stable ICU 2.2 */
+        Same as ublock_getCode, returns UBlockCode values. \xrefitem stable "Stable" "Stable List" ICU 2.2 */
     UCHAR_BLOCK=0x1001,
     /** Enumerated property Canonical_Combining_Class.
-        Same as u_getCombiningClass, returns 8-bit numeric values. @stable ICU 2.2 */
+        Same as u_getCombiningClass, returns 8-bit numeric values. \xrefitem stable "Stable" "Stable List" ICU 2.2 */
     UCHAR_CANONICAL_COMBINING_CLASS=0x1002,
     /** Enumerated property Decomposition_Type.
-        Returns UDecompositionType values. @stable ICU 2.2 */
+        Returns UDecompositionType values. \xrefitem stable "Stable" "Stable List" ICU 2.2 */
     UCHAR_DECOMPOSITION_TYPE=0x1003,
     /** Enumerated property East_Asian_Width.
         See http://www.unicode.org/reports/tr11/
-        Returns UEastAsianWidth values. @stable ICU 2.2 */
+        Returns UEastAsianWidth values. \xrefitem stable "Stable" "Stable List" ICU 2.2 */
     UCHAR_EAST_ASIAN_WIDTH=0x1004,
     /** Enumerated property General_Category.
-        Same as u_charType, returns UCharCategory values. @stable ICU 2.2 */
+        Same as u_charType, returns UCharCategory values. \xrefitem stable "Stable" "Stable List" ICU 2.2 */
     UCHAR_GENERAL_CATEGORY=0x1005,
     /** Enumerated property Joining_Group.
-        Returns UJoiningGroup values. @stable ICU 2.2 */
+        Returns UJoiningGroup values. \xrefitem stable "Stable" "Stable List" ICU 2.2 */
     UCHAR_JOINING_GROUP=0x1006,
     /** Enumerated property Joining_Type.
-        Returns UJoiningType values. @stable ICU 2.2 */
+        Returns UJoiningType values. \xrefitem stable "Stable" "Stable List" ICU 2.2 */
     UCHAR_JOINING_TYPE=0x1007,
     /** Enumerated property Line_Break.
-        Returns ULineBreak values. @stable ICU 2.2 */
+        Returns ULineBreak values. \xrefitem stable "Stable" "Stable List" ICU 2.2 */
     UCHAR_LINE_BREAK=0x1008,
     /** Enumerated property Numeric_Type.
-        Returns UNumericType values. @stable ICU 2.2 */
+        Returns UNumericType values. \xrefitem stable "Stable" "Stable List" ICU 2.2 */
     UCHAR_NUMERIC_TYPE=0x1009,
     /** Enumerated property Script.
-        Same as uscript_getScript, returns UScriptCode values. @stable ICU 2.2 */
+        Same as uscript_getScript, returns UScriptCode values. \xrefitem stable "Stable" "Stable List" ICU 2.2 */
     UCHAR_SCRIPT=0x100A,
     /** Enumerated property Hangul_Syllable_Type, new in Unicode 4.
-        Returns UHangulSyllableType values. @stable ICU 2.6 */
+        Returns UHangulSyllableType values. \xrefitem stable "Stable" "Stable List" ICU 2.6 */
     UCHAR_HANGUL_SYLLABLE_TYPE=0x100B,
     /** Enumerated property NFD_Quick_Check.
-        Returns UNormalizationCheckResult values. @stable ICU 3.0 */
+        Returns UNormalizationCheckResult values. \xrefitem stable "Stable" "Stable List" ICU 3.0 */
     UCHAR_NFD_QUICK_CHECK=0x100C,
     /** Enumerated property NFKD_Quick_Check.
-        Returns UNormalizationCheckResult values. @stable ICU 3.0 */
+        Returns UNormalizationCheckResult values. \xrefitem stable "Stable" "Stable List" ICU 3.0 */
     UCHAR_NFKD_QUICK_CHECK=0x100D,
     /** Enumerated property NFC_Quick_Check.
-        Returns UNormalizationCheckResult values. @stable ICU 3.0 */
+        Returns UNormalizationCheckResult values. \xrefitem stable "Stable" "Stable List" ICU 3.0 */
     UCHAR_NFC_QUICK_CHECK=0x100E,
     /** Enumerated property NFKC_Quick_Check.
-        Returns UNormalizationCheckResult values. @stable ICU 3.0 */
+        Returns UNormalizationCheckResult values. \xrefitem stable "Stable" "Stable List" ICU 3.0 */
     UCHAR_NFKC_QUICK_CHECK=0x100F,
     /** Enumerated property Lead_Canonical_Combining_Class.
         ICU-specific property for the ccc of the first code point
         of the decomposition, or lccc(c)=ccc(NFD(c)[0]).
         Useful for checking for canonically ordered text;
         see UNORM_FCD and http://www.unicode.org/notes/tn5/#FCD .
-        Returns 8-bit numeric values like UCHAR_CANONICAL_COMBINING_CLASS. @stable ICU 3.0 */
+        Returns 8-bit numeric values like UCHAR_CANONICAL_COMBINING_CLASS. \xrefitem stable "Stable" "Stable List" ICU 3.0 */
     UCHAR_LEAD_CANONICAL_COMBINING_CLASS=0x1010,
     /** Enumerated property Trail_Canonical_Combining_Class.
         ICU-specific property for the ccc of the last code point
         of the decomposition, or tccc(c)=ccc(NFD(c)[last]).
         Useful for checking for canonically ordered text;
         see UNORM_FCD and http://www.unicode.org/notes/tn5/#FCD .
-        Returns 8-bit numeric values like UCHAR_CANONICAL_COMBINING_CLASS. @stable ICU 3.0 */
+        Returns 8-bit numeric values like UCHAR_CANONICAL_COMBINING_CLASS. \xrefitem stable "Stable" "Stable List" ICU 3.0 */
     UCHAR_TRAIL_CANONICAL_COMBINING_CLASS=0x1011,
     /** Enumerated property Grapheme_Cluster_Break (new in Unicode 4.1).
         Used in UAX #29: Text Boundaries
         (http://www.unicode.org/reports/tr29/)
-        Returns UGraphemeClusterBreak values. @stable ICU 3.4 */
+        Returns UGraphemeClusterBreak values. \xrefitem stable "Stable" "Stable List" ICU 3.4 */
     UCHAR_GRAPHEME_CLUSTER_BREAK=0x1012,
     /** Enumerated property Sentence_Break (new in Unicode 4.1).
         Used in UAX #29: Text Boundaries
         (http://www.unicode.org/reports/tr29/)
-        Returns USentenceBreak values. @stable ICU 3.4 */
+        Returns USentenceBreak values. \xrefitem stable "Stable" "Stable List" ICU 3.4 */
     UCHAR_SENTENCE_BREAK=0x1013,
     /** Enumerated property Word_Break (new in Unicode 4.1).
         Used in UAX #29: Text Boundaries
         (http://www.unicode.org/reports/tr29/)
-        Returns UWordBreakValues values. @stable ICU 3.4 */
+        Returns UWordBreakValues values. \xrefitem stable "Stable" "Stable List" ICU 3.4 */
     UCHAR_WORD_BREAK=0x1014,
     /** Enumerated property Bidi_Paired_Bracket_Type (new in Unicode 6.3).
         Used in UAX #9: Unicode Bidirectional Algorithm
         (http://www.unicode.org/reports/tr9/)
-        Returns UBidiPairedBracketType values. @stable ICU 52 */
+        Returns UBidiPairedBracketType values. \xrefitem stable "Stable" "Stable List" ICU 52 */
     UCHAR_BIDI_PAIRED_BRACKET_TYPE=0x1015,
     /**
      * Enumerated property Indic_Positional_Category.
      * New in Unicode 6.0 as provisional property Indic_Matra_Category;
      * renamed and changed to informative in Unicode 8.0.
      * See http://www.unicode.org/reports/tr44/#IndicPositionalCategory.txt
-     * @stable ICU 63
+     * \xrefitem stable "Stable" "Stable List" ICU 63
      */
     UCHAR_INDIC_POSITIONAL_CATEGORY=0x1016,
     /**
      * Enumerated property Indic_Syllabic_Category.
      * New in Unicode 6.0 as provisional; informative since Unicode 8.0.
      * See http://www.unicode.org/reports/tr44/#IndicSyllabicCategory.txt
-     * @stable ICU 63
+     * \xrefitem stable "Stable" "Stable List" ICU 63
      */
     UCHAR_INDIC_SYLLABIC_CATEGORY=0x1017,
     /**
      * Enumerated property Vertical_Orientation.
      * Used for UAX #50 Unicode Vertical Text Layout (https://www.unicode.org/reports/tr50/).
      * New as a UCD property in Unicode 10.0.
-     * @stable ICU 63
+     * \xrefitem stable "Stable" "Stable List" ICU 63
      */
     UCHAR_VERTICAL_ORIENTATION=0x1018,
 #ifndef U_HIDE_DEPRECATED_API
     /**
      * One more than the last constant for enumerated/integer Unicode properties.
-     * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
+     * \xrefitem deprecated "Deprecated" "Deprecated List" ICU 58 The numeric value may change over time, see ICU ticket #12420.
      */
     UCHAR_INT_LIMIT=0x1019,
 #endif  // U_HIDE_DEPRECATED_API
@@ -613,85 +615,85 @@
         When used with u_getPropertyValueName() and u_getPropertyValueEnum(),
         a multi-bit mask is used for sets of categories like "Letters".
         Mask values should be cast to uint32_t.
-        @stable ICU 2.4 */
+        \xrefitem stable "Stable" "Stable List" ICU 2.4 */
     UCHAR_GENERAL_CATEGORY_MASK=0x2000,
-    /** First constant for bit-mask Unicode properties. @stable ICU 2.4 */
+    /** First constant for bit-mask Unicode properties. \xrefitem stable "Stable" "Stable List" ICU 2.4 */
     UCHAR_MASK_START=UCHAR_GENERAL_CATEGORY_MASK,
 #ifndef U_HIDE_DEPRECATED_API
     /**
      * One more than the last constant for bit-mask Unicode properties.
-     * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
+     * \xrefitem deprecated "Deprecated" "Deprecated List" ICU 58 The numeric value may change over time, see ICU ticket #12420.
      */
     UCHAR_MASK_LIMIT=0x2001,
 #endif  // U_HIDE_DEPRECATED_API
 
     /** Double property Numeric_Value.
-        Corresponds to u_getNumericValue. @stable ICU 2.4 */
+        Corresponds to u_getNumericValue. \xrefitem stable "Stable" "Stable List" ICU 2.4 */
     UCHAR_NUMERIC_VALUE=0x3000,
-    /** First constant for double Unicode properties. @stable ICU 2.4 */
+    /** First constant for double Unicode properties. \xrefitem stable "Stable" "Stable List" ICU 2.4 */
     UCHAR_DOUBLE_START=UCHAR_NUMERIC_VALUE,
 #ifndef U_HIDE_DEPRECATED_API
     /**
      * One more than the last constant for double Unicode properties.
-     * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
+     * \xrefitem deprecated "Deprecated" "Deprecated List" ICU 58 The numeric value may change over time, see ICU ticket #12420.
      */
     UCHAR_DOUBLE_LIMIT=0x3001,
 #endif  // U_HIDE_DEPRECATED_API
 
     /** String property Age.
-        Corresponds to u_charAge. @stable ICU 2.4 */
+        Corresponds to u_charAge. \xrefitem stable "Stable" "Stable List" ICU 2.4 */
     UCHAR_AGE=0x4000,
-    /** First constant for string Unicode properties. @stable ICU 2.4 */
+    /** First constant for string Unicode properties. \xrefitem stable "Stable" "Stable List" ICU 2.4 */
     UCHAR_STRING_START=UCHAR_AGE,
     /** String property Bidi_Mirroring_Glyph.
-        Corresponds to u_charMirror. @stable ICU 2.4 */
+        Corresponds to u_charMirror. \xrefitem stable "Stable" "Stable List" ICU 2.4 */
     UCHAR_BIDI_MIRRORING_GLYPH=0x4001,
     /** String property Case_Folding.
-        Corresponds to u_strFoldCase in ustring.h. @stable ICU 2.4 */
+        Corresponds to u_strFoldCase in ustring.h. \xrefitem stable "Stable" "Stable List" ICU 2.4 */
     UCHAR_CASE_FOLDING=0x4002,
 #ifndef U_HIDE_DEPRECATED_API
     /** Deprecated string property ISO_Comment.
-        Corresponds to u_getISOComment. @deprecated ICU 49 */
+        Corresponds to u_getISOComment. \xrefitem deprecated "Deprecated" "Deprecated List" ICU 49 */
     UCHAR_ISO_COMMENT=0x4003,
 #endif  /* U_HIDE_DEPRECATED_API */
     /** String property Lowercase_Mapping.
-        Corresponds to u_strToLower in ustring.h. @stable ICU 2.4 */
+        Corresponds to u_strToLower in ustring.h. \xrefitem stable "Stable" "Stable List" ICU 2.4 */
     UCHAR_LOWERCASE_MAPPING=0x4004,
     /** String property Name.
-        Corresponds to u_charName. @stable ICU 2.4 */
+        Corresponds to u_charName. \xrefitem stable "Stable" "Stable List" ICU 2.4 */
     UCHAR_NAME=0x4005,
     /** String property Simple_Case_Folding.
-        Corresponds to u_foldCase. @stable ICU 2.4 */
+        Corresponds to u_foldCase. \xrefitem stable "Stable" "Stable List" ICU 2.4 */
     UCHAR_SIMPLE_CASE_FOLDING=0x4006,
     /** String property Simple_Lowercase_Mapping.
-        Corresponds to u_tolower. @stable ICU 2.4 */
+        Corresponds to u_tolower. \xrefitem stable "Stable" "Stable List" ICU 2.4 */
     UCHAR_SIMPLE_LOWERCASE_MAPPING=0x4007,
     /** String property Simple_Titlecase_Mapping.
-        Corresponds to u_totitle. @stable ICU 2.4 */
+        Corresponds to u_totitle. \xrefitem stable "Stable" "Stable List" ICU 2.4 */
     UCHAR_SIMPLE_TITLECASE_MAPPING=0x4008,
     /** String property Simple_Uppercase_Mapping.
-        Corresponds to u_toupper. @stable ICU 2.4 */
+        Corresponds to u_toupper. \xrefitem stable "Stable" "Stable List" ICU 2.4 */
     UCHAR_SIMPLE_UPPERCASE_MAPPING=0x4009,
     /** String property Titlecase_Mapping.
-        Corresponds to u_strToTitle in ustring.h. @stable ICU 2.4 */
+        Corresponds to u_strToTitle in ustring.h. \xrefitem stable "Stable" "Stable List" ICU 2.4 */
     UCHAR_TITLECASE_MAPPING=0x400A,
 #ifndef U_HIDE_DEPRECATED_API
     /** String property Unicode_1_Name.
         This property is of little practical value.
         Beginning with ICU 49, ICU APIs return an empty string for this property.
-        Corresponds to u_charName(U_UNICODE_10_CHAR_NAME). @deprecated ICU 49 */
+        Corresponds to u_charName(U_UNICODE_10_CHAR_NAME). \xrefitem deprecated "Deprecated" "Deprecated List" ICU 49 */
     UCHAR_UNICODE_1_NAME=0x400B,
 #endif  /* U_HIDE_DEPRECATED_API */
     /** String property Uppercase_Mapping.
-        Corresponds to u_strToUpper in ustring.h. @stable ICU 2.4 */
+        Corresponds to u_strToUpper in ustring.h. \xrefitem stable "Stable" "Stable List" ICU 2.4 */
     UCHAR_UPPERCASE_MAPPING=0x400C,
     /** String property Bidi_Paired_Bracket (new in Unicode 6.3).
-        Corresponds to u_getBidiPairedBracket. @stable ICU 52 */
+        Corresponds to u_getBidiPairedBracket. \xrefitem stable "Stable" "Stable List" ICU 52 */
     UCHAR_BIDI_PAIRED_BRACKET=0x400D,
 #ifndef U_HIDE_DEPRECATED_API
     /**
      * One more than the last constant for string Unicode properties.
-     * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
+     * \xrefitem deprecated "Deprecated" "Deprecated List" ICU 58 The numeric value may change over time, see ICU ticket #12420.
      */
     UCHAR_STRING_LIMIT=0x400E,
 #endif  // U_HIDE_DEPRECATED_API
@@ -700,26 +702,26 @@
         Some characters are commonly used in multiple scripts.
         For more information, see UAX #24: http://www.unicode.org/reports/tr24/.
         Corresponds to uscript_hasScript and uscript_getScriptExtensions in uscript.h.
-        @stable ICU 4.6 */
+        \xrefitem stable "Stable" "Stable List" ICU 4.6 */
     UCHAR_SCRIPT_EXTENSIONS=0x7000,
-    /** First constant for Unicode properties with unusual value types. @stable ICU 4.6 */
+    /** First constant for Unicode properties with unusual value types. \xrefitem stable "Stable" "Stable List" ICU 4.6 */
     UCHAR_OTHER_PROPERTY_START=UCHAR_SCRIPT_EXTENSIONS,
 #ifndef U_HIDE_DEPRECATED_API
     /**
      * One more than the last constant for Unicode properties with unusual value types.
-     * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
+     * \xrefitem deprecated "Deprecated" "Deprecated List" ICU 58 The numeric value may change over time, see ICU ticket #12420.
      */
     UCHAR_OTHER_PROPERTY_LIMIT=0x7001,
 #endif  // U_HIDE_DEPRECATED_API
 
-    /** Represents a nonexistent or invalid property or property value. @stable ICU 2.4 */
+    /** Represents a nonexistent or invalid property or property value. \xrefitem stable "Stable" "Stable List" ICU 2.4 */
     UCHAR_INVALID_CODE = -1
 } UProperty;
 
 /**
  * Data for enumerated Unicode general category types.
  * See http://www.unicode.org/Public/UNIDATA/UnicodeData.html .
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 typedef enum UCharCategory
 {
@@ -730,74 +732,74 @@
      *     U_<[A-Z_]+> = <integer>,
      */
 
-    /** Non-category for unassigned and non-character code points. @stable ICU 2.0 */
+    /** Non-category for unassigned and non-character code points. \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_UNASSIGNED              = 0,
-    /** Cn "Other, Not Assigned (no characters in [UnicodeData.txt] have this property)" (same as U_UNASSIGNED!) @stable ICU 2.0 */
+    /** Cn "Other, Not Assigned (no characters in [UnicodeData.txt] have this property)" (same as U_UNASSIGNED!) \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_GENERAL_OTHER_TYPES     = 0,
-    /** Lu @stable ICU 2.0 */
+    /** Lu \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_UPPERCASE_LETTER        = 1,
-    /** Ll @stable ICU 2.0 */
+    /** Ll \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_LOWERCASE_LETTER        = 2,
-    /** Lt @stable ICU 2.0 */
+    /** Lt \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_TITLECASE_LETTER        = 3,
-    /** Lm @stable ICU 2.0 */
+    /** Lm \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_MODIFIER_LETTER         = 4,
-    /** Lo @stable ICU 2.0 */
+    /** Lo \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_OTHER_LETTER            = 5,
-    /** Mn @stable ICU 2.0 */
+    /** Mn \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_NON_SPACING_MARK        = 6,
-    /** Me @stable ICU 2.0 */
+    /** Me \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_ENCLOSING_MARK          = 7,
-    /** Mc @stable ICU 2.0 */
+    /** Mc \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_COMBINING_SPACING_MARK  = 8,
-    /** Nd @stable ICU 2.0 */
+    /** Nd \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_DECIMAL_DIGIT_NUMBER    = 9,
-    /** Nl @stable ICU 2.0 */
+    /** Nl \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_LETTER_NUMBER           = 10,
-    /** No @stable ICU 2.0 */
+    /** No \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_OTHER_NUMBER            = 11,
-    /** Zs @stable ICU 2.0 */
+    /** Zs \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_SPACE_SEPARATOR         = 12,
-    /** Zl @stable ICU 2.0 */
+    /** Zl \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_LINE_SEPARATOR          = 13,
-    /** Zp @stable ICU 2.0 */
+    /** Zp \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_PARAGRAPH_SEPARATOR     = 14,
-    /** Cc @stable ICU 2.0 */
+    /** Cc \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_CONTROL_CHAR            = 15,
-    /** Cf @stable ICU 2.0 */
+    /** Cf \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_FORMAT_CHAR             = 16,
-    /** Co @stable ICU 2.0 */
+    /** Co \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_PRIVATE_USE_CHAR        = 17,
-    /** Cs @stable ICU 2.0 */
+    /** Cs \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_SURROGATE               = 18,
-    /** Pd @stable ICU 2.0 */
+    /** Pd \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_DASH_PUNCTUATION        = 19,
-    /** Ps @stable ICU 2.0 */
+    /** Ps \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_START_PUNCTUATION       = 20,
-    /** Pe @stable ICU 2.0 */
+    /** Pe \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_END_PUNCTUATION         = 21,
-    /** Pc @stable ICU 2.0 */
+    /** Pc \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_CONNECTOR_PUNCTUATION   = 22,
-    /** Po @stable ICU 2.0 */
+    /** Po \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_OTHER_PUNCTUATION       = 23,
-    /** Sm @stable ICU 2.0 */
+    /** Sm \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_MATH_SYMBOL             = 24,
-    /** Sc @stable ICU 2.0 */
+    /** Sc \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_CURRENCY_SYMBOL         = 25,
-    /** Sk @stable ICU 2.0 */
+    /** Sk \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_MODIFIER_SYMBOL         = 26,
-    /** So @stable ICU 2.0 */
+    /** So \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_OTHER_SYMBOL            = 27,
-    /** Pi @stable ICU 2.0 */
+    /** Pi \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_INITIAL_PUNCTUATION     = 28,
-    /** Pf @stable ICU 2.0 */
+    /** Pf \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_FINAL_PUNCTUATION       = 29,
     /**
      * One higher than the last enum UCharCategory constant.
      * This numeric value is stable (will not change), see
      * http://www.unicode.org/policies/stability_policy.html#Property_Value
      *
-     * @stable ICU 2.0
+     * \xrefitem stable "Stable" "Stable List" ICU 2.0
      */
     U_CHAR_CATEGORY_COUNT
 } UCharCategory;
@@ -814,109 +816,109 @@
  * @see u_charType
  * @see U_GET_GC_MASK
  * @see UCharCategory
- * @stable ICU 2.1
+ * \xrefitem stable "Stable" "Stable List" ICU 2.1
  */
 #define U_GC_CN_MASK    U_MASK(U_GENERAL_OTHER_TYPES)
 
-/** Mask constant for a UCharCategory. @stable ICU 2.1 */
+/** Mask constant for a UCharCategory. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
 #define U_GC_LU_MASK    U_MASK(U_UPPERCASE_LETTER)
-/** Mask constant for a UCharCategory. @stable ICU 2.1 */
+/** Mask constant for a UCharCategory. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
 #define U_GC_LL_MASK    U_MASK(U_LOWERCASE_LETTER)
-/** Mask constant for a UCharCategory. @stable ICU 2.1 */
+/** Mask constant for a UCharCategory. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
 #define U_GC_LT_MASK    U_MASK(U_TITLECASE_LETTER)
-/** Mask constant for a UCharCategory. @stable ICU 2.1 */
+/** Mask constant for a UCharCategory. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
 #define U_GC_LM_MASK    U_MASK(U_MODIFIER_LETTER)
-/** Mask constant for a UCharCategory. @stable ICU 2.1 */
+/** Mask constant for a UCharCategory. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
 #define U_GC_LO_MASK    U_MASK(U_OTHER_LETTER)
 
-/** Mask constant for a UCharCategory. @stable ICU 2.1 */
+/** Mask constant for a UCharCategory. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
 #define U_GC_MN_MASK    U_MASK(U_NON_SPACING_MARK)
-/** Mask constant for a UCharCategory. @stable ICU 2.1 */
+/** Mask constant for a UCharCategory. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
 #define U_GC_ME_MASK    U_MASK(U_ENCLOSING_MARK)
-/** Mask constant for a UCharCategory. @stable ICU 2.1 */
+/** Mask constant for a UCharCategory. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
 #define U_GC_MC_MASK    U_MASK(U_COMBINING_SPACING_MARK)
 
-/** Mask constant for a UCharCategory. @stable ICU 2.1 */
+/** Mask constant for a UCharCategory. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
 #define U_GC_ND_MASK    U_MASK(U_DECIMAL_DIGIT_NUMBER)
-/** Mask constant for a UCharCategory. @stable ICU 2.1 */
+/** Mask constant for a UCharCategory. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
 #define U_GC_NL_MASK    U_MASK(U_LETTER_NUMBER)
-/** Mask constant for a UCharCategory. @stable ICU 2.1 */
+/** Mask constant for a UCharCategory. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
 #define U_GC_NO_MASK    U_MASK(U_OTHER_NUMBER)
 
-/** Mask constant for a UCharCategory. @stable ICU 2.1 */
+/** Mask constant for a UCharCategory. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
 #define U_GC_ZS_MASK    U_MASK(U_SPACE_SEPARATOR)
-/** Mask constant for a UCharCategory. @stable ICU 2.1 */
+/** Mask constant for a UCharCategory. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
 #define U_GC_ZL_MASK    U_MASK(U_LINE_SEPARATOR)
-/** Mask constant for a UCharCategory. @stable ICU 2.1 */
+/** Mask constant for a UCharCategory. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
 #define U_GC_ZP_MASK    U_MASK(U_PARAGRAPH_SEPARATOR)
 
-/** Mask constant for a UCharCategory. @stable ICU 2.1 */
+/** Mask constant for a UCharCategory. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
 #define U_GC_CC_MASK    U_MASK(U_CONTROL_CHAR)
-/** Mask constant for a UCharCategory. @stable ICU 2.1 */
+/** Mask constant for a UCharCategory. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
 #define U_GC_CF_MASK    U_MASK(U_FORMAT_CHAR)
-/** Mask constant for a UCharCategory. @stable ICU 2.1 */
+/** Mask constant for a UCharCategory. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
 #define U_GC_CO_MASK    U_MASK(U_PRIVATE_USE_CHAR)
-/** Mask constant for a UCharCategory. @stable ICU 2.1 */
+/** Mask constant for a UCharCategory. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
 #define U_GC_CS_MASK    U_MASK(U_SURROGATE)
 
-/** Mask constant for a UCharCategory. @stable ICU 2.1 */
+/** Mask constant for a UCharCategory. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
 #define U_GC_PD_MASK    U_MASK(U_DASH_PUNCTUATION)
-/** Mask constant for a UCharCategory. @stable ICU 2.1 */
+/** Mask constant for a UCharCategory. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
 #define U_GC_PS_MASK    U_MASK(U_START_PUNCTUATION)
-/** Mask constant for a UCharCategory. @stable ICU 2.1 */
+/** Mask constant for a UCharCategory. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
 #define U_GC_PE_MASK    U_MASK(U_END_PUNCTUATION)
-/** Mask constant for a UCharCategory. @stable ICU 2.1 */
+/** Mask constant for a UCharCategory. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
 #define U_GC_PC_MASK    U_MASK(U_CONNECTOR_PUNCTUATION)
-/** Mask constant for a UCharCategory. @stable ICU 2.1 */
+/** Mask constant for a UCharCategory. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
 #define U_GC_PO_MASK    U_MASK(U_OTHER_PUNCTUATION)
 
-/** Mask constant for a UCharCategory. @stable ICU 2.1 */
+/** Mask constant for a UCharCategory. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
 #define U_GC_SM_MASK    U_MASK(U_MATH_SYMBOL)
-/** Mask constant for a UCharCategory. @stable ICU 2.1 */
+/** Mask constant for a UCharCategory. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
 #define U_GC_SC_MASK    U_MASK(U_CURRENCY_SYMBOL)
-/** Mask constant for a UCharCategory. @stable ICU 2.1 */
+/** Mask constant for a UCharCategory. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
 #define U_GC_SK_MASK    U_MASK(U_MODIFIER_SYMBOL)
-/** Mask constant for a UCharCategory. @stable ICU 2.1 */
+/** Mask constant for a UCharCategory. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
 #define U_GC_SO_MASK    U_MASK(U_OTHER_SYMBOL)
 
-/** Mask constant for a UCharCategory. @stable ICU 2.1 */
+/** Mask constant for a UCharCategory. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
 #define U_GC_PI_MASK    U_MASK(U_INITIAL_PUNCTUATION)
-/** Mask constant for a UCharCategory. @stable ICU 2.1 */
+/** Mask constant for a UCharCategory. \xrefitem stable "Stable" "Stable List" ICU 2.1 */
 #define U_GC_PF_MASK    U_MASK(U_FINAL_PUNCTUATION)
 
 
-/** Mask constant for multiple UCharCategory bits (L Letters). @stable ICU 2.1 */
+/** Mask constant for multiple UCharCategory bits (L Letters). \xrefitem stable "Stable" "Stable List" ICU 2.1 */
 #define U_GC_L_MASK \
             (U_GC_LU_MASK|U_GC_LL_MASK|U_GC_LT_MASK|U_GC_LM_MASK|U_GC_LO_MASK)
 
-/** Mask constant for multiple UCharCategory bits (LC Cased Letters). @stable ICU 2.1 */
+/** Mask constant for multiple UCharCategory bits (LC Cased Letters). \xrefitem stable "Stable" "Stable List" ICU 2.1 */
 #define U_GC_LC_MASK \
             (U_GC_LU_MASK|U_GC_LL_MASK|U_GC_LT_MASK)
 
-/** Mask constant for multiple UCharCategory bits (M Marks). @stable ICU 2.1 */
+/** Mask constant for multiple UCharCategory bits (M Marks). \xrefitem stable "Stable" "Stable List" ICU 2.1 */
 #define U_GC_M_MASK (U_GC_MN_MASK|U_GC_ME_MASK|U_GC_MC_MASK)
 
-/** Mask constant for multiple UCharCategory bits (N Numbers). @stable ICU 2.1 */
+/** Mask constant for multiple UCharCategory bits (N Numbers). \xrefitem stable "Stable" "Stable List" ICU 2.1 */
 #define U_GC_N_MASK (U_GC_ND_MASK|U_GC_NL_MASK|U_GC_NO_MASK)
 
-/** Mask constant for multiple UCharCategory bits (Z Separators). @stable ICU 2.1 */
+/** Mask constant for multiple UCharCategory bits (Z Separators). \xrefitem stable "Stable" "Stable List" ICU 2.1 */
 #define U_GC_Z_MASK (U_GC_ZS_MASK|U_GC_ZL_MASK|U_GC_ZP_MASK)
 
-/** Mask constant for multiple UCharCategory bits (C Others). @stable ICU 2.1 */
+/** Mask constant for multiple UCharCategory bits (C Others). \xrefitem stable "Stable" "Stable List" ICU 2.1 */
 #define U_GC_C_MASK \
             (U_GC_CN_MASK|U_GC_CC_MASK|U_GC_CF_MASK|U_GC_CO_MASK|U_GC_CS_MASK)
 
-/** Mask constant for multiple UCharCategory bits (P Punctuation). @stable ICU 2.1 */
+/** Mask constant for multiple UCharCategory bits (P Punctuation). \xrefitem stable "Stable" "Stable List" ICU 2.1 */
 #define U_GC_P_MASK \
             (U_GC_PD_MASK|U_GC_PS_MASK|U_GC_PE_MASK|U_GC_PC_MASK|U_GC_PO_MASK| \
              U_GC_PI_MASK|U_GC_PF_MASK)
 
-/** Mask constant for multiple UCharCategory bits (S Symbols). @stable ICU 2.1 */
+/** Mask constant for multiple UCharCategory bits (S Symbols). \xrefitem stable "Stable" "Stable List" ICU 2.1 */
 #define U_GC_S_MASK (U_GC_SM_MASK|U_GC_SC_MASK|U_GC_SK_MASK|U_GC_SO_MASK)
 
 /**
  * This specifies the language directional property of a character set.
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 typedef enum UCharDirection {
     /*
@@ -926,58 +928,58 @@
      *     U_<[A-Z_]+> = <integer>,
      */
 
-    /** L @stable ICU 2.0 */
+    /** L \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_LEFT_TO_RIGHT               = 0,
-    /** R @stable ICU 2.0 */
+    /** R \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_RIGHT_TO_LEFT               = 1,
-    /** EN @stable ICU 2.0 */
+    /** EN \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_EUROPEAN_NUMBER             = 2,
-    /** ES @stable ICU 2.0 */
+    /** ES \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_EUROPEAN_NUMBER_SEPARATOR   = 3,
-    /** ET @stable ICU 2.0 */
+    /** ET \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_EUROPEAN_NUMBER_TERMINATOR  = 4,
-    /** AN @stable ICU 2.0 */
+    /** AN \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_ARABIC_NUMBER               = 5,
-    /** CS @stable ICU 2.0 */
+    /** CS \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_COMMON_NUMBER_SEPARATOR     = 6,
-    /** B @stable ICU 2.0 */
+    /** B \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_BLOCK_SEPARATOR             = 7,
-    /** S @stable ICU 2.0 */
+    /** S \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_SEGMENT_SEPARATOR           = 8,
-    /** WS @stable ICU 2.0 */
+    /** WS \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_WHITE_SPACE_NEUTRAL         = 9,
-    /** ON @stable ICU 2.0 */
+    /** ON \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_OTHER_NEUTRAL               = 10,
-    /** LRE @stable ICU 2.0 */
+    /** LRE \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_LEFT_TO_RIGHT_EMBEDDING     = 11,
-    /** LRO @stable ICU 2.0 */
+    /** LRO \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_LEFT_TO_RIGHT_OVERRIDE      = 12,
-    /** AL @stable ICU 2.0 */
+    /** AL \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_RIGHT_TO_LEFT_ARABIC        = 13,
-    /** RLE @stable ICU 2.0 */
+    /** RLE \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_RIGHT_TO_LEFT_EMBEDDING     = 14,
-    /** RLO @stable ICU 2.0 */
+    /** RLO \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_RIGHT_TO_LEFT_OVERRIDE      = 15,
-    /** PDF @stable ICU 2.0 */
+    /** PDF \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_POP_DIRECTIONAL_FORMAT      = 16,
-    /** NSM @stable ICU 2.0 */
+    /** NSM \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_DIR_NON_SPACING_MARK        = 17,
-    /** BN @stable ICU 2.0 */
+    /** BN \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_BOUNDARY_NEUTRAL            = 18,
-    /** FSI @stable ICU 52 */
+    /** FSI \xrefitem stable "Stable" "Stable List" ICU 52 */
     U_FIRST_STRONG_ISOLATE        = 19,
-    /** LRI @stable ICU 52 */
+    /** LRI \xrefitem stable "Stable" "Stable List" ICU 52 */
     U_LEFT_TO_RIGHT_ISOLATE       = 20,
-    /** RLI @stable ICU 52 */
+    /** RLI \xrefitem stable "Stable" "Stable List" ICU 52 */
     U_RIGHT_TO_LEFT_ISOLATE       = 21,
-    /** PDI @stable ICU 52 */
+    /** PDI \xrefitem stable "Stable" "Stable List" ICU 52 */
     U_POP_DIRECTIONAL_ISOLATE     = 22,
 #ifndef U_HIDE_DEPRECATED_API
     /**
      * One more than the highest UCharDirection value.
      * The highest value is available via u_getIntPropertyMaxValue(UCHAR_BIDI_CLASS).
      *
-     * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
+     * \xrefitem deprecated "Deprecated" "Deprecated List" ICU 58 The numeric value may change over time, see ICU ticket #12420.
      */
     U_CHAR_DIRECTION_COUNT
 #endif  // U_HIDE_DEPRECATED_API
@@ -987,7 +989,7 @@
  * Bidi Paired Bracket Type constants.
  *
  * @see UCHAR_BIDI_PAIRED_BRACKET_TYPE
- * @stable ICU 52
+ * \xrefitem stable "Stable" "Stable List" ICU 52
  */
 typedef enum UBidiPairedBracketType {
     /*
@@ -996,18 +998,18 @@
      *     U_BPT_<Unicode Bidi_Paired_Bracket_Type value name>
      */
 
-    /** Not a paired bracket. @stable ICU 52 */
+    /** Not a paired bracket. \xrefitem stable "Stable" "Stable List" ICU 52 */
     U_BPT_NONE,
-    /** Open paired bracket. @stable ICU 52 */
+    /** Open paired bracket. \xrefitem stable "Stable" "Stable List" ICU 52 */
     U_BPT_OPEN,
-    /** Close paired bracket. @stable ICU 52 */
+    /** Close paired bracket. \xrefitem stable "Stable" "Stable List" ICU 52 */
     U_BPT_CLOSE,
 #ifndef U_HIDE_DEPRECATED_API
     /**
      * One more than the highest normal UBidiPairedBracketType value.
      * The highest value is available via u_getIntPropertyMaxValue(UCHAR_BIDI_PAIRED_BRACKET_TYPE).
      *
-     * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
+     * \xrefitem deprecated "Deprecated" "Deprecated List" ICU 58 The numeric value may change over time, see ICU ticket #12420.
      */
     U_BPT_COUNT /* 3 */
 #endif  // U_HIDE_DEPRECATED_API
@@ -1015,7 +1017,7 @@
 
 /**
  * Constants for Unicode blocks, see the Unicode Data file Blocks.txt
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 enum UBlockCode {
     /*
@@ -1024,244 +1026,244 @@
      *     UBLOCK_<Unicode Block value name> = <integer>,
      */
 
-    /** New No_Block value in Unicode 4. @stable ICU 2.6 */
+    /** New No_Block value in Unicode 4. \xrefitem stable "Stable" "Stable List" ICU 2.6 */
     UBLOCK_NO_BLOCK = 0, /*[none]*/ /* Special range indicating No_Block */
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_BASIC_LATIN = 1, /*[0000]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_LATIN_1_SUPPLEMENT=2, /*[0080]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_LATIN_EXTENDED_A =3, /*[0100]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_LATIN_EXTENDED_B =4, /*[0180]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_IPA_EXTENSIONS =5, /*[0250]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_SPACING_MODIFIER_LETTERS =6, /*[02B0]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_COMBINING_DIACRITICAL_MARKS =7, /*[0300]*/
 
     /**
      * Unicode 3.2 renames this block to "Greek and Coptic".
-     * @stable ICU 2.0
+     * \xrefitem stable "Stable" "Stable List" ICU 2.0
      */
     UBLOCK_GREEK =8, /*[0370]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_CYRILLIC =9, /*[0400]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_ARMENIAN =10, /*[0530]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_HEBREW =11, /*[0590]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_ARABIC =12, /*[0600]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_SYRIAC =13, /*[0700]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_THAANA =14, /*[0780]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_DEVANAGARI =15, /*[0900]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_BENGALI =16, /*[0980]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_GURMUKHI =17, /*[0A00]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_GUJARATI =18, /*[0A80]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_ORIYA =19, /*[0B00]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_TAMIL =20, /*[0B80]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_TELUGU =21, /*[0C00]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_KANNADA =22, /*[0C80]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_MALAYALAM =23, /*[0D00]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_SINHALA =24, /*[0D80]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_THAI =25, /*[0E00]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_LAO =26, /*[0E80]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_TIBETAN =27, /*[0F00]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_MYANMAR =28, /*[1000]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_GEORGIAN =29, /*[10A0]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_HANGUL_JAMO =30, /*[1100]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_ETHIOPIC =31, /*[1200]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_CHEROKEE =32, /*[13A0]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS =33, /*[1400]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_OGHAM =34, /*[1680]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_RUNIC =35, /*[16A0]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_KHMER =36, /*[1780]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_MONGOLIAN =37, /*[1800]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_LATIN_EXTENDED_ADDITIONAL =38, /*[1E00]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_GREEK_EXTENDED =39, /*[1F00]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_GENERAL_PUNCTUATION =40, /*[2000]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_SUPERSCRIPTS_AND_SUBSCRIPTS =41, /*[2070]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_CURRENCY_SYMBOLS =42, /*[20A0]*/
 
     /**
      * Unicode 3.2 renames this block to "Combining Diacritical Marks for Symbols".
-     * @stable ICU 2.0
+     * \xrefitem stable "Stable" "Stable List" ICU 2.0
      */
     UBLOCK_COMBINING_MARKS_FOR_SYMBOLS =43, /*[20D0]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_LETTERLIKE_SYMBOLS =44, /*[2100]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_NUMBER_FORMS =45, /*[2150]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_ARROWS =46, /*[2190]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_MATHEMATICAL_OPERATORS =47, /*[2200]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_MISCELLANEOUS_TECHNICAL =48, /*[2300]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_CONTROL_PICTURES =49, /*[2400]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_OPTICAL_CHARACTER_RECOGNITION =50, /*[2440]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_ENCLOSED_ALPHANUMERICS =51, /*[2460]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_BOX_DRAWING =52, /*[2500]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_BLOCK_ELEMENTS =53, /*[2580]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_GEOMETRIC_SHAPES =54, /*[25A0]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_MISCELLANEOUS_SYMBOLS =55, /*[2600]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_DINGBATS =56, /*[2700]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_BRAILLE_PATTERNS =57, /*[2800]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_CJK_RADICALS_SUPPLEMENT =58, /*[2E80]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_KANGXI_RADICALS =59, /*[2F00]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_IDEOGRAPHIC_DESCRIPTION_CHARACTERS =60, /*[2FF0]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_CJK_SYMBOLS_AND_PUNCTUATION =61, /*[3000]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_HIRAGANA =62, /*[3040]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_KATAKANA =63, /*[30A0]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_BOPOMOFO =64, /*[3100]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_HANGUL_COMPATIBILITY_JAMO =65, /*[3130]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_KANBUN =66, /*[3190]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_BOPOMOFO_EXTENDED =67, /*[31A0]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_ENCLOSED_CJK_LETTERS_AND_MONTHS =68, /*[3200]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_CJK_COMPATIBILITY =69, /*[3300]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A =70, /*[3400]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_CJK_UNIFIED_IDEOGRAPHS =71, /*[4E00]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_YI_SYLLABLES =72, /*[A000]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_YI_RADICALS =73, /*[A490]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_HANGUL_SYLLABLES =74, /*[AC00]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_HIGH_SURROGATES =75, /*[D800]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_HIGH_PRIVATE_USE_SURROGATES =76, /*[DB80]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_LOW_SURROGATES =77, /*[DC00]*/
 
     /**
@@ -1271,7 +1273,7 @@
      * Unicode 3.2 renames the block for the BMP PUA to "Private Use Area" and
      * adds separate blocks for the supplementary PUAs.
      *
-     * @stable ICU 2.0
+     * \xrefitem stable "Stable" "Stable List" ICU 2.0
      */
     UBLOCK_PRIVATE_USE_AREA =78, /*[E000]*/
     /**
@@ -1281,530 +1283,530 @@
      * Unicode 3.2 renames the block for the BMP PUA to "Private Use Area" and
      * adds separate blocks for the supplementary PUAs.
      *
-     * @stable ICU 2.0
+     * \xrefitem stable "Stable" "Stable List" ICU 2.0
      */
     UBLOCK_PRIVATE_USE = UBLOCK_PRIVATE_USE_AREA,
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_CJK_COMPATIBILITY_IDEOGRAPHS =79, /*[F900]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_ALPHABETIC_PRESENTATION_FORMS =80, /*[FB00]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_ARABIC_PRESENTATION_FORMS_A =81, /*[FB50]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_COMBINING_HALF_MARKS =82, /*[FE20]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_CJK_COMPATIBILITY_FORMS =83, /*[FE30]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_SMALL_FORM_VARIANTS =84, /*[FE50]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_ARABIC_PRESENTATION_FORMS_B =85, /*[FE70]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_SPECIALS =86, /*[FFF0]*/
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_HALFWIDTH_AND_FULLWIDTH_FORMS =87, /*[FF00]*/
 
     /* New blocks in Unicode 3.1 */
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_OLD_ITALIC = 88, /*[10300]*/
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_GOTHIC = 89, /*[10330]*/
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_DESERET = 90, /*[10400]*/
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_BYZANTINE_MUSICAL_SYMBOLS = 91, /*[1D000]*/
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_MUSICAL_SYMBOLS = 92, /*[1D100]*/
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_MATHEMATICAL_ALPHANUMERIC_SYMBOLS = 93, /*[1D400]*/
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B  = 94, /*[20000]*/
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT = 95, /*[2F800]*/
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_TAGS = 96, /*[E0000]*/
 
     /* New blocks in Unicode 3.2 */
 
-    /** @stable ICU 3.0  */
+    /** \xrefitem stable "Stable" "Stable List" ICU 3.0  */
     UBLOCK_CYRILLIC_SUPPLEMENT = 97, /*[0500]*/
     /**
      * Unicode 4.0.1 renames the "Cyrillic Supplementary" block to "Cyrillic Supplement".
-     * @stable ICU 2.2
+     * \xrefitem stable "Stable" "Stable List" ICU 2.2
      */
     UBLOCK_CYRILLIC_SUPPLEMENTARY = UBLOCK_CYRILLIC_SUPPLEMENT,
-    /** @stable ICU 2.2 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.2 */
     UBLOCK_TAGALOG = 98, /*[1700]*/
-    /** @stable ICU 2.2 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.2 */
     UBLOCK_HANUNOO = 99, /*[1720]*/
-    /** @stable ICU 2.2 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.2 */
     UBLOCK_BUHID = 100, /*[1740]*/
-    /** @stable ICU 2.2 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.2 */
     UBLOCK_TAGBANWA = 101, /*[1760]*/
-    /** @stable ICU 2.2 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.2 */
     UBLOCK_MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A = 102, /*[27C0]*/
-    /** @stable ICU 2.2 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.2 */
     UBLOCK_SUPPLEMENTAL_ARROWS_A = 103, /*[27F0]*/
-    /** @stable ICU 2.2 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.2 */
     UBLOCK_SUPPLEMENTAL_ARROWS_B = 104, /*[2900]*/
-    /** @stable ICU 2.2 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.2 */
     UBLOCK_MISCELLANEOUS_MATHEMATICAL_SYMBOLS_B = 105, /*[2980]*/
-    /** @stable ICU 2.2 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.2 */
     UBLOCK_SUPPLEMENTAL_MATHEMATICAL_OPERATORS = 106, /*[2A00]*/
-    /** @stable ICU 2.2 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.2 */
     UBLOCK_KATAKANA_PHONETIC_EXTENSIONS = 107, /*[31F0]*/
-    /** @stable ICU 2.2 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.2 */
     UBLOCK_VARIATION_SELECTORS = 108, /*[FE00]*/
-    /** @stable ICU 2.2 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.2 */
     UBLOCK_SUPPLEMENTARY_PRIVATE_USE_AREA_A = 109, /*[F0000]*/
-    /** @stable ICU 2.2 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.2 */
     UBLOCK_SUPPLEMENTARY_PRIVATE_USE_AREA_B = 110, /*[100000]*/
 
     /* New blocks in Unicode 4 */
 
-    /** @stable ICU 2.6 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.6 */
     UBLOCK_LIMBU = 111, /*[1900]*/
-    /** @stable ICU 2.6 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.6 */
     UBLOCK_TAI_LE = 112, /*[1950]*/
-    /** @stable ICU 2.6 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.6 */
     UBLOCK_KHMER_SYMBOLS = 113, /*[19E0]*/
-    /** @stable ICU 2.6 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.6 */
     UBLOCK_PHONETIC_EXTENSIONS = 114, /*[1D00]*/
-    /** @stable ICU 2.6 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.6 */
     UBLOCK_MISCELLANEOUS_SYMBOLS_AND_ARROWS = 115, /*[2B00]*/
-    /** @stable ICU 2.6 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.6 */
     UBLOCK_YIJING_HEXAGRAM_SYMBOLS = 116, /*[4DC0]*/
-    /** @stable ICU 2.6 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.6 */
     UBLOCK_LINEAR_B_SYLLABARY = 117, /*[10000]*/
-    /** @stable ICU 2.6 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.6 */
     UBLOCK_LINEAR_B_IDEOGRAMS = 118, /*[10080]*/
-    /** @stable ICU 2.6 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.6 */
     UBLOCK_AEGEAN_NUMBERS = 119, /*[10100]*/
-    /** @stable ICU 2.6 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.6 */
     UBLOCK_UGARITIC = 120, /*[10380]*/
-    /** @stable ICU 2.6 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.6 */
     UBLOCK_SHAVIAN = 121, /*[10450]*/
-    /** @stable ICU 2.6 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.6 */
     UBLOCK_OSMANYA = 122, /*[10480]*/
-    /** @stable ICU 2.6 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.6 */
     UBLOCK_CYPRIOT_SYLLABARY = 123, /*[10800]*/
-    /** @stable ICU 2.6 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.6 */
     UBLOCK_TAI_XUAN_JING_SYMBOLS = 124, /*[1D300]*/
-    /** @stable ICU 2.6 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.6 */
     UBLOCK_VARIATION_SELECTORS_SUPPLEMENT = 125, /*[E0100]*/
 
     /* New blocks in Unicode 4.1 */
 
-    /** @stable ICU 3.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 3.4 */
     UBLOCK_ANCIENT_GREEK_MUSICAL_NOTATION = 126, /*[1D200]*/
-    /** @stable ICU 3.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 3.4 */
     UBLOCK_ANCIENT_GREEK_NUMBERS = 127, /*[10140]*/
-    /** @stable ICU 3.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 3.4 */
     UBLOCK_ARABIC_SUPPLEMENT = 128, /*[0750]*/
-    /** @stable ICU 3.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 3.4 */
     UBLOCK_BUGINESE = 129, /*[1A00]*/
-    /** @stable ICU 3.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 3.4 */
     UBLOCK_CJK_STROKES = 130, /*[31C0]*/
-    /** @stable ICU 3.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 3.4 */
     UBLOCK_COMBINING_DIACRITICAL_MARKS_SUPPLEMENT = 131, /*[1DC0]*/
-    /** @stable ICU 3.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 3.4 */
     UBLOCK_COPTIC = 132, /*[2C80]*/
-    /** @stable ICU 3.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 3.4 */
     UBLOCK_ETHIOPIC_EXTENDED = 133, /*[2D80]*/
-    /** @stable ICU 3.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 3.4 */
     UBLOCK_ETHIOPIC_SUPPLEMENT = 134, /*[1380]*/
-    /** @stable ICU 3.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 3.4 */
     UBLOCK_GEORGIAN_SUPPLEMENT = 135, /*[2D00]*/
-    /** @stable ICU 3.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 3.4 */
     UBLOCK_GLAGOLITIC = 136, /*[2C00]*/
-    /** @stable ICU 3.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 3.4 */
     UBLOCK_KHAROSHTHI = 137, /*[10A00]*/
-    /** @stable ICU 3.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 3.4 */
     UBLOCK_MODIFIER_TONE_LETTERS = 138, /*[A700]*/
-    /** @stable ICU 3.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 3.4 */
     UBLOCK_NEW_TAI_LUE = 139, /*[1980]*/
-    /** @stable ICU 3.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 3.4 */
     UBLOCK_OLD_PERSIAN = 140, /*[103A0]*/
-    /** @stable ICU 3.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 3.4 */
     UBLOCK_PHONETIC_EXTENSIONS_SUPPLEMENT = 141, /*[1D80]*/
-    /** @stable ICU 3.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 3.4 */
     UBLOCK_SUPPLEMENTAL_PUNCTUATION = 142, /*[2E00]*/
-    /** @stable ICU 3.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 3.4 */
     UBLOCK_SYLOTI_NAGRI = 143, /*[A800]*/
-    /** @stable ICU 3.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 3.4 */
     UBLOCK_TIFINAGH = 144, /*[2D30]*/
-    /** @stable ICU 3.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 3.4 */
     UBLOCK_VERTICAL_FORMS = 145, /*[FE10]*/
 
     /* New blocks in Unicode 5.0 */
 
-    /** @stable ICU 3.6 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 3.6 */
     UBLOCK_NKO = 146, /*[07C0]*/
-    /** @stable ICU 3.6 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 3.6 */
     UBLOCK_BALINESE = 147, /*[1B00]*/
-    /** @stable ICU 3.6 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 3.6 */
     UBLOCK_LATIN_EXTENDED_C = 148, /*[2C60]*/
-    /** @stable ICU 3.6 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 3.6 */
     UBLOCK_LATIN_EXTENDED_D = 149, /*[A720]*/
-    /** @stable ICU 3.6 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 3.6 */
     UBLOCK_PHAGS_PA = 150, /*[A840]*/
-    /** @stable ICU 3.6 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 3.6 */
     UBLOCK_PHOENICIAN = 151, /*[10900]*/
-    /** @stable ICU 3.6 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 3.6 */
     UBLOCK_CUNEIFORM = 152, /*[12000]*/
-    /** @stable ICU 3.6 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 3.6 */
     UBLOCK_CUNEIFORM_NUMBERS_AND_PUNCTUATION = 153, /*[12400]*/
-    /** @stable ICU 3.6 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 3.6 */
     UBLOCK_COUNTING_ROD_NUMERALS = 154, /*[1D360]*/
 
     /* New blocks in Unicode 5.1 */
 
-    /** @stable ICU 4.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.0 */
     UBLOCK_SUNDANESE = 155, /*[1B80]*/
-    /** @stable ICU 4.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.0 */
     UBLOCK_LEPCHA = 156, /*[1C00]*/
-    /** @stable ICU 4.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.0 */
     UBLOCK_OL_CHIKI = 157, /*[1C50]*/
-    /** @stable ICU 4.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.0 */
     UBLOCK_CYRILLIC_EXTENDED_A = 158, /*[2DE0]*/
-    /** @stable ICU 4.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.0 */
     UBLOCK_VAI = 159, /*[A500]*/
-    /** @stable ICU 4.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.0 */
     UBLOCK_CYRILLIC_EXTENDED_B = 160, /*[A640]*/
-    /** @stable ICU 4.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.0 */
     UBLOCK_SAURASHTRA = 161, /*[A880]*/
-    /** @stable ICU 4.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.0 */
     UBLOCK_KAYAH_LI = 162, /*[A900]*/
-    /** @stable ICU 4.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.0 */
     UBLOCK_REJANG = 163, /*[A930]*/
-    /** @stable ICU 4.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.0 */
     UBLOCK_CHAM = 164, /*[AA00]*/
-    /** @stable ICU 4.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.0 */
     UBLOCK_ANCIENT_SYMBOLS = 165, /*[10190]*/
-    /** @stable ICU 4.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.0 */
     UBLOCK_PHAISTOS_DISC = 166, /*[101D0]*/
-    /** @stable ICU 4.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.0 */
     UBLOCK_LYCIAN = 167, /*[10280]*/
-    /** @stable ICU 4.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.0 */
     UBLOCK_CARIAN = 168, /*[102A0]*/
-    /** @stable ICU 4.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.0 */
     UBLOCK_LYDIAN = 169, /*[10920]*/
-    /** @stable ICU 4.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.0 */
     UBLOCK_MAHJONG_TILES = 170, /*[1F000]*/
-    /** @stable ICU 4.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.0 */
     UBLOCK_DOMINO_TILES = 171, /*[1F030]*/
 
     /* New blocks in Unicode 5.2 */
 
-    /** @stable ICU 4.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.4 */
     UBLOCK_SAMARITAN = 172, /*[0800]*/
-    /** @stable ICU 4.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.4 */
     UBLOCK_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED = 173, /*[18B0]*/
-    /** @stable ICU 4.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.4 */
     UBLOCK_TAI_THAM = 174, /*[1A20]*/
-    /** @stable ICU 4.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.4 */
     UBLOCK_VEDIC_EXTENSIONS = 175, /*[1CD0]*/
-    /** @stable ICU 4.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.4 */
     UBLOCK_LISU = 176, /*[A4D0]*/
-    /** @stable ICU 4.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.4 */
     UBLOCK_BAMUM = 177, /*[A6A0]*/
-    /** @stable ICU 4.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.4 */
     UBLOCK_COMMON_INDIC_NUMBER_FORMS = 178, /*[A830]*/
-    /** @stable ICU 4.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.4 */
     UBLOCK_DEVANAGARI_EXTENDED = 179, /*[A8E0]*/
-    /** @stable ICU 4.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.4 */
     UBLOCK_HANGUL_JAMO_EXTENDED_A = 180, /*[A960]*/
-    /** @stable ICU 4.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.4 */
     UBLOCK_JAVANESE = 181, /*[A980]*/
-    /** @stable ICU 4.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.4 */
     UBLOCK_MYANMAR_EXTENDED_A = 182, /*[AA60]*/
-    /** @stable ICU 4.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.4 */
     UBLOCK_TAI_VIET = 183, /*[AA80]*/
-    /** @stable ICU 4.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.4 */
     UBLOCK_MEETEI_MAYEK = 184, /*[ABC0]*/
-    /** @stable ICU 4.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.4 */
     UBLOCK_HANGUL_JAMO_EXTENDED_B = 185, /*[D7B0]*/
-    /** @stable ICU 4.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.4 */
     UBLOCK_IMPERIAL_ARAMAIC = 186, /*[10840]*/
-    /** @stable ICU 4.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.4 */
     UBLOCK_OLD_SOUTH_ARABIAN = 187, /*[10A60]*/
-    /** @stable ICU 4.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.4 */
     UBLOCK_AVESTAN = 188, /*[10B00]*/
-    /** @stable ICU 4.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.4 */
     UBLOCK_INSCRIPTIONAL_PARTHIAN = 189, /*[10B40]*/
-    /** @stable ICU 4.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.4 */
     UBLOCK_INSCRIPTIONAL_PAHLAVI = 190, /*[10B60]*/
-    /** @stable ICU 4.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.4 */
     UBLOCK_OLD_TURKIC = 191, /*[10C00]*/
-    /** @stable ICU 4.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.4 */
     UBLOCK_RUMI_NUMERAL_SYMBOLS = 192, /*[10E60]*/
-    /** @stable ICU 4.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.4 */
     UBLOCK_KAITHI = 193, /*[11080]*/
-    /** @stable ICU 4.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.4 */
     UBLOCK_EGYPTIAN_HIEROGLYPHS = 194, /*[13000]*/
-    /** @stable ICU 4.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.4 */
     UBLOCK_ENCLOSED_ALPHANUMERIC_SUPPLEMENT = 195, /*[1F100]*/
-    /** @stable ICU 4.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.4 */
     UBLOCK_ENCLOSED_IDEOGRAPHIC_SUPPLEMENT = 196, /*[1F200]*/
-    /** @stable ICU 4.4 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.4 */
     UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C = 197, /*[2A700]*/
 
     /* New blocks in Unicode 6.0 */
 
-    /** @stable ICU 4.6 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.6 */
     UBLOCK_MANDAIC = 198, /*[0840]*/
-    /** @stable ICU 4.6 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.6 */
     UBLOCK_BATAK = 199, /*[1BC0]*/
-    /** @stable ICU 4.6 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.6 */
     UBLOCK_ETHIOPIC_EXTENDED_A = 200, /*[AB00]*/
-    /** @stable ICU 4.6 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.6 */
     UBLOCK_BRAHMI = 201, /*[11000]*/
-    /** @stable ICU 4.6 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.6 */
     UBLOCK_BAMUM_SUPPLEMENT = 202, /*[16800]*/
-    /** @stable ICU 4.6 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.6 */
     UBLOCK_KANA_SUPPLEMENT = 203, /*[1B000]*/
-    /** @stable ICU 4.6 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.6 */
     UBLOCK_PLAYING_CARDS = 204, /*[1F0A0]*/
-    /** @stable ICU 4.6 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.6 */
     UBLOCK_MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS = 205, /*[1F300]*/
-    /** @stable ICU 4.6 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.6 */
     UBLOCK_EMOTICONS = 206, /*[1F600]*/
-    /** @stable ICU 4.6 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.6 */
     UBLOCK_TRANSPORT_AND_MAP_SYMBOLS = 207, /*[1F680]*/
-    /** @stable ICU 4.6 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.6 */
     UBLOCK_ALCHEMICAL_SYMBOLS = 208, /*[1F700]*/
-    /** @stable ICU 4.6 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.6 */
     UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D = 209, /*[2B740]*/
 
     /* New blocks in Unicode 6.1 */
 
-    /** @stable ICU 49 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 49 */
     UBLOCK_ARABIC_EXTENDED_A = 210, /*[08A0]*/
-    /** @stable ICU 49 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 49 */
     UBLOCK_ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS = 211, /*[1EE00]*/
-    /** @stable ICU 49 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 49 */
     UBLOCK_CHAKMA = 212, /*[11100]*/
-    /** @stable ICU 49 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 49 */
     UBLOCK_MEETEI_MAYEK_EXTENSIONS = 213, /*[AAE0]*/
-    /** @stable ICU 49 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 49 */
     UBLOCK_MEROITIC_CURSIVE = 214, /*[109A0]*/
-    /** @stable ICU 49 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 49 */
     UBLOCK_MEROITIC_HIEROGLYPHS = 215, /*[10980]*/
-    /** @stable ICU 49 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 49 */
     UBLOCK_MIAO = 216, /*[16F00]*/
-    /** @stable ICU 49 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 49 */
     UBLOCK_SHARADA = 217, /*[11180]*/
-    /** @stable ICU 49 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 49 */
     UBLOCK_SORA_SOMPENG = 218, /*[110D0]*/
-    /** @stable ICU 49 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 49 */
     UBLOCK_SUNDANESE_SUPPLEMENT = 219, /*[1CC0]*/
-    /** @stable ICU 49 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 49 */
     UBLOCK_TAKRI = 220, /*[11680]*/
 
     /* New blocks in Unicode 7.0 */
 
-    /** @stable ICU 54 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 54 */
     UBLOCK_BASSA_VAH = 221, /*[16AD0]*/
-    /** @stable ICU 54 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 54 */
     UBLOCK_CAUCASIAN_ALBANIAN = 222, /*[10530]*/
-    /** @stable ICU 54 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 54 */
     UBLOCK_COPTIC_EPACT_NUMBERS = 223, /*[102E0]*/
-    /** @stable ICU 54 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 54 */
     UBLOCK_COMBINING_DIACRITICAL_MARKS_EXTENDED = 224, /*[1AB0]*/
-    /** @stable ICU 54 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 54 */
     UBLOCK_DUPLOYAN = 225, /*[1BC00]*/
-    /** @stable ICU 54 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 54 */
     UBLOCK_ELBASAN = 226, /*[10500]*/
-    /** @stable ICU 54 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 54 */
     UBLOCK_GEOMETRIC_SHAPES_EXTENDED = 227, /*[1F780]*/
-    /** @stable ICU 54 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 54 */
     UBLOCK_GRANTHA = 228, /*[11300]*/
-    /** @stable ICU 54 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 54 */
     UBLOCK_KHOJKI = 229, /*[11200]*/
-    /** @stable ICU 54 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 54 */
     UBLOCK_KHUDAWADI = 230, /*[112B0]*/
-    /** @stable ICU 54 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 54 */
     UBLOCK_LATIN_EXTENDED_E = 231, /*[AB30]*/
-    /** @stable ICU 54 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 54 */
     UBLOCK_LINEAR_A = 232, /*[10600]*/
-    /** @stable ICU 54 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 54 */
     UBLOCK_MAHAJANI = 233, /*[11150]*/
-    /** @stable ICU 54 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 54 */
     UBLOCK_MANICHAEAN = 234, /*[10AC0]*/
-    /** @stable ICU 54 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 54 */
     UBLOCK_MENDE_KIKAKUI = 235, /*[1E800]*/
-    /** @stable ICU 54 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 54 */
     UBLOCK_MODI = 236, /*[11600]*/
-    /** @stable ICU 54 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 54 */
     UBLOCK_MRO = 237, /*[16A40]*/
-    /** @stable ICU 54 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 54 */
     UBLOCK_MYANMAR_EXTENDED_B = 238, /*[A9E0]*/
-    /** @stable ICU 54 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 54 */
     UBLOCK_NABATAEAN = 239, /*[10880]*/
-    /** @stable ICU 54 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 54 */
     UBLOCK_OLD_NORTH_ARABIAN = 240, /*[10A80]*/
-    /** @stable ICU 54 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 54 */
     UBLOCK_OLD_PERMIC = 241, /*[10350]*/
-    /** @stable ICU 54 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 54 */
     UBLOCK_ORNAMENTAL_DINGBATS = 242, /*[1F650]*/
-    /** @stable ICU 54 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 54 */
     UBLOCK_PAHAWH_HMONG = 243, /*[16B00]*/
-    /** @stable ICU 54 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 54 */
     UBLOCK_PALMYRENE = 244, /*[10860]*/
-    /** @stable ICU 54 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 54 */
     UBLOCK_PAU_CIN_HAU = 245, /*[11AC0]*/
-    /** @stable ICU 54 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 54 */
     UBLOCK_PSALTER_PAHLAVI = 246, /*[10B80]*/
-    /** @stable ICU 54 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 54 */
     UBLOCK_SHORTHAND_FORMAT_CONTROLS = 247, /*[1BCA0]*/
-    /** @stable ICU 54 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 54 */
     UBLOCK_SIDDHAM = 248, /*[11580]*/
-    /** @stable ICU 54 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 54 */
     UBLOCK_SINHALA_ARCHAIC_NUMBERS = 249, /*[111E0]*/
-    /** @stable ICU 54 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 54 */
     UBLOCK_SUPPLEMENTAL_ARROWS_C = 250, /*[1F800]*/
-    /** @stable ICU 54 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 54 */
     UBLOCK_TIRHUTA = 251, /*[11480]*/
-    /** @stable ICU 54 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 54 */
     UBLOCK_WARANG_CITI = 252, /*[118A0]*/
 
     /* New blocks in Unicode 8.0 */
 
-    /** @stable ICU 56 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 56 */
     UBLOCK_AHOM = 253, /*[11700]*/
-    /** @stable ICU 56 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 56 */
     UBLOCK_ANATOLIAN_HIEROGLYPHS = 254, /*[14400]*/
-    /** @stable ICU 56 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 56 */
     UBLOCK_CHEROKEE_SUPPLEMENT = 255, /*[AB70]*/
-    /** @stable ICU 56 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 56 */
     UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E = 256, /*[2B820]*/
-    /** @stable ICU 56 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 56 */
     UBLOCK_EARLY_DYNASTIC_CUNEIFORM = 257, /*[12480]*/
-    /** @stable ICU 56 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 56 */
     UBLOCK_HATRAN = 258, /*[108E0]*/
-    /** @stable ICU 56 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 56 */
     UBLOCK_MULTANI = 259, /*[11280]*/
-    /** @stable ICU 56 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 56 */
     UBLOCK_OLD_HUNGARIAN = 260, /*[10C80]*/
-    /** @stable ICU 56 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 56 */
     UBLOCK_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS = 261, /*[1F900]*/
-    /** @stable ICU 56 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 56 */
     UBLOCK_SUTTON_SIGNWRITING = 262, /*[1D800]*/
 
     /* New blocks in Unicode 9.0 */
 
-    /** @stable ICU 58 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 58 */
     UBLOCK_ADLAM = 263, /*[1E900]*/
-    /** @stable ICU 58 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 58 */
     UBLOCK_BHAIKSUKI = 264, /*[11C00]*/
-    /** @stable ICU 58 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 58 */
     UBLOCK_CYRILLIC_EXTENDED_C = 265, /*[1C80]*/
-    /** @stable ICU 58 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 58 */
     UBLOCK_GLAGOLITIC_SUPPLEMENT = 266, /*[1E000]*/
-    /** @stable ICU 58 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 58 */
     UBLOCK_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION = 267, /*[16FE0]*/
-    /** @stable ICU 58 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 58 */
     UBLOCK_MARCHEN = 268, /*[11C70]*/
-    /** @stable ICU 58 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 58 */
     UBLOCK_MONGOLIAN_SUPPLEMENT = 269, /*[11660]*/
-    /** @stable ICU 58 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 58 */
     UBLOCK_NEWA = 270, /*[11400]*/
-    /** @stable ICU 58 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 58 */
     UBLOCK_OSAGE = 271, /*[104B0]*/
-    /** @stable ICU 58 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 58 */
     UBLOCK_TANGUT = 272, /*[17000]*/
-    /** @stable ICU 58 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 58 */
     UBLOCK_TANGUT_COMPONENTS = 273, /*[18800]*/
 
     // New blocks in Unicode 10.0
 
-    /** @stable ICU 60 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 60 */
     UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_F = 274, /*[2CEB0]*/
-    /** @stable ICU 60 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 60 */
     UBLOCK_KANA_EXTENDED_A = 275, /*[1B100]*/
-    /** @stable ICU 60 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 60 */
     UBLOCK_MASARAM_GONDI = 276, /*[11D00]*/
-    /** @stable ICU 60 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 60 */
     UBLOCK_NUSHU = 277, /*[1B170]*/
-    /** @stable ICU 60 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 60 */
     UBLOCK_SOYOMBO = 278, /*[11A50]*/
-    /** @stable ICU 60 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 60 */
     UBLOCK_SYRIAC_SUPPLEMENT = 279, /*[0860]*/
-    /** @stable ICU 60 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 60 */
     UBLOCK_ZANABAZAR_SQUARE = 280, /*[11A00]*/
 
     // New blocks in Unicode 11.0
 
-    /** @stable ICU 62 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 62 */
     UBLOCK_CHESS_SYMBOLS = 281, /*[1FA00]*/
-    /** @stable ICU 62 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 62 */
     UBLOCK_DOGRA = 282, /*[11800]*/
-    /** @stable ICU 62 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 62 */
     UBLOCK_GEORGIAN_EXTENDED = 283, /*[1C90]*/
-    /** @stable ICU 62 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 62 */
     UBLOCK_GUNJALA_GONDI = 284, /*[11D60]*/
-    /** @stable ICU 62 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 62 */
     UBLOCK_HANIFI_ROHINGYA = 285, /*[10D00]*/
-    /** @stable ICU 62 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 62 */
     UBLOCK_INDIC_SIYAQ_NUMBERS = 286, /*[1EC70]*/
-    /** @stable ICU 62 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 62 */
     UBLOCK_MAKASAR = 287, /*[11EE0]*/
-    /** @stable ICU 62 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 62 */
     UBLOCK_MAYAN_NUMERALS = 288, /*[1D2E0]*/
-    /** @stable ICU 62 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 62 */
     UBLOCK_MEDEFAIDRIN = 289, /*[16E40]*/
-    /** @stable ICU 62 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 62 */
     UBLOCK_OLD_SOGDIAN = 290, /*[10F00]*/
-    /** @stable ICU 62 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 62 */
     UBLOCK_SOGDIAN = 291, /*[10F30]*/
 
     // New blocks in Unicode 12.0
 
-    /** @stable ICU 64 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 64 */
     UBLOCK_EGYPTIAN_HIEROGLYPH_FORMAT_CONTROLS = 292, /*[13430]*/
-    /** @stable ICU 64 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 64 */
     UBLOCK_ELYMAIC = 293, /*[10FE0]*/
-    /** @stable ICU 64 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 64 */
     UBLOCK_NANDINAGARI = 294, /*[119A0]*/
-    /** @stable ICU 64 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 64 */
     UBLOCK_NYIAKENG_PUACHUE_HMONG = 295, /*[1E100]*/
-    /** @stable ICU 64 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 64 */
     UBLOCK_OTTOMAN_SIYAQ_NUMBERS = 296, /*[1ED00]*/
-    /** @stable ICU 64 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 64 */
     UBLOCK_SMALL_KANA_EXTENSION = 297, /*[1B130]*/
-    /** @stable ICU 64 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 64 */
     UBLOCK_SYMBOLS_AND_PICTOGRAPHS_EXTENDED_A = 298, /*[1FA70]*/
-    /** @stable ICU 64 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 64 */
     UBLOCK_TAMIL_SUPPLEMENT = 299, /*[11FC0]*/
-    /** @stable ICU 64 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 64 */
     UBLOCK_WANCHO = 300, /*[1E2C0]*/
 
     // New blocks in Unicode 13.0
 
-    /** @stable ICU 66 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 66 */
     UBLOCK_CHORASMIAN = 301, /*[10FB0]*/
-    /** @stable ICU 66 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 66 */
     UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_G = 302, /*[30000]*/
-    /** @stable ICU 66 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 66 */
     UBLOCK_DIVES_AKURU = 303, /*[11900]*/
-    /** @stable ICU 66 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 66 */
     UBLOCK_KHITAN_SMALL_SCRIPT = 304, /*[18B00]*/
-    /** @stable ICU 66 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 66 */
     UBLOCK_LISU_SUPPLEMENT = 305, /*[11FB0]*/
-    /** @stable ICU 66 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 66 */
     UBLOCK_SYMBOLS_FOR_LEGACY_COMPUTING = 306, /*[1FB00]*/
-    /** @stable ICU 66 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 66 */
     UBLOCK_TANGUT_SUPPLEMENT = 307, /*[18D00]*/
-    /** @stable ICU 66 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 66 */
     UBLOCK_YEZIDI = 308, /*[10E80]*/
 
 #ifndef U_HIDE_DEPRECATED_API
@@ -1812,16 +1814,16 @@
      * One more than the highest normal UBlockCode value.
      * The highest value is available via u_getIntPropertyMaxValue(UCHAR_BLOCK).
      *
-     * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
+     * \xrefitem deprecated "Deprecated" "Deprecated List" ICU 58 The numeric value may change over time, see ICU ticket #12420.
      */
     UBLOCK_COUNT = 309,
 #endif  // U_HIDE_DEPRECATED_API
 
-    /** @stable ICU 2.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     UBLOCK_INVALID_CODE=-1
 };
 
-/** @stable ICU 2.0 */
+/** \xrefitem stable "Stable" "Stable List" ICU 2.0 */
 typedef enum UBlockCode UBlockCode;
 
 /**
@@ -1829,7 +1831,7 @@
  *
  * @see UCHAR_EAST_ASIAN_WIDTH
  * @see u_getIntPropertyValue
- * @stable ICU 2.2
+ * \xrefitem stable "Stable" "Stable List" ICU 2.2
  */
 typedef enum UEastAsianWidth {
     /*
@@ -1849,7 +1851,7 @@
      * One more than the highest normal UEastAsianWidth value.
      * The highest value is available via u_getIntPropertyMaxValue(UCHAR_EAST_ASIAN_WIDTH).
      *
-     * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
+     * \xrefitem deprecated "Deprecated" "Deprecated List" ICU 58 The numeric value may change over time, see ICU ticket #12420.
      */
     U_EA_COUNT
 #endif  // U_HIDE_DEPRECATED_API
@@ -1864,27 +1866,27 @@
  * Unicode code point a unique name.
  *
  * @see u_charName
- * @stable ICU 2.0
+ * \xrefitem stable "Stable" "Stable List" ICU 2.0
  */
 typedef enum UCharNameChoice {
-    /** Unicode character name (Name property). @stable ICU 2.0 */
+    /** Unicode character name (Name property). \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_UNICODE_CHAR_NAME,
 #ifndef U_HIDE_DEPRECATED_API
     /**
      * The Unicode_1_Name property value which is of little practical value.
      * Beginning with ICU 49, ICU APIs return an empty string for this name choice.
-     * @deprecated ICU 49
+     * \xrefitem deprecated "Deprecated" "Deprecated List" ICU 49
      */
     U_UNICODE_10_CHAR_NAME,
 #endif  /* U_HIDE_DEPRECATED_API */
-    /** Standard or synthetic character name. @stable ICU 2.0 */
+    /** Standard or synthetic character name. \xrefitem stable "Stable" "Stable List" ICU 2.0 */
     U_EXTENDED_CHAR_NAME = U_UNICODE_CHAR_NAME+2,
-    /** Corrected name from NameAliases.txt. @stable ICU 4.4 */
+    /** Corrected name from NameAliases.txt. \xrefitem stable "Stable" "Stable List" ICU 4.4 */
     U_CHAR_NAME_ALIAS,
 #ifndef U_HIDE_DEPRECATED_API
     /**
      * One more than the highest normal UCharNameChoice value.
-     * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
+     * \xrefitem deprecated "Deprecated" "Deprecated List" ICU 58 The numeric value may change over time, see ICU ticket #12420.
      */
     U_CHAR_NAME_CHOICE_COUNT
 #endif  // U_HIDE_DEPRECATED_API
@@ -1901,7 +1903,7 @@
  *
  * @see u_getPropertyName()
  * @see u_getPropertyValueName()
- * @stable ICU 2.4
+ * \xrefitem stable "Stable" "Stable List" ICU 2.4
  */
 typedef enum UPropertyNameChoice {
     U_SHORT_PROPERTY_NAME,
@@ -1909,7 +1911,7 @@
 #ifndef U_HIDE_DEPRECATED_API
     /**
      * One more than the highest normal UPropertyNameChoice value.
-     * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
+     * \xrefitem deprecated "Deprecated" "Deprecated List" ICU 58 The numeric value may change over time, see ICU ticket #12420.
      */
     U_PROPERTY_NAME_CHOICE_COUNT
 #endif  // U_HIDE_DEPRECATED_API
@@ -1919,7 +1921,7 @@
  * Decomposition Type constants.
  *
  * @see UCHAR_DECOMPOSITION_TYPE
- * @stable ICU 2.2
+ * \xrefitem stable "Stable" "Stable List" ICU 2.2
  */
 typedef enum UDecompositionType {
     /*
@@ -1951,7 +1953,7 @@
      * One more than the highest normal UDecompositionType value.
      * The highest value is available via u_getIntPropertyMaxValue(UCHAR_DECOMPOSITION_TYPE).
      *
-     * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
+     * \xrefitem deprecated "Deprecated" "Deprecated List" ICU 58 The numeric value may change over time, see ICU ticket #12420.
      */
     U_DT_COUNT /* 18 */
 #endif  // U_HIDE_DEPRECATED_API
@@ -1961,7 +1963,7 @@
  * Joining Type constants.
  *
  * @see UCHAR_JOINING_TYPE
- * @stable ICU 2.2
+ * \xrefitem stable "Stable" "Stable List" ICU 2.2
  */
 typedef enum UJoiningType {
     /*
@@ -1981,7 +1983,7 @@
      * One more than the highest normal UJoiningType value.
      * The highest value is available via u_getIntPropertyMaxValue(UCHAR_JOINING_TYPE).
      *
-     * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
+     * \xrefitem deprecated "Deprecated" "Deprecated List" ICU 58 The numeric value may change over time, see ICU ticket #12420.
      */
     U_JT_COUNT /* 6 */
 #endif  // U_HIDE_DEPRECATED_API
@@ -1991,7 +1993,7 @@
  * Joining Group constants.
  *
  * @see UCHAR_JOINING_GROUP
- * @stable ICU 2.2
+ * \xrefitem stable "Stable" "Stable List" ICU 2.2
  */
 typedef enum UJoiningGroup {
     /*
@@ -2014,7 +2016,7 @@
     U_JG_GAF,
     U_JG_GAMAL,
     U_JG_HAH,
-    U_JG_TEH_MARBUTA_GOAL,  /**< @stable ICU 4.6 */
+    U_JG_TEH_MARBUTA_GOAL,  /**< \xrefitem stable "Stable" "Stable List" ICU 4.6 */
     U_JG_HAMZA_ON_HEH_GOAL=U_JG_TEH_MARBUTA_GOAL,
     U_JG_HE,
     U_JG_HEH,
@@ -2052,66 +2054,66 @@
     U_JG_YUDH,
     U_JG_YUDH_HE,
     U_JG_ZAIN,
-    U_JG_FE,        /**< @stable ICU 2.6 */
-    U_JG_KHAPH,     /**< @stable ICU 2.6 */
-    U_JG_ZHAIN,     /**< @stable ICU 2.6 */
-    U_JG_BURUSHASKI_YEH_BARREE, /**< @stable ICU 4.0 */
-    U_JG_FARSI_YEH, /**< @stable ICU 4.4 */
-    U_JG_NYA,       /**< @stable ICU 4.4 */
-    U_JG_ROHINGYA_YEH,  /**< @stable ICU 49 */
-    U_JG_MANICHAEAN_ALEPH,  /**< @stable ICU 54 */
-    U_JG_MANICHAEAN_AYIN,  /**< @stable ICU 54 */
-    U_JG_MANICHAEAN_BETH,  /**< @stable ICU 54 */
-    U_JG_MANICHAEAN_DALETH,  /**< @stable ICU 54 */
-    U_JG_MANICHAEAN_DHAMEDH,  /**< @stable ICU 54 */
-    U_JG_MANICHAEAN_FIVE,  /**< @stable ICU 54 */
-    U_JG_MANICHAEAN_GIMEL,  /**< @stable ICU 54 */
-    U_JG_MANICHAEAN_HETH,  /**< @stable ICU 54 */
-    U_JG_MANICHAEAN_HUNDRED,  /**< @stable ICU 54 */
-    U_JG_MANICHAEAN_KAPH,  /**< @stable ICU 54 */
-    U_JG_MANICHAEAN_LAMEDH,  /**< @stable ICU 54 */
-    U_JG_MANICHAEAN_MEM,  /**< @stable ICU 54 */
-    U_JG_MANICHAEAN_NUN,  /**< @stable ICU 54 */
-    U_JG_MANICHAEAN_ONE,  /**< @stable ICU 54 */
-    U_JG_MANICHAEAN_PE,  /**< @stable ICU 54 */
-    U_JG_MANICHAEAN_QOPH,  /**< @stable ICU 54 */
-    U_JG_MANICHAEAN_RESH,  /**< @stable ICU 54 */
-    U_JG_MANICHAEAN_SADHE,  /**< @stable ICU 54 */
-    U_JG_MANICHAEAN_SAMEKH,  /**< @stable ICU 54 */
-    U_JG_MANICHAEAN_TAW,  /**< @stable ICU 54 */
-    U_JG_MANICHAEAN_TEN,  /**< @stable ICU 54 */
-    U_JG_MANICHAEAN_TETH,  /**< @stable ICU 54 */
-    U_JG_MANICHAEAN_THAMEDH,  /**< @stable ICU 54 */
-    U_JG_MANICHAEAN_TWENTY,  /**< @stable ICU 54 */
-    U_JG_MANICHAEAN_WAW,  /**< @stable ICU 54 */
-    U_JG_MANICHAEAN_YODH,  /**< @stable ICU 54 */
-    U_JG_MANICHAEAN_ZAYIN,  /**< @stable ICU 54 */
-    U_JG_STRAIGHT_WAW,  /**< @stable ICU 54 */
-    U_JG_AFRICAN_FEH,  /**< @stable ICU 58 */
-    U_JG_AFRICAN_NOON,  /**< @stable ICU 58 */
-    U_JG_AFRICAN_QAF,  /**< @stable ICU 58 */
+    U_JG_FE,        /**< \xrefitem stable "Stable" "Stable List" ICU 2.6 */
+    U_JG_KHAPH,     /**< \xrefitem stable "Stable" "Stable List" ICU 2.6 */
+    U_JG_ZHAIN,     /**< \xrefitem stable "Stable" "Stable List" ICU 2.6 */
+    U_JG_BURUSHASKI_YEH_BARREE, /**< \xrefitem stable "Stable" "Stable List" ICU 4.0 */
+    U_JG_FARSI_YEH, /**< \xrefitem stable "Stable" "Stable List" ICU 4.4 */
+    U_JG_NYA,       /**< \xrefitem stable "Stable" "Stable List" ICU 4.4 */
+    U_JG_ROHINGYA_YEH,  /**< \xrefitem stable "Stable" "Stable List" ICU 49 */
+    U_JG_MANICHAEAN_ALEPH,  /**< \xrefitem stable "Stable" "Stable List" ICU 54 */
+    U_JG_MANICHAEAN_AYIN,  /**< \xrefitem stable "Stable" "Stable List" ICU 54 */
+    U_JG_MANICHAEAN_BETH,  /**< \xrefitem stable "Stable" "Stable List" ICU 54 */
+    U_JG_MANICHAEAN_DALETH,  /**< \xrefitem stable "Stable" "Stable List" ICU 54 */
+    U_JG_MANICHAEAN_DHAMEDH,  /**< \xrefitem stable "Stable" "Stable List" ICU 54 */
+    U_JG_MANICHAEAN_FIVE,  /**< \xrefitem stable "Stable" "Stable List" ICU 54 */
+    U_JG_MANICHAEAN_GIMEL,  /**< \xrefitem stable "Stable" "Stable List" ICU 54 */
+    U_JG_MANICHAEAN_HETH,  /**< \xrefitem stable "Stable" "Stable List" ICU 54 */
+    U_JG_MANICHAEAN_HUNDRED,  /**< \xrefitem stable "Stable" "Stable List" ICU 54 */
+    U_JG_MANICHAEAN_KAPH,  /**< \xrefitem stable "Stable" "Stable List" ICU 54 */
+    U_JG_MANICHAEAN_LAMEDH,  /**< \xrefitem stable "Stable" "Stable List" ICU 54 */
+    U_JG_MANICHAEAN_MEM,  /**< \xrefitem stable "Stable" "Stable List" ICU 54 */
+    U_JG_MANICHAEAN_NUN,  /**< \xrefitem stable "Stable" "Stable List" ICU 54 */
+    U_JG_MANICHAEAN_ONE,  /**< \xrefitem stable "Stable" "Stable List" ICU 54 */
+    U_JG_MANICHAEAN_PE,  /**< \xrefitem stable "Stable" "Stable List" ICU 54 */
+    U_JG_MANICHAEAN_QOPH,  /**< \xrefitem stable "Stable" "Stable List" ICU 54 */
+    U_JG_MANICHAEAN_RESH,  /**< \xrefitem stable "Stable" "Stable List" ICU 54 */
+    U_JG_MANICHAEAN_SADHE,  /**< \xrefitem stable "Stable" "Stable List" ICU 54 */
+    U_JG_MANICHAEAN_SAMEKH,  /**< \xrefitem stable "Stable" "Stable List" ICU 54 */
+    U_JG_MANICHAEAN_TAW,  /**< \xrefitem stable "Stable" "Stable List" ICU 54 */
+    U_JG_MANICHAEAN_TEN,  /**< \xrefitem stable "Stable" "Stable List" ICU 54 */
+    U_JG_MANICHAEAN_TETH,  /**< \xrefitem stable "Stable" "Stable List" ICU 54 */
+    U_JG_MANICHAEAN_THAMEDH,  /**< \xrefitem stable "Stable" "Stable List" ICU 54 */
+    U_JG_MANICHAEAN_TWENTY,  /**< \xrefitem stable "Stable" "Stable List" ICU 54 */
+    U_JG_MANICHAEAN_WAW,  /**< \xrefitem stable "Stable" "Stable List" ICU 54 */
+    U_JG_MANICHAEAN_YODH,  /**< \xrefitem stable "Stable" "Stable List" ICU 54 */
+    U_JG_MANICHAEAN_ZAYIN,  /**< \xrefitem stable "Stable" "Stable List" ICU 54 */
+    U_JG_STRAIGHT_WAW,  /**< \xrefitem stable "Stable" "Stable List" ICU 54 */
+    U_JG_AFRICAN_FEH,  /**< \xrefitem stable "Stable" "Stable List" ICU 58 */
+    U_JG_AFRICAN_NOON,  /**< \xrefitem stable "Stable" "Stable List" ICU 58 */
+    U_JG_AFRICAN_QAF,  /**< \xrefitem stable "Stable" "Stable List" ICU 58 */
 
-    U_JG_MALAYALAM_BHA,  /**< @stable ICU 60 */
-    U_JG_MALAYALAM_JA,  /**< @stable ICU 60 */
-    U_JG_MALAYALAM_LLA,  /**< @stable ICU 60 */
-    U_JG_MALAYALAM_LLLA,  /**< @stable ICU 60 */
-    U_JG_MALAYALAM_NGA,  /**< @stable ICU 60 */
-    U_JG_MALAYALAM_NNA,  /**< @stable ICU 60 */
-    U_JG_MALAYALAM_NNNA,  /**< @stable ICU 60 */
-    U_JG_MALAYALAM_NYA,  /**< @stable ICU 60 */
-    U_JG_MALAYALAM_RA,  /**< @stable ICU 60 */
-    U_JG_MALAYALAM_SSA,  /**< @stable ICU 60 */
-    U_JG_MALAYALAM_TTA,  /**< @stable ICU 60 */
+    U_JG_MALAYALAM_BHA,  /**< \xrefitem stable "Stable" "Stable List" ICU 60 */
+    U_JG_MALAYALAM_JA,  /**< \xrefitem stable "Stable" "Stable List" ICU 60 */
+    U_JG_MALAYALAM_LLA,  /**< \xrefitem stable "Stable" "Stable List" ICU 60 */
+    U_JG_MALAYALAM_LLLA,  /**< \xrefitem stable "Stable" "Stable List" ICU 60 */
+    U_JG_MALAYALAM_NGA,  /**< \xrefitem stable "Stable" "Stable List" ICU 60 */
+    U_JG_MALAYALAM_NNA,  /**< \xrefitem stable "Stable" "Stable List" ICU 60 */
+    U_JG_MALAYALAM_NNNA,  /**< \xrefitem stable "Stable" "Stable List" ICU 60 */
+    U_JG_MALAYALAM_NYA,  /**< \xrefitem stable "Stable" "Stable List" ICU 60 */
+    U_JG_MALAYALAM_RA,  /**< \xrefitem stable "Stable" "Stable List" ICU 60 */
+    U_JG_MALAYALAM_SSA,  /**< \xrefitem stable "Stable" "Stable List" ICU 60 */
+    U_JG_MALAYALAM_TTA,  /**< \xrefitem stable "Stable" "Stable List" ICU 60 */
 
-    U_JG_HANIFI_ROHINGYA_KINNA_YA,  /**< @stable ICU 62 */
-    U_JG_HANIFI_ROHINGYA_PA,  /**< @stable ICU 62 */
+    U_JG_HANIFI_ROHINGYA_KINNA_YA,  /**< \xrefitem stable "Stable" "Stable List" ICU 62 */
+    U_JG_HANIFI_ROHINGYA_PA,  /**< \xrefitem stable "Stable" "Stable List" ICU 62 */
 
 #ifndef U_HIDE_DEPRECATED_API
     /**
      * One more than the highest normal UJoiningGroup value.
      * The highest value is available via u_getIntPropertyMaxValue(UCHAR_JOINING_GROUP).
      *
-     * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
+     * \xrefitem deprecated "Deprecated" "Deprecated List" ICU 58 The numeric value may change over time, see ICU ticket #12420.
      */
     U_JG_COUNT
 #endif  // U_HIDE_DEPRECATED_API
@@ -2121,7 +2123,7 @@
  * Grapheme Cluster Break constants.
  *
  * @see UCHAR_GRAPHEME_CLUSTER_BREAK
- * @stable ICU 3.4
+ * \xrefitem stable "Stable" "Stable List" ICU 3.4
  */
 typedef enum UGraphemeClusterBreak {
     /*
@@ -2140,21 +2142,21 @@
     U_GCB_LVT = 7,              /*[LVT]*/
     U_GCB_T = 8,                /*[T]*/
     U_GCB_V = 9,                /*[V]*/
-    /** @stable ICU 4.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.0 */
     U_GCB_SPACING_MARK = 10,    /*[SM]*/ /* from here on: new in Unicode 5.1/ICU 4.0 */
-    /** @stable ICU 4.0 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 4.0 */
     U_GCB_PREPEND = 11,         /*[PP]*/
-    /** @stable ICU 50 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 50 */
     U_GCB_REGIONAL_INDICATOR = 12,  /*[RI]*/ /* new in Unicode 6.2/ICU 50 */
-    /** @stable ICU 58 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 58 */
     U_GCB_E_BASE = 13,          /*[EB]*/ /* from here on: new in Unicode 9.0/ICU 58 */
-    /** @stable ICU 58 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 58 */
     U_GCB_E_BASE_GAZ = 14,      /*[EBG]*/
-    /** @stable ICU 58 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 58 */
     U_GCB_E_MODIFIER = 15,      /*[EM]*/
-    /** @stable ICU 58 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 58 */
     U_GCB_GLUE_AFTER_ZWJ = 16,  /*[GAZ]*/
-    /** @stable ICU 58 */
+    /** \xrefitem stable "Stable" "Stable List" ICU 58 */
     U_GCB_ZWJ = 17,             /*[ZWJ]*/
 
 #ifndef U_HIDE_DEPRECATED_API
@@ -2162,7 +2164,7 @@
      * One more than the highest normal UGraphemeClusterBreak value.
      * The highest value is available via u_getIntPropertyMaxValue(UCHAR_GRAPHEME_CLUSTER_BREAK).
      *
-     * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
+     * \xrefitem deprecated "Deprecated" "Deprecated List" ICU 58 The numeric value may change over time, see ICU ticket #12420.
      */
     U_GCB_COUNT = 18
 #endif  // U_HIDE_DEPRECATED_API
@@ -2173,7 +2175,7 @@
  * (UWordBreak is a pre-existing enum type in ubrk.h for word break status tags.)
  *
  * @see UCHAR_WORD_BRE