diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
index 40f5b69def..843c032a2b 100644
--- a/.github/workflows/ci-workflow.yml
+++ b/.github/workflows/ci-workflow.yml
@@ -12,17 +12,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        cfg: # some jobs disabled because we have too many
-          - { os: ubuntu-22.04, apt: g++-8,    cxx: g++-8,      cc: gcc-8,    dist: false, archstr: "x64"}
-          #- { os: ubuntu-22.04, apt: g++-9,    cxx: g++-9,      cc: gcc-9,    dist: false, archstr: "x64"}
-          - { os: ubuntu-22.04, apt: g++-10,   cxx: g++-10,     cc: gcc-10,   dist: false, archstr: "x64"}
-          - { os: ubuntu-22.04, apt: g++-13,   cxx: g++-13,     cc: gcc-13,   dist: false, archstr: "x64"}
-          - { os: ubuntu-22.04, apt: clang-9,  cxx: clang++-9,  cc: clang-9,  dist: false, archstr: "x64"}
-          #- { os: ubuntu-22.04, apt: clang-10, cxx: clang++-10, cc: clang-10, dist: false, archstr: "x64"}
-          #- { os: ubuntu-22.04, apt: clang-11, cxx: clang++-11, cc: clang-11, dist: false, archstr: "x64"}
-          - { os: ubuntu-22.04, apt: clang-12, cxx: clang++-12, cc: clang-12, dist: true, archstr: "x64"}
-          - { os: ubuntu-22.04, apt: clang-16, cxx: clang++-16, cc: clang-16, dist: false, archstr: "x64"}
-          - { os: ubuntu-22.04-arm, apt: clang-16, cxx: clang++-16, cc: clang-16, dist: false, archstr: "aarch64"}
+        cfg:
+          - { os: ubuntu-24.04, apt: g++-11,   cxx: g++-11,     cc: gcc-11,   dist: false, archstr: "x64"}
+          - { os: ubuntu-24.04, apt: g++-12,   cxx: g++-12,     cc: gcc-12,   dist: false, archstr: "x64"}
+          - { os: ubuntu-24.04, apt: g++-13,   cxx: g++-13,     cc: gcc-13,   dist: false, archstr: "x64"}
+          - { os: ubuntu-24.04, apt: g++-14,   cxx: g++-14,     cc: gcc-14,   dist: false, archstr: "x64"}
+          - { os: ubuntu-24.04, apt: clang-16, cxx: clang++-16, cc: clang-16, dist: true, archstr: "x64"}
+          - { os: ubuntu-24.04, apt: clang-17, cxx: clang++-17, cc: clang-17, dist: false, archstr: "x64"}
+          - { os: ubuntu-24.04, apt: clang-18, cxx: clang++-18, cc: clang-18, dist: false, archstr: "x64"}
+          - { os: ubuntu-24.04-arm, apt: clang-16, cxx: clang++-16, cc: clang-16, dist: false, archstr: "aarch64"}
 
     steps:
       - name: Checkout Etterna
@@ -36,14 +34,24 @@ jobs:
           repository: etternagame/CrashpadTools
           path: tools
 
+      - name: Setup Crashpad
+        shell: bash
+        run: |
+          git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git "$HOME/depot_tools"
+
+          cd main/extern/crashpad
+          "$HOME/depot_tools/gclient" sync
+          "$HOME/depot_tools/gclient" runhooks
+
       - name: Install apt packages
-        run: sudo apt update && sudo apt install ${{ matrix.cfg.cpp-version }} nasm ninja-build libglew-dev libxrandr-dev libxtst-dev libpulse-dev libasound-dev libogg-dev libvorbis-dev xorg-dev libcurl4-openssl-dev
+        run: sudo apt update && sudo apt install ${{ matrix.cfg.apt }} nasm ninja-build libglew-dev libxrandr-dev libxtst-dev libpulse-dev libasound-dev libogg-dev libvorbis-dev xorg-dev libcurl4-openssl-dev
       - name: Install OpenSSL 3.5
         run: mkdir -p tmp/openssl && cd tmp/openssl && wget https://github.com/openssl/openssl/releases/download/openssl-3.5.1/openssl-3.5.1.tar.gz && tar -xf openssl-3.5.1.tar.gz && cd openssl-3.5.1 && ./Configure --prefix="${HOME}/toolchain" && make -j `nproc` && make test -j `nproc` && sudo make install
       - name: Generate CMake
         run: mkdir main/build && cd main/build && cmake -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTS=FALSE -DBUILD_EXAMPLES=FALSE -DOPENSSL_ROOT_DIR=~/toolchain/ ..
         env:
-          CXX: ${{matrix.cfg.cpp-version}}
+          CXX: ${{matrix.cfg.cxx}}
+          CC: ${{matrix.cfg.cc}}
 
       - name: Build Project
         run: cd main/build && ninja
@@ -56,7 +64,7 @@ jobs:
         if: ${{matrix.cfg.dist}}
         uses: actions/upload-artifact@v4
         with:
-          name: "Etterna - Linux x64"
+          name: "Etterna - Linux ${{matrix.cfg.archstr}}"
           path: '${{github.workspace}}/main/build/*.tar.gz'
 
       - name: Update Environment Variables
@@ -82,7 +90,7 @@ jobs:
         if: ${{matrix.cfg.dist}}
         uses: actions/upload-artifact@v4
         with:
-          name: Etterna Symbols Linux x64 - ${{github.sha}}
+          name: Etterna Symbols Linux ${{matrix.cfg.archstr}} - ${{github.sha}}
           path: '${{github.workspace}}/sym/EtternaSymbolsUploadDir'
 
       - name: Get version for CrashServer Upload
@@ -123,8 +131,17 @@ jobs:
           repository: etternagame/CrashpadTools
           path: tools
 
+      - name: Setup Crashpad
+        shell: bash
+        run: |
+          git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git "$HOME/depot_tools"
+
+          cd main/extern/crashpad
+          "$HOME/depot_tools/gclient" sync
+          "$HOME/depot_tools/gclient" runhooks
+
       - name: Install homebrew packages
-        run: brew install cmake nasm ninja openssl
+        run: brew install cmake nasm yasm ninja openssl
 
       - name: Setup Python 3
         uses: actions/setup-python@v6
@@ -207,7 +224,7 @@ jobs:
           #- { os: macos-13,     name: "Ventura", dist: true} # rendered useless by GHA
           #- { os: macos-12,     name: "Monterey", dist: true} # rendered useless by GHA
           #- { os: macos-11,     name: "Big Sur",  dist: true} # rendered useless by GHA
-          - { os: macos-15,     name: "Sequoia", dist: true}
+          - { os: macos-15-intel,     name: "Sequoia", dist: true}
 
     steps:
 
@@ -222,13 +239,17 @@ jobs:
           repository: etternagame/CrashpadTools
           path: tools
 
-      - name: Install homebrew packages
-        run: brew install cmake nasm ninja openssl
+      - name: Setup Crashpad
+        shell: bash
+        run: |
+          git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git "$HOME/depot_tools"
 
-      - name: Setup Python 2.7
-        uses: MatteoH2O1999/setup-python@v6
-        with:
-          python-version: '2.7'
+          cd main/extern/crashpad
+          "$HOME/depot_tools/gclient" sync
+          "$HOME/depot_tools/gclient" runhooks
+
+      - name: Install homebrew packages
+        run: brew install cmake nasm yasm ninja openssl
 
       - name: Setup Python 3
         uses: actions/setup-python@v6
@@ -325,6 +346,15 @@ jobs:
           repository: etternagame/CrashpadTools
           path: tools
 
+      - name: Setup Crashpad
+        shell: bash
+        run: |
+          git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git "$HOME/depot_tools"
+
+          cd main/extern/crashpad
+          "$HOME/depot_tools/gclient" sync
+          "$HOME/depot_tools/gclient" runhooks
+
       - name: Install homebrew packages
         run: brew install cmake nasm ninja openssl && brew tap etternagame/etterna && brew update && HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
 
@@ -392,12 +422,12 @@ jobs:
         if: ${{ matrix.cfg.dist && github.event_name == 'release' && github.event.action == 'published' }}
         with:
           files: ${{github.workspace}}/main/build/*.dmg
-  windows: # Windows x64 and x86 build matrix
+  windows: # Windows x64 (RIP x86) build matrix
     strategy:
       fail-fast: false # Don't cancel other matrix jobs if one fails
       matrix:
         cfg:
-        - { name: i386, arch: x86,  ssl-dir: 'C:\Program Files (x86)\OpenSSL-Win32' }
+        #- { name: i386, arch: x86,  ssl-dir: 'C:\Program Files (x86)\OpenSSL-Win32' }
         - { name: x64,  arch: x64,  ssl-dir: 'C:\Program Files\OpenSSL-Win64'}
 
     name: "Windows ${{matrix.cfg.name}}"
@@ -414,6 +444,15 @@ jobs:
           repository: etternagame/CrashpadTools
           path: tools
 
+      - name: Setup Crashpad
+        shell: bash
+        run: |
+          git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git "$HOME/depot_tools"
+
+          cd main/extern/crashpad
+          "$HOME/depot_tools/gclient" sync
+          "$HOME/depot_tools/gclient" runhooks
+
       - name: Checkout DirectX SDK
         uses: actions/checkout@v3
         with:
@@ -430,24 +469,6 @@ jobs:
         with:
           python-version: '3.12'
           
-      - name: Setup Python 2.7
-        uses: MatteoH2O1999/setup-python@v6
-        with:
-          python-version: '2.7'
-
-      - name: Install chocolatey packages (i386)
-        if: ${{ matrix.cfg.arch == 'x86' }}
-        run: choco install ninja nsis -y --x86
-
-      # the last win32 curl version is 8.15.0
-      - name: Install curl (i386)
-        if: ${{ matrix.cfg.arch == 'x86' }}
-        run: choco install curl -y --x86 --version=8.15.0
-      
-      - name: Install openSSL (i386)
-        if: ${{ matrix.cfg.arch == 'x86' }}
-        run: choco install openssl -y --x86
-
       - name: Install chocolatey packages (x64)
         if: ${{ matrix.cfg.arch == 'x64' }}
         run: choco install ninja nsis curl -y
diff --git a/CMake/Helpers/CMakeLinux.cmake b/CMake/Helpers/CMakeLinux.cmake
index b6c122e0e2..8dc0c6edfd 100644
--- a/CMake/Helpers/CMakeLinux.cmake
+++ b/CMake/Helpers/CMakeLinux.cmake
@@ -27,4 +27,4 @@ target_link_libraries(Etterna PRIVATE ${PULSEAUDIO_LIBRARIES})
 target_link_libraries(Etterna PRIVATE ${ALSA_LIBRARIES})
 target_link_libraries(Etterna PRIVATE ${JACK_LIBRARIES})
 target_link_libraries(Etterna PRIVATE ${VA_LIBRARIES})
-target_link_libraries(Etterna PRIVATE ${OPENGL_LIBRARY})
+target_link_libraries(Etterna PRIVATE ${OPENGL_LIBRARY})
\ No newline at end of file
diff --git a/CMake/Helpers/CMakeMacOS.cmake b/CMake/Helpers/CMakeMacOS.cmake
index d1a1d833d0..7aa413bda4 100644
--- a/CMake/Helpers/CMakeMacOS.cmake
+++ b/CMake/Helpers/CMakeMacOS.cmake
@@ -36,11 +36,15 @@ find_library(MAC_FRAME_CARBON Carbon)
 find_library(MAC_FRAME_COREAUDIO CoreAudio)
 find_library(MAC_FRAME_IOKIT IOKit)
 find_library(MAC_FRAME_METAL Metal)
+find_library(MAC_FRAME_FOUNDATION Foundation)
+find_library(MAC_FRAME_APPKIT AppKit)
 target_link_libraries(Etterna PRIVATE ${MAC_FRAME_AUDIOUNIT})
 target_link_libraries(Etterna PRIVATE ${MAC_FRAME_CARBON})
 target_link_libraries(Etterna PRIVATE ${MAC_FRAME_COREAUDIO})
 target_link_libraries(Etterna PRIVATE ${MAC_FRAME_IOKIT})
 target_link_libraries(Etterna PRIVATE ${MAC_FRAME_METAL})
+target_link_libraries(Etterna PRIVATE ${MAC_FRAME_FOUNDATION})
+target_link_libraries(Etterna PRIVATE ${MAC_FRAME_APPKIT})
 
 # Extern Libraries
 target_link_libraries(Etterna PRIVATE ffmpeg)
diff --git a/CMake/Helpers/CPackSetup.cmake b/CMake/Helpers/CPackSetup.cmake
index c042d06ee6..c3b305f10b 100644
--- a/CMake/Helpers/CPackSetup.cmake
+++ b/CMake/Helpers/CPackSetup.cmake
@@ -10,6 +10,12 @@ set(INSTALL_DIR "Etterna" CACHE STRING "Output directory for built game")
 set(ASSET_DIR "${INSTALL_DIR}" CACHE STRING "Output directory for game assets")
 
 if(UNIX)
+    set_target_properties(Etterna PROPERTIES
+        INSTALL_RPATH "\$ORIGIN:\$ORIGIN/../lib"
+        INSTALL_RPATH_USE_LINK_PATH TRUE
+        SKIP_INSTALL_RPATH OFF
+    )
+
     set(CPACK_GENERATOR TGZ)
     set(CPACK_DEBIAN_PACKAGE_DEPENDS "")
     set(CPACK_PACKAGE_CONTACT https://github.com/etternagame/etterna)
@@ -23,6 +29,10 @@ if(UNIX)
                             GROUP_READ GROUP_EXECUTE
                             WORLD_READ WORLD_EXECUTE)
     endif()
+
+    install(FILES "${PROJECT_SOURCE_DIR}/extern/discord/lib/release/libdiscord_partner_sdk.so"
+        COMPONENT Etterna
+        DESTINATION ${INSTALL_DIR})
 endif()
 
 # Windows Specific CPack
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 08c0195fb6..0c8b4deb83 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,6 +43,16 @@ add_executable(Etterna)
 # Project Compile Options
 set(WITH_CRASHPAD TRUE CACHE BOOL "Compile with Crash Handler (Requires depot_tools installed)")
 
+# Discord doesn't seem to provide Linux arm64 binaries...
+set(SUPPORT_DISCORD_SDK ON)
+if(UNIX AND NOT APPLE)
+    string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" _proc)
+    if(_proc MATCHES "^(arm64|aarch64)$")
+        message(WARNING "Discord Social SDK not supported for this platform")
+        set(SUPPORT_DISCORD_SDK OFF)
+    endif()
+endif()
+
 ## Setting Target Properties
 ### Set a different name for each output binary depending on what build configuration is.
 ### Usually it is separated by directory, but since we have the same directory for every
@@ -100,7 +110,12 @@ target_link_libraries(Etterna PRIVATE rapidjson)
 target_link_libraries(Etterna PRIVATE jwt-cpp)
 target_link_libraries(Etterna PRIVATE websocketpp)
 target_link_libraries(Etterna PRIVATE libluajit)
-target_link_libraries(Etterna PRIVATE discord)
+
+if(SUPPORT_DISCORD_SDK)
+    add_compile_definitions(SUPPORT_DISCORD_SDK)
+    target_link_libraries(Etterna PRIVATE discord)
+endif()
+
 target_link_libraries(Etterna PRIVATE muFFT)
 target_link_libraries(Etterna PRIVATE glfw)
 target_link_libraries(Etterna PRIVATE ogg)
@@ -115,7 +130,8 @@ target_link_libraries(Etterna PRIVATE plog::plog)
 target_link_libraries(Etterna PRIVATE nowide::nowide)
 target_link_libraries(Etterna PRIVATE ghc_filesystem)
 
-if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64")
+string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" _proc)
+if(_proc MATCHES "^(arm64|aarch64)$")
   target_link_libraries(Etterna PRIVATE sse2neon)
 endif()
 
diff --git a/Docs/Building.md b/Docs/Building.md
index 965706a7fb..3e9e29b747 100644
--- a/Docs/Building.md
+++ b/Docs/Building.md
@@ -110,6 +110,13 @@ There are two stages apart of CMake projects.
 
 ### CLI Project Generation
 
+Before starting, if you really need Crashpad, be sure to sync its dependencies:
+```bash
+cd extern/crashpad
+gclient sync
+gclient runhooks
+```
+
 Both configuration and generation stages automatically happen one after the other when using the CLI.
 Start by creating a folder to hold all the output object files, usually called `build`, within the root of the project.
 
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index cfab5a57f0..3379eba25a 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -33,10 +33,12 @@ target_include_directories(websocketpp INTERFACE websocketpp)
 target_link_libraries(websocketpp INTERFACE asio)
 
 ## discord-rpc
-set(CLANG_FORMAT_CMD OFF CACHE BOOL "" FORCE)   # Disable discord clang-format
-set(BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)     # Disable discord examples
-add_subdirectory(discord)
-
+if(SUPPORT_DISCORD_SDK)
+    set(CLANG_FORMAT_CMD OFF CACHE BOOL "" FORCE)   # Disable discord clang-format
+    set(BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)     # Disable discord examples
+    add_subdirectory(discord)
+    list(APPEND EXT_TARGETS discord)
+endif()
 ## plog
 set(PLOG_BUILD_SAMPLES OFF)
 add_subdirectory(plog)
@@ -48,12 +50,12 @@ add_subdirectory(rapidjson)
 add_subdirectory(stb)
 add_subdirectory(miniz)
 
-if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64")
+string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" _proc)
+if(_proc MATCHES "^(arm64|aarch64)$")
     # Used for providing ARM's NEON equivalents of x86_64 SSE SIMD instructions
     add_subdirectory(sse2neon)
 endif()
 
-
 set(JWT_SSL_LIBRARY OpenSSL)
 add_subdirectory(jwt-cpp-0.6.0)
 
@@ -85,7 +87,7 @@ endif()
 ## IDE Folder Organization
 list(APPEND EXT_TARGETS
     SQLiteCpp sqlite3
-    discord muFFT
+    muFFT
     zlib libmad pcre
     ogg vorbis glfw
     fmt)
diff --git a/extern/crashpad/.gclient b/extern/crashpad/.gclient
index 080549b986..3ceff58479 100644
--- a/extern/crashpad/.gclient
+++ b/extern/crashpad/.gclient
@@ -1,9 +1,7 @@
-target_os = ["mac", "win", "unix"];
 solutions = [
   {
-    "custom_vars": { "pull_linux_clang": True },
     "name": "crashpad",
     "url": "https://chromium.googlesource.com/crashpad/crashpad.git",
     "managed": False,
   },
-];
+]
diff --git a/extern/crashpad/.gclient_entries b/extern/crashpad/.gclient_entries
index 8b35450dae..7ae60c584e 100644
--- a/extern/crashpad/.gclient_entries
+++ b/extern/crashpad/.gclient_entries
@@ -1,15 +1,14 @@
 entries = {
   'crashpad': 'https://chromium.googlesource.com/crashpad/crashpad.git',
-  'buildtools': 'https://chromium.googlesource.com/chromium/src/buildtools.git@9e121212d42be62a7cce38072f925f8398d11e49',
-  'crashpad/third_party/googletest/googletest': 'https://chromium.googlesource.com/external/github.com/google/googletest@11da093e0477185dbd78abaaa9f99db15be498d0',
+  'buildtools': 'https://chromium.googlesource.com/chromium/src/buildtools.git@efa920ce144e4dc1c1841e73179cd7e23b9f0d5e',
+  'buildtools/clang_format/script': 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git@c912837e0d82b5ca4b6e790b573b3956d3744c1c',
+  'buildtools/win:gn/gn/windows-amd64': 'https://chrome-infra-packages.appspot.com/gn/gn/windows-amd64@git_revision:5e19d2fb166fbd4f6f32147fbb2f497091a54ad8',
+  'crashpad/third_party/googletest/googletest': 'https://chromium.googlesource.com/external/github.com/google/googletest@3983f67e32fb3e9294487b9d4f9586efa6e5d088',
   'crashpad/third_party/libfuzzer/src': 'https://chromium.googlesource.com/chromium/llvm-project/compiler-rt/lib/fuzzer.git@fda403cf93ecb8792cb1d061564d89a6553ca020',
-  'crashpad/third_party/linux/clang/linux-amd64:fuchsia/clang/linux-amd64': 'https://chrome-infra-packages.appspot.com/fuchsia/clang/linux-amd64@goma',
-  'crashpad/third_party/lss/lss': 'https://chromium.googlesource.com/linux-syscall-support.git@7bde79cc274d06451bf65ae82c012a5d3e476b5a',
-  'crashpad/third_party/mini_chromium/mini_chromium': 'https://chromium.googlesource.com/chromium/mini_chromium@14b219d5d503e305a6d853e64de201659cfcbe2d',
-  'crashpad/third_party/zlib/zlib': 'https://chromium.googlesource.com/chromium/src/third_party/zlib@13dc246a58e4b72104d35f9b1809af95221ebda7',
-  'buildtools/clang_format/script': 'https://chromium.googlesource.com/chromium/llvm-project/cfe/tools/clang-format.git@96636aa0e9f047f17447f2d45a094d0b59ed7917',
-  'buildtools/mac:gn/gn/mac-amd64': 'https://chrome-infra-packages.appspot.com/gn/gn/mac-amd64@git_revision:3028c6a426a4aaf6da91c4ebafe716ae370225fe',
-  'buildtools/third_party/libc++/trunk': 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git@d9040c75cfea5928c804ab7c235fed06a63f743a',
-  'buildtools/third_party/libc++abi/trunk': 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@196ba1aaa8ac285d94f4ea8d9836390a45360533',
-  'buildtools/third_party/libunwind/trunk': 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git@d999d54f4bca789543a2eb6c995af2d9b5a1f3ed',
+  'crashpad/third_party/lss/lss': 'https://chromium.googlesource.com/linux-syscall-support.git@9719c1e1e676814c456b55f5f070eabad6709d31',
+  'crashpad/third_party/mini_chromium/mini_chromium': 'https://chromium.googlesource.com/chromium/mini_chromium@706fce5b1a280a6f2eea69040f67847f9acb65ff',
+  'crashpad/third_party/ninja:infra/3pp/tools/ninja/${platform}': 'https://chrome-infra-packages.appspot.com/infra/3pp/tools/ninja/${platform}@version:2@1.8.2.chromium.3',
+  'crashpad/third_party/windows/clang/win-amd64:Win/clang-llvmorg-20-init-17108-g29ed6000-2.tar.xz': 'gs://chromium-browser-clang/Win/clang-llvmorg-20-init-17108-g29ed6000-2.tar.xz',
+  'crashpad/third_party/zlib/zlib': 'https://chromium.googlesource.com/chromium/src/third_party/zlib@fef58692c1d7bec94c4ed3d030a45a1832a9615d',
+  'buildtools/win/format:49458d4c1e884a38308f8dc6a2c7eb55fc478755': 'gs://chromium-clang-format/49458d4c1e884a38308f8dc6a2c7eb55fc478755',
 }
diff --git a/extern/crashpad/.gclient_previous_sync_commits b/extern/crashpad/.gclient_previous_sync_commits
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/extern/crashpad/.gclient_previous_sync_commits
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/extern/crashpad/.gcs_entries b/extern/crashpad/.gcs_entries
new file mode 100644
index 0000000000..ee4c5902d7
--- /dev/null
+++ b/extern/crashpad/.gcs_entries
@@ -0,0 +1,21 @@
+{
+  "crashpad": {
+    "crashpad/third_party/windows/clang/win-amd64": [
+      "Win/clang-llvmorg-20-init-17108-g29ed6000-2.tar.xz"
+    ]
+  },
+  "buildtools": {
+    "buildtools/win/format": [
+      "49458d4c1e884a38308f8dc6a2c7eb55fc478755"
+    ],
+    "buildtools/mac/format": [
+      "0b4bd257a1f4cd27d27d6919b0f9e52ecdfa8f1e"
+    ],
+    "buildtools/mac_arm64/format": [
+      "96c34e77259c4cc1fc7bdf067fc058bfd341ab85"
+    ],
+    "buildtools/linux64/format": [
+      "b42097ca924d1f1736a5a7806068fed9d7345eb4"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/extern/crashpad/.gitignore b/extern/crashpad/.gitignore
new file mode 100644
index 0000000000..aa152e1dd6
--- /dev/null
+++ b/extern/crashpad/.gitignore
@@ -0,0 +1,2 @@
+_bad_scm/
+.cipd/
\ No newline at end of file
diff --git a/extern/crashpad/CMakeLists.txt b/extern/crashpad/CMakeLists.txt
index f0f9dfe5b5..01c81f4c90 100644
--- a/extern/crashpad/CMakeLists.txt
+++ b/extern/crashpad/CMakeLists.txt
@@ -1,13 +1,29 @@
-# Crashpad needs google's depot_tools to be in the system path.
-# "gclient" is a binary known to be apart of depot_tools.
-find_program(DEPOT_TOOLS_EXIST gclient)
-if(DEPOT_TOOLS_EXIST AND NOT $ENV{CI}) # Not required on CI, as it's prepared in ci-workflow.yml
-	message(WARNING " depot_tools were not found. Crashpad will be disabled. If you would like to build crashpad,\n"
-					" please ensure depot_tools have been added to your system path. Install instructions are at:\n"
-					" https://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/depot_tools_tutorial.html#_setting_up")
-	return()
+include(FetchContent)
+
+# Here we only download depot_tools by using FetchContent. If the developer has
+# installed depot_tools on their own system and added it to path, this would
+# not be necessary, but for the sake of Etterna, it was added to keep build instruction
+# modification to a minimum. Unlike ExternalProject, FetchContent will download the
+# git repository *during project generation*.
+FetchContent_Declare(depot_tools
+	GIT_REPOSITORY https://chromium.googlesource.com/chromium/tools/depot_tools.git
+	GIT_TAG	main
+	GIT_PROGRESS TRUE
+	GIT_SHALLOW TRUE)
+FetchContent_MakeAvailable(depot_tools)
+FetchContent_GetProperties(depot_tools SOURCE_DIR DEPOT_TOOLS_DIR)
+list(APPEND CMAKE_PROGRAM_PATH ${DEPOT_TOOLS_DIR})
+
+if(WIN32)
+	set(GCLIENT ${DEPOT_TOOLS_DIR}/gclient.bat)
+else()
+	set(GCLIENT ${DEPOT_TOOLS_DIR}/gclient)
 endif()
 
+# Crashpad source and build folders
+set(SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/crashpad)
+set(BINARY_DIR ${PROJECT_BINARY_DIR}/gn_crashpad)
+
 # Check linux to ensure necessary tools exist to build crashpad
 if(UNIX AND NOT APPLE)
 	# clang++ must be detected on linux only.
@@ -18,14 +34,6 @@ if(UNIX AND NOT APPLE)
 						" setup by crashpad.")
 		return()
 	endif()
-	# Python2 must be detected on linux only. depot_tools provides a python2 interpreter on windows,
-	# and python2 comes standards on mac.
-	find_package(Python2 COMPONENTS Interpreter)
-	if(NOT Python2_FOUND AND NOT $ENV{CI}) # Not required on CI, as it's prepared in ci-workflow.yml
-		message(WARNING " python2 was not found. Crashpad will be disabled. If you would like to build crashpad,\n"
-						" please ensure you have python2 installed via your package manager.")
-		return()
-	endif()
 endif()
 
 # Google uses depot_tools to download and build crashpad. We will do the same.
@@ -37,35 +45,31 @@ endif()
 # inside the downloaded "libs/crashpad/{buildtools,crashpad}" as we want it in the current,
 # source tree, and not as a submodule/subtree.
 include(ExternalProject)
-include(FetchContent)
 
-# Here we only download depot_tools by using FetchContent. If the developer has
-# installed depot_tools on their own system and added it to path, this would
-# not be necessary, but for the sake of Etterna, it was added to keep build instruction
-# modification to a minimum. Unlike ExternalProject, FetchContent will download the
-# git repository *during project generation*.
-FetchContent_Declare(depot_tools
-	GIT_REPOSITORY https://chromium.googlesource.com/chromium/tools/depot_tools.git
-	GIT_TAG	main
-	GIT_PROGRESS TRUE
-	GIT_SHALLOW TRUE)
-FetchContent_MakeAvailable(depot_tools)
-FetchContent_GetProperties(depot_tools SOURCE_DIR DEPOT_TOOLS_DIR)
-
-list(APPEND CMAKE_PROGRAM_PATH ${DEPOT_TOOLS_DIR})
-find_program(EXE_DEPOT_GN gn)
-find_program(EXE_DEPOT_NINJA ninja)
-find_program(EXE_DEPOT_UPDATE_DEPOT_TOOLS update_depot_tools)
-find_program(EXE_DEPOT_GIT git) # TODO: I'm not sure this grabs the "right" version of git; investigate here if shennanigans arise.
+# these tools should be loaded by CI or the user themselves
+find_program(EXE_DEPOT_GN gn REQUIRED)
+find_program(EXE_DEPOT_NINJA ninja REQUIRED)
+find_program(EXE_DEPOT_UPDATE_DEPOT_TOOLS update_depot_tools REQUIRED)
+find_program(EXE_DEPOT_GIT git REQUIRED) # TODO: I'm not sure this grabs the "right" version of git; investigate here if shennanigans arise.
 
-# Crashpad source and build folders
-set(SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/crashpad)
-set(BINARY_DIR ${PROJECT_BINARY_DIR}/gn_crashpad)
-
-# Assume 64bit, change to 32 if necessary
 set(GN_TARGET_CPU x64)
-if(CMAKE_SIZEOF_VOID_P EQUAL 4) # If 32bit
-	set(GN_TARGET_CPU x86)
+
+if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+    set(GN_TARGET_CPU x86)
+else()
+    string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" _proc)
+
+    if(CMAKE_GENERATOR_PLATFORM)
+        string(TOLOWER "${CMAKE_GENERATOR_PLATFORM}" _plat)
+    else()
+        set(_plat "")
+    endif()
+
+    if(_proc MATCHES "^(arm64|aarch64)$" OR _plat MATCHES "arm64")
+        set(GN_TARGET_CPU arm64)
+    elseif(_proc MATCHES "^(x86_64|amd64|x64)$" OR _plat MATCHES "x64")
+        set(GN_TARGET_CPU x64)
+    endif()
 endif()
 
 # Lists of the expected output libraries
diff --git a/extern/crashpad/breakpad/README.md b/extern/crashpad/breakpad/README.md
deleted file mode 100644
index 97fcfb0ded..0000000000
--- a/extern/crashpad/breakpad/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Breakpad Tools
-
-While Breadpad and Crashpad operate differently, crashpad still relies on breakpad tools.
-Crashpad is specificly the crash-handler and reporter tools, while the tools needed to
-prepare symbols are stored within breakpad.
diff --git a/extern/crashpad/breakpad/mac/dump_syms b/extern/crashpad/breakpad/mac/dump_syms
deleted file mode 100755
index 5ebcbf795c..0000000000
Binary files a/extern/crashpad/breakpad/mac/dump_syms and /dev/null differ
diff --git a/extern/crashpad/breakpad/win/dump_syms.exe b/extern/crashpad/breakpad/win/dump_syms.exe
deleted file mode 100755
index 524c82a242..0000000000
Binary files a/extern/crashpad/breakpad/win/dump_syms.exe and /dev/null differ
diff --git a/extern/crashpad/buildtools/.gitignore b/extern/crashpad/buildtools/.gitignore
index 8c0bfc5b77..449448ef5b 100644
--- a/extern/crashpad/buildtools/.gitignore
+++ b/extern/crashpad/buildtools/.gitignore
@@ -1,13 +1,18 @@
 *.pyc
-clang_format/script/
-third_party/libc++/trunk
-third_party/libc++abi/trunk
-third_party/libunwind/trunk
-linux64/clang-format
-linux64/.versions
-mac/clang-format
-mac/.versions
-win/clang-format.exe
-win/.versions
-android/doclava/
-android/doclava.tar.gz
+/*/format
+/android/doclava.tar.gz
+/android/doclava/
+/clang_format/script/
+/linux64/.versions/
+/linux64/clang-format
+/linux64/gn
+/mac/.versions/
+/mac/clang-format
+/mac/gn
+/reclient/
+/third_party/libc++/trunk
+/third_party/libc++abi/trunk
+/third_party/libunwind/trunk
+/win/.versions
+/win/clang-format.exe
+/win/gn.exe
diff --git a/extern/crashpad/buildtools/DEPS b/extern/crashpad/buildtools/DEPS
index 6d944a7298..bc62395d0c 100644
--- a/extern/crashpad/buildtools/DEPS
+++ b/extern/crashpad/buildtools/DEPS
@@ -1,72 +1,60 @@
 use_relative_paths = True
 
-vars = {
-  'chromium_url': 'https://chromium.googlesource.com',
-
-  #
-  # TODO(crbug.com/941824): The values below need to be kept in sync
-  # between //DEPS and //buildtools/DEPS, so if you're updating one,
-  # update the other. There is a presubmit check that checks that
-  # you've done so; if you are adding new tools to //buildtools and
-  # hence new revisions to this list, make sure you update the
-  # _CheckBuildtoolsRevsAreInSync in PRESUBMIT.py to include the additional
-  # revisions.
-  #
-
-  # GN CIPD package version.
-  'gn_version': 'git_revision:3028c6a426a4aaf6da91c4ebafe716ae370225fe',
-
-  # When changing these, also update the svn revisions in deps_revisions.gni
-  'clang_format_revision': '96636aa0e9f047f17447f2d45a094d0b59ed7917',
-  'libcxx_revision':       'd9040c75cfea5928c804ab7c235fed06a63f743a',
-  'libcxxabi_revision':    '196ba1aaa8ac285d94f4ea8d9836390a45360533',
-  'libunwind_revision':    'd999d54f4bca789543a2eb6c995af2d9b5a1f3ed',
-}
-
 deps = {
-  'clang_format/script':
-    Var('chromium_url') + '/chromium/llvm-project/cfe/tools/clang-format.git@' +
-    Var('clang_format_revision'),
-  'linux64': {
-    'packages': [
+  'win/format': {
+    'bucket': 'chromium-clang-format',
+    'condition': 'host_os == "win"',
+    'dep_type': 'gcs',
+    'objects': [
       {
-        'package': 'gn/gn/linux-amd64',
-        'version': Var('gn_version'),
-      }
+        'object_name': '49458d4c1e884a38308f8dc6a2c7eb55fc478755',
+        'sha256sum': '2f964ea355762d28005568a1cf888114d13b18631c618543586fb40589a22224',
+        'size_bytes': 3214848,
+        'generation': 1699478813805380,
+        'output_file': 'clang-format.exe',
+      },
     ],
-    'dep_type': 'cipd',
-    'condition': 'host_os == "linux"',
   },
-  'mac': {
-    'packages': [
+  'mac/format': {
+    'bucket': 'chromium-clang-format',
+    'condition': 'host_os == "mac" and host_cpu == "x64"',
+    'dep_type': 'gcs',
+    'objects': [
       {
-        'package': 'gn/gn/mac-amd64',
-        'version': Var('gn_version'),
-      }
+        'object_name': '0b4bd257a1f4cd27d27d6919b0f9e52ecdfa8f1e',
+        'sha256sum': '0f3c38a6af0a04fd4161f1948f02e83a8827727e77242d3b5b61ae4f009a270a',
+        'size_bytes': 2869976,
+        'generation': 1699478821342910,
+        'output_file': 'clang-format',
+      },
     ],
-    'dep_type': 'cipd',
-    'condition': 'host_os == "mac"',
   },
-  'third_party/libc++/trunk':
-    Var('chromium_url') +
-    '/external/github.com/llvm/llvm-project/libcxx.git' + '@' +
-    Var('libcxx_revision'),
-  'third_party/libc++abi/trunk':
-    Var('chromium_url') +
-    '/external/github.com/llvm/llvm-project/libcxxabi.git' + '@' +
-    Var('libcxxabi_revision'),
-  'third_party/libunwind/trunk':
-    Var('chromium_url') +
-    '/external/github.com/llvm/llvm-project/libunwind.git' + '@' +
-    Var('libunwind_revision'),
-  'win': {
-    'packages': [
+  'mac_arm64/format': {
+    'bucket': 'chromium-clang-format',
+    'condition': 'host_os == "mac" and host_cpu == "arm64"',
+    'dep_type': 'gcs',
+    'objects': [
       {
-        'package': 'gn/gn/windows-amd64',
-        'version': Var('gn_version'),
-      }
+        'object_name': '96c34e77259c4cc1fc7bdf067fc058bfd341ab85',
+        'sha256sum': '66c5243cd530702defcbe18dffdbed0da9a3d1474b158a949580f6d269fbac17',
+        'size_bytes': 2847744,
+        'generation': 1699478828600976,
+        'output_file': 'clang-format',
+      },
+    ],
+  },
+  'linux64/format': {
+    'bucket': 'chromium-clang-format',
+    'condition': 'host_os == "linux"',
+    'dep_type': 'gcs',
+    'objects': [
+      {
+        'object_name': 'b42097ca924d1f1736a5a7806068fed9d7345eb4',
+        'sha256sum': '82df59a7d4390892c3eeaf0c8bf626e2869f1138a6ad3eb90dd51da0011ba630',
+        'size_bytes': 3539912,
+        'generation': 1699478806427152,
+        'output_file': 'clang-format',
+      },
     ],
-    'dep_type': 'cipd',
-    'condition': 'host_os == "win"',
   },
 }
diff --git a/extern/crashpad/buildtools/DIR_METADATA b/extern/crashpad/buildtools/DIR_METADATA
new file mode 100644
index 0000000000..544842aca1
--- /dev/null
+++ b/extern/crashpad/buildtools/DIR_METADATA
@@ -0,0 +1,7 @@
+monorail: {
+  component: "Build"
+}
+team_email: "build@chromium.org"
+buganizer_public: {
+  component_id: 1456832
+}
diff --git a/extern/crashpad/buildtools/LICENSE b/extern/crashpad/buildtools/LICENSE
index 972bb2edb0..513e8a6a0a 100644
--- a/extern/crashpad/buildtools/LICENSE
+++ b/extern/crashpad/buildtools/LICENSE
@@ -1,4 +1,4 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
diff --git a/extern/crashpad/buildtools/OWNERS b/extern/crashpad/buildtools/OWNERS
index 66adf76163..9afe97e154 100644
--- a/extern/crashpad/buildtools/OWNERS
+++ b/extern/crashpad/buildtools/OWNERS
@@ -1,7 +1,9 @@
-dpranke@chromium.org
-dpranke@google.com
+set noparent
 thakis@chromium.org
 thomasanderson@chromium.org
 
-# TEAM: build@chromium.org
-# COMPONENT: Build
+# Chrome Build Team members
+file://infra/config/groups/chrome-build/OWNERS
+
+# For the libc++ autoroller.
+per-file deps_revisions.gni=*
diff --git a/extern/crashpad/buildtools/checkdeps/PRESUBMIT.py b/extern/crashpad/buildtools/checkdeps/PRESUBMIT.py
index 10ef63212f..c8255a59ae 100644
--- a/extern/crashpad/buildtools/checkdeps/PRESUBMIT.py
+++ b/extern/crashpad/buildtools/checkdeps/PRESUBMIT.py
@@ -1,18 +1,15 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright 2012 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Presubmit script for checkdeps tool.
 """
 
-
 def CheckChange(input_api, output_api):
-  results = []
-  results.extend(input_api.canned_checks.RunUnitTests(
+  return input_api.canned_checks.RunUnitTests(
       input_api, output_api,
       [input_api.os_path.join(input_api.PresubmitLocalPath(),
-                              'checkdeps_test.py')]))
-  return results
+                              'checkdeps_test.py')])
 
 
 # Mandatory entrypoint.
diff --git a/extern/crashpad/buildtools/checkdeps/README.md b/extern/crashpad/buildtools/checkdeps/README.md
index 12a89cbe0c..db31b09bee 100644
--- a/extern/crashpad/buildtools/checkdeps/README.md
+++ b/extern/crashpad/buildtools/checkdeps/README.md
@@ -59,6 +59,20 @@ specific_include_rules = {
 }
 ```
 
+To add different dependencies for Java instrumentation and unit tests, the
+following regular expressions may be useful:
+
+```
+specific_include_rules = {
+  '.*UnitTest\.java': [
+    # Rules for unit tests.
+  ],
+  '.*(?<!Unit)Test\.java': [
+    # Rules for instrumentation tests.
+  ],
+}
+```
+
 You can optionally ignore the rules inherited from parent directories, similar
 to "set noparent" in OWNERS files. For example, adding `noparent = True` in
 //ash/components/DEPS will cause rules from //ash/DEPS to be ignored, thereby
diff --git a/extern/crashpad/buildtools/checkdeps/builddeps.py b/extern/crashpad/buildtools/checkdeps/builddeps.py
old mode 100755
new mode 100644
index 2fe48b2d6f..7b6a8cb21c
--- a/extern/crashpad/buildtools/checkdeps/builddeps.py
+++ b/extern/crashpad/buildtools/checkdeps/builddeps.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python
-# Copyright 2013 The Chromium Authors. All rights reserved.
+#!/usr/bin/env python3
+# Copyright 2013 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -9,6 +9,8 @@
 See README.md for the format of the deps file.
 """
 
+
+
 import copy
 import os.path
 import posixpath
@@ -58,11 +60,10 @@ def _GitSourceDirectories(base_directory):
   # FIXME: Use a context manager in Python 3.2+
   popen = subprocess.Popen(git_ls_files_cmd,
                            stdout=subprocess.PIPE,
-                           bufsize=1,  # line buffering, since read by line
                            cwd=base_directory)
   try:
     try:
-      for line in popen.stdout:
+      for line in popen.stdout.read().decode('utf-8').splitlines():
         dir_path = os.path.join(base_directory, os.path.dirname(line))
         dir_path_norm = NormalizePath(dir_path)
         # Add the directory as well as all the parent directories,
@@ -108,7 +109,9 @@ def __init__(self,
     self._ignore_specific_rules = ignore_specific_rules
     self._git_source_directories = None
 
-    if os.path.exists(os.path.join(base_directory, '.git')):
+    if os.getcwd().startswith('/google/cog/cloud'):
+      self.is_git = False
+    elif os.path.exists(os.path.join(base_directory, '.git')):
       self.is_git = True
     elif os.path.exists(os.path.join(base_directory, '.svn')):
       self.is_git = False
@@ -180,7 +183,7 @@ def ApplyOneRule(rule_str, dependee_regexp=None):
     if self._ignore_specific_rules:
       return rules
 
-    for regexp, specific_rules in specific_includes.iteritems():
+    for regexp, specific_rules in specific_includes.items():
       for rule_str in specific_rules:
         ApplyOneRule(rule_str, regexp)
 
@@ -210,7 +213,7 @@ def _ApplyDirectoryRules(self, existing_rules, dir_path_local_abs):
 
     # Check the DEPS file in this directory.
     if self.verbose:
-      print 'Applying rules from', dir_path_local_abs
+      print('Applying rules from', dir_path_local_abs)
     def FromImpl(*_):
       pass  # NOP function so "From" doesn't fail.
 
@@ -248,9 +251,14 @@ def Lookup(self, var_name):
     if os.path.isfile(deps_file_path) and not (
         self._under_test and
         os.path.basename(dir_path_local_abs) == 'checkdeps'):
-      execfile(deps_file_path, global_scope, local_scope)
+      try:
+        with open(deps_file_path) as file:
+          exec(file.read(), global_scope, local_scope)
+      except Exception as e:
+        print(' Error reading %s: %s' % (deps_file_path, str(e)))
+        raise
     elif self.verbose:
-      print '  No deps file found in', dir_path_local_abs
+      print('  No deps file found in', dir_path_local_abs)
 
     # Even if a DEPS file does not exist we still invoke ApplyRules
     # to apply the implicit "allow" rule for the current directory
@@ -302,7 +310,6 @@ def GetAllRulesAndFiles(self, dir_name=None):
         self._git_source_directories.update(_GitSourceDirectories(repo_path))
 
     # Collect a list of all files and directories to check.
-    files_to_check = []
     if dir_name and not os.path.isabs(dir_name):
       dir_name = os.path.join(self.base_directory, dir_name)
     dirs_to_check = [dir_name or self.base_directory]
@@ -315,6 +322,8 @@ def GetAllRulesAndFiles(self, dir_name=None):
       if self.is_git:
         if NormalizePath(current_dir) not in self._git_source_directories:
           continue
+      elif os.getcwd().startswith('/google/cog/cloud'):
+        pass
       elif not os.path.exists(os.path.join(current_dir, '.svn')):
         continue
 
diff --git a/extern/crashpad/buildtools/checkdeps/checkdeps.py b/extern/crashpad/buildtools/checkdeps/checkdeps.py
old mode 100755
new mode 100644
index 4713dc0f3a..19e0854786
--- a/extern/crashpad/buildtools/checkdeps/checkdeps.py
+++ b/extern/crashpad/buildtools/checkdeps/checkdeps.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python
-# Copyright 2012 The Chromium Authors. All rights reserved.
+#!/usr/bin/env python3
+# Copyright 2012 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -12,6 +12,8 @@
 See README.md for a detailed description of the DEPS format.
 """
 
+
+
 import os
 import optparse
 import re
@@ -30,7 +32,7 @@ def _IsTestFile(filename):
   """Does a rudimentary check to try to skip test files; this could be
   improved but is good enough for now.
   """
-  return re.match('(test|mock|dummy)_.*|.*_[a-z]*test\.(cc|mm|java)', filename)
+  return re.match(r'(test|mock|dummy)_.*|.*_[a-z]*test\.(cc|mm|java)', filename)
 
 
 class DepsChecker(DepsBuilder):
@@ -68,7 +70,7 @@ def Report(self):
     if self.results_formatter.GetResults():
       self.results_formatter.PrintResults()
       return 1
-    print '\nSUCCESS\n'
+    print('\nSUCCESS\n')
     return 0
 
   def CheckDirectory(self, start_dir):
@@ -149,14 +151,16 @@ def CheckAddedCppIncludes(self, added_includes):
     return self.CheckIncludesAndImports(
         added_includes, cpp_checker.CppChecker(self.verbose))
 
-  def CheckAddedJavaImports(self, added_imports, allow_multiple_definitions=None):
+  def CheckAddedJavaImports(self, added_imports,
+                            allow_multiple_definitions=None):
     """This is used from PRESUBMIT.py to check new import statements added in
     the change being presubmit checked.
 
     Args:
       added_imports: ((file_path, (import_line, import_line, ...), ...)
-      allow_multiple_definitions: [file_name, file_name, ...]. List of java file
-                                  names allowing multipe definition in presubmit check.
+      allow_multiple_definitions: [file_name, file_name, ...]. List of java
+                                  file names allowing multiple definitions in
+                                  presubmit check.
 
     Return:
       A list of tuples, (bad_file_path, rule_type, rule_description)
@@ -185,7 +189,7 @@ def CheckAddedProtoImports(self, added_imports):
             verbose=self.verbose, root_dir=self.base_directory))
 
 def PrintUsage():
-  print """Usage: python checkdeps.py [--root <root>] [tocheck]
+  print("""Usage: python checkdeps.py [--root <root>] [tocheck]
 
   --root ROOT Specifies the repository root. This defaults to "../../.."
               relative to the script file. This will be correct given the
@@ -198,7 +202,7 @@ def PrintUsage():
 
 Examples:
   python checkdeps.py
-  python checkdeps.py --root c:\\source chrome"""
+  python checkdeps.py --root c:\\source chrome""")
 
 
 def main():
@@ -266,12 +270,12 @@ def main():
     return 1
 
   if not start_dir.startswith(deps_checker.base_directory):
-    print 'Directory to check must be a subdirectory of the base directory,'
-    print 'but %s is not a subdirectory of %s' % (start_dir, base_directory)
+    print('Directory to check must be a subdirectory of the base directory,')
+    print('but %s is not a subdirectory of %s' % (start_dir, base_directory))
     return 1
 
-  print 'Using base directory:', base_directory
-  print 'Checking:', start_dir
+  print('Using base directory:', base_directory)
+  print('Checking:', start_dir)
 
   if options.generate_temp_rules:
     deps_checker.results_formatter = results.TemporaryRulesFormatter()
diff --git a/extern/crashpad/buildtools/checkdeps/checkdeps_test.py b/extern/crashpad/buildtools/checkdeps/checkdeps_test.py
old mode 100755
new mode 100644
index 8d0588dff3..7409aeffcc
--- a/extern/crashpad/buildtools/checkdeps/checkdeps_test.py
+++ b/extern/crashpad/buildtools/checkdeps/checkdeps_test.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+#!/usr/bin/env python3
+# Copyright 2012 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -31,9 +31,9 @@ def ImplTestRegularCheckDepsRun(self, ignore_temp_rules, skip_tests):
 
     problems = self.deps_checker.results_formatter.GetResults()
     if skip_tests:
-      self.failUnlessEqual(4, len(problems))
+      self.assertEqual(4, len(problems))
     else:
-      self.failUnlessEqual(5, len(problems))
+      self.assertEqual(5, len(problems))
 
     def VerifySubstringsInProblems(key_path, substrings_in_sequence):
       """Finds the problem in |problems| that contains |key_path|,
@@ -48,7 +48,7 @@ def VerifySubstringsInProblems(key_path, substrings_in_sequence):
         if index != -1:
           for substring in substrings_in_sequence:
             index = problem.find(substring, index + 1)
-            self.failUnless(index != -1, '%s in %s' % (substring, problem))
+            self.assertTrue(index != -1, '%s in %s' % (substring, problem))
           found = True
           break
       if not found:
@@ -103,16 +103,16 @@ def CountViolations(self, ignore_temp_rules):
     return self.deps_checker.results_formatter.GetResults()
 
   def testCountViolations(self):
-    self.failUnlessEqual('11', self.CountViolations(False))
+    self.assertEqual('11', self.CountViolations(False))
 
   def testCountViolationsIgnoringTempRules(self):
-    self.failUnlessEqual('12', self.CountViolations(True))
+    self.assertEqual('12', self.CountViolations(True))
 
   def testCountViolationsWithRelativePath(self):
     self.deps_checker.results_formatter = results.CountViolationsFormatter()
     self.deps_checker.CheckDirectory(
         os.path.join('buildtools', 'checkdeps', 'testdata', 'allowed'))
-    self.failUnlessEqual('4', self.deps_checker.results_formatter.GetResults())
+    self.assertEqual('4', self.deps_checker.results_formatter.GetResults())
 
   def testTempRulesGenerator(self):
     self.deps_checker.results_formatter = results.TemporaryRulesFormatter()
@@ -120,12 +120,14 @@ def testTempRulesGenerator(self):
         os.path.join(self.deps_checker.base_directory,
                      'buildtools/checkdeps/testdata/allowed'))
     temp_rules = self.deps_checker.results_formatter.GetResults()
-    expected = [u'  "!buildtools/checkdeps/testdata/disallowed/bad.h",',
-                u'  "!buildtools/checkdeps/testdata/disallowed/teststuff/bad.h",',
-                u'  "!third_party/explicitly_disallowed/bad.h",',
-                u'  "!third_party/no_rule/bad.h",']
-    self.failUnlessEqual(expected, temp_rules)
-
+    expected = ['  "!buildtools/checkdeps/testdata/disallowed/bad.h",',
+                '  "!buildtools/checkdeps/testdata/disallowed/teststuff/bad.h",',
+                '  "!third_party/explicitly_disallowed/bad.h",',
+                '  "!third_party/no_rule/bad.h",']
+    self.assertEqual(expected, temp_rules)
+
+  @unittest.skipIf(os.getcwd().startswith('/google/cog/cloud'),
+                  "Skip if not git")
   def testBadBaseDirectoryNotCheckoutRoot(self):
     # This assumes git. It's not a valid test if buildtools is fetched via svn.
     with self.assertRaises(builddeps.DepsBuilderError):
@@ -138,34 +140,34 @@ def testCheckAddedIncludesAllGood(self):
         ['#include "buildtools/checkdeps/testdata/allowed/good.h"',
          '#include "buildtools/checkdeps/testdata/disallowed/allowed/good.h"']
       ]])
-    self.failIf(problems)
+    self.assertFalse(problems)
 
   def testCheckAddedIncludesManyGarbageLines(self):
     garbage_lines = ["My name is Sam%d\n" % num for num in range(50)]
     problems = self.deps_checker.CheckAddedCppIncludes(
       [['buildtools/checkdeps/testdata/allowed/test.cc', garbage_lines]])
-    self.failIf(problems)
+    self.assertFalse(problems)
 
   def testCheckAddedIncludesNoRule(self):
     problems = self.deps_checker.CheckAddedCppIncludes(
       [['buildtools/checkdeps/testdata/allowed/test.cc',
         ['#include "no_rule_for_this/nogood.h"']
       ]])
-    self.failUnless(problems)
+    self.assertTrue(problems)
 
   def testCheckAddedIncludesSkippedDirectory(self):
     problems = self.deps_checker.CheckAddedCppIncludes(
       [['buildtools/checkdeps/testdata/disallowed/allowed/skipped/test.cc',
         ['#include "whatever/whocares.h"']
       ]])
-    self.failIf(problems)
+    self.assertFalse(problems)
 
   def testCheckAddedIncludesTempAllowed(self):
     problems = self.deps_checker.CheckAddedCppIncludes(
       [['buildtools/checkdeps/testdata/allowed/test.cc',
         ['#include "buildtools/checkdeps/testdata/disallowed/temporarily_allowed.h"']
       ]])
-    self.failUnless(problems)
+    self.assertTrue(problems)
 
   def testCopyIsDeep(self):
     # Regression test for a bug where we were making shallow copies of
@@ -187,26 +189,26 @@ def testCopyIsDeep(self):
        ]])
     # With the bug in place, there would be two problems reported, and
     # the second would be for foo_unittest.cc.
-    self.failUnless(len(problems) == 1)
-    self.failUnless(problems[0][0].endswith('/test.cc'))
+    self.assertTrue(len(problems) == 1)
+    self.assertTrue(problems[0][0].endswith('/test.cc'))
 
   def testTraversalIsOrdered(self):
     dirs_traversed = []
     for rules, filenames in self.deps_checker.GetAllRulesAndFiles(dir_name='buildtools'):
-      self.failUnlessEqual(type(filenames), list)
-      self.failUnlessEqual(filenames, sorted(filenames))
+      self.assertEqual(type(filenames), list)
+      self.assertEqual(filenames, sorted(filenames))
       if filenames:
         dir_names = set(os.path.dirname(file) for file in filenames)
-        self.failUnlessEqual(1, len(dir_names))
+        self.assertEqual(1, len(dir_names))
         dirs_traversed.append(dir_names.pop())
-    self.failUnlessEqual(dirs_traversed, sorted(dirs_traversed))
+    self.assertEqual(dirs_traversed, sorted(dirs_traversed))
 
   def testCheckPartialImportsAreAllowed(self):
     problems = self.deps_checker.CheckAddedProtoImports(
       [['buildtools/checkdeps/testdata/test.proto',
         ['import "no_rule_for_this/nogood.proto"']
       ]])
-    self.failIf(problems)
+    self.assertFalse(problems)
 
   def testCheckAddedFullPathImportsAllowed(self):
     problems = self.deps_checker.CheckAddedProtoImports(
@@ -214,28 +216,28 @@ def testCheckAddedFullPathImportsAllowed(self):
         ['import "buildtools/checkdeps/testdata/allowed/good.proto"',
          'import "buildtools/checkdeps/testdata/disallowed/sub_folder/good.proto"']
       ]])
-    self.failIf(problems)
+    self.assertFalse(problems)
 
   def testCheckAddedFullPathImportsDisallowed(self):
     problems = self.deps_checker.CheckAddedProtoImports(
       [['buildtools/checkdeps/testdata/test.proto',
         ['import "buildtools/checkdeps/testdata/disallowed/bad.proto"']
       ]])
-    self.failUnless(problems)
+    self.assertTrue(problems)
 
   def testCheckAddedFullPathImportsManyGarbageLines(self):
     garbage_lines = ["My name is Sam%d\n" % num for num in range(50)]
     problems = self.deps_checker.CheckAddedProtoImports(
       [['buildtools/checkdeps/testdata/test.proto',
         garbage_lines]])
-    self.failIf(problems)
+    self.assertFalse(problems)
 
   def testCheckAddedIncludesNoRuleFullPath(self):
     problems = self.deps_checker.CheckAddedProtoImports(
       [['buildtools/checkdeps/testdata/test.proto',
         ['import "tools/some.proto"']
       ]])
-    self.failUnless(problems)
+    self.assertTrue(problems)
 
 if __name__ == '__main__':
   unittest.main()
diff --git a/extern/crashpad/buildtools/checkdeps/cpp_checker.py b/extern/crashpad/buildtools/checkdeps/cpp_checker.py
index 3efad9741c..f6d85b8678 100644
--- a/extern/crashpad/buildtools/checkdeps/cpp_checker.py
+++ b/extern/crashpad/buildtools/checkdeps/cpp_checker.py
@@ -1,9 +1,11 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright 2012 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Checks C++ and Objective-C files for illegal includes."""
 
+
+
 import codecs
 import os
 import re
@@ -32,7 +34,7 @@ class CppChecker(object):
   # This regular expression will be used to extract filenames from include
   # statements.
   _EXTRACT_INCLUDE_PATH = re.compile(
-      '[ \t]*#[ \t]*(?:include|import)[ \t]+"(.*)"')
+      r'[ \t]*#[ \t]*(?:include|import)[ \t]*"(.*)"')
 
   def __init__(self, verbose, resolve_dotdot=False, root_dir=''):
     self._verbose = verbose
@@ -64,7 +66,7 @@ def CheckLine(self, rules, line, dependee_path, fail_on_temp_allow=False):
       # Don't fail when no directory is specified. We may want to be more
       # strict about this in the future.
       if self._verbose:
-        print ' WARNING: include specified with no directory: ' + include_path
+        print(' WARNING: include specified with no directory: ' + include_path)
       return True, None
 
     if self._resolve_dotdot and '../' in include_path:
@@ -80,7 +82,7 @@ def CheckLine(self, rules, line, dependee_path, fail_on_temp_allow=False):
 
   def CheckFile(self, rules, filepath):
     if self._verbose:
-      print 'Checking: ' + filepath
+      print('Checking: ' + filepath)
 
     dependee_status = results.DependeeStatus(filepath)
     ret_val = ''  # We'll collect the error messages in here
diff --git a/extern/crashpad/buildtools/checkdeps/graphdeps.py b/extern/crashpad/buildtools/checkdeps/graphdeps.py
old mode 100755
new mode 100644
index aff3c765c8..8031417997
--- a/extern/crashpad/buildtools/checkdeps/graphdeps.py
+++ b/extern/crashpad/buildtools/checkdeps/graphdeps.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python
-# Copyright 2013 The Chromium Authors. All rights reserved.
+#!/usr/bin/env python3
+# Copyright 2013 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -233,7 +233,7 @@ def _DumpDependenciesImpl(self, deps, out):
 
     # Reformat the computed raw node attributes into a final DOT representation.
     nodes = []
-    for (node, attrs) in node_props.iteritems():
+    for (node, attrs) in node_props.items():
       attr_strs = []
       if attrs['hilite']:
         attr_strs.append('style=filled,fillcolor=%s' % attrs['hilite'])
@@ -253,7 +253,7 @@ def _DumpDependenciesImpl(self, deps, out):
 
 
 def PrintUsage():
-  print """Usage: python graphdeps.py [--root <root>]
+  print("""Usage: python graphdeps.py [--root <root>]
 
   --root ROOT Specifies the repository root. This defaults to "../../.."
               relative to the script file. This will be correct given the
@@ -280,7 +280,7 @@ def PrintUsage():
       --excl='.*->third_party' \
       --fanin='^(apps|content/browser/renderer_host)$' \
       --ignore-specific-rules \
-      --ignore-temp-rules"""
+      --ignore-temp-rules""")
 
 
 def main():
@@ -392,11 +392,11 @@ def main():
     PrintUsage()
     return 1
 
-  print 'Using base directory: ', deps_grapher.base_directory
-  print 'include nodes       : ', options.incl
-  print 'exclude nodes       : ', options.excl
-  print 'highlight fanins of : ', options.hilite_fanins
-  print 'highlight fanouts of: ', options.hilite_fanouts
+  print('Using base directory: ', deps_grapher.base_directory)
+  print('include nodes       : ', options.incl)
+  print('exclude nodes       : ', options.excl)
+  print('highlight fanins of : ', options.hilite_fanins)
+  print('highlight fanouts of: ', options.hilite_fanouts)
 
   deps_grapher.DumpDependencies()
   return 0
diff --git a/extern/crashpad/buildtools/checkdeps/java_checker.py b/extern/crashpad/buildtools/checkdeps/java_checker.py
index a5b1db73ff..70e6daf14f 100644
--- a/extern/crashpad/buildtools/checkdeps/java_checker.py
+++ b/extern/crashpad/buildtools/checkdeps/java_checker.py
@@ -1,9 +1,11 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright 2012 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Checks Java files for illegal imports."""
 
+
+
 import codecs
 import os
 import re
@@ -35,7 +37,7 @@ class JavaChecker(object):
 
   # This regular expression will be used to extract filenames from import
   # statements.
-  _EXTRACT_IMPORT_PATH = re.compile('^import\s+(?:static\s+)?([\w\.]+)\s*;')
+  _EXTRACT_IMPORT_PATH = re.compile(r'^import\s+(?:static\s+)?([\w\.]+)\s*;')
 
   def __init__(self, base_directory, verbose, added_imports=None,
                allow_multiple_definitions=None):
@@ -54,7 +56,7 @@ def _GetClassFullName(self, filepath):
     with codecs.open(filepath, encoding='utf-8') as f:
       short_class_name, _ = os.path.splitext(os.path.basename(filepath))
       for line in f:
-        for package in re.findall('^package\s+([\w\.]+);', line):
+        for package in re.findall(r'^package\s+([\w\.]+);', line):
           return package + '.' + short_class_name
 
   def _IgnoreDir(self, d):
@@ -75,10 +77,11 @@ def _IgnoreDir(self, d):
     return False
 
   def _PrescanFiles(self, added_classset):
-    for root, dirs, files in os.walk(self._base_directory.encode('utf-8')):
+    for root, dirs, files in os.walk(self._base_directory):
       # Skip unwanted subdirectories. TODO(husky): it would be better to do
       # this via the skip_child_includes flag in DEPS files. Maybe hoist this
       # prescan logic into checkdeps.py itself?
+      # Modify dirs in-place with slice assignment to avoid recursing into them.
       dirs[:] = [d for d in dirs if not self._IgnoreDir(d)]
       for f in files:
         if f.endswith('.java'):
@@ -112,21 +115,25 @@ def _PrescanImportFiles(self, added_imports):
 
   def _PrescanFile(self, filepath, added_classset):
     if self._verbose:
-      print 'Prescanning: ' + filepath
+      print('Prescanning: ' + filepath)
     full_class_name = self._GetClassFullName(filepath)
     if full_class_name:
       if full_class_name in self._classmap:
         if self._verbose or full_class_name in added_classset:
           if not any(re.match(i, filepath) for i in
                      self._allow_multiple_definitions):
-            print 'WARNING: multiple definitions of %s:' % full_class_name
-            print '    ' + filepath
-            print '    ' + self._classmap[full_class_name]
-            print
+            print('WARNING: multiple definitions of %s:' % full_class_name)
+            print('    ' + filepath)
+            print('    ' + self._classmap[full_class_name])
+            print()
+        # Prefer the public repo when multiple matches are found.
+        if self._classmap[full_class_name].startswith(
+            os.path.join(self._base_directory, 'clank')):
+          self._classmap[full_class_name] = filepath
       else:
         self._classmap[full_class_name] = filepath
     elif self._verbose:
-      print 'WARNING: no package definition found in %s' % filepath
+      print('WARNING: no package definition found in %s' % filepath)
 
   def CheckLine(self, rules, line, filepath, fail_on_temp_allow=False):
     """Checks the given line with the given rule set.
@@ -157,7 +164,7 @@ def CheckLine(self, rules, line, filepath, fail_on_temp_allow=False):
 
   def CheckFile(self, rules, filepath):
     if self._verbose:
-      print 'Checking: ' + filepath
+      print('Checking: ' + filepath)
 
     dependee_status = results.DependeeStatus(filepath)
     with codecs.open(filepath, encoding='utf-8') as f:
diff --git a/extern/crashpad/buildtools/checkdeps/proto_checker.py b/extern/crashpad/buildtools/checkdeps/proto_checker.py
index a90628a6c9..e7a596e61a 100644
--- a/extern/crashpad/buildtools/checkdeps/proto_checker.py
+++ b/extern/crashpad/buildtools/checkdeps/proto_checker.py
@@ -1,9 +1,11 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright 2012 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Checks protobuf files for illegal imports."""
 
+
+
 import codecs
 import os
 import re
@@ -28,7 +30,7 @@ class ProtoChecker(object):
   # This regular expression will be used to extract filenames from import
   # statements.
   _EXTRACT_IMPORT_PATH = re.compile(
-      '[ \t]*[ \t]*import[ \t]+"(.*)"')
+      r'[ \t]*[ \t]*import[ \t]+"(.*)"')
 
   def __init__(self, verbose, resolve_dotdot=False, root_dir=''):
     self._verbose = verbose
@@ -37,7 +39,7 @@ def __init__(self, verbose, resolve_dotdot=False, root_dir=''):
 
   def IsFullPath(self, import_path):
     """Checks if the given path is a valid path starting from |_root_dir|."""
-    match = re.match('(.*)/([^/]*\.proto)', import_path)
+    match = re.match(r'(.*)/([^/]*\.proto)', import_path)
     if not match:
       return False
     return os.path.isdir(self._root_dir + "/" + match.group(1))
@@ -67,7 +69,7 @@ def CheckLine(self, rules, line, dependee_path, fail_on_temp_allow=False):
       # Don't fail when no directory is specified. We may want to be more
       # strict about this in the future.
       if self._verbose:
-        print ' WARNING: import specified with no directory: ' + import_path
+        print(' WARNING: import specified with no directory: ' + import_path)
       return True, None
 
     if self._resolve_dotdot and '../' in import_path:
@@ -87,7 +89,7 @@ def CheckLine(self, rules, line, dependee_path, fail_on_temp_allow=False):
 
   def CheckFile(self, rules, filepath):
     if self._verbose:
-      print 'Checking: ' + filepath
+      print('Checking: ' + filepath)
 
     dependee_status = results.DependeeStatus(filepath)
     last_import = 0
diff --git a/extern/crashpad/buildtools/checkdeps/results.py b/extern/crashpad/buildtools/checkdeps/results.py
index b52880ccca..7b14ab1b51 100644
--- a/extern/crashpad/buildtools/checkdeps/results.py
+++ b/extern/crashpad/buildtools/checkdeps/results.py
@@ -1,11 +1,11 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright 2012 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-
 """Results object and results formatters for checkdeps tool."""
 
 
+
 import json
 
 
@@ -96,9 +96,9 @@ def GetResults(self):
 
   def PrintResults(self):
     for result in self.results:
-      print result
+      print(result)
     if self.results:
-      print '\nFAILED\n'
+      print('\nFAILED\n')
 
 
 class JSONResultsFormatter(ResultsFormatter):
@@ -133,7 +133,7 @@ def PrintResults(self):
       self.wrapped_formatter.PrintResults()
       return
 
-    print self.results
+    print(self.results)
 
 
 class TemporaryRulesFormatter(ResultsFormatter):
@@ -154,7 +154,7 @@ def GetResults(self):
 
   def PrintResults(self):
     for result in self.GetResults():
-      print result
+      print(result)
 
 
 class CountViolationsFormatter(ResultsFormatter):
@@ -175,4 +175,4 @@ def GetResults(self):
     return '%d' % self.count
 
   def PrintResults(self):
-    print self.count
+    print(self.count)
diff --git a/extern/crashpad/buildtools/checkdeps/rules.py b/extern/crashpad/buildtools/checkdeps/rules.py
index dd3884db22..8464a062b2 100644
--- a/extern/crashpad/buildtools/checkdeps/rules.py
+++ b/extern/crashpad/buildtools/checkdeps/rules.py
@@ -1,4 +1,4 @@
-# Copyright 2012 The Chromium Authors. All rights reserved.
+# Copyright 2012 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -79,8 +79,8 @@ def ParseRuleString(rule_string, source):
   # Ban them.
   if rule_string[-1] == '/':
     raise Exception(
-      'The rule string "%s" ends with a "/" which is not allowed' %
-      rule_string)
+      'The rule string "%s" ends with a "/" which is not allowed.'
+      ' Please remove the trailing "/".' % rule_string)
 
   return rule_string[0], rule_string[1:]
 
@@ -112,7 +112,7 @@ def __init__(self):
   def __str__(self):
     result = ['Rules = {\n    (apply to all files): [\n%s\n    ],' % '\n'.join(
         '      %s' % x for x in self._general_rules)]
-    for regexp, rules in self._specific_rules.iteritems():
+    for regexp, rules in list(self._specific_rules.items()):
       result.append('    (limited to files matching %s): [\n%s\n    ]' % (
           regexp, '\n'.join('      %s' % x for x in rules)))
     result.append('  }')
@@ -132,7 +132,7 @@ def AddDependencyTuplesImpl(deps, rules, extra_dependent_suffix=""):
     if include_general_rules:
       AddDependencyTuplesImpl(deps, self._general_rules)
     if include_specific_rules:
-      for regexp, rules in self._specific_rules.iteritems():
+      for regexp, rules in list(self._specific_rules.items()):
         AddDependencyTuplesImpl(deps, rules, "/" + regexp)
     return deps
 
@@ -175,7 +175,7 @@ def RuleApplyingTo(self, include_path, dependee_path):
     file located at |dependee_path|.
     """
     dependee_filename = os.path.basename(dependee_path)
-    for regexp, specific_rules in self._specific_rules.iteritems():
+    for regexp, specific_rules in list(self._specific_rules.items()):
       if re.match(regexp, dependee_filename):
         for rule in specific_rules:
           if rule.ChildOrMatch(include_path):
diff --git a/extern/crashpad/buildtools/checkdeps/testdata/allowed/foo_unittest.cc b/extern/crashpad/buildtools/checkdeps/testdata/allowed/foo_unittest.cc
index eab25d1740..7a888b77f7 100644
--- a/extern/crashpad/buildtools/checkdeps/testdata/allowed/foo_unittest.cc
+++ b/extern/crashpad/buildtools/checkdeps/testdata/allowed/foo_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/buildtools/checkdeps/testdata/allowed/not_a_test.cc b/extern/crashpad/buildtools/checkdeps/testdata/allowed/not_a_test.cc
index 07ed9cdf2b..7cc89c6c83 100644
--- a/extern/crashpad/buildtools/checkdeps/testdata/allowed/not_a_test.cc
+++ b/extern/crashpad/buildtools/checkdeps/testdata/allowed/not_a_test.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/buildtools/checkdeps/testdata/allowed/test.h b/extern/crashpad/buildtools/checkdeps/testdata/allowed/test.h
index fb542a622d..9561316359 100644
--- a/extern/crashpad/buildtools/checkdeps/testdata/allowed/test.h
+++ b/extern/crashpad/buildtools/checkdeps/testdata/allowed/test.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/buildtools/checkdeps/testdata/checkdeps_test/allowed/foo_unittest.cc b/extern/crashpad/buildtools/checkdeps/testdata/checkdeps_test/allowed/foo_unittest.cc
index 1a507eca4e..d651b8305e 100644
--- a/extern/crashpad/buildtools/checkdeps/testdata/checkdeps_test/allowed/foo_unittest.cc
+++ b/extern/crashpad/buildtools/checkdeps/testdata/checkdeps_test/allowed/foo_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/buildtools/checkdeps/testdata/checkdeps_test/allowed/not_a_test.cc b/extern/crashpad/buildtools/checkdeps/testdata/checkdeps_test/allowed/not_a_test.cc
index 4278d64763..34459e48e6 100644
--- a/extern/crashpad/buildtools/checkdeps/testdata/checkdeps_test/allowed/not_a_test.cc
+++ b/extern/crashpad/buildtools/checkdeps/testdata/checkdeps_test/allowed/not_a_test.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/buildtools/checkdeps/testdata/checkdeps_test/allowed/test.h b/extern/crashpad/buildtools/checkdeps/testdata/checkdeps_test/allowed/test.h
index 2dbd7a38b4..6cfaf630ea 100644
--- a/extern/crashpad/buildtools/checkdeps/testdata/checkdeps_test/allowed/test.h
+++ b/extern/crashpad/buildtools/checkdeps/testdata/checkdeps_test/allowed/test.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/buildtools/checkdeps/testdata/checkdeps_test/disallowed/allowed/skipped/test.h b/extern/crashpad/buildtools/checkdeps/testdata/checkdeps_test/disallowed/allowed/skipped/test.h
index 80105968e2..a4c8c91faa 100644
--- a/extern/crashpad/buildtools/checkdeps/testdata/checkdeps_test/disallowed/allowed/skipped/test.h
+++ b/extern/crashpad/buildtools/checkdeps/testdata/checkdeps_test/disallowed/allowed/skipped/test.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/buildtools/checkdeps/testdata/checkdeps_test/disallowed/allowed/test.h b/extern/crashpad/buildtools/checkdeps/testdata/checkdeps_test/disallowed/allowed/test.h
index aa5013d25d..3d69f52d86 100644
--- a/extern/crashpad/buildtools/checkdeps/testdata/checkdeps_test/disallowed/allowed/test.h
+++ b/extern/crashpad/buildtools/checkdeps/testdata/checkdeps_test/disallowed/allowed/test.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/buildtools/checkdeps/testdata/checkdeps_test/disallowed/test.h b/extern/crashpad/buildtools/checkdeps/testdata/checkdeps_test/disallowed/test.h
index 5520a68c8f..5913a2fb3f 100644
--- a/extern/crashpad/buildtools/checkdeps/testdata/checkdeps_test/disallowed/test.h
+++ b/extern/crashpad/buildtools/checkdeps/testdata/checkdeps_test/disallowed/test.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/buildtools/checkdeps/testdata/disallowed/allowed/skipped/test.h b/extern/crashpad/buildtools/checkdeps/testdata/disallowed/allowed/skipped/test.h
index 80105968e2..a4c8c91faa 100644
--- a/extern/crashpad/buildtools/checkdeps/testdata/disallowed/allowed/skipped/test.h
+++ b/extern/crashpad/buildtools/checkdeps/testdata/disallowed/allowed/skipped/test.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/buildtools/checkdeps/testdata/disallowed/allowed/test.h b/extern/crashpad/buildtools/checkdeps/testdata/disallowed/allowed/test.h
index 40bc1fb0e5..f5d61507ed 100644
--- a/extern/crashpad/buildtools/checkdeps/testdata/disallowed/allowed/test.h
+++ b/extern/crashpad/buildtools/checkdeps/testdata/disallowed/allowed/test.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/buildtools/checkdeps/testdata/disallowed/foo_unittest.cc b/extern/crashpad/buildtools/checkdeps/testdata/disallowed/foo_unittest.cc
index cdf295ca39..b1faa35759 100644
--- a/extern/crashpad/buildtools/checkdeps/testdata/disallowed/foo_unittest.cc
+++ b/extern/crashpad/buildtools/checkdeps/testdata/disallowed/foo_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/buildtools/checkdeps/testdata/disallowed/test.h b/extern/crashpad/buildtools/checkdeps/testdata/disallowed/test.h
index 4af2bd989c..916a7185dd 100644
--- a/extern/crashpad/buildtools/checkdeps/testdata/disallowed/test.h
+++ b/extern/crashpad/buildtools/checkdeps/testdata/disallowed/test.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/buildtools/checkdeps/testdata/noparent/test.h b/extern/crashpad/buildtools/checkdeps/testdata/noparent/test.h
index 2f0dbbf227..65258368a0 100644
--- a/extern/crashpad/buildtools/checkdeps/testdata/noparent/test.h
+++ b/extern/crashpad/buildtools/checkdeps/testdata/noparent/test.h
@@ -1,4 +1,4 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
+// Copyright 2018 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/buildtools/clang_format/README.chromium b/extern/crashpad/buildtools/clang_format/README.chromium
index 03f9c92595..6324f53171 100644
--- a/extern/crashpad/buildtools/clang_format/README.chromium
+++ b/extern/crashpad/buildtools/clang_format/README.chromium
@@ -1,12 +1,12 @@
 Name: clang-format
 Short Name: clang-format
-URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-format/
-Version: 8.0.0
-Date: 15 November 2018
-Revision: See DEPS
-License: University of Illinois/NCSA Open Source License
-License File: NOT_SHIPPED
+URL: https://github.com/llvm/llvm-project/tree/main/clang/tools/clang-format
+Version: llvmorg-17-init-4759-g547e3456
+Date: 21 March 2023
+Revision: llvmorg-17-init-4759-g547e3456
+License: Apache 2.0 / University of Illinois/NCSA Open Source License
 Security Critical: No
+Shipped: no
 
 Description:
 A tool for formatting C++ code to style.
diff --git a/extern/crashpad/buildtools/clang_format/README.txt b/extern/crashpad/buildtools/clang_format/README.txt
index 29b446ce5d..20e72c3225 100644
--- a/extern/crashpad/buildtools/clang_format/README.txt
+++ b/extern/crashpad/buildtools/clang_format/README.txt
@@ -2,7 +2,7 @@ This folder contains clang-format scripts. The binaries will be automatically
 downloaded from Google Storage by gclient runhooks for the current platform.
 
 For a walkthrough on how to maintain these binaries:
-  https://chromium.googlesource.com/chromium/src/+/master/docs/updating_clang_format_binaries.md
+  https://chromium.googlesource.com/chromium/src/+/main/docs/updating_clang_format_binaries.md
 
 To upload a file:
   python ~/depot_tools/upload_to_google_storage.py -b chromium-clang-format <FILENAME>
diff --git a/extern/crashpad/buildtools/deps_revisions.gni b/extern/crashpad/buildtools/deps_revisions.gni
index caed65f377..f7df5d5473 100644
--- a/extern/crashpad/buildtools/deps_revisions.gni
+++ b/extern/crashpad/buildtools/deps_revisions.gni
@@ -1,9 +1,9 @@
-# Copyright 2018 The Chromium Authors. All rights reserved.
+# Copyright 2018 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 declare_args() {
-  # The libc++ svn revision that belongs to the git hash in DEPS. Used to cause
-  # full rebuilds on libc++ rolls.
-  libcxx_svn_revision = "375504"
+  # Used to cause full rebuilds on libc++ rolls. This should be kept in sync
+  # with the libcxx_revision vars in //DEPS.
+  libcxx_revision = "852bc6746f45add53fec19f3a29280e69e358d44"
 }
diff --git a/extern/crashpad/buildtools/ensure_gn_version.py b/extern/crashpad/buildtools/ensure_gn_version.py
deleted file mode 100755
index cfc75a3779..0000000000
--- a/extern/crashpad/buildtools/ensure_gn_version.py
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/usr/bin/env python
-# Copyright 2019 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Ensure that CIPD fetched the right GN version.
-
-Due to crbug.com/944367, using cipd in gclient to fetch GN binaries
-may not always work right. This is a script that can be used as
-a backup method to force-install GN at the right revision, just in case.
-
-It should be used as a gclient hook alongside fetching GN via CIPD
-until we have a proper fix in place.
-
-TODO(crbug.com/944667): remove this script when it is no longer needed.
-"""
-
-from __future__ import print_function
-
-import argparse
-import errno
-import io
-import os
-import re
-import stat
-import subprocess
-import sys
-
-try:
-  import urllib2 as urllib
-except ImportError:
-  import urllib.request as urllib
-
-import zipfile
-
-
-BUILDTOOLS_DIR = os.path.abspath(os.path.dirname(__file__))
-SRC_DIR = os.path.dirname(BUILDTOOLS_DIR)
-
-def ChmodGnFile(path_to_exe):
-  """Makes the gn binary executable for all and writable for the user."""
-  os.chmod(path_to_exe,
-           stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR |  # This is 0o755.
-           stat.S_IRGRP | stat.S_IXGRP |
-           stat.S_IROTH | stat.S_IXOTH)
-
-def main():
-  parser = argparse.ArgumentParser()
-  parser.add_argument('version',
-          help='CIPD "git_revision:XYZ" label for GN to sync to')
-
-  args = parser.parse_args()
-
-  if not args.version.startswith('git_revision:'):
-    print('Unknown version format: %s' % args.version)
-    return 2
-
-  desired_revision = args.version[len('git_revision:'):]
-
-  if sys.platform == 'darwin':
-    platform, member, dest_dir = ('mac-amd64', 'gn', 'mac')
-  elif sys.platform == 'win32':
-    platform, member, dest_dir = ('windows-amd64', 'gn.exe', 'win')
-  else:
-    platform, member, dest_dir = ('linux-amd64', 'gn', 'linux64')
-
-  path_to_exe = os.path.join(BUILDTOOLS_DIR, dest_dir, member)
-  cmd = [path_to_exe, '--version']
-  cmd_str = ' '.join(cmd)
-  try:
-    out = subprocess.check_output(cmd,
-                                  stderr=subprocess.STDOUT,
-                                  cwd=SRC_DIR).decode(errors='replace')
-  except subprocess.CalledProcessError as e:
-    print('`%s` returned %d:\n%s' % (cmd_str, e.returncode, e.output))
-    return 1
-  except OSError as e:
-    if e.errno != errno.ENOENT:
-      print('`%s` failed:\n%s' % (cmd_str, e.strerror))
-      return 1
-
-    # The tool doesn't exist, so redownload it.
-    out = ''
-
-  if out:
-    current_revision_match = re.findall(r'\((.*)\)', out)
-    if current_revision_match:
-      current_revision = current_revision_match[0]
-      if desired_revision.startswith(current_revision):
-        # We're on the right version, so we're done.
-        return 0
-
-  print("`%s` returned '%s', which wasn't what we were expecting."
-          % (cmd_str, out.strip()))
-  print("Force-installing %s to update it." % desired_revision)
-
-  url = 'https://chrome-infra-packages.appspot.com/dl/gn/gn/%s/+/%s' % (
-      platform, args.version)
-  try:
-    zipdata = urllib.urlopen(url).read()
-  except urllib.HTTPError as e:
-    print('Failed to download the package from %s: %d %s' % (
-        url, e.code, e.reason))
-    return 1
-
-  try:
-    # Make the existing file writable so that we can overwrite it.
-    ChmodGnFile(path_to_exe)
-  except OSError as e:
-    if e.errno != errno.ENOENT:
-      print('Failed to make %s writable:\n%s\n' % (path_to_exe, e.strerror))
-      return 1
-
-  try:
-    zf = zipfile.ZipFile(io.BytesIO(zipdata))
-    zf.extract(member, os.path.join(BUILDTOOLS_DIR, dest_dir))
-  except OSError as e:
-    print('Failed to extract the binary:\n%s\n' % e.strerror)
-    return 1
-  except (zipfile.LargeZipFile, zipfile.BadZipfile) as e:
-    print('Zip containing gn was corrupt:\n%s\n' % e)
-    return 1
-
-  try:
-    ChmodGnFile(path_to_exe)
-  except OSError as e:
-    print('Failed to make %s executable:\n%s\n' % (path_to_exe, e.strerror))
-    return 1
-
-  return 0
-
-
-if __name__ == '__main__':
-  sys.exit(main())
diff --git a/extern/crashpad/buildtools/linux64/clang-format.sha1 b/extern/crashpad/buildtools/linux64/clang-format.sha1
index 62b2d60b58..3adca70687 100644
--- a/extern/crashpad/buildtools/linux64/clang-format.sha1
+++ b/extern/crashpad/buildtools/linux64/clang-format.sha1
@@ -1 +1 @@
-1baf0089e895c989a311b6a38ed94d0e8be4c0a7
\ No newline at end of file
+b42097ca924d1f1736a5a7806068fed9d7345eb4
\ No newline at end of file
diff --git a/extern/crashpad/buildtools/linux64/gn b/extern/crashpad/buildtools/linux64/gn
deleted file mode 100755
index adf0a6431e..0000000000
Binary files a/extern/crashpad/buildtools/linux64/gn and /dev/null differ
diff --git a/extern/crashpad/buildtools/mac/clang-format.arm64.sha1 b/extern/crashpad/buildtools/mac/clang-format.arm64.sha1
new file mode 100644
index 0000000000..15102f552a
--- /dev/null
+++ b/extern/crashpad/buildtools/mac/clang-format.arm64.sha1
@@ -0,0 +1 @@
+96c34e77259c4cc1fc7bdf067fc058bfd341ab85
\ No newline at end of file
diff --git a/extern/crashpad/buildtools/mac/clang-format.sha1 b/extern/crashpad/buildtools/mac/clang-format.sha1
deleted file mode 100644
index 5ef063b160..0000000000
--- a/extern/crashpad/buildtools/mac/clang-format.sha1
+++ /dev/null
@@ -1 +0,0 @@
-62bde1baa7196ad9df969fc1f06b66360b1a927b
\ No newline at end of file
diff --git a/extern/crashpad/buildtools/mac/clang-format.x64.sha1 b/extern/crashpad/buildtools/mac/clang-format.x64.sha1
new file mode 100644
index 0000000000..7efbcc0500
--- /dev/null
+++ b/extern/crashpad/buildtools/mac/clang-format.x64.sha1
@@ -0,0 +1 @@
+0b4bd257a1f4cd27d27d6919b0f9e52ecdfa8f1e
\ No newline at end of file
diff --git a/extern/crashpad/buildtools/mac/gn b/extern/crashpad/buildtools/mac/gn
deleted file mode 100755
index 24d887843e..0000000000
Binary files a/extern/crashpad/buildtools/mac/gn and /dev/null differ
diff --git a/extern/crashpad/buildtools/reclient_cfgs/.gitignore b/extern/crashpad/buildtools/reclient_cfgs/.gitignore
new file mode 100644
index 0000000000..12d51d89d6
--- /dev/null
+++ b/extern/crashpad/buildtools/reclient_cfgs/.gitignore
@@ -0,0 +1,5 @@
+/chromium-browser-clang/
+/nacl/
+/python/
+/win-cross/
+reproxy.cfg
diff --git a/extern/crashpad/buildtools/reclient_cfgs/.style.yapf b/extern/crashpad/buildtools/reclient_cfgs/.style.yapf
new file mode 100644
index 0000000000..1d02278eff
--- /dev/null
+++ b/extern/crashpad/buildtools/reclient_cfgs/.style.yapf
@@ -0,0 +1,3 @@
+[style]
+based_on_style = pep8
+
diff --git a/extern/crashpad/buildtools/reclient_cfgs/OWNERS b/extern/crashpad/buildtools/reclient_cfgs/OWNERS
new file mode 100644
index 0000000000..e43d152b54
--- /dev/null
+++ b/extern/crashpad/buildtools/reclient_cfgs/OWNERS
@@ -0,0 +1,2 @@
+include ../../infra/config/groups/chrome-build/OWNERS
+include ../../infra/config/groups/foundry-x/OWNERS
diff --git a/extern/crashpad/buildtools/reclient_cfgs/README.md b/extern/crashpad/buildtools/reclient_cfgs/README.md
new file mode 100644
index 0000000000..ecab8824a1
--- /dev/null
+++ b/extern/crashpad/buildtools/reclient_cfgs/README.md
@@ -0,0 +1 @@
+This directory contains the config files accepted by re-client's rewrapper command in place of inline flags.
diff --git a/extern/crashpad/buildtools/reclient_cfgs/configure_reclient_cfgs.py b/extern/crashpad/buildtools/reclient_cfgs/configure_reclient_cfgs.py
new file mode 100644
index 0000000000..672f5a9957
--- /dev/null
+++ b/extern/crashpad/buildtools/reclient_cfgs/configure_reclient_cfgs.py
@@ -0,0 +1,385 @@
+#!/usr/bin/env python3
+# Copyright 2021 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""This script is used to fetch reclient cfgs."""
+
+import argparse
+import glob
+import logging
+import os
+import posixpath
+import re
+import shutil
+import string
+import subprocess
+import sys
+
+THIS_DIR = os.path.abspath(os.path.dirname(__file__))
+CHROMIUM_SRC = os.path.abspath(os.path.join(THIS_DIR, "..", ".."))
+REPROXY_CFG_PATH = os.path.join(THIS_DIR, "reproxy.cfg")
+
+REPROXY_CFG_HEADER = """# AUTOGENERATED FILE - DO NOT EDIT
+# Generated by configure_reclient_cfgs.py
+# To edit:
+# Update reproxy_cfg_templates/$reproxy_cfg_template
+# And run 'gclient sync' or 'gclient runhooks'
+"""
+
+AUTO_AUTH_FLAGS = """
+# Googler auth flags
+experimental_credentials_helper={credshelper}
+experimental_credentials_helper_args={args}
+""".format(credshelper=os.path.join(CHROMIUM_SRC, "buildtools", "reclient",
+                                    "credshelper"),
+           args="--auth_source=automaticAuth --gcert_refresh_timeout=20")
+
+ADC_AUTH_FLAGS = """
+# ADC auth flags
+use_application_default_credentials=true
+"""
+
+GCLOUD_AUTH_FLAGS = """
+use_external_auth_token=true
+experimental_credentials_helper={credshelper}
+experimental_credentials_helper_args={args}
+""".format(credshelper=os.path.join(CHROMIUM_SRC, "buildtools", "reclient",
+                                    "credshelper"),
+           args="--auth_source=gcloud")
+
+LUCI_AUTH_CREDSHELPER_FLAGS = """
+experimental_credentials_helper={credshelper}
+experimental_credentials_helper_args={args}
+""".format(
+    credshelper=os.path.join("luci-auth"),
+    args=" ".join([
+        "token",
+        "-scopes-context",
+        "-json-output=-",
+        "-json-format=reclient",
+        "-lifetime=5m",
+    ]),
+)
+
+
+def ClangRevision():
+    sys.path.insert(0, os.path.join(CHROMIUM_SRC, "tools", "clang", "scripts"))
+    import update
+    sys.path.pop(0)
+    return update.PACKAGE_VERSION
+
+
+def NaclRevision():
+    nacl_dir = os.path.join(CHROMIUM_SRC, "native_client")
+    # With git submodules, nacl_dir will always exist, regardless if it is
+    # cloned or not. To detect if nacl is actually cloned, check content of the
+    # repository. We assume that if README.md exists, then the repository is
+    # cloned.
+    if not os.path.exists(os.path.join(nacl_dir, "README.md")):
+        return None
+
+    if os.path.isdir(os.path.join(nacl_dir, ".git")):
+        remote_host = subprocess.run(["git", "ls-remote", "--get-url"],
+                                     cwd=nacl_dir,
+                                     shell=os.name == "nt",
+                                     text=True,
+                                     stdout=subprocess.PIPE).stdout.strip()
+        # check nacl dir is checkout of native_client.
+        if re.match(".*native_client.*", remote_host):
+            return subprocess.run(
+                ["git", "log", "-1", "--format=%H"],
+                cwd=nacl_dir,
+                shell=os.name == "nt",
+                text=True,
+                check=True,
+                stdout=subprocess.PIPE,
+            ).stdout.strip()
+        else:
+            logging.warning(
+                'unexpected remote host for native_client dir: %s' %
+                remote_host)
+
+    # If we're in a work tree without .git directories, we can fallback to
+    # the slower method of looking the revision up via `gclient revinfo`.
+    gclient_env = os.environ.copy()
+    gclient_env["DEPOT_TOOLS_UPDATE"] = "0"
+    revinfo = subprocess.run(
+        ["gclient", "revinfo", "--filter=src/native_client"],
+        shell=os.name == "nt",
+        text=True,
+        check=True,
+        stdout=subprocess.PIPE,
+        env=gclient_env,
+    ).stdout.strip()
+    try:
+        # We expect this format: "src/native_client: {url}@{commit}"
+        commit = revinfo.split("@")[1]
+        if not re.match("^[0-9a-f]{40,}$", commit):
+            raise ValueError("invalid commit hash")
+        return commit
+    except (IndexError, ValueError):
+        logging.warning(
+            "Could not parse output of 'gclient revinfo "
+            "--filter=src/native_client': %s",
+            revinfo if revinfo else "<empty>")
+        logging.warning("src/native_client seems present, but neither Git "
+                        "nor gclient know its revision?")
+
+    return None
+
+
+class CipdError(Exception):
+    """Raised by configure_reclient_cfgs on fatal cipd error."""
+
+
+class CipdAuthError(CipdError):
+    """Raised by configure_reclient_cfgs on cipd auth error."""
+
+
+def CipdEnsure(pkg_name, ref, directory, quiet):
+    logging.info("ensure %s %s in %s", pkg_name, ref, directory)
+    log_level = "warning" if quiet else "info"
+    ensure_file = """
+$ParanoidMode CheckIntegrity
+{pkg} {ref}
+""".format(pkg=pkg_name, ref=ref)
+    try:
+        output = subprocess.check_output(
+            " ".join([
+                "cipd", "ensure", "-log-level=" + log_level, "-root",
+                directory, "-ensure-file", "-"
+            ]),
+            shell=True,
+            input=ensure_file,
+            stderr=subprocess.STDOUT,
+            universal_newlines=True,
+        )
+        logging.info(output)
+    except subprocess.CalledProcessError as e:
+        if not IsCipdLoggedIn():
+            raise CipdAuthError(e.output) from e
+        raise CipdError(e.output) from e
+
+
+def IsCipdLoggedIn():
+    ps = subprocess.run(
+        ' '.join(['cipd', 'auth-info']),
+        shell=True, capture_output=True, text=True)
+    logging.warning(
+        "log for http://b/304677840: stdout from cipd auth-info: %s",
+        ps.stdout)
+    logging.warning(
+        "log for http://b/304677840: stderr from cipd auth-info: %s",
+        ps.stderr)
+    return ps.returncode == 0
+
+
+def RbeProjectFromInstance(instance):
+    m = re.fullmatch(r"projects/([-\w]+)/instances/[-\w]+", instance)
+    if not m:
+        return None
+    return m.group(1)
+
+
+def GenerateReproxyCfg(reproxy_cfg_template, rbe_instance, rbe_project,
+                       use_luci_auth):
+    tmpl_path = os.path.join(THIS_DIR, "reproxy_cfg_templates",
+                             reproxy_cfg_template)
+    logging.info(f"generate reproxy.cfg using {tmpl_path}")
+    if not os.path.isfile(tmpl_path):
+        logging.warning(f"{tmpl_path} does not exist")
+        return False
+    with open(tmpl_path) as f:
+        reproxy_cfg_tmpl = string.Template(REPROXY_CFG_HEADER + f.read())
+    depsscanner_address = "exec://" + os.path.join(
+        CHROMIUM_SRC, "buildtools", "reclient", "scandeps_server")
+    auth_flags = AUTO_AUTH_FLAGS
+    if sys.platform.startswith("win"):
+        depsscanner_address += ".exe"
+        auth_flags = ADC_AUTH_FLAGS
+    if sys.platform == "darwin":
+        auth_flags = GCLOUD_AUTH_FLAGS
+    if use_luci_auth:
+        auth_flags = LUCI_AUTH_CREDSHELPER_FLAGS
+
+    reproxy_cfg = reproxy_cfg_tmpl.substitute({
+        "rbe_instance": rbe_instance,
+        "rbe_project": rbe_project,
+        "reproxy_cfg_template": reproxy_cfg_template,
+        "depsscanner_address": depsscanner_address,
+        "auth_flags": auth_flags,
+    })
+    with open(REPROXY_CFG_PATH, "w") as f:
+        f.write(reproxy_cfg)
+    return True
+
+
+def RequestCipdAuthentication():
+    """Requests that the user authenticate to access CIPD packages."""
+
+    print("Access to remoteexec config CIPD package requires authentication.")
+    print("-----------------------------------------------------------------")
+    print()
+    print("I'm sorry for the hassle, but you may need to do a one-time manual")
+    print("authentication. Please run:")
+    print()
+    print("    cipd auth-login")
+    print()
+    print("and follow the instructions.")
+    print()
+    print("NOTE: Use your google.com credentials, not chromium.org.")
+    print()
+    print("-----------------------------------------------------------------")
+    print()
+    sys.stdout.flush()
+
+
+def ReadConfig():
+    entries = {}
+    if not os.path.isfile(REPROXY_CFG_PATH):
+        logging.error('The reproxy.cfg file has not been generated yet')
+        return entries
+    with open(REPROXY_CFG_PATH, 'r') as f:
+        for line in f:
+            parts = line.strip().split('=')
+            if len(parts) > 1:
+                entries[parts[0].strip()] = parts[1].strip()
+        return entries
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        description="configure reclient cfgs",
+        formatter_class=argparse.RawTextHelpFormatter,
+    )
+    parser.add_argument(
+        "--rewrapper_cfg_project",
+        "--rbe_project",
+        help="RBE instance project id for rewrapper configs. "
+        "Only specify if different from --rbe_instance\n"
+        "TODO(b/270201776) --rbe_project is deprecated, "
+        "remove once no more usages exist",
+    )
+    parser.add_argument(
+        "--reproxy_cfg_template",
+        help="If set REPROXY_CFG_TEMPLATE will be used to "
+        "generate reproxy.cfg. --rbe_instance must be "
+        "specified.",
+    )
+    parser.add_argument(
+        "--rbe_instance",
+        help="RBE instance for rewrapper and reproxy configs",
+        default=os.environ.get("RBE_instance"),
+    )
+    parser.add_argument(
+        "--cipd_prefix",
+        help="cipd package name prefix",
+        default="infra_internal/rbe/reclient_cfgs",
+    )
+    parser.add_argument(
+        "--skip_remoteexec_cfg_fetch",
+        help="skip downloading reclient cfgs from CIPD server",
+        action="store_true",
+    )
+    parser.add_argument(
+        "--use_luci_auth_credshelper",
+        help="use luci_auth in credshelper mode for authentication",
+        action="store_true",
+    )
+    parser.add_argument("--quiet",
+                        help="Suppresses info logs",
+                        action="store_true")
+    parser.add_argument("--get-rbe-instance",
+                        help="Print the currently configured rbe instance to "
+                        "stdout",
+                        action="store_true")
+
+    args = parser.parse_args()
+
+    logging.basicConfig(
+        level=logging.WARNING if args.quiet else logging.INFO,
+        format="%(message)s",
+    )
+
+    if not args.rewrapper_cfg_project and not args.rbe_instance and not args.get_rbe_instance:
+        logging.error(
+            "At least one of --rbe_instance, --rewrapper_cfg_project or "
+            "--get-rbe-instance must be provided")
+        return 1
+
+    if args.get_rbe_instance:
+        config = ReadConfig()
+        # This makes the assumption the $rbe_instance is saved under "instance"
+        # in the original template
+        if not "instance" in config:
+            return 1
+        logging.info(config["instance"])
+        return 0
+
+    rbe_project = args.rewrapper_cfg_project
+    if not args.rewrapper_cfg_project:
+        rbe_project = RbeProjectFromInstance(args.rbe_instance)
+
+    if args.reproxy_cfg_template:
+        if not args.rbe_instance:
+            logging.error(
+                "--rbe_instance is required if --reproxy_cfg_template is set")
+            return 1
+        if not GenerateReproxyCfg(args.reproxy_cfg_template, args.rbe_instance,
+                                  rbe_project, args.use_luci_auth_credshelper):
+            return 1
+
+    if args.skip_remoteexec_cfg_fetch:
+        return 0
+
+    logging.info("fetch reclient_cfgs for RBE project %s..." % rbe_project)
+
+    cipd_prefix = posixpath.join(args.cipd_prefix, rbe_project)
+
+    tool_revisions = {
+        "chromium-browser-clang": ClangRevision(),
+        "nacl": NaclRevision(),
+        "python": "3.8.0",
+    }
+    for toolchain in tool_revisions:
+        revision = tool_revisions[toolchain]
+        if not revision:
+            logging.info("failed to detect %s revision" % toolchain)
+            continue
+
+        toolchain_root = os.path.join(THIS_DIR, toolchain)
+        cipd_ref = "revision/" + revision
+        # 'cipd ensure' initializes the directory.
+        try:
+            CipdEnsure(
+                posixpath.join(cipd_prefix, toolchain),
+                ref=cipd_ref,
+                directory=toolchain_root,
+                quiet=args.quiet,
+            )
+        except CipdAuthError as e:
+            RequestCipdAuthentication()
+            return 1
+        except CipdError as e:
+            logging.error(e)
+            return 1
+        win_cross_cfg_dir = "win-cross"
+        wcedir = os.path.join(THIS_DIR, win_cross_cfg_dir, toolchain)
+        if not os.path.exists(wcedir):
+            os.makedirs(wcedir, mode=0o755)
+        if os.path.exists(os.path.join(toolchain_root, win_cross_cfg_dir)):
+            # copy in win-cross/toolchain
+            # as windows may not use symlinks.
+            for cfg in glob.glob(
+                    os.path.join(toolchain_root, win_cross_cfg_dir, "*.cfg")):
+                fname = os.path.join(wcedir, os.path.basename(cfg))
+                if os.path.exists(fname):
+                    os.chmod(fname, 0o777)
+                    os.remove(fname)
+                logging.info("Copy from %s to %s..." % (cfg, fname))
+                shutil.copy(cfg, fname)
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/extern/crashpad/buildtools/reclient_cfgs/fetch_reclient_cfgs.py b/extern/crashpad/buildtools/reclient_cfgs/fetch_reclient_cfgs.py
new file mode 100644
index 0000000000..4f136f5ae0
--- /dev/null
+++ b/extern/crashpad/buildtools/reclient_cfgs/fetch_reclient_cfgs.py
@@ -0,0 +1,16 @@
+#!/usr/bin/env python3
+# Copyright 2021 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""This script is used to fetch reclient cfgs.
+
+This is renamed to configure_reclient_cfgs.py, delete this file if there are no
+reference to this file.
+"""
+
+import sys
+
+import configure_reclient_cfgs
+
+if __name__ == '__main__':
+    sys.exit(configure_reclient_cfgs.main())
diff --git a/extern/crashpad/buildtools/reclient_cfgs/linux/chromium-browser-clang/rewrapper_linux.cfg b/extern/crashpad/buildtools/reclient_cfgs/linux/chromium-browser-clang/rewrapper_linux.cfg
new file mode 100644
index 0000000000..b2ec06d55b
--- /dev/null
+++ b/extern/crashpad/buildtools/reclient_cfgs/linux/chromium-browser-clang/rewrapper_linux.cfg
@@ -0,0 +1,8 @@
+platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:26de99218a1a8b527d4840490bcbf1690ee0b55c84316300b60776e6b3a03fe1,label:action_default=1
+server_address=unix:///tmp/reproxy.sock
+labels=type=compile,compiler=clang,lang=cpp
+exec_strategy=racing
+dial_timeout=10m
+exec_timeout=2m
+reclient_timeout=2m
+canonicalize_working_dir=true
diff --git a/extern/crashpad/buildtools/reclient_cfgs/linux/nacl/rewrapper_linux.cfg b/extern/crashpad/buildtools/reclient_cfgs/linux/nacl/rewrapper_linux.cfg
new file mode 100644
index 0000000000..eff5063015
--- /dev/null
+++ b/extern/crashpad/buildtools/reclient_cfgs/linux/nacl/rewrapper_linux.cfg
@@ -0,0 +1,9 @@
+platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:26de99218a1a8b527d4840490bcbf1690ee0b55c84316300b60776e6b3a03fe1,label:action_default=1
+server_address=unix:///tmp/reproxy.sock
+labels=type=compile,compiler=nacl,lang=cpp
+exec_strategy=remote_local_fallback
+inputs=native_client/toolchain/linux_x86/saigo_newlib/lib
+dial_timeout=10m
+canonicalize_working_dir=true
+exec_timeout=2m
+reclient_timeout=2m
diff --git a/extern/crashpad/buildtools/reclient_cfgs/linux/python/rewrapper_linux.cfg b/extern/crashpad/buildtools/reclient_cfgs/linux/python/rewrapper_linux.cfg
new file mode 100644
index 0000000000..12ae5379c2
--- /dev/null
+++ b/extern/crashpad/buildtools/reclient_cfgs/linux/python/rewrapper_linux.cfg
@@ -0,0 +1,8 @@
+platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:26de99218a1a8b527d4840490bcbf1690ee0b55c84316300b60776e6b3a03fe1,label:action_default=1
+server_address=unix:///tmp/reproxy.sock
+labels=type=tool
+exec_strategy=remote_local_fallback
+dial_timeout=10m
+canonicalize_working_dir=true
+exec_timeout=2m
+reclient_timeout=2m
diff --git a/extern/crashpad/buildtools/reclient_cfgs/linux/python/rewrapper_linux_large.cfg b/extern/crashpad/buildtools/reclient_cfgs/linux/python/rewrapper_linux_large.cfg
new file mode 100644
index 0000000000..3afa0ba12f
--- /dev/null
+++ b/extern/crashpad/buildtools/reclient_cfgs/linux/python/rewrapper_linux_large.cfg
@@ -0,0 +1,8 @@
+platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:26de99218a1a8b527d4840490bcbf1690ee0b55c84316300b60776e6b3a03fe1,label:action_large=1
+server_address=unix:///tmp/reproxy.sock
+labels=type=tool
+exec_strategy=remote_local_fallback
+dial_timeout=10m
+canonicalize_working_dir=true
+exec_timeout=2m
+reclient_timeout=2m
diff --git a/extern/crashpad/buildtools/reclient_cfgs/linux_chroot/chromium-browser-clang/rewrapper_linux.cfg b/extern/crashpad/buildtools/reclient_cfgs/linux_chroot/chromium-browser-clang/rewrapper_linux.cfg
new file mode 100644
index 0000000000..58f5e09f28
--- /dev/null
+++ b/extern/crashpad/buildtools/reclient_cfgs/linux_chroot/chromium-browser-clang/rewrapper_linux.cfg
@@ -0,0 +1,9 @@
+platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:26de99218a1a8b527d4840490bcbf1690ee0b55c84316300b60776e6b3a03fe1,dockerChrootPath=.,dockerRuntime=runsc,label:orchestrator=portage,label:package_accelerator=reclient,label:core_count=2
+server_address=unix:///tmp/reproxy.sock
+labels=type=compile,compiler=clang,lang=cpp
+exec_strategy=remote_local_fallback
+dial_timeout=10m
+exec_timeout=2m
+reclient_timeout=2m
+canonicalize_working_dir=true
+exec_root=/
diff --git a/extern/crashpad/buildtools/reclient_cfgs/linux_chroot/nacl/rewrapper_linux.cfg b/extern/crashpad/buildtools/reclient_cfgs/linux_chroot/nacl/rewrapper_linux.cfg
new file mode 100644
index 0000000000..becb5af233
--- /dev/null
+++ b/extern/crashpad/buildtools/reclient_cfgs/linux_chroot/nacl/rewrapper_linux.cfg
@@ -0,0 +1,9 @@
+platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:26de99218a1a8b527d4840490bcbf1690ee0b55c84316300b60776e6b3a03fe1,dockerRuntime=runsc,label:orchestrator=portage,label:package_accelerator=reclient,label:core_count=2
+server_address=unix:///tmp/reproxy.sock
+labels=type=compile,compiler=nacl,lang=cpp
+exec_strategy=remote_local_fallback
+dial_timeout=10m
+canonicalize_working_dir=true
+exec_timeout=2m
+reclient_timeout=2m
+exec_root=/
diff --git a/extern/crashpad/buildtools/reclient_cfgs/linux_chroot/python/rewrapper_linux.cfg b/extern/crashpad/buildtools/reclient_cfgs/linux_chroot/python/rewrapper_linux.cfg
new file mode 100644
index 0000000000..918fc9cb47
--- /dev/null
+++ b/extern/crashpad/buildtools/reclient_cfgs/linux_chroot/python/rewrapper_linux.cfg
@@ -0,0 +1,9 @@
+platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:26de99218a1a8b527d4840490bcbf1690ee0b55c84316300b60776e6b3a03fe1,dockerRuntime=runsc,label:orchestrator=portage,label:package_accelerator=reclient,label:core_count=2
+server_address=unix:///tmp/reproxy.sock
+labels=type=tool
+exec_strategy=remote_local_fallback
+dial_timeout=10m
+canonicalize_working_dir=true
+exec_timeout=2m
+reclient_timeout=2m
+exec_root=/
diff --git a/extern/crashpad/buildtools/reclient_cfgs/linux_chroot/python/rewrapper_linux_large.cfg b/extern/crashpad/buildtools/reclient_cfgs/linux_chroot/python/rewrapper_linux_large.cfg
new file mode 100644
index 0000000000..8ac27bc025
--- /dev/null
+++ b/extern/crashpad/buildtools/reclient_cfgs/linux_chroot/python/rewrapper_linux_large.cfg
@@ -0,0 +1,12 @@
+# This is a dummy rewrapper config for CrOS builds to run remote_worker=large actions.
+# https://source.chromium.org/chromium/chromium/src/+/main:build/config/BUILDCONFIG.gn;l=809-811;drc=bdd37016de861ecba4e80a87be378c711ae9cf2c
+# If CrOS prepared a large worker pool, this config should be updated accordingly.
+platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:26de99218a1a8b527d4840490bcbf1690ee0b55c84316300b60776e6b3a03fe1,dockerRuntime=runsc,label:orchestrator=portage,label:package_accelerator=reclient,label:core_count=2
+server_address=unix:///tmp/reproxy.sock
+labels=type=tool
+exec_strategy=remote_local_fallback
+dial_timeout=10m
+canonicalize_working_dir=true
+exec_timeout=2m
+reclient_timeout=2m
+exec_root=/
diff --git a/extern/crashpad/buildtools/reclient_cfgs/reproxy_cfg_templates/reproxy.cfg.template b/extern/crashpad/buildtools/reclient_cfgs/reproxy_cfg_templates/reproxy.cfg.template
new file mode 100644
index 0000000000..305750725d
--- /dev/null
+++ b/extern/crashpad/buildtools/reclient_cfgs/reproxy_cfg_templates/reproxy.cfg.template
@@ -0,0 +1,26 @@
+instance=$rbe_instance
+service=remotebuildexecution.googleapis.com:443
+log_format=reducedtext
+$auth_flags
+fail_early_min_action_count=400
+fail_early_min_fallback_ratio=0.5
+deps_cache_max_mb=256
+# TODO(b/276727504) Re-enable once noop build shutdown time bug is fixed
+# enable_deps_cache=true
+async_reproxy_termination=true
+use_unified_uploads=true
+fast_log_collection=true
+depsscanner_address=$depsscanner_address
+
+# Improve upload/download concurrency
+max_concurrent_streams_per_conn=50
+max_concurrent_requests_per_conn=50
+min_grpc_connections=50
+cas_concurrency=200
+
+# Always compress artifacts
+compression_threshold=0
+use_batches=false
+
+# Metric metadata
+metrics_namespace=$rbe_project
diff --git a/extern/crashpad/buildtools/reclient_cfgs/rewrapper_chroot_compile.cfg b/extern/crashpad/buildtools/reclient_cfgs/rewrapper_chroot_compile.cfg
new file mode 100644
index 0000000000..ea327f99e3
--- /dev/null
+++ b/extern/crashpad/buildtools/reclient_cfgs/rewrapper_chroot_compile.cfg
@@ -0,0 +1,6 @@
+platform=container-image=docker://gcr.io/cloud-marketplace/google/rbe-ubuntu16-04@sha256:f6568d8168b14aafd1b707019927a63c2d37113a03bcee188218f99bd0327ea1,dockerChrootPath=.,dockerRuntime=runsc
+server_address=unix:///tmp/reproxy.sock
+labels=type=compile,compiler=clang,lang=cpp
+exec_root=/
+env_var_allowlist=PATH
+exec_strategy=remote_local_fallback
diff --git a/extern/crashpad/buildtools/reclient_cfgs/rewrapper_chroot_python.cfg b/extern/crashpad/buildtools/reclient_cfgs/rewrapper_chroot_python.cfg
new file mode 100644
index 0000000000..aae5b2f66f
--- /dev/null
+++ b/extern/crashpad/buildtools/reclient_cfgs/rewrapper_chroot_python.cfg
@@ -0,0 +1,6 @@
+platform=container-image=docker://gcr.io/cloud-marketplace/google/rbe-ubuntu16-04@sha256:f6568d8168b14aafd1b707019927a63c2d37113a03bcee188218f99bd0327ea1,dockerChrootPath=.,dockerRuntime=runsc
+server_address=unix:///tmp/reproxy.sock
+labels=type=tool
+exec_root=/
+env_var_allowlist=PATH
+exec_strategy=remote_local_fallback
diff --git a/extern/crashpad/buildtools/reclient_cfgs/rewrapper_linux.cfg b/extern/crashpad/buildtools/reclient_cfgs/rewrapper_linux.cfg
new file mode 100644
index 0000000000..f66d02dcbf
--- /dev/null
+++ b/extern/crashpad/buildtools/reclient_cfgs/rewrapper_linux.cfg
@@ -0,0 +1,9 @@
+#TODO(crbug.com/40788874): remove this when remote_toolchain_inputs is provided
+#                         with the toolchain.  This file is used by
+#                         cros_chrome_sdk to generate rewrapper.cfg for
+#                         ChromeOS (simple chrome).
+platform=container-image=docker://gcr.io/cloud-marketplace/google/rbe-ubuntu16-04@sha256:b4dad0bfc4951d619229ab15343a311f2415a16ef83bcaa55b44f4e2bf1cf635
+server_address=unix:///tmp/reproxy.sock
+labels=type=compile,compiler=clang,lang=cpp
+exec_strategy=remote_local_fallback
+inputs=third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6
diff --git a/extern/crashpad/buildtools/reclient_cfgs/rewrapper_linux_link.cfg b/extern/crashpad/buildtools/reclient_cfgs/rewrapper_linux_link.cfg
new file mode 100644
index 0000000000..31aa6b62ee
--- /dev/null
+++ b/extern/crashpad/buildtools/reclient_cfgs/rewrapper_linux_link.cfg
@@ -0,0 +1,12 @@
+# Config file for rewrapper binary, for remote linking.
+# This is an experimental configuration used to get data
+# on remote linking performance.
+# ${revision}
+
+platform=container-image=docker://gcr.io/chops-private-images-prod/rbe/chromium-browser-clang/linux-link@sha256:f138e0a336d48a34bf2537796215acd8e7a626ac1ebddb22674f2d4cd713ec2b,label:linktype=small
+server_address=unix:///tmp/reproxy.sock
+labels=type=link,tool=clang
+exec_strategy=remote_local_fallback
+inputs=third_party/llvm-build/Release+Asserts/bin/lld,third_party/llvm-build/Release+Asserts/bin/ld64.lld,third_party/llvm-build/Release+Asserts/bin/ld.lld,third_party/llvm-build/Release+Asserts/bin/lld-link,third_party/llvm-build/Release+Asserts/bin/wasm-ld
+dial_timeout=10m
+remote_wrapper=/chromium-browser-clang/run.sh
\ No newline at end of file
diff --git a/extern/crashpad/buildtools/third_party/eu-strip/OWNERS b/extern/crashpad/buildtools/third_party/eu-strip/OWNERS
index c253f75114..296dc0df7c 100644
--- a/extern/crashpad/buildtools/third_party/eu-strip/OWNERS
+++ b/extern/crashpad/buildtools/third_party/eu-strip/OWNERS
@@ -1,4 +1,2 @@
-dpranke@chromium.org
-dpranke@google.com
 thestig@chromium.org
 thomasanderson@chromium.org
diff --git a/extern/crashpad/buildtools/third_party/eu-strip/README.chromium b/extern/crashpad/buildtools/third_party/eu-strip/README.chromium
index 5c621b0a5b..14abad31fb 100644
--- a/extern/crashpad/buildtools/third_party/eu-strip/README.chromium
+++ b/extern/crashpad/buildtools/third_party/eu-strip/README.chromium
@@ -2,8 +2,8 @@ Name: eu-strip
 URL: https://sourceware.org/elfutils/
 Version: 0.158
 Security Critical: no
+Shipped: no
 License: LGPL 3
-License File: NOT_SHIPPED
 
 Description:
 
diff --git a/extern/crashpad/buildtools/third_party/eu-strip/bin/eu-strip b/extern/crashpad/buildtools/third_party/eu-strip/bin/eu-strip
old mode 100755
new mode 100644
diff --git a/extern/crashpad/buildtools/third_party/eu-strip/build.sh b/extern/crashpad/buildtools/third_party/eu-strip/build.sh
old mode 100755
new mode 100644
diff --git a/extern/crashpad/buildtools/third_party/libc++/BUILD.gn b/extern/crashpad/buildtools/third_party/libc++/BUILD.gn
index 82ad7e27b6..30fad21ed7 100644
--- a/extern/crashpad/buildtools/third_party/libc++/BUILD.gn
+++ b/extern/crashpad/buildtools/third_party/libc++/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2015 The Chromium Authors. All rights reserved.
+# Copyright 2015 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -7,15 +7,28 @@ import("//build/config/sanitizers/sanitizers.gni")
 import("//build/toolchain/toolchain.gni")
 
 # Used by libc++ and libc++abi.
+# See //build/config/c++:runtime_library for the config used by users of libc++.
 config("config") {
   cflags = [ "-fstrict-aliasing" ]
   if (is_win) {
-    # libc++ wants to redefine the macros WIN32_LEAN_AND_MEAN and _CRT_RAND_S in
-    # its implementation.
-    cflags += [ "-Wno-macro-redefined" ]
+    cflags += [
+      # libc++ wants to redefine the macros WIN32_LEAN_AND_MEAN and _CRT_RAND_S
+      # in its implementation.
+      "-Wno-macro-redefined",
+    ]
+
+    cflags_cc = [
+      # We want to use a uniform C++ version across all of chromium, but
+      # upstream libc++ requires C++20 so we have to make an exception here.
+      # No other target should override the default -std= flag.
+      "-std:c++20",
+    ]
   } else {
     cflags += [ "-fPIC" ]
+    cflags_cc = [ "-std=c++20" ]
   }
+
+  defines = [ "_LIBCPP_BUILDING_LIBRARY" ]
 }
 
 # Explicitly set version macros to Windows 7 to prevent libc++ from adding a
@@ -51,51 +64,97 @@ target(_libcxx_target_type, "libc++") {
   if (libcxx_is_shared) {
     no_default_deps = true
   }
+
+  if (is_linux && !is_clang) {
+    libs = [ "atomic" ]
+  }
+
+  inputs = [
+    "__assertion_handler",
+    "__config_site",
+  ]
+
+  # TODO(crbug.com/40273848): Move this build file to third_party/libc++/BUILD.gn
+  # once submodule migration is done.
   sources = [
-    "trunk/src/algorithm.cpp",
-    "trunk/src/any.cpp",
-    "trunk/src/bind.cpp",
-    "trunk/src/charconv.cpp",
-    "trunk/src/chrono.cpp",
-    "trunk/src/condition_variable.cpp",
-    "trunk/src/condition_variable_destructor.cpp",
-    "trunk/src/debug.cpp",
-    "trunk/src/exception.cpp",
-    "trunk/src/functional.cpp",
-    "trunk/src/future.cpp",
-    "trunk/src/hash.cpp",
-    "trunk/src/ios.cpp",
-    "trunk/src/iostream.cpp",
-    "trunk/src/locale.cpp",
-    "trunk/src/memory.cpp",
-    "trunk/src/mutex.cpp",
-    "trunk/src/mutex_destructor.cpp",
-    "trunk/src/new.cpp",
-    "trunk/src/optional.cpp",
-    "trunk/src/random.cpp",
-    "trunk/src/regex.cpp",
-    "trunk/src/shared_mutex.cpp",
-    "trunk/src/stdexcept.cpp",
-    "trunk/src/string.cpp",
-    "trunk/src/strstream.cpp",
-    "trunk/src/system_error.cpp",
-    "trunk/src/thread.cpp",
-    "trunk/src/typeinfo.cpp",
-    "trunk/src/utility.cpp",
-    "trunk/src/valarray.cpp",
-    "trunk/src/variant.cpp",
-    "trunk/src/vector.cpp",
+    "//third_party/libc++/src/src/algorithm.cpp",
+    "//third_party/libc++/src/src/any.cpp",
+    "//third_party/libc++/src/src/atomic.cpp",
+    "//third_party/libc++/src/src/barrier.cpp",
+    "//third_party/libc++/src/src/bind.cpp",
+    "//third_party/libc++/src/src/call_once.cpp",
+    "//third_party/libc++/src/src/charconv.cpp",
+    "//third_party/libc++/src/src/chrono.cpp",
+    "//third_party/libc++/src/src/condition_variable.cpp",
+    "//third_party/libc++/src/src/condition_variable_destructor.cpp",
+    "//third_party/libc++/src/src/error_category.cpp",
+    "//third_party/libc++/src/src/exception.cpp",
+    "//third_party/libc++/src/src/filesystem/directory_iterator.cpp",
+    "//third_party/libc++/src/src/filesystem/filesystem_error.cpp",
+    "//third_party/libc++/src/src/filesystem/operations.cpp",
+    "//third_party/libc++/src/src/filesystem/path.cpp",
+    "//third_party/libc++/src/src/functional.cpp",
+    "//third_party/libc++/src/src/future.cpp",
+    "//third_party/libc++/src/src/hash.cpp",
+    "//third_party/libc++/src/src/ios.cpp",
+    "//third_party/libc++/src/src/ios.instantiations.cpp",
+    "//third_party/libc++/src/src/iostream.cpp",
+    "//third_party/libc++/src/src/legacy_pointer_safety.cpp",
+    "//third_party/libc++/src/src/locale.cpp",
+    "//third_party/libc++/src/src/memory.cpp",
+    "//third_party/libc++/src/src/mutex.cpp",
+    "//third_party/libc++/src/src/mutex_destructor.cpp",
+    "//third_party/libc++/src/src/new_handler.cpp",
+    "//third_party/libc++/src/src/new_helpers.cpp",
+    "//third_party/libc++/src/src/optional.cpp",
+    "//third_party/libc++/src/src/random.cpp",
+    "//third_party/libc++/src/src/random_shuffle.cpp",
+    "//third_party/libc++/src/src/regex.cpp",
+    "//third_party/libc++/src/src/ryu/d2fixed.cpp",
+    "//third_party/libc++/src/src/ryu/d2s.cpp",
+    "//third_party/libc++/src/src/ryu/f2s.cpp",
+    "//third_party/libc++/src/src/shared_mutex.cpp",
+    "//third_party/libc++/src/src/stdexcept.cpp",
+    "//third_party/libc++/src/src/string.cpp",
+    "//third_party/libc++/src/src/strstream.cpp",
+    "//third_party/libc++/src/src/system_error.cpp",
+    "//third_party/libc++/src/src/thread.cpp",
+    "//third_party/libc++/src/src/typeinfo.cpp",
+    "//third_party/libc++/src/src/valarray.cpp",
+    "//third_party/libc++/src/src/variant.cpp",
+    "//third_party/libc++/src/src/vector.cpp",
+    "//third_party/libc++/src/src/verbose_abort.cpp",
   ]
+
+  if (is_apple || (!is_asan && !is_tsan && !is_msan)) {
+    # In {a,t,m}san configurations, operator new and operator delete will be
+    # provided by the sanitizer runtime library.  Since libc++ defines these
+    # symbols with weak linkage, and the *san runtime uses strong linkage, it
+    # should technically be OK to include this file, but it's removed to be
+    # explicit.
+    sources += [ "//third_party/libc++/src/src/new.cpp" ]
+  }
+
+  if (is_linux) {
+    # These sources are necessary for the Centipede fuzzer,
+    # which currently only needs to run on Linux.
+    sources += [
+      "//third_party/libc++/src/src/filesystem/directory_entry.cpp",
+      "//third_party/libc++/src/src/filesystem/filesystem_clock.cpp",
+    ]
+  }
+
+  include_dirs = [ "//third_party/libc++/src/src" ]
   if (is_win) {
     sources += [
-      "trunk/src/support/win32/locale_win32.cpp",
-      "trunk/src/support/win32/support.cpp",
-      "trunk/src/support/win32/thread_win32.cpp",
+      "//third_party/libc++/src/src/support/win32/locale_win32.cpp",
+      "//third_party/libc++/src/src/support/win32/support.cpp",
+      "//third_party/libc++/src/src/support/win32/thread_win32.cpp",
     ]
     configs -= [ "//build/config/win:winver" ]
     configs += [ ":winver" ]
     if (libcxx_natvis_include) {
-      inputs = [
+      inputs += [
         # libc++.natvis listed as an input here instead of in
         # //build/config/c++:runtime_library to prevent unnecessary size
         # increase in generated build files.
@@ -109,42 +168,36 @@ target(_libcxx_target_type, "libc++") {
     "//build/config/compiler:no_rtti",
     "//build/config/coverage:default_coverage",
   ]
-  if (is_android && libcxx_is_shared) {
+  if ((is_android || is_apple) && libcxx_is_shared) {
     # Use libc++_chrome to avoid conflicting with system libc++
-    # See crbug.com/1076244#c11 for more detail.
     output_name = "libc++_chrome"
-    configs -= [ "//build/config/android:hide_all_but_jni_onload" ]
+    if (is_android) {
+      # See crbug.com/1076244#c11 for more detail.
+      configs -= [ "//build/config/android:hide_all_but_jni_onload" ]
+    }
   }
   configs += [
     ":config",
     "//build/config/compiler:no_chromium_code",
     "//build/config/compiler:exceptions",
     "//build/config/compiler:rtti",
-    "//build/config/sanitizers:sanitizer_options_link_helper",
   ]
+
   if (libcxx_is_shared && !is_win) {
     configs -= [ "//build/config/gcc:symbol_visibility_hidden" ]
     configs += [ "//build/config/gcc:symbol_visibility_default" ]
   }
 
-  defines = [ "_LIBCPP_BUILDING_LIBRARY" ]
-  if (!is_clang && libcxx_is_shared) {
-    # This is a temporary workaround to get libc++ builds working with
-    # gcc.  It can be removed with either
-    # https://reviews.llvm.org/D35326 or
-    # https://reviews.llvm.org/D35388 lands.
-    defines += [ "_LIBCPP_EXTERN_TEMPLATE_TYPE_VIS=__attribute__((__visibility__(\"default\")))" ]
-  }
+  defines = []
+
   if (!libcxx_is_shared) {
-    # TODO(https://crbug.com/946629): Remove use_xcode_clang condition once
-    # XCode clang is updated to support -fvisibility-global-new-delete-hidden.
-    if ((is_mac || (is_ios && !use_xcode_clang)) && is_clang) {
+    if (is_apple && is_clang) {
       # We want operator new/delete to be private on Mac, but these functions
       # are implicitly created by the compiler for each translation unit, as
       # specified in the C++ spec 3.7.4p2, which makes them always have default
       # visibility.  This option is needed to force hidden visibility since
       # -fvisibility=hidden doesn't have the desired effect.
-      cflags = [ "-fvisibility-global-new-delete-hidden" ]
+      cflags = [ "-fvisibility-global-new-delete=force-hidden" ]
     } else {
       defines += [
         # This resets the visibility to default only for the various
@@ -165,13 +218,6 @@ target(_libcxx_target_type, "libc++") {
       ]
     }
   }
-  if (!is_mac && !is_ios && (is_asan || is_tsan || is_msan)) {
-    # In {a,t,m}san configurations, operator new and operator delete will be
-    # provided by the sanitizer runtime library.  Since libc++ defines these
-    # symbols with weak linkage, and the *san runtime uses strong linkage, it
-    # should technically be OK to omit this, but it's added to be explicit.
-    defines += [ "_LIBCPP_DISABLE_NEW_DELETE_DEFINITIONS" ]
-  }
 
   if (!is_win) {
     defines += [ "LIBCXX_BUILDING_LIBCXXABI" ]
diff --git a/extern/crashpad/buildtools/third_party/libc++/OWNERS b/extern/crashpad/buildtools/third_party/libc++/OWNERS
index 361c2b5e69..9a192b4b65 100644
--- a/extern/crashpad/buildtools/third_party/libc++/OWNERS
+++ b/extern/crashpad/buildtools/third_party/libc++/OWNERS
@@ -1,4 +1,3 @@
-earthdok@chromium.org
-glider@chromium.org
+hans@chromium.org
 thakis@chromium.org
 thomasanderson@chromium.org
diff --git a/extern/crashpad/buildtools/third_party/libc++/README.chromium b/extern/crashpad/buildtools/third_party/libc++/README.chromium
deleted file mode 100644
index 0c6fbeeee8..0000000000
--- a/extern/crashpad/buildtools/third_party/libc++/README.chromium
+++ /dev/null
@@ -1,11 +0,0 @@
-Name: libcxx
-Short Name: libc++
-URL: http://libcxx.llvm.org/
-Version: 1.0
-License: MIT, University of Illinois/NCSA Open Source License
-License File: trunk/LICENSE.TXT
-Security Critical: yes
-
-Description:
-
-libc++ for Chromium.
diff --git a/extern/crashpad/buildtools/third_party/libc++/__assertion_handler b/extern/crashpad/buildtools/third_party/libc++/__assertion_handler
new file mode 100644
index 0000000000..111d305a16
--- /dev/null
+++ b/extern/crashpad/buildtools/third_party/libc++/__assertion_handler
@@ -0,0 +1,23 @@
+// -*- C++ -*-
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef _LIBCPP___ASSERTION_HANDLER
+#define _LIBCPP___ASSERTION_HANDLER
+
+#include <__config>
+#include <__verbose_abort>
+
+#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+#  pragma GCC system_header
+#endif
+
+// TODO(hardening): in production, trap rather than abort.
+#define _LIBCPP_ASSERTION_HANDLER(message) _LIBCPP_VERBOSE_ABORT("%s", message)
+
+#endif // _LIBCPP___ASSERTION_HANDLER
diff --git a/extern/crashpad/buildtools/third_party/libc++/__config_site b/extern/crashpad/buildtools/third_party/libc++/__config_site
new file mode 100644
index 0000000000..d3249c5c30
--- /dev/null
+++ b/extern/crashpad/buildtools/third_party/libc++/__config_site
@@ -0,0 +1,93 @@
+#ifndef _LIBCPP_CONFIG_SITE
+#define _LIBCPP_CONFIG_SITE
+
+// We set a custom _LIBCPP_ABI_NAMESPACE for the following reasons:
+//
+// 1. When libcxx_is_shared is true, symbols from libc++.so are exported for all
+//    DSOs to use.  If the system libc++ gets loaded (indirectly through a
+//    a system library), then it will conflict with our libc++.so.
+// 2. The default value of _LIBCPP_ABI_NAMESPACE is the string
+//    "_LIBCPP_ABI_NAMESPACE". This contributes to an increase in binary size;
+//    on Windows, the increase is great enough that we go above the 4GB size
+//    limit for PDBs (https://crbug.com/1327710#c5). To fix this, we set
+//    _LIBCPP_ABI_NAMESPACE to a shorter value.
+#define _LIBCPP_ABI_NAMESPACE __Cr
+
+#define _LIBCPP_ABI_VERSION 2
+
+/* #undef _LIBCPP_ABI_FORCE_ITANIUM */
+/* #undef _LIBCPP_ABI_FORCE_MICROSOFT */
+/* #undef _LIBCPP_HAS_NO_THREADS */
+/* #undef _LIBCPP_HAS_NO_MONOTONIC_CLOCK */
+/* #undef _LIBCPP_HAS_MUSL_LIBC */
+/* #undef _LIBCPP_HAS_THREAD_API_PTHREAD */
+/* #undef _LIBCPP_HAS_THREAD_API_EXTERNAL */
+/* #undef _LIBCPP_HAS_THREAD_API_WIN32 */
+/* #undef _LIBCPP_HAS_THREAD_LIBRARY_EXTERNAL */
+/* #undef _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS */
+#define _LIBCPP_HAS_NO_VENDOR_AVAILABILITY_ANNOTATIONS
+/* #undef _LIBCPP_NO_VCRUNTIME */
+/* #undef _LIBCPP_TYPEINFO_COMPARISON_IMPLEMENTATION */
+/* #undef _LIBCPP_HAS_NO_FILESYSTEM */
+/* #undef _LIBCPP_HAS_PARALLEL_ALGORITHMS */
+/* #undef _LIBCPP_HAS_NO_RANDOM_DEVICE */
+/* #undef _LIBCPP_HAS_NO_LOCALIZATION */
+/* #undef _LIBCPP_HAS_NO_WIDE_CHARACTERS */
+
+// TODO(thakis): Is this right?
+/* #undef _LIBCPP_HAS_NO_STD_MODULES */
+
+// TODO(thakis): Is this right?
+/* #undef _LIBCPP_HAS_NO_TIME_ZONE_DATABASE */
+
+#define _LIBCPP_INSTRUMENTED_WITH_ASAN
+
+// PSTL backends
+/* #undef _LIBCPP_PSTL_BACKEND_SERIAL */
+#if defined(__APPLE__)
+#define _LIBCPP_PSTL_BACKEND_LIBDISPATCH
+#else
+#define _LIBCPP_PSTL_BACKEND_STD_THREAD
+#endif
+
+// PSTL backends, old spelling
+// TODO(thakis): Remove these after the next libc++ roll is in.
+/* #undef _LIBCPP_PSTL_CPU_BACKEND_SERIAL */
+#if defined(__APPLE__)
+#define _LIBCPP_PSTL_CPU_BACKEND_LIBDISPATCH
+#else
+#define _LIBCPP_PSTL_CPU_BACKEND_THREAD
+#endif
+
+// Settings below aren't part of __config_site upstream.
+// We set them here since we want them to take effect everywhere,
+// unconditionally.
+
+// Prevent libc++ from embedding linker flags to try to automatically link
+// against its runtime library. This is unnecessary with our build system,
+// and can also result in build failures if libc++'s name for a library
+// does not match ours.  Only has an effect on Windows.
+#define _LIBCPP_NO_AUTO_LINK
+
+#define _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
+
+// Don't add ABI tags to libc++ symbols. ABI tags increase mangled name sizes.
+// This only exists to allow multiple // libc++ versions to be linked into a
+// binary, which Chrome doesn't do.
+#define _LIBCPP_NO_ABI_TAG
+
+// Explicitly define  _LIBCPP_VERBOSE_ABORT(...) to call the termination
+// function because by default, this macro will does not call the verbose
+// termination function on Apple platforms.
+#define _LIBCPP_VERBOSE_ABORT(...) ::std::__libcpp_verbose_abort(__VA_ARGS__)
+
+// TODO(crbug.com/40272953) Link against compiler-rt's builtins library to
+// enable 128-arithmetic.
+#if defined(_WIN32)
+#define _LIBCPP_HAS_NO_INT128
+#endif
+
+// TODO(thakis): Remove this after LLVM 19's libc++ is rolled in.
+#define _LIBCPP_CHAR_TRAITS_REMOVE_BASE_SPECIALIZATION
+
+#endif // _LIBCPP_CONFIG_SITE
diff --git a/extern/crashpad/buildtools/third_party/libc++abi/BUILD.gn b/extern/crashpad/buildtools/third_party/libc++abi/BUILD.gn
index 22517c2768..bf3db7adc3 100644
--- a/extern/crashpad/buildtools/third_party/libc++abi/BUILD.gn
+++ b/extern/crashpad/buildtools/third_party/libc++abi/BUILD.gn
@@ -1,8 +1,10 @@
-# Copyright 2015 The Chromium Authors. All rights reserved.
+# Copyright 2015 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/android/config.gni")
 import("//build/config/c++/c++.gni")
+import("//build/config/unwind.gni")
 
 source_set("libc++abi") {
   if (export_libcxxabi_from_executables) {
@@ -12,54 +14,61 @@ source_set("libc++abi") {
   }
 
   # Fuchsia builds don't link against any libraries that provide stack
-  # unwinding symbols, unlike Linux does with glibc.  Build and link against
-  # libunwind manually to get this functionality.
-  if (is_fuchsia) {
+  # unwinding symbols, unlike Linux does with glibc (same applies for Android).
+  # Build and link against libunwind manually to get this functionality.
+  if (use_custom_libunwind) {
     deps = [ "//buildtools/third_party/libunwind" ]
   }
 
+  # TODO(crbug.com/40273848): Move this build file to third_party/libc++/BUILD.gn once submodule migration is done
   sources = [
-    "trunk/src/abort_message.cpp",
-    "trunk/src/cxa_aux_runtime.cpp",
-    "trunk/src/cxa_default_handlers.cpp",
-    "trunk/src/cxa_exception.cpp",
-    "trunk/src/cxa_exception_storage.cpp",
-    "trunk/src/cxa_handlers.cpp",
+    "//third_party/libc++abi/src/src/abort_message.cpp",
+    "//third_party/libc++abi/src/src/cxa_aux_runtime.cpp",
+    "//third_party/libc++abi/src/src/cxa_default_handlers.cpp",
+    "//third_party/libc++abi/src/src/cxa_exception.cpp",
+    "//third_party/libc++abi/src/src/cxa_exception_storage.cpp",
+    "//third_party/libc++abi/src/src/cxa_handlers.cpp",
 
     # This file is supposed to be used in fno-exception builds of
     # libc++abi.  We build lib++/libc++abi with exceptions enabled.
-    #"trunk/src/cxa_noexception.cpp",
-    "trunk/src/cxa_personality.cpp",
-    "trunk/src/cxa_unexpected.cpp",
-    "trunk/src/cxa_vector.cpp",
-    "trunk/src/cxa_virtual.cpp",
-    "trunk/src/fallback_malloc.cpp",
-    "trunk/src/private_typeinfo.cpp",
-    "trunk/src/stdlib_exception.cpp",
-    "trunk/src/stdlib_stdexcept.cpp",
-    "trunk/src/stdlib_typeinfo.cpp",
+    #"//third_party/libc++abi/src/src/cxa_noexception.cpp",
+    "//third_party/libc++abi/src/src/cxa_personality.cpp",
+    "//third_party/libc++abi/src/src/cxa_vector.cpp",
+    "//third_party/libc++abi/src/src/cxa_virtual.cpp",
+    "//third_party/libc++abi/src/src/fallback_malloc.cpp",
+    "//third_party/libc++abi/src/src/private_typeinfo.cpp",
+    "//third_party/libc++abi/src/src/stdlib_exception.cpp",
+    "//third_party/libc++abi/src/src/stdlib_stdexcept.cpp",
+    "//third_party/libc++abi/src/src/stdlib_typeinfo.cpp",
   ]
 
   if (!is_tsan) {
-    sources += [ "trunk/src/cxa_guard.cpp" ]
+    sources += [ "//third_party/libc++abi/src/src/cxa_guard.cpp" ]
   }
 
   # See the comment in cxa_demangle_stub.cc for why we don't use LLVM's
   # demangler on android.
+  # TODO(thakis): Switch to building with LIBCXXABI_NON_DEMANGLING_TERMINATE
+  # defined instead.
   if (is_android) {
     sources += [ "cxa_demangle_stub.cc" ]
   } else {
-    sources += [ "trunk/src/cxa_demangle.cpp" ]
+    sources += [ "//third_party/libc++abi/src/src/cxa_demangle.cpp" ]
   }
 
-  if (is_fuchsia || (is_posix && !is_mac && !is_ios)) {
-    sources += [ "trunk/src/cxa_thread_atexit.cpp" ]
-  }
+  defines = [ "LIBCXXABI_SILENT_TERMINATE" ]
 
-  defines = [
-    "LIBCXXABI_SILENT_TERMINATE",
-    "_LIBCPP_ENABLE_CXX17_REMOVED_UNEXPECTED_FUNCTIONS",
-  ]
+  if (is_fuchsia || (is_posix && !is_apple)) {
+    sources += [ "//third_party/libc++abi/src/src/cxa_thread_atexit.cpp" ]
+
+    # Android's bionic libc added support for '__cxa_thread_atexit_impl' as of
+    # API level 23.
+    if (is_android &&
+        ((!android_64bit_target_cpu && android32_ndk_api_level >= 23) ||
+         (android_64bit_target_cpu && android64_ndk_api_level >= 23))) {
+      defines += [ "HAVE___CXA_THREAD_ATEXIT_IMPL" ]
+    }
+  }
 
   configs -= [
     "//build/config/compiler:chromium_code",
@@ -74,8 +83,19 @@ source_set("libc++abi") {
     "//buildtools/third_party/libc++:config",
   ]
 
+  # private_typeinfo.cpp implements __dynamic_cast(), which is the runtime
+  # bit that implements dynamic_cast<>(). But ubsan's vptr check inserts
+  # dynamic_cast<>()s, which leads to infinite recursion. So make sure we don't
+  # pass -fsanitize=vptr.
+  configs -= [ "//build/config/sanitizers:default_sanitizer_flags" ]
+  configs +=
+      [ "//build/config/sanitizers:default_sanitizer_flags_but_ubsan_vptr" ]
+
   if (export_libcxxabi_from_executables || libcxx_is_shared) {
     configs -= [ "//build/config/gcc:symbol_visibility_hidden" ]
     configs += [ "//build/config/gcc:symbol_visibility_default" ]
   }
+
+  # libc++abi depends on libc++ internals.
+  include_dirs = [ "//third_party/libc++/src/src" ]
 }
diff --git a/extern/crashpad/buildtools/third_party/libc++abi/OWNERS b/extern/crashpad/buildtools/third_party/libc++abi/OWNERS
index 361c2b5e69..52faa91a96 100644
--- a/extern/crashpad/buildtools/third_party/libc++abi/OWNERS
+++ b/extern/crashpad/buildtools/third_party/libc++abi/OWNERS
@@ -1,4 +1,2 @@
-earthdok@chromium.org
-glider@chromium.org
 thakis@chromium.org
 thomasanderson@chromium.org
diff --git a/extern/crashpad/buildtools/third_party/libc++abi/README.chromium b/extern/crashpad/buildtools/third_party/libc++abi/README.chromium
deleted file mode 100644
index a57429eeaa..0000000000
--- a/extern/crashpad/buildtools/third_party/libc++abi/README.chromium
+++ /dev/null
@@ -1,11 +0,0 @@
-Name: libcxxabi
-Short Name: libc++abi
-URL: http://libcxxabi.llvm.org/
-Version: 1.0
-License: MIT, University of Illinois/NCSA Open Source License
-License File: trunk/LICENSE.TXT
-Security Critical: yes
-
-Description:
-
-libc++abi for Chromium.
diff --git a/extern/crashpad/buildtools/third_party/libc++abi/cxa_demangle_stub.cc b/extern/crashpad/buildtools/third_party/libc++abi/cxa_demangle_stub.cc
index 5c6560cd1c..ba6a781bd9 100644
--- a/extern/crashpad/buildtools/third_party/libc++abi/cxa_demangle_stub.cc
+++ b/extern/crashpad/buildtools/third_party/libc++abi/cxa_demangle_stub.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
+// Copyright 2018 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/buildtools/third_party/libunwind/BUILD.gn b/extern/crashpad/buildtools/third_party/libunwind/BUILD.gn
index 923f928f88..83adb80e69 100644
--- a/extern/crashpad/buildtools/third_party/libunwind/BUILD.gn
+++ b/extern/crashpad/buildtools/third_party/libunwind/BUILD.gn
@@ -1,10 +1,11 @@
-# Copyright 2017 The Chromium Authors. All rights reserved.
+# Copyright 2017 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/c++/c++.gni")
 
 config("libunwind_config") {
+  defines = [ "_LIBUNWIND_IS_NATIVE_ONLY" ]
   cflags = [
     "-fstrict-aliasing",
     "-fPIC",
@@ -16,50 +17,44 @@ config("libunwind_config") {
     # unwind its own frames.
     "-funwind-tables",
   ]
-
-  if (is_fuchsia) {
-    # Workaround for https://bugs.llvm.org/show_bug.cgi?id=45875:
-    # compiling the C code with -fexceptions ensures that accurate
-    # unwinding information is generated for _Unwind_RaiseException.
-    cflags_c = [ "-fexceptions" ]
-  }
 }
 
+# TODO(crbug.com/40273848): Move this build file to third_party/libc++/BUILD.gn once submodule migration is done
 source_set("libunwind") {
-  visibility = []
-  if (is_fuchsia) {
-    visibility += [ "//buildtools/third_party/libc++abi" ]
-  } else if (is_android) {
+  visibility = [ "//buildtools/third_party/libc++abi" ]
+  if (is_android) {
     visibility += [ "//services/tracing/public/cpp" ]
   }
   if (!is_component_build) {
     defines = [ "_LIBUNWIND_DISABLE_VISIBILITY_ANNOTATIONS" ]
   }
-  include_dirs = [ "//buildtools/third_party/libunwind/trunk/include" ]
+  include_dirs = [ "//third_party/libunwind/src/include" ]
   sources = [
     # C++ sources
-    "trunk/src/Unwind-EHABI.cpp",
-    "trunk/src/libunwind.cpp",
+    "//third_party/libunwind/src/src/Unwind-EHABI.cpp",
+    "//third_party/libunwind/src/src/libunwind.cpp",
 
     # C sources
-    "trunk/src/Unwind-sjlj.c",
-    "trunk/src/UnwindLevel1-gcc-ext.c",
-    "trunk/src/UnwindLevel1.c",
+    "//third_party/libunwind/src/src/Unwind-sjlj.c",
+    "//third_party/libunwind/src/src/UnwindLevel1-gcc-ext.c",
+    "//third_party/libunwind/src/src/UnwindLevel1.c",
 
     # ASM sources
-    "trunk/src/UnwindRegistersRestore.S",
-    "trunk/src/UnwindRegistersSave.S",
+    "//third_party/libunwind/src/src/UnwindRegistersRestore.S",
+    "//third_party/libunwind/src/src/UnwindRegistersSave.S",
   ]
   configs -= [
     "//build/config/compiler:chromium_code",
     "//build/config/compiler:no_exceptions",
     "//build/config/compiler:no_rtti",
     "//build/config/coverage:default_coverage",
+    "//build/config/compiler:default_optimization",
   ]
   configs += [
     "//build/config/compiler:no_chromium_code",
     "//build/config/compiler:exceptions",
     "//build/config/compiler:rtti",
+    "//build/config/compiler:optimize_speed",
 
     # Must be after no_chromium_code
     ":libunwind_config",
diff --git a/extern/crashpad/buildtools/third_party/libunwind/README.chromium b/extern/crashpad/buildtools/third_party/libunwind/README.chromium
deleted file mode 100644
index d787e87ad6..0000000000
--- a/extern/crashpad/buildtools/third_party/libunwind/README.chromium
+++ /dev/null
@@ -1,11 +0,0 @@
-Name: libunwind
-URL: https://llvm.org/svn/llvm-project/libunwind/trunk/
-Version: 1.0
-License: MIT, University of Illinois/NCSA Open Source License
-License File: trunk/LICENSE.TXT
-Security Critical: yes
-
-Description:
-
-libunwind for Chromium.
-This is a dependency of libc++abi on ARM builds.
diff --git a/extern/crashpad/buildtools/win/clang-format.exe.sha1 b/extern/crashpad/buildtools/win/clang-format.exe.sha1
index 03c98aa593..ee8aea2779 100644
--- a/extern/crashpad/buildtools/win/clang-format.exe.sha1
+++ b/extern/crashpad/buildtools/win/clang-format.exe.sha1
@@ -1 +1 @@
-d4afd4eba27022f5f6d518133aebde57281677c9
\ No newline at end of file
+49458d4c1e884a38308f8dc6a2c7eb55fc478755
\ No newline at end of file
diff --git a/extern/crashpad/buildtools/win/gn.exe b/extern/crashpad/buildtools/win/gn.exe
deleted file mode 100644
index 6a92a03bb8..0000000000
Binary files a/extern/crashpad/buildtools/win/gn.exe and /dev/null differ
diff --git a/extern/crashpad/crashpad/.clang-format b/extern/crashpad/crashpad/.clang-format
index 0be5323f5b..8508426fe6 100644
--- a/extern/crashpad/crashpad/.clang-format
+++ b/extern/crashpad/crashpad/.clang-format
@@ -1,4 +1,4 @@
-# Copyright 2014 The Crashpad Authors. All rights reserved.
+# Copyright 2014 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/.gitattributes b/extern/crashpad/crashpad/.gitattributes
index 9bfc20d15c..3c09b54e1e 100644
--- a/extern/crashpad/crashpad/.gitattributes
+++ b/extern/crashpad/crashpad/.gitattributes
@@ -1,4 +1,4 @@
-# Copyright 2019 The Crashpad Authors. All rights reserved.
+# Copyright 2019 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,8 +23,6 @@
 *.gn text eol=lf
 *.gni text eol=lf
 *.go text eol=lf
-*.gyp text eol=lf
-*.gypi text eol=lf
 *.h text eol=lf
 *.m text eol=lf
 *.md text eol=lf
diff --git a/extern/crashpad/crashpad/.gitignore b/extern/crashpad/crashpad/.gitignore
index 64507fc480..dfef5497a4 100644
--- a/extern/crashpad/crashpad/.gitignore
+++ b/extern/crashpad/crashpad/.gitignore
@@ -1,4 +1,4 @@
-# Copyright 2014 The Crashpad Authors. All rights reserved.
+# Copyright 2014 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Keep sorted
+
 *.Makefile
 *.ninja
 *.pyc
@@ -20,11 +22,15 @@
 *~
 .*.sw?
 .DS_Store
+.cache
 .gdb_history
 .gdbinit
+/.vscode/
 /Makefile
+/build/fuchsia
 /out
 /third_party/edo/edo
+/third_party/fuchsia-gn-sdk
 /third_party/fuchsia/.cipd
 /third_party/fuchsia/clang
 /third_party/fuchsia/qemu
@@ -34,6 +40,12 @@
 /third_party/linux/.cipd
 /third_party/linux/clang
 /third_party/linux/sysroot
-/third_party/gyp/gyp
+/third_party/lss/lss
+/third_party/mini_chromium/mini_chromium
+/third_party/ninja/linux
+/third_party/ninja/mac*
+/third_party/ninja/ninja.exe
+/third_party/windows/clang/win-amd64
+/third_party/zlib/zlib
 /xcodebuild
 tags
diff --git a/extern/crashpad/crashpad/.gn b/extern/crashpad/crashpad/.gn
index d447a5537c..f2db1da269 100644
--- a/extern/crashpad/crashpad/.gn
+++ b/extern/crashpad/crashpad/.gn
@@ -1,4 +1,4 @@
-# Copyright 2017 The Crashpad Authors. All rights reserved.
+# Copyright 2017 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,3 +13,4 @@
 # limitations under the License.
 
 buildconfig = "//build/BUILDCONFIG.gn"
+script_executable = "python3"
diff --git a/extern/crashpad/crashpad/.style.yapf b/extern/crashpad/crashpad/.style.yapf
index 8aaf9b62c7..1471bc8225 100644
--- a/extern/crashpad/crashpad/.style.yapf
+++ b/extern/crashpad/crashpad/.style.yapf
@@ -1,4 +1,4 @@
-# Copyright 2020 The Crashpad Authors. All rights reserved.
+# Copyright 2020 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/.vpython b/extern/crashpad/crashpad/.vpython3
similarity index 86%
rename from extern/crashpad/crashpad/.vpython
rename to extern/crashpad/crashpad/.vpython3
index c2001fc5df..f16930379f 100644
--- a/extern/crashpad/crashpad/.vpython
+++ b/extern/crashpad/crashpad/.vpython3
@@ -1,4 +1,4 @@
-# Copyright 2018 The Crashpad Authors. All rights reserved.
+# Copyright 2022 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,8 +21,8 @@
 
 # This is needed for snapshot/win/end_to_end_test.py.
 wheel: <
-  name: "infra/python/wheels/pypiwin32/${vpython_platform}"
-  version: "version:219"
+  name: "infra/python/wheels/pywin32/${vpython_platform}"
+  version: "version:300"
   match_tag: <
     platform: "win32"
   >
diff --git a/extern/crashpad/crashpad/AUTHORS b/extern/crashpad/crashpad/AUTHORS
index 8dcac32388..e797d3db7c 100644
--- a/extern/crashpad/crashpad/AUTHORS
+++ b/extern/crashpad/crashpad/AUTHORS
@@ -12,3 +12,5 @@ Opera Software ASA
 Vewd Software AS
 LG Electronics, Inc.
 MIPS Technologies, Inc.
+Darshan Sen <raisinten@gmail.com>
+Ho Cheung <uioptt24@gmail.com>
diff --git a/extern/crashpad/crashpad/BUILD.gn b/extern/crashpad/crashpad/BUILD.gn
index 666784af6a..db7ece70c6 100644
--- a/extern/crashpad/crashpad/BUILD.gn
+++ b/extern/crashpad/crashpad/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2017 The Crashpad Authors. All rights reserved.
+# Copyright 2017 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,7 +17,10 @@ import("build/test.gni")
 import("util/net/tls.gni")
 
 config("crashpad_config") {
-  include_dirs = [ "." ]
+  include_dirs = [
+    ".",
+    root_gen_dir,
+  ]
 }
 
 if (crashpad_is_in_chromium || crashpad_is_in_fuchsia) {
@@ -30,16 +33,37 @@ if (crashpad_is_in_chromium || crashpad_is_in_fuchsia) {
       "test:test_test",
       "util:util_test",
     ]
+
+    data_deps = []
+
+    if (crashpad_is_in_chromium) {
+      data_deps += [ "//testing/buildbot/filters:crashpad_tests_filters" ]
+    }
+
     if (!crashpad_is_ios && !crashpad_is_fuchsia) {
       deps += [ "handler:handler_test" ]
     }
     if (crashpad_is_in_fuchsia) {
       # TODO(fuchsia:46559): Fix the leaks and remove this.
       deps += [ "//build/config/sanitizers:suppress-lsan.DO-NOT-USE-THIS" ]
+
+      # TODO(fxbug.dev/42059784): Remove this once the underlying issue is
+      # addressed.
+      exclude_toolchain_tags = [ "hwasan" ]
     }
     if (crashpad_is_android) {
       use_raw_android_executable = true
 
+      # crbug.com/418874703 - This is a workaround to propagate the data deps to
+      # //:crashpad_tests__dist for Android build.
+      data_deps += [
+        "snapshot:crashpad_snapshot_test_both_dt_hash_styles",
+        "snapshot:crashpad_snapshot_test_module",
+        "snapshot:crashpad_snapshot_test_module_large",
+        "snapshot:crashpad_snapshot_test_module_small",
+        "test:crashpad_test_test_multiprocess_exec_test_child",
+      ]
+
       copy("crashpad_test_data") {
         testonly = true
         sources = [
@@ -64,7 +88,7 @@ if (crashpad_is_in_chromium || crashpad_is_in_fuchsia) {
   if (crashpad_is_in_fuchsia) {
     import("//build/components.gni")
     fuchsia_test_component("crashpad-test-component") {
-      manifest = "test/fuchsia_crashpad_tests.cmx"
+      manifest = "test/fuchsia_crashpad_tests.cml"
       deps = [
         ":crashpad-test-resources",
         ":crashpad_tests",
@@ -73,13 +97,17 @@ if (crashpad_is_in_chromium || crashpad_is_in_fuchsia) {
         "snapshot:crashpad_snapshot_test_module_large",
         "snapshot:crashpad_snapshot_test_module_small",
         "test:crashpad_test_test_multiprocess_exec_test_child",
-        "util:http_transport_test_server",
       ]
     }
 
     fuchsia_test_package("crashpad-test") {
       test_components = [ ":crashpad-test-component" ]
 
+      deps = [
+        "//src/connectivity/network/dns:component",
+        "//src/connectivity/network/netstack:component",
+      ]
+
       test_specs = {
         log_settings = {
           max_severity = "FATAL"
@@ -113,11 +141,6 @@ if (crashpad_is_in_chromium || crashpad_is_in_fuchsia) {
       deps = _resources
     }
 
-    fuchsia_shell_package("crashpad-database-util") {
-      package_name = "crashpad_database_util"
-      deps = [ "tools:crashpad_database_util" ]
-    }
-
     group("tests") {
       testonly = true
 
diff --git a/extern/crashpad/crashpad/DEPS b/extern/crashpad/crashpad/DEPS
index fc7a1e2a73..cc0a90a369 100644
--- a/extern/crashpad/crashpad/DEPS
+++ b/extern/crashpad/crashpad/DEPS
@@ -1,4 +1,4 @@
-# Copyright 2014 The Crashpad Authors. All rights reserved.
+# Copyright 2014 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,6 +14,10 @@
 
 vars = {
   'chromium_git': 'https://chromium.googlesource.com',
+  'gn_version': 'git_revision:5e19d2fb166fbd4f6f32147fbb2f497091a54ad8',
+  # ninja CIPD package version.
+  # https://chrome-infra-packages.appspot.com/p/infra/3pp/tools/ninja
+  'ninja_version': 'version:2@1.8.2.chromium.3',
   'pull_linux_clang': False,
   'pull_win_toolchain': False,
   # Controls whether crashpad/build/ios/setup-ios-gn.py is run as part of
@@ -25,34 +29,78 @@ vars = {
 deps = {
   'buildtools':
       Var('chromium_git') + '/chromium/src/buildtools.git@' +
-      '9e121212d42be62a7cce38072f925f8398d11e49',
+      'efa920ce144e4dc1c1841e73179cd7e23b9f0d5e',
+  'buildtools/clang_format/script':
+      Var('chromium_git') +
+      '/external/github.com/llvm/llvm-project/clang/tools/clang-format.git@' +
+      'c912837e0d82b5ca4b6e790b573b3956d3744c1c',
   'crashpad/third_party/edo/edo': {
       'url': Var('chromium_git') + '/external/github.com/google/eDistantObject.git@' +
-      '6ffbf833173f53fcd06ecf08670a95cc01c01f72',
+      '38e71ff183d76f702db6966fa7236c98831acd80',
       'condition': 'checkout_ios',
   },
   'crashpad/third_party/googletest/googletest':
       Var('chromium_git') + '/external/github.com/google/googletest@' +
-      '11da093e0477185dbd78abaaa9f99db15be498d0',
+      '3983f67e32fb3e9294487b9d4f9586efa6e5d088',
   'crashpad/third_party/lss/lss':
       Var('chromium_git') + '/linux-syscall-support.git@' +
-      '7bde79cc274d06451bf65ae82c012a5d3e476b5a',
+      '9719c1e1e676814c456b55f5f070eabad6709d31',
   'crashpad/third_party/mini_chromium/mini_chromium':
       Var('chromium_git') + '/chromium/mini_chromium@' +
-      '14b219d5d503e305a6d853e64de201659cfcbe2d',
+      '706fce5b1a280a6f2eea69040f67847f9acb65ff',
   'crashpad/third_party/libfuzzer/src':
       Var('chromium_git') + '/chromium/llvm-project/compiler-rt/lib/fuzzer.git@' +
       'fda403cf93ecb8792cb1d061564d89a6553ca020',
   'crashpad/third_party/zlib/zlib':
       Var('chromium_git') + '/chromium/src/third_party/zlib@' +
-      '13dc246a58e4b72104d35f9b1809af95221ebda7',
+      'fef58692c1d7bec94c4ed3d030a45a1832a9615d',
 
-  # CIPD packages below.
+  # CIPD packages.
+  'buildtools/linux64': {
+    'packages': [
+      {
+        'package': 'gn/gn/linux-${{arch}}',
+        'version': Var('gn_version'),
+      }
+    ],
+    'dep_type': 'cipd',
+    'condition': 'host_os == "linux"',
+  },
+  'buildtools/mac': {
+    'packages': [
+      {
+        'package': 'gn/gn/mac-${{arch}}',
+        'version': Var('gn_version'),
+      }
+    ],
+    'dep_type': 'cipd',
+    'condition': 'host_os == "mac"',
+  },
+  'buildtools/win': {
+    'packages': [
+      {
+        'package': 'gn/gn/windows-amd64',
+        'version': Var('gn_version'),
+      }
+    ],
+    'dep_type': 'cipd',
+    'condition': 'host_os == "win"',
+  },
+  'crashpad/build/fuchsia': {
+     'packages': [
+       {
+        'package': 'chromium/fuchsia/test-scripts',
+        'version': 'latest',
+       }
+     ],
+     'condition': 'checkout_fuchsia',
+     'dep_type': 'cipd',
+  },
   'crashpad/third_party/linux/clang/linux-amd64': {
     'packages': [
       {
-        'package': 'fuchsia/clang/linux-amd64',
-        'version': 'goma',
+        'package': 'fuchsia/third_party/clang/linux-amd64',
+        'version': 'Tpc85d1ZwSlZ6UKl2d96GRUBGNA5JKholOKe24sRDr0C',
       },
     ],
     'condition': 'checkout_linux and pull_linux_clang',
@@ -61,8 +109,8 @@ deps = {
   'crashpad/third_party/fuchsia/clang/mac-amd64': {
     'packages': [
       {
-        'package': 'fuchsia/clang/mac-amd64',
-        'version': 'goma',
+        'package': 'fuchsia/third_party/clang/mac-amd64',
+        'version': 'integration',
       },
     ],
     'condition': 'checkout_fuchsia and host_os == "mac"',
@@ -71,33 +119,91 @@ deps = {
   'crashpad/third_party/fuchsia/clang/linux-amd64': {
     'packages': [
       {
-        'package': 'fuchsia/clang/linux-amd64',
-        'version': 'goma',
+        'package': 'fuchsia/third_party/clang/linux-amd64',
+        'version': 'integration',
       },
     ],
     'condition': 'checkout_fuchsia and host_os == "linux"',
     'dep_type': 'cipd'
   },
-  'crashpad/third_party/fuchsia/sdk/mac-amd64': {
+  'crashpad/third_party/windows/clang/win-amd64': {
+    'bucket': 'chromium-browser-clang',
+    'objects': [
+      {
+        'object_name': 'Win/clang-llvmorg-20-init-17108-g29ed6000-2.tar.xz',
+        'sha256sum': '1c71efd923a91480480d4f31c2fd5f1369e01e14f15776a9454abbce0bc13548',
+        'size_bytes': 46357580,
+        'generation': 1737590897363452,
+      },
+    ],
+    'condition': 'checkout_win and host_os == "win"',
+    'dep_type': 'gcs',
+  },
+  'crashpad/third_party/fuchsia-gn-sdk': {
     'packages': [
       {
-        'package': 'fuchsia/sdk/gn/mac-amd64',
+        'package': 'chromium/fuchsia/gn-sdk',
         'version': 'latest'
       },
     ],
-    'condition': 'checkout_fuchsia and host_os == "mac"',
+    'condition': 'checkout_fuchsia',
     'dep_type': 'cipd'
   },
   'crashpad/third_party/fuchsia/sdk/linux-amd64': {
     'packages': [
       {
-        'package': 'fuchsia/sdk/gn/linux-amd64',
+        'package': 'fuchsia/sdk/core/linux-amd64',
         'version': 'latest'
       },
     ],
     'condition': 'checkout_fuchsia and host_os == "linux"',
     'dep_type': 'cipd'
   },
+  # depot_tools/ninja wrapper calls third_party/ninja/{ninja, ninja.exe}.
+  # crashpad/third_party/ninja/ninja is another wrapper to call linux ninja
+  # or mac ninja.
+  # This allows crashpad developers to work for multiple platforms on the same
+  # machine.
+  'crashpad/third_party/ninja': {
+    'packages': [
+      {
+        'package': 'infra/3pp/tools/ninja/${{platform}}',
+        'version': Var('ninja_version'),
+      }
+    ],
+    'condition': 'host_os == "win"',
+    'dep_type': 'cipd',
+  },
+  'crashpad/third_party/ninja/linux': {
+    'packages': [
+      {
+        'package': 'infra/3pp/tools/ninja/${{platform}}',
+        'version': Var('ninja_version'),
+      }
+    ],
+    'condition': 'host_os == "linux"',
+    'dep_type': 'cipd',
+  },
+  'crashpad/third_party/ninja/mac-amd64': {
+    'packages': [
+      {
+        'package': 'infra/3pp/tools/ninja/mac-amd64',
+        'version': Var('ninja_version'),
+      }
+    ],
+    'condition': 'host_os == "mac" and host_cpu == "x64"',
+    'dep_type': 'cipd',
+  },
+  'crashpad/third_party/ninja/mac-arm64': {
+    'packages': [
+      {
+        'package': 'infra/3pp/tools/ninja/mac-arm64',
+        'version': Var('ninja_version'),
+      }
+    ],
+    'condition': 'host_os == "mac" and host_cpu == "arm64"',
+    'dep_type': 'cipd',
+  },
   'crashpad/third_party/win/toolchain': {
     # This package is only updated when the solution in .gclient includes an
     # entry like:
@@ -106,7 +212,7 @@ deps = {
     'packages': [
       {
         'package': 'chrome_internal/third_party/sdk/windows',
-        'version': 'uploaded:2018-06-13'
+        'version': 'uploaded:2021-04-28'
       },
     ],
     'condition': 'checkout_win and pull_win_toolchain',
@@ -116,52 +222,35 @@ deps = {
 
 hooks = [
   {
-    'name': 'clang_format_mac',
-    'pattern': '.',
-    'condition': 'host_os == "mac"',
-    'action': [
-      'download_from_google_storage',
-      '--no_resume',
-      '--no_auth',
-      '--bucket=chromium-clang-format',
-      '--sha1_file',
-      'buildtools/mac/clang-format.sha1',
-    ],
-  },
-  {
-    'name': 'clang_format_linux',
+    # If using a local clang ("pull_linux_clang" above), also pull down a
+    # sysroot.
+    'name': 'sysroot_linux',
     'pattern': '.',
-    'condition': 'host_os == "linux"',
+    'condition': 'checkout_linux and pull_linux_clang',
     'action': [
-      'download_from_google_storage',
-      '--no_resume',
-      '--no_auth',
-      '--bucket=chromium-clang-format',
-      '--sha1_file',
-      'buildtools/linux64/clang-format.sha1',
+      'crashpad/build/install_linux_sysroot.py',
     ],
   },
   {
-    'name': 'clang_format_win',
+    # Avoid introducing unnecessary PRESUBMIT.py file from build/fuchsia.
+    # Never fail and ignore the error if the file does not exist.
+    'name': 'Remove the PRESUBMIT.py from build/fuchsia',
     'pattern': '.',
-    'condition': 'host_os == "win"',
+    'condition': 'checkout_fuchsia',
     'action': [
-      'download_from_google_storage',
-      '--no_resume',
-      '--no_auth',
-      '--bucket=chromium-clang-format',
-      '--sha1_file',
-      'buildtools/win/clang-format.exe.sha1',
+      'rm',
+      '-f',
+      'crashpad/build/fuchsia/PRESUBMIT.py',
     ],
   },
   {
-    # If using a local clang ("pull_linux_clang" above), also pull down a
-    # sysroot.
-    'name': 'sysroot_linux',
+    'name': 'Generate Fuchsia Build Definitions',
     'pattern': '.',
-    'condition': 'checkout_linux and pull_linux_clang',
+    'condition': 'checkout_fuchsia',
     'action': [
-      'crashpad/build/install_linux_sysroot.py',
+      'python3',
+      'crashpad/build/fuchsia_envs.py',
+      'crashpad/build/fuchsia/gen_build_defs.py'
     ],
   },
   {
@@ -169,7 +258,7 @@ hooks = [
     'pattern': '.',
     'condition': 'run_setup_ios_gn and checkout_ios',
     'action': [
-        'python',
+        'python3',
         'crashpad/build/ios/setup_ios_gn.py'
     ],
   },
diff --git a/extern/crashpad/crashpad/third_party/glibc/BUILD.gn b/extern/crashpad/crashpad/OWNERS
similarity index 77%
rename from extern/crashpad/crashpad/third_party/glibc/BUILD.gn
rename to extern/crashpad/crashpad/OWNERS
index 3f2b08bc0d..f5d56bf7d0 100644
--- a/extern/crashpad/crashpad/third_party/glibc/BUILD.gn
+++ b/extern/crashpad/crashpad/OWNERS
@@ -1,4 +1,4 @@
-# Copyright 2019 The Crashpad Authors. All rights reserved.
+# Copyright 2025 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,6 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-source_set("glibc") {
-  sources = [ "elf/elf.h" ]
-}
+jperaza@chromium.org
+justincohen@chromium.org
+lgrey@chromium.org
+mark@chromium.org
+pbos@chromium.org
+wfh@chromium.org
diff --git a/extern/crashpad/crashpad/README.md b/extern/crashpad/crashpad/README.md
index b20777bbf8..1db2920e18 100644
--- a/extern/crashpad/crashpad/README.md
+++ b/extern/crashpad/crashpad/README.md
@@ -1,5 +1,5 @@
 <!--
-Copyright 2015 The Crashpad Authors. All rights reserved.
+Copyright 2015 The Crashpad Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/build/BUILD.gn b/extern/crashpad/crashpad/build/BUILD.gn
index 9f959ec93a..664e498249 100644
--- a/extern/crashpad/crashpad/build/BUILD.gn
+++ b/extern/crashpad/crashpad/build/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2017 The Crashpad Authors. All rights reserved.
+# Copyright 2017 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -30,6 +30,11 @@ config("crashpad_is_in_fuchsia") {
   }
 }
 
+config("flock_always_supported_defines") {
+  defines =
+      [ "CRASHPAD_FLOCK_ALWAYS_SUPPORTED=$crashpad_flock_always_supported" ]
+}
+
 group("default_exe_manifest_win") {
   if (crashpad_is_in_chromium) {
     deps = [ "//build/win:default_exe_manifest" ]
@@ -46,16 +51,18 @@ config("crashpad_fuzzer_flags") {
   ldflags = [ "-fsanitize=address" ]
 }
 
-if (crashpad_is_ios) {
-  group("ios_enable_arc") {
-    if (crashpad_is_in_chromium) {
-      public_configs = [ "//build/config/compiler:enable_arc" ]
-    } else if (crashpad_is_standalone) {
-      public_configs =
-          [ "//third_party/mini_chromium/mini_chromium/build/config:ios_enable_arc" ]
+if (crashpad_is_apple) {
+  group("apple_enable_arc") {
+    # If `crashpad_is_in_chromium`, then because Chromium enables ARC
+    # compilation by default, no special configuration is needed.
+
+    if (crashpad_is_standalone) {
+      public_configs = [ "//third_party/mini_chromium/mini_chromium/build/config:apple_enable_arc" ]
     }
   }
+}
 
+if (crashpad_is_ios) {
   group("ios_xctest") {
     if (crashpad_is_in_chromium) {
       public_configs = [ "//build/config/ios:xctest_config" ]
@@ -65,4 +72,17 @@ if (crashpad_is_ios) {
       ]
     }
   }
+
+  if (crashpad_is_in_chromium) {
+    import("//build/config/ios/ios_sdk.gni")
+    crashpad_is_ios_app_extension = ios_is_app_extension
+  } else {
+    crashpad_is_ios_app_extension = false
+  }
+
+  config("crashpad_is_ios_app_extension") {
+    if (crashpad_is_ios_app_extension) {
+      defines = [ "CRASHPAD_IS_IOS_APP_EXTENSION" ]
+    }
+  }
 }
diff --git a/extern/crashpad/crashpad/build/BUILDCONFIG.gn b/extern/crashpad/crashpad/build/BUILDCONFIG.gn
index d40a6ad2da..ef36cf6336 100644
--- a/extern/crashpad/crashpad/build/BUILDCONFIG.gn
+++ b/extern/crashpad/crashpad/build/BUILDCONFIG.gn
@@ -1,4 +1,4 @@
-# Copyright 2017 The Crashpad Authors. All rights reserved.
+# Copyright 2017 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -69,6 +69,14 @@ if (crashpad_use_libfuzzer) {
   _default_configs += [ "//build/config:crashpad_fuzzer_flags" ]
 }
 
+if (current_os == "fuchsia") {
+  _default_configs += [
+    "//third_party/fuchsia-gn-sdk/src/config:compiler",
+    "//third_party/fuchsia-gn-sdk/src/config:runtime_library",
+  ]
+  import("//third_party/fuchsia-gn-sdk/src/gn_configs.gni")
+}
+
 _default_executable_configs = _default_configs + [
                                 "$_mini_chromium_dir/build/config:executable",
                                 "$_mini_chromium_dir/build/config:win_console",
diff --git a/extern/crashpad/crashpad/build/config/fuchsia/gn_configs.gni b/extern/crashpad/crashpad/build/config/fuchsia/gn_configs.gni
new file mode 100644
index 0000000000..e38a6ae7d9
--- /dev/null
+++ b/extern/crashpad/crashpad/build/config/fuchsia/gn_configs.gni
@@ -0,0 +1,32 @@
+# Copyright 2024 The Crashpad Authors
+#
+# 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.
+
+# This file is copied from
+# https://crsrc.org/c/build/config/fuchsia/gn_configs.gni?q=gn_configs.gni
+# with some local modifications to match the crashpad setup.
+
+# Path to the fuchsia SDK. This is intended for use in other templates &
+# rules to reference the contents of the fuchsia SDK.
+fuchsia_sdk = "//third_party/fuchsia/sdk/linux-amd64"
+
+declare_args() {
+  # Specify a readelf_exec path to use. If not specified, the host's system
+  # executable will be used. Passed to populate_build_id_dir.py and
+  # prepare_package_inputs.py via the --readelf-exec flag.
+  # Must be a GN path (not an absolute path) since it is adjusted with
+  # rebase_path().
+  if (!defined(fuchsia_sdk_readelf_exec)) {
+    fuchsia_sdk_readelf_exec = ""
+  }
+}
diff --git a/extern/crashpad/crashpad/build/crashpad_buildconfig.gni b/extern/crashpad/crashpad/build/crashpad_buildconfig.gni
index a9a8a102cb..80992a1b99 100644
--- a/extern/crashpad/crashpad/build/crashpad_buildconfig.gni
+++ b/extern/crashpad/crashpad/build/crashpad_buildconfig.gni
@@ -1,4 +1,4 @@
-# Copyright 2017 The Crashpad Authors. All rights reserved.
+# Copyright 2017 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -36,11 +36,10 @@ crashpad_is_standalone = crashpad_dependencies == "standalone"
 
 # This is the parent directory that contains the mini_chromium source dir.
 # This variable is not used when crashpad_is_in_chromium.
-if (crashpad_is_external || crashpad_is_in_dart) {
-  # External and Dart SDK builds assume crashpad and mini_chromium are peers.
-  mini_chromium_source_parent = "../mini_chromium"
-} else if (crashpad_is_in_fuchsia) {
-  mini_chromium_source_parent = "//third_party/crashpad/third_party/mini_chromium"
+if (crashpad_is_in_fuchsia) {
+  import("//third_party/crashpad/fuchsia_buildconfig.gni")
+  mini_chromium_source_parent =
+      fuchsia_crashpad_root + "/third_party/mini_chromium"
 } else {
   mini_chromium_source_parent = "../third_party/mini_chromium"
 }
@@ -50,16 +49,23 @@ _mini_chromium_source_root = "$mini_chromium_source_parent/mini_chromium"
 
 # This references the mini_chromium location for importing GN files.
 if (crashpad_is_external || crashpad_is_in_dart) {
-  mini_chromium_import_root = "../../$_mini_chromium_source_root"
+  mini_chromium_import_root = "../../../$_mini_chromium_source_root"
 } else if (crashpad_is_in_fuchsia) {
-  mini_chromium_import_root = "//third_party/mini_chromium"
+  mini_chromium_import_root = fuchsia_mini_chromium_root
 } else {
   mini_chromium_import_root = _mini_chromium_source_root
 }
 
 if (crashpad_is_in_chromium) {
+  if (is_ios) {
+    # For `target_platform`.
+    import("//build/config/apple/mobile_config.gni")
+  }
+
   crashpad_is_mac = is_mac
   crashpad_is_ios = is_ios
+  crashpad_is_tvos = is_ios && target_platform == "tvos"
+  crashpad_is_apple = is_apple
   crashpad_is_win = is_win
   crashpad_is_linux = is_linux || is_chromeos
   crashpad_is_android = is_android
@@ -70,9 +76,17 @@ if (crashpad_is_in_chromium) {
   crashpad_is_clang = is_clang
 } else {
   import("$mini_chromium_import_root/build/compiler.gni")
+  import("$mini_chromium_import_root/build/platform.gni")
+
+  if (mini_chromium_is_ios) {
+    # For `target_platform`.
+    import("$mini_chromium_import_root/build/ios/ios_sdk.gni")
+  }
 
   crashpad_is_mac = mini_chromium_is_mac
   crashpad_is_ios = mini_chromium_is_ios
+  crashpad_is_tvos = crashpad_is_ios && target_platform == "tvos"
+  crashpad_is_apple = mini_chromium_is_apple
   crashpad_is_win = mini_chromium_is_win
   crashpad_is_linux = mini_chromium_is_linux
   crashpad_is_android = mini_chromium_is_android
@@ -81,8 +95,13 @@ if (crashpad_is_in_chromium) {
   crashpad_is_posix = mini_chromium_is_posix
 
   crashpad_is_clang = mini_chromium_is_clang
+
+  # fuchsia-gn-sdk from chromium uses "is_fuchsia" condition.
+  is_fuchsia = crashpad_is_fuchsia
 }
 
+crashpad_flock_always_supported = !(crashpad_is_android || crashpad_is_fuchsia)
+
 template("crashpad_executable") {
   executable(target_name) {
     forward_variables_from(invoker,
@@ -102,7 +121,7 @@ template("crashpad_executable") {
     if (crashpad_is_in_fuchsia) {
       conversion_config = [ "//build/config:Wno-conversion" ]
       if (configs + conversion_config - conversion_config == configs) {
-        # TODO(https://fxbug.dev/58162): Decide if these are worth enabling.
+        # TODO(https://fxbug.dev/42136089): Decide if these are worth enabling.
         configs += conversion_config
       }
     }
@@ -128,7 +147,7 @@ template("crashpad_loadable_module") {
     if (crashpad_is_in_fuchsia) {
       conversion_config = [ "//build/config:Wno-conversion" ]
       if (configs + conversion_config - conversion_config == configs) {
-        # TODO(https://fxbug.dev/58162): Decide if these are worth enabling.
+        # TODO(https://fxbug.dev/42136089): Decide if these are worth enabling.
         configs += conversion_config
       }
     }
@@ -154,7 +173,7 @@ template("crashpad_static_library") {
     if (crashpad_is_in_fuchsia) {
       conversion_config = [ "//build/config:Wno-conversion" ]
       if (configs + conversion_config - conversion_config == configs) {
-        # TODO(https://fxbug.dev/58162): Decide if these are worth enabling.
+        # TODO(https://fxbug.dev/42136089): Decide if these are worth enabling.
         configs += conversion_config
       }
     }
diff --git a/extern/crashpad/crashpad/build/crashpad_fuzzer_test.gni b/extern/crashpad/crashpad/build/crashpad_fuzzer_test.gni
index cc709b0d11..3c5be18512 100644
--- a/extern/crashpad/crashpad/build/crashpad_fuzzer_test.gni
+++ b/extern/crashpad/crashpad/build/crashpad_fuzzer_test.gni
@@ -1,4 +1,4 @@
-# Copyright 2018 The Crashpad Authors. All rights reserved.
+# Copyright 2018 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/build/fuchsia_envs.py b/extern/crashpad/crashpad/build/fuchsia_envs.py
new file mode 100644
index 0000000000..753c322070
--- /dev/null
+++ b/extern/crashpad/crashpad/build/fuchsia_envs.py
@@ -0,0 +1,47 @@
+#!/usr/bin/env python3
+
+# Copyright 2024 The Crashpad Authors
+#
+# 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.
+
+import os
+import platform
+import subprocess
+import sys
+
+
+def main(args):
+    """
+    Executes the test-scripts with required environment variables. It acts like
+    /usr/bin/env, but provides some extra functionality to dynamically set up
+    the environment variables.
+
+    Args:
+        args: the command line arguments without the script name itself.
+    """
+    os.environ['SRC_ROOT'] = os.path.abspath(
+        os.path.join(os.path.dirname(__file__), '..'))
+
+    assert platform.system() == 'Linux', 'Unsupported OS ' + platform.system()
+    os.environ['FUCHSIA_SDK_ROOT'] = os.path.join(
+        os.environ['SRC_ROOT'], 'third_party/fuchsia/sdk/linux-amd64/')
+    os.environ['FUCHSIA_GN_SDK_ROOT'] = os.path.join(
+        os.environ['SRC_ROOT'], 'third_party/fuchsia-gn-sdk/src')
+    os.environ['FUCHSIA_READELF'] = os.path.join(os.environ['SRC_ROOT'],
+        'third_party/fuchsia/clang/linux-amd64/bin/llvm-readelf')
+
+    return subprocess.run(args).returncode
+
+
+if __name__ == '__main__':
+    sys.exit(main(sys.argv[1:]))
diff --git a/extern/crashpad/crashpad/build/install_linux_sysroot.py b/extern/crashpad/crashpad/build/install_linux_sysroot.py
index c05c4d5dbe..287d5c9d76 100755
--- a/extern/crashpad/crashpad/build/install_linux_sysroot.py
+++ b/extern/crashpad/crashpad/build/install_linux_sysroot.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright 2018 The Crashpad Authors. All rights reserved.
+# Copyright 2018 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/build/ios/Unittest-Info.plist b/extern/crashpad/crashpad/build/ios/Unittest-Info.plist
index fdca91fb13..0af7bbc413 100644
--- a/extern/crashpad/crashpad/build/ios/Unittest-Info.plist
+++ b/extern/crashpad/crashpad/build/ios/Unittest-Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleIdentifier</key>
-	<string>${IOS_BUNDLE_ID_PREFIX}.googletest.${GTEST_BUNDLE_ID_SUFFIX:rfc1034identifier}</string>
+	<string>${IOS_BUNDLE_ID_PREFIX}.${GTEST_BUNDLE_ID_SUFFIX:rfc1034identifier}</string>
 	<key>UIApplicationDelegate</key>
 	<string>CrashpadUnitTestDelegate</string>
 </dict>
diff --git a/extern/crashpad/crashpad/build/ios/convert_gn_xcodeproj.py b/extern/crashpad/crashpad/build/ios/convert_gn_xcodeproj.py
index d546279ce0..71b8d3d28f 100755
--- a/extern/crashpad/crashpad/build/ios/convert_gn_xcodeproj.py
+++ b/extern/crashpad/crashpad/build/ios/convert_gn_xcodeproj.py
@@ -1,6 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
-# Copyright 2020 The Crashpad Authors. All rights reserved.
+# Copyright 2020 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -26,14 +26,130 @@
 import collections
 import copy
 import filecmp
-import json
+import functools
 import hashlib
+import io
+import json
 import os
 import re
 import shutil
+import string
 import subprocess
 import sys
 import tempfile
+import xml.etree.ElementTree
+
+
+LLDBINIT_PATH = '$(PROJECT_DIR)/.lldbinit'
+
+PYTHON_RE = re.compile('[ /]python[23]?$')
+
+XCTEST_PRODUCT_TYPES = frozenset((
+    'com.apple.product-type.bundle.unit-test',
+    'com.apple.product-type.bundle.ui-testing',
+))
+
+SCHEME_PRODUCT_TYPES = frozenset((
+    'com.apple.product-type.app-extension',
+    'com.apple.product-type.application',
+    'com.apple.product-type.framework'
+))
+
+
+class Template(string.Template):
+
+  """A subclass of string.Template that changes delimiter."""
+
+  delimiter = '@'
+
+
+@functools.lru_cache
+def LoadSchemeTemplate(root, name):
+  """Return a string.Template object for scheme file loaded relative to root."""
+  path = os.path.join(root, 'build', 'ios', name + '.template')
+  with open(path) as file:
+    return Template(file.read())
+
+
+def CreateIdentifier(str_id):
+  """Return a 24 characters string that can be used as an identifier."""
+  return hashlib.sha1(str_id.encode("utf-8")).hexdigest()[:24].upper()
+
+
+def GenerateSchemeForTarget(root, project, old_project, name, path, is_test):
+  """Generates the .xcsheme file for target named |name|.
+
+  The file is generated in the new project schemes directory from a template.
+  If there is an existing previous project, then the old scheme file is copied
+  and the lldbinit setting is set. If lldbinit setting is already correct, the
+  file is not modified, just copied.
+  """
+  project_name = os.path.basename(project)
+  relative_path = os.path.join('xcshareddata', 'xcschemes', name + '.xcscheme')
+  identifier = CreateIdentifier('%s %s' % (name, path))
+
+  scheme_path = os.path.join(project, relative_path)
+  if not os.path.isdir(os.path.dirname(scheme_path)):
+    os.makedirs(os.path.dirname(scheme_path))
+
+  substitutions = {
+    'LLDBINIT_PATH': LLDBINIT_PATH,
+    'BLUEPRINT_IDENTIFIER': identifier,
+    'BUILDABLE_NAME': path,
+    'BLUEPRINT_NAME': name,
+    'PROJECT_NAME': project_name
+  }
+
+  if is_test:
+    template = LoadSchemeTemplate(root, 'xcodescheme-testable')
+    substitutions['PATH'] = os.environ['PATH']
+
+  else:
+    template = LoadSchemeTemplate(root, 'xcodescheme')
+
+  old_scheme_path = os.path.join(old_project, relative_path)
+  if os.path.exists(old_scheme_path):
+
+    tree = xml.etree.ElementTree.parse(old_scheme_path)
+    tree_root = tree.getroot()
+
+    for reference in tree_root.findall('.//BuildableReference'):
+      for (attr, value) in (
+          ('BuildableName', path),
+          ('BlueprintName', name),
+          ('BlueprintIdentifier', identifier)):
+        if reference.get(attr) != value:
+          reference.set(attr, value)
+
+    for child in tree_root:
+      if child.tag not in ('TestAction', 'LaunchAction'):
+        continue
+
+      if child.get('customLLDBInitFile') != LLDBINIT_PATH:
+        child.set('customLLDBInitFile', LLDBINIT_PATH)
+
+    if is_test:
+
+      template_tree = xml.etree.ElementTree.parse(
+          io.StringIO(template.substitute(**substitutions)))
+
+      template_tree_root = template_tree.getroot()
+      for child in tree_root:
+        if child.tag != 'BuildAction':
+          continue
+
+        for subchild in list(child):
+          child.remove(subchild)
+
+        for post_action in template_tree_root.findall('.//PostActions'):
+          child.append(post_action)
+
+    tree.write(scheme_path, xml_declaration=True, encoding='UTF-8')
+
+  else:
+
+    with open(scheme_path, 'w') as scheme_file:
+      scheme_file.write(template.substitute(**substitutions))
 
 
 class XcodeProject(object):
@@ -46,7 +162,7 @@ def AddObject(self, parent_name, obj):
     while True:
       self.counter += 1
       str_id = "%s %s %d" % (parent_name, obj['isa'], self.counter)
-      new_id = hashlib.sha1(str_id.encode("utf-8")).hexdigest()[:24].upper()
+      new_id = CreateIdentifier(str_id)
 
       # Make sure ID is unique. It's possible there could be an id conflict
       # since this is run after GN runs.
@@ -54,6 +170,93 @@ def AddObject(self, parent_name, obj):
         self.objects[new_id] = obj
         return new_id
 
+  def IterObjectsByIsa(self, isa):
+    """Iterates overs objects of the |isa| type."""
+    for key, obj in self.objects.items():
+      if obj['isa'] == isa:
+        yield (key, obj)
+
+  def IterNativeTargetByProductType(self, product_types):
+    """Iterates over PBXNativeTarget objects of any |product_types| types."""
+    for key, obj in self.IterObjectsByIsa('PBXNativeTarget'):
+      if obj['productType'] in product_types:
+        yield (key, obj)
+
+  def UpdateBuildScripts(self):
+    """Update build scripts to respect configuration and platforms."""
+    for key, obj in self.IterObjectsByIsa('PBXShellScriptBuildPhase'):
+
+      shell_path = obj['shellPath']
+      shell_code = obj['shellScript']
+      if shell_path.endswith('/sh'):
+        shell_code = shell_code.replace(
+            'ninja -C .',
+            'ninja -C "../${CONFIGURATION}${EFFECTIVE_PLATFORM_NAME}"')
+      elif PYTHON_RE.search(shell_path):
+        shell_code = shell_code.replace(
+            '''ninja_params = [ '-C', '.' ]''',
+            '''ninja_params = [ '-C', '../' + os.environ['CONFIGURATION']'''
+            ''' + os.environ['EFFECTIVE_PLATFORM_NAME'] ]''')
+
+      # Replace the build script in the object.
+      obj['shellScript'] = shell_code
+
+
+  def UpdateBuildConfigurations(self, configurations):
+    """Add new configurations, using the first one as default."""
+
+    # Create a list with all the objects of interest. This is needed
+    # because objects will be added to/removed from the project upon
+    # iterating this list and python dictionaries cannot be mutated
+    # during iteration.
+
+    for key, obj in list(self.IterObjectsByIsa('XCConfigurationList')):
+      # Use the first build configuration as template for creating all the
+      # new build configurations.
+      build_config_template = self.objects[obj['buildConfigurations'][0]]
+      build_config_template['buildSettings']['CONFIGURATION_BUILD_DIR'] = \
+          '$(PROJECT_DIR)/../$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)'
+
+      # Remove the existing build configurations from the project before
+      # creating the new ones.
+      for build_config_id in obj['buildConfigurations']:
+        del self.objects[build_config_id]
+      obj['buildConfigurations'] = []
+
+      for configuration in configurations:
+        build_config = copy.copy(build_config_template)
+        build_config['name'] = configuration
+        build_config_id = self.AddObject('products', build_config)
+        obj['buildConfigurations'].append(build_config_id)
+
+  def GetHostMappingForXCTests(self):
+    """Returns a dict from targets to the list of their xctests modules."""
+    mapping = collections.defaultdict(list)
+    for key, obj in self.IterNativeTargetByProductType(XCTEST_PRODUCT_TYPES):
+      build_config_lists_id = obj['buildConfigurationList']
+      build_configs = self.objects[build_config_lists_id]['buildConfigurations']
+
+      # Use the first build configuration to get the name of the host target.
+      # This is arbitrary, but since the build configuration are all identical
+      # after UpdateBuildConfiguration, except for their 'name', it is fine.
+      build_config = self.objects[build_configs[0]]
+      if obj['productType'] == 'com.apple.product-type.bundle.unit-test':
+        # The test_host value will look like this:
+        # `$(BUILD_PRODUCTS_DIR)/host_app_name.app/host_app_name`
+        #
+        # Extract the `host_app_name.app` part as key for the output.
+        test_host_path = build_config['buildSettings']['TEST_HOST']
+        test_host_name = os.path.basename(os.path.dirname(test_host_path))
+      else:
+        test_host_name = build_config['buildSettings']['TEST_TARGET_NAME']
+
+      test_name = obj['name']
+      test_path = self.objects[obj['productReference']]['path']
+
+      mapping[test_host_name].append((key, test_name, test_path))
+
+    return dict(mapping)
+
 
 def check_output(command):
   """Wrapper around subprocess.check_output that decode output as utf-8."""
@@ -100,7 +303,7 @@ def WriteXcodeProject(output_path, json_string):
         os.path.join(output_path, 'project.pbxproj'))
 
 
-def UpdateXcodeProject(project_dir, configurations, root_dir):
+def UpdateXcodeProject(project_dir, old_project_dir, configurations, root_dir):
   """Update inplace Xcode project to support multiple configurations.
 
   Args:
@@ -113,74 +316,66 @@ def UpdateXcodeProject(project_dir, configurations, root_dir):
   json_data = json.loads(LoadXcodeProjectAsJSON(project_dir))
   project = XcodeProject(json_data['objects'])
 
-  objects_to_remove = []
-  for value in list(project.objects.values()):
-    isa = value['isa']
+  project.UpdateBuildScripts()
+  project.UpdateBuildConfigurations(configurations)
 
-    # Teach build shell script to look for the configuration and platform.
-    if isa == 'PBXShellScriptBuildPhase':
-      shell_path = value['shellPath']
-      if shell_path.endswith('/sh'):
-        value['shellScript'] = value['shellScript'].replace(
-            'ninja -C .',
-            'ninja -C "../${CONFIGURATION}${EFFECTIVE_PLATFORM_NAME}"')
-      elif re.search('[ /]python[23]?$', shell_path):
-        value['shellScript'] = value['shellScript'].replace(
-            'ninja_params = [ \'-C\', \'.\' ]',
-            'ninja_params = [ \'-C\', \'../\' + os.environ[\'CONFIGURATION\']'
-            ' + os.environ[\'EFFECTIVE_PLATFORM_NAME\'] ]')
-
-    # Add new configuration, using the first one as default.
-    if isa == 'XCConfigurationList':
-      value['defaultConfigurationName'] = configurations[0]
-      objects_to_remove.extend(value['buildConfigurations'])
-
-      build_config_template = project.objects[value['buildConfigurations'][0]]
-      build_config_template['buildSettings']['CONFIGURATION_BUILD_DIR'] = \
-          '$(PROJECT_DIR)/../$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)'
+  mapping = project.GetHostMappingForXCTests()
 
-      value['buildConfigurations'] = []
-      for configuration in configurations:
-        new_build_config = copy.copy(build_config_template)
-        new_build_config['name'] = configuration
-        value['buildConfigurations'].append(
-            project.AddObject('products', new_build_config))
+  # Generate schemes for application, extensions and framework targets
+  for key, obj in project.IterNativeTargetByProductType(SCHEME_PRODUCT_TYPES):
+    product = project.objects[obj['productReference']]
+    product_path = product['path']
+
+    # Do not generate scheme for the XCTests and XXCUITests target app.
+    # Instead, a scheme will be generated for each test modules.
+    tests = mapping.get(product_path, []) + mapping.get(obj['name'], [])
+    if not tests:
+      GenerateSchemeForTarget(
+          root_dir, project_dir, old_project_dir,
+          obj['name'], product_path, False)
+
+    else:
+      for (_, test_name, test_path) in tests:
+        GenerateSchemeForTarget(
+          root_dir, project_dir, old_project_dir,
+          test_name, test_path, True)
+
+  root_object = project.objects[json_data['rootObject']]
+  main_group = project.objects[root_object['mainGroup']]
 
-  for object_id in objects_to_remove:
-    del project.objects[object_id]
+  sources = None
+  for child_key in main_group['children']:
+    child = project.objects[child_key]
+    if child.get('name') == 'Source' or child.get('name') == 'Sources':
+      sources = child
+      break
 
-  source = GetOrCreateRootGroup(project, json_data['rootObject'], 'Source')
-  AddMarkdownToProject(project, root_dir, source)
-  SortFileReferencesByName(project, source)
+  if sources is None:
+    sources = main_group
+
+  AddMarkdownToProject(project, root_dir, sources, sources is main_group)
+  SortFileReferencesByName(project, sources, root_object.get('productRefGroup'))
 
   objects = collections.OrderedDict(sorted(project.objects.items()))
-  WriteXcodeProject(project_dir, json.dumps(json_data))
+  # WriteXcodeProject(project_dir, json.dumps(json_data))
 
 
-def CreateGroup(project, parent_group, group_name, path=None):
+def CreateGroup(project, parent_group, group_name, use_relative_paths):
   group_object = {
     'children': [],
     'isa': 'PBXGroup',
-    'name': group_name,
     'sourceTree': '<group>',
   }
-  if path is not None:
-    group_object['path'] = path
+  if use_relative_paths:
+    group_object['path'] = group_name
+  else:
+    group_object['name'] = group_name
   parent_group_name = parent_group.get('name', '')
   group_object_key = project.AddObject(parent_group_name, group_object)
   parent_group['children'].append(group_object_key)
   return group_object
 
 
-def GetOrCreateRootGroup(project, root_object, group_name):
-  main_group = project.objects[project.objects[root_object]['mainGroup']]
-  for child_key in main_group['children']:
-    child = project.objects[child_key]
-    if child['name'] == group_name:
-      return child
-  return CreateGroup(project, main_group, group_name, path='../..')
-
-
 class ObjectKey(object):
 
   """Wrapper around PBXFileReference and PBXGroup for sorting.
@@ -198,19 +393,24 @@ class ObjectKey(object):
   is checked and compared in alphabetic order.
   """
 
-  def __init__(self, obj):
+  def __init__(self, obj, last):
     self.isa = obj['isa']
     if 'name' in obj:
       self.name = obj['name']
     else:
       self.name = obj['path']
+    self.last = last
 
   def __lt__(self, other):
+    if self.last != other.last:
+      return other.last
     if self.isa != other.isa:
       return self.isa > other.isa
     return self.name < other.name
 
   def __gt__(self, other):
+    if self.last != other.last:
+      return self.last
     if self.isa != other.isa:
       return self.isa < other.isa
     return self.name > other.name
@@ -219,9 +419,10 @@ def __eq__(self, other):
     return self.isa == other.isa and self.name == other.name
 
 
-def SortFileReferencesByName(project, group_object):
+def SortFileReferencesByName(project, group_object, products_group_ref):
   SortFileReferencesByNameWithSortKey(
-      project, group_object, lambda ref: ObjectKey(project.objects[ref]))
+      project, group_object,
+      lambda ref: ObjectKey(project.objects[ref], ref == products_group_ref))
 
 
 def SortFileReferencesByNameWithSortKey(project, group_object, sort_key):
@@ -232,7 +433,7 @@ def SortFileReferencesByNameWithSortKey(project, group_object, sort_key):
       SortFileReferencesByNameWithSortKey(project, child, sort_key)
 
 
-def AddMarkdownToProject(project, root_dir, group_object):
+def AddMarkdownToProject(project, root_dir, group_object, use_relative_paths):
   list_files_cmd = ['git', '-C', root_dir, 'ls-files', '*.md']
   paths = check_output(list_files_cmd).splitlines()
   ios_internal_dir = os.path.join(root_dir, 'ios_internal')
@@ -245,36 +446,48 @@ def AddMarkdownToProject(project, root_dir, group_object):
       "fileEncoding": "4",
       "isa": "PBXFileReference",
       "lastKnownFileType": "net.daringfireball.markdown",
-      "name": os.path.basename(path),
-      "path": path,
       "sourceTree": "<group>"
     }
-    new_markdown_entry_id = project.AddObject('sources', new_markdown_entry)
-    folder = GetFolderForPath(project, group_object, os.path.dirname(path))
+    if use_relative_paths:
+      new_markdown_entry['path'] = os.path.basename(path)
+    else:
+      new_markdown_entry['name'] = os.path.basename(path)
+      new_markdown_entry['path'] = path
+    folder = GetFolderForPath(
+        project, group_object, os.path.dirname(path),
+        use_relative_paths)
+    folder_name = folder.get('name', None)
+    if folder_name is None:
+      folder_name = folder.get('path', 'sources')
+    new_markdown_entry_id = project.AddObject(folder_name, new_markdown_entry)
     folder['children'].append(new_markdown_entry_id)
 
 
-def GetFolderForPath(project, group_object, path):
+def GetFolderForPath(project, group_object, path, use_relative_paths):
   objects = project.objects
   if not path:
     return group_object
   for folder in path.split('/'):
     children = group_object['children']
     new_root = None
-    for child in children:
-      if objects[child]['isa'] == 'PBXGroup' and \
-         objects[child]['name'] == folder:
-        new_root = objects[child]
-        break
+    for child_key in children:
+      child = objects[child_key]
+      if child['isa'] == 'PBXGroup':
+        child_name = child.get('name', None)
+        if child_name is None:
+          child_name = child.get('path')
+        if child_name == folder:
+          new_root = child
+          break
     if not new_root:
       # If the folder isn't found we could just cram it into the leaf existing
       # folder, but that leads to folders with tons of README.md inside.
-      new_root = CreateGroup(project, group_object, folder)
+      new_root = CreateGroup(project, group_object, folder, use_relative_paths)
     group_object = new_root
   return group_object
 
 
-def ConvertGnXcodeProject(root_dir, input_dir, output_dir, configurations):
+def ConvertGnXcodeProject(root_dir, proj_name, input_dir, output_dir, configs):
   '''Tweak the Xcode project generated by gn to support multiple configurations.
 
   The Xcode projects generated by "gn gen --ide" only supports a single
@@ -284,34 +497,22 @@ def ConvertGnXcodeProject(root_dir, input_dir, output_dir, configurations):
   to select them in Xcode).
 
   Args:
+    root_dir: directory that is the root of the project
+    proj_name: name of the Xcode project "file" (usually `all.xcodeproj`)
     input_dir: directory containing the XCode projects created by "gn gen --ide"
     output_dir: directory where the tweaked Xcode projects will be saved
-    configurations: list of string corresponding to the configurations that
-      need to be supported by the tweaked Xcode projects, must contains at
-      least one value.
+    configs: list of string corresponding to the configurations that need to be
+        supported by the tweaked Xcode projects, must contains at least one
+        value.
   '''
 
-  # Update the project (supports legacy name "products.xcodeproj" or the new
-  # project name "all.xcodeproj").
-  for project_name in ('all.xcodeproj', 'products.xcodeproj'):
-    if os.path.exists(os.path.join(input_dir, project_name)):
-      UpdateXcodeProject(
-          os.path.join(input_dir, project_name),
-          configurations, root_dir)
-
-      CopyTreeIfChanged(os.path.join(input_dir, project_name),
-                        os.path.join(output_dir, project_name))
-
-    else:
-      shutil.rmtree(os.path.join(output_dir, project_name), ignore_errors=True)
+  UpdateXcodeProject(
+      os.path.join(input_dir, proj_name),
+      os.path.join(output_dir, proj_name),
+      configs, root_dir)
 
-  # Copy all.xcworkspace if it exists (will be removed in a future gn version).
-  workspace_name = 'all.xcworkspace'
-  if os.path.exists(os.path.join(input_dir, workspace_name)):
-    CopyTreeIfChanged(os.path.join(input_dir, workspace_name),
-                      os.path.join(output_dir, workspace_name))
-  else:
-    shutil.rmtree(os.path.join(output_dir, workspace_name), ignore_errors=True)
+  CopyTreeIfChanged(os.path.join(input_dir, proj_name),
+                    os.path.join(output_dir, proj_name))
 
 
 def Main(args):
@@ -329,33 +530,30 @@ def Main(args):
   parser.add_argument(
       '--root', type=os.path.abspath, required=True,
       help='root directory of the project')
+  parser.add_argument(
+      '--project-name', default='all.xcodeproj', dest='proj_name',
+      help='name of the Xcode project (default: %(default)s)')
   args = parser.parse_args(args)
 
   if not os.path.isdir(args.input):
     sys.stderr.write('Input directory does not exists.\n')
     return 1
 
-  # Depending on the version of "gn", there should be either one project file
-  # named "all.xcodeproj" or a project file named "products.xcodeproj" and a
-  # workspace named "all.xcworkspace".
-  required_files_sets = [
-      set(("all.xcodeproj",)),
-      set(("products.xcodeproj", "all.xcworkspace")),
-  ]
-
-  for required_files in required_files_sets:
-    if required_files.issubset(os.listdir(args.input)):
-      break
-  else:
+  if args.proj_name not in os.listdir(args.input):
     sys.stderr.write(
-        'Input directory does not contain all necessary Xcode projects.\n')
+        'Input directory does not contain the Xcode project.\n')
     return 1
 
   if not args.configurations:
     sys.stderr.write('At least one configuration required, see --add-config.\n')
     return 1
 
-  ConvertGnXcodeProject(args.root, args.input, args.output, args.configurations)
+  ConvertGnXcodeProject(
+      args.root,
+      args.proj_name,
+      args.input,
+      args.output,
+      args.configurations)
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv[1:]))
diff --git a/extern/crashpad/crashpad/build/ios/setup_ios_gn.config b/extern/crashpad/crashpad/build/ios/setup_ios_gn.config
index 30c31115e7..1a5e2251e7 100644
--- a/extern/crashpad/crashpad/build/ios/setup_ios_gn.config
+++ b/extern/crashpad/crashpad/build/ios/setup_ios_gn.config
@@ -1,4 +1,4 @@
-# Copyright 2020 The Crashpad Authors. All rights reserved.
+# Copyright 2020 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,13 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-[goma]
-# Controls whether goma is enabled or not. If you generally use goma but
-# want to disable goma for a single build, consider using the environment
-# variable GOMA_DISABLED.
-enabled = False
-install = "$GOMA_DIR"
-
 [xcode]
 # Controls settings for the generated Xcode project. If jobs is non-zero
 # it will be passed to the ninja invocation in Xcode project.
diff --git a/extern/crashpad/crashpad/build/ios/setup_ios_gn.py b/extern/crashpad/crashpad/build/ios/setup_ios_gn.py
index 9522ce6757..b6c2dfed12 100755
--- a/extern/crashpad/crashpad/build/ios/setup_ios_gn.py
+++ b/extern/crashpad/crashpad/build/ios/setup_ios_gn.py
@@ -1,6 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
-# Copyright 2020 The Crashpad Authors. All rights reserved.
+# Copyright 2020 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,334 +15,403 @@
 # limitations under the License.
 
 import argparse
+import configparser
 import convert_gn_xcodeproj
 import errno
+import io
 import os
+import platform
 import re
 import shutil
 import subprocess
 import sys
 import tempfile
 
-try:
-    import configparser
-except ImportError:
-    import ConfigParser as configparser
 
-try:
-    import StringIO as io
-except ImportError:
-    import io
+SUPPORTED_TARGETS = ('appletvos', 'appletvsimulator', 'iphoneos',
+                     'iphonesimulator', 'maccatalyst')
+SUPPORTED_CONFIGS = ('Debug', 'Release', 'Profile', 'Official')
 
-SUPPORTED_TARGETS = ('iphoneos', 'iphonesimulator')
-SUPPORTED_CONFIGS = ('Debug', 'Release', 'Profile', 'Official', 'Coverage')
+# Pattern matching lines from ~/.lldbinit that must not be copied to the
+# generated .lldbinit file. They match what the user were told to add to
+# their global ~/.lldbinit file before setup-gn.py was updated to generate
+# a project specific file and thus must not be copied as they would cause
+# the settings to be overwritten.
+LLDBINIT_SKIP_PATTERNS = (
+    re.compile('^script sys.path\\[:0\\] = \\[\'.*/src/tools/lldb\'\\]$'),
+    re.compile('^script import lldbinit$'),
+    re.compile('^settings append target.source-map .* /google/src/.*$'),
+)
 
 
-class ConfigParserWithStringInterpolation(configparser.SafeConfigParser):
-    '''A .ini file parser that supports strings and environment variables.'''
+def HostCpuArch():
+  '''Returns the arch of the host cpu for GN.'''
+  HOST_CPU_ARCH = {
+    'arm64': '"arm64"',
+    'x86_64': '"x64"',
+  }
+  return HOST_CPU_ARCH[platform.machine()]
 
-    ENV_VAR_PATTERN = re.compile(r'\$([A-Za-z0-9_]+)')
 
-    def values(self, section):
-        return map(lambda kv: self._UnquoteString(self._ExpandEnvVar(kv[1])),
-                   configparser.ConfigParser.items(self, section))
+class ConfigParserWithStringInterpolation(configparser.ConfigParser):
 
-    def getstring(self, section, option):
-        return self._UnquoteString(self._ExpandEnvVar(self.get(section,
-                                                               option)))
+  '''A .ini file parser that supports strings and environment variables.'''
 
-    def _UnquoteString(self, string):
-        if not string or string[0] != '"' or string[-1] != '"':
-            return string
-        return string[1:-1]
+  ENV_VAR_PATTERN = re.compile(r'\$([A-Za-z0-9_]+)')
 
-    def _ExpandEnvVar(self, value):
-        match = self.ENV_VAR_PATTERN.search(value)
-        if not match:
-            return value
-        name, (begin, end) = match.group(1), match.span(0)
-        prefix, suffix = value[:begin], self._ExpandEnvVar(value[end:])
-        return prefix + os.environ.get(name, '') + suffix
+  def values(self, section):
+    return filter(
+        lambda val: val != '',
+        map(lambda kv: self._UnquoteString(self._ExpandEnvVar(kv[1])),
+            configparser.ConfigParser.items(self, section)))
+
+  def getstring(self, section, option, fallback=''):
+    try:
+      raw_value = self.get(section, option)
+    except configparser.NoOptionError:
+      return fallback
+    return self._UnquoteString(self._ExpandEnvVar(raw_value))
+
+  def _UnquoteString(self, string):
+    if not string or string[0] != '"' or string[-1] != '"':
+      return string
+    return string[1:-1]
+
+  def _ExpandEnvVar(self, value):
+    match = self.ENV_VAR_PATTERN.search(value)
+    if not match:
+      return value
+    name, (begin, end) = match.group(1), match.span(0)
+    prefix, suffix = value[:begin], self._ExpandEnvVar(value[end:])
+    return prefix + os.environ.get(name, '') + suffix
 
 
 class GnGenerator(object):
-    '''Holds configuration for a build and method to generate gn default
-    files.'''
-
-    FAT_BUILD_DEFAULT_ARCH = '64-bit'
-
-    TARGET_CPU_VALUES = {
-        'iphoneos': {
-            '32-bit': '"arm"',
-            '64-bit': '"arm64"',
-        },
-        'iphonesimulator': {
-            '32-bit': '"x86"',
-            '64-bit': '"x64"',
-        }
-    }
-
-    def __init__(self, settings, config, target):
-        assert target in SUPPORTED_TARGETS
-        assert config in SUPPORTED_CONFIGS
-        self._settings = settings
-        self._config = config
-        self._target = target
-
-    def _GetGnArgs(self):
-        """Build the list of arguments to pass to gn.
-
-        Returns:
-            A list of tuple containing gn variable names and variable values (it
-            is not a dictionary as the order needs to be preserved).
-        """
-        args = []
-
-        args.append(('is_debug', self._config in ('Debug', 'Coverage')))
-
-        if os.environ.get('FORCE_MAC_TOOLCHAIN', '0') == '1':
-            args.append(('use_system_xcode', False))
-
-        cpu_values = self.TARGET_CPU_VALUES[self._target]
-        build_arch = self._settings.getstring('build', 'arch')
-        if build_arch == 'fat':
-            target_cpu = cpu_values[self.FAT_BUILD_DEFAULT_ARCH]
-            args.append(('target_cpu', target_cpu))
-            args.append(
-                ('additional_target_cpus',
-                 [cpu for cpu in cpu_values.itervalues() if cpu != target_cpu]))
-        else:
-            args.append(('target_cpu', cpu_values[build_arch]))
-
-        # Add user overrides after the other configurations so that they can
-        # refer to them and override them.
-        args.extend(self._settings.items('gn_args'))
-        return args
-
-    def Generate(self, gn_path, root_path, out_path):
-        buf = io.StringIO()
-        self.WriteArgsGn(buf)
-        WriteToFileIfChanged(os.path.join(out_path, 'args.gn'),
-                             buf.getvalue(),
-                             overwrite=True)
-
-        subprocess.check_call(
-            self.GetGnCommand(gn_path, root_path, out_path, True))
-
-    def CreateGnRules(self, gn_path, root_path, out_path):
-        buf = io.StringIO()
-        self.WriteArgsGn(buf)
-        WriteToFileIfChanged(os.path.join(out_path, 'args.gn'),
-                             buf.getvalue(),
-                             overwrite=True)
-
-        buf = io.StringIO()
-        gn_command = self.GetGnCommand(gn_path, root_path, out_path, False)
-        self.WriteBuildNinja(buf, gn_command)
-        WriteToFileIfChanged(os.path.join(out_path, 'build.ninja'),
-                             buf.getvalue(),
-                             overwrite=False)
-
-        buf = io.StringIO()
-        self.WriteBuildNinjaDeps(buf)
-        WriteToFileIfChanged(os.path.join(out_path, 'build.ninja.d'),
-                             buf.getvalue(),
-                             overwrite=False)
-
-    def WriteArgsGn(self, stream):
-        stream.write('# This file was generated by setup-gn.py. Do not edit\n')
-        stream.write('# but instead use ~/.setup-gn or $repo/.setup-gn files\n')
-        stream.write('# to configure settings.\n')
-        stream.write('\n')
 
+  '''Holds configuration for a build and method to generate gn default files.'''
+
+  FAT_BUILD_DEFAULT_ARCH = '64-bit'
+
+  TARGET_CPU_VALUES = {
+    'appletvos': '"arm64"',
+    'appletvsimulator': HostCpuArch(),
+    'iphoneos': '"arm64"',
+    'iphonesimulator': HostCpuArch(),
+    'maccatalyst': HostCpuArch(),
+  }
+
+  TARGET_ENVIRONMENT_VALUES = {
+    'appletvos': '"device"',
+    'appletvsimulator': '"simulator"',
+    'iphoneos': '"device"',
+    'iphonesimulator': '"simulator"',
+    'maccatalyst': '"catalyst"'
+  }
+
+  TARGET_PLATFORM_VALUES = {
+    'appletvos': '"tvos"',
+    'appletvsimulator': '"tvos"',
+    'iphoneos': '"iphoneos"',
+    'iphonesimulator': '"iphoneos"',
+    'maccatalyst': '"iphoneos"'
+  }
+
+  def __init__(self, settings, config, target):
+    assert target in SUPPORTED_TARGETS
+    assert config in SUPPORTED_CONFIGS
+    self._settings = settings
+    self._config = config
+    self._target = target
+
+  def _GetGnArgs(self):
+    """Build the list of arguments to pass to gn.
+
+    Returns:
+      A list of tuple containing gn variable names and variable values (it
+      is not a dictionary as the order needs to be preserved).
+    """
+    args = []
+
+    is_debug = self._config == 'Debug'
+    official = self._config == 'Official'
+    is_optim = self._config in ('Profile', 'Official')
+
+    args.append(('target_os', '"ios"'))
+    args.append(('is_debug', is_debug))
+
+    if os.environ.get('FORCE_MAC_TOOLCHAIN', '0') == '1':
+      args.append(('use_system_xcode', False))
+
+    args.append(('target_cpu', self.TARGET_CPU_VALUES[self._target]))
+    args.append(
+        ('target_environment', self.TARGET_ENVIRONMENT_VALUES[self._target]))
+    args.append(('target_platform', self.TARGET_PLATFORM_VALUES[self._target]))
+
+    # Add user overrides after the other configurations so that they can
+    # refer to them and override them.
+    args.extend(self._settings.items('gn_args'))
+    return args
+
+
+  def Generate(self, gn_path, proj_name, root_path, build_dir):
+    self.WriteArgsGn(build_dir, xcode_project_name=proj_name)
+    subprocess.check_call(self.GetGnCommand(
+        gn_path, root_path, build_dir, xcode_project_name=proj_name))
+
+  def CreateGnRules(self, gn_path, root_path, build_dir):
+    gn_command = self.GetGnCommand(gn_path, root_path, build_dir)
+    self.WriteArgsGn(build_dir)
+    self.WriteBuildNinja(gn_command, build_dir)
+    self.WriteBuildNinjaDeps(build_dir)
+
+  def WriteArgsGn(self, build_dir, xcode_project_name=None):
+    with open(os.path.join(build_dir, 'args.gn'), 'w') as stream:
+      stream.write('# This file was generated by setup-gn.py. Do not edit\n')
+      stream.write('# but instead use ~/.setup-gn or $repo/.setup-gn files\n')
+      stream.write('# to configure settings.\n')
+      stream.write('\n')
+
+      if self._target != 'maccatalyst':
         if self._settings.has_section('$imports$'):
-            for import_rule in self._settings.values('$imports$'):
-                stream.write('import("%s")\n' % import_rule)
-            stream.write('\n')
-
-        gn_args = self._GetGnArgs()
-        for name, value in gn_args:
-            if isinstance(value, bool):
-                stream.write('%s = %s\n' % (name, str(value).lower()))
-            elif isinstance(value, list):
-                stream.write('%s = [%s' %
-                             (name, '\n' if len(value) > 1 else ''))
-                if len(value) == 1:
-                    prefix = ' '
-                    suffix = ' '
-                else:
-                    prefix = '  '
-                    suffix = ',\n'
-                for item in value:
-                    if isinstance(item, bool):
-                        stream.write('%s%s%s' %
-                                     (prefix, str(item).lower(), suffix))
-                    else:
-                        stream.write('%s%s%s' % (prefix, item, suffix))
-                stream.write(']\n')
+          for import_rule in self._settings.values('$imports$'):
+            stream.write('import("%s")\n' % import_rule)
+          stream.write('\n')
+
+      gn_args = self._GetGnArgs()
+
+      for name, value in gn_args:
+        if isinstance(value, bool):
+          stream.write('%s = %s\n' % (name, str(value).lower()))
+        elif isinstance(value, list):
+          stream.write('%s = [%s' % (name, '\n' if len(value) > 1 else ''))
+          if len(value) == 1:
+            prefix = ' '
+            suffix = ' '
+          else:
+            prefix = '  '
+            suffix = ',\n'
+          for item in value:
+            if isinstance(item, bool):
+              stream.write('%s%s%s' % (prefix, str(item).lower(), suffix))
             else:
-                stream.write('%s = %s\n' % (name, value))
-
-    def WriteBuildNinja(self, stream, gn_command):
-        stream.write('rule gn\n')
-        stream.write('  command = %s\n' % NinjaEscapeCommand(gn_command))
-        stream.write('  description = Regenerating ninja files\n')
-        stream.write('\n')
-        stream.write('build build.ninja: gn\n')
-        stream.write('  generator = 1\n')
-        stream.write('  depfile = build.ninja.d\n')
-
-    def WriteBuildNinjaDeps(self, stream):
-        stream.write('build.ninja: nonexistant_file.gn\n')
-
-    def GetGnCommand(self, gn_path, src_path, out_path, generate_xcode_project):
-        gn_command = [gn_path, '--root=%s' % os.path.realpath(src_path), '-q']
-        if generate_xcode_project:
-            gn_command.append('--ide=xcode')
-            gn_command.append('--ninja-executable=autoninja')
-            if self._settings.has_section('filters'):
-                target_filters = self._settings.values('filters')
-                if target_filters:
-                    gn_command.append('--filters=%s' % ';'.join(target_filters))
+              stream.write('%s%s%s' % (prefix, item, suffix))
+          stream.write(']\n')
         else:
-            gn_command.append('--check')
-        gn_command.append('gen')
-        gn_command.append('//%s' % os.path.relpath(os.path.abspath(out_path),
-                                                   os.path.abspath(src_path)))
-        return gn_command
-
-
-def WriteToFileIfChanged(filename, content, overwrite):
-    '''Write |content| to |filename| if different. If |overwrite| is False
-    and the file already exists it is left untouched.'''
-    if os.path.exists(filename):
-        if not overwrite:
-            return
-        with open(filename) as file:
-            if file.read() == content:
-                return
-    if not os.path.isdir(os.path.dirname(filename)):
-        os.makedirs(os.path.dirname(filename))
-    with open(filename, 'w') as file:
-        file.write(content)
+          # ConfigParser removes quote around empty string which confuse
+          # `gn gen` so restore them.
+          if not value:
+            value = '""'
+          stream.write('%s = %s\n' % (name, value))
+
+  def WriteBuildNinja(self, gn_command, build_dir):
+    with open(os.path.join(build_dir, 'build.ninja'), 'w') as stream:
+      stream.write('ninja_required_version = 1.7.2\n')
+      stream.write('\n')
+      stream.write('rule gn\n')
+      stream.write('  command = %s\n' % NinjaEscapeCommand(gn_command))
+      stream.write('  description = Regenerating ninja files\n')
+      stream.write('\n')
+      stream.write('build build.ninja: gn\n')
+      stream.write('  generator = 1\n')
+      stream.write('  depfile = build.ninja.d\n')
+
+  def WriteBuildNinjaDeps(self, build_dir):
+    with open(os.path.join(build_dir, 'build.ninja.d'), 'w') as stream:
+      stream.write('build.ninja: nonexistant_file.gn\n')
+
+  def GetGnCommand(self, gn_path, src_path, out_path, xcode_project_name=None):
+    gn_command = [ gn_path, '--root=%s' % os.path.realpath(src_path), '-q' ]
+    if xcode_project_name is not None:
+      gn_command.append('--ide=xcode')
+      gn_command.append('--ninja-executable=autoninja')
+      gn_command.append('--xcode-build-system=new')
+      gn_command.append('--xcode-project=%s' % xcode_project_name)
+      gn_command.append('--xcode-additional-files-patterns=*.md')
+      gn_command.append('--xcode-configs=' + ';'.join(SUPPORTED_CONFIGS))
+      gn_command.append('--xcode-config-build-dir='
+                        '//out/${CONFIGURATION}${EFFECTIVE_PLATFORM_NAME}')
+      if self._settings.has_section('filters'):
+        target_filters = self._settings.values('filters')
+        if target_filters:
+          gn_command.append('--filters=%s' % ';'.join(target_filters))
+    else:
+      gn_command.append('--check')
+    gn_command.append('gen')
+    gn_command.append('//%s' %
+        os.path.relpath(os.path.abspath(out_path), os.path.abspath(src_path)))
+    return gn_command
 
 
 def NinjaNeedEscape(arg):
-    '''Returns True if |arg| needs to be escaped when written to .ninja file.'''
-    return ':' in arg or '*' in arg or ';' in arg
+  '''Returns True if |arg| needs to be escaped when written to .ninja file.'''
+  return ':' in arg or '*' in arg or ';' in arg
 
 
 def NinjaEscapeCommand(command):
-    '''Escapes |command| in order to write it to .ninja file.'''
-    result = []
-    for arg in command:
-        if NinjaNeedEscape(arg):
-            arg = arg.replace(':', '$:')
-            arg = arg.replace(';', '\\;')
-            arg = arg.replace('*', '\\*')
-        else:
-            result.append(arg)
-    return ' '.join(result)
+  '''Escapes |command| in order to write it to .ninja file.'''
+  result = []
+  for arg in command:
+    if NinjaNeedEscape(arg):
+      arg = arg.replace(':', '$:')
+      arg = arg.replace(';', '\\;')
+      arg = arg.replace('*', '\\*')
+    else:
+      result.append(arg)
+  return ' '.join(result)
 
 
 def FindGn():
-    '''Returns absolute path to gn binary looking at the PATH env variable.'''
-    for path in os.environ['PATH'].split(os.path.pathsep):
-        gn_path = os.path.join(path, 'gn')
-        if os.path.isfile(gn_path) and os.access(gn_path, os.X_OK):
-            return gn_path
-    return None
-
-
-def GenerateXcodeProject(gn_path, root_dir, out_dir, settings):
-    '''Convert GN generated Xcode project into multi-configuration Xcode
-    project.'''
-
-    temp_path = tempfile.mkdtemp(
-        prefix=os.path.abspath(os.path.join(out_dir, '_temp')))
-    try:
-        generator = GnGenerator(settings, 'Debug', 'iphonesimulator')
-        generator.Generate(gn_path, root_dir, temp_path)
-        convert_gn_xcodeproj.ConvertGnXcodeProject(
-            root_dir, os.path.join(temp_path), os.path.join(out_dir, 'build'),
-            SUPPORTED_CONFIGS)
-    finally:
-        if os.path.exists(temp_path):
-            shutil.rmtree(temp_path)
+  '''Returns absolute path to gn binary looking at the PATH env variable.'''
+  for path in os.environ['PATH'].split(os.path.pathsep):
+    gn_path = os.path.join(path, 'gn')
+    if os.path.isfile(gn_path) and os.access(gn_path, os.X_OK):
+      return gn_path
+  return None
+
+
+def GenerateXcodeProject(gn_path, root_dir, proj_name, out_dir, settings):
+  '''Generate Xcode project with Xcode and convert to multi-configurations.'''
+  prefix = os.path.abspath(os.path.join(out_dir, '_temp'))
+  temp_path = tempfile.mkdtemp(prefix=prefix)
+  try:
+    generator = GnGenerator(settings, 'Debug', 'iphonesimulator')
+    generator.Generate(gn_path, proj_name, root_dir, temp_path)
+    convert_gn_xcodeproj.ConvertGnXcodeProject(
+        root_dir,
+        '%s.xcodeproj' % proj_name,
+        os.path.join(temp_path),
+        os.path.join(out_dir, 'build'),
+        SUPPORTED_CONFIGS)
+  finally:
+    if os.path.exists(temp_path):
+      shutil.rmtree(temp_path)
+
+def CreateLLDBInitFile(root_dir, out_dir, settings):
+  '''
+  Generate an .lldbinit file for the project that load the script that fixes
+  the mapping of source files (see docs/ios/build_instructions.md#debugging).
+  '''
+  with open(os.path.join(out_dir, 'build', '.lldbinit'), 'w') as lldbinit:
+    lldb_script_dir = os.path.join(os.path.abspath(root_dir), 'tools', 'lldb')
+    lldbinit.write('script sys.path[:0] = [\'%s\']\n' % lldb_script_dir)
+    lldbinit.write('script import lldbinit\n')
+
+    workspace_name = settings.getstring(
+        'gn_args',
+        'ios_internal_citc_workspace_name')
+
+    if workspace_name != '':
+      username = os.environ['USER']
+      for shortname in ('googlemac', 'third_party', 'blaze-out'):
+        lldbinit.write('settings append target.source-map %s %s\n' % (
+            shortname,
+            '/google/src/cloud/%s/%s/google3/%s' % (
+                username, workspace_name, shortname)))
+
+    # Append the content of //ios/build/tools/lldbinit.defaults if it exists.
+    tools_dir = os.path.join(root_dir, 'ios', 'build', 'tools')
+    defaults_lldbinit_path = os.path.join(tools_dir, 'lldbinit.defaults')
+    if os.path.isfile(defaults_lldbinit_path):
+      with open(defaults_lldbinit_path) as defaults_lldbinit:
+        for line in defaults_lldbinit:
+          lldbinit.write(line)
+
+    # Append the content of ~/.lldbinit if it exists. Line that look like they
+    # are trying to configure source mapping are skipped as they probably date
+    # back from when setup-gn.py was not generating an .lldbinit file.
+    global_lldbinit_path = os.path.join(os.environ['HOME'], '.lldbinit')
+    if os.path.isfile(global_lldbinit_path):
+      with open(global_lldbinit_path) as global_lldbinit:
+        for line in global_lldbinit:
+          if any(pattern.match(line) for pattern in LLDBINIT_SKIP_PATTERNS):
+            continue
+          lldbinit.write(line)
 
 
 def GenerateGnBuildRules(gn_path, root_dir, out_dir, settings):
-    '''Generates all template configurations for gn.'''
-    for config in SUPPORTED_CONFIGS:
-        for target in SUPPORTED_TARGETS:
-            build_dir = os.path.join(out_dir, '%s-%s' % (config, target))
-            generator = GnGenerator(settings, config, target)
-            generator.CreateGnRules(gn_path, root_dir, build_dir)
+  '''Generates all template configurations for gn.'''
+  for config in SUPPORTED_CONFIGS:
+    for target in SUPPORTED_TARGETS:
+      build_dir = os.path.join(out_dir, '%s-%s' % (config, target))
+      if not os.path.isdir(build_dir):
+        os.makedirs(build_dir)
 
+      generator = GnGenerator(settings, config, target)
+      generator.CreateGnRules(gn_path, root_dir, build_dir)
 
-def Main(args):
-    default_root = os.path.normpath(
-        os.path.join(os.path.dirname(__file__), os.pardir, os.pardir))
-
-    parser = argparse.ArgumentParser(
-        description='Generate build directories for use with gn.')
-    parser.add_argument(
-        'root',
-        default=default_root,
-        nargs='?',
-        help='root directory where to generate multiple out configurations')
-    parser.add_argument('--import',
-                        action='append',
-                        dest='import_rules',
-                        default=[],
-                        help='path to file defining default gn variables')
-    parser.add_argument('--gn-path',
-                        default=None,
-                        help='path to gn binary (default: look up in $PATH)')
-    parser.add_argument(
-        '--build-dir',
-        default='out',
-        help='path where the build should be created (default: %(default)s)')
-    args = parser.parse_args(args)
-
-    # Load configuration (first global and then any user overrides).
-    settings = ConfigParserWithStringInterpolation()
-    settings.read([
-        os.path.splitext(__file__)[0] + '.config',
-        os.path.expanduser('~/.setup-gn'),
-    ])
-
-    # Add private sections corresponding to --import argument.
-    if args.import_rules:
-        settings.add_section('$imports$')
-        for i, import_rule in enumerate(args.import_rules):
-            if not import_rule.startswith('//'):
-                import_rule = '//%s' % os.path.relpath(
-                    os.path.abspath(import_rule), os.path.abspath(args.root))
-            settings.set('$imports$', '$rule%d$' % i, import_rule)
-
-    # Validate settings.
-    if settings.getstring('build', 'arch') not in ('64-bit', '32-bit', 'fat'):
-        sys.stderr.write('ERROR: invalid value for build.arch: %s\n' %
-                         settings.getstring('build', 'arch'))
-        sys.exit(1)
-
-    # Find path to gn binary either from command-line or in PATH.
-    if args.gn_path:
-        gn_path = args.gn_path
-    else:
-        gn_path = FindGn()
-        if gn_path is None:
-            sys.stderr.write('ERROR: cannot find gn in PATH\n')
-            sys.exit(1)
 
-    out_dir = os.path.join(args.root, args.build_dir)
-    if not os.path.isdir(out_dir):
-        os.makedirs(out_dir)
-
-    GenerateXcodeProject(gn_path, args.root, out_dir, settings)
-    GenerateGnBuildRules(gn_path, args.root, out_dir, settings)
+def Main(args):
+  default_root = os.path.normpath(os.path.join(
+      os.path.dirname(__file__), os.pardir, os.pardir))
+
+  parser = argparse.ArgumentParser(
+      description='Generate build directories for use with gn.')
+  parser.add_argument(
+      'root', default=default_root, nargs='?',
+      help='root directory where to generate multiple out configurations')
+  parser.add_argument(
+      '--import', action='append', dest='import_rules', default=[],
+      help='path to file defining default gn variables')
+  parser.add_argument(
+      '--gn-path', default=None,
+      help='path to gn binary (default: look up in $PATH)')
+  parser.add_argument(
+      '--build-dir', default='out',
+      help='path where the build should be created (default: %(default)s)')
+  parser.add_argument(
+      '--config-path', default=os.path.expanduser('~/.setup-gn'),
+      help='path to the user config file (default: %(default)s)')
+  parser.add_argument(
+      '--system-config-path', default=os.path.splitext(__file__)[0] + '.config',
+      help='path to the default config file (default: %(default)s)')
+  parser.add_argument(
+      '--project-name', default='all', dest='proj_name',
+      help='name of the generated Xcode project (default: %(default)s)')
+  parser.add_argument(
+      '--no-xcode-project', action='store_true', default=False,
+      help='do not generate the build directory with XCode project')
+  args = parser.parse_args(args)
+
+  # Load configuration (first global and then any user overrides).
+  settings = ConfigParserWithStringInterpolation()
+  settings.read([
+      args.system_config_path,
+      args.config_path,
+  ])
+
+  # Add private sections corresponding to --import argument.
+  if args.import_rules:
+    settings.add_section('$imports$')
+    for i, import_rule in enumerate(args.import_rules):
+      if not import_rule.startswith('//'):
+        import_rule = '//%s' % os.path.relpath(
+            os.path.abspath(import_rule), os.path.abspath(args.root))
+      settings.set('$imports$', '$rule%d$' % i, import_rule)
+
+  # Validate settings.
+  if settings.getstring('build', 'arch') not in ('64-bit', '32-bit', 'fat'):
+    sys.stderr.write('ERROR: invalid value for build.arch: %s\n' %
+        settings.getstring('build', 'arch'))
+    sys.exit(1)
+
+  # Find path to gn binary either from command-line or in PATH.
+  if args.gn_path:
+    gn_path = args.gn_path
+  else:
+    gn_path = FindGn()
+    if gn_path is None:
+      sys.stderr.write('ERROR: cannot find gn in PATH\n')
+      sys.exit(1)
+
+  out_dir = os.path.join(args.root, args.build_dir)
+  if not os.path.isdir(out_dir):
+    os.makedirs(out_dir)
+
+  if not args.no_xcode_project:
+    GenerateXcodeProject(gn_path, args.root, args.proj_name, out_dir, settings)
+    CreateLLDBInitFile(args.root, out_dir, settings)
+  GenerateGnBuildRules(gn_path, args.root, out_dir, settings)
 
 
 if __name__ == '__main__':
-    sys.exit(Main(sys.argv[1:]))
+  sys.exit(Main(sys.argv[1:]))
diff --git a/extern/crashpad/crashpad/build/ios/xcodescheme-testable.template b/extern/crashpad/crashpad/build/ios/xcodescheme-testable.template
new file mode 100644
index 0000000000..24ba39a97d
--- /dev/null
+++ b/extern/crashpad/crashpad/build/ios/xcodescheme-testable.template
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1220"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <PostActions>
+         <ExecutionAction
+            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+            <ActionContent
+               title = "Resign test runner"
+               scriptText = "unset -v XCODE_DEVELOPER_DIR_PATH&#10;&#10;BUILDDIR=&quot;${PROJECT_DIR}/../${CONFIGURATION}${EFFECTIVE_PLATFORM_NAME}&quot;&#10;&#10;export PATH=&quot;@{PATH}&quot;&#10;&#10;rm -rf &quot;${BUILDDIR}/@{BLUEPRINT_NAME}-Runner.app&quot;&#10;autoninja -C &quot;${BUILDDIR}&quot; &quot;@{BLUEPRINT_NAME}&quot;&#10;"
+               shellToInvoke = "/bin/sh">
+               <EnvironmentBuildable>
+                  <BuildableReference
+                     BuildableIdentifier = "primary"
+                     BlueprintIdentifier = "@{BLUEPRINT_IDENTIFIER}"
+                     BuildableName = "@{BUILDABLE_NAME}"
+                     BlueprintName = "@{BLUEPRINT_NAME}"
+                     ReferencedContainer = "container:@{PROJECT_NAME}">
+                  </BuildableReference>
+               </EnvironmentBuildable>
+            </ActionContent>
+         </ExecutionAction>
+      </PostActions>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "@{LLDBINIT_PATH}"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "@{BLUEPRINT_IDENTIFIER}"
+               BuildableName = "@{BUILDABLE_NAME}"
+               BlueprintName = "@{BLUEPRINT_NAME}"
+               ReferencedContainer = "container:@{PROJECT_NAME}">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "@{LLDBINIT_PATH}"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Profile"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Official"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/extern/crashpad/crashpad/build/ios/xcodescheme.template b/extern/crashpad/crashpad/build/ios/xcodescheme.template
new file mode 100644
index 0000000000..b7cda4b10b
--- /dev/null
+++ b/extern/crashpad/crashpad/build/ios/xcodescheme.template
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1220"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "@{BLUEPRINT_IDENTIFIER}"
+               BuildableName = "@{BUILDABLE_NAME}"
+               BlueprintName = "@{BLUEPRINT_NAME}"
+               ReferencedContainer = "container:@{PROJECT_NAME}">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "@{LLDBINIT_PATH}"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "@{LLDBINIT_PATH}"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "@{BLUEPRINT_IDENTIFIER}"
+            BuildableName = "@{BUILDABLE_NAME}"
+            BlueprintName = "@{BLUEPRINT_NAME}"
+            ReferencedContainer = "container:@{PROJECT_NAME}">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Profile"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "@{BLUEPRINT_IDENTIFIER}"
+            BuildableName = "@{BUILDABLE_NAME}"
+            BlueprintName = "@{BLUEPRINT_NAME}"
+            ReferencedContainer = "container:@{PROJECT_NAME}">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Official"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/extern/crashpad/crashpad/build/run_tests.py b/extern/crashpad/crashpad/build/run_tests.py
index f48652ff78..e5b65ccf81 100755
--- a/extern/crashpad/crashpad/build/run_tests.py
+++ b/extern/crashpad/crashpad/build/run_tests.py
@@ -1,7 +1,6 @@
-#!/usr/bin/env python
-# coding: utf-8
+#!/usr/bin/env python3
 
-# Copyright 2014 The Crashpad Authors. All rights reserved.
+# Copyright 2014 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,13 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import print_function
-
 import argparse
 import os
-import pipes
 import posixpath
 import re
+import shlex
 import subprocess
 import sys
 import tempfile
@@ -40,7 +37,7 @@ def _FindGNFromBinaryDir(binary_dir):
 
     build_ninja = os.path.join(binary_dir, 'build.ninja')
     if os.path.isfile(build_ninja):
-        with open(build_ninja, 'rb') as f:
+        with open(build_ninja, 'r') as f:
             # Look for the always-generated regeneration rule of the form:
             #
             # rule gn
@@ -64,38 +61,26 @@ def _FindGNFromBinaryDir(binary_dir):
     return None
 
 
-def _BinaryDirTargetOS(binary_dir):
-    """Returns the apparent target OS of binary_dir, or None if none appear to
-    be explicitly specified."""
+def _GetGNArgument(argument_name, binary_dir):
+    """Returns the value of a given GN argument, or None if it is not
+    explicitly specified."""
 
     gn_path = _FindGNFromBinaryDir(binary_dir)
-
     if gn_path:
         # Look for a GN “target_os”.
         popen = subprocess.Popen([
             gn_path, '--root=' + CRASHPAD_DIR, 'args', binary_dir,
-            '--list=target_os', '--short'
+            '--list=%s' % argument_name, '--short'
         ],
                                  shell=IS_WINDOWS_HOST,
                                  stdout=subprocess.PIPE,
-                                 stderr=open(os.devnull))
+                                 stderr=open(os.devnull),
+                                 text=True)
         value = popen.communicate()[0]
         if popen.returncode == 0:
-            match = re.match('target_os = "(.*)"$', value.decode('utf-8'))
+            match = re.match(r'%s = "(.*)"$' % argument_name, value)
             if match:
                 return match.group(1)
-
-    # For GYP with Ninja, look for the appearance of “linux-android” in the path
-    # to ar. This path is configured by gyp_crashpad_android.py.
-    build_ninja_path = os.path.join(binary_dir, 'build.ninja')
-    if os.path.exists(build_ninja_path):
-        with open(build_ninja_path) as build_ninja_file:
-            build_ninja_content = build_ninja_file.read()
-            match = re.search('-linux-android(eabi)?-ar$', build_ninja_content,
-                              re.MULTILINE)
-            if match:
-                return 'android'
-
     return None
 
 
@@ -187,22 +172,23 @@ def _adb_shell(command_args, env={}):
         script_commands = []
         for k, v in env.items():
             script_commands.append('export %s=%s' %
-                                   (pipes.quote(k), pipes.quote(v)))
+                                   (shlex.quote(k), shlex.quote(v)))
         script_commands.extend([
-            ' '.join(pipes.quote(x) for x in command_args), 'status=${?}',
+            ' '.join(shlex.quote(x) for x in command_args), 'status=${?}',
             'echo "status=${status}"', 'exit ${status}'
         ])
         adb_command.append('; '.join(script_commands))
         child = subprocess.Popen(adb_command,
                                  shell=IS_WINDOWS_HOST,
                                  stdin=open(os.devnull),
-                                 stdout=subprocess.PIPE)
+                                 stdout=subprocess.PIPE,
+                                 text=True)
 
-        FINAL_LINE_RE = re.compile('status=(\d+)$')
+        FINAL_LINE_RE = re.compile(r'status=(\d+)$')
         final_line = None
         while True:
             # Use readline so that the test output appears “live” when running.
-            data = child.stdout.readline().decode('utf-8')
+            data = child.stdout.readline()
             if data == '':
                 break
             if final_line is not None:
@@ -313,10 +299,33 @@ def _adb_shell(command_args, env={}):
         _adb_shell(['rm', '-rf', device_temp_dir])
 
 
-def _RunOnIOSTarget(binary_dir, test, is_xcuitest=False):
-    """Runs the given iOS |test| app on iPhone 8 with the default OS version."""
-
-    def xctest(binary_dir, test):
+def _RunOnIOSTarget(binary_dir,
+                    test,
+                    target_platform,
+                    is_xcuitest=False,
+                    gtest_filter=None):
+    """Runs the given iOS |test| app on a simulator with the default OS version."""
+
+    target_platform = target_platform or 'iphoneos'
+    if target_platform == 'iphoneos':
+        dyld_insert_libraries = (
+            '__PLATFORMS__/iPhoneSimulator.platform/Developer/usr/lib/'
+            'libXCTestBundleInject.dylib')
+        xcodebuild_platform = 'iOS Simulator'
+        xcodebuild_device_name = 'iPhone 17'
+    elif target_platform == 'tvos':
+        dyld_insert_libraries = (
+            '__PLATFORMS__/AppleTVSimulator.platform/Developer/usr/lib/'
+            'libXCTestBundleInject.dylib')
+        xcodebuild_platform = 'tvOS Simulator'
+        xcodebuild_device_name = 'Apple TV 4K (3rd generation)'
+    else:
+        raise ValueError(f'Unexpected target_platform: {target_platform}')
+
+    # E.g. __TESTROOT__/Debug-iphonesimulator.
+    dyld_framework_path = '__TESTROOT__/%s' % os.path.basename(binary_dir)
+
+    def xctest(binary_dir, test, gtest_filter=None):
         """Returns a dict containing the xctestrun data needed to run an
         XCTest-based test app."""
         test_path = os.path.join(CRASHPAD_DIR, binary_dir)
@@ -324,15 +333,17 @@ def xctest(binary_dir, test):
             'TestBundlePath': os.path.join(test_path, test + '_module.xctest'),
             'TestHostPath': os.path.join(test_path, test + '.app'),
             'TestingEnvironmentVariables': {
-                'DYLD_FRAMEWORK_PATH': '__TESTROOT__/Debug-iphonesimulator:',
-                'DYLD_INSERT_LIBRARIES':
-                    ('__PLATFORMS__/iPhoneSimulator.platform/Developer/'
-                     'usr/lib/libXCTestBundleInject.dylib'),
-                'DYLD_LIBRARY_PATH': '__TESTROOT__/Debug-iphonesimulator',
+                'DYLD_FRAMEWORK_PATH': dyld_framework_path + ':',
+                'DYLD_INSERT_LIBRARIES': dyld_insert_libraries,
+                'DYLD_LIBRARY_PATH': dyld_framework_path,
                 'IDEiPhoneInternalTestBundleName': test + '.app',
                 'XCInjectBundleInto': '__TESTHOST__/' + test,
             }
         }
+        if gtest_filter:
+            module_data['CommandLineArguments'] = [
+                '--gtest_filter=' + gtest_filter
+            ]
         return {test: module_data}
 
     def xcuitest(binary_dir, test):
@@ -346,6 +357,7 @@ def xcuitest(binary_dir, test):
         target_app_path = os.path.join(test_path, test + '.app')
         module_data = {
             'IsUITestBundle': True,
+            'SystemAttachmentLifetime': 'deleteOnSuccess',
             'IsXCTRunnerHostedTestBundle': True,
             'TestBundlePath': bundle_path,
             'TestHostPath': runner_path,
@@ -354,11 +366,8 @@ def xcuitest(binary_dir, test):
                 bundle_path, runner_path, target_app_path
             ],
             'TestingEnvironmentVariables': {
-                'DYLD_FRAMEWORK_PATH': '__TESTROOT__/Debug-iphonesimulator:',
-                'DYLD_INSERT_LIBRARIES':
-                    ('__PLATFORMS__/iPhoneSimulator.platform/Developer/'
-                     'usr/lib/libXCTestBundleInject.dylib'),
-                'DYLD_LIBRARY_PATH': '__TESTROOT__/Debug-iphonesimulator',
+                'DYLD_FRAMEWORK_PATH': dyld_framework_path + ':',
+                'DYLD_LIBRARY_PATH': dyld_framework_path,
                 'XCInjectBundleInto': '__TESTHOST__/' + test + '_module-Runner',
             },
         }
@@ -367,17 +376,24 @@ def xcuitest(binary_dir, test):
     with tempfile.NamedTemporaryFile() as f:
         import plistlib
 
-        xctestrun_path = f.name
+        xctestrun_path = f.name + ".xctestrun"
         print(xctestrun_path)
-        if is_xcuitest:
-            plistlib.writePlist(xcuitest(binary_dir, test), xctestrun_path)
-        else:
-            plistlib.writePlist(xctest(binary_dir, test), xctestrun_path)
-
-        subprocess.check_call([
-            'xcodebuild', 'test-without-building', '-xctestrun', xctestrun_path,
-            '-destination', 'platform=iOS Simulator,name=iPhone 8'
-        ])
+        command = [
+            'xcodebuild',
+            'test-without-building',
+            '-xctestrun',
+            xctestrun_path,
+            '-destination',
+            f'platform={xcodebuild_platform},name={xcodebuild_device_name}',
+        ]
+        with open(xctestrun_path, 'wb') as fp:
+            if is_xcuitest:
+                plistlib.dump(xcuitest(binary_dir, test), fp)
+                if gtest_filter:
+                    command.append('-only-testing:' + test + '/' + gtest_filter)
+            else:
+                plistlib.dump(xctest(binary_dir, test, gtest_filter), fp)
+        subprocess.check_call(command)
 
 
 # This script is primarily used from the waterfall so that the list of tests
@@ -404,9 +420,11 @@ def main(args):
         if os.path.isdir(binary_dir_32):
             os.environ['CRASHPAD_TEST_32_BIT_OUTPUT'] = binary_dir_32
 
-    target_os = _BinaryDirTargetOS(args.binary_dir)
+    target_os = _GetGNArgument('target_os', args.binary_dir)
     is_android = target_os == 'android'
     is_ios = target_os == 'ios'
+    # |target_platform| is only set for iOS-based platforms.
+    target_platform = _GetGNArgument('target_platform', args.binary_dir)
 
     tests = [
         'crashpad_client_test',
@@ -421,12 +439,13 @@ def main(args):
         android_device = os.environ.get('ANDROID_DEVICE')
         if not android_device:
             adb_devices = subprocess.check_output(['adb', 'devices'],
-                                                  shell=IS_WINDOWS_HOST)
+                                                  shell=IS_WINDOWS_HOST,
+                                                  text=True)
             devices = []
             for line in adb_devices.splitlines():
-                line = line.decode('utf-8')
+                line = line
                 if (line == 'List of devices attached' or
-                        re.match('^\* daemon .+ \*$', line) or line == ''):
+                        re.match(r'^\* daemon .+ \*$', line) or line == ''):
                     continue
                 (device, ignore) = line.split('\t')
                 devices.append(device)
@@ -467,7 +486,9 @@ def main(args):
             elif is_ios:
                 _RunOnIOSTarget(args.binary_dir,
                                 test,
-                                is_xcuitest=test.startswith('ios'))
+                                target_platform,
+                                is_xcuitest=test.startswith('ios'),
+                                gtest_filter=args.gtest_filter)
             else:
                 subprocess.check_call([os.path.join(args.binary_dir, test)] +
                                       extra_command_line)
diff --git a/extern/crashpad/crashpad/build/test.gni b/extern/crashpad/crashpad/build/test.gni
index 01fd7e7979..d995789297 100644
--- a/extern/crashpad/crashpad/build/test.gni
+++ b/extern/crashpad/crashpad/build/test.gni
@@ -1,4 +1,4 @@
-# Copyright 2017 The Crashpad Authors. All rights reserved.
+# Copyright 2017 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/client/BUILD.gn b/extern/crashpad/crashpad/client/BUILD.gn
index 5c18c6b0d7..e57e0e0c6f 100644
--- a/extern/crashpad/crashpad/client/BUILD.gn
+++ b/extern/crashpad/crashpad/client/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2015 The Crashpad Authors. All rights reserved.
+# Copyright 2015 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,13 +32,32 @@ crashpad_static_library("client") {
 
   if (crashpad_is_ios) {
     sources += [
+      "crash_handler_base_ios.cc",
+      "crash_handler_base_ios.h",
       "crashpad_client_ios.cc",
       "ios_handler/exception_processor.h",
       "ios_handler/exception_processor.mm",
+      "ios_handler/in_process_handler.cc",
+      "ios_handler/in_process_handler.h",
       "ios_handler/in_process_intermediate_dump_handler.cc",
       "ios_handler/in_process_intermediate_dump_handler.h",
+      "ios_handler/prune_intermediate_dumps_and_crash_reports_thread.cc",
+      "ios_handler/prune_intermediate_dumps_and_crash_reports_thread.h",
       "simulate_crash_ios.h",
+      "upload_behavior_ios.h",
     ]
+
+    if (!crashpad_is_tvos) {
+      sources += [
+        "crash_handler_ios.cc",
+        "crash_handler_ios.h",
+      ]
+    } else {
+      sources += [
+        "crash_handler_tvos.cc",
+        "crash_handler_tvos.h",
+      ]
+    }
   }
 
   if (crashpad_is_linux || crashpad_is_android) {
@@ -74,17 +93,17 @@ crashpad_static_library("client") {
     "../util",
   ]
 
-  deps = [
-    ":common",
-    "$mini_chromium_source_parent:chromeos_buildflags",
-  ]
+  deps = [ ":common" ]
 
   if (crashpad_is_win) {
     libs = [ "rpcrt4.lib" ]
     cflags = [ "/wd4201" ]  # nonstandard extension used : nameless struct/union
   }
 
-  # TODO(justincohen): Temporary dependency to bring up the iOS client.
+  if (crashpad_is_apple) {
+    deps += [ "../build:apple_enable_arc" ]
+  }
+
   if (crashpad_is_ios) {
     deps += [
       "../handler:common",
@@ -115,13 +134,15 @@ static_library("common") {
     "crash_report_database.h",
     "crashpad_info.cc",
     "crashpad_info.h",
+    "length_delimited_ring_buffer.h",
+    "ring_buffer_annotation.h",
     "settings.cc",
     "settings.h",
     "simple_address_range_bag.h",
     "simple_string_dictionary.h",
   ]
 
-  if (crashpad_is_mac || crashpad_is_ios) {
+  if (crashpad_is_apple) {
     sources += [ "crash_report_database_mac.mm" ]
   }
   if (crashpad_is_win) {
@@ -140,6 +161,21 @@ static_library("common") {
     "../util",
   ]
   deps = [ "../util" ]
+  configs += [ "../build:flock_always_supported_defines" ]
+
+  if (crashpad_is_apple) {
+    deps += [ "../build:apple_enable_arc" ]
+  }
+}
+
+crashpad_executable("ring_buffer_annotation_load_test") {
+  testonly = true
+  sources = [ "ring_buffer_annotation_load_test_main.cc" ]
+  deps = [
+    ":client",
+    "$mini_chromium_source_parent:base",
+    "../tools:tool_support",
+  ]
 }
 
 source_set("client_test") {
@@ -149,7 +185,10 @@ source_set("client_test") {
     "annotation_list_test.cc",
     "annotation_test.cc",
     "crash_report_database_test.cc",
+    "crashpad_info_test.cc",
+    "length_delimited_ring_buffer_test.cc",
     "prune_crash_reports_test.cc",
+    "ring_buffer_annotation_test.cc",
     "settings_test.cc",
     "simple_address_range_bag_test.cc",
     "simple_string_dictionary_test.cc",
@@ -167,6 +206,7 @@ source_set("client_test") {
     sources += [
       "crashpad_client_ios_test.mm",
       "ios_handler/exception_processor_test.mm",
+      "ios_handler/in_process_handler_test.cc",
       "ios_handler/in_process_intermediate_dump_handler_test.cc",
     ]
   }
@@ -181,8 +221,8 @@ source_set("client_test") {
     "../compat",
     "../snapshot",
     "../test",
+    "../third_party/googletest",
     "../third_party/googletest:googlemock",
-    "../third_party/googletest:googletest",
     "../util",
   ]
 
@@ -190,8 +230,19 @@ source_set("client_test") {
     data_deps = [ "../handler:crashpad_handler" ]
   }
 
+  if (crashpad_is_apple) {
+    deps += [ "../build:apple_enable_arc" ]
+  }
+
   if (crashpad_is_win) {
-    data_deps += [ "../handler:crashpad_handler_console" ]
+    data_deps += [
+      "../handler:crashpad_handler_console",
+      "../handler/win/wer:crashpad_wer_handler",
+    ]
+  }
+
+  if (crashpad_is_ios) {
+    deps += [ "../minidump" ]
   }
 }
 
diff --git a/extern/crashpad/crashpad/client/annotation.cc b/extern/crashpad/crashpad/client/annotation.cc
index 71b64989ca..59dc15da4a 100644
--- a/extern/crashpad/crashpad/client/annotation.cc
+++ b/extern/crashpad/crashpad/client/annotation.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/client/annotation.h b/extern/crashpad/crashpad/client/annotation.h
index 8e7a3cbdc1..5effc776dd 100644
--- a/extern/crashpad/crashpad/client/annotation.h
+++ b/extern/crashpad/crashpad/client/annotation.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,20 +15,23 @@
 #ifndef CRASHPAD_CLIENT_ANNOTATION_H_
 #define CRASHPAD_CLIENT_ANNOTATION_H_
 
-#include <algorithm>
-#include <atomic>
-
 #include <stdint.h>
 #include <string.h>
 #include <sys/types.h>
 
+#include <algorithm>
+#include <atomic>
+#include <optional>
+#include <ostream>
+#include <string_view>
+
 #include "base/check.h"
 #include "base/numerics/safe_conversions.h"
-#include "base/strings/string_piece.h"
 #include "build/build_config.h"
+#include "util/synchronization/scoped_spin_guard.h"
 
 namespace crashpad {
-#if defined(OS_IOS)
+#if BUILDFLAG(IS_IOS)
 namespace internal {
 class InProcessIntermediateDumpHandler;
 }  // namespace internal
@@ -72,7 +75,8 @@ class AnnotationList;
 class Annotation {
  public:
   //! \brief The maximum length of an annotation’s name, in bytes.
-  static constexpr size_t kNameMaxLength = 64;
+  //!    Matches the behavior of Breakpad's SimpleStringDictionary.
+  static constexpr size_t kNameMaxLength = 256;
 
   //! \brief The maximum size of an annotation’s value, in bytes.
   static constexpr size_t kValueMaxSize = 5 * 4096;
@@ -93,6 +97,20 @@ class Annotation {
     kUserDefinedStart = 0x8000,
   };
 
+  //! \brief Mode used to guard concurrent reads from writes.
+  enum class ConcurrentAccessGuardMode : bool {
+    //! \!brief Annotation does not guard reads from concurrent
+    //!     writes. Annotation values can be corrupted if the process crashes
+    //!     mid-write and the handler tries to read from the Annotation while
+    //!     being written to.
+    kUnguarded = false,
+
+    //! \!brief Annotation guards reads from concurrent writes using
+    //!     ScopedSpinGuard. Clients must use TryCreateScopedSpinGuard()
+    //!     before reading or writing the data in this Annotation.
+    kScopedSpinGuard = true,
+  };
+
   //! \brief Creates a user-defined Annotation::Type.
   //!
   //! This exists to remove the casting overhead of `enum class`.
@@ -106,7 +124,7 @@ class Annotation {
     // variables defined in a constexpr function, which is valid. Avoid them
     // and the also-problematic DCHECK until all the infrastructure is updated:
     // https://crbug.com/crashpad/201.
-#if !defined(OS_WIN) || (defined(_MSC_VER) && _MSC_VER >= 1910)
+#if !BUILDFLAG(IS_WIN) || (defined(_MSC_VER) && _MSC_VER >= 1910)
     const UnderlyingType start =
         static_cast<UnderlyingType>(Type::kUserDefinedStart);
     const UnderlyingType user_type = start + value;
@@ -131,12 +149,11 @@ class Annotation {
   //! \param[in] value_ptr A pointer to the value for the annotation. The
   //!     pointer may not be changed once associated with an annotation, but
   //!     the data may be mutated.
-  constexpr Annotation(Type type, const char name[], void* const value_ptr)
-      : link_node_(nullptr),
-        name_(name),
-        value_ptr_(value_ptr),
-        size_(0),
-        type_(type) {}
+  constexpr Annotation(Type type, const char name[], void* value_ptr)
+      : Annotation(type,
+                   name,
+                   value_ptr,
+                   ConcurrentAccessGuardMode::kUnguarded) {}
 
   Annotation(const Annotation&) = delete;
   Annotation& operator=(const Annotation&) = delete;
@@ -171,14 +188,73 @@ class Annotation {
   const char* name() const { return name_; }
   const void* value() const { return value_ptr_; }
 
+  ConcurrentAccessGuardMode concurrent_access_guard_mode() const {
+    return concurrent_access_guard_mode_;
+  }
+
+  //! \brief If this Annotation guards concurrent access using ScopedSpinGuard,
+  //!     tries to obtain the spin guard and returns the result.
+  //!
+  //! \param[in] timeout_ns The timeout in nanoseconds after which to give up
+  //!     trying to obtain the spin guard.
+  //! \return std::nullopt if the spin guard could not be obtained within
+  //!     timeout_ns, or the obtained spin guard otherwise.
+  std::optional<ScopedSpinGuard> TryCreateScopedSpinGuard(uint64_t timeout_ns) {
+    // This can't use DCHECK_EQ() because ostream doesn't support
+    // operator<<(bool).
+    DCHECK(concurrent_access_guard_mode_ ==
+           ConcurrentAccessGuardMode::kScopedSpinGuard);
+    if (concurrent_access_guard_mode_ ==
+        ConcurrentAccessGuardMode::kUnguarded) {
+      return std::nullopt;
+    }
+    return ScopedSpinGuard::TryCreateScopedSpinGuard(timeout_ns,
+                                                     spin_guard_state_);
+  }
+
  protected:
+  //! \brief Constructs a new annotation.
+  //!
+  //! Upon construction, the annotation will not be included in any crash
+  //! reports until \sa SetSize() is called with a value greater than `0`.
+  //!
+  //! \param[in] type The data type of the value of the annotation.
+  //! \param[in] name A `NUL`-terminated C-string name for the annotation. Names
+  //!     do not have to be unique, though not all crash processors may handle
+  //!     Annotations with the same name. Names should be constexpr data with
+  //!     static storage duration.
+  //! \param[in] value_ptr A pointer to the value for the annotation. The
+  //!     pointer may not be changed once associated with an annotation, but
+  //!     the data may be mutated.
+  //! \param[in] concurrent_access_guard_mode Mode used to guard concurrent
+  //!     reads from writes.
+  constexpr Annotation(Type type,
+                       const char name[],
+                       void* value_ptr,
+                       ConcurrentAccessGuardMode concurrent_access_guard_mode)
+      : link_node_(nullptr),
+        name_(name),
+        value_ptr_(value_ptr),
+        size_(0),
+        type_(type),
+        concurrent_access_guard_mode_(concurrent_access_guard_mode),
+        spin_guard_state_() {}
+
   friend class AnnotationList;
-#if defined(OS_IOS)
+#if BUILDFLAG(IS_IOS)
   friend class internal::InProcessIntermediateDumpHandler;
 #endif
 
   std::atomic<Annotation*>& link_node() { return link_node_; }
 
+  Annotation* GetLinkNode(std::memory_order order = std::memory_order_seq_cst) {
+    return link_node_.load(order);
+  }
+  const Annotation* GetLinkNode(
+      std::memory_order order = std::memory_order_seq_cst) const {
+    return link_node_.load(order);
+  }
+
  private:
   //! \brief Linked list next-node pointer. Accessed only by \sa AnnotationList.
   //!
@@ -191,6 +267,11 @@ class Annotation {
   void* const value_ptr_;
   ValueSizeType size_;
   const Type type_;
+
+  //! \brief Mode used to guard concurrent reads from writes.
+  const ConcurrentAccessGuardMode concurrent_access_guard_mode_;
+
+  SpinGuardState spin_guard_state_;
 };
 
 //! \brief An \sa Annotation that stores a `NUL`-terminated C-string value.
@@ -248,17 +329,19 @@ class StringAnnotation : public Annotation {
   //! \brief Sets the Annotation's string value.
   //!
   //! \param[in] string The string value.
-  void Set(base::StringPiece string) {
+  void Set(std::string_view string) {
     Annotation::ValueSizeType size =
         std::min(MaxSize, base::saturated_cast<ValueSizeType>(string.size()));
-    memcpy(value_, string.data(), size);
+    string = string.substr(0, size);
+    std::copy(string.begin(), string.end(), value_);
     // Check for no embedded `NUL` characters.
-    DCHECK(!memchr(value_, '\0', size)) << "embedded NUL";
+    DCHECK(string.find('\0', /*pos=*/0) == std::string_view::npos)
+        << "embedded NUL";
     SetSize(size);
   }
 
-  const base::StringPiece value() const {
-    return base::StringPiece(value_, size());
+  const std::string_view value() const {
+    return std::string_view(value_, size());
   }
 
  private:
diff --git a/extern/crashpad/crashpad/client/annotation_list.cc b/extern/crashpad/crashpad/client/annotation_list.cc
index f847d7cf52..c73660772c 100644
--- a/extern/crashpad/crashpad/client/annotation_list.cc
+++ b/extern/crashpad/crashpad/client/annotation_list.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,6 +19,46 @@
 
 namespace crashpad {
 
+template <typename T>
+T* AnnotationList::IteratorBase<T>::operator*() const {
+  CHECK_NE(curr_, tail_);
+  return curr_;
+}
+
+template <typename T>
+T* AnnotationList::IteratorBase<T>::operator->() const {
+  CHECK_NE(curr_, tail_);
+  return curr_;
+}
+
+template <typename T>
+AnnotationList::IteratorBase<T>& AnnotationList::IteratorBase<T>::operator++() {
+  CHECK_NE(curr_, tail_);
+  curr_ = curr_->GetLinkNode();
+  return *this;
+}
+
+template <typename T>
+AnnotationList::IteratorBase<T> AnnotationList::IteratorBase<T>::operator++(
+    int) {
+  T* const old_curr = curr_;
+  ++(*this);
+  return IteratorBase(old_curr, tail_);
+}
+
+template <typename T>
+bool AnnotationList::IteratorBase<T>::operator!=(
+    const IteratorBase& other) const {
+  return !(*this == other);
+}
+
+template <typename T>
+AnnotationList::IteratorBase<T>::IteratorBase(T* head, const Annotation* tail)
+    : curr_(head), tail_(tail) {}
+
+template class AnnotationList::IteratorBase<Annotation>;
+template class AnnotationList::IteratorBase<const Annotation>;
+
 AnnotationList::AnnotationList()
     : tail_pointer_(&tail_),
       head_(Annotation::Type::kInvalid, nullptr, nullptr),
@@ -65,33 +105,20 @@ void AnnotationList::Add(Annotation* annotation) {
   }
 }
 
-AnnotationList::Iterator::Iterator(Annotation* head, const Annotation* tail)
-    : curr_(head), tail_(tail) {}
-
-AnnotationList::Iterator::~Iterator() = default;
-
-Annotation* AnnotationList::Iterator::operator*() const {
-  CHECK_NE(curr_, tail_);
-  return curr_;
-}
-
-AnnotationList::Iterator& AnnotationList::Iterator::operator++() {
-  CHECK_NE(curr_, tail_);
-  curr_ = curr_->link_node();
-  return *this;
-}
-
-bool AnnotationList::Iterator::operator==(
-    const AnnotationList::Iterator& other) const {
-  return curr_ == other.curr_;
+AnnotationList::Iterator AnnotationList::begin() {
+  return Iterator(head_.GetLinkNode(), tail_pointer_);
 }
 
-AnnotationList::Iterator AnnotationList::begin() {
-  return Iterator(head_.link_node(), tail_pointer_);
+AnnotationList::ConstIterator AnnotationList::cbegin() const {
+  return ConstIterator(head_.GetLinkNode(), tail_pointer_);
 }
 
 AnnotationList::Iterator AnnotationList::end() {
   return Iterator(&tail_, tail_pointer_);
 }
 
+AnnotationList::ConstIterator AnnotationList::cend() const {
+  return ConstIterator(&tail_, tail_pointer_);
+}
+
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/client/annotation_list.h b/extern/crashpad/crashpad/client/annotation_list.h
index 02389530c8..6df33c46d7 100644
--- a/extern/crashpad/crashpad/client/annotation_list.h
+++ b/extern/crashpad/crashpad/client/annotation_list.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,11 +15,13 @@
 #ifndef CRASHPAD_CLIENT_ANNOTATION_LIST_H_
 #define CRASHPAD_CLIENT_ANNOTATION_LIST_H_
 
+#include <iterator>
+
 #include "build/build_config.h"
 #include "client/annotation.h"
 
 namespace crashpad {
-#if defined(OS_IOS)
+#if BUILDFLAG(IS_IOS)
 namespace internal {
 class InProcessIntermediateDumpHandler;
 }  // namespace internal
@@ -44,7 +46,7 @@ class AnnotationList {
   //!     CrashapdInfo structure.
   static AnnotationList* Get();
 
-  //! \brief Returns the instace of the list, creating and registering
+  //! \brief Returns the instance of the list, creating and registering
   //!     it if one is not already set on the CrashapdInfo structure.
   static AnnotationList* Register();
 
@@ -61,33 +63,58 @@ class AnnotationList {
   void Add(Annotation* annotation);
 
   //! \brief An InputIterator for the AnnotationList.
-  class Iterator {
+  template <typename T>
+  class IteratorBase {
    public:
-    ~Iterator();
+    using difference_type = signed int;
+    using value_type = T*;
+    using reference = T*;
+    using pointer = void;
+    using iterator_category = std::input_iterator_tag;
+
+    IteratorBase(const IteratorBase& other) = default;
+    IteratorBase(IteratorBase&& other) = default;
+
+    ~IteratorBase() = default;
+
+    IteratorBase& operator=(const IteratorBase& other) = default;
+    IteratorBase& operator=(IteratorBase&& other) = default;
+
+    T* operator*() const;
+    T* operator->() const;
 
-    Annotation* operator*() const;
-    Iterator& operator++();
-    bool operator==(const Iterator& other) const;
-    bool operator!=(const Iterator& other) const { return !(*this == other); }
+    IteratorBase& operator++();
+    IteratorBase operator++(int);
+
+    bool operator==(const IteratorBase& other) const {
+      return curr_ == other.curr_;
+    }
+
+    bool operator!=(const IteratorBase& other) const;
 
    private:
     friend class AnnotationList;
-    Iterator(Annotation* head, const Annotation* tail);
+    IteratorBase(T* head, const Annotation* tail);
 
-    Annotation* curr_;
-    const Annotation* const tail_;
-
-    // Copy and assign are required.
+    T* curr_ = nullptr;
+    const Annotation* tail_ = nullptr;
   };
 
+  using Iterator = IteratorBase<Annotation>;
+  using ConstIterator = IteratorBase<const Annotation>;
+
   //! \brief Returns an iterator to the first element of the annotation list.
   Iterator begin();
+  ConstIterator begin() const { return cbegin(); }
+  ConstIterator cbegin() const;
 
   //! \brief Returns an iterator past the last element of the annotation list.
   Iterator end();
+  ConstIterator end() const { return cend(); }
+  ConstIterator cend() const;
 
  protected:
-#if defined(OS_IOS)
+#if BUILDFLAG(IS_IOS)
   friend class internal::InProcessIntermediateDumpHandler;
 #endif
 
diff --git a/extern/crashpad/crashpad/client/annotation_list_test.cc b/extern/crashpad/crashpad/client/annotation_list_test.cc
index ef3039c5f6..41ecfa05ac 100644
--- a/extern/crashpad/crashpad/client/annotation_list_test.cc
+++ b/extern/crashpad/crashpad/client/annotation_list_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,10 @@
 
 #include "client/annotation.h"
 
+#include <algorithm>
+#include <iterator>
 #include <string>
+#include <type_traits>
 #include <vector>
 
 #include "base/rand_util.h"
@@ -27,6 +30,52 @@ namespace crashpad {
 namespace test {
 namespace {
 
+#if (__cplusplus >= 202002L)
+template <typename Iterator>
+  requires std::input_iterator<Iterator>
+void VerifyIsInputIterator(Iterator) {}
+#else
+template <typename Iterator>
+struct IsLegacyIteratorImpl {
+  static constexpr bool value =
+      std::is_copy_constructible_v<Iterator> &&
+      std::is_copy_assignable_v<Iterator> && std::is_destructible_v<Iterator> &&
+      std::is_swappable_v<Iterator> &&
+      // check that std::iterator_traits has the necessary types (check only one
+      // needed as std::iterator is required to define only if all are defined)
+      !std::is_same_v<typename std::iterator_traits<Iterator>::reference,
+                      void> &&
+      std::is_same_v<decltype(++std::declval<Iterator>()), Iterator&> &&
+      !std::is_same_v<decltype(*std::declval<Iterator>()), void>;
+};
+
+template <typename Iterator>
+struct IsLegacyInputIteratorImpl {
+  static constexpr bool value =
+      IsLegacyIteratorImpl<Iterator>::value &&
+      std::is_base_of_v<
+          std::input_iterator_tag,
+          typename std::iterator_traits<Iterator>::iterator_category> &&
+      std::is_convertible_v<decltype(std::declval<Iterator>() !=
+                                     std::declval<Iterator>()),
+                            bool> &&
+      std::is_convertible_v<decltype(std::declval<Iterator>() ==
+                                     std::declval<Iterator>()),
+                            bool> &&
+      std::is_same_v<decltype(*std::declval<Iterator>()),
+                     typename std::iterator_traits<Iterator>::reference> &&
+      std::is_same_v<decltype(++std::declval<Iterator>()), Iterator&> &&
+      std::is_same_v<decltype(std::declval<Iterator>()++), Iterator> &&
+      std::is_same_v<decltype(*(++std::declval<Iterator>())),
+                     typename std::iterator_traits<Iterator>::reference>;
+};
+
+template <typename Iterator>
+void VerifyIsInputIterator(Iterator) {
+  static_assert(IsLegacyInputIteratorImpl<Iterator>::value);
+}
+#endif
+
 TEST(AnnotationListStatic, Register) {
   ASSERT_FALSE(AnnotationList::Get());
   EXPECT_TRUE(AnnotationList::Register());
@@ -128,6 +177,117 @@ TEST_F(AnnotationList, DuplicateKeys) {
   EXPECT_EQ(1u, annotations.size());
 }
 
+TEST_F(AnnotationList, IteratorSingleAnnotation) {
+  ASSERT_EQ(annotations_.begin(), annotations_.end());
+  ASSERT_EQ(annotations_.cbegin(), annotations_.cend());
+
+  one_.Set("1");
+
+  auto iterator = annotations_.begin();
+  auto const_iterator = annotations_.cbegin();
+
+  ASSERT_NE(iterator, annotations_.end());
+  ASSERT_NE(const_iterator, annotations_.cend());
+
+  EXPECT_EQ(*iterator, &one_);
+  EXPECT_EQ(*const_iterator, &one_);
+
+  ++iterator;
+  ++const_iterator;
+
+  EXPECT_EQ(iterator, annotations_.end());
+  EXPECT_EQ(const_iterator, annotations_.cend());
+}
+
+TEST_F(AnnotationList, IteratorMultipleAnnotationsInserted) {
+  ASSERT_EQ(annotations_.begin(), annotations_.end());
+  ASSERT_EQ(annotations_.cbegin(), annotations_.cend());
+
+  one_.Set("1");
+  two_.Set("2");
+
+  // New annotations are inserted to the beginning of the list. Hence, |two_|
+  // must be the first annotation, followed by |one_|.
+  {
+    auto iterator = annotations_.begin();
+    auto const_iterator = annotations_.cbegin();
+
+    ASSERT_NE(iterator, annotations_.end());
+    ASSERT_NE(const_iterator, annotations_.cend());
+
+    EXPECT_EQ(*iterator, &two_);
+    EXPECT_EQ(*const_iterator, &two_);
+
+    ++iterator;
+    ++const_iterator;
+
+    ASSERT_NE(iterator, annotations_.end());
+    ASSERT_NE(const_iterator, annotations_.cend());
+
+    EXPECT_EQ(*iterator, &one_);
+    EXPECT_EQ(*const_iterator, &one_);
+
+    ++iterator;
+    ++const_iterator;
+
+    EXPECT_EQ(iterator, annotations_.end());
+    EXPECT_EQ(const_iterator, annotations_.cend());
+  }
+}
+
+TEST_F(AnnotationList, IteratorMultipleAnnotationsInsertedAndRemoved) {
+  ASSERT_EQ(annotations_.begin(), annotations_.end());
+  ASSERT_EQ(annotations_.cbegin(), annotations_.cend());
+
+  one_.Set("1");
+  two_.Set("2");
+  one_.Clear();
+  two_.Clear();
+
+  // Even after clearing, Annotations are still inserted in the list and
+  // reachable via the iterators.
+  auto iterator = annotations_.begin();
+  auto const_iterator = annotations_.cbegin();
+
+  ASSERT_NE(iterator, annotations_.end());
+  ASSERT_NE(const_iterator, annotations_.cend());
+
+  EXPECT_EQ(*iterator, &two_);
+  EXPECT_EQ(*const_iterator, &two_);
+
+  ++iterator;
+  ++const_iterator;
+
+  ASSERT_NE(iterator, annotations_.end());
+  ASSERT_NE(const_iterator, annotations_.cend());
+
+  EXPECT_EQ(*iterator, &one_);
+  EXPECT_EQ(*const_iterator, &one_);
+
+  ++iterator;
+  ++const_iterator;
+
+  EXPECT_EQ(iterator, annotations_.end());
+  EXPECT_EQ(const_iterator, annotations_.cend());
+}
+
+TEST_F(AnnotationList, IteratorIsInputIterator) {
+  one_.Set("1");
+  two_.Set("2");
+
+  // Check explicitly that the iterators meet the interface of an input
+  // iterator.
+  VerifyIsInputIterator(annotations_.begin());
+  VerifyIsInputIterator(annotations_.cbegin());
+  VerifyIsInputIterator(annotations_.end());
+  VerifyIsInputIterator(annotations_.cend());
+
+  // Additionally verify that std::distance accepts the iterators. It requires
+  // the iterators to comply to the input iterator interface.
+  EXPECT_EQ(std::distance(annotations_.begin(), annotations_.end()), 2);
+  EXPECT_EQ(std::distance(annotations_.cbegin(), annotations_.cend()), 2);
+}
+
 class RaceThread : public Thread {
  public:
   explicit RaceThread(test::AnnotationList* test) : Thread(), test_(test) {}
diff --git a/extern/crashpad/crashpad/client/annotation_test.cc b/extern/crashpad/crashpad/client/annotation_test.cc
index 365c0c22b7..fd22c2a0b4 100644
--- a/extern/crashpad/crashpad/client/annotation_test.cc
+++ b/extern/crashpad/crashpad/client/annotation_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,11 +21,58 @@
 #include "client/crashpad_info.h"
 #include "gtest/gtest.h"
 #include "test/gtest_death.h"
+#include "util/misc/clock.h"
+#include "util/synchronization/scoped_spin_guard.h"
+#include "util/thread/thread.h"
 
 namespace crashpad {
 namespace test {
 namespace {
 
+class SpinGuardAnnotation final : public Annotation {
+ public:
+  SpinGuardAnnotation(Annotation::Type type, const char name[])
+      : Annotation(type,
+                   name,
+                   &value_,
+                   ConcurrentAccessGuardMode::kScopedSpinGuard) {}
+
+  bool Set(bool value, uint64_t spin_guard_timeout_ns) {
+    auto guard = TryCreateScopedSpinGuard(spin_guard_timeout_ns);
+    if (!guard) {
+      return false;
+    }
+    value_ = value;
+    SetSize(sizeof(value_));
+    return true;
+  }
+
+ private:
+  bool value_;
+};
+
+class ScopedSpinGuardUnlockThread final : public Thread {
+ public:
+  ScopedSpinGuardUnlockThread(ScopedSpinGuard scoped_spin_guard,
+                              uint64_t sleep_time_ns)
+      : scoped_spin_guard_(std::move(scoped_spin_guard)),
+        sleep_time_ns_(sleep_time_ns) {}
+
+ private:
+  void ThreadMain() override {
+    SleepNanoseconds(sleep_time_ns_);
+
+    // Move the ScopedSpinGuard member into a local variable which is
+    // destroyed when ThreadMain() returns.
+    ScopedSpinGuard local_scoped_spin_guard(std::move(scoped_spin_guard_));
+
+    // After this point, local_scoped_spin_guard will be destroyed and unlocked.
+  }
+
+  ScopedSpinGuard scoped_spin_guard_;
+  const uint64_t sleep_time_ns_;
+};
+
 class Annotation : public testing::Test {
  public:
   void SetUp() override {
@@ -108,6 +155,62 @@ TEST_F(Annotation, StringType) {
   EXPECT_EQ("loooo", annotation.value());
 }
 
+TEST_F(Annotation, BaseAnnotationShouldNotSupportSpinGuard) {
+  char buffer[1024];
+  crashpad::Annotation annotation(
+      crashpad::Annotation::Type::kString, "no-spin-guard", buffer);
+  EXPECT_EQ(annotation.concurrent_access_guard_mode(),
+            crashpad::Annotation::ConcurrentAccessGuardMode::kUnguarded);
+#if !DCHECK_IS_ON()
+  // This fails a DCHECK() in debug builds, so only test it when DCHECK()
+  // is not on.
+  EXPECT_EQ(std::nullopt, annotation.TryCreateScopedSpinGuard(0));
+#endif
+}
+
+TEST_F(Annotation, CustomAnnotationShouldSupportSpinGuardAndSet) {
+  constexpr crashpad::Annotation::Type kType =
+      crashpad::Annotation::UserDefinedType(1);
+  SpinGuardAnnotation spin_guard_annotation(kType, "spin-guard");
+  EXPECT_EQ(spin_guard_annotation.concurrent_access_guard_mode(),
+            crashpad::Annotation::ConcurrentAccessGuardMode::kScopedSpinGuard);
+  EXPECT_TRUE(spin_guard_annotation.Set(true, 0));
+  EXPECT_EQ(1U, spin_guard_annotation.size());
+}
+
+TEST_F(Annotation, CustomAnnotationSetShouldFailIfRunConcurrently) {
+  constexpr crashpad::Annotation::Type kType =
+      crashpad::Annotation::UserDefinedType(1);
+  SpinGuardAnnotation spin_guard_annotation(kType, "spin-guard");
+  auto guard = spin_guard_annotation.TryCreateScopedSpinGuard(0);
+  EXPECT_NE(std::nullopt, guard);
+  // This should fail, since the guard is already held and the timeout is 0.
+  EXPECT_FALSE(spin_guard_annotation.Set(true, 0));
+}
+
+TEST_F(Annotation,
+       CustomAnnotationSetShouldSucceedIfSpinGuardUnlockedAsynchronously) {
+  constexpr crashpad::Annotation::Type kType =
+      crashpad::Annotation::UserDefinedType(1);
+  SpinGuardAnnotation spin_guard_annotation(kType, "spin-guard");
+  auto guard = spin_guard_annotation.TryCreateScopedSpinGuard(0);
+  EXPECT_NE(std::nullopt, guard);
+  // Pass the guard off to a background thread which unlocks it after 1 ms.
+  constexpr uint64_t kSleepTimeNs = 1000000;  // 1 ms
+  ScopedSpinGuardUnlockThread unlock_thread(std::move(guard.value()),
+                                            kSleepTimeNs);
+  unlock_thread.Start();
+
+  // Try to set the annotation with a 100 ms timeout.
+  constexpr uint64_t kSpinGuardTimeoutNanos = 100000000;  // 100 ms
+
+  // This should succeed after 1 ms, since the timeout is much larger than the
+  // time the background thread holds the guard.
+  EXPECT_TRUE(spin_guard_annotation.Set(true, kSpinGuardTimeoutNanos));
+
+  unlock_thread.Join();
+}
+
 TEST(StringAnnotation, ArrayOfString) {
   static crashpad::StringAnnotation<4> annotations[] = {
       {"test-1", crashpad::StringAnnotation<4>::Tag::kArray},
diff --git a/extern/crashpad/crashpad/client/client_argv_handling.cc b/extern/crashpad/crashpad/client/client_argv_handling.cc
index a3b9a5f3e8..766812cdfa 100644
--- a/extern/crashpad/crashpad/client/client_argv_handling.cc
+++ b/extern/crashpad/crashpad/client/client_argv_handling.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/client/client_argv_handling.h b/extern/crashpad/crashpad/client/client_argv_handling.h
index bfb54006e2..ba05bd3521 100644
--- a/extern/crashpad/crashpad/client/client_argv_handling.h
+++ b/extern/crashpad/crashpad/client/client_argv_handling.h
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/client/crash_handler_base_ios.cc b/extern/crashpad/crashpad/client/crash_handler_base_ios.cc
new file mode 100644
index 0000000000..6b349ca2bf
--- /dev/null
+++ b/extern/crashpad/crashpad/client/crash_handler_base_ios.cc
@@ -0,0 +1,127 @@
+// Copyright 2025 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "client/crash_handler_base_ios.h"
+
+#include "base/logging.h"
+#include "util/posix/signals.h"
+
+namespace crashpad {
+
+CrashHandlerBase::CrashHandlerBase() = default;
+CrashHandlerBase::~CrashHandlerBase() = default;
+
+bool CrashHandlerBase::Initialize(
+    const base::FilePath& database,
+    const std::string& url,
+    const std::map<std::string, std::string>& annotations,
+    internal::InProcessHandler::ProcessPendingReportsObservationCallback
+        callback) {
+  INITIALIZATION_STATE_SET_INITIALIZING(initialized_);
+  if (!in_process_handler().Initialize(database, url, annotations, callback)) {
+    LOG(ERROR) << "Unable to initialize Crashpad.";
+    return false;
+  }
+  if (!DoInitialize()) {
+    return false;
+  }
+  INITIALIZATION_STATE_SET_VALID(initialized_);
+  return true;
+}
+
+void CrashHandlerBase::ProcessIntermediateDumps(
+    const std::map<std::string, std::string>& annotations,
+    const UserStreamDataSources* user_stream_sources) {
+  in_process_handler_.ProcessIntermediateDumps(annotations,
+                                               user_stream_sources);
+}
+
+void CrashHandlerBase::ProcessIntermediateDump(
+    const base::FilePath& file,
+    const std::map<std::string, std::string>& annotations) {
+  in_process_handler_.ProcessIntermediateDump(file, annotations);
+}
+
+void CrashHandlerBase::DumpWithoutCrash(NativeCPUContext* context,
+                                        bool process_dump) {
+  INITIALIZATION_STATE_DCHECK_VALID(initialized_);
+  base::FilePath path;
+  if (!in_process_handler_.DumpExceptionFromSimulatedMachException(
+          context, kMachExceptionSimulated, &path)) {
+    return;
+  }
+
+  if (process_dump) {
+    in_process_handler_.ProcessIntermediateDump(path);
+  }
+}
+
+void CrashHandlerBase::DumpWithoutCrashAtPath(NativeCPUContext* context,
+                                              const base::FilePath& path) {
+  in_process_handler_.DumpExceptionFromSimulatedMachExceptionAtPath(
+      context, kMachExceptionSimulated, path);
+}
+
+void CrashHandlerBase::StartProcessingPendingReports(
+    UploadBehavior upload_behavior) {
+  INITIALIZATION_STATE_DCHECK_VALID(initialized_);
+  in_process_handler_.StartProcessingPendingReports(upload_behavior);
+}
+
+void CrashHandlerBase::SetExceptionCallbackForTesting(void (*callback)()) {
+  in_process_handler_.SetExceptionCallbackForTesting(callback);
+}
+
+void CrashHandlerBase::HandleAndReraiseSignal(int signo,
+                                              siginfo_t* siginfo,
+                                              ucontext_t* context,
+                                              struct sigaction* old_action) {
+  in_process_handler_.DumpExceptionFromSignal(siginfo, context);
+
+  // Always call system handler.
+  Signals::RestoreHandlerAndReraiseSignalOnReturn(siginfo, old_action);
+}
+
+void CrashHandlerBase::HandleUncaughtNSException(const uint64_t* frames,
+                                                 const size_t num_frames) {
+  in_process_handler_.DumpExceptionFromNSExceptionWithFrames(frames,
+                                                             num_frames);
+  // After uncaught exceptions are reported, the system immediately triggers a
+  // call to std::terminate()/abort(). Remove the abort handler so a second
+  // dump isn't generated.
+  CHECK(Signals::InstallDefaultHandler(SIGABRT));
+}
+
+void CrashHandlerBase::HandleUncaughtNSExceptionWithContext(
+    NativeCPUContext* context) {
+  base::FilePath path;
+  in_process_handler_.DumpExceptionFromSimulatedMachException(
+      context, kMachExceptionFromNSException, &path);
+
+  // After uncaught exceptions are reported, the system immediately triggers a
+  // call to std::terminate()/abort(). Remove the abort handler so a second
+  // dump isn't generated.
+  CHECK(Signals::InstallDefaultHandler(SIGABRT));
+}
+
+void CrashHandlerBase::HandleUncaughtNSExceptionWithContextAtPath(
+    NativeCPUContext* context,
+    const base::FilePath& path) {
+  in_process_handler_.DumpExceptionFromSimulatedMachExceptionAtPath(
+      context, kMachExceptionFromNSException, path);
+}
+
+bool CrashHandlerBase::MoveIntermediateDumpAtPathToPending(
+    const base::FilePath& path) {
+  if (in_process_handler_.MoveIntermediateDumpAtPathToPending(path)) {
+    // After uncaught exceptions are reported, the system immediately triggers
+    // a call to std::terminate()/abort(). Remove the abort handler so a
+    // second dump isn't generated.
+    CHECK(Signals::InstallDefaultHandler(SIGABRT));
+    return true;
+  }
+  return false;
+}
+
+}  // namespace crashpad
diff --git a/extern/crashpad/crashpad/client/crash_handler_base_ios.h b/extern/crashpad/crashpad/client/crash_handler_base_ios.h
new file mode 100644
index 0000000000..0aea192553
--- /dev/null
+++ b/extern/crashpad/crashpad/client/crash_handler_base_ios.h
@@ -0,0 +1,89 @@
+// Copyright 2025 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CRASHPAD_CLIENT_CRASH_HANDLER_BASE_IOS_H_
+#define CRASHPAD_CLIENT_CRASH_HANDLER_BASE_IOS_H_
+
+#include <stdint.h>
+#include <sys/signal.h>
+
+#include <map>
+#include <string>
+
+#include "base/files/file_path.h"
+#include "client/ios_handler/exception_processor.h"
+#include "client/ios_handler/in_process_handler.h"
+#include "client/upload_behavior_ios.h"
+#include "util/misc/capture_context.h"
+#include "util/misc/initialization_state_dcheck.h"
+
+namespace crashpad {
+
+// Base class shared by the iOS and tvOS CrashHandler implementations.
+class CrashHandlerBase : public ObjcExceptionDelegate {
+ public:
+  CrashHandlerBase(const CrashHandlerBase&) = delete;
+  CrashHandlerBase& operator=(const CrashHandlerBase&) = delete;
+
+  bool Initialize(
+      const base::FilePath& database,
+      const std::string& url,
+      const std::map<std::string, std::string>& annotations,
+      internal::InProcessHandler::ProcessPendingReportsObservationCallback
+          callback);
+
+  void ProcessIntermediateDumps(
+      const std::map<std::string, std::string>& annotations,
+      const UserStreamDataSources* user_stream_sources);
+
+  void ProcessIntermediateDump(
+      const base::FilePath& file,
+      const std::map<std::string, std::string>& annotations);
+
+  void DumpWithoutCrash(NativeCPUContext* context, bool process_dump);
+
+  void DumpWithoutCrashAtPath(NativeCPUContext* context,
+                              const base::FilePath& path);
+
+  void StartProcessingPendingReports(UploadBehavior upload_behavior);
+
+  void SetExceptionCallbackForTesting(void (*callback)());
+
+ protected:
+  CrashHandlerBase();
+  virtual ~CrashHandlerBase();
+
+  // Subclasses are expected to install signal handlers and set up Mach ports in
+  // this function.
+  virtual bool DoInitialize() = 0;
+
+  void HandleAndReraiseSignal(int signo,
+                              siginfo_t* siginfo,
+                              ucontext_t* context,
+                              struct sigaction* old_action);
+
+  internal::InProcessHandler& in_process_handler() {
+    return in_process_handler_;
+  }
+
+ private:
+  // ObjcExceptionDelegate overrides:
+  void HandleUncaughtNSException(const uint64_t* frames,
+                                 const size_t num_frames) override;
+
+  void HandleUncaughtNSExceptionWithContext(NativeCPUContext* context) override;
+
+  void HandleUncaughtNSExceptionWithContextAtPath(
+      NativeCPUContext* context,
+      const base::FilePath& path) override;
+
+  bool MoveIntermediateDumpAtPathToPending(const base::FilePath& path) override;
+
+  internal::InProcessHandler in_process_handler_;
+  InitializationStateDcheck initialized_;
+};
+
+}  // namespace crashpad
+
+#endif  // CRASHPAD_CLIENT_CRASH_HANDLER_BASE_IOS_H_
diff --git a/extern/crashpad/crashpad/client/crash_handler_ios.cc b/extern/crashpad/crashpad/client/crash_handler_ios.cc
new file mode 100644
index 0000000000..e349364a8a
--- /dev/null
+++ b/extern/crashpad/crashpad/client/crash_handler_ios.cc
@@ -0,0 +1,307 @@
+// Copyright 2025 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "client/crash_handler_ios.h"
+
+#include <sys/sysctl.h>
+#include <unistd.h>
+
+#include <iterator>
+
+#include "base/apple/mach_logging.h"
+#include "util/ios/raw_logging.h"
+#include "util/mach/mach_extensions.h"
+#include "util/mach/mach_message.h"
+#include "util/mach/mach_message_server.h"
+#include "util/posix/signals.h"
+
+namespace {
+
+bool IsBeingDebugged() {
+  int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid()};
+  size_t len = sizeof(kinfo_proc);
+  kinfo_proc kern_proc_info;
+  if (sysctl(mib, std::size(mib), &kern_proc_info, &len, nullptr, 0) == 0) {
+    return kern_proc_info.kp_proc.p_flag & P_TRACED;
+  }
+  return false;
+}
+
+}  // namespace
+
+namespace crashpad {
+
+CrashHandler::ThreadSafeScopedMachPortWithReceiveRight::
+    ThreadSafeScopedMachPortWithReceiveRight()
+    : port_(NewMachPort(MACH_PORT_RIGHT_RECEIVE)) {}
+
+CrashHandler::ThreadSafeScopedMachPortWithReceiveRight::
+    ~ThreadSafeScopedMachPortWithReceiveRight() {
+  reset();
+}
+
+mach_port_t CrashHandler::ThreadSafeScopedMachPortWithReceiveRight::get() {
+  return port_.load();
+}
+void CrashHandler::ThreadSafeScopedMachPortWithReceiveRight::reset() {
+  mach_port_t old_port = port_.exchange(MACH_PORT_NULL);
+  if (old_port == MACH_PORT_NULL) {
+    // Already reset, nothing to do.
+    return;
+  }
+  kern_return_t kr = mach_port_mod_refs(
+      mach_task_self(), old_port, MACH_PORT_RIGHT_RECEIVE, -1);
+  MACH_LOG_IF(ERROR, kr != KERN_SUCCESS, kr)
+      << "ThreadSafeScopedMachPortWithReceiveRight mach_port_mod_refs";
+  kr = mach_port_deallocate(mach_task_self(), old_port);
+  MACH_LOG_IF(ERROR, kr != KERN_SUCCESS, kr)
+      << "ThreadSafeScopedMachPortWithReceiveRight mach_port_deallocate";
+}
+
+CrashHandler* CrashHandler::instance_ = nullptr;
+
+CrashHandler::CrashHandler() = default;
+
+CrashHandler::~CrashHandler() {
+  UninstallObjcExceptionPreprocessor();
+  // Reset the SIGPIPE handler only if the current handler is the
+  // one installed by DoInitialize(). In other words, if an
+  // application has set its own SIGPIPE handler after initializing
+  // Crashpad, there is no need to change the signal handler here.
+  struct sigaction sa;
+  if (sigaction(SIGPIPE, nullptr, &sa) == 0 &&
+      sa.sa_sigaction == CatchAndReraiseSignalDefaultAction) {
+    Signals::InstallDefaultHandler(SIGPIPE);
+  }
+  Signals::InstallDefaultHandler(SIGABRT);
+  UninstallMachExceptionHandler();
+}
+
+// static
+CrashHandler* CrashHandler::Get() {
+  if (!instance_)
+    instance_ = new CrashHandler();
+  return instance_;
+}
+
+// static
+void CrashHandler::ResetForTesting() {
+  delete instance_;
+  instance_ = nullptr;
+}
+
+bool CrashHandler::DoInitialize() {
+  if (!InstallMachExceptionHandler() ||
+      // xnu turns hardware faults into Mach exceptions, so the only signal
+      // left to register is SIGABRT, which never starts off as a hardware
+      // fault. Installing a handler for other signals would lead to
+      // recording exceptions twice. As a consequence, Crashpad will not
+      // generate intermediate dumps for anything manually calling
+      // raise(SIG*). In practice, this doesn’t actually happen for crash
+      // signals that originate as hardware faults.
+      !Signals::InstallHandler(
+          SIGABRT, CatchAndReraiseSignal, 0, &old_action_)) {
+    return false;
+  }
+
+  // For applications that haven't ignored or set a handler for SIGPIPE:
+  // It’s OK for an application to set its own SIGPIPE handler (including
+  // SIG_IGN) before initializing Crashpad, because Crashpad will discover the
+  // existing handler and not install its own.
+  // It’s OK for Crashpad to install its own SIGPIPE handler and for the
+  // application to subsequently install its own (including SIG_IGN)
+  // afterwards, because its handler will replace Crashpad’s.
+  // This is useful to cover the default situation where nobody installs a
+  // SIGPIPE handler and the disposition is at SIG_DFL, because SIGPIPE is a
+  // “kill” signal (bsd/sys/signalvar.h sigprop). In that case, without
+  // Crashpad, SIGPIPE results in a silent and unreported kill (and not even
+  // ReportCrash will record it), but developers probably want to be alerted to
+  // the condition.
+  struct sigaction sa;
+  if (sigaction(SIGPIPE, nullptr, &sa) == 0 && sa.sa_handler == SIG_DFL) {
+    Signals::InstallHandler(
+        SIGPIPE, CatchAndReraiseSignalDefaultAction, 0, nullptr);
+  }
+
+  InstallObjcExceptionPreprocessor(this);
+  return true;
+}
+
+bool CrashHandler::InstallMachExceptionHandler() {
+  mach_port_t exception_port = exception_port_.get();
+  if (exception_port == MACH_PORT_NULL) {
+    return false;
+  }
+
+  kern_return_t kr = mach_port_insert_right(mach_task_self(),
+                                            exception_port,
+                                            exception_port,
+                                            MACH_MSG_TYPE_MAKE_SEND);
+  if (kr != KERN_SUCCESS) {
+    MACH_LOG(ERROR, kr) << "mach_port_insert_right";
+    return false;
+  }
+
+  // TODO: Use SwapExceptionPort instead and put back EXC_MASK_BREAKPOINT.
+  // Until then, remove |EXC_MASK_BREAKPOINT| while attached to a debugger.
+  exception_mask_t mask =
+      ExcMaskAll() &
+      ~(EXC_MASK_EMULATION | EXC_MASK_SOFTWARE | EXC_MASK_RPC_ALERT |
+        EXC_MASK_GUARD | (IsBeingDebugged() ? EXC_MASK_BREAKPOINT : 0));
+
+  ExceptionPorts exception_ports(ExceptionPorts::kTargetTypeTask, TASK_NULL);
+  if (!exception_ports.GetExceptionPorts(mask, &original_handlers_) ||
+      !exception_ports.SetExceptionPort(
+          mask,
+          exception_port,
+          EXCEPTION_STATE_IDENTITY_PROTECTED | MACH_EXCEPTION_CODES,
+          MACHINE_THREAD_STATE)) {
+    return false;
+  }
+
+  mach_handler_running_ = true;
+  Start();
+  return true;
+}
+
+void CrashHandler::UninstallMachExceptionHandler() {
+  mach_handler_running_ = false;
+  exception_port_.reset();
+  Join();
+}
+
+// Thread:
+
+void CrashHandler::ThreadMain() {
+  UniversalMachExcServer universal_mach_exc_server(this);
+  while (mach_handler_running_) {
+    mach_msg_return_t mr =
+        MachMessageServer::Run(&universal_mach_exc_server,
+                               exception_port_.get(),
+                               MACH_MSG_OPTION_NONE,
+                               MachMessageServer::kPersistent,
+                               MachMessageServer::kReceiveLargeIgnore,
+                               kMachMessageTimeoutWaitIndefinitely);
+    MACH_CHECK(
+        mach_handler_running_
+            ? mr == MACH_SEND_INVALID_DEST  // This shouldn't happen for
+                                            // exception messages that come
+                                            // from the kernel itself, but if
+                                            // something else in-process sends
+                                            // exception messages and breaks,
+                                            // handle that case.
+            : (mr == MACH_RCV_PORT_CHANGED ||  // Port was closed while the
+                                               // thread was listening.
+               mr == MACH_RCV_INVALID_NAME),  // Port was closed before the
+                                              // thread started listening.
+        mr)
+        << "MachMessageServer::Run";
+  }
+}
+
+// UniversalMachExcServer::Interface:
+
+kern_return_t CrashHandler::CatchMachException(
+    exception_behavior_t behavior,
+    exception_handler_t exception_port,
+    thread_t thread,
+    task_t task,
+    exception_type_t exception,
+    const mach_exception_data_type_t* code,
+    mach_msg_type_number_t code_count,
+    thread_state_flavor_t* flavor,
+    ConstThreadState old_state,
+    mach_msg_type_number_t old_state_count,
+    thread_state_t new_state,
+    mach_msg_type_number_t* new_state_count,
+    const mach_msg_trailer_t* trailer,
+    bool* destroy_complex_request) {
+  *destroy_complex_request = true;
+
+  // TODO(justincohen): Forward exceptions to original_handlers_ with
+  // UniversalExceptionRaise.
+
+  // iOS shouldn't have any child processes, but just in case, those will
+  // inherit the task exception ports, and this process isn’t prepared to
+  // handle them
+  if (task != mach_task_self()) {
+    CRASHPAD_RAW_LOG("MachException task != mach_task_self()");
+    return KERN_FAILURE;
+  }
+
+  HandleMachException(behavior,
+                      thread,
+                      exception,
+                      code,
+                      code_count,
+                      *flavor,
+                      old_state,
+                      old_state_count);
+
+  // Respond with KERN_FAILURE so the system will continue to handle this
+  // exception. xnu will turn this Mach exception into a signal and take the
+  // default action to terminate the process. However, if sigprocmask is
+  // called before this Mach exception returns (such as by another thread
+  // calling abort, see: Libc-1506.40.4/stdlib/FreeBSD/abort.c), the Mach
+  // exception will be converted into a signal but delivery will be blocked.
+  // Since concurrent exceptions lead to the losing thread sleeping
+  // indefinitely, if the abort thread never returns, the thread that
+  // triggered this Mach exception will repeatedly trap and the process will
+  // never terminate. If the abort thread didn’t have a user-space signal
+  // handler that slept forever, the abort would terminate the process even if
+  // all other signals had been blocked. Instead, unblock all signals
+  // corresponding to all Mach exceptions Crashpad is registered for before
+  // returning KERN_FAILURE. There is still racy behavior possible with this
+  // call to sigprocmask, but the repeated calls to CatchMachException here
+  // will eventually lead to termination.
+  sigset_t unblock_set;
+  sigemptyset(&unblock_set);
+  sigaddset(&unblock_set, SIGILL);  // EXC_BAD_INSTRUCTION
+  sigaddset(&unblock_set, SIGTRAP);  // EXC_BREAKPOINT
+  sigaddset(&unblock_set, SIGFPE);  // EXC_ARITHMETIC
+  sigaddset(&unblock_set, SIGBUS);  // EXC_BAD_ACCESS
+  sigaddset(&unblock_set, SIGSEGV);  // EXC_BAD_ACCESS
+  if (sigprocmask(SIG_UNBLOCK, &unblock_set, nullptr) != 0) {
+    CRASHPAD_RAW_LOG("sigprocmask");
+  }
+  return KERN_FAILURE;
+}
+
+void CrashHandler::HandleMachException(exception_behavior_t behavior,
+                                       thread_t thread,
+                                       exception_type_t exception,
+                                       const mach_exception_data_type_t* code,
+                                       mach_msg_type_number_t code_count,
+                                       thread_state_flavor_t flavor,
+                                       ConstThreadState old_state,
+                                       mach_msg_type_number_t old_state_count) {
+  in_process_handler().DumpExceptionFromMachException(behavior,
+                                                      thread,
+                                                      exception,
+                                                      code,
+                                                      code_count,
+                                                      flavor,
+                                                      old_state,
+                                                      old_state_count);
+}
+
+// static
+void CrashHandler::CatchAndReraiseSignal(int signo,
+                                         siginfo_t* siginfo,
+                                         void* context) {
+  Get()->HandleAndReraiseSignal(signo,
+                                siginfo,
+                                reinterpret_cast<ucontext_t*>(context),
+                                &(Get()->old_action_));
+}
+
+// static
+void CrashHandler::CatchAndReraiseSignalDefaultAction(int signo,
+                                                      siginfo_t* siginfo,
+                                                      void* context) {
+  Get()->HandleAndReraiseSignal(
+      signo, siginfo, reinterpret_cast<ucontext_t*>(context), nullptr);
+}
+
+}  // namespace crashpad
diff --git a/extern/crashpad/crashpad/client/crash_handler_ios.h b/extern/crashpad/crashpad/client/crash_handler_ios.h
new file mode 100644
index 0000000000..35e1753df6
--- /dev/null
+++ b/extern/crashpad/crashpad/client/crash_handler_ios.h
@@ -0,0 +1,109 @@
+// Copyright 2025 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CRASHPAD_CLIENT_CRASH_HANDLER_IOS_H_
+#define CRASHPAD_CLIENT_CRASH_HANDLER_IOS_H_
+
+#include <atomic>
+
+#include "client/crash_handler_base_ios.h"
+#include "util/mach/exc_server_variants.h"
+#include "util/mach/exception_ports.h"
+#include "util/thread/thread.h"
+
+namespace crashpad {
+
+// A base class for signal handler and Mach exception server.
+class CrashHandler : public Thread,
+                     public UniversalMachExcServer::Interface,
+                     public CrashHandlerBase {
+ public:
+  CrashHandler(const CrashHandler&) = delete;
+  CrashHandler& operator=(const CrashHandler&) = delete;
+
+  static CrashHandler* Get();
+
+  static void ResetForTesting();
+
+ private:
+  // Thread-safe version of `base::apple::ScopedMachReceiveRight` which
+  // allocates the Mach port upon construction and deallocates it upon
+  // destruction.
+  class ThreadSafeScopedMachPortWithReceiveRight {
+   public:
+    ThreadSafeScopedMachPortWithReceiveRight();
+
+    ThreadSafeScopedMachPortWithReceiveRight(
+        const ThreadSafeScopedMachPortWithReceiveRight&) = delete;
+    ThreadSafeScopedMachPortWithReceiveRight& operator=(
+        const ThreadSafeScopedMachPortWithReceiveRight&) = delete;
+
+    ~ThreadSafeScopedMachPortWithReceiveRight();
+
+    mach_port_t get();
+    void reset();
+
+   private:
+    std::atomic<mach_port_t> port_;
+  };
+
+  CrashHandler();
+
+  ~CrashHandler() override;
+
+  bool DoInitialize() override;
+
+  bool InstallMachExceptionHandler();
+
+  void UninstallMachExceptionHandler();
+
+  // Thread:
+
+  void ThreadMain() override;
+
+  // UniversalMachExcServer::Interface:
+
+  kern_return_t CatchMachException(exception_behavior_t behavior,
+                                   exception_handler_t exception_port,
+                                   thread_t thread,
+                                   task_t task,
+                                   exception_type_t exception,
+                                   const mach_exception_data_type_t* code,
+                                   mach_msg_type_number_t code_count,
+                                   thread_state_flavor_t* flavor,
+                                   ConstThreadState old_state,
+                                   mach_msg_type_number_t old_state_count,
+                                   thread_state_t new_state,
+                                   mach_msg_type_number_t* new_state_count,
+                                   const mach_msg_trailer_t* trailer,
+                                   bool* destroy_complex_request) override;
+
+  void HandleMachException(exception_behavior_t behavior,
+                           thread_t thread,
+                           exception_type_t exception,
+                           const mach_exception_data_type_t* code,
+                           mach_msg_type_number_t code_count,
+                           thread_state_flavor_t flavor,
+                           ConstThreadState old_state,
+                           mach_msg_type_number_t old_state_count);
+
+  // The signal handler installed at OS-level.
+  static void CatchAndReraiseSignal(int signo,
+                                    siginfo_t* siginfo,
+                                    void* context);
+
+  static void CatchAndReraiseSignalDefaultAction(int signo,
+                                                 siginfo_t* siginfo,
+                                                 void* context);
+
+  ThreadSafeScopedMachPortWithReceiveRight exception_port_;
+  ExceptionPorts::ExceptionHandlerVector original_handlers_;
+  struct sigaction old_action_ = {};
+  static CrashHandler* instance_;
+  std::atomic<bool> mach_handler_running_ = false;
+};
+
+}  // namespace crashpad
+
+#endif  // CRASHPAD_CLIENT_CRASH_HANDLER_IOS_H_
diff --git a/extern/crashpad/crashpad/client/crash_handler_tvos.cc b/extern/crashpad/crashpad/client/crash_handler_tvos.cc
new file mode 100644
index 0000000000..ab42b44398
--- /dev/null
+++ b/extern/crashpad/crashpad/client/crash_handler_tvos.cc
@@ -0,0 +1,96 @@
+// Copyright 2025 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "client/crash_handler_tvos.h"
+
+#include <sys/signal.h>
+
+#include "util/posix/signals.h"
+#include "util/thread/thread.h"
+
+namespace crashpad {
+
+CrashHandler* CrashHandler::instance_ = nullptr;
+
+CrashHandler::CrashHandler() = default;
+
+CrashHandler::~CrashHandler() {
+  UninstallObjcExceptionPreprocessor();
+  for (int signo = 1; signo < NSIG; ++signo) {
+    if (!Signals::IsCrashSignal(signo)) {
+      Signals::RestoreOrResetHandler(signo,
+                                     old_actions_.ActionForSignal(signo));
+    } else if (signo == SIGPIPE) {
+      // Reset the SIGPIPE handler only if the current handler is the one
+      // installed by DoInitialize(). In other words, if an application has set
+      // its own SIGPIPE handler after initializing Crashpad, there is no need
+      // to change the signal handler here.
+      struct sigaction sa;
+      if (sigaction(SIGPIPE, nullptr, &sa) == 0 &&
+          sa.sa_sigaction == CatchAndReraiseSignal) {
+        Signals::InstallDefaultHandler(SIGPIPE);
+      }
+    }
+  }
+}
+
+// static
+CrashHandler* CrashHandler::Get() {
+  if (!instance_) {
+    instance_ = new CrashHandler;
+  }
+  return instance_;
+}
+
+// static
+void CrashHandler::ResetForTesting() {
+  delete instance_;
+  instance_ = nullptr;
+}
+
+uint64_t CrashHandler::GetThreadIdForTesting() {
+  return Thread::GetThreadIdForTesting();
+}
+
+bool CrashHandler::DoInitialize() {
+  if (!Signals::InstallCrashHandlers(CatchAndReraiseSignal,
+                                     /*flags=*/0,
+                                     &old_actions_)) {
+    return false;
+  }
+
+  // For applications that haven't ignored or set a handler for SIGPIPE:
+  // It’s OK for an application to set its own SIGPIPE handler (including
+  // SIG_IGN) before initializing Crashpad, because Crashpad will discover the
+  // existing handler and not install its own.
+  // It’s OK for Crashpad to install its own SIGPIPE handler and for the
+  // application to subsequently install its own (including SIG_IGN)
+  // afterwards, because its handler will replace Crashpad’s.
+  // This is useful to cover the default situation where nobody installs a
+  // SIGPIPE handler and the disposition is at SIG_DFL, because SIGPIPE is a
+  // “kill” signal (bsd/sys/signalvar.h sigprop). In that case, without
+  // Crashpad, SIGPIPE results in a silent and unreported kill (and not even
+  // ReportCrash will record it), but developers probably want to be alerted to
+  // the condition.
+  struct sigaction sa;
+  if (sigaction(SIGPIPE, nullptr, &sa) == 0 && sa.sa_handler == SIG_DFL) {
+    Signals::InstallHandler(SIGPIPE, CatchAndReraiseSignal, 0, nullptr);
+  }
+
+  InstallObjcExceptionPreprocessor(this);
+  return true;
+}
+
+// static
+void CrashHandler::CatchAndReraiseSignal(int signo,
+                                         siginfo_t* siginfo,
+                                         void* context) {
+  CrashHandler* self = Get();
+  self->HandleAndReraiseSignal(signo,
+                               siginfo,
+                               reinterpret_cast<ucontext_t*>(context),
+                               self->old_actions_.ActionForSignal(signo));
+}
+
+}  // namespace crashpad
diff --git a/extern/crashpad/crashpad/client/crash_handler_tvos.h b/extern/crashpad/crashpad/client/crash_handler_tvos.h
new file mode 100644
index 0000000000..61e2718920
--- /dev/null
+++ b/extern/crashpad/crashpad/client/crash_handler_tvos.h
@@ -0,0 +1,44 @@
+// Copyright 2025 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CRASHPAD_CLIENT_CRASH_HANDLER_TVOS_H_
+#define CRASHPAD_CLIENT_CRASH_HANDLER_TVOS_H_
+
+#include "client/crash_handler_base_ios.h"
+#include "util/posix/signals.h"
+
+namespace crashpad {
+
+// A crash handler based on POSIX signals.
+// The APIs to handle Mach exceptions are not available to third-party
+// applications on tvOS.
+class CrashHandler final : public CrashHandlerBase {
+ public:
+  CrashHandler(const CrashHandler&) = delete;
+  CrashHandler& operator=(const CrashHandler&) = delete;
+
+  static CrashHandler* Get();
+
+  static void ResetForTesting();
+
+  uint64_t GetThreadIdForTesting();
+
+ private:
+  CrashHandler();
+  ~CrashHandler() override;
+
+  bool DoInitialize() override;
+
+  // The signal handler installed at OS-level.
+  static void CatchAndReraiseSignal(int signo,
+                                    siginfo_t* siginfo,
+                                    void* context);
+
+  Signals::OldActions old_actions_ = {};
+  static CrashHandler* instance_;
+};
+
+}  // namespace crashpad
+
+#endif  // CRASHPAD_CLIENT_CRASH_HANDLER_TVOS_H_
diff --git a/extern/crashpad/crashpad/client/crash_report_database.cc b/extern/crashpad/crashpad/client/crash_report_database.cc
index 68393333df..141c845952 100644
--- a/extern/crashpad/crashpad/client/crash_report_database.cc
+++ b/extern/crashpad/crashpad/client/crash_report_database.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,10 +14,29 @@
 
 #include "client/crash_report_database.h"
 
+#include <sys/stat.h>
+
+#include "base/logging.h"
+#include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
+#include "util/file/directory_reader.h"
+#include "util/file/filesystem.h"
 
 namespace crashpad {
 
+namespace {
+constexpr base::FilePath::CharType kAttachmentsDirectory[] =
+    FILE_PATH_LITERAL("attachments");
+
+bool AttachmentNameIsOK(const std::string& name) {
+  for (const char c : name) {
+    if (c != '_' && c != '-' && c != '.' && !isalnum(c))
+      return false;
+  }
+  return true;
+}
+}  // namespace
+
 CrashReportDatabase::Report::Report()
     : uuid(),
       file_path(),
@@ -49,7 +68,7 @@ bool CrashReportDatabase::NewReport::Initialize(
     return false;
   }
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   const std::wstring uuid_string = uuid_.ToWString();
 #else
   const std::string uuid_string = uuid_.ToString();
@@ -73,6 +92,60 @@ FileReaderInterface* CrashReportDatabase::NewReport::Reader() {
   return reader_.get();
 }
 
+FileWriter* CrashReportDatabase::NewReport::AddAttachment(
+    const std::string& name) {
+  if (!AttachmentNameIsOK(name)) {
+    LOG(ERROR) << "invalid name for attachment " << name;
+    return nullptr;
+  }
+  base::FilePath report_attachments_dir = database_->AttachmentsPath(uuid_);
+  if (!LoggingCreateDirectory(
+          report_attachments_dir, FilePermissions::kOwnerOnly, true)) {
+    return nullptr;
+  }
+#if BUILDFLAG(IS_WIN)
+  const std::wstring name_string = base::UTF8ToWide(name);
+#else
+  const std::string name_string = name;
+#endif
+  base::FilePath attachment_path = report_attachments_dir.Append(name_string);
+  auto writer = std::make_unique<FileWriter>();
+  if (!writer->Open(attachment_path,
+                    FileWriteMode::kCreateOrFail,
+                    FilePermissions::kOwnerOnly)) {
+    return nullptr;
+  }
+  attachment_writers_.emplace_back(std::move(writer));
+  attachment_removers_.emplace_back(ScopedRemoveFile(attachment_path));
+  return attachment_writers_.back().get();
+}
+
+void CrashReportDatabase::UploadReport::InitializeAttachments() {
+  base::FilePath report_attachments_dir = database_->AttachmentsPath(uuid);
+  DirectoryReader dir_reader;
+  if (!dir_reader.Open(report_attachments_dir)) {
+    return;
+  }
+
+  base::FilePath filename;
+  DirectoryReader::Result dir_result;
+  while ((dir_result = dir_reader.NextFile(&filename)) ==
+         DirectoryReader::Result::kSuccess) {
+    const base::FilePath filepath(report_attachments_dir.Append(filename));
+    std::unique_ptr<FileReader> file_reader(std::make_unique<FileReader>());
+    if (!file_reader->Open(filepath)) {
+      continue;
+    }
+    attachment_readers_.emplace_back(std::move(file_reader));
+#if BUILDFLAG(IS_WIN)
+    const std::string name_string = base::WideToUTF8(filename.value());
+#else
+    const std::string name_string = filename.value();
+#endif
+    attachment_map_[name_string] = attachment_readers_.back().get();
+  }
+}
+
 CrashReportDatabase::UploadReport::UploadReport()
     : Report(),
       reader_(std::make_unique<FileReader>()),
@@ -103,4 +176,40 @@ CrashReportDatabase::OperationStatus CrashReportDatabase::RecordUploadComplete(
   return RecordUploadAttempt(report, true, id);
 }
 
+base::FilePath CrashReportDatabase::AttachmentsPath(const UUID& uuid) {
+#if BUILDFLAG(IS_WIN)
+  const std::wstring uuid_string = uuid.ToWString();
+#else
+  const std::string uuid_string = uuid.ToString();
+#endif
+
+  return DatabasePath().Append(kAttachmentsDirectory).Append(uuid_string);
+}
+
+base::FilePath CrashReportDatabase::AttachmentsRootPath() {
+  return DatabasePath().Append(kAttachmentsDirectory);
+}
+
+void CrashReportDatabase::RemoveAttachmentsByUUID(const UUID& uuid) {
+  base::FilePath report_attachment_dir = AttachmentsPath(uuid);
+  if (!IsDirectory(report_attachment_dir, /*allow_symlinks=*/false)) {
+    return;
+  }
+  DirectoryReader reader;
+  if (!reader.Open(report_attachment_dir)) {
+    return;
+  }
+
+  base::FilePath filename;
+  DirectoryReader::Result result;
+  while ((result = reader.NextFile(&filename)) ==
+         DirectoryReader::Result::kSuccess) {
+    const base::FilePath attachment_path(
+        report_attachment_dir.Append(filename));
+    LoggingRemoveFile(attachment_path);
+  }
+
+  LoggingRemoveDirectory(report_attachment_dir);
+}
+
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/client/crash_report_database.h b/extern/crashpad/crashpad/client/crash_report_database.h
index 19f1bf74db..c24b4a629e 100644
--- a/extern/crashpad/crashpad/client/crash_report_database.h
+++ b/extern/crashpad/crashpad/client/crash_report_database.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -34,6 +34,7 @@
 namespace crashpad {
 
 class Settings;
+class SettingsReader;
 
 //! \brief An interface for managing a collection of crash report files and
 //!     metadata associated with the crash reports.
@@ -129,8 +130,6 @@ class CrashReportDatabase {
 
     //! \brief Adds an attachment to the report.
     //!
-    //! \note This function is not yet implemented on macOS.
-    //!
     //! \param[in] name The key and name for the attachment, which will be
     //!     included in the http upload. The attachment will not appear in the
     //!     minidump report. \a name should only use characters from the set
@@ -174,8 +173,6 @@ class CrashReportDatabase {
 
     //! \brief Obtains a mapping of names to file readers for any attachments
     //!     for the report.
-    //!
-    //! This is not implemented on macOS.
     std::map<std::string, FileReader*> GetAttachments() const {
       return attachment_map_;
     }
@@ -270,6 +267,16 @@ class CrashReportDatabase {
   static std::unique_ptr<CrashReportDatabase> InitializeWithoutCreating(
       const base::FilePath& path);
 
+  //! \brief Given a database path, return a read-only view of its settings.
+  //!
+  //! \param[in] path A path to the database. If the database does not exist, or
+  //!     the settings file does not exist, the returned reader will fail its
+  //!     read methods.
+  //!
+  //! \return A SettingsReader.
+  static std::unique_ptr<SettingsReader> GetSettingsReaderForDatabasePath(
+      const base::FilePath& path);
+
   //! \brief Returns the Settings object for this database.
   //!
   //! \return A weak pointer to the Settings object, which is owned by the
@@ -332,7 +339,8 @@ class CrashReportDatabase {
   virtual OperationStatus GetCompletedReports(std::vector<Report>* reports) = 0;
 
   //! \brief Obtains and locks a report object for uploading to a collection
-  //!     server.
+  //!     server. On iOS the file lock is released and mutual-exclusion is kept
+  //!     via a file attribute.
   //!
   //! Callers should upload the crash report using the FileReader provided.
   //! Callers should then call RecordUploadComplete() to record a successful
@@ -340,6 +348,13 @@ class CrashReportDatabase {
   //! be recorded as unsuccessful and the report lock released when \a report is
   //! destroyed.
   //!
+  //! On iOS, holding a lock during a slow upload can lead to watchdog kills if
+  //! the app is suspended mid-upload. Instead, if the client can obtain the
+  //! lock, the database sets a lock-time file attribute and releases the lock.
+  //! The attribute is cleared when the upload is completed. The lock-time
+  //! attribute can be used to prevent file access from other processes, or to
+  //! discard reports that likely were terminated mid-upload.
+  //!
   //! \param[in] uuid The unique identifier for the crash report record.
   //! \param[out] report A crash report record for the report to be uploaded.
   //!     Only valid if this returns #kNoError.
@@ -400,9 +415,11 @@ class CrashReportDatabase {
   virtual OperationStatus RequestUpload(const UUID& uuid) = 0;
 
   //! \brief Cleans the database of expired lockfiles, metadata without report
-  //!     files, and report files without metadata.
+  //!     files, report files without metadata, and attachments without report
+  //!     files.
   //!
-  //! This method does nothing on the macOS implementations of the database.
+  //! As the macOS implementation does not use  lock or metadata files, the
+  //! cleaning is limited to attachments without report files.
   //!
   //! \param[in] lockfile_ttl The number of seconds at which lockfiles or new
   //!     report files are considered expired.
@@ -410,7 +427,31 @@ class CrashReportDatabase {
   virtual int CleanDatabase(time_t lockfile_ttl) { return 0; }
 
  protected:
-  CrashReportDatabase() {}
+  CrashReportDatabase() = default;
+
+  //! \brief The path to the database passed to Initialize.
+  //!
+  //! \return The filepath of the database;
+  virtual base::FilePath DatabasePath() = 0;
+
+  //! \brief Build a filepath for the root attachments directory.
+  //!
+  //! \return The filepath to the attachments directory.
+  base::FilePath AttachmentsRootPath();
+
+  //! \brief  Build a filepath for the directory for the report to hold
+  //!     attachments.
+  //!
+  //! \param[in] uuid The unique identifier for the crash report record.
+  //!
+  //! \return The filepath to the report attachments directory.
+  base::FilePath AttachmentsPath(const UUID& uuid);
+
+  //! \brief Attempts to remove any attachments associated with the given
+  //!     report UUID. There may not be any, so failing is not an error.
+  //!
+  //! \param[in] uuid The unique identifier for the crash report record.
+  void RemoveAttachmentsByUUID(const UUID& uuid);
 
  private:
   //! \brief Adjusts a crash report record’s metadata to account for an upload
diff --git a/extern/crashpad/crashpad/client/crash_report_database_generic.cc b/extern/crashpad/crashpad/client/crash_report_database_generic.cc
index a433a905dc..c92922eb10 100644
--- a/extern/crashpad/crashpad/client/crash_report_database_generic.cc
+++ b/extern/crashpad/crashpad/client/crash_report_database_generic.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,10 +18,12 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include <mutex>
+#include <tuple>
 #include <utility>
 
+#include "base/check_op.h"
 #include "base/logging.h"
-#include "base/macros.h"
 #include "build/build_config.h"
 #include "client/settings.h"
 #include "util/file/directory_reader.h"
@@ -45,14 +47,6 @@ UUID UUIDFromReportPath(const base::FilePath& path) {
   return uuid;
 }
 
-bool AttachmentNameIsOK(const std::string& name) {
-  for (const char c : name) {
-    if (c != '_' && c != '-' && c != '.' && !isalnum(c))
-      return false;
-  }
-  return true;
-}
-
 using OperationStatus = CrashReportDatabase::OperationStatus;
 
 constexpr base::FilePath::CharType kSettings[] =
@@ -70,8 +64,6 @@ constexpr base::FilePath::CharType kPendingDirectory[] =
     FILE_PATH_LITERAL("pending");
 constexpr base::FilePath::CharType kCompletedDirectory[] =
     FILE_PATH_LITERAL("completed");
-constexpr base::FilePath::CharType kAttachmentsDirectory[] =
-    FILE_PATH_LITERAL("attachments");
 
 constexpr const base::FilePath::CharType* kReportDirectories[] = {
     kNewDirectory,
@@ -164,40 +156,11 @@ class ScopedLockFile {
  private:
   ScopedRemoveFile lock_file_;
 };
-
-off_t GetFileSize(const base::FilePath& filepath) {
-  struct stat statbuf;
-  if (stat(filepath.value().c_str(), &statbuf) == 0) {
-    return statbuf.st_size;
-  }
-  PLOG(ERROR) << "stat " << filepath.value();
-  return 0;
-}
-
-void AddAttachmentSize(const base::FilePath& attachments_dir, uint64_t* size) {
-  // Early return if the attachment directory does not exist.
-  if (!IsDirectory(attachments_dir, /*allow_symlinks=*/false)) {
-    return;
-  }
-  DirectoryReader reader;
-  if (!reader.Open(attachments_dir)) {
-    return;
-  }
-  base::FilePath attachment_filename;
-  DirectoryReader::Result result;
-  while ((result = reader.NextFile(&attachment_filename)) ==
-         DirectoryReader::Result::kSuccess) {
-    const base::FilePath attachment_filepath(
-        attachments_dir.Append(attachment_filename));
-    *size += GetFileSize(attachment_filepath);
-  }
-}
-
 }  // namespace
 
 class CrashReportDatabaseGeneric : public CrashReportDatabase {
  public:
-  CrashReportDatabaseGeneric();
+  explicit CrashReportDatabaseGeneric(const base::FilePath& path);
 
   CrashReportDatabaseGeneric(const CrashReportDatabaseGeneric&) = delete;
   CrashReportDatabaseGeneric& operator=(const CrashReportDatabaseGeneric&) =
@@ -205,7 +168,7 @@ class CrashReportDatabaseGeneric : public CrashReportDatabase {
 
   ~CrashReportDatabaseGeneric() override;
 
-  bool Initialize(const base::FilePath& path, bool may_create);
+  bool Initialize(bool may_create);
 
   // CrashReportDatabase:
   Settings* GetSettings() override;
@@ -225,9 +188,7 @@ class CrashReportDatabaseGeneric : public CrashReportDatabase {
   OperationStatus DeleteReport(const UUID& uuid) override;
   OperationStatus RequestUpload(const UUID& uuid) override;
   int CleanDatabase(time_t lockfile_ttl) override;
-
-  // Build a filepath for the directory for the report to hold attachments.
-  base::FilePath AttachmentsPath(const UUID& uuid);
+  base::FilePath DatabasePath() override;
 
  private:
   struct LockfileUploadReport : public UploadReport {
@@ -286,10 +247,6 @@ class CrashReportDatabaseGeneric : public CrashReportDatabase {
   // Cleans any attachments that have no associated report in any state.
   void CleanOrphanedAttachments();
 
-  // Attempt to remove any attachments associated with the given report UUID.
-  // There may not be any, so failing is not an error.
-  void RemoveAttachmentsByUUID(const UUID& uuid);
-
   // Reads the metadata for a report from path and returns it in report.
   bool ReadMetadata(const base::FilePath& path, Report* report);
 
@@ -302,75 +259,25 @@ class CrashReportDatabaseGeneric : public CrashReportDatabase {
   // Writes the metadata for report to the filesystem at path.
   static bool WriteMetadata(const base::FilePath& path, const Report& report);
 
-  base::FilePath base_dir_;
+  Settings& SettingsInternal() {
+    std::call_once(settings_init_, [this]() { settings_.Initialize(); });
+    return settings_;
+  }
+
+  const base::FilePath base_dir_;
   Settings settings_;
+  std::once_flag settings_init_;
   InitializationStateDcheck initialized_;
 };
 
-FileWriter* CrashReportDatabase::NewReport::AddAttachment(
-    const std::string& name) {
-  if (!AttachmentNameIsOK(name)) {
-    LOG(ERROR) << "invalid name for attachment " << name;
-    return nullptr;
-  }
-
-  base::FilePath attachments_dir =
-      static_cast<CrashReportDatabaseGeneric*>(database_)->AttachmentsPath(
-          uuid_);
-  if (!LoggingCreateDirectory(
-          attachments_dir, FilePermissions::kOwnerOnly, true)) {
-    return nullptr;
-  }
-
-  base::FilePath path = attachments_dir.Append(name);
-
-  auto writer = std::make_unique<FileWriter>();
-  if (!writer->Open(
-          path, FileWriteMode::kCreateOrFail, FilePermissions::kOwnerOnly)) {
-    LOG(ERROR) << "could not open " << path.value();
-    return nullptr;
-  }
-  attachment_writers_.emplace_back(std::move(writer));
-  attachment_removers_.emplace_back(ScopedRemoveFile(path));
-  return attachment_writers_.back().get();
-}
-
-void CrashReportDatabase::UploadReport::InitializeAttachments() {
-  base::FilePath attachments_dir =
-      static_cast<CrashReportDatabaseGeneric*>(database_)->AttachmentsPath(
-          uuid);
-  if (!IsDirectory(attachments_dir, /*allow_symlinks=*/false)) {
-    return;
-  }
-  DirectoryReader reader;
-  if (!reader.Open(attachments_dir)) {
-    return;
-  }
-
-  base::FilePath filename;
-  DirectoryReader::Result dir_result;
-  while ((dir_result = reader.NextFile(&filename)) ==
-         DirectoryReader::Result::kSuccess) {
-    const base::FilePath filepath(attachments_dir.Append(filename));
-    std::unique_ptr<FileReader> reader(std::make_unique<FileReader>());
-    if (!reader->Open(filepath)) {
-      LOG(ERROR) << "attachment " << filepath.value()
-                 << " couldn't be opened, skipping";
-      continue;
-    }
-    attachment_readers_.emplace_back(std::move(reader));
-    attachment_map_[filename.value()] = attachment_readers_.back().get();
-  }
-}
-
-CrashReportDatabaseGeneric::CrashReportDatabaseGeneric() = default;
+CrashReportDatabaseGeneric::CrashReportDatabaseGeneric(
+    const base::FilePath& path)
+    : base_dir_(path), settings_(path.Append(kSettings)) {}
 
 CrashReportDatabaseGeneric::~CrashReportDatabaseGeneric() = default;
 
-bool CrashReportDatabaseGeneric::Initialize(const base::FilePath& path,
-                                            bool may_create) {
+bool CrashReportDatabaseGeneric::Initialize(bool may_create) {
   INITIALIZATION_STATE_SET_INITIALIZING(initialized_);
-  base_dir_ = path;
 
   if (!IsDirectory(base_dir_, true) &&
       !(may_create &&
@@ -385,13 +292,8 @@ bool CrashReportDatabaseGeneric::Initialize(const base::FilePath& path,
     }
   }
 
-  if (!LoggingCreateDirectory(base_dir_.Append(kAttachmentsDirectory),
-                              FilePermissions::kOwnerOnly,
-                              true)) {
-    return false;
-  }
-
-  if (!settings_.Initialize(base_dir_.Append(kSettings))) {
+  if (!LoggingCreateDirectory(
+          AttachmentsRootPath(), FilePermissions::kOwnerOnly, true)) {
     return false;
   }
 
@@ -399,23 +301,13 @@ bool CrashReportDatabaseGeneric::Initialize(const base::FilePath& path,
   return true;
 }
 
-// static
-std::unique_ptr<CrashReportDatabase> CrashReportDatabase::Initialize(
-    const base::FilePath& path) {
-  auto database = std::make_unique<CrashReportDatabaseGeneric>();
-  return database->Initialize(path, true) ? std::move(database) : nullptr;
-}
-
-// static
-std::unique_ptr<CrashReportDatabase>
-CrashReportDatabase::InitializeWithoutCreating(const base::FilePath& path) {
-  auto database = std::make_unique<CrashReportDatabaseGeneric>();
-  return database->Initialize(path, false) ? std::move(database) : nullptr;
+base::FilePath CrashReportDatabaseGeneric::DatabasePath() {
+  return base_dir_;
 }
 
 Settings* CrashReportDatabaseGeneric::GetSettings() {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
-  return &settings_;
+  return &SettingsInternal();
 }
 
 OperationStatus CrashReportDatabaseGeneric::PrepareNewCrashReport(
@@ -454,14 +346,14 @@ OperationStatus CrashReportDatabaseGeneric::FinishedWritingCrashReport(
     return kFileSystemError;
   }
   // We've moved the report to pending, so it no longer needs to be removed.
-  ignore_result(report->file_remover_.release());
+  std::ignore = report->file_remover_.release();
 
   // Close all the attachments and disarm their removers too.
   for (auto& writer : report->attachment_writers_) {
     writer->Close();
   }
   for (auto& remover : report->attachment_removers_) {
-    ignore_result(remover.release());
+    std::ignore = remover.release();
   }
 
   *uuid = report->ReportID();
@@ -642,6 +534,16 @@ int CrashReportDatabaseGeneric::CleanDatabase(time_t lockfile_ttl) {
   removed += CleanReportsInState(kPending, lockfile_ttl);
   removed += CleanReportsInState(kCompleted, lockfile_ttl);
   CleanOrphanedAttachments();
+#if !CRASHPAD_FLOCK_ALWAYS_SUPPORTED
+  base::FilePath settings_path(kSettings);
+  if (Settings::IsLockExpired(settings_path, lockfile_ttl)) {
+    base::FilePath lockfile_path(settings_path.value() +
+                                 Settings::kLockfileExtension);
+    if (LoggingRemoveFile(lockfile_path)) {
+      ++removed;
+    }
+  }
+#endif  // !CRASHPAD_FLOCK_ALWAYS_SUPPORTED
   return removed;
 }
 
@@ -686,7 +588,7 @@ OperationStatus CrashReportDatabaseGeneric::RecordUploadAttempt(
     return kDatabaseError;
   }
 
-  if (!settings_.SetLastUploadAttemptTime(now)) {
+  if (!SettingsInternal().SetLastUploadAttemptTime(now)) {
     return kDatabaseError;
   }
 
@@ -698,8 +600,8 @@ base::FilePath CrashReportDatabaseGeneric::ReportPath(const UUID& uuid,
   DCHECK_NE(state, kUninitialized);
   DCHECK_NE(state, kSearchable);
 
-#if defined(OS_WIN)
-  const std::wstring uuid_string = uuid.ToString16();
+#if BUILDFLAG(IS_WIN)
+  const std::wstring uuid_string = uuid.ToWString();
 #else
   const std::string uuid_string = uuid.ToString();
 #endif
@@ -708,16 +610,6 @@ base::FilePath CrashReportDatabaseGeneric::ReportPath(const UUID& uuid,
       .Append(uuid_string + kCrashReportExtension);
 }
 
-base::FilePath CrashReportDatabaseGeneric::AttachmentsPath(const UUID& uuid) {
-#if defined(OS_WIN)
-  const std::wstring uuid_string = uuid.ToString16();
-#else
-  const std::string uuid_string = uuid.ToString();
-#endif
-
-  return base_dir_.Append(kAttachmentsDirectory).Append(uuid_string);
-}
-
 OperationStatus CrashReportDatabaseGeneric::LocateAndLockReport(
     const UUID& uuid,
     ReportState desired_state,
@@ -878,7 +770,7 @@ int CrashReportDatabaseGeneric::CleanReportsInState(ReportState state,
 }
 
 void CrashReportDatabaseGeneric::CleanOrphanedAttachments() {
-  base::FilePath root_attachments_dir(base_dir_.Append(kAttachmentsDirectory));
+  base::FilePath root_attachments_dir(AttachmentsRootPath());
   DirectoryReader reader;
   if (!reader.Open(root_attachments_dir)) {
     return;
@@ -888,8 +780,9 @@ void CrashReportDatabaseGeneric::CleanOrphanedAttachments() {
   DirectoryReader::Result result;
   while ((result = reader.NextFile(&filename)) ==
          DirectoryReader::Result::kSuccess) {
-    const base::FilePath path(root_attachments_dir.Append(filename));
-    if (IsDirectory(path, false)) {
+    const base::FilePath report_attachment_dir(
+        root_attachments_dir.Append(filename));
+    if (IsDirectory(report_attachment_dir, false)) {
       UUID uuid;
       if (!uuid.InitializeFromString(filename.value())) {
         LOG(ERROR) << "unexpected attachment dir name " << filename.value();
@@ -919,27 +812,6 @@ void CrashReportDatabaseGeneric::CleanOrphanedAttachments() {
   }
 }
 
-void CrashReportDatabaseGeneric::RemoveAttachmentsByUUID(const UUID& uuid) {
-  base::FilePath attachments_dir = AttachmentsPath(uuid);
-  if (!IsDirectory(attachments_dir, /*allow_symlinks=*/false)) {
-    return;
-  }
-  DirectoryReader reader;
-  if (!reader.Open(attachments_dir)) {
-    return;
-  }
-
-  base::FilePath filename;
-  DirectoryReader::Result result;
-  while ((result = reader.NextFile(&filename)) ==
-         DirectoryReader::Result::kSuccess) {
-    const base::FilePath filepath(attachments_dir.Append(filename));
-    LoggingRemoveFile(filepath);
-  }
-
-  LoggingRemoveDirectory(attachments_dir);
-}
-
 bool CrashReportDatabaseGeneric::ReadMetadata(const base::FilePath& path,
                                               Report* report) {
   const base::FilePath metadata_path(
@@ -974,7 +846,7 @@ bool CrashReportDatabaseGeneric::ReadMetadata(const base::FilePath& path,
   // Seed the total size with the main report size and then add the sizes of any
   // potential attachments.
   uint64_t total_size = GetFileSize(path);
-  AddAttachmentSize(AttachmentsPath(uuid), &total_size);
+  total_size += GetDirectorySize(AttachmentsPath(uuid));
 
   report->uuid = uuid;
   report->upload_attempts = metadata.upload_attempts;
@@ -1056,4 +928,25 @@ bool CrashReportDatabaseGeneric::WriteMetadata(const base::FilePath& path,
          LoggingWriteFile(handle.get(), report.id.c_str(), report.id.size());
 }
 
+// static
+std::unique_ptr<CrashReportDatabase> CrashReportDatabase::Initialize(
+    const base::FilePath& path) {
+  auto database = std::make_unique<CrashReportDatabaseGeneric>(path);
+  return database->Initialize(true) ? std::move(database) : nullptr;
+}
+
+// static
+std::unique_ptr<CrashReportDatabase>
+CrashReportDatabase::InitializeWithoutCreating(const base::FilePath& path) {
+  auto database = std::make_unique<CrashReportDatabaseGeneric>(path);
+  return database->Initialize(false) ? std::move(database) : nullptr;
+}
+
+// static
+std::unique_ptr<SettingsReader>
+CrashReportDatabase::GetSettingsReaderForDatabasePath(
+    const base::FilePath& path) {
+  return std::make_unique<SettingsReader>(path.Append(kSettings));
+}
+
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/client/crash_report_database_mac.mm b/extern/crashpad/crashpad/client/crash_report_database_mac.mm
index 839cfc8f30..6041434c13 100644
--- a/extern/crashpad/crashpad/client/crash_report_database_mac.mm
+++ b/extern/crashpad/crashpad/client/crash_report_database_mac.mm
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
 
 #include "client/crash_report_database.h"
 
+#import <Foundation/Foundation.h>
 #include <errno.h>
 #include <fcntl.h>
-#import <Foundation/Foundation.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <sys/stat.h>
@@ -25,21 +25,30 @@
 #include <unistd.h>
 #include <uuid/uuid.h>
 
-#include "base/cxx17_backports.h"
+#include <array>
+#include <iterator>
+#include <mutex>
+#include <string_view>
+#include <tuple>
+
+#include "base/apple/scoped_nsautorelease_pool.h"
 #include "base/logging.h"
-#include "base/mac/scoped_nsautorelease_pool.h"
-#include "base/macros.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/scoped_generic.h"
-#include "base/strings/string_piece.h"
-#include "base/strings/stringprintf.h"
+#include "base/strings/strcat.h"
 #include "base/strings/sys_string_conversions.h"
 #include "client/settings.h"
+#include "util/file/directory_reader.h"
 #include "util/file/file_io.h"
+#include "util/file/filesystem.h"
 #include "util/mac/xattr.h"
 #include "util/misc/initialization_state_dcheck.h"
 #include "util/misc/metrics.h"
 
+#if BUILDFLAG(IS_IOS)
+#include "util/ios/scoped_background_task.h"
+#endif  // BUILDFLAG(IS_IOS)
+
 namespace crashpad {
 
 namespace {
@@ -50,7 +59,7 @@
 
 constexpr char kSettings[] = "settings.dat";
 
-constexpr const char* kReportDirectories[] = {
+constexpr std::array<const char*, 3> kReportDirectories = {
     kWriteDirectory,
     kUploadPendingDirectory,
     kCompletedDirectory,
@@ -62,6 +71,9 @@
 constexpr char kXattrCollectorID[] = "id";
 constexpr char kXattrCreationTime[] = "creation_time";
 constexpr char kXattrIsUploaded[] = "uploaded";
+#if BUILDFLAG(IS_IOS)
+constexpr char kXattrUploadStartTime[] = "upload_start_time";
+#endif
 constexpr char kXattrLastUploadTime[] = "last_upload_time";
 constexpr char kXattrUploadAttemptCount[] = "upload_count";
 constexpr char kXattrIsUploadExplicitlyRequested[] =
@@ -103,10 +115,10 @@ bool CreateOrEnsureDirectoryExists(const base::FilePath& path) {
 // Creates a long database xattr name from the short constant name. These names
 // have changed, and new_name determines whether the returned xattr name will be
 // the old name or its new equivalent.
-std::string XattrNameInternal(const base::StringPiece& name, bool new_name) {
-  return base::StringPrintf(new_name ? "org.chromium.crashpad.database.%s"
-                                     : "com.googlecode.crashpad.%s",
-                            name.data());
+std::string XattrNameInternal(std::string_view name, bool new_name) {
+  return base::StrCat({new_name ? "org.chromium.crashpad.database."
+                                : "com.googlecode.crashpad.",
+                       name});
 }
 
 }  // namespace
@@ -153,6 +165,8 @@ OperationStatus SkipReportUpload(const UUID& uuid,
                                    Metrics::CrashSkippedReason reason) override;
   OperationStatus DeleteReport(const UUID& uuid) override;
   OperationStatus RequestUpload(const UUID& uuid) override;
+  int CleanDatabase(time_t lockfile_ttl) override;
+  base::FilePath DatabasePath() override;
 
  private:
   // CrashReportDatabase:
@@ -174,9 +188,15 @@ OperationStatus RecordUploadAttempt(UploadReport* report,
   //! \brief A private extension of the Report class that maintains bookkeeping
   //!    information of the database.
   struct UploadReportMac : public UploadReport {
+#if BUILDFLAG(IS_IOS)
+    //! \brief Obtain a background task assertion while a flock is in use.
+    //!     Ensure this is defined first so it is destroyed last.
+    internal::ScopedBackgroundTask ios_background_task{"UploadReportMac"};
+#else
     //! \brief Stores the flock of the file for the duration of
     //!     GetReportForUploading() and RecordUploadAttempt().
     base::ScopedFD lock_fd;
+#endif  // BUILDFLAG(IS_IOS)
   };
 
   //! \brief Locates a crash report in the database by UUID.
@@ -230,7 +250,7 @@ OperationStatus ReportsInDirectory(const base::FilePath& path,
   //! \param[in] name The short name of the extended attribute.
   //!
   //! \return The long name of the extended attribute.
-  std::string XattrName(const base::StringPiece& name);
+  std::string XattrName(std::string_view name);
 
   //! \brief Marks a report with a given path as completed.
   //!
@@ -244,29 +264,28 @@ OperationStatus ReportsInDirectory(const base::FilePath& path,
       const base::FilePath& report_path,
       base::FilePath* out_path);
 
-  base::FilePath base_dir_;
+  // Cleans any attachments that have no associated report in any state.
+  void CleanOrphanedAttachments();
+
+  Settings& SettingsInternal() {
+    std::call_once(settings_init_, [this]() { settings_.Initialize(); });
+    return settings_;
+  }
+
+  const base::FilePath base_dir_;
   Settings settings_;
+  std::once_flag settings_init_;
   bool xattr_new_names_;
   InitializationStateDcheck initialized_;
 };
 
-FileWriter* CrashReportDatabase::NewReport::AddAttachment(
-    const std::string& name) {
-  // Attachments aren't implemented in the Mac database yet.
-  return nullptr;
-}
-
-void CrashReportDatabase::UploadReport::InitializeAttachments() {
-  // Attachments aren't implemented in the Mac database yet.
-}
-
 CrashReportDatabaseMac::CrashReportDatabaseMac(const base::FilePath& path)
     : CrashReportDatabase(),
       base_dir_(path),
-      settings_(),
+      settings_(path.Append(kSettings)),
+      settings_init_(),
       xattr_new_names_(false),
-      initialized_() {
-}
+      initialized_() {}
 
 CrashReportDatabaseMac::~CrashReportDatabaseMac() {}
 
@@ -283,13 +302,14 @@ OperationStatus ReportsInDirectory(const base::FilePath& path,
   }
 
   // Create the three processing directories for the database.
-  for (size_t i = 0; i < base::size(kReportDirectories); ++i) {
-    if (!CreateOrEnsureDirectoryExists(base_dir_.Append(kReportDirectories[i])))
+  for (const auto& dir : kReportDirectories) {
+    if (!CreateOrEnsureDirectoryExists(base_dir_.Append(dir)))
       return false;
   }
 
-  if (!settings_.Initialize(base_dir_.Append(kSettings)))
+  if (!CreateOrEnsureDirectoryExists(AttachmentsRootPath())) {
     return false;
+  }
 
   // Do an xattr operation as the last step, to ensure the filesystem has
   // support for them. This xattr also serves as a marker for whether the
@@ -315,9 +335,13 @@ OperationStatus ReportsInDirectory(const base::FilePath& path,
   return true;
 }
 
+base::FilePath CrashReportDatabaseMac::DatabasePath() {
+  return base_dir_;
+}
+
 Settings* CrashReportDatabaseMac::GetSettings() {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
-  return &settings_;
+  return &SettingsInternal();
 }
 
 CrashReportDatabase::OperationStatus
@@ -379,7 +403,15 @@ OperationStatus ReportsInDirectory(const base::FilePath& path,
     PLOG(ERROR) << "rename " << path.value() << " to " << new_path.value();
     return kFileSystemError;
   }
-  ignore_result(report->file_remover_.release());
+  std::ignore = report->file_remover_.release();
+
+  // Close all the attachments and disarm their removers too.
+  for (auto& writer : report->attachment_writers_) {
+    writer->Close();
+  }
+  for (auto& remover : report->attachment_removers_) {
+    std::ignore = remover.release();
+  }
 
   Metrics::CrashReportPending(Metrics::PendingReportReason::kNewlyCreated);
   Metrics::CrashReportSize(size);
@@ -444,12 +476,50 @@ OperationStatus ReportsInDirectory(const base::FilePath& path,
   if (!ReadReportMetadataLocked(upload_report->file_path, upload_report.get()))
     return kDatabaseError;
 
-  if (!upload_report->reader_->Open(upload_report->file_path)) {
+#if BUILDFLAG(IS_IOS)
+  time_t upload_start_time = 0;
+  if (ReadXattrTimeT(upload_report->file_path,
+                     XattrName(kXattrUploadStartTime),
+                     &upload_start_time) == XattrStatus::kOtherError) {
+    return kDatabaseError;
+  }
+
+  time_t now = time(nullptr);
+  if (upload_start_time) {
+    // If we were able to ObtainReportLock but kXattrUploadStartTime is set,
+    // either another client is uploading this report or a client was terminated
+    // during an upload. CrashReportUploadThread sets the timeout to 20 seconds
+    // for iOS. If kXattrUploadStartTime is less than  5 minutes ago, consider
+    // the report locked and return kBusyError. Otherwise, consider the upload a
+    // failure and skip the report.
+    if (upload_start_time > now - 15 * internal::kUploadReportTimeoutSeconds) {
+      return kBusyError;
+    } else {
+      // SkipReportUpload expects an unlocked report.
+      lock.reset();
+      CrashReportDatabase::OperationStatus os = SkipReportUpload(
+          upload_report->uuid, Metrics::CrashSkippedReason::kUploadFailed);
+      if (os != kNoError) {
+        return kDatabaseError;
+      }
+      return kReportNotFound;
+    }
+  }
+
+  if (!WriteXattrTimeT(
+          upload_report->file_path, XattrName(kXattrUploadStartTime), now)) {
+    return kDatabaseError;
+  }
+#endif
+
+  if (!upload_report->Initialize(upload_report->file_path, this)) {
     return kFileSystemError;
   }
 
   upload_report->database_ = this;
+#if !BUILDFLAG(IS_IOS)
   upload_report->lock_fd.reset(lock.release());
+#endif
   upload_report->report_metrics_ = report_metrics;
   report->reset(upload_report.release());
   return kNoError;
@@ -480,6 +550,13 @@ OperationStatus ReportsInDirectory(const base::FilePath& path,
       return os;
   }
 
+#if BUILDFLAG(IS_IOS)
+  if (RemoveXattr(report_path, XattrName(kXattrUploadStartTime)) ==
+      XattrStatus::kOtherError) {
+    return kDatabaseError;
+  }
+#endif
+
   if (!WriteXattrBool(report_path, XattrName(kXattrIsUploaded), successful)) {
     return kDatabaseError;
   }
@@ -502,7 +579,7 @@ OperationStatus ReportsInDirectory(const base::FilePath& path,
     return kDatabaseError;
   }
 
-  if (!settings_.SetLastUploadAttemptTime(now)) {
+  if (!SettingsInternal().SetLastUploadAttemptTime(now)) {
     return kDatabaseError;
   }
 
@@ -524,6 +601,13 @@ OperationStatus ReportsInDirectory(const base::FilePath& path,
   if (!lock.is_valid())
     return kBusyError;
 
+#if BUILDFLAG(IS_IOS)
+  if (RemoveXattr(report_path, XattrName(kXattrUploadStartTime)) ==
+      XattrStatus::kOtherError) {
+    return kDatabaseError;
+  }
+#endif
+
   return MarkReportCompletedLocked(report_path, nullptr);
 }
 
@@ -544,6 +628,8 @@ OperationStatus ReportsInDirectory(const base::FilePath& path,
     return kFileSystemError;
   }
 
+  RemoveAttachmentsByUUID(uuid);
+
   return kNoError;
 }
 
@@ -628,6 +714,34 @@ OperationStatus ReportsInDirectory(const base::FilePath& path,
   return kNoError;
 }
 
+int CrashReportDatabaseMac::CleanDatabase(time_t lockfile_ttl) {
+  int removed = 0;
+  time_t now = time(nullptr);
+
+  DirectoryReader reader;
+  const base::FilePath new_dir(base_dir_.Append(kWriteDirectory));
+  if (reader.Open(new_dir)) {
+    base::FilePath filename;
+    DirectoryReader::Result result;
+    while ((result = reader.NextFile(&filename)) ==
+           DirectoryReader::Result::kSuccess) {
+      const base::FilePath filepath(new_dir.Append(filename));
+      timespec filetime;
+      if (!FileModificationTime(filepath, &filetime)) {
+        continue;
+      }
+      if (filetime.tv_sec <= now - lockfile_ttl) {
+        if (LoggingRemoveFile(filepath)) {
+          ++removed;
+        }
+      }
+    }
+  }
+
+  CleanOrphanedAttachments();
+  return removed;
+}
+
 // static
 base::ScopedFD CrashReportDatabaseMac::ObtainReportLock(
     const base::FilePath& path) {
@@ -685,13 +799,11 @@ OperationStatus ReportsInDirectory(const base::FilePath& path,
     return false;
   }
 
-  // There are no attachments on Mac so the total size is the main report size.
-  struct stat statbuf;
-  if (stat(path.value().c_str(), &statbuf) != 0) {
-    PLOG(ERROR) << "stat " << path.value();
-    return false;
-  }
-  report->total_size = statbuf.st_size;
+  // Seed the total size with the main report size and then add the sizes of any
+  // potential attachments.
+  uint64_t total_size = GetFileSize(path);
+  total_size += GetDirectorySize(AttachmentsPath(report->uuid));
+  report->total_size = total_size;
 
   return true;
 }
@@ -699,7 +811,7 @@ OperationStatus ReportsInDirectory(const base::FilePath& path,
 CrashReportDatabase::OperationStatus CrashReportDatabaseMac::ReportsInDirectory(
     const base::FilePath& path,
     std::vector<CrashReportDatabase::Report>* reports) {
-  base::mac::ScopedNSAutoreleasePool pool;
+  base::apple::ScopedNSAutoreleasePool pool;
 
   DCHECK(reports->empty());
 
@@ -732,7 +844,7 @@ OperationStatus ReportsInDirectory(const base::FilePath& path,
   return kNoError;
 }
 
-std::string CrashReportDatabaseMac::XattrName(const base::StringPiece& name) {
+std::string CrashReportDatabaseMac::XattrName(std::string_view name) {
   return XattrNameInternal(name, xattr_new_names_);
 }
 
@@ -758,6 +870,49 @@ OperationStatus ReportsInDirectory(const base::FilePath& path,
   return kNoError;
 }
 
+void CrashReportDatabaseMac::CleanOrphanedAttachments() {
+  base::FilePath root_attachments_dir(AttachmentsRootPath());
+  DirectoryReader reader;
+  if (!reader.Open(root_attachments_dir)) {
+    return;
+  }
+
+  base::FilePath filename;
+  DirectoryReader::Result result;
+  while ((result = reader.NextFile(&filename)) ==
+         DirectoryReader::Result::kSuccess) {
+    const base::FilePath report_attachment_dir(
+        root_attachments_dir.Append(filename));
+    if (IsDirectory(report_attachment_dir, false)) {
+      UUID uuid;
+      if (!uuid.InitializeFromString(filename.value())) {
+        LOG(ERROR) << "unexpected attachment dir name " << filename.value();
+        continue;
+      }
+
+      // Check to see if the report is being created in "new".
+      base::FilePath new_dir_path =
+          base_dir_.Append(kWriteDirectory)
+              .Append(uuid.ToString() + "." + kCrashReportFileExtension);
+      if (IsRegularFile(new_dir_path)) {
+        continue;
+      }
+
+      // Check to see if the report is in "pending" or "completed".
+      base::FilePath local_path =
+          LocateCrashReport(uuid, kReportStatePending | kReportStateCompleted);
+      if (!local_path.empty()) {
+        continue;
+      }
+
+      // Couldn't find a report, assume these attachments are orphaned.
+      RemoveAttachmentsByUUID(uuid);
+    }
+  }
+}
+
+namespace {
+
 std::unique_ptr<CrashReportDatabase> InitializeInternal(
     const base::FilePath& path,
     bool may_create) {
@@ -769,6 +924,8 @@ OperationStatus ReportsInDirectory(const base::FilePath& path,
   return std::unique_ptr<CrashReportDatabase>(database_mac.release());
 }
 
+}  // namespace
+
 // static
 std::unique_ptr<CrashReportDatabase> CrashReportDatabase::Initialize(
     const base::FilePath& path) {
@@ -781,4 +938,11 @@ OperationStatus ReportsInDirectory(const base::FilePath& path,
   return InitializeInternal(path, false);
 }
 
+// static
+std::unique_ptr<SettingsReader>
+CrashReportDatabase::GetSettingsReaderForDatabasePath(
+    const base::FilePath& path) {
+  return std::make_unique<SettingsReader>(path.Append(kSettings));
+}
+
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/client/crash_report_database_test.cc b/extern/crashpad/crashpad/client/crash_report_database_test.cc
index 9d3f1fc9b9..6d8acaf00e 100644
--- a/extern/crashpad/crashpad/client/crash_report_database_test.cc
+++ b/extern/crashpad/crashpad/client/crash_report_database_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -24,6 +24,10 @@
 #include "util/file/file_io.h"
 #include "util/file/filesystem.h"
 
+#if BUILDFLAG(IS_IOS)
+#include "util/mac/xattr.h"
+#endif
+
 namespace crashpad {
 namespace test {
 namespace {
@@ -185,6 +189,41 @@ TEST_F(CrashReportDatabaseTest, Initialize) {
   EXPECT_FALSE(db);
 }
 
+TEST_F(CrashReportDatabaseTest, Settings) {
+  // Initialize three databases and ensure settings.dat isn't created yet.
+  ASSERT_TRUE(db());
+
+  base::FilePath settings_path =
+      path().Append(FILE_PATH_LITERAL("settings.dat"));
+  EXPECT_FALSE(FileExists(settings_path));
+
+  std::unique_ptr<CrashReportDatabase> db2 =
+      CrashReportDatabase::Initialize(path());
+  ASSERT_TRUE(db2);
+  EXPECT_FALSE(FileExists(settings_path));
+
+  std::unique_ptr<CrashReportDatabase> db3 =
+      CrashReportDatabase::Initialize(path());
+  ASSERT_TRUE(db3);
+  EXPECT_FALSE(FileExists(settings_path));
+
+  // Ensure settings.dat exists after getter.
+  Settings* settings = db3->GetSettings();
+  ASSERT_TRUE(settings);
+  EXPECT_TRUE(FileExists(settings_path));
+
+  time_t last_upload_attempt_time = 42;
+  ASSERT_TRUE(settings->SetLastUploadAttemptTime(last_upload_attempt_time));
+
+  // Ensure the first two databases read the same value.
+  ASSERT_TRUE(
+      db2->GetSettings()->GetLastUploadAttemptTime(&last_upload_attempt_time));
+  EXPECT_EQ(last_upload_attempt_time, 42);
+  ASSERT_TRUE(
+      db()->GetSettings()->GetLastUploadAttemptTime(&last_upload_attempt_time));
+  EXPECT_EQ(last_upload_attempt_time, 42);
+}
+
 TEST_F(CrashReportDatabaseTest, NewCrashReport) {
   std::unique_ptr<CrashReportDatabase::NewReport> new_report;
   EXPECT_EQ(db()->PrepareNewCrashReport(&new_report),
@@ -476,6 +515,46 @@ TEST_F(CrashReportDatabaseTest, DuelingUploads) {
             CrashReportDatabase::kNoError);
 }
 
+#if BUILDFLAG(IS_IOS)
+TEST_F(CrashReportDatabaseTest, InterruptedIOSUploads) {
+  CrashReportDatabase::Report report;
+  CreateCrashReport(&report);
+
+  std::unique_ptr<const CrashReportDatabase::UploadReport> upload_report;
+  EXPECT_EQ(db()->GetReportForUploading(report.uuid, &upload_report),
+            CrashReportDatabase::kNoError);
+
+  // Set upload_start_time to 10 minutes ago.
+  time_t ten_minutes_ago = time(nullptr) - 10 * 60;
+  ASSERT_TRUE(
+      WriteXattrTimeT(report.file_path,
+                      "org.chromium.crashpad.database.upload_start_time",
+                      ten_minutes_ago));
+
+  std::vector<CrashReportDatabase::Report> reports;
+  EXPECT_EQ(db()->GetPendingReports(&reports), CrashReportDatabase::kNoError);
+  ASSERT_EQ(reports.size(), 1u);
+  reports.clear();
+  EXPECT_EQ(db()->GetCompletedReports(&reports), CrashReportDatabase::kNoError);
+  EXPECT_TRUE(reports.empty());
+
+  // Getting a stale report will automatically skip it.
+  std::unique_ptr<const CrashReportDatabase::UploadReport> upload_report_2;
+  EXPECT_EQ(db()->GetReportForUploading(report.uuid, &upload_report_2),
+            CrashReportDatabase::kReportNotFound);
+  EXPECT_FALSE(upload_report_2);
+
+  // Confirm report was moved from pending to completed.
+  EXPECT_EQ(db()->GetPendingReports(&reports), CrashReportDatabase::kNoError);
+  EXPECT_TRUE(reports.empty());
+  EXPECT_EQ(db()->GetCompletedReports(&reports), CrashReportDatabase::kNoError);
+  ASSERT_EQ(reports.size(), 1u);
+
+  EXPECT_EQ(db()->RecordUploadComplete(std::move(upload_report), std::string()),
+            CrashReportDatabase::kReportNotFound);
+}
+#endif
+
 TEST_F(CrashReportDatabaseTest, UploadAlreadyUploaded) {
   CrashReportDatabase::Report report;
   CreateCrashReport(&report);
@@ -675,10 +754,6 @@ TEST_F(CrashReportDatabaseTest, RequestUpload) {
 }
 
 TEST_F(CrashReportDatabaseTest, Attachments) {
-#if defined(OS_APPLE) || defined(OS_WIN)
-  // Attachments aren't supported on Mac and Windows yet.
-  GTEST_SKIP();
-#else
   std::unique_ptr<CrashReportDatabase::NewReport> new_report;
   ASSERT_EQ(db()->PrepareNewCrashReport(&new_report),
             CrashReportDatabase::kNoError);
@@ -717,16 +792,9 @@ TEST_F(CrashReportDatabaseTest, Attachments) {
   char result_buffer[sizeof(test_data)];
   result_attachments["some_file"]->Read(result_buffer, sizeof(result_buffer));
   EXPECT_EQ(memcmp(test_data, result_buffer, sizeof(test_data)), 0);
-#endif
 }
 
 TEST_F(CrashReportDatabaseTest, OrphanedAttachments) {
-#if defined(OS_APPLE) || defined(OS_WIN)
-  // Attachments aren't supported on Mac and Windows yet.
-  GTEST_SKIP();
-#else
-  // TODO: This is using paths that are specific to the generic implementation
-  // and will need to be generalized for Mac and Windows.
   std::unique_ptr<CrashReportDatabase::NewReport> new_report;
   ASSERT_EQ(db()->PrepareNewCrashReport(&new_report),
             CrashReportDatabase::kNoError);
@@ -742,36 +810,60 @@ TEST_F(CrashReportDatabaseTest, OrphanedAttachments) {
             CrashReportDatabase::kNoError);
   EXPECT_EQ(uuid, expect_uuid);
 
+#if BUILDFLAG(IS_WIN)
+  const std::wstring uuid_string = uuid.ToWString();
+#else
+  const std::string uuid_string = uuid.ToString();
+#endif
+  const base::FilePath report_attachments_dir(
+      path().Append(FILE_PATH_LITERAL("attachments")).Append(uuid_string));
+  const base::FilePath file_path1(
+      report_attachments_dir.Append(FILE_PATH_LITERAL("file1")));
+  const base::FilePath file_path2(
+      report_attachments_dir.Append(FILE_PATH_LITERAL("file2")));
+
   CrashReportDatabase::Report report;
   ASSERT_EQ(db()->LookUpCrashReport(uuid, &report),
             CrashReportDatabase::kNoError);
 
+  // Cleaning a consistent database does not remove the attachements.
+  EXPECT_EQ(db()->CleanDatabase(0), 0);
+  EXPECT_TRUE(FileExists(file_path1));
+  EXPECT_TRUE(FileExists(file_path1));
+
   ASSERT_TRUE(LoggingRemoveFile(report.file_path));
 
+#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_WIN)
+  // CrashReportDatabaseMac stores metadata in xattrs and does not have .meta
+  // files.
+  // CrashReportDatabaseWin stores metadata in a global metadata file and not
+  // per report.
   ASSERT_TRUE(LoggingRemoveFile(base::FilePath(
       report.file_path.RemoveFinalExtension().value() + ".meta")));
+#endif
 
   ASSERT_EQ(db()->LookUpCrashReport(uuid, &report),
             CrashReportDatabase::kReportNotFound);
 
-  base::FilePath report_attachments_dir(
-      path().Append("attachments").Append(uuid.ToString()));
-  base::FilePath file_path1(report_attachments_dir.Append("file1"));
-  base::FilePath file_path2(report_attachments_dir.Append("file2"));
   EXPECT_TRUE(FileExists(file_path1));
   EXPECT_TRUE(FileExists(file_path1));
 
+#if BUILDFLAG(IS_WIN)
+  // On Windows, reports removed from metadata are counted, even if the file
+  // is not on the disk.
+  EXPECT_EQ(db()->CleanDatabase(0), 1);
+#else
   EXPECT_EQ(db()->CleanDatabase(0), 0);
+#endif
 
   EXPECT_FALSE(FileExists(file_path1));
   EXPECT_FALSE(FileExists(file_path2));
   EXPECT_FALSE(FileExists(report_attachments_dir));
-#endif
 }
 
 // This test uses knowledge of the database format to break it, so it only
 // applies to the unfified database implementation.
-#if !defined(OS_APPLE) && !defined(OS_WIN)
+#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_WIN)
 TEST_F(CrashReportDatabaseTest, CleanBrokenDatabase) {
   // Remove report files if metadata goes missing.
   CrashReportDatabase::Report report;
@@ -836,7 +928,7 @@ TEST_F(CrashReportDatabaseTest, CleanBrokenDatabase) {
   EXPECT_FALSE(PathExists(report.file_path));
   EXPECT_FALSE(PathExists(metadata3));
 }
-#endif  // !OS_APPLE && !OS_WIN
+#endif  // !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_WIN)
 
 TEST_F(CrashReportDatabaseTest, TotalSize_MainReportOnly) {
   std::unique_ptr<CrashReportDatabase::NewReport> new_report;
@@ -860,10 +952,6 @@ TEST_F(CrashReportDatabaseTest, TotalSize_MainReportOnly) {
 }
 
 TEST_F(CrashReportDatabaseTest, GetReportSize_RightSizeWithAttachments) {
-#if defined(OS_APPLE) || defined(OS_WIN)
-  // Attachments aren't supported on Mac and Windows yet.
-  return;
-#else
   std::unique_ptr<CrashReportDatabase::NewReport> new_report;
   ASSERT_EQ(db()->PrepareNewCrashReport(&new_report),
             CrashReportDatabase::kNoError);
@@ -895,7 +983,50 @@ TEST_F(CrashReportDatabaseTest, GetReportSize_RightSizeWithAttachments) {
   EXPECT_EQ(report.total_size,
             sizeof(main_report_data) + sizeof(attachment_1_data) +
                 sizeof(attachment_2_data));
-#endif
+}
+
+TEST_F(CrashReportDatabaseTest, InitializeFromLargerFileRetainsClientId) {
+  // Initialize the database for the first time, creating it.
+  ASSERT_TRUE(db());
+
+  const base::FilePath settings_path =
+      path().Append(FILE_PATH_LITERAL("settings.dat"));
+  EXPECT_FALSE(FileExists(settings_path));
+
+  Settings* settings = db()->GetSettings();
+  ASSERT_TRUE(settings);
+  EXPECT_TRUE(FileExists(settings_path));
+
+  UUID client_id;
+  ASSERT_TRUE(settings->GetClientID(&client_id));
+  EXPECT_NE(client_id, UUID());
+
+  // Close and reopen the database at the same path.
+  ResetDatabase();
+  EXPECT_FALSE(db());
+  EXPECT_TRUE(FileExists(settings_path));
+
+  // Append some data, to ensure that we can open settings even if a future
+  // version has added additional field to Settings (forwards compatible).
+  FileWriter settings_writer;
+  ASSERT_TRUE(settings_writer.Open(
+      settings_path, FileWriteMode::kReuseOrFail, FilePermissions::kOwnerOnly));
+  ASSERT_NE(settings_writer.Seek(0, SEEK_END), 0);
+  constexpr uint64_t extra_garbage = 0xBADF00D;
+  ASSERT_TRUE(settings_writer.Write(&extra_garbage, sizeof(extra_garbage)));
+  settings_writer.Close();
+
+  auto db = CrashReportDatabase::InitializeWithoutCreating(path());
+  ASSERT_TRUE(db);
+
+  settings = db->GetSettings();
+  ASSERT_TRUE(settings);
+
+  // Make sure that the reopened settings retained the original client id and
+  // wasn't recreated.
+  UUID reopened_client_id;
+  ASSERT_TRUE(settings->GetClientID(&reopened_client_id));
+  EXPECT_EQ(client_id, reopened_client_id);
 }
 
 }  // namespace
diff --git a/extern/crashpad/crashpad/client/crash_report_database_win.cc b/extern/crashpad/crashpad/client/crash_report_database_win.cc
index b8ecadb788..0ded021c3b 100644
--- a/extern/crashpad/crashpad/client/crash_report_database_win.cc
+++ b/extern/crashpad/crashpad/client/crash_report_database_win.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,10 +21,12 @@
 #include <time.h>
 #include <wchar.h>
 
+#include <mutex>
+#include <tuple>
 #include <utility>
 
+#include "base/check_op.h"
 #include "base/logging.h"
-#include "base/macros.h"
 #include "base/numerics/safe_math.h"
 #include "base/strings/utf_string_conversions.h"
 #include "client/settings.h"
@@ -48,8 +50,6 @@ constexpr wchar_t kCrashReportFileExtension[] = L"dmp";
 constexpr uint32_t kMetadataFileHeaderMagic = 'CPAD';
 constexpr uint32_t kMetadataFileVersion = 1;
 
-constexpr base::FilePath::CharType kAttachmentsDirectory[] = L"attachments";
-
 using OperationStatus = CrashReportDatabase::OperationStatus;
 
 // Helpers ---------------------------------------------------------------------
@@ -216,8 +216,10 @@ class Metadata {
   //!     handle.
   ~Metadata();
 
-  static std::unique_ptr<Metadata> Create(const base::FilePath& metadata_file,
-                                          const base::FilePath& report_dir);
+  static std::unique_ptr<Metadata> Create(
+      const base::FilePath& metadata_file,
+      const base::FilePath& report_dir,
+      const base::FilePath& attachments_dir);
 
   //! \brief Adds a new report to the set.
   //!
@@ -280,7 +282,9 @@ class Metadata {
   int CleanDatabase();
 
  private:
-  Metadata(FileHandle handle, const base::FilePath& report_dir);
+  Metadata(FileHandle handle,
+           const base::FilePath& report_dir,
+           const base::FilePath& attachments_dir);
 
   bool Rewind();
 
@@ -298,6 +302,7 @@ class Metadata {
 
   ScopedFileHandle handle_;
   const base::FilePath report_dir_;
+  const base::FilePath attachments_dir_;
   bool dirty_;  //! \brief `true` when a Write() is required on destruction.
   std::vector<ReportDisk> reports_;
 };
@@ -312,8 +317,10 @@ Metadata::~Metadata() {
 }
 
 // static
-std::unique_ptr<Metadata> Metadata::Create(const base::FilePath& metadata_file,
-                                           const base::FilePath& report_dir) {
+std::unique_ptr<Metadata> Metadata::Create(
+    const base::FilePath& metadata_file,
+    const base::FilePath& report_dir,
+    const base::FilePath& attachments_dir) {
   // It is important that dwShareMode be non-zero so that concurrent access to
   // this file results in a successful open. This allows us to get to LockFileEx
   // which then blocks to guard access.
@@ -338,7 +345,8 @@ std::unique_ptr<Metadata> Metadata::Create(const base::FilePath& metadata_file,
     return std::unique_ptr<Metadata>();
   }
 
-  std::unique_ptr<Metadata> metadata(new Metadata(handle, report_dir));
+  std::unique_ptr<Metadata> metadata(
+      new Metadata(handle, report_dir, attachments_dir));
   // If Read() fails, for whatever reason (corruption, etc.) metadata will not
   // have been modified and will be in a clean empty state. We continue on and
   // return an empty database to hopefully recover. This means that existing
@@ -427,9 +435,14 @@ int Metadata::CleanDatabase() {
   return removed;
 }
 
-Metadata::Metadata(FileHandle handle, const base::FilePath& report_dir)
-    : handle_(handle), report_dir_(report_dir), dirty_(false), reports_() {
-}
+Metadata::Metadata(FileHandle handle,
+                   const base::FilePath& report_dir,
+                   const base::FilePath& attachments_dir)
+    : handle_(handle),
+      report_dir_(report_dir),
+      attachments_dir_(attachments_dir),
+      dirty_(false),
+      reports_() {}
 
 bool Metadata::Rewind() {
   FileOffset result = LoggingSeekFile(handle_.get(), 0, SEEK_SET);
@@ -488,15 +501,10 @@ void Metadata::Read() {
       }
       ReportDisk report_disk(record, report_dir_, string_table);
 
-      // There are no attachments on Windows so the total size is the main
-      // report size.
-      struct _stati64 statbuf;
-      if (_wstat64(report_disk.file_path.value().c_str(), &statbuf) == 0) {
-        report_disk.total_size = statbuf.st_size;
-      } else {
-        LOG(ERROR) << "failed to stat report";
-      }
-
+      report_disk.total_size = GetFileSize(report_disk.file_path);
+      base::FilePath report_attachment_dir =
+          attachments_dir_.Append(report_disk.uuid.ToWString());
+      report_disk.total_size += GetDirectorySize(report_attachment_dir);
       reports.push_back(report_disk);
     }
   }
@@ -538,8 +546,7 @@ void Metadata::Write() {
   for (const auto& report : reports_) {
     const base::FilePath& path = report.file_path;
     if (path.DirName() != report_dir_) {
-      LOG(ERROR) << path.value().c_str() << " expected to start with "
-                 << base::WideToUTF8(report_dir_.value());
+      LOG(ERROR) << path << " expected to start with " << report_dir_;
       return;
     }
     records.push_back(MetadataFileReportRecord(report, &string_table));
@@ -583,12 +590,11 @@ OperationStatus Metadata::VerifyReport(const ReportDisk& report_disk,
 bool EnsureDirectory(const base::FilePath& path) {
   DWORD fileattr = GetFileAttributes(path.value().c_str());
   if (fileattr == INVALID_FILE_ATTRIBUTES) {
-    PLOG(ERROR) << "GetFileAttributes " << base::WideToUTF8(path.value());
+    PLOG(ERROR) << "GetFileAttributes " << path;
     return false;
   }
   if ((fileattr & FILE_ATTRIBUTE_DIRECTORY) == 0) {
-    LOG(ERROR) << "GetFileAttributes " << base::WideToUTF8(path.value())
-               << ": not a directory";
+    LOG(ERROR) << "GetFileAttributes " << path << ": not a directory";
     return false;
   }
   return true;
@@ -643,12 +649,7 @@ class CrashReportDatabaseWin : public CrashReportDatabase {
   OperationStatus DeleteReport(const UUID& uuid) override;
   OperationStatus RequestUpload(const UUID& uuid) override;
   int CleanDatabase(time_t lockfile_ttl) override;
-
-  // Build a filepath for the root attachments directory.
-  base::FilePath AttachmentsRootPath();
-
-  // Build a filepath for the directory for the report to hold attachments.
-  base::FilePath AttachmentsPath(const UUID& uuid);
+  base::FilePath DatabasePath() override;
 
  private:
   // CrashReportDatabase:
@@ -659,81 +660,25 @@ class CrashReportDatabaseWin : public CrashReportDatabase {
   // Cleans any attachments that have no associated report.
   void CleanOrphanedAttachments();
 
-  // Attempt to remove any attachments associated with the given report UUID.
-  // There may not be any, so failing is not an error.
-  void RemoveAttachmentsByUUID(const UUID& uuid);
-
   std::unique_ptr<Metadata> AcquireMetadata();
 
-  base::FilePath base_dir_;
+  Settings& SettingsInternal() {
+    std::call_once(settings_init_, [this]() { settings_.Initialize(); });
+    return settings_;
+  }
+
+  const base::FilePath base_dir_;
   Settings settings_;
+  std::once_flag settings_init_;
   InitializationStateDcheck initialized_;
 };
 
-base::FilePath CrashReportDatabaseWin::AttachmentsRootPath() {
-  return base_dir_.Append(kAttachmentsDirectory);
-}
-
-base::FilePath CrashReportDatabaseWin::AttachmentsPath(const UUID& uuid) {
-  const std::wstring uuid_string = uuid.ToWString();
-  return base_dir_.Append(kAttachmentsDirectory).Append(uuid_string);
-}
-
-FileWriter* CrashReportDatabase::NewReport::AddAttachment(
-    const std::string& name) {
-  auto database_win = static_cast<CrashReportDatabaseWin*>(database_);
-  base::FilePath attachments_root_dir = database_win->AttachmentsRootPath();
-  base::FilePath attachments_dir = database_win->AttachmentsPath(uuid_);
-  if (!LoggingCreateDirectory(
-          attachments_root_dir, FilePermissions::kOwnerOnly, true) ||
-      !LoggingCreateDirectory(
-          attachments_dir, FilePermissions::kOwnerOnly, true)) {
-    return nullptr;
-  }
-
-  base::FilePath path = attachments_dir.Append(base::UTF8ToWide(name));
-
-  auto writer = std::make_unique<FileWriter>();
-  if (!writer->Open(
-          path, FileWriteMode::kCreateOrFail, FilePermissions::kOwnerOnly)) {
-    LOG(ERROR) << "could not open " << path.value().c_str();
-    return nullptr;
-  }
-  attachment_writers_.emplace_back(std::move(writer));
-  attachment_removers_.emplace_back(ScopedRemoveFile(path));
-  return attachment_writers_.back().get();
-}
-
-void CrashReportDatabase::UploadReport::InitializeAttachments() {
-  base::FilePath attachments_dir =
-      static_cast<CrashReportDatabaseWin*>(database_)->AttachmentsPath(uuid);
-  if (!IsDirectory(attachments_dir, /*allow_symlinks=*/false)) {
-    return;
-  }
-  DirectoryReader dir_reader;
-  if (!dir_reader.Open(attachments_dir)) {
-    return;
-  }
-
-  base::FilePath filename;
-  DirectoryReader::Result dir_result;
-  while ((dir_result = dir_reader.NextFile(&filename)) ==
-         DirectoryReader::Result::kSuccess) {
-    const base::FilePath filepath(attachments_dir.Append(filename));
-    std::unique_ptr<FileReader> file_reader(std::make_unique<FileReader>());
-    if (!file_reader->Open(filepath)) {
-      LOG(ERROR) << "attachment " << filepath.value().c_str()
-                 << " couldn't be opened, skipping";
-      continue;
-    }
-    attachment_readers_.emplace_back(std::move(file_reader));
-    attachment_map_[base::WideToUTF8(filename.value())] =
-        attachment_readers_.back().get();
-  }
-}
-
 CrashReportDatabaseWin::CrashReportDatabaseWin(const base::FilePath& path)
-    : CrashReportDatabase(), base_dir_(path), settings_(), initialized_() {}
+    : CrashReportDatabase(),
+      base_dir_(path),
+      settings_(path.Append(kSettings)),
+      settings_init_(),
+      initialized_() {}
 
 CrashReportDatabaseWin::~CrashReportDatabaseWin() {
 }
@@ -753,16 +698,20 @@ bool CrashReportDatabaseWin::Initialize(bool may_create) {
   if (!CreateDirectoryIfNecessary(base_dir_.Append(kReportsDirectory)))
     return false;
 
-  if (!settings_.Initialize(base_dir_.Append(kSettings)))
+  if (!CreateDirectoryIfNecessary(AttachmentsRootPath()))
     return false;
 
   INITIALIZATION_STATE_SET_VALID(initialized_);
   return true;
 }
 
+base::FilePath CrashReportDatabaseWin::DatabasePath() {
+  return base_dir_;
+}
+
 Settings* CrashReportDatabaseWin::GetSettings() {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
-  return &settings_;
+  return &SettingsInternal();
 }
 
 OperationStatus CrashReportDatabaseWin::PrepareNewCrashReport(
@@ -793,14 +742,14 @@ OperationStatus CrashReportDatabaseWin::FinishedWritingCrashReport(
                                     time(nullptr),
                                     ReportState::kPending));
 
-  ignore_result(report->file_remover_.release());
+  std::ignore = report->file_remover_.release();
 
   // Close all the attachments and disarm their removers too.
   for (auto& writer : report->attachment_writers_) {
     writer->Close();
   }
   for (auto& remover : report->attachment_removers_) {
-    ignore_result(remover.release());
+    std::ignore = remover.release();
   }
 
   *uuid = report->ReportID();
@@ -906,7 +855,7 @@ OperationStatus CrashReportDatabaseWin::RecordUploadAttempt(
         report->upload_explicitly_requested;
   }
 
-  if (!settings_.SetLastUploadAttemptTime(now))
+  if (!SettingsInternal().SetLastUploadAttemptTime(now))
     return kDatabaseError;
 
   return kNoError;
@@ -925,7 +874,7 @@ OperationStatus CrashReportDatabaseWin::DeleteReport(const UUID& uuid) {
     return os;
 
   if (!DeleteFile(report_path.value().c_str())) {
-    PLOG(ERROR) << "DeleteFile " << base::WideToUTF8(report_path.value());
+    PLOG(ERROR) << "DeleteFile " << report_path;
     return kFileSystemError;
   }
 
@@ -934,27 +883,6 @@ OperationStatus CrashReportDatabaseWin::DeleteReport(const UUID& uuid) {
   return kNoError;
 }
 
-void CrashReportDatabaseWin::RemoveAttachmentsByUUID(const UUID& uuid) {
-  base::FilePath attachments_dir = AttachmentsPath(uuid);
-  if (!IsDirectory(attachments_dir, /*allow_symlinks=*/false)) {
-    return;
-  }
-  DirectoryReader reader;
-  if (!reader.Open(attachments_dir)) {
-    return;
-  }
-
-  base::FilePath filename;
-  DirectoryReader::Result result;
-  while ((result = reader.NextFile(&filename)) ==
-         DirectoryReader::Result::kSuccess) {
-    const base::FilePath filepath(attachments_dir.Append(filename));
-    LoggingRemoveFile(filepath);
-  }
-
-  LoggingRemoveDirectory(attachments_dir);
-}
-
 OperationStatus CrashReportDatabaseWin::SkipReportUpload(
     const UUID& uuid,
     Metrics::CrashSkippedReason reason) {
@@ -977,17 +905,9 @@ OperationStatus CrashReportDatabaseWin::SkipReportUpload(
 
 std::unique_ptr<Metadata> CrashReportDatabaseWin::AcquireMetadata() {
   base::FilePath metadata_file = base_dir_.Append(kMetadataFileName);
-  return Metadata::Create(metadata_file, base_dir_.Append(kReportsDirectory));
-}
-
-std::unique_ptr<CrashReportDatabase> InitializeInternal(
-    const base::FilePath& path,
-    bool may_create) {
-  std::unique_ptr<CrashReportDatabaseWin> database_win(
-      new CrashReportDatabaseWin(path));
-  return database_win->Initialize(may_create)
-             ? std::move(database_win)
-             : std::unique_ptr<CrashReportDatabaseWin>();
+  return Metadata::Create(metadata_file,
+                          base_dir_.Append(kReportsDirectory),
+                          AttachmentsRootPath());
 }
 
 OperationStatus CrashReportDatabaseWin::RequestUpload(const UUID& uuid) {
@@ -1036,6 +956,9 @@ int CrashReportDatabaseWin::CleanDatabase(time_t lockfile_ttl) {
   time_t now = time(nullptr);
 
   std::unique_ptr<Metadata> metadata(AcquireMetadata());
+  if (!metadata) {
+    return removed;
+  }
 
   // Remove old reports without metadata.
   while ((result = reader.NextFile(&filename)) ==
@@ -1073,7 +996,7 @@ int CrashReportDatabaseWin::CleanDatabase(time_t lockfile_ttl) {
 }
 
 void CrashReportDatabaseWin::CleanOrphanedAttachments() {
-  base::FilePath root_attachments_dir(base_dir_.Append(kAttachmentsDirectory));
+  base::FilePath root_attachments_dir = AttachmentsRootPath();
   DirectoryReader reader;
   if (!reader.Open(root_attachments_dir)) {
     return;
@@ -1088,14 +1011,13 @@ void CrashReportDatabaseWin::CleanOrphanedAttachments() {
     if (IsDirectory(path, false)) {
       UUID uuid;
       if (!uuid.InitializeFromString(filename.value())) {
-        LOG(ERROR) << "unexpected attachment dir name "
-                   << filename.value().c_str();
+        LOG(ERROR) << "unexpected attachment dir name " << filename;
         continue;
       }
 
-      // Remove attachments if corresponding report doen't exist.
-      base::FilePath report_path =
-          reports_dir.Append(uuid.ToWString() + kCrashReportFileExtension);
+      // Remove attachments if corresponding report doesn't exist.
+      base::FilePath report_path = reports_dir.Append(
+          uuid.ToWString() + L"." + kCrashReportFileExtension);
       if (!IsRegularFile(report_path)) {
         RemoveAttachmentsByUUID(uuid);
       }
@@ -1103,6 +1025,20 @@ void CrashReportDatabaseWin::CleanOrphanedAttachments() {
   }
 }
 
+namespace {
+
+std::unique_ptr<CrashReportDatabase> InitializeInternal(
+    const base::FilePath& path,
+    bool may_create) {
+  std::unique_ptr<CrashReportDatabaseWin> database_win(
+      new CrashReportDatabaseWin(path));
+  return database_win->Initialize(may_create)
+             ? std::move(database_win)
+             : std::unique_ptr<CrashReportDatabaseWin>();
+}
+
+}  // namespace
+
 // static
 std::unique_ptr<CrashReportDatabase> CrashReportDatabase::Initialize(
     const base::FilePath& path) {
@@ -1115,4 +1051,11 @@ CrashReportDatabase::InitializeWithoutCreating(const base::FilePath& path) {
   return InitializeInternal(path, false);
 }
 
+// static
+std::unique_ptr<SettingsReader>
+CrashReportDatabase::GetSettingsReaderForDatabasePath(
+    const base::FilePath& path) {
+  return std::make_unique<SettingsReader>(path.Append(kSettings));
+}
+
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/client/crashpad_client.h b/extern/crashpad/crashpad/client/crashpad_client.h
index 122794e6de..b21167ebf0 100644
--- a/extern/crashpad/crashpad/client/crashpad_client.h
+++ b/extern/crashpad/crashpad/client/crashpad_client.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
 #ifndef CRASHPAD_CLIENT_CRASHPAD_CLIENT_H_
 #define CRASHPAD_CLIENT_CRASHPAD_CLIENT_H_
 
+#include <functional>
 #include <map>
 #include <set>
 #include <string>
@@ -25,18 +26,26 @@
 #include "base/files/file_path.h"
 #include "build/build_config.h"
 #include "util/file/file_io.h"
+
+#if !BUILDFLAG(IS_FUCHSIA)
 #include "util/misc/capture_context.h"
+#endif  // !BUILDFLAG(IS_FUCHSIA)
 
-#if defined(OS_APPLE)
-#include "base/mac/scoped_mach_port.h"
-#elif defined(OS_WIN)
+#if BUILDFLAG(IS_APPLE)
+#include "base/apple/scoped_mach_port.h"
+#elif BUILDFLAG(IS_WIN)
 #include <windows.h>
 #include "util/win/scoped_handle.h"
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
 #include <signal.h>
 #include <ucontext.h>
 #endif
 
+#if BUILDFLAG(IS_IOS)
+#include "client/upload_behavior_ios.h"
+#include "handler/user_stream_data_source.h"  // nogncheck
+#endif
+
 namespace crashpad {
 
 //! \brief The primary interface for an application to have Crashpad monitor
@@ -124,7 +133,8 @@ class CrashpadClient {
                     bool asynchronous_start,
                     const std::vector<base::FilePath>& attachments = {});
 
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || DOXYGEN
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+    DOXYGEN
   //! \brief Retrieve the socket and process ID for the handler.
   //!
   //! `StartHandler()` must have successfully been called before calling this
@@ -169,9 +179,10 @@ class CrashpadClient {
   //!
   //! \return `true` on success. Otherwise `false` with a message logged.
   static bool InitializeSignalStackForThread();
-#endif  // OS_ANDROID || OS_LINUX || OS_CHROMEOS || DOXYGEN
+#endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ||
+        // BUILDFLAG(IS_CHROMEOS) || DOXYGEN
 
-#if defined(OS_ANDROID) || DOXYGEN
+#if BUILDFLAG(IS_ANDROID) || DOXYGEN
   //! \brief Installs a signal handler to execute `/system/bin/app_process` and
   //!     load a Java class in response to a crash.
   //!
@@ -338,9 +349,10 @@ class CrashpadClient {
       const std::map<std::string, std::string>& annotations,
       const std::vector<std::string>& arguments,
       int socket);
-#endif  // OS_ANDROID || DOXYGEN
+#endif  // BUILDFLAG(IS_ANDROID) || DOXYGEN
 
-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_CHROMEOS) || DOXYGEN
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || \
+    DOXYGEN
   //! \brief Installs a signal handler to launch a handler process in reponse to
   //!     a crash.
   //!
@@ -361,6 +373,9 @@ class CrashpadClient {
   //!     Arguments passed in other parameters and arguments required to perform
   //!     the handshake are the responsibility of this method, and must not be
   //!     specified in this parameter.
+  //! \param[in] attachments Attachment paths to pass to the Crashpad handler.
+  //!     The handler will be started with an `--attachment` argument for each
+  //!     path in this vector.
   //!
   //! \return `true` on success, `false` on failure with a message logged.
   bool StartHandlerAtCrash(
@@ -417,11 +432,11 @@ class CrashpadClient {
   //!     CaptureContext() or similar.
   static void DumpWithoutCrash(NativeCPUContext* context);
 
-  //! \brief Disables any installed crash handler, including any
+  //! \brief Disables any installed crash handler, not including any
   //!     FirstChanceHandler and crashes the current process.
   //!
   //! \param[in] message A message to be logged before crashing.
-  static void CrashWithoutDump(const std::string& message);
+  [[noreturn]] static void CrashWithoutDump(const std::string& message);
 
   //! \brief The type for custom handlers installed by clients.
   using FirstChanceHandler = bool (*)(int, siginfo_t*, ucontext_t*);
@@ -444,6 +459,24 @@ class CrashpadClient {
   //! \param[in] handler The custom crash signal handler to install.
   static void SetFirstChanceExceptionHandler(FirstChanceHandler handler);
 
+  //! \brief Installs a custom crash signal handler which runs after the
+  //!     currently installed Crashpad handler.
+  //!
+  //! Handling signals appropriately can be tricky and use of this method
+  //! should be avoided, if possible.
+  //!
+  //! A handler must have already been installed before calling this method.
+  //!
+  //! The custom handler runs in a signal handler context and must be safe for
+  //! that purpose.
+  //!
+  //! If the custom handler returns `true`, the signal is not reraised.
+  //!
+  //! \param[in] handler The custom crash signal handler to install.
+  static void SetLastChanceExceptionHandler(bool (*handler)(int,
+                                                            siginfo_t*,
+                                                            ucontext_t*));
+
   //! \brief Configures a set of signals that shouldn't have Crashpad signal
   //!     handlers installed.
   //!
@@ -453,9 +486,21 @@ class CrashpadClient {
   //!
   //! \param[in] unhandled_signals The set of unhandled signals
   void SetUnhandledSignals(const std::set<int>& unhandled_signals);
-#endif  // OS_LINUX || OS_ANDROID || OS_CHROMEOS || DOXYGEN
+#endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ||
+        // BUILDFLAG(IS_CHROMEOS) || DOXYGEN
+
+#if BUILDFLAG(IS_IOS) || DOXYGEN
+  //! \brief Observation callback invoked each time this object finishes
+  //!     processing and attempting to upload on-disk crash reports (whether or
+  //!     not the uploads succeeded).
+  //!
+  //! This callback is copied into this object. Any references or pointers
+  //! inside must outlive this object.
+  //!
+  //! The callback might be invoked on a background thread, so clients must
+  //! synchronize appropriately.
+  using ProcessPendingReportsObservationCallback = std::function<void()>;
 
-#if defined(OS_IOS) || DOXYGEN
   //! \brief Configures the process to direct its crashes to the iOS in-process
   //! Crashpad handler.
   //!
@@ -464,10 +509,16 @@ class CrashpadClient {
   //! \param[in] database The path to a Crashpad database.
   //! \param[in] url The URL of an upload server.
   //! \param[in] annotations Process annotations to set in each crash report.
-  static void StartCrashpadInProcessHandler(
+  //! \param[in] callback Optional callback invoked zero or more times
+  //!     on a background thread each time the handler finishes
+  //!     processing and attempting to upload on-disk crash reports.
+  //!     If this callback is empty, it is not invoked.
+  //! \return `true` on success, `false` on failure with a message logged.
+  static bool StartCrashpadInProcessHandler(
       const base::FilePath& database,
       const std::string& url,
-      const std::map<std::string, std::string>& annotations);
+      const std::map<std::string, std::string>& annotations,
+      ProcessPendingReportsObservationCallback callback);
 
   //! \brief Requests that the handler convert intermediate dumps into
   //!     minidumps and trigger an upload if possible.
@@ -481,8 +532,13 @@ class CrashpadClient {
   //! \param[in] annotations Process annotations to set in each crash report.
   //!     Useful when adding crash annotations detected on the next run after a
   //!     crash but before upload.
+  //! \param[in] user_stream_sources An optional vector containing the
+  //!     extensibility data sources to call on crash. Each time a minidump is
+  //!     created, the sources are called in turn. Any streams returned are
+  //!     added to the minidump.
   static void ProcessIntermediateDumps(
-      const std::map<std::string, std::string>& annotations = {});
+      const std::map<std::string, std::string>& annotations = {},
+      const UserStreamDataSources* user_stream_sources = nullptr);
 
   //! \brief Requests that the handler convert a single intermediate dump at \a
   //!     file generated by DumpWithoutCrashAndDeferProcessingAtPath into a
@@ -502,13 +558,18 @@ class CrashpadClient {
       const std::map<std::string, std::string>& annotations = {});
 
   //! \brief Requests that the handler begin in-process uploading of any
-  //! pending reports.
+  //!     pending reports.
   //!
   //! Once called the handler will start looking for pending reports to upload
   //! on another thread. This method does not block.
   //!
   //! A handler must have already been installed before calling this method.
-  static void StartProcessingPendingReports();
+  //!
+  //! \param[in] upload_behavior Controls when the upload thread will run and
+  //!     process pending reports. By default, only uploads pending reports
+  //!     when the application is active.
+  static void StartProcessingPendingReports(
+      UploadBehavior upload_behavior = UploadBehavior::kUploadWhenAppIsActive);
 
   //! \brief Requests that the handler capture an intermediate dump even though
   //!     there hasn't been a crash. The intermediate dump will be converted
@@ -552,9 +613,22 @@ class CrashpadClient {
   static void DumpWithoutCrashAndDeferProcessingAtPath(
       NativeCPUContext* context,
       const base::FilePath path);
+
+  //! \brief Unregister the Crashpad client. Intended to be used by tests so
+  //!     multiple Crashpad clients can be started and stopped. Not expected to
+  //!     be used in a shipping application.
+  static void ResetForTesting();
+
+  //! \brief Inject a callback into the Mach exception and signal handling
+  //!     mechanisms. Intended to be used by tests to trigger a reentrant
+  //      exception.
+  static void SetExceptionCallbackForTesting(void (*callback)());
+
+  //! \brief Returns the thread id of the Mach exception thread, used by tests.
+  static uint64_t GetThreadIdForTesting();
 #endif
 
-#if defined(OS_APPLE) || DOXYGEN
+#if BUILDFLAG(IS_APPLE) || DOXYGEN
   //! \brief Sets the process’ crash handler to a Mach service registered with
   //!     the bootstrap server.
   //!
@@ -580,7 +654,7 @@ class CrashpadClient {
   //!     Crashpad exception handler service.
   //!
   //! \return `true` on success, `false` on failure with a message logged.
-  bool SetHandlerMachPort(base::mac::ScopedMachSendRight exception_port);
+  bool SetHandlerMachPort(base::apple::ScopedMachSendRight exception_port);
 
   //! \brief Retrieves a send right to the process’ crash handler Mach port.
   //!
@@ -601,10 +675,10 @@ class CrashpadClient {
   //!     SetHandlerMachService(). This method must only be called after a
   //!     successful call to one of those methods. `MACH_PORT_NULL` on failure
   //!     with a message logged.
-  base::mac::ScopedMachSendRight GetHandlerMachPort() const;
+  base::apple::ScopedMachSendRight GetHandlerMachPort() const;
 #endif
 
-#if defined(OS_WIN) || DOXYGEN
+#if BUILDFLAG(IS_WIN) || DOXYGEN
   //! \brief Sets the IPC pipe of a presumably-running Crashpad handler process
   //!     which was started with StartHandler() or by other compatible means
   //!     and does an IPC message exchange to register this process with the
@@ -651,6 +725,21 @@ class CrashpadClient {
   //!     error message will have been logged.
   bool WaitForHandlerStart(unsigned int timeout_ms);
 
+  //! \brief Register a DLL using WerRegisterExceptionModule().
+  //!
+  //! This method should only be called after a successful call to
+  //! SetHandlerIPCPipe() or StartHandler(). The registration is valid for the
+  //! lifetime of this object.
+  //!
+  //! \param[in] full_path The full path to the DLL that will be registered.
+  //!     The DLL path should also be set in an appropriate
+  //!     `Windows Error Reporting` registry key.
+  //!
+  //! \return `true` if the DLL was registered. Note: Windows just stashes the
+  //!     path somewhere so this returns `true` even if the DLL is not yet
+  //!     set in an appropriate registry key, or does not exist.
+  bool RegisterWerModule(const std::wstring& full_path);
+
   //! \brief Requests that the handler capture a dump even though there hasn't
   //!     been a crash.
   //!
@@ -691,20 +780,9 @@ class CrashpadClient {
   static bool DumpAndCrashTargetProcess(HANDLE process,
                                         HANDLE blame_thread,
                                         DWORD exception_code);
-
-  enum : uint32_t {
-    //! \brief The exception code (roughly "Client called") used when
-    //!     DumpAndCrashTargetProcess() triggers an exception in a target
-    //!     process.
-    //!
-    //! \note This value does not have any bits of the top nibble set, to avoid
-    //!     confusion with real exception codes which tend to have those bits
-    //!     set.
-    kTriggeredExceptionCode = 0xcca11ed,
-  };
 #endif
 
-#if defined(OS_APPLE) || DOXYGEN
+#if BUILDFLAG(IS_APPLE) || DOXYGEN
   //! \brief Configures the process to direct its crashes to the default handler
   //!     for the operating system.
   //!
@@ -727,15 +805,31 @@ class CrashpadClient {
   static void UseSystemDefaultHandler();
 #endif
 
+#if BUILDFLAG(IS_CHROMEOS)
+  //! \brief Sets a timestamp on the signal handler to be passed on to
+  //!     crashpad_handler and then eventually Chrome OS's crash_reporter.
+  //!
+  //! \note This method is used by clients that use `StartHandler()` to start
+  //!     a handler and not by clients that use any other handler starting
+  //!     methods.
+  static void SetCrashLoopBefore(uint64_t crash_loop_before_time);
+#endif
+
  private:
-#if defined(OS_APPLE)
-  base::mac::ScopedMachSendRight exception_port_;
-#elif defined(OS_WIN)
+#if BUILDFLAG(IS_WIN) || DOXYGEN
+  //!  \brief Registers process handlers for the client.
+  void RegisterHandlers();
+#endif
+
+#if BUILDFLAG(IS_APPLE)
+  base::apple::ScopedMachSendRight exception_port_;
+#elif BUILDFLAG(IS_WIN)
   std::wstring ipc_pipe_;
   ScopedKernelHANDLE handler_start_thread_;
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+  ScopedVectoredExceptionRegistration vectored_handler_;
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
   std::set<int> unhandled_signals_;
-#endif  // OS_APPLE
+#endif  // BUILDFLAG(IS_APPLE)
 };
 
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/client/crashpad_client_fuchsia.cc b/extern/crashpad/crashpad/client/crashpad_client_fuchsia.cc
index 46afe00317..9b09ad1bb6 100644
--- a/extern/crashpad/crashpad/client/crashpad_client_fuchsia.cc
+++ b/extern/crashpad/crashpad/client/crashpad_client_fuchsia.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 #include <lib/zx/process.h>
 #include <zircon/processargs.h>
 
+#include "base/check_op.h"
 #include "base/fuchsia/fuchsia_logging.h"
 #include "base/logging.h"
 #include "client/client_argv_handling.h"
diff --git a/extern/crashpad/crashpad/client/crashpad_client_ios.cc b/extern/crashpad/crashpad/client/crashpad_client_ios.cc
index b32678d6e3..fbff1a304f 100644
--- a/extern/crashpad/crashpad/client/crashpad_client_ios.cc
+++ b/extern/crashpad/crashpad/client/crashpad_client_ios.cc
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,236 +14,39 @@
 
 #include "client/crashpad_client.h"
 
-#include <unistd.h>
+#include "build/buildflag.h"
+#include "client/ios_handler/in_process_handler.h"
 
-#include <ios>
-
-#include "base/cxx17_backports.h"
-#include "base/logging.h"
-#include "base/mac/mach_logging.h"
-#include "base/mac/scoped_mach_port.h"
-#include "client/ios_handler/exception_processor.h"
-#include "util/ios/ios_system_data_collector.h"
-#include "util/mach/exc_server_variants.h"
-#include "util/mach/exception_ports.h"
-#include "util/mach/mach_extensions.h"
-#include "util/mach/mach_message.h"
-#include "util/mach/mach_message_server.h"
-#include "util/misc/initialization_state_dcheck.h"
-#include "util/posix/signals.h"
-#include "util/thread/thread.h"
+#if !BUILDFLAG(IS_IOS_TVOS)
+#include "client/crash_handler_ios.h"
+#else
+#include "client/crash_handler_tvos.h"
+#endif
 
 namespace crashpad {
 
-namespace {
-
-// A base class for signal handler and Mach exception server.
-class CrashHandler : public Thread,
-                     public UniversalMachExcServer::Interface,
-                     public ObjcExceptionDelegate {
- public:
-  CrashHandler(const CrashHandler&) = delete;
-  CrashHandler& operator=(const CrashHandler&) = delete;
-
-  static CrashHandler* Get() {
-    static CrashHandler* instance = new CrashHandler();
-    return instance;
-  }
-
-  void Initialize() {
-    INITIALIZATION_STATE_SET_INITIALIZING(initialized_);
-    InstallMachExceptionHandler();
-    CHECK(Signals::InstallHandler(SIGABRT, CatchSignal, 0, &old_action_));
-    INITIALIZATION_STATE_SET_VALID(initialized_);
-  }
-
-  void ProcessIntermediateDumps(
-      const std::map<std::string, std::string>& annotations = {}) {}
-
-  void ProcessIntermediateDump(
-      const base::FilePath& file,
-      const std::map<std::string, std::string>& annotations = {}) {}
-
-  void DumpWithoutCrash(NativeCPUContext* context) {
-    INITIALIZATION_STATE_DCHECK_VALID(initialized_);
-    mach_exception_data_type_t code[2] = {};
-    static constexpr int kSimulatedException = -1;
-    HandleMachException(MACH_EXCEPTION_CODES,
-                        mach_thread_self(),
-                        kSimulatedException,
-                        code,
-                        base::size(code),
-                        MACHINE_THREAD_STATE,
-                        reinterpret_cast<ConstThreadState>(context),
-                        MACHINE_THREAD_STATE_COUNT);
-  }
-
- private:
-  CrashHandler() = default;
-
-  void InstallMachExceptionHandler() {
-    exception_port_.reset(NewMachPort(MACH_PORT_RIGHT_RECEIVE));
-    CHECK(exception_port_.is_valid());
-
-    kern_return_t kr = mach_port_insert_right(mach_task_self(),
-                                              exception_port_.get(),
-                                              exception_port_.get(),
-                                              MACH_MSG_TYPE_MAKE_SEND);
-    MACH_CHECK(kr == KERN_SUCCESS, kr) << "mach_port_insert_right";
-
-    // TODO: Use SwapExceptionPort instead and put back EXC_MASK_BREAKPOINT.
-    const exception_mask_t mask =
-        ExcMaskAll() &
-        ~(EXC_MASK_EMULATION | EXC_MASK_SOFTWARE | EXC_MASK_BREAKPOINT |
-          EXC_MASK_RPC_ALERT | EXC_MASK_GUARD);
-    ExceptionPorts exception_ports(ExceptionPorts::kTargetTypeTask, TASK_NULL);
-    exception_ports.GetExceptionPorts(mask, &original_handlers_);
-    exception_ports.SetExceptionPort(
-        mask,
-        exception_port_.get(),
-        EXCEPTION_STATE_IDENTITY | MACH_EXCEPTION_CODES,
-        MACHINE_THREAD_STATE);
-
-    Start();
-  }
-
-  // Thread:
-
-  void ThreadMain() override {
-    UniversalMachExcServer universal_mach_exc_server(this);
-    while (true) {
-      mach_msg_return_t mr =
-          MachMessageServer::Run(&universal_mach_exc_server,
-                                 exception_port_.get(),
-                                 MACH_MSG_OPTION_NONE,
-                                 MachMessageServer::kPersistent,
-                                 MachMessageServer::kReceiveLargeIgnore,
-                                 kMachMessageTimeoutWaitIndefinitely);
-      MACH_CHECK(mr == MACH_SEND_INVALID_DEST, mr) << "MachMessageServer::Run";
-    }
-  }
-
-  // UniversalMachExcServer::Interface:
-
-  kern_return_t CatchMachException(exception_behavior_t behavior,
-                                   exception_handler_t exception_port,
-                                   thread_t thread,
-                                   task_t task,
-                                   exception_type_t exception,
-                                   const mach_exception_data_type_t* code,
-                                   mach_msg_type_number_t code_count,
-                                   thread_state_flavor_t* flavor,
-                                   ConstThreadState old_state,
-                                   mach_msg_type_number_t old_state_count,
-                                   thread_state_t new_state,
-                                   mach_msg_type_number_t* new_state_count,
-                                   const mach_msg_trailer_t* trailer,
-                                   bool* destroy_complex_request) override {
-    *destroy_complex_request = true;
-
-    // TODO(justincohen): Forward exceptions to original_handlers_ with
-    // UniversalExceptionRaise.
-
-    // iOS shouldn't have any child processes, but just in case, those will
-    // inherit the task exception ports, and this process isn’t prepared to
-    // handle them
-    if (task != mach_task_self()) {
-      LOG(WARNING) << "task 0x" << std::hex << task << " != 0x"
-                   << mach_task_self();
-      return KERN_FAILURE;
-    }
-
-    HandleMachException(behavior,
-                        thread,
-                        exception,
-                        code,
-                        code_count,
-                        *flavor,
-                        old_state,
-                        old_state_count);
-
-    // Respond with KERN_FAILURE so the system will continue to handle this
-    // exception as a crash.
-    return KERN_FAILURE;
-  }
-
-  void HandleMachException(exception_behavior_t behavior,
-                           thread_t thread,
-                           exception_type_t exception,
-                           const mach_exception_data_type_t* code,
-                           mach_msg_type_number_t code_count,
-                           thread_state_flavor_t flavor,
-                           ConstThreadState old_state,
-                           mach_msg_type_number_t old_state_count) {
-    // TODO(justincohen): This is incomplete.
-  }
-
-  // The signal handler installed at OS-level.
-  static void CatchSignal(int signo, siginfo_t* siginfo, void* context) {
-    Get()->HandleAndReraiseSignal(
-        signo, siginfo, reinterpret_cast<ucontext_t*>(context));
-  }
-
-  void HandleAndReraiseSignal(int signo,
-                              siginfo_t* siginfo,
-                              ucontext_t* context) {
-    // TODO(justincohen): This is incomplete.
-
-    // Always call system handler.
-    Signals::RestoreHandlerAndReraiseSignalOnReturn(siginfo, &old_action_);
-  }
-
-  void HandleUncaughtNSException(const uint64_t* frames,
-                                 const size_t num_frames) override {
-    // TODO(justincohen): Call into in_process_handler.
-
-    // After uncaught exceptions are reported, the system immediately triggers a
-    // call to std::terminate()/abort(). Remove the abort handler so a second
-    // dump isn't generated.
-    CHECK(Signals::InstallDefaultHandler(SIGABRT));
-  }
-
-  void HandleUncaughtNSExceptionWithContext(
-      NativeCPUContext* context) override {
-    // TODO(justincohen): Call into in_process_handler.
-
-    // After uncaught exceptions are reported, the system immediately triggers a
-    // call to std::terminate()/abort(). Remove the abort handler so a second
-    // dump isn't generated.
-    CHECK(Signals::InstallDefaultHandler(SIGABRT));
-  }
-
-  base::mac::ScopedMachReceiveRight exception_port_;
-  ExceptionPorts::ExceptionHandlerVector original_handlers_;
-  struct sigaction old_action_ = {};
-  internal::IOSSystemDataCollector system_data_;
-  InitializationStateDcheck initialized_;
-};
-
-}  // namespace
-
 CrashpadClient::CrashpadClient() {}
 
 CrashpadClient::~CrashpadClient() {}
 
 // static
-void CrashpadClient::StartCrashpadInProcessHandler(
+bool CrashpadClient::StartCrashpadInProcessHandler(
     const base::FilePath& database,
     const std::string& url,
-    const std::map<std::string, std::string>& annotations) {
-
+    const std::map<std::string, std::string>& annotations,
+    ProcessPendingReportsObservationCallback callback) {
   CrashHandler* crash_handler = CrashHandler::Get();
   DCHECK(crash_handler);
-  InstallObjcExceptionPreprocessor(crash_handler);
-  crash_handler->Initialize();
+  return crash_handler->Initialize(database, url, annotations, callback);
 }
 
 // static
 void CrashpadClient::ProcessIntermediateDumps(
-    const std::map<std::string, std::string>& annotations) {
+    const std::map<std::string, std::string>& annotations,
+    const UserStreamDataSources* user_stream_sources) {
   CrashHandler* crash_handler = CrashHandler::Get();
   DCHECK(crash_handler);
-  crash_handler->ProcessIntermediateDumps(annotations);
+  crash_handler->ProcessIntermediateDumps(annotations, user_stream_sources);
 }
 
 // static
@@ -256,18 +59,18 @@ void CrashpadClient::ProcessIntermediateDump(
 }
 
 // static
-void CrashpadClient::StartProcessingPendingReports() {
-  // TODO(justincohen): Start the CrashReportUploadThread.
+void CrashpadClient::StartProcessingPendingReports(
+    UploadBehavior upload_behavior) {
+  CrashHandler* crash_handler = CrashHandler::Get();
+  DCHECK(crash_handler);
+  crash_handler->StartProcessingPendingReports(upload_behavior);
 }
 
 // static
 void CrashpadClient::DumpWithoutCrash(NativeCPUContext* context) {
   CrashHandler* crash_handler = CrashHandler::Get();
   DCHECK(crash_handler);
-  crash_handler->DumpWithoutCrash(context);
-  // TODO(justincohen): Change this to only process the dump from above, not all
-  // intermediate dump files.
-  crash_handler->ProcessIntermediateDumps();
+  crash_handler->DumpWithoutCrash(context, /*process_dump=*/true);
 }
 
 // static
@@ -275,7 +78,7 @@ void CrashpadClient::DumpWithoutCrashAndDeferProcessing(
     NativeCPUContext* context) {
   CrashHandler* crash_handler = CrashHandler::Get();
   DCHECK(crash_handler);
-  crash_handler->DumpWithoutCrash(context);
+  crash_handler->DumpWithoutCrash(context, /*process_dump=*/false);
 }
 
 // static
@@ -284,8 +87,25 @@ void CrashpadClient::DumpWithoutCrashAndDeferProcessingAtPath(
     const base::FilePath path) {
   CrashHandler* crash_handler = CrashHandler::Get();
   DCHECK(crash_handler);
-  // TODO(justincohen): Change to DumpWithoutCrashAtPath(context, path).
-  crash_handler->DumpWithoutCrash(context);
+  crash_handler->DumpWithoutCrashAtPath(context, path);
+}
+
+void CrashpadClient::ResetForTesting() {
+  CrashHandler* crash_handler = CrashHandler::Get();
+  DCHECK(crash_handler);
+  crash_handler->ResetForTesting();
+}
+
+void CrashpadClient::SetExceptionCallbackForTesting(void (*callback)()) {
+  CrashHandler* crash_handler = CrashHandler::Get();
+  DCHECK(crash_handler);
+  crash_handler->SetExceptionCallbackForTesting(callback);
+}
+
+uint64_t CrashpadClient::GetThreadIdForTesting() {
+  CrashHandler* crash_handler = CrashHandler::Get();
+  DCHECK(crash_handler);
+  return crash_handler->GetThreadIdForTesting();
 }
 
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/client/crashpad_client_ios_test.mm b/extern/crashpad/crashpad/client/crashpad_client_ios_test.mm
index 30fabae014..6d275911a4 100644
--- a/extern/crashpad/crashpad/client/crashpad_client_ios_test.mm
+++ b/extern/crashpad/crashpad/client/crashpad_client_ios_test.mm
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,25 +16,124 @@
 
 #import <Foundation/Foundation.h>
 
+#include <utility>
 #include <vector>
 
+#include "base/strings/sys_string_conversions.h"
+#include "client/crash_report_database.h"
+#include "client/ios_handler/exception_processor.h"
 #include "client/simulate_crash.h"
 #include "gtest/gtest.h"
 #include "test/scoped_temp_dir.h"
 #include "testing/platform_test.h"
+#include "util/thread/thread.h"
 
 namespace crashpad {
 namespace test {
 namespace {
 
-using CrashpadIOSClient = PlatformTest;
+class CrashpadIOSClient : public PlatformTest {
+ protected:
+  // testing::Test:
 
-TEST_F(CrashpadIOSClient, DumpWithoutCrash) {
-  CrashpadClient client;
+  void SetUp() override {
+    ASSERT_TRUE(client_.StartCrashpadInProcessHandler(
+        base::FilePath(database_dir.path()),
+        "",
+        {},
+        CrashpadClient::ProcessPendingReportsObservationCallback()));
+    database_ = CrashReportDatabase::Initialize(database_dir.path());
+  }
+
+  void TearDown() override { client_.ResetForTesting(); }
+
+  auto& Client() { return client_; }
+  auto& Database() { return database_; }
+
+ private:
+  std::unique_ptr<CrashReportDatabase> database_;
+  CrashpadClient client_;
   ScopedTempDir database_dir;
-  client.StartCrashpadInProcessHandler(
-      base::FilePath(database_dir.path()), "", {});
+};
+
+TEST_F(CrashpadIOSClient, DumpWithoutCrash) {
+  std::vector<CrashReportDatabase::Report> reports;
+  EXPECT_EQ(Database()->GetPendingReports(&reports),
+            CrashReportDatabase::kNoError);
+  ASSERT_EQ(reports.size(), 0u);
   CRASHPAD_SIMULATE_CRASH();
+
+  EXPECT_EQ(Database()->GetPendingReports(&reports),
+            CrashReportDatabase::kNoError);
+  ASSERT_EQ(reports.size(), 1u);
+}
+
+TEST_F(CrashpadIOSClient, DumpWithoutCrashAndDefer) {
+  std::vector<CrashReportDatabase::Report> reports;
+  CRASHPAD_SIMULATE_CRASH_AND_DEFER_PROCESSING();
+  EXPECT_EQ(Database()->GetPendingReports(&reports),
+            CrashReportDatabase::kNoError);
+  ASSERT_EQ(reports.size(), 0u);
+  Client().ProcessIntermediateDumps();
+  EXPECT_EQ(Database()->GetPendingReports(&reports),
+            CrashReportDatabase::kNoError);
+  ASSERT_EQ(reports.size(), 1u);
+}
+
+TEST_F(CrashpadIOSClient, DumpWithoutCrashAndDeferAtPath) {
+  std::vector<CrashReportDatabase::Report> reports;
+  ScopedTempDir crash_dir;
+  UUID uuid;
+  uuid.InitializeWithNew();
+  CRASHPAD_SIMULATE_CRASH_AND_DEFER_PROCESSING_AT_PATH(
+      crash_dir.path().Append(uuid.ToString()));
+  EXPECT_EQ(Database()->GetPendingReports(&reports),
+            CrashReportDatabase::kNoError);
+  ASSERT_EQ(reports.size(), 0u);
+
+  NSError* error = nil;
+  NSArray* paths = [[NSFileManager defaultManager]
+      contentsOfDirectoryAtPath:base::SysUTF8ToNSString(
+                                    crash_dir.path().value())
+                          error:&error];
+  ASSERT_EQ([paths count], 1u);
+  Client().ProcessIntermediateDump(
+      crash_dir.path().Append([paths[0] fileSystemRepresentation]));
+  reports.clear();
+  EXPECT_EQ(Database()->GetPendingReports(&reports),
+            CrashReportDatabase::kNoError);
+  ASSERT_EQ(reports.size(), 1u);
+}
+
+class RaceThread : public Thread {
+ public:
+  explicit RaceThread() : Thread() {}
+
+ private:
+  void ThreadMain() override {
+    for (int i = 0; i < 10; ++i) {
+      CRASHPAD_SIMULATE_CRASH();
+    }
+  }
+};
+
+TEST_F(CrashpadIOSClient, MultipleThreadsSimulateCrash) {
+  RaceThread race_threads[2];
+  for (RaceThread& race_thread : race_threads) {
+    race_thread.Start();
+  }
+
+  for (int i = 0; i < 10; ++i) {
+    CRASHPAD_SIMULATE_CRASH();
+  }
+  for (RaceThread& race_thread : race_threads) {
+    race_thread.Join();
+  }
+
+  std::vector<CrashReportDatabase::Report> reports;
+  ASSERT_EQ(Database()->GetPendingReports(&reports),
+            CrashReportDatabase::kNoError);
+  EXPECT_EQ(reports.size(), 30u);
 }
 
 // This test is covered by a similar XCUITest, but for development purposes it's
@@ -42,10 +141,6 @@
 // to correctly run this in Google Test. Leave the test here, disabled, for use
 // during development only.
 TEST_F(CrashpadIOSClient, DISABLED_ThrowNSException) {
-  CrashpadClient client;
-  ScopedTempDir database_dir;
-  client.StartCrashpadInProcessHandler(
-      base::FilePath(database_dir.path()), "", {});
   [NSException raise:@"GoogleTestNSException" format:@"ThrowException"];
 }
 
@@ -54,12 +149,8 @@
 // to correctly run this in Google Test. Leave the test here, disabled, for use
 // during development only.
 TEST_F(CrashpadIOSClient, DISABLED_ThrowException) {
-  CrashpadClient client;
-  ScopedTempDir database_dir;
-  client.StartCrashpadInProcessHandler(
-      base::FilePath(database_dir.path()), "", {});
   std::vector<int> empty_vector;
-  empty_vector.at(42);
+  std::ignore = empty_vector.at(42);
 }
 
 }  // namespace
diff --git a/extern/crashpad/crashpad/client/crashpad_client_linux.cc b/extern/crashpad/crashpad/client/crashpad_client_linux.cc
index eccf204ca1..8241d23a14 100644
--- a/extern/crashpad/crashpad/client/crashpad_client_linux.cc
+++ b/extern/crashpad/crashpad/client/crashpad_client_linux.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <limits.h>
+#include <linux/futex.h>
 #include <pthread.h>
 #include <stdlib.h>
 #include <sys/mman.h>
@@ -26,9 +28,12 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
+#include <atomic>
+
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
-#include "build/chromeos_buildflags.h"
+#include "build/build_config.h"
 #include "client/client_argv_handling.h"
 #include "third_party/lss/lss.h"
 #include "util/file/file_io.h"
@@ -40,9 +45,9 @@
 #include "util/linux/socket.h"
 #include "util/misc/address_sanitizer.h"
 #include "util/misc/from_pointer_cast.h"
-#include "util/posix/double_fork_and_exec.h"
 #include "util/posix/scoped_mmap.h"
 #include "util/posix/signals.h"
+#include "util/posix/spawn_subprocess.h"
 
 namespace crashpad {
 
@@ -56,7 +61,7 @@ std::string FormatArgumentAddress(const std::string& name, const void* addr) {
   return base::StringPrintf("--%s=%p", name.c_str(), addr);
 }
 
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
 
 std::vector<std::string> BuildAppProcessArgs(
     const std::string& class_name,
@@ -124,7 +129,9 @@ std::vector<std::string> BuildArgsToLaunchWithLinker(
   return argv;
 }
 
-#endif  // OS_ANDROID
+#endif  // BUILDFLAG(IS_ANDROID)
+
+using LastChanceHandler = bool (*)(int, siginfo_t*, ucontext_t*);
 
 // A base class for Crashpad signal handler implementations.
 class SignalHandler {
@@ -136,28 +143,26 @@ class SignalHandler {
   // handler has been installed.
   static SignalHandler* Get() { return handler_; }
 
-  // Disables any installed Crashpad signal handler for the calling thread. If a
-  // crash signal is received, any previously installed (non-Crashpad) signal
-  // handler will be restored and the signal reraised.
-  static void DisableForThread() { disabled_for_thread_ = true; }
+  // Disables any installed Crashpad signal handler. If a crash signal is
+  // received, any previously installed (non-Crashpad) signal handler will be
+  // restored and the signal reraised.
+  static void Disable() {
+    if (!handler_->disabled_.test_and_set()) {
+      handler_->WakeThreads();
+    }
+  }
 
   void SetFirstChanceHandler(CrashpadClient::FirstChanceHandler handler) {
     first_chance_handler_ = handler;
   }
 
+  void SetLastChanceExceptionHandler(LastChanceHandler handler) {
+    last_chance_handler_ = handler;
+  }
+
   // The base implementation for all signal handlers, suitable for calling
   // directly to simulate signal delivery.
-  bool HandleCrash(int signo, siginfo_t* siginfo, void* context) {
-    if (disabled_for_thread_) {
-      return false;
-    }
-
-    if (first_chance_handler_ &&
-        first_chance_handler_(
-            signo, siginfo, static_cast<ucontext_t*>(context))) {
-      return true;
-    }
-
+  void HandleCrash(int signo, siginfo_t* siginfo, void* context) {
     exception_information_.siginfo_address =
         FromPointerCast<decltype(exception_information_.siginfo_address)>(
             siginfo);
@@ -168,7 +173,6 @@ class SignalHandler {
 
     ScopedPrSetDumpable set_dumpable(false);
     HandleCrashImpl();
-    return false;
   }
 
  protected:
@@ -182,8 +186,10 @@ class SignalHandler {
 
     DCHECK(!handler_);
     handler_ = this;
-    return Signals::InstallCrashHandlers(
-        HandleOrReraiseSignal, SA_ONSTACK, &old_actions_, unhandled_signals);
+    return Signals::InstallCrashHandlers(HandleOrReraiseSignal,
+                                         SA_ONSTACK | SA_EXPOSE_TAGBITS,
+                                         &old_actions_,
+                                         unhandled_signals);
   }
 
   const ExceptionInformation& GetExceptionInfo() {
@@ -193,27 +199,84 @@ class SignalHandler {
   virtual void HandleCrashImpl() = 0;
 
  private:
+  static constexpr int32_t kDumpNotDone = 0;
+  static constexpr int32_t kDumpDone = 1;
+
   // The signal handler installed at OS-level.
   static void HandleOrReraiseSignal(int signo,
                                     siginfo_t* siginfo,
                                     void* context) {
-    if (handler_->HandleCrash(signo, siginfo, context)) {
+    if (handler_->first_chance_handler_ &&
+        handler_->first_chance_handler_(
+            signo, siginfo, static_cast<ucontext_t*>(context))) {
       return;
     }
+
+    // Only handle the first fatal signal observed. If another thread receives a
+    // crash signal, it waits for the first dump to complete instead of
+    // requesting another.
+    if (!handler_->disabled_.test_and_set()) {
+      handler_->HandleCrash(signo, siginfo, context);
+      handler_->WakeThreads();
+      if (handler_->last_chance_handler_ &&
+          handler_->last_chance_handler_(
+              signo, siginfo, static_cast<ucontext_t*>(context))) {
+        return;
+      }
+    } else {
+      // Processes on Android normally have several chained signal handlers that
+      // co-operate to report crashes. e.g. WebView will have this signal
+      // handler installed, the app embedding WebView may have a signal handler
+      // installed, and Bionic will have a signal handler. Each signal handler
+      // runs in succession, possibly managed by libsigchain. This wait is
+      // intended to avoid ill-effects from multiple signal handlers from
+      // different layers (possibly all trying to use ptrace()) from running
+      // simultaneously. It does not block forever so that in most conditions,
+      // those signal handlers will still have a chance to run and ensures
+      // process termination in case the first crashing thread crashes again in
+      // its signal handler. Though less typical, this situation also occurs on
+      // other Linuxes, e.g. to produce in-process stack traces for debug
+      // builds.
+      handler_->WaitForDumpDone();
+    }
+
     Signals::RestoreHandlerAndReraiseSignalOnReturn(
         siginfo, handler_->old_actions_.ActionForSignal(signo));
   }
 
+  void WaitForDumpDone() {
+    kernel_timespec timeout;
+    timeout.tv_sec = 5;
+    timeout.tv_nsec = 0;
+    sys_futex(&dump_done_futex_,
+              FUTEX_WAIT_PRIVATE,
+              kDumpNotDone,
+              &timeout,
+              nullptr,
+              0);
+  }
+
+  void WakeThreads() {
+    dump_done_futex_ = kDumpDone;
+    sys_futex(
+        &dump_done_futex_, FUTEX_WAKE_PRIVATE, INT_MAX, nullptr, nullptr, 0);
+  }
+
   Signals::OldActions old_actions_ = {};
   ExceptionInformation exception_information_ = {};
   CrashpadClient::FirstChanceHandler first_chance_handler_ = nullptr;
+  LastChanceHandler last_chance_handler_ = nullptr;
+  int32_t dump_done_futex_ = kDumpNotDone;
+#if !defined(__cpp_lib_atomic_value_initialization) || \
+    __cpp_lib_atomic_value_initialization < 201911L
+  std::atomic_flag disabled_ = ATOMIC_FLAG_INIT;
+#else
+  std::atomic_flag disabled_;
+#endif
 
   static SignalHandler* handler_;
-
-  static thread_local bool disabled_for_thread_;
 };
 SignalHandler* SignalHandler::handler_ = nullptr;
-thread_local bool SignalHandler::disabled_for_thread_ = false;
 
 // Launches a single use handler to snapshot this process.
 class LaunchAtCrashHandler : public SignalHandler {
@@ -307,17 +370,11 @@ class RequestCrashDumpHandler : public SignalHandler {
       }
       pid = creds.pid;
     }
-    if (pid > 0 && prctl(PR_SET_PTRACER, pid, 0, 0, 0) != 0) {
-      PLOG(WARNING) << "prctl";
-      // TODO(jperaza): If this call to set the ptracer failed, it might be
-      // possible to try again just before a dump request, in case the
-      // environment has changed. Revisit ExceptionHandlerClient::SetPtracer()
-      // and consider saving the result of this call in ExceptionHandlerClient
-      // or as a member in this signal handler. ExceptionHandlerClient hasn't
-      // been responsible for maintaining state and a new ExceptionHandlerClient
-      // has been constructed as a local whenever a client needs to communicate
-      // with the handler. ExceptionHandlerClient lifetimes and ownership will
-      // need to be reconsidered if it becomes responsible for state.
+    if (pid > 0) {
+      pthread_atfork(nullptr, nullptr, SetPtracerAtFork);
+      if (prctl(PR_SET_PTRACER, pid, 0, 0, 0) != 0) {
+        PLOG(WARNING) << "prctl";
+      }
     }
     sock_to_handler_.reset(sock.release());
     handler_pid_ = pid;
@@ -338,10 +395,17 @@ class RequestCrashDumpHandler : public SignalHandler {
   }
 
   void HandleCrashImpl() override {
+    // Attempt to set the ptracer again, in case a crash occurs after a fork,
+    // before SetPtracerAtFork() has been called. Ignore errors because the
+    // system call may be disallowed if the sandbox is engaged.
+    if (handler_pid_ > 0) {
+      sys_prctl(PR_SET_PTRACER, handler_pid_, 0, 0, 0);
+    }
+
     ExceptionHandlerProtocol::ClientInformation info = {};
     info.exception_information_address =
         FromPointerCast<VMAddress>(&GetExceptionInfo());
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS)
     info.crash_loop_before_time = crash_loop_before_time_;
 #endif
 
@@ -349,7 +413,7 @@ class RequestCrashDumpHandler : public SignalHandler {
     client.RequestCrashDump(info);
   }
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS)
   void SetCrashLoopBefore(uint64_t crash_loop_before_time) {
     crash_loop_before_time_ = crash_loop_before_time;
   }
@@ -360,10 +424,18 @@ class RequestCrashDumpHandler : public SignalHandler {
 
   ~RequestCrashDumpHandler() = delete;
 
+  static void SetPtracerAtFork() {
+    auto handler = RequestCrashDumpHandler::Get();
+    if (handler->handler_pid_ > 0 &&
+        prctl(PR_SET_PTRACER, handler->handler_pid_, 0, 0, 0) != 0) {
+      PLOG(WARNING) << "prctl";
+    }
+  }
+
   ScopedFileHandle sock_to_handler_;
   pid_t handler_pid_ = -1;
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS)
   // An optional UNIX timestamp passed to us from Chrome.
   // This will pass to crashpad_handler and then to Chrome OS crash_reporter.
   // This should really be a time_t, but it's basically an opaque value (we
@@ -401,9 +473,10 @@ bool CrashpadClient::StartHandler(
 
   argv.push_back(FormatArgumentInt("initial-client-fd", handler_sock.get()));
   argv.push_back("--shared-client-connection");
-  if (!DoubleForkAndExec(argv, nullptr, handler_sock.get(), false, nullptr)) {
+  if (!SpawnSubprocess(argv, nullptr, handler_sock.get(), false, nullptr)) {
     return false;
   }
+  handler_sock.reset();
 
   pid_t handler_pid = -1;
   if (!IsRegularFile(base::FilePath("/proc/sys/kernel/yama/ptrace_scope"))) {
@@ -415,7 +488,7 @@ bool CrashpadClient::StartHandler(
       std::move(client_sock), handler_pid, &unhandled_signals_);
 }
 
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 // static
 bool CrashpadClient::GetHandlerSocket(int* sock, pid_t* pid) {
   auto signal_handler = RequestCrashDumpHandler::Get();
@@ -519,9 +592,10 @@ bool CrashpadClient::InitializeSignalStackForThread() {
   }
   return true;
 }
-#endif  // OS_ANDROID || OS_LINUX || OS_CHROMEOS
+#endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ||
+        // BUILDFLAG(IS_CHROMEOS)
 
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
 
 bool CrashpadClient::StartJavaHandlerAtCrash(
     const std::string& class_name,
@@ -555,7 +629,7 @@ bool CrashpadClient::StartJavaHandlerForClient(
     int socket) {
   std::vector<std::string> argv = BuildAppProcessArgs(
       class_name, database, metrics_dir, url, annotations, arguments, socket);
-  return DoubleForkAndExec(argv, env, socket, false, nullptr);
+  return SpawnSubprocess(argv, env, socket, false, nullptr);
 }
 
 bool CrashpadClient::StartHandlerWithLinkerAtCrash(
@@ -604,7 +678,7 @@ bool CrashpadClient::StartHandlerWithLinkerForClient(
                                   annotations,
                                   arguments,
                                   socket);
-  return DoubleForkAndExec(argv, env, socket, false, nullptr);
+  return SpawnSubprocess(argv, env, socket, false, nullptr);
 }
 
 #endif
@@ -638,7 +712,7 @@ bool CrashpadClient::StartHandlerForClient(
 
   argv.push_back(FormatArgumentInt("initial-client-fd", socket));
 
-  return DoubleForkAndExec(argv, nullptr, socket, true, nullptr);
+  return SpawnSubprocess(argv, nullptr, socket, true, nullptr);
 }
 
 // static
@@ -666,7 +740,7 @@ void CrashpadClient::DumpWithoutCrash(NativeCPUContext* context) {
 
 // static
 void CrashpadClient::CrashWithoutDump(const std::string& message) {
-  SignalHandler::DisableForThread();
+  SignalHandler::Disable();
   LOG(FATAL) << message;
 }
 
@@ -677,12 +751,18 @@ void CrashpadClient::SetFirstChanceExceptionHandler(
   SignalHandler::Get()->SetFirstChanceHandler(handler);
 }
 
+// static
+void CrashpadClient::SetLastChanceExceptionHandler(LastChanceHandler handler) {
+  DCHECK(SignalHandler::Get());
+  SignalHandler::Get()->SetLastChanceExceptionHandler(handler);
+}
+
 void CrashpadClient::SetUnhandledSignals(const std::set<int>& signals) {
   DCHECK(!SignalHandler::Get());
   unhandled_signals_ = signals;
 }
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS)
 // static
 void CrashpadClient::SetCrashLoopBefore(uint64_t crash_loop_before_time) {
   auto request_crash_dump_handler = RequestCrashDumpHandler::Get();
diff --git a/extern/crashpad/crashpad/client/crashpad_client_linux_test.cc b/extern/crashpad/crashpad/client/crashpad_client_linux_test.cc
index a17589add0..c0bba4036d 100644
--- a/extern/crashpad/crashpad/client/crashpad_client_linux_test.cc
+++ b/extern/crashpad/crashpad/client/crashpad_client_linux_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,17 +15,20 @@
 #include "client/crashpad_client.h"
 
 #include <dlfcn.h>
+#include <setjmp.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <sys/syscall.h>
 #include <sys/types.h>
+#include <sys/utsname.h>
 #include <unistd.h>
 
 #include "base/check_op.h"
-#include "base/notreached.h"
+#include "build/build_config.h"
 #include "client/annotation.h"
 #include "client/annotation_list.h"
 #include "client/crash_report_database.h"
+#include "client/crashpad_info.h"
 #include "client/simulate_crash.h"
 #include "gtest/gtest.h"
 #include "snapshot/annotation_snapshot.h"
@@ -49,7 +52,7 @@
 #include "util/posix/signals.h"
 #include "util/thread/thread.h"
 
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
 #include <android/set_abort_message.h>
 #include "dlfcn_internal.h"
 
@@ -66,19 +69,24 @@ enum class CrashType : uint32_t {
   kSimulated,
   kBuiltinTrap,
   kInfiniteRecursion,
+  kSegvWithTagBits,
+  // kFakeSegv is meant to simulate a MTE segv error.
+  kFakeSegv,
 };
 
 struct StartHandlerForSelfTestOptions {
   bool start_handler_at_crash;
   bool set_first_chance_handler;
+  bool set_last_chance_handler;
   bool crash_non_main_thread;
   bool client_uses_signals;
+  bool gather_indirectly_referenced_memory;
   CrashType crash_type;
 };
 
 class StartHandlerForSelfTest
     : public testing::TestWithParam<
-          std::tuple<bool, bool, bool, bool, CrashType>> {
+          std::tuple<bool, bool, bool, bool, bool, bool, CrashType>> {
  public:
   StartHandlerForSelfTest() = default;
 
@@ -88,10 +96,15 @@ class StartHandlerForSelfTest
   ~StartHandlerForSelfTest() = default;
 
   void SetUp() override {
+    // MSAN requires that padding bytes have been initialized for structs that
+    // are written to files.
+    memset(&options_, 0, sizeof(options_));
     std::tie(options_.start_handler_at_crash,
              options_.set_first_chance_handler,
+             options_.set_last_chance_handler,
              options_.crash_non_main_thread,
              options_.client_uses_signals,
+             options_.gather_indirectly_referenced_memory,
              options_.crash_type) = GetParam();
   }
 
@@ -101,10 +114,6 @@ class StartHandlerForSelfTest
   StartHandlerForSelfTestOptions options_;
 };
 
-bool HandleCrashSuccessfully(int, siginfo_t*, ucontext_t*) {
-  return true;
-}
-
 bool InstallHandler(CrashpadClient* client,
                     bool start_at_crash,
                     const base::FilePath& handler_path,
@@ -134,7 +143,7 @@ constexpr char kTestAnnotationValue[] = "value_of_annotation";
 constexpr char kTestAttachmentName[] = "test_attachment";
 constexpr char kTestAttachmentContent[] = "attachment_content";
 
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
 constexpr char kTestAbortMessage[] = "test abort message";
 #endif
 
@@ -147,11 +156,37 @@ void ValidateAttachment(const CrashReportDatabase::UploadReport* report) {
             0);
 }
 
-void ValidateDump(const CrashReportDatabase::UploadReport* report) {
+void ValidateExtraMemory(const StartHandlerForSelfTestOptions& options,
+                         const ProcessSnapshotMinidump& minidump) {
+  // Verify that if we have an exception, then the code around the instruction
+  // pointer is included in the extra memory.
+  const ExceptionSnapshot* exception = minidump.Exception();
+  if (exception == nullptr)
+    return;
+  uint64_t pc = exception->Context()->InstructionPointer();
+  std::vector<const MemorySnapshot*> snippets = minidump.ExtraMemory();
+  bool pc_found = false;
+  for (const MemorySnapshot* snippet : snippets) {
+    uint64_t start = snippet->Address();
+    uint64_t end = start + snippet->Size();
+    if (pc >= start && pc < end) {
+      pc_found = true;
+      break;
+    }
+  }
+  EXPECT_EQ(pc_found, options.gather_indirectly_referenced_memory);
+
+  if (options.crash_type == CrashType::kSegvWithTagBits) {
+    EXPECT_EQ(exception->ExceptionAddress(), 0xefull << 56);
+  }
+}
+
+void ValidateDump(const StartHandlerForSelfTestOptions& options,
+                  const CrashReportDatabase::UploadReport* report) {
   ProcessSnapshotMinidump minidump_snapshot;
   ASSERT_TRUE(minidump_snapshot.Initialize(report->Reader()));
 
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
   // This part of the test requires Q. The API level on Q devices will be 28
   // until the API is finalized, so we can't check API level yet. For now, test
   // for the presence of a libc symbol which was introduced in Q.
@@ -164,6 +199,8 @@ void ValidateDump(const CrashReportDatabase::UploadReport* report) {
 #endif
   ValidateAttachment(report);
 
+  ValidateExtraMemory(options, minidump_snapshot);
+
   for (const ModuleSnapshot* module : minidump_snapshot.Modules()) {
     for (const AnnotationSnapshot& annotation : module->AnnotationObjects()) {
       if (static_cast<Annotation::Type>(annotation.type) !=
@@ -185,28 +222,73 @@ void ValidateDump(const CrashReportDatabase::UploadReport* report) {
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Winfinite-recursion"
+// Clang (masquerading as gcc) is too smart, and removes the recursion
+// otherwise. May need to change if either clang or another compiler becomes
+// smarter.
+#if defined(COMPILER_GCC)
+__attribute__((noinline))
+#endif
+#if defined(__clang__)
+__attribute__((optnone))
+#endif
 int RecurseInfinitely(int* ptr) {
   int buf[1 << 20];
   return *ptr + RecurseInfinitely(buf);
 }
 #pragma clang diagnostic pop
 
+sigjmp_buf do_crash_sigjmp_env;
+
+bool HandleCrashSuccessfully(int, siginfo_t*, ucontext_t*) {
+  siglongjmp(do_crash_sigjmp_env, 1);
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunreachable-code-return"
+  return true;
+#pragma clang diagnostic pop
+}
+
+bool HandleCrashSuccessfullyAfterReporting(int, siginfo_t*, ucontext_t*) {
+  return true;
+}
+
 void DoCrash(const StartHandlerForSelfTestOptions& options,
              CrashpadClient* client) {
+  if (sigsetjmp(do_crash_sigjmp_env, 1) != 0) {
+    return;
+  }
+
   switch (options.crash_type) {
-    case CrashType::kSimulated:
-      if (options.set_first_chance_handler) {
-        client->SetFirstChanceExceptionHandler(HandleCrashSuccessfully);
-      }
+    case CrashType::kSimulated: {
       CRASHPAD_SIMULATE_CRASH();
       break;
+    }
 
-    case CrashType::kBuiltinTrap:
+    case CrashType::kBuiltinTrap: {
       __builtin_trap();
+    }
 
-    case CrashType::kInfiniteRecursion:
+    case CrashType::kInfiniteRecursion: {
       int val = 42;
       exit(RecurseInfinitely(&val));
+    }
+
+    case CrashType::kSegvWithTagBits: {
+      volatile char* x = nullptr;
+#ifdef __aarch64__
+      x += 0xefull << 56;
+#endif  // __aarch64__
+      *x;
+      break;
+    }
+
+    case CrashType::kFakeSegv: {
+      // With a regular SIGSEGV like null dereference, the signal gets reraised
+      // automatically, causing HandleOrReraiseSignal() to be called a second
+      // time, terminating the process with the signal regardless of the last
+      // chance handler.
+      raise(SIGSEGV);
+      break;
+    }
   }
 }
 
@@ -229,7 +311,7 @@ class ScopedAltSignalStack {
 
   void Initialize() {
     ScopedMmap local_stack_mem;
-    constexpr size_t stack_size = MINSIGSTKSZ;
+    const size_t stack_size = MINSIGSTKSZ;
     ASSERT_TRUE(local_stack_mem.ResetMmap(nullptr,
                                           stack_size,
                                           PROT_READ | PROT_WRITE,
@@ -308,6 +390,11 @@ CRASHPAD_CHILD_TEST_MAIN(StartHandlerForSelfTestChild) {
         client_handler, SA_ONSTACK, &old_actions));
   }
 
+  if (options.gather_indirectly_referenced_memory) {
+    CrashpadInfo::GetCrashpadInfo()->set_gather_indirectly_referenced_memory(
+        TriState::kEnabled, 1024 * 1024 * 4);
+  }
+
   base::FilePath handler_path = TestPaths::Executable().DirName().Append(
       FILE_PATH_LITERAL("crashpad_handler"));
 
@@ -328,7 +415,15 @@ CRASHPAD_CHILD_TEST_MAIN(StartHandlerForSelfTestChild) {
     return EXIT_FAILURE;
   }
 
-#if defined(OS_ANDROID)
+  if (options.set_first_chance_handler) {
+    client.SetFirstChanceExceptionHandler(HandleCrashSuccessfully);
+  }
+
+  if (options.set_last_chance_handler) {
+    client.SetLastChanceExceptionHandler(HandleCrashSuccessfullyAfterReporting);
+  }
+
+#if BUILDFLAG(IS_ANDROID)
   if (android_set_abort_message) {
     android_set_abort_message(kTestAbortMessage);
   }
@@ -350,17 +445,32 @@ class StartHandlerForSelfInChildTest : public MultiprocessExec {
   StartHandlerForSelfInChildTest(const StartHandlerForSelfTestOptions& options)
       : MultiprocessExec(), options_(options) {
     SetChildTestMainFunction("StartHandlerForSelfTestChild");
-    switch (options.crash_type) {
-      case CrashType::kSimulated:
-        // kTerminationNormal, EXIT_SUCCESS
-        break;
-      case CrashType::kBuiltinTrap:
-        SetExpectedChildTerminationBuiltinTrap();
-        break;
-      case CrashType::kInfiniteRecursion:
-        SetExpectedChildTermination(TerminationReason::kTerminationSignal,
-                                    SIGSEGV);
-        break;
+    if (!options.set_first_chance_handler) {
+      switch (options.crash_type) {
+        case CrashType::kSimulated:
+          // kTerminationNormal, EXIT_SUCCESS
+          break;
+        case CrashType::kBuiltinTrap:
+          SetExpectedChildTerminationBuiltinTrap();
+          break;
+        case CrashType::kInfiniteRecursion:
+          SetExpectedChildTermination(TerminationReason::kTerminationSignal,
+                                      SIGSEGV);
+          break;
+        case CrashType::kSegvWithTagBits:
+          SetExpectedChildTermination(TerminationReason::kTerminationSignal,
+                                      SIGSEGV);
+          break;
+        case CrashType::kFakeSegv:
+          if (!options.set_last_chance_handler) {
+            SetExpectedChildTermination(TerminationReason::kTerminationSignal,
+                                        SIGSEGV);
+          } else {
+            SetExpectedChildTermination(TerminationReason::kTerminationNormal,
+                                        EXIT_SUCCESS);
+          }
+          break;
+      }
     }
   }
 
@@ -391,7 +501,11 @@ class StartHandlerForSelfInChildTest : public MultiprocessExec {
     writer.Close();
 
     if (options_.client_uses_signals && !options_.set_first_chance_handler &&
-        options_.crash_type != CrashType::kSimulated) {
+        options_.crash_type != CrashType::kSimulated &&
+        // The last chance handler will prevent the client handler from being
+        // called if crash type is kFakeSegv.
+        (!options_.set_last_chance_handler ||
+         options_.crash_type != CrashType::kFakeSegv)) {
       // Wait for child's client signal handler.
       char c;
       EXPECT_TRUE(LoggingReadFileExactly(ReadPipeHandle(), &c, sizeof(c)));
@@ -411,33 +525,61 @@ class StartHandlerForSelfInChildTest : public MultiprocessExec {
     reports.clear();
     ASSERT_EQ(database->GetPendingReports(&reports),
               CrashReportDatabase::kNoError);
-    ASSERT_EQ(reports.size(), options_.set_first_chance_handler ? 0u : 1u);
 
-    if (options_.set_first_chance_handler) {
+    bool report_expected = !options_.set_first_chance_handler ||
+                           options_.crash_type == CrashType::kSimulated;
+    ASSERT_EQ(reports.size(), report_expected ? 1u : 0u);
+
+    if (!report_expected) {
       return;
     }
 
     std::unique_ptr<const CrashReportDatabase::UploadReport> report;
     ASSERT_EQ(database->GetReportForUploading(reports[0].uuid, &report),
               CrashReportDatabase::kNoError);
-    ValidateDump(report.get());
+    ValidateDump(options_, report.get());
   }
 
   StartHandlerForSelfTestOptions options_;
 };
 
 TEST_P(StartHandlerForSelfTest, StartHandlerInChild) {
-  if (Options().set_first_chance_handler &&
-      Options().crash_type != CrashType::kSimulated) {
-    // TODO(jperaza): test first chance handlers with real crashes.
-    return;
-  }
 #if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER) || \
     defined(UNDEFINED_SANITIZER)
   if (Options().crash_type == CrashType::kInfiniteRecursion) {
     GTEST_SKIP();
   }
 #endif  // defined(ADDRESS_SANITIZER)
+
+  // kFakeSegv does raise(SIGSEGV) to simulate a MTE error which is a SEGSEGV
+  // that doesn't get reraised automatically, but this causes the child process
+  // to flakily terminate normally on some bots (e.g. android-nougat-x86-rel)
+  // for some reason so this is skipped.
+  if (!Options().set_last_chance_handler &&
+      Options().crash_type == CrashType::kFakeSegv) {
+    GTEST_SKIP();
+  }
+
+  if (Options().crash_type == CrashType::kSegvWithTagBits) {
+#if !defined(ARCH_CPU_ARM64)
+    GTEST_SKIP() << "Testing for tag bits only exists on aarch64.";
+#else
+    struct utsname uname_info;
+    ASSERT_EQ(uname(&uname_info), 0);
+    ASSERT_NE(uname_info.release, nullptr);
+
+    char* release = uname_info.release;
+    unsigned major = strtoul(release, &release, 10);
+    ASSERT_EQ(*release++, '.');
+    unsigned minor = strtoul(release, nullptr, 10);
+
+    if (major < 5 || (major == 5 && minor < 11)) {
+      GTEST_SKIP() << "Linux kernel v" << uname_info.release
+                   << " does not support SA_EXPOSE_TAGBITS";
+    }
+#endif  // !defined(ARCH_CPU_ARM64)
+  }
+
   StartHandlerForSelfInChildTest test(Options());
   test.Run();
 }
@@ -446,12 +588,16 @@ INSTANTIATE_TEST_SUITE_P(
     StartHandlerForSelfTestSuite,
     StartHandlerForSelfTest,
     testing::Combine(testing::Bool(),
+                     testing::Bool(),
+                     testing::Bool(),
                      testing::Bool(),
                      testing::Bool(),
                      testing::Bool(),
                      testing::Values(CrashType::kSimulated,
                                      CrashType::kBuiltinTrap,
-                                     CrashType::kInfiniteRecursion)));
+                                     CrashType::kInfiniteRecursion,
+                                     CrashType::kSegvWithTagBits,
+                                     CrashType::kFakeSegv)));
 
 // Test state for starting the handler for another process.
 class StartHandlerForClientTest {
@@ -613,12 +759,10 @@ class StartHandlerForChildTest : public Multiprocess {
     test_state_.ExpectReport();
   }
 
-  void MultiprocessChild() {
+  [[noreturn]] void MultiprocessChild() {
     CHECK(test_state_.InstallHandler());
 
     __builtin_trap();
-
-    NOTREACHED();
   }
 
   StartHandlerForClientTest test_state_;
diff --git a/extern/crashpad/crashpad/client/crashpad_client_mac.cc b/extern/crashpad/crashpad/client/crashpad_client_mac.cc
index f4256f0cd3..a76b89b2fa 100644
--- a/extern/crashpad/crashpad/client/crashpad_client_mac.cc
+++ b/extern/crashpad/crashpad/client/crashpad_client_mac.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,11 +21,12 @@
 #include <stdint.h>
 
 #include <memory>
+#include <tuple>
 #include <utility>
 
+#include "base/apple/mach_logging.h"
+#include "base/check_op.h"
 #include "base/logging.h"
-#include "base/mac/mach_logging.h"
-#include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "util/mac/mac_util.h"
 #include "util/mach/bootstrap.h"
@@ -36,7 +37,7 @@
 #include "util/mach/notify_server.h"
 #include "util/misc/clock.h"
 #include "util/misc/implicit_cast.h"
-#include "util/posix/double_fork_and_exec.h"
+#include "util/posix/spawn_subprocess.h"
 
 namespace crashpad {
 
@@ -63,13 +64,13 @@ std::string FormatArgumentInt(const std::string& name, int value) {
 // reasons, an EXC_CRASH exception will be sent. See 10.9.5
 // xnu-2422.115.4/bsd/kern/kern_exit.c proc_prepareexit().
 //
-// EXC_RESOURCE and EXC_GUARD do not become signals or EXC_CRASH exceptions. The
-// host-level exception handler in the kernel does not receive these exception
-// types, and even if it did, it would not map them to signals. Instead, the
-// first Mach service loaded by the root (process ID 1) launchd with a boolean
-// “ExceptionServer” property in its job dictionary (regardless of its value) or
-// with any subdictionary property will become the host-level exception handler
-// for EXC_CRASH, EXC_RESOURCE, and EXC_GUARD. See 10.9.5
+// EXC_RESOURCE and EXC_GUARD (pre-macOS 13) do not become signals or EXC_CRASH
+// exceptions. The host-level exception handler in the kernel does not receive
+// these exception types, and even if it did, it would not map them to signals.
+// Instead, the first Mach service loaded by the root (process ID 1) launchd
+// with a boolean “ExceptionServer” property in its job dictionary (regardless
+// of its value) or with any subdictionary property will become the host-level
+// exception handler for EXC_CRASH, EXC_RESOURCE, and EXC_GUARD. See 10.9.5
 // launchd-842.92.1/src/core.c job_setup_exception_port(). Normally, this job is
 // com.apple.ReportCrash.Root, the systemwide Apple Crash Reporter. Since it is
 // impossible to receive EXC_RESOURCE and EXC_GUARD exceptions through the
@@ -82,8 +83,15 @@ std::string FormatArgumentInt(const std::string& name, int value) {
 // so AND them with ExcMaskValid(). EXC_MASK_CRASH is always supported.
 bool SetCrashExceptionPorts(exception_handler_t exception_handler) {
   ExceptionPorts exception_ports(ExceptionPorts::kTargetTypeTask, TASK_NULL);
+
+  exception_mask_t mask = EXC_MASK_CRASH | EXC_MASK_RESOURCE;
+  if (MacOSVersionNumber() < 13'00'00) {
+    // EXC_GUARD is delivered as an EXC_CRASH macOS 13 and later.
+    mask |= EXC_MASK_GUARD;
+  }
+
   return exception_ports.SetExceptionPort(
-      (EXC_MASK_CRASH | EXC_MASK_RESOURCE | EXC_MASK_GUARD) & ExcMaskValid(),
+      mask & ExcMaskValid(),
       exception_handler,
       EXCEPTION_STATE_IDENTITY | MACH_EXCEPTION_CODES,
       MACHINE_THREAD_STATE);
@@ -122,18 +130,19 @@ class HandlerStarter final : public NotifyServer::DefaultInterface {
   //!
   //! \return On success, a send right to the Crashpad handler that has been
   //!     started. On failure, `MACH_PORT_NULL` with a message logged.
-  static base::mac::ScopedMachSendRight InitialStart(
+  static base::apple::ScopedMachSendRight InitialStart(
       const base::FilePath& handler,
       const base::FilePath& database,
       const base::FilePath& metrics_dir,
       const std::string& url,
       const std::map<std::string, std::string>& annotations,
       const std::vector<std::string>& arguments,
-      bool restartable) {
-    base::mac::ScopedMachReceiveRight receive_right(
+      bool restartable,
+      const std::vector<base::FilePath>& attachments) {
+    base::apple::ScopedMachReceiveRight receive_right(
         NewMachPort(MACH_PORT_RIGHT_RECEIVE));
     if (!receive_right.is_valid()) {
-      return base::mac::ScopedMachSendRight();
+      return base::apple::ScopedMachSendRight();
     }
 
     mach_port_t port;
@@ -145,9 +154,9 @@ class HandlerStarter final : public NotifyServer::DefaultInterface {
                                                &right_type);
     if (kr != KERN_SUCCESS) {
       MACH_LOG(ERROR, kr) << "mach_port_extract_right";
-      return base::mac::ScopedMachSendRight();
+      return base::apple::ScopedMachSendRight();
     }
-    base::mac::ScopedMachSendRight send_right(port);
+    base::apple::ScopedMachSendRight send_right(port);
     DCHECK_EQ(port, receive_right.get());
     DCHECK_EQ(right_type,
               implicit_cast<mach_msg_type_name_t>(MACH_MSG_TYPE_PORT_SEND));
@@ -170,15 +179,16 @@ class HandlerStarter final : public NotifyServer::DefaultInterface {
                      arguments,
                      std::move(receive_right),
                      handler_restarter.get(),
-                     false)) {
-      return base::mac::ScopedMachSendRight();
+                     false,
+                     attachments)) {
+      return base::apple::ScopedMachSendRight();
     }
 
-    if (handler_restarter &&
-        handler_restarter->StartRestartThread(
-            handler, database, metrics_dir, url, annotations, arguments)) {
+    if (handler_restarter && handler_restarter->StartRestartThread(
+                                 handler, database, metrics_dir, url,
+                                 annotations, arguments, attachments)) {
       // The thread owns the object now.
-      ignore_result(handler_restarter.release());
+      std::ignore = handler_restarter.release();
     }
 
     // If StartRestartThread() failed, proceed without the ability to restart.
@@ -211,9 +221,10 @@ class HandlerStarter final : public NotifyServer::DefaultInterface {
                 url_,
                 annotations_,
                 arguments_,
-                base::mac::ScopedMachReceiveRight(rights),
+                base::apple::ScopedMachReceiveRight(rights),
                 this,
-                true);
+                true,
+                attachments_);
 
     return KERN_SUCCESS;
   }
@@ -256,9 +267,10 @@ class HandlerStarter final : public NotifyServer::DefaultInterface {
                           const std::string& url,
                           const std::map<std::string, std::string>& annotations,
                           const std::vector<std::string>& arguments,
-                          base::mac::ScopedMachReceiveRight receive_right,
+                          base::apple::ScopedMachReceiveRight receive_right,
                           HandlerStarter* handler_restarter,
-                          bool restart) {
+                          bool restart,
+                          const std::vector<base::FilePath>& attachments) {
     DCHECK(!restart || handler_restarter);
 
     if (handler_restarter) {
@@ -282,7 +294,7 @@ class HandlerStarter final : public NotifyServer::DefaultInterface {
         // port-destroyed notifications can be delivered.
         handler_restarter->notify_port_.reset();
       } else {
-        base::mac::ScopedMachSendRight previous_owner(previous);
+        base::apple::ScopedMachSendRight previous_owner(previous);
         DCHECK(restart || !previous_owner.is_valid());
       }
 
@@ -336,6 +348,9 @@ class HandlerStarter final : public NotifyServer::DefaultInterface {
       argv.push_back(
           FormatArgumentString("annotation", kv.first + '=' + kv.second));
     }
+    for (const auto& attachment : attachments) {
+      argv.push_back(FormatArgumentString("attachment", attachment.value()));
+    }
     argv.push_back(FormatArgumentInt("handshake-fd", server_write_fd.get()));
 
     // When restarting, reset the system default crash handler first. Otherwise,
@@ -343,7 +358,7 @@ class HandlerStarter final : public NotifyServer::DefaultInterface {
     // this parent process, which was probably using the exception server now
     // being restarted. The handler can’t monitor itself for its own crashes via
     // this interface.
-    if (!DoubleForkAndExec(
+    if (!SpawnSubprocess(
             argv,
             nullptr,
             server_write_fd.get(),
@@ -362,7 +377,7 @@ class HandlerStarter final : public NotifyServer::DefaultInterface {
       return false;
     }
 
-    ignore_result(receive_right.release());
+    std::ignore = receive_right.release();
     return true;
   }
 
@@ -371,13 +386,15 @@ class HandlerStarter final : public NotifyServer::DefaultInterface {
                           const base::FilePath& metrics_dir,
                           const std::string& url,
                           const std::map<std::string, std::string>& annotations,
-                          const std::vector<std::string>& arguments) {
+                          const std::vector<std::string>& arguments,
+                          const std::vector<base::FilePath>& attachments) {
     handler_ = handler;
     database_ = database;
     metrics_dir_ = metrics_dir;
     url_ = url;
     annotations_ = annotations;
     arguments_ = arguments;
+    attachments_ = attachments;
 
     pthread_attr_t pthread_attr;
     errno = pthread_attr_init(&pthread_attr);
@@ -430,7 +447,8 @@ class HandlerStarter final : public NotifyServer::DefaultInterface {
   std::string url_;
   std::map<std::string, std::string> annotations_;
   std::vector<std::string> arguments_;
-  base::mac::ScopedMachReceiveRight notify_port_;
+  std::vector<base::FilePath> attachments_;
+  base::apple::ScopedMachReceiveRight notify_port_;
   uint64_t last_start_time_;
 };
 
@@ -452,13 +470,10 @@ bool CrashpadClient::StartHandler(
     bool restartable,
     bool asynchronous_start,
     const std::vector<base::FilePath>& attachments) {
-  // Attachments are not implemented on MacOS yet.
-  DCHECK(attachments.empty());
-
   // The “restartable” behavior can only be selected on OS X 10.10 and later. In
   // previous OS versions, if the initial client were to crash while attempting
   // to restart the handler, it would become an unkillable process.
-  base::mac::ScopedMachSendRight exception_port(HandlerStarter::InitialStart(
+  base::apple::ScopedMachSendRight exception_port(HandlerStarter::InitialStart(
       handler,
       database,
       metrics_dir,
@@ -466,7 +481,8 @@ bool CrashpadClient::StartHandler(
       annotations,
       arguments,
       restartable && (__MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_10 ||
-                      MacOSVersionNumber() >= 10'10'00)));
+                      MacOSVersionNumber() >= 10'10'00),
+      attachments));
   if (!exception_port.is_valid()) {
     return false;
   }
@@ -476,7 +492,8 @@ bool CrashpadClient::StartHandler(
 }
 
 bool CrashpadClient::SetHandlerMachService(const std::string& service_name) {
-  base::mac::ScopedMachSendRight exception_port(BootstrapLookUp(service_name));
+  base::apple::ScopedMachSendRight exception_port(
+      BootstrapLookUp(service_name));
   if (!exception_port.is_valid()) {
     return false;
   }
@@ -486,7 +503,7 @@ bool CrashpadClient::SetHandlerMachService(const std::string& service_name) {
 }
 
 bool CrashpadClient::SetHandlerMachPort(
-    base::mac::ScopedMachSendRight exception_port) {
+    base::apple::ScopedMachSendRight exception_port) {
   DCHECK(!exception_port_.is_valid());
   DCHECK(exception_port.is_valid());
 
@@ -498,7 +515,7 @@ bool CrashpadClient::SetHandlerMachPort(
   return true;
 }
 
-base::mac::ScopedMachSendRight CrashpadClient::GetHandlerMachPort() const {
+base::apple::ScopedMachSendRight CrashpadClient::GetHandlerMachPort() const {
   DCHECK(exception_port_.is_valid());
 
   // For the purposes of this method, only return a port set by
@@ -519,16 +536,16 @@ base::mac::ScopedMachSendRight CrashpadClient::GetHandlerMachPort() const {
       mach_task_self(), exception_port_.get(), MACH_PORT_RIGHT_SEND, 1);
   if (kr != KERN_SUCCESS) {
     MACH_LOG(ERROR, kr) << "mach_port_mod_refs";
-    return base::mac::ScopedMachSendRight(MACH_PORT_NULL);
+    return base::apple::ScopedMachSendRight(MACH_PORT_NULL);
   }
 
-  return base::mac::ScopedMachSendRight(exception_port_.get());
+  return base::apple::ScopedMachSendRight(exception_port_.get());
 }
 
 // static
 void CrashpadClient::UseSystemDefaultHandler() {
-  base::mac::ScopedMachSendRight
-      system_crash_reporter_handler(SystemCrashReporterHandler());
+  base::apple::ScopedMachSendRight system_crash_reporter_handler(
+      SystemCrashReporterHandler());
 
   // Proceed even if SystemCrashReporterHandler() failed, setting MACH_PORT_NULL
   // to clear the current exception ports.
diff --git a/extern/crashpad/crashpad/client/crashpad_client_win.cc b/extern/crashpad/crashpad/client/crashpad_client_win.cc
index 0973c2a672..22ac0a2044 100644
--- a/extern/crashpad/crashpad/client/crashpad_client_win.cc
+++ b/extern/crashpad/crashpad/client/crashpad_client_win.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,13 +16,17 @@
 
 #include <windows.h>
 
+#include <werapi.h>
+
 #include <signal.h>
 #include <stdint.h>
 #include <string.h>
 
+#include <atomic>
 #include <memory>
+#include <string_view>
 
-#include "base/atomicops.h"
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/scoped_generic.h"
 #include "base/strings/stringprintf.h"
@@ -36,6 +40,7 @@
 #include "util/win/command_line.h"
 #include "util/win/context_wrappers.h"
 #include "util/win/critical_section_with_debug_info.h"
+#include "util/win/exception_codes.h"
 #include "util/win/get_function.h"
 #include "util/win/handle.h"
 #include "util/win/initial_client_data.h"
@@ -60,19 +65,25 @@ HANDLE g_signal_exception = INVALID_HANDLE_VALUE;
 // Where we store the exception information that the crash handler reads.
 ExceptionInformation g_crash_exception_information;
 
-// These handles are never closed. g_signal_non_crash_dump is used to signal to
-// the server to take a dump (not due to an exception), and the server will
-// signal g_non_crash_dump_done when the dump is completed.
-HANDLE g_signal_non_crash_dump = INVALID_HANDLE_VALUE;
-HANDLE g_non_crash_dump_done = INVALID_HANDLE_VALUE;
-
-// Guards multiple simultaneous calls to DumpWithoutCrash(). This is leaked.
+// Guards multiple simultaneous calls to DumpWithoutCrash() in the client.
+// This is leaked.
 base::Lock* g_non_crash_dump_lock;
 
 // Where we store a pointer to the context information when taking a non-crash
 // dump.
 ExceptionInformation g_non_crash_exception_information;
 
+// Context for the out-of-process exception handler module and holds non-crash
+// dump handles. Handles are never closed once created.
+WerRegistration g_wer_registration = {WerRegistration::kWerRegistrationVersion,
+                                      INVALID_HANDLE_VALUE,
+                                      INVALID_HANDLE_VALUE,
+                                      false,
+                                      nullptr,
+                                      {0},
+                                      {0},
+                                      {0}};
+
 enum class StartupState : int {
   kNotReady = 0,  // This must be value 0 because it is the initial value of a
                   // global AtomicWord.
@@ -84,7 +95,7 @@ enum class StartupState : int {
 // when the handler is known to have started successfully, or failed to start
 // the value will be updated. The unhandled exception filter will not proceed
 // until one of those two cases happens.
-base::subtle::AtomicWord g_handler_startup_state;
+std::atomic<StartupState> g_handler_startup_state;
 
 // A CRITICAL_SECTION initialized with
 // RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO to force it to be allocated with a
@@ -95,20 +106,18 @@ CRITICAL_SECTION g_critical_section_with_debug_info;
 
 void SetHandlerStartupState(StartupState state) {
   DCHECK(state == StartupState::kSucceeded || state == StartupState::kFailed);
-  base::subtle::Release_Store(&g_handler_startup_state,
-                              static_cast<base::subtle::AtomicWord>(state));
+  g_handler_startup_state.store(state, std::memory_order_release);
 }
 
 StartupState BlockUntilHandlerStartedOrFailed() {
   // Wait until we know the handler has either succeeded or failed to start.
-  base::subtle::AtomicWord startup_state;
-  while (
-      (startup_state = base::subtle::Acquire_Load(&g_handler_startup_state)) ==
-      static_cast<int>(StartupState::kNotReady)) {
+  StartupState startup_state;
+  while ((startup_state = g_handler_startup_state.load(
+              std::memory_order_acquire)) == StartupState::kNotReady) {
     Sleep(1);
   }
 
-  return static_cast<StartupState>(startup_state);
+  return startup_state;
 }
 
 #if defined(ADDRESS_SANITIZER)
@@ -135,7 +144,7 @@ LONG WINAPI UnhandledExceptionHandler(EXCEPTION_POINTERS* exception_pointers) {
   // Otherwise, we know the handler startup has succeeded, and we can continue.
 
   // Tracks whether a thread has already entered UnhandledExceptionHandler.
-  static base::subtle::AtomicWord have_crashed;
+  static std::atomic<bool> have_crashed;
 
   // This is a per-process handler. While this handler is being invoked, other
   // threads are still executing as usual, so multiple threads could enter at
@@ -149,7 +158,7 @@ LONG WINAPI UnhandledExceptionHandler(EXCEPTION_POINTERS* exception_pointers) {
   // that we won't save the exception pointers from the second and further
   // crashes, but contention here is very unlikely, and we'll still have a stack
   // that's blocked at this location.
-  if (base::subtle::Barrier_AtomicIncrement(&have_crashed, 1) > 1) {
+  if (have_crashed.exchange(true)) {
     SleepEx(INFINITE, false);
   }
 
@@ -178,6 +187,17 @@ LONG WINAPI UnhandledExceptionHandler(EXCEPTION_POINTERS* exception_pointers) {
   return EXCEPTION_CONTINUE_SEARCH;
 }
 
+#if !defined(ADDRESS_SANITIZER)
+LONG WINAPI HandleHeapCorruption(EXCEPTION_POINTERS* exception_pointers) {
+  if (exception_pointers->ExceptionRecord->ExceptionCode ==
+      STATUS_HEAP_CORRUPTION) {
+    return UnhandledExceptionHandler(exception_pointers);
+  }
+
+  return EXCEPTION_CONTINUE_SEARCH;
+}
+#endif
+
 void HandleAbortSignal(int signum) {
   DCHECK_EQ(signum, SIGABRT);
 
@@ -401,8 +421,8 @@ bool StartHandlerProcess(
 
   InitialClientData initial_client_data(
       g_signal_exception,
-      g_signal_non_crash_dump,
-      g_non_crash_dump_done,
+      g_wer_registration.dump_without_crashing,
+      g_wer_registration.dump_completed,
       data->ipc_pipe_handle.get(),
       this_process.get(),
       FromPointerCast<WinVMAddress>(&g_crash_exception_information),
@@ -416,7 +436,8 @@ bool StartHandlerProcess(
   BOOL rv;
   DWORD creation_flags;
   STARTUPINFOEX startup_info = {};
-  startup_info.StartupInfo.dwFlags = STARTF_USESTDHANDLES;
+  startup_info.StartupInfo.dwFlags =
+      STARTF_USESTDHANDLES | STARTF_FORCEOFFFEEDBACK;
   startup_info.StartupInfo.hStdInput = GetStdHandle(STD_INPUT_HANDLE);
   startup_info.StartupInfo.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE);
   startup_info.StartupInfo.hStdError = GetStdHandle(STD_ERROR_HANDLE);
@@ -466,8 +487,8 @@ bool StartHandlerProcess(
 
     handle_list.reserve(8);
     handle_list.push_back(g_signal_exception);
-    handle_list.push_back(g_signal_non_crash_dump);
-    handle_list.push_back(g_non_crash_dump_done);
+    handle_list.push_back(g_wer_registration.dump_without_crashing);
+    handle_list.push_back(g_wer_registration.dump_completed);
     handle_list.push_back(data->ipc_pipe_handle.get());
     handle_list.push_back(this_process.get());
     AddHandleToListIfValidAndInheritable(&handle_list,
@@ -496,7 +517,7 @@ bool StartHandlerProcess(
   // invalid command line where the first argument needed by rundll32 is not in
   // the correct format as required in:
   // https://support.microsoft.com/en-ca/help/164787/info-windows-rundll-and-rundll32-interface
-  const base::WStringPiece kRunDll32Exe(L"rundll32.exe");
+  const std::wstring_view kRunDll32Exe(L"rundll32.exe");
   bool is_embedded_in_dll = false;
   if (data->handler.value().size() >= kRunDll32Exe.size() &&
       _wcsicmp(data->handler.value()
@@ -568,35 +589,10 @@ void CommonInProcessInitialization() {
   g_non_crash_dump_lock = new base::Lock();
 }
 
-void RegisterHandlers() {
-  SetUnhandledExceptionFilter(&UnhandledExceptionHandler);
-
-  // The Windows CRT's signal.h lists:
-  // - SIGINT
-  // - SIGILL
-  // - SIGFPE
-  // - SIGSEGV
-  // - SIGTERM
-  // - SIGBREAK
-  // - SIGABRT
-  // SIGILL and SIGTERM are documented as not being generated. SIGBREAK and
-  // SIGINT are for Ctrl-Break and Ctrl-C, and aren't something for which
-  // capturing a dump is warranted. SIGFPE and SIGSEGV are captured as regular
-  // exceptions through the unhandled exception filter. This leaves SIGABRT. In
-  // the standard CRT, abort() is implemented as a synchronous call to the
-  // SIGABRT signal handler if installed, but after doing so, the unhandled
-  // exception filter is not triggered (it instead __fastfail()s). So, register
-  // to handle SIGABRT to catch abort() calls, as client code might use this and
-  // expect it to cause a crash dump. This will only work when the abort()
-  // that's called in client code is the same (or has the same behavior) as the
-  // one in use here.
-  void (*rv)(int) = signal(SIGABRT, HandleAbortSignal);
-  DCHECK_NE(rv, SIG_ERR);
-}
-
 }  // namespace
 
-CrashpadClient::CrashpadClient() : ipc_pipe_(), handler_start_thread_() {}
+CrashpadClient::CrashpadClient()
+    : ipc_pipe_(), handler_start_thread_(), vectored_handler_() {}
 
 CrashpadClient::~CrashpadClient() {}
 
@@ -624,9 +620,9 @@ bool CrashpadClient::StartHandler(
 
   g_signal_exception =
       CreateEvent(&security_attributes, false /* auto reset */, false, nullptr);
-  g_signal_non_crash_dump =
+  g_wer_registration.dump_without_crashing =
       CreateEvent(&security_attributes, false /* auto reset */, false, nullptr);
-  g_non_crash_dump_done =
+  g_wer_registration.dump_completed =
       CreateEvent(&security_attributes, false /* auto reset */, false, nullptr);
 
   CommonInProcessInitialization();
@@ -670,6 +666,42 @@ bool CrashpadClient::StartHandler(
   }
 }
 
+void CrashpadClient::RegisterHandlers() {
+  SetUnhandledExceptionFilter(&UnhandledExceptionHandler);
+
+  // Windows swallows heap corruption failures but we can intercept them with
+  // a vectored exception handler. Note that a vectored exception handler is
+  // not compatible with or generally helpful in ASAN builds (ASAN inserts a
+  // bad dereference at the beginning of the handler, leading to recursive
+  // invocation of the handler).
+#if !defined(ADDRESS_SANITIZER)
+  PVOID handler = AddVectoredExceptionHandler(true, HandleHeapCorruption);
+  vectored_handler_.reset(handler);
+#endif
+
+  // The Windows CRT's signal.h lists:
+  // - SIGINT
+  // - SIGILL
+  // - SIGFPE
+  // - SIGSEGV
+  // - SIGTERM
+  // - SIGBREAK
+  // - SIGABRT
+  // SIGILL and SIGTERM are documented as not being generated. SIGBREAK and
+  // SIGINT are for Ctrl-Break and Ctrl-C, and aren't something for which
+  // capturing a dump is warranted. SIGFPE and SIGSEGV are captured as regular
+  // exceptions through the unhandled exception filter. This leaves SIGABRT. In
+  // the standard CRT, abort() is implemented as a synchronous call to the
+  // SIGABRT signal handler if installed, but after doing so, the unhandled
+  // exception filter is not triggered (it instead __fastfail()s). So, register
+  // to handle SIGABRT to catch abort() calls, as client code might use this and
+  // expect it to cause a crash dump. This will only work when the abort()
+  // that's called in client code is the same (or has the same behavior) as the
+  // one in use here.
+  void (*rv)(int) = signal(SIGABRT, HandleAbortSignal);
+  DCHECK_NE(rv, SIG_ERR);
+}
+
 bool CrashpadClient::SetHandlerIPCPipe(const std::wstring& ipc_pipe) {
   DCHECK(ipc_pipe_.empty());
   DCHECK(!ipc_pipe.empty());
@@ -678,8 +710,8 @@ bool CrashpadClient::SetHandlerIPCPipe(const std::wstring& ipc_pipe) {
 
   DCHECK(!ipc_pipe_.empty());
   DCHECK_EQ(g_signal_exception, INVALID_HANDLE_VALUE);
-  DCHECK_EQ(g_signal_non_crash_dump, INVALID_HANDLE_VALUE);
-  DCHECK_EQ(g_non_crash_dump_done, INVALID_HANDLE_VALUE);
+  DCHECK_EQ(g_wer_registration.dump_without_crashing, INVALID_HANDLE_VALUE);
+  DCHECK_EQ(g_wer_registration.dump_completed, INVALID_HANDLE_VALUE);
   DCHECK(!g_critical_section_with_debug_info.DebugInfo);
   DCHECK(!g_non_crash_dump_lock);
 
@@ -711,9 +743,9 @@ bool CrashpadClient::SetHandlerIPCPipe(const std::wstring& ipc_pipe) {
   // The server returns these already duplicated to be valid in this process.
   g_signal_exception =
       IntToHandle(response.registration.request_crash_dump_event);
-  g_signal_non_crash_dump =
+  g_wer_registration.dump_without_crashing =
       IntToHandle(response.registration.request_non_crash_dump_event);
-  g_non_crash_dump_done =
+  g_wer_registration.dump_completed =
       IntToHandle(response.registration.non_crash_dump_completed_event);
 
   return true;
@@ -748,10 +780,29 @@ bool CrashpadClient::WaitForHandlerStart(unsigned int timeout_ms) {
   return exit_code == 0;
 }
 
+bool CrashpadClient::RegisterWerModule(const std::wstring& path) {
+  if (g_wer_registration.dump_completed == INVALID_HANDLE_VALUE ||
+      g_wer_registration.dump_without_crashing == INVALID_HANDLE_VALUE) {
+    LOG(ERROR) << "not connected";
+    return false;
+  }
+  // We cannot point (*context).exception_pointers to our pointers yet as it
+  // might get used for other non-crash dumps.
+  g_wer_registration.crashpad_exception_info =
+      &g_non_crash_exception_information;
+  // we can point these as we are the only users.
+  g_wer_registration.pointers.ExceptionRecord = &g_wer_registration.exception;
+  g_wer_registration.pointers.ContextRecord = &g_wer_registration.context;
+
+  HRESULT res =
+      WerRegisterRuntimeExceptionModule(path.c_str(), &g_wer_registration);
+  return res == S_OK;
+}
+
 // static
 void CrashpadClient::DumpWithoutCrash(const CONTEXT& context) {
-  if (g_signal_non_crash_dump == INVALID_HANDLE_VALUE ||
-      g_non_crash_dump_done == INVALID_HANDLE_VALUE) {
+  if (g_wer_registration.dump_without_crashing == INVALID_HANDLE_VALUE ||
+      g_wer_registration.dump_completed == INVALID_HANDLE_VALUE) {
     LOG(ERROR) << "not connected";
     return;
   }
@@ -759,7 +810,7 @@ void CrashpadClient::DumpWithoutCrash(const CONTEXT& context) {
   if (BlockUntilHandlerStartedOrFailed() == StartupState::kFailed) {
     // If we know for certain that the handler has failed to start, then abort
     // here, as we would otherwise wait indefinitely for the
-    // g_non_crash_dump_done event that would never be signalled.
+    // g_wer_registration.dump_completed event that would never be signalled.
     LOG(ERROR) << "crash server failed to launch, no dump captured";
     return;
   }
@@ -797,11 +848,14 @@ void CrashpadClient::DumpWithoutCrash(const CONTEXT& context) {
   g_non_crash_exception_information.exception_pointers =
       FromPointerCast<WinVMAddress>(&exception_pointers);
 
-  bool set_event_result = !!SetEvent(g_signal_non_crash_dump);
+  g_wer_registration.in_dump_without_crashing = true;
+  bool set_event_result = !!SetEvent(g_wer_registration.dump_without_crashing);
   PLOG_IF(ERROR, !set_event_result) << "SetEvent";
 
-  DWORD wfso_result = WaitForSingleObject(g_non_crash_dump_done, INFINITE);
+  DWORD wfso_result =
+      WaitForSingleObject(g_wer_registration.dump_completed, INFINITE);
   PLOG_IF(ERROR, wfso_result != WAIT_OBJECT_0) << "WaitForSingleObject";
+  g_wer_registration.in_dump_without_crashing = false;
 }
 
 // static
@@ -926,7 +980,7 @@ bool CrashpadClient::DumpAndCrashTargetProcess(HANDLE process,
 
     // ecx = kTriggeredExceptionCode for dwExceptionCode.
     data_to_write.push_back(0xb9);
-    AddUint32(&data_to_write, kTriggeredExceptionCode);
+    AddUint32(&data_to_write, ExceptionCodes::kTriggeredExceptionCode);
 
     // jmp to RaiseException() via rax.
     data_to_write.push_back(0x48);  // mov rax, imm.
diff --git a/extern/crashpad/crashpad/client/crashpad_client_win_test.cc b/extern/crashpad/crashpad/client/crashpad_client_win_test.cc
index f15887b9fa..901cf81fa5 100644
--- a/extern/crashpad/crashpad/client/crashpad_client_win_test.cc
+++ b/extern/crashpad/crashpad/client/crashpad_client_win_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/client/crashpad_info.cc b/extern/crashpad/crashpad/client/crashpad_info.cc
index 929c0df11f..78a40d8957 100644
--- a/extern/crashpad/crashpad/client/crashpad_info.cc
+++ b/extern/crashpad/crashpad/client/crashpad_info.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,10 +16,12 @@
 
 #include <type_traits>
 
+#include "base/numerics/safe_conversions.h"
+#include "build/build_config.h"
 #include "util/misc/address_sanitizer.h"
 #include "util/misc/from_pointer_cast.h"
 
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
 #include <mach-o/loader.h>
 #endif
 
@@ -32,6 +34,21 @@ namespace {
 // understand new versions.
 constexpr uint32_t kCrashpadInfoVersion = 1;
 
+// Creates a `UserDataMinidumpStreamListEntry` with the given fields, and
+// returns a pointer to it. The caller takes ownership of the returned object.
+crashpad::internal::UserDataMinidumpStreamListEntry* CreateListEntry(
+    uint64_t next,
+    uint32_t stream_type,
+    const void* data,
+    size_t size) {
+  auto to_be_added = new crashpad::internal::UserDataMinidumpStreamListEntry();
+  to_be_added->next = next;
+  to_be_added->stream_type = stream_type;
+  to_be_added->base_address = crashpad::FromPointerCast<uint64_t>(data);
+  to_be_added->size = base::checked_cast<uint64_t>(size);
+  return to_be_added;
+}
+
 }  // namespace
 
 namespace crashpad {
@@ -52,10 +69,10 @@ static_assert(std::is_standard_layout<CrashpadInfo>::value,
 // because it’s POD, no code should need to run to initialize this under
 // release-mode optimization.
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 __attribute__((
 
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
     // Put the structure in a well-known section name where it can be easily
     // found without having to consult the symbol table.
     section(SEG_DATA ",crashpad_info"),
@@ -77,16 +94,16 @@ __attribute__((
     // The “used” attribute prevents the structure from being dead-stripped.
     used))
 
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 
 // Put the struct in a section name CPADinfo where it can be found without the
 // symbol table.
 #pragma section("CPADinfo", read, write)
 __declspec(allocate("CPADinfo"))
 
-#else  // !defined(OS_POSIX) && !defined(OS_WIN)
+#else  // !BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_WIN)
 #error Port
-#endif  // !defined(OS_POSIX) && !defined(OS_WIN)
+#endif  // !BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_WIN)
 
 CrashpadInfo g_crashpad_info;
 
@@ -94,8 +111,8 @@ extern "C" int* CRASHPAD_NOTE_REFERENCE;
 
 // static
 CrashpadInfo* CrashpadInfo::GetCrashpadInfo() {
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \
-    defined(OS_FUCHSIA)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
+    BUILDFLAG(IS_FUCHSIA)
   // This otherwise-unused reference is used so that any module that
   // references GetCrashpadInfo() will also include the note in the
   // .note.crashpad.info section. That note in turn contains the address of
@@ -120,18 +137,58 @@ CrashpadInfo::CrashpadInfo()
       extra_memory_ranges_(nullptr),
       simple_annotations_(nullptr),
       user_data_minidump_stream_head_(nullptr),
-      annotations_list_(nullptr) {}
-
-void CrashpadInfo::AddUserDataMinidumpStream(uint32_t stream_type,
-                                             const void* data,
-                                             size_t size) {
-  auto to_be_added = new internal::UserDataMinidumpStreamListEntry();
-  to_be_added->next =
-      FromPointerCast<uint64_t>(user_data_minidump_stream_head_);
-  to_be_added->stream_type = stream_type;
-  to_be_added->base_address = FromPointerCast<uint64_t>(data);
-  to_be_added->size = base::checked_cast<uint64_t>(size);
-  user_data_minidump_stream_head_ = to_be_added;
+      annotations_list_(nullptr)
+#if BUILDFLAG(IS_IOS)
+      ,
+      intermediate_dump_extra_memory_ranges_(nullptr)
+#endif
+{
+}
+
+UserDataMinidumpStreamHandle* CrashpadInfo::AddUserDataMinidumpStream(
+    uint32_t stream_type,
+    const void* data,
+    size_t size) {
+  user_data_minidump_stream_head_ = CreateListEntry(
+      crashpad::FromPointerCast<uint64_t>(user_data_minidump_stream_head_),
+      stream_type,
+      data,
+      size);
+  return user_data_minidump_stream_head_;
+}
+
+UserDataMinidumpStreamHandle* CrashpadInfo::UpdateUserDataMinidumpStream(
+    UserDataMinidumpStreamHandle* stream_to_update,
+    uint32_t stream_type,
+    const void* data,
+    size_t size) {
+  // Create a new stream that points to the node `stream_to_update` points to.
+  const auto new_stream =
+      CreateListEntry(stream_to_update->next, stream_type, data, size);
+
+  // If `stream_to_update` is head of the list, replace the head with
+  // `new_stream`.
+  if (stream_to_update == user_data_minidump_stream_head_) {
+    user_data_minidump_stream_head_ = new_stream;
+  } else {
+    // Otherwise, find the node before `stream_to_update`, and make it point to
+    // `new_stream` instead.
+    auto current = user_data_minidump_stream_head_;
+    while (current) {
+      auto next = reinterpret_cast<internal::UserDataMinidumpStreamListEntry*>(
+          current->next);
+      if (next == stream_to_update) {
+        current->next = FromPointerCast<uint64_t>(new_stream);
+        break;
+      }
+      current = next;
+    }
+    CHECK(current)
+        << "Tried to update a UserDataMinidumpStream that doesn't exist";
+  }
+
+  delete stream_to_update;
+  return new_stream;
 }
 
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/client/crashpad_info.h b/extern/crashpad/crashpad/client/crashpad_info.h
index cc05398e3f..b777a81f05 100644
--- a/extern/crashpad/crashpad/client/crashpad_info.h
+++ b/extern/crashpad/crashpad/client/crashpad_info.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -23,15 +23,15 @@
 #include "client/simple_string_dictionary.h"
 #include "util/misc/tri_state.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include <windows.h>
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
 
 namespace crashpad {
 
 namespace internal {
 
-#if defined(OS_IOS)
+#if BUILDFLAG(IS_IOS)
 class InProcessIntermediateDumpHandler;
 #endif
 
@@ -56,6 +56,8 @@ struct UserDataMinidumpStreamListEntry {
 
 }  // namespace internal
 
+using UserDataMinidumpStreamHandle = internal::UserDataMinidumpStreamListEntry;
+
 //! \brief A structure that can be used by a Crashpad-enabled program to
 //!     provide information to the Crashpad crash handler.
 //!
@@ -79,16 +81,54 @@ struct CrashpadInfo {
   //! this method is called, or they may be added, removed, or modified in \a
   //! address_range_bag after this method is called.
   //!
-  //! TODO(scottmg) This is currently only supported on Windows.
+  //! TODO(scottmg) This is currently only supported on Windows and iOS.
   //!
   //! \param[in] address_range_bag A bag of address ranges. The CrashpadInfo
   //!     object does not take ownership of the SimpleAddressRangeBag object.
   //!     It is the caller’s responsibility to ensure that this pointer remains
   //!     valid while it is in effect for a CrashpadInfo object.
+  //!
+  //! \sa extra_memory_ranges()
   void set_extra_memory_ranges(SimpleAddressRangeBag* address_range_bag) {
     extra_memory_ranges_ = address_range_bag;
   }
 
+  //! \return The simple extra memory ranges SimpleAddressRangeBag object.
+  //!
+  //! \sa set_extra_memory_ranges()
+  SimpleAddressRangeBag* extra_memory_ranges() const {
+    return extra_memory_ranges_;
+  }
+
+#if BUILDFLAG(IS_IOS)
+  //! \brief Sets the bag of extra memory ranges to be included in the iOS
+  //! intermediate dump. This memory is not included in the minidump.
+  //!
+  //! Extra memory ranges may exist in \a address_range_bag at the time that
+  //! this method is called, or they may be added, removed, or modified in \a
+  //! address_range_bag after this method is called.
+  //!
+  //! This is only supported on iOS.
+  //!
+  //! \param[in] address_range_bag A bag of address ranges. The CrashpadInfo
+  //!     object does not take ownership of the SimpleAddressRangeBag object.
+  //!     It is the caller’s responsibility to ensure that this pointer remains
+  //!     valid while it is in effect for a CrashpadInfo object.
+  //!
+  //! \sa extra_memory_ranges()
+  void set_intermediate_dump_extra_memory_ranges(
+      SimpleAddressRangeBag* address_range_bag) {
+    intermediate_dump_extra_memory_ranges_ = address_range_bag;
+  }
+
+  //! \return The simple extra memory ranges SimpleAddressRangeBag object.
+  //!
+  //! \sa set_extra_memory_ranges()
+  SimpleAddressRangeBag* intermediate_dump_extra_memory_ranges() const {
+    return intermediate_dump_extra_memory_ranges_;
+  }
+#endif
+
   //! \brief Sets the simple annotations dictionary.
   //!
   //! Simple annotations set on a CrashpadInfo structure are interpreted by
@@ -221,16 +261,48 @@ struct CrashpadInfo {
   //!     which is `0xffff`.
   //! \param[in] data The base pointer of the stream data.
   //! \param[in] size The size of the stream data.
-  void AddUserDataMinidumpStream(uint32_t stream_type,
-                                 const void* data,
-                                 size_t size);
+  //! \return A handle to the added stream, for use in calling
+  //!     UpdateUserDataMinidumpStream() if needed.
+  UserDataMinidumpStreamHandle* AddUserDataMinidumpStream(uint32_t stream_type,
+                                                          const void* data,
+                                                          size_t size);
+
+  //! \brief Replaces the given stream with an updated stream.
+  //!
+  //! Creates a new memory block referencing the given \a data and \a size with
+  //! type \a stream_type. The memory referred to be \a data and \a size is
+  //! owned by the caller and must remain valid while it is in effect for the
+  //! CrashpadInfo object.
+  //!
+  //! Frees \a stream_to_update and returns a new handle to the updated stream.
+  //!
+  //! \param[in] stream_to_update A handle to the stream to be updated, received
+  //!     from either AddUserDataMinidumpStream() or previous calls to this
+  //!     function.
+  //! \param[in] stream_type The stream type identifier to use. This should be
+  //!     normally be larger than `MINIDUMP_STREAM_TYPE::LastReservedStream`
+  //!     which is `0xffff`.
+  //! \param[in] data The base pointer of the stream data.
+  //! \param[in] size The size of the stream data.
+  //! \return A handle to the new memory block that references the updated data,
+  //!     for use in calling this method again if needed.
+  UserDataMinidumpStreamHandle* UpdateUserDataMinidumpStream(
+      UserDataMinidumpStreamHandle* stream_to_update,
+      uint32_t stream_type,
+      const void* data,
+      size_t size);
+
+  internal::UserDataMinidumpStreamListEntry*
+  GetUserDataMinidumpStreamHeadForTesting() {
+    return user_data_minidump_stream_head_;
+  }
 
   enum : uint32_t {
     kSignature = 'CPad',
   };
 
  protected:
-#if defined(OS_IOS)
+#if BUILDFLAG(IS_IOS)
   friend class internal::InProcessIntermediateDumpHandler;
 #endif
 
@@ -262,6 +334,9 @@ struct CrashpadInfo {
   SimpleStringDictionary* simple_annotations_;  // weak
   internal::UserDataMinidumpStreamListEntry* user_data_minidump_stream_head_;
   AnnotationList* annotations_list_;  // weak
+#if BUILDFLAG(IS_IOS)
+  SimpleAddressRangeBag* intermediate_dump_extra_memory_ranges_;  // weak
+#endif
 
   // It’s generally safe to add new fields without changing
   // kCrashpadInfoVersion, because readers should check size_ and ignore fields
diff --git a/extern/crashpad/crashpad/client/crashpad_info_note.S b/extern/crashpad/crashpad/client/crashpad_info_note.S
index b13d8642e7..2dbf938d9e 100644
--- a/extern/crashpad/crashpad/client/crashpad_info_note.S
+++ b/extern/crashpad/crashpad/client/crashpad_info_note.S
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 // that symbol to be in the dynamic symbol table.
 
 #include "util/misc/elf_note_types.h"
+#include "util/misc/arm64_pac_bti.S"
 
 // namespace crashpad {
 // CrashpadInfo g_crashpad_info;
diff --git a/extern/crashpad/crashpad/client/crashpad_info_test.cc b/extern/crashpad/crashpad/client/crashpad_info_test.cc
new file mode 100644
index 0000000000..8ea7f8a155
--- /dev/null
+++ b/extern/crashpad/crashpad/client/crashpad_info_test.cc
@@ -0,0 +1,142 @@
+// Copyright 2024 The Crashpad Authors
+//
+// 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.
+
+#include "client/crashpad_info.h"
+
+#include <string>
+
+#include "gtest/gtest.h"
+
+namespace crashpad {
+namespace test {
+namespace {
+
+constexpr uint32_t kTestStreamType = 0x33333;
+
+class CrashpadInfoTest : public testing::Test {
+ protected:
+  CrashpadInfo& crashpad_info() { return crashpad_info_; }
+
+  // Returns the current head of the list of streams in `crashpad_info_`. Note
+  // that the returned pointer is invalidated if a stream is added or updated.
+  internal::UserDataMinidumpStreamListEntry* GetCurrentHead() {
+    return crashpad_info().GetUserDataMinidumpStreamHeadForTesting();
+  }
+
+  // Returns a pointer to the next node in the list after the given `node`.
+  internal::UserDataMinidumpStreamListEntry* GetNext(
+      internal::UserDataMinidumpStreamListEntry* node) {
+    return reinterpret_cast<internal::UserDataMinidumpStreamListEntry*>(
+        node->next);
+  }
+
+  internal::UserDataMinidumpStreamListEntry* initial_head() {
+    return initial_head_;
+  }
+
+  internal::UserDataMinidumpStreamListEntry* initial_tail() {
+    return initial_tail_;
+  }
+
+ private:
+  void SetUp() override {
+    ASSERT_EQ(nullptr, GetCurrentHead());
+
+    // Create a simple test list with the structure
+    // `initial_head_` -> `initial_tail_`.
+    initial_tail_ = AddStream(0x11111, kInitialTailData);
+    initial_head_ = AddStream(0x22222, kInitialHeadData);
+
+    // Validate the list's contents.
+    auto current = GetCurrentHead();
+    ASSERT_EQ(initial_head_, current);
+    ASSERT_EQ(kInitialHeadData, reinterpret_cast<char*>(current->base_address));
+    current = GetNext(current);
+    ASSERT_EQ(initial_tail_, current);
+    ASSERT_EQ(nullptr, GetNext(current));
+  }
+
+  void TearDown() override {
+    // Free the list. The list lives until process exit in production, but must
+    // be freed in tests as multiple tests run in the same process.
+    auto current = GetCurrentHead();
+    while (current) {
+      auto next = GetNext(current);
+      delete current;
+      current = next;
+    }
+  }
+
+  internal::UserDataMinidumpStreamListEntry* AddStream(uint32_t stream_type,
+                                                       const char* data) {
+    return reinterpret_cast<internal::UserDataMinidumpStreamListEntry*>(
+        crashpad_info().AddUserDataMinidumpStream(
+            stream_type, data, strlen(data)));
+  }
+
+  CrashpadInfo crashpad_info_;
+
+  static constexpr char kInitialHeadData[] = "head";
+  static constexpr char kInitialTailData[] = "tail";
+
+  internal::UserDataMinidumpStreamListEntry* initial_head_ = nullptr;
+  internal::UserDataMinidumpStreamListEntry* initial_tail_ = nullptr;
+};
+
+// Tests that updating the head of the list updates the head pointer, the new
+// head contains the updated data, and the updated node points to the next node.
+TEST_F(CrashpadInfoTest, UpdateUserDataMinidumpStreamHead) {
+  const std::string new_data = "this is a new string";
+  const auto new_entry = crashpad_info().UpdateUserDataMinidumpStream(
+      initial_head(), kTestStreamType, new_data.data(), new_data.size());
+  const auto head = GetCurrentHead();
+  EXPECT_EQ(new_entry, head);
+  EXPECT_EQ(new_data.data(), reinterpret_cast<char*>(head->base_address));
+  EXPECT_EQ(new_data.size(), head->size);
+  EXPECT_EQ(kTestStreamType, head->stream_type);
+  EXPECT_EQ(initial_tail(), GetNext(head));
+}
+
+// Tests that updating the tail of the list results in a tail pointing to
+// nullptr, and that the node before the updated node points to it.
+TEST_F(CrashpadInfoTest, UpdateUserDataMinidumpStreamTail) {
+  const std::string new_data = "new";
+  const auto new_entry = crashpad_info().UpdateUserDataMinidumpStream(
+      initial_tail(), kTestStreamType, new_data.data(), new_data.size());
+  const auto tail = GetNext(GetCurrentHead());
+  EXPECT_EQ(new_entry, tail);
+  EXPECT_EQ(nullptr, GetNext(tail));
+}
+
+// Tests that the handle returned from updating an entry is usable for updating
+// the entry again.
+TEST_F(CrashpadInfoTest, UpdateUserDataMinidumpStreamMultipleTimes) {
+  // Update the entry at the head; the updated entry should become the new head.
+  const std::string new_data = "new";
+  const auto new_entry_1 = crashpad_info().UpdateUserDataMinidumpStream(
+      initial_head(), kTestStreamType, new_data.data(), new_data.size());
+  EXPECT_EQ(new_entry_1, GetCurrentHead());
+
+  // Update the updated entry again; another new entry should replace it as
+  // head.
+  const auto new_entry_2 = crashpad_info().UpdateUserDataMinidumpStream(
+      new_entry_1, kTestStreamType, new_data.data(), new_data.size());
+  EXPECT_NE(new_entry_1, new_entry_2);
+  EXPECT_EQ(new_entry_2, GetCurrentHead());
+  EXPECT_EQ(initial_tail(), GetNext(GetCurrentHead()));
+}
+
+}  // namespace
+}  // namespace test
+}  // namespace crashpad
diff --git a/extern/crashpad/crashpad/client/ios_handler/exception_processor.h b/extern/crashpad/crashpad/client/ios_handler/exception_processor.h
index 7318e21446..259e99b78a 100644
--- a/extern/crashpad/crashpad/client/ios_handler/exception_processor.h
+++ b/extern/crashpad/crashpad/client/ios_handler/exception_processor.h
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,8 +15,7 @@
 #ifndef CRASHPAD_UTIL_IOS_EXCEPTION_PROCESSOR_H_
 #define CRASHPAD_UTIL_IOS_EXCEPTION_PROCESSOR_H_
 
-#include <vector>
-
+#include "base/files/file_path.h"
 #include "util/misc/capture_context.h"
 
 namespace crashpad {
@@ -40,6 +39,28 @@ class ObjcExceptionDelegate {
   virtual void HandleUncaughtNSException(const uint64_t* frames,
                                          const size_t num_frames) = 0;
 
+  //! \brief Generate an intermediate dump from an NSException caught with its
+  //!     associated CPU context. Because the method for intercepting
+  //!     exceptions is imperfect, write the the intermediate dump to a
+  //!     temporary location specified by \a path. If the NSException matches
+  //!     the one used in the UncaughtExceptionHandler, call
+  //!     MoveIntermediateDumpAtPathToPending to move to the proper Crashpad
+  //!     database pending location.
+  //!
+  //! \param[in] context The cpu context of the thread throwing an exception.
+  //! \param[in] path Path to write the intermediate dump.
+  virtual void HandleUncaughtNSExceptionWithContextAtPath(
+      NativeCPUContext* context,
+      const base::FilePath& path) = 0;
+
+  //! \brief Moves an intermediate dump to the pending directory. This is meant
+  //!     to be used by the UncaughtExceptionHandler, when the NSException
+  //!     caught by the preprocessor matches the UncaughtExceptionHandler.
+  //!
+  //! \param[in] path Path to the specific intermediate dump.
+  virtual bool MoveIntermediateDumpAtPathToPending(
+      const base::FilePath& path) = 0;
+
  protected:
   ~ObjcExceptionDelegate() {}
 };
@@ -59,6 +80,10 @@ class ObjcExceptionDelegate {
 //! signal handler. It should only be installed once.
 void InstallObjcExceptionPreprocessor(ObjcExceptionDelegate* delegate);
 
+//! \brief Uninstalls the Objective-C exception preprocessor. Expected to be
+//!     used by tests only.
+void UninstallObjcExceptionPreprocessor();
+
 }  // namespace crashpad
 
 #endif  // CRASHPAD_UTIL_IOS_EXCEPTION_PROCESSOR_H_
diff --git a/extern/crashpad/crashpad/client/ios_handler/exception_processor.mm b/extern/crashpad/crashpad/client/ios_handler/exception_processor.mm
index d8c94e5430..5ed0eb2661 100644
--- a/extern/crashpad/crashpad/client/ios_handler/exception_processor.mm
+++ b/extern/crashpad/crashpad/client/ios_handler/exception_processor.mm
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,6 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// std::unexpected_handler is deprecated starting in C++11, and removed in
+// C++17.  But macOS versions we run on still ship it. This define makes
+// std::unexpected_handler reappear. If that define ever stops working,
+// we hopefully no longer run on macOS versions that still have it.
+// (...or we'll have to define it in this file instead of getting it from
+// <exception>). This define must before all includes.
+#define _LIBCPP_ENABLE_CXX17_REMOVED_UNEXPECTED_FUNCTIONS
+
 #include "client/ios_handler/exception_processor.h"
 
 #include <Availability.h>
@@ -30,11 +38,12 @@
 #include <sys/types.h>
 #include <unwind.h>
 
+#include <atomic>
 #include <exception>
 #include <type_traits>
 #include <typeinfo>
+#include <vector>
 
-#include "base/bit_cast.h"
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/memory/free_deleter.h"
@@ -43,7 +52,8 @@
 #include "base/strings/sys_string_conversions.h"
 #include "build/build_config.h"
 #include "client/annotation.h"
-#include "client/simulate_crash_ios.h"
+
+namespace crashpad {
 
 namespace {
 
@@ -54,7 +64,7 @@
   Class cls_unremapped;
 };
 struct objc_exception {
-  id obj;
+  id __unsafe_unretained obj;
   objc_typeinfo tinfo;
 };
 
@@ -124,42 +134,157 @@ int LoggingUnwStep(unw_cursor_t* cursor) {
   return FormatStackTrace(addresses, 1024);
 }
 
-crashpad::ObjcExceptionDelegate* g_exception_delegate;
-objc_exception_preprocessor g_next_preprocessor;
-NSUncaughtExceptionHandler* g_next_uncaught_exception_handler;
-
-static void SetNSExceptionAnnotations(id exception,
+static void SetNSExceptionAnnotations(NSException* exception,
                                       std::string& name,
                                       std::string& reason) {
-  name = base::SysNSStringToUTF8([exception name]);
-  reason = base::SysNSStringToUTF8([exception reason]);
-  static crashpad::StringAnnotation<256> nameKey("exceptionName");
-  nameKey.Set(name);
-  static crashpad::StringAnnotation<512> reasonKey("exceptionReason");
-  reasonKey.Set(reason);
+  @try {
+    name = base::SysNSStringToUTF8(exception.name);
+    static StringAnnotation<256> nameKey("exceptionName");
+    nameKey.Set(name);
+  } @catch (id name_exception) {
+    LOG(ERROR) << "Unable to read uncaught Objective-C exception name.";
+  }
+
+  @try {
+    reason = base::SysNSStringToUTF8(exception.reason);
+    static StringAnnotation<1024> reasonKey("exceptionReason");
+    reasonKey.Set(reason);
+  } @catch (id reason_exception) {
+    LOG(ERROR) << "Unable to read uncaught Objective-C exception reason.";
+  }
+
+  @try {
+    if (exception.userInfo) {
+      static StringAnnotation<1024> userInfoKey("exceptionUserInfo");
+      userInfoKey.Set(base::SysNSStringToUTF8(
+          [NSString stringWithFormat:@"%@", exception.userInfo]));
+    }
+  } @catch (id user_info_exception) {
+    LOG(ERROR) << "Unable to read uncaught Objective-C exception user info.";
+  }
 }
 
-static void ObjcUncaughtExceptionHandler(NSException* exception) {
-  std::string name, reason;
-  SetNSExceptionAnnotations(exception, name, reason);
-  NSArray<NSNumber*>* addressArray = [exception callStackReturnAddresses];
-  if ([addressArray count] > 0) {
-    static crashpad::StringAnnotation<256> nameKey("UncaughtNSException");
-    nameKey.Set("true");
-    std::vector<uint64_t> addresses;
-    NSArray<NSNumber*>* addressArray = [exception callStackReturnAddresses];
-    for (NSNumber* address in addressArray)
-      addresses.push_back([address unsignedLongLongValue]);
-    g_exception_delegate->HandleUncaughtNSException(&addresses[0],
-                                                    addresses.size());
-  } else {
-    LOG(WARNING) << "Uncaught Objective-C exception name: " << name
-                 << " reason: " << reason << " with no "
-                 << " -callStackReturnAddresses.";
-    crashpad::NativeCPUContext cpu_context;
-    crashpad::CaptureContext(&cpu_context);
-    g_exception_delegate->HandleUncaughtNSExceptionWithContext(&cpu_context);
+//! \brief Helper class to own the complex types used by the Objective-C
+//!     exception preprocessor.
+class ExceptionPreprocessorState {
+ public:
+  ExceptionPreprocessorState(const ExceptionPreprocessorState&) = delete;
+  ExceptionPreprocessorState& operator=(const ExceptionPreprocessorState&) =
+      delete;
+
+  static ExceptionPreprocessorState* Get() {
+    static ExceptionPreprocessorState* instance = []() {
+      return new ExceptionPreprocessorState();
+    }();
+    return instance;
+  }
+
+  // Writes an intermediate dumps to a temporary location to be used by the
+  // final UncaughtExceptionHandler and notifies the preprocessor chain.
+  id HandleUncaughtException(NativeCPUContext* cpu_context, id exception) {
+    // If this isn't the first time the preprocessor has detected an uncaught
+    // NSException, note this in the second intermediate dump.
+    objc_exception_preprocessor next_preprocessor = next_preprocessor_;
+    static bool handled_first_exception;
+    if (handled_first_exception) {
+      static StringAnnotation<5> name_key("MultipleHandledUncaughtNSException");
+      name_key.Set("true");
+
+      // Unregister so we stop getting in the way of the exception processor if
+      // we aren't correctly identifying sinkholes. The final uncaught exception
+      // handler is still active.
+      objc_setExceptionPreprocessor(next_preprocessor_);
+      next_preprocessor_ = nullptr;
+    }
+    handled_first_exception = true;
+
+    // Use tmp/ for this intermediate dump path. Normally these dumps are
+    // written to the "pending-serialized-ios-dump" folder and are eligable for
+    // the next pass to convert pending intermediate dumps to minidump files.
+    // Since this intermediate dump isn't eligable until the uncaught handler,
+    // use tmp/.
+    base::FilePath path(base::SysNSStringToUTF8([NSTemporaryDirectory()
+        stringByAppendingPathComponent:[[NSUUID UUID] UUIDString]]));
+    exception_delegate_->HandleUncaughtNSExceptionWithContextAtPath(cpu_context,
+                                                                    path);
+    last_handled_intermediate_dump_ = path;
+
+    return next_preprocessor ? next_preprocessor(exception) : exception;
   }
+
+  // If the PreprocessException already captured this exception via
+  // HANDLE_UNCAUGHT_NSEXCEPTION. Move last_handled_intermediate_dump_ to
+  // the pending intermediate dump directory and return true. Otherwise the
+  // preprocessor didn't catch anything, so pass the frames or just the context
+  // to the exception_delegate.
+  void FinalizeUncaughtNSException(id exception) {
+    if (last_exception() == (__bridge void*)exception &&
+        !last_handled_intermediate_dump_.empty() &&
+        exception_delegate_->MoveIntermediateDumpAtPathToPending(
+            last_handled_intermediate_dump_)) {
+      last_handled_intermediate_dump_ = base::FilePath();
+      return;
+    }
+
+    std::string name, reason;
+    NSArray<NSNumber*>* address_array = nil;
+    if ([exception isKindOfClass:[NSException class]]) {
+      SetNSExceptionAnnotations(exception, name, reason);
+      address_array = [exception callStackReturnAddresses];
+    }
+
+    if ([address_array count] > 0) {
+      static StringAnnotation<256> name_key("UncaughtNSException");
+      name_key.Set("true");
+      std::vector<uint64_t> addresses;
+      for (NSNumber* address in address_array)
+        addresses.push_back([address unsignedLongLongValue]);
+      exception_delegate_->HandleUncaughtNSException(&addresses[0],
+                                                     addresses.size());
+    } else {
+      LOG(WARNING) << "Uncaught Objective-C exception name: " << name
+                   << " reason: " << reason << " with no "
+                   << " -callStackReturnAddresses.";
+      NativeCPUContext cpu_context;
+      CaptureContext(&cpu_context);
+      exception_delegate_->HandleUncaughtNSExceptionWithContext(&cpu_context);
+    }
+  }
+
+  id MaybeCallNextPreprocessor(id exception) {
+    return next_preprocessor_ ? next_preprocessor_(exception) : exception;
+  }
+
+  // Register the objc_setExceptionPreprocessor and NSUncaughtExceptionHandler.
+  void Install(ObjcExceptionDelegate* delegate);
+
+  // Restore the objc_setExceptionPreprocessor and NSUncaughtExceptionHandler.
+  void Uninstall();
+
+  void* last_exception() { return last_exception_; }
+  void set_last_exception(void* exception) { last_exception_ = exception; }
+
+ private:
+  ExceptionPreprocessorState() = default;
+  ~ExceptionPreprocessorState() = default;
+
+  // Location of the intermediate dump generated after an exception triggered
+  // HANDLE_UNCAUGHT_NSEXCEPTION.
+  base::FilePath last_handled_intermediate_dump_;
+
+  // Recorded last NSException pointer in case the exception is caught and
+  // thrown again (without using objc_exception_rethrow) as an
+  // unsafe_unretained reference. Stored as a void* as the only safe
+  // operation is pointer comparison.
+  std::atomic<void*> last_exception_ = nil;
+
+  ObjcExceptionDelegate* exception_delegate_ = nullptr;
+  objc_exception_preprocessor next_preprocessor_ = nullptr;
+  NSUncaughtExceptionHandler* next_uncaught_exception_handler_ = nullptr;
+};
+
+static void ObjcUncaughtExceptionHandler(NSException* exception) {
+  ExceptionPreprocessorState::Get()->FinalizeUncaughtNSException(exception);
 }
 
 // This function is used to make it clear to the crash processor that an
@@ -168,18 +293,17 @@ static __attribute__((noinline)) id HANDLE_UNCAUGHT_NSEXCEPTION(
     id exception,
     const char* sinkhole) {
   std::string name, reason;
-  SetNSExceptionAnnotations(exception, name, reason);
+  if ([exception isKindOfClass:[NSException class]]) {
+    SetNSExceptionAnnotations(exception, name, reason);
+  }
   LOG(WARNING) << "Handling Objective-C exception name: " << name
                << " reason: " << reason << " with sinkhole: " << sinkhole;
-  crashpad::NativeCPUContext cpu_context;
-  crashpad::CaptureContext(&cpu_context);
-  g_exception_delegate->HandleUncaughtNSExceptionWithContext(&cpu_context);
+  NativeCPUContext cpu_context{};
+  CaptureContext(&cpu_context);
 
-  // Remove the uncaught exception handler so we don't record this twice.
-  NSSetUncaughtExceptionHandler(g_next_uncaught_exception_handler);
-  g_next_uncaught_exception_handler = nullptr;
-
-  return g_next_preprocessor ? g_next_preprocessor(exception) : exception;
+  ExceptionPreprocessorState* preprocessor_state =
+      ExceptionPreprocessorState::Get();
+  return preprocessor_state->HandleUncaughtException(&cpu_context, exception);
 }
 
 // Returns true if |path| equals |sinkhole| on device. Simulator paths prepend
@@ -199,19 +323,48 @@ bool ModulePathMatchesSinkhole(const char* path, const char* sinkhole) {
 #endif
 }
 
+//! \brief Helper to release memory from calls to __cxa_allocate_exception.
+class ScopedException {
+ public:
+  explicit ScopedException(objc_exception* exception) : exception_(exception) {}
+
+  ScopedException(const ScopedException&) = delete;
+  ScopedException& operator=(const ScopedException&) = delete;
+
+  ~ScopedException() { __cxxabiv1::__cxa_free_exception(exception_); }
+
+ private:
+  objc_exception* exception_;  // weak
+};
+
 id ObjcExceptionPreprocessor(id exception) {
+  // Some sinkholes don't use objc_exception_rethrow when they should, which
+  // would otherwise prevent the exception_preprocessor from getting called
+  // again. Because of this, track the most recently seen exception and
+  // ignore it.
+  ExceptionPreprocessorState* preprocessor_state =
+      ExceptionPreprocessorState::Get();
+  if (preprocessor_state->last_exception() == (__bridge void*)exception) {
+    return preprocessor_state->MaybeCallNextPreprocessor(exception);
+  }
+  preprocessor_state->set_last_exception((__bridge void*)exception);
+
   static bool seen_first_exception;
 
-  static crashpad::StringAnnotation<256> firstexception("firstexception");
-  static crashpad::StringAnnotation<256> lastexception("lastexception");
-  static crashpad::StringAnnotation<1024> firstexception_bt(
-      "firstexception_bt");
-  static crashpad::StringAnnotation<1024> lastexception_bt("lastexception_bt");
+  static StringAnnotation<256> firstexception("firstexception");
+  static StringAnnotation<256> lastexception("lastexception");
+  static StringAnnotation<1024> firstexception_bt("firstexception_bt");
+  static StringAnnotation<1024> lastexception_bt("lastexception_bt");
   auto* key = seen_first_exception ? &lastexception : &firstexception;
   auto* bt_key = seen_first_exception ? &lastexception_bt : &firstexception_bt;
-  NSString* value = [NSString
-      stringWithFormat:@"%@ reason %@", [exception name], [exception reason]];
-  key->Set(base::SysNSStringToUTF8(value));
+
+  if ([exception isKindOfClass:[NSException class]]) {
+    NSString* value = [NSString
+        stringWithFormat:@"%@ reason %@", [exception name], [exception reason]];
+    key->Set(base::SysNSStringToUTF8(value));
+  } else {
+    key->Set(base::SysNSStringToUTF8([exception description]));
+  }
 
   // This exception preprocessor runs prior to the one in libobjc, which sets
   // the -[NSException callStackReturnAddresses].
@@ -244,6 +397,7 @@ id ObjcExceptionPreprocessor(id exception) {
   // From 10.15.0 objc4-779.1/runtime/objc-exception.mm objc_exception_throw.
   objc_exception* exception_objc = reinterpret_cast<objc_exception*>(
       __cxxabiv1::__cxa_allocate_exception(sizeof(objc_exception)));
+  ScopedException exception_objc_owner(exception_objc);
   exception_objc->obj = exception;
   exception_objc->tinfo.vtable = objc_ehtype_vtable + 2;
   exception_objc->tinfo.name = object_getClassName(exception);
@@ -359,6 +513,24 @@ id ObjcExceptionPreprocessor(id exception) {
           return HANDLE_UNCAUGHT_NSEXCEPTION(exception, sinkhole);
         }
       }
+
+      // Another set of iOS redacted sinkholes appear in CoreAutoLayout.
+      // However, this is often called by client code, so it's unsafe to simply
+      // handle an uncaught nsexception here. Instead, skip the frame and
+      // continue searching for either a handler that belongs to us, or another
+      // sinkhole. See:
+      //    -[NSISEngine
+      //    performModifications:withUnsatisfiableConstraintsHandler:]:
+      //    -[NSISEngine withBehaviors:performModifications:]
+      //    +[NSLayoutConstraintParser
+      //    constraintsWithVisualFormat:options:metrics:views:]:
+      static constexpr const char* kCoreAutoLayoutSinkhole =
+          "/System/Library/PrivateFrameworks/CoreAutoLayout.framework/"
+          "CoreAutoLayout";
+      if (ModulePathMatchesSinkhole(dl_info.dli_fname,
+                                    kCoreAutoLayoutSinkhole)) {
+        continue;
+      }
     }
 
     // Some <redacted> sinkholes are harder to find. _UIGestureEnvironmentUpdate
@@ -367,20 +539,22 @@ id ObjcExceptionPreprocessor(id exception) {
     // internally and also has has non-sinkhole handlers. While all the
     // calling methods in UIKit are marked <redacted> starting in iOS14, it's
     // currently true that all callers to _UIGestureEnvironmentUpdate are within
-    // UIGestureEnvironment.  That means a very hacky way to detect this are to
-    // check if the calling method IMP is within the range of all
-    // UIGestureEnvironment methods.
+    // UIWindow sendEvent -> UIGestureEnvironment.  That means a very hacky way
+    // to detect this is to check if the calling (2x) method IMP is within the
+    // range of all UIWindow methods.
     static constexpr const char kUIKitCorePath[] =
         "/System/Library/PrivateFrameworks/UIKitCore.framework/UIKitCore";
     if (ModulePathMatchesSinkhole(dl_info.dli_fname, kUIKitCorePath)) {
       unw_proc_info_t caller_frame_info;
       if (LoggingUnwStep(&cursor) > 0 &&
+          unw_get_proc_info(&cursor, &caller_frame_info) == UNW_ESUCCESS &&
+          LoggingUnwStep(&cursor) > 0 &&
           unw_get_proc_info(&cursor, &caller_frame_info) == UNW_ESUCCESS) {
-        auto uigestureimp_lambda = [](IMP* max) {
-          IMP min = *max = bit_cast<IMP>(nullptr);
+        auto uiwindowimp_lambda = [](IMP* max) {
+          IMP min = *max = nullptr;
           unsigned int method_count = 0;
           std::unique_ptr<Method[], base::FreeDeleter> method_list(
-              class_copyMethodList(NSClassFromString(@"UIGestureEnvironment"),
+              class_copyMethodList(NSClassFromString(@"UIWindow"),
                                    &method_count));
           if (method_count > 0) {
             min = *max = method_getImplementation(method_list[0]);
@@ -395,15 +569,14 @@ id ObjcExceptionPreprocessor(id exception) {
           return min;
         };
 
-        static IMP gesture_environment_max_imp;
-        static IMP gesture_environment_min_imp =
-            uigestureimp_lambda(&gesture_environment_max_imp);
+        static IMP uiwindow_max_imp;
+        static IMP uiwindow_min_imp = uiwindowimp_lambda(&uiwindow_max_imp);
 
-        if (gesture_environment_min_imp && gesture_environment_max_imp &&
+        if (uiwindow_min_imp && uiwindow_max_imp &&
             caller_frame_info.start_ip >=
-                reinterpret_cast<unw_word_t>(gesture_environment_min_imp) &&
+                reinterpret_cast<unw_word_t>(uiwindow_min_imp) &&
             caller_frame_info.start_ip <=
-                reinterpret_cast<unw_word_t>(gesture_environment_max_imp)) {
+                reinterpret_cast<unw_word_t>(uiwindow_max_imp)) {
           return HANDLE_UNCAUGHT_NSEXCEPTION(exception,
                                              "_UIGestureEnvironmentUpdate");
         }
@@ -425,36 +598,41 @@ id ObjcExceptionPreprocessor(id exception) {
   }
 
   // Forward to the next preprocessor.
-  return g_next_preprocessor ? g_next_preprocessor(exception) : exception;
+  return preprocessor_state->MaybeCallNextPreprocessor(exception);
 }
 
-}  // namespace
-
-namespace crashpad {
-
-void InstallObjcExceptionPreprocessor(ObjcExceptionDelegate* delegate) {
-  DCHECK(!g_next_preprocessor);
+void ExceptionPreprocessorState::Install(ObjcExceptionDelegate* delegate) {
+  DCHECK(!next_preprocessor_);
+  exception_delegate_ = delegate;
 
   // Preprocessor.
-  g_next_preprocessor =
+  next_preprocessor_ =
       objc_setExceptionPreprocessor(&ObjcExceptionPreprocessor);
 
   // Uncaught processor.
-  g_exception_delegate = delegate;
-  g_next_uncaught_exception_handler = NSGetUncaughtExceptionHandler();
+  next_uncaught_exception_handler_ = NSGetUncaughtExceptionHandler();
   NSSetUncaughtExceptionHandler(&ObjcUncaughtExceptionHandler);
 }
 
-void UninstallObjcExceptionPreprocessor() {
-  DCHECK(g_next_preprocessor);
+void ExceptionPreprocessorState::Uninstall() {
+  DCHECK(next_preprocessor_);
+  objc_setExceptionPreprocessor(next_preprocessor_);
+  next_preprocessor_ = nullptr;
 
-  objc_setExceptionPreprocessor(g_next_preprocessor);
-  g_exception_delegate = nullptr;
+  NSSetUncaughtExceptionHandler(next_uncaught_exception_handler_);
+  next_uncaught_exception_handler_ = nullptr;
 
-  NSSetUncaughtExceptionHandler(g_next_uncaught_exception_handler);
-  g_next_uncaught_exception_handler = nullptr;
+  exception_delegate_ = nullptr;
+}
+
+}  // namespace
 
-  g_next_preprocessor = nullptr;
+void InstallObjcExceptionPreprocessor(ObjcExceptionDelegate* delegate) {
+  ExceptionPreprocessorState::Get()->Install(delegate);
+}
+
+void UninstallObjcExceptionPreprocessor() {
+  ExceptionPreprocessorState::Get()->Uninstall();
 }
 
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/client/ios_handler/exception_processor_test.mm b/extern/crashpad/crashpad/client/ios_handler/exception_processor_test.mm
index d86507698e..8be7089019 100644
--- a/extern/crashpad/crashpad/client/ios_handler/exception_processor_test.mm
+++ b/extern/crashpad/crashpad/client/ios_handler/exception_processor_test.mm
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/client/ios_handler/in_process_handler.cc b/extern/crashpad/crashpad/client/ios_handler/in_process_handler.cc
new file mode 100644
index 0000000000..b88c1bacb1
--- /dev/null
+++ b/extern/crashpad/crashpad/client/ios_handler/in_process_handler.cc
@@ -0,0 +1,516 @@
+// Copyright 2021 The Crashpad Authors
+//
+// 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.
+
+#include "client/ios_handler/in_process_handler.h"
+
+#include <stdio.h>
+#include <sys/stat.h>
+
+#include <algorithm>
+
+#include "base/logging.h"
+#include "client/ios_handler/in_process_intermediate_dump_handler.h"
+#include "client/prune_crash_reports.h"
+#include "client/settings.h"
+#include "minidump/minidump_file_writer.h"
+#include "util/file/directory_reader.h"
+#include "util/file/filesystem.h"
+#include "util/ios/raw_logging.h"
+
+namespace {
+
+// Creates directory at |path|.
+bool CreateDirectory(const base::FilePath& path) {
+  if (mkdir(path.value().c_str(), 0755) == 0) {
+    return true;
+  }
+  if (errno != EEXIST) {
+    PLOG(ERROR) << "mkdir " << path.value();
+    return false;
+  }
+  return true;
+}
+
+// The file extension used to indicate a file is locked.
+constexpr char kLockedExtension[] = ".locked";
+
+// The seperator used to break the bundle id (e.g. com.chromium.ios) from the
+// uuid in the intermediate dump file name.
+constexpr char kBundleSeperator[] = "@";
+
+// Zero-ed codes used by kMachExceptionFromNSException and
+// kMachExceptionSimulated.
+constexpr mach_exception_data_type_t kEmulatedMachExceptionCodes[2] = {};
+
+}  // namespace
+
+namespace crashpad {
+namespace internal {
+
+InProcessHandler::InProcessHandler() = default;
+
+InProcessHandler::~InProcessHandler() {
+  if (cached_writer_) {
+    cached_writer_->Close();
+  }
+  UpdatePruneAndUploadThreads(false, UploadBehavior::kUploadWhenAppIsActive);
+}
+
+bool InProcessHandler::Initialize(
+    const base::FilePath& database,
+    const std::string& url,
+    const std::map<std::string, std::string>& annotations,
+    ProcessPendingReportsObservationCallback callback) {
+  INITIALIZATION_STATE_SET_INITIALIZING(initialized_);
+  annotations_ = annotations;
+  database_ = CrashReportDatabase::Initialize(database);
+  if (!database_) {
+    return false;
+  }
+  bundle_identifier_and_seperator_ =
+      system_data_.BundleIdentifier() + kBundleSeperator;
+
+  if (!url.empty()) {
+    // TODO(scottmg): options.rate_limit should be removed when we have a
+    // configurable database setting to control upload limiting.
+    // See https://crashpad.chromium.org/bug/23.
+    CrashReportUploadThread::Options upload_thread_options;
+    upload_thread_options.rate_limit = false;
+    upload_thread_options.upload_gzip = true;
+    upload_thread_options.watch_pending_reports = true;
+    upload_thread_options.identify_client_via_url = true;
+
+    upload_thread_.reset(new CrashReportUploadThread(
+        database_.get(), url, upload_thread_options, callback));
+  }
+
+  if (!CreateDirectory(database))
+    return false;
+  static constexpr char kPendingSerializediOSDump[] =
+      "pending-serialized-ios-dump";
+  base_dir_ = database.Append(kPendingSerializediOSDump);
+  if (!CreateDirectory(base_dir_))
+    return false;
+
+  bool is_app_extension = system_data_.IsExtension();
+  prune_thread_.reset(new PruneIntermediateDumpsAndCrashReportsThread(
+      database_.get(),
+      PruneCondition::GetDefault(),
+      base_dir_,
+      bundle_identifier_and_seperator_,
+      is_app_extension));
+  if (is_app_extension || system_data_.IsApplicationActive())
+    prune_thread_->Start();
+
+  if (!is_app_extension) {
+    system_data_.SetActiveApplicationCallback([this](bool active) {
+      dispatch_async(
+          dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+            UpdatePruneAndUploadThreads(active,
+                                        UploadBehavior::kUploadWhenAppIsActive);
+          });
+    });
+  }
+
+  base::FilePath cached_writer_path = NewLockedFilePath();
+  cached_writer_ = CreateWriterWithPath(cached_writer_path);
+  if (!cached_writer_.get())
+    return false;
+
+  // Cache the locked and unlocked path here so no allocations are needed during
+  // any exceptions.
+  cached_writer_path_ = cached_writer_path.value();
+  cached_writer_unlocked_path_ =
+      cached_writer_path.RemoveFinalExtension().value();
+  INITIALIZATION_STATE_SET_VALID(initialized_);
+  return true;
+}
+
+void InProcessHandler::DumpExceptionFromSignal(siginfo_t* siginfo,
+                                               ucontext_t* context) {
+  INITIALIZATION_STATE_DCHECK_VALID(initialized_);
+  ScopedLockedWriter writer(GetCachedWriter(),
+                            cached_writer_path_.c_str(),
+                            cached_writer_unlocked_path_.c_str());
+  if (!writer.GetWriter()) {
+    CRASHPAD_RAW_LOG("Cannot DumpExceptionFromSignal without writer");
+    return;
+  }
+  if (exception_callback_for_testing_) {
+    exception_callback_for_testing_();
+  }
+  ScopedReport report(writer.GetWriter(), system_data_, annotations_);
+  InProcessIntermediateDumpHandler::WriteExceptionFromSignal(
+      writer.GetWriter(), system_data_, siginfo, context);
+}
+
+void InProcessHandler::DumpExceptionFromMachException(
+    exception_behavior_t behavior,
+    thread_t thread,
+    exception_type_t exception,
+    const mach_exception_data_type_t* code,
+    mach_msg_type_number_t code_count,
+    thread_state_flavor_t flavor,
+    ConstThreadState old_state,
+    mach_msg_type_number_t old_state_count) {
+  INITIALIZATION_STATE_DCHECK_VALID(initialized_);
+  ScopedLockedWriter writer(GetCachedWriter(),
+                            cached_writer_path_.c_str(),
+                            cached_writer_unlocked_path_.c_str());
+  if (!writer.GetWriter()) {
+    CRASHPAD_RAW_LOG("Cannot DumpExceptionFromMachException without writer");
+    return;
+  }
+
+  if (exception_callback_for_testing_) {
+    exception_callback_for_testing_();
+  }
+
+  ScopedReport report(writer.GetWriter(), system_data_, annotations_);
+  InProcessIntermediateDumpHandler::WriteExceptionFromMachException(
+      writer.GetWriter(),
+      behavior,
+      thread,
+      exception,
+      code,
+      code_count,
+      flavor,
+      old_state,
+      old_state_count);
+}
+
+void InProcessHandler::DumpExceptionFromNSExceptionWithFrames(
+    const uint64_t* frames,
+    const size_t num_frames) {
+  INITIALIZATION_STATE_DCHECK_VALID(initialized_);
+  ScopedLockedWriter writer(GetCachedWriter(),
+                            cached_writer_path_.c_str(),
+                            cached_writer_unlocked_path_.c_str());
+  if (!writer.GetWriter()) {
+    CRASHPAD_RAW_LOG(
+        "Cannot DumpExceptionFromNSExceptionWithFrames without writer");
+    return;
+  }
+  ScopedReport report(
+      writer.GetWriter(), system_data_, annotations_, frames, num_frames);
+  InProcessIntermediateDumpHandler::WriteExceptionFromNSException(
+      writer.GetWriter());
+}
+
+bool InProcessHandler::DumpExceptionFromSimulatedMachException(
+    const NativeCPUContext* context,
+    exception_type_t exception,
+    base::FilePath* path) {
+  base::FilePath locked_path = NewLockedFilePath();
+  *path = locked_path.RemoveFinalExtension();
+  return DumpExceptionFromSimulatedMachExceptionAtPath(
+      context, exception, locked_path);
+}
+
+bool InProcessHandler::DumpExceptionFromSimulatedMachExceptionAtPath(
+    const NativeCPUContext* context,
+    exception_type_t exception,
+    const base::FilePath& path) {
+  // This does not use the cached writer. It's expected that simulated
+  // exceptions can be called multiple times and there is no expectation that
+  // the application is in an unsafe state, or will be terminated after this
+  // call.
+  std::unique_ptr<IOSIntermediateDumpWriter> unsafe_writer =
+      CreateWriterWithPath(path);
+  base::FilePath writer_path_unlocked = path.RemoveFinalExtension();
+  ScopedLockedWriter writer(unsafe_writer.get(),
+                            path.value().c_str(),
+                            writer_path_unlocked.value().c_str());
+  if (!writer.GetWriter()) {
+    CRASHPAD_RAW_LOG(
+        "Cannot DumpExceptionFromSimulatedMachExceptionAtPath without writer");
+    return false;
+  }
+  ScopedReport report(writer.GetWriter(), system_data_, annotations_);
+  InProcessIntermediateDumpHandler::WriteExceptionFromMachException(
+      writer.GetWriter(),
+      MACH_EXCEPTION_CODES,
+      mach_thread_self(),
+      exception,
+      kEmulatedMachExceptionCodes,
+      std::size(kEmulatedMachExceptionCodes),
+      MACHINE_THREAD_STATE,
+      reinterpret_cast<ConstThreadState>(context),
+      MACHINE_THREAD_STATE_COUNT);
+  return true;
+}
+
+bool InProcessHandler::MoveIntermediateDumpAtPathToPending(
+    const base::FilePath& path) {
+  base::FilePath new_path_unlocked = NewLockedFilePath().RemoveFinalExtension();
+  return MoveFileOrDirectory(path, new_path_unlocked);
+}
+void InProcessHandler::ProcessIntermediateDumps(
+    const std::map<std::string, std::string>& annotations,
+    const UserStreamDataSources* user_stream_sources) {
+  INITIALIZATION_STATE_DCHECK_VALID(initialized_);
+
+  for (auto& file : PendingFiles())
+    ProcessIntermediateDump(file, annotations, user_stream_sources);
+}
+
+void InProcessHandler::ProcessIntermediateDump(
+    const base::FilePath& file,
+    const std::map<std::string, std::string>& annotations,
+    const UserStreamDataSources* user_stream_sources) {
+  INITIALIZATION_STATE_DCHECK_VALID(initialized_);
+
+  ProcessSnapshotIOSIntermediateDump process_snapshot;
+  if (process_snapshot.InitializeWithFilePath(file, annotations)) {
+    SaveSnapshot(process_snapshot, user_stream_sources);
+  }
+}
+
+void InProcessHandler::StartProcessingPendingReports(
+    UploadBehavior upload_behavior) {
+  if (!upload_thread_)
+    return;
+
+  upload_thread_enabled_ = true;
+
+  // This may be a no-op if IsApplicationActive is false, as it is not safe to
+  // start the upload thread when in the background (due to the potential for
+  // flocked files in shared containers).
+  // TODO(crbug.com/crashpad/400): Consider moving prune and upload thread to
+  // BackgroundTasks and/or NSURLSession. This might allow uploads to continue
+  // in the background.
+  UpdatePruneAndUploadThreads(system_data_.IsApplicationActive(),
+                              upload_behavior);
+}
+
+void InProcessHandler::UpdatePruneAndUploadThreads(
+    bool active,
+    UploadBehavior upload_behavior) {
+  base::AutoLock lock_owner(prune_and_upload_lock_);
+  // TODO(crbug.com/crashpad/400): Consider moving prune and upload thread to
+  // BackgroundTasks and/or NSURLSession. This might allow uploads to continue
+  // in the background.
+  bool threads_should_run;
+  switch (upload_behavior) {
+    case UploadBehavior::kUploadWhenAppIsActive:
+      threads_should_run = active;
+      break;
+    case UploadBehavior::kUploadImmediately:
+      threads_should_run = true;
+      break;
+  }
+  if (threads_should_run) {
+    if (!prune_thread_->is_running())
+      prune_thread_->Start();
+    if (upload_thread_enabled_ && !upload_thread_->is_running()) {
+      upload_thread_->Start();
+    }
+  } else {
+    if (prune_thread_->is_running())
+      prune_thread_->Stop();
+    if (upload_thread_enabled_ && upload_thread_->is_running())
+      upload_thread_->Stop();
+  }
+}
+
+void InProcessHandler::SaveSnapshot(
+    ProcessSnapshotIOSIntermediateDump& process_snapshot,
+    const UserStreamDataSources* user_stream_sources) {
+  std::unique_ptr<CrashReportDatabase::NewReport> new_report;
+  CrashReportDatabase::OperationStatus database_status =
+      database_->PrepareNewCrashReport(&new_report);
+  if (database_status != CrashReportDatabase::kNoError) {
+    Metrics::ExceptionCaptureResult(
+        Metrics::CaptureResult::kPrepareNewCrashReportFailed);
+    return;
+  }
+  process_snapshot.SetReportID(new_report->ReportID());
+
+  UUID client_id;
+  Settings* const settings = database_->GetSettings();
+  if (settings && settings->GetClientID(&client_id)) {
+    process_snapshot.SetClientID(client_id);
+  }
+
+  MinidumpFileWriter minidump;
+  minidump.InitializeFromSnapshot(&process_snapshot);
+  AddUserExtensionStreams(user_stream_sources, &process_snapshot, &minidump);
+
+  if (!minidump.WriteEverything(new_report->Writer())) {
+    Metrics::ExceptionCaptureResult(
+        Metrics::CaptureResult::kMinidumpWriteFailed);
+    return;
+  }
+  UUID uuid;
+  database_status =
+      database_->FinishedWritingCrashReport(std::move(new_report), &uuid);
+  if (database_status != CrashReportDatabase::kNoError) {
+    Metrics::ExceptionCaptureResult(
+        Metrics::CaptureResult::kFinishedWritingCrashReportFailed);
+    return;
+  }
+
+  if (upload_thread_) {
+    upload_thread_->ReportPending(uuid);
+  }
+}
+
+std::vector<base::FilePath> InProcessHandler::PendingFiles() {
+  DirectoryReader reader;
+  std::vector<base::FilePath> files;
+  if (!reader.Open(base_dir_)) {
+    return files;
+  }
+  base::FilePath file;
+  DirectoryReader::Result result;
+
+  // Because the intermediate dump directory is expected to be shared,
+  // mitigate any spamming by limiting this to |kMaxPendingFiles|.
+  constexpr size_t kMaxPendingFiles = 20;
+
+  // Track other application bundles separately, so they don't spam our
+  // intermediate dumps into never getting processed.
+  std::vector<base::FilePath> other_files;
+
+  base::FilePath cached_writer_path(cached_writer_path_);
+  while ((result = reader.NextFile(&file)) ==
+         DirectoryReader::Result::kSuccess) {
+    // Don't try to process files marked as 'locked' from a different bundle id.
+    bool bundle_match =
+        file.value().compare(0,
+                             bundle_identifier_and_seperator_.size(),
+                             bundle_identifier_and_seperator_) == 0;
+    if (!bundle_match && file.FinalExtension() == kLockedExtension) {
+      continue;
+    }
+
+    // Never process the current cached writer path.
+    file = base_dir_.Append(file);
+    if (file == cached_writer_path)
+      continue;
+
+    // Otherwise, include any other unlocked, or locked files matching
+    // |bundle_identifier_and_seperator_|.
+    if (bundle_match) {
+      files.push_back(file);
+      if (files.size() >= kMaxPendingFiles)
+        return files;
+    } else {
+      other_files.push_back(file);
+    }
+  }
+
+  auto end_iterator =
+      other_files.begin() +
+      std::min(kMaxPendingFiles - files.size(), other_files.size());
+  files.insert(files.end(), other_files.begin(), end_iterator);
+  return files;
+}
+
+IOSIntermediateDumpWriter* InProcessHandler::GetCachedWriter() {
+  static_assert(
+      std::atomic<uint64_t>::is_always_lock_free,
+      "std::atomic_compare_exchange_strong uint64_t may not be signal-safe");
+  uint64_t thread_self;
+  // This is only safe when passing pthread_self(), otherwise this can lock.
+  pthread_threadid_np(pthread_self(), &thread_self);
+  uint64_t expected = 0;
+  if (!std::atomic_compare_exchange_strong(
+          &exception_thread_id_, &expected, thread_self)) {
+    if (expected == thread_self) {
+      // Another exception came in from this thread, which means it's likely
+      // that our own handler crashed. We could open up a new intermediate dump
+      // and try to save this dump, but we could end up endlessly writing dumps.
+      // Instead, give up.
+    } else {
+      // Another thread is handling a crash. Sleep forever.
+      while (1) {
+        sleep(std::numeric_limits<unsigned int>::max());
+      }
+    }
+    return nullptr;
+  }
+
+  return cached_writer_.get();
+}
+
+std::unique_ptr<IOSIntermediateDumpWriter>
+InProcessHandler::CreateWriterWithPath(const base::FilePath& writer_path) {
+  std::unique_ptr<IOSIntermediateDumpWriter> writer =
+      std::make_unique<IOSIntermediateDumpWriter>();
+  if (!writer->Open(writer_path)) {
+    DLOG(ERROR) << "Unable to open intermediate dump file: "
+                << writer_path.value();
+    return nullptr;
+  }
+  return writer;
+}
+
+const base::FilePath InProcessHandler::NewLockedFilePath() {
+  UUID uuid;
+  uuid.InitializeWithNew();
+  const std::string file_string =
+      bundle_identifier_and_seperator_ + uuid.ToString() + kLockedExtension;
+  return base_dir_.Append(file_string);
+}
+
+InProcessHandler::ScopedReport::ScopedReport(
+    IOSIntermediateDumpWriter* writer,
+    const IOSSystemDataCollector& system_data,
+    const std::map<std::string, std::string>& annotations,
+    const uint64_t* frames,
+    const size_t num_frames)
+    : writer_(writer),
+      frames_(frames),
+      num_frames_(num_frames),
+      rootMap_(writer) {
+  DCHECK(writer);
+  // Grab the report creation time before writing the report.
+  uint64_t report_time_nanos = ClockMonotonicNanoseconds();
+  InProcessIntermediateDumpHandler::WriteHeader(writer);
+  InProcessIntermediateDumpHandler::WriteProcessInfo(writer, annotations);
+  InProcessIntermediateDumpHandler::WriteSystemInfo(
+      writer, system_data, report_time_nanos);
+}
+
+InProcessHandler::ScopedReport::~ScopedReport() {
+  // Write threads and modules last (after the exception itself is written by
+  // DumpExceptionFrom*.)
+  InProcessIntermediateDumpHandler::WriteThreadInfo(
+      writer_, frames_, num_frames_);
+  InProcessIntermediateDumpHandler::WriteModuleInfo(writer_);
+}
+
+InProcessHandler::ScopedLockedWriter::ScopedLockedWriter(
+    IOSIntermediateDumpWriter* writer,
+    const char* writer_path,
+    const char* writer_unlocked_path)
+    : writer_path_(writer_path),
+      writer_unlocked_path_(writer_unlocked_path),
+      writer_(writer) {}
+
+InProcessHandler::ScopedLockedWriter::~ScopedLockedWriter() {
+  if (!writer_)
+    return;
+
+  writer_->Close();
+  if (rename(writer_path_, writer_unlocked_path_) != 0) {
+    CRASHPAD_RAW_LOG("Could not remove locked extension.");
+    CRASHPAD_RAW_LOG(writer_path_);
+    CRASHPAD_RAW_LOG(writer_unlocked_path_);
+  }
+}
+
+}  // namespace internal
+}  // namespace crashpad
diff --git a/extern/crashpad/crashpad/client/ios_handler/in_process_handler.h b/extern/crashpad/crashpad/client/ios_handler/in_process_handler.h
new file mode 100644
index 0000000000..f65f7e405a
--- /dev/null
+++ b/extern/crashpad/crashpad/client/ios_handler/in_process_handler.h
@@ -0,0 +1,310 @@
+// Copyright 2021 The Crashpad Authors
+//
+// 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.
+
+#ifndef CRASHPAD_CLIENT_IOS_HANDLER_IN_PROCESS_IN_PROCESS_HANDLER_H_
+#define CRASHPAD_CLIENT_IOS_HANDLER_IN_PROCESS_IN_PROCESS_HANDLER_H_
+
+#include <mach/mach.h>
+#include <stdint.h>
+
+#include <atomic>
+#include <functional>
+#include <map>
+#include <string>
+#include <vector>
+
+#include "base/files/file_path.h"
+#include "base/synchronization/lock.h"
+#include "client/ios_handler/prune_intermediate_dumps_and_crash_reports_thread.h"
+#include "client/upload_behavior_ios.h"
+#include "handler/crash_report_upload_thread.h"
+#include "handler/user_stream_data_source.h"
+#include "snapshot/ios/process_snapshot_ios_intermediate_dump.h"
+#include "util/ios/ios_intermediate_dump_writer.h"
+#include "util/ios/ios_system_data_collector.h"
+#include "util/mach/mach_extensions.h"
+#include "util/misc/capture_context.h"
+#include "util/misc/initialization_state_dcheck.h"
+
+namespace crashpad {
+namespace internal {
+
+//! \brief Manage intermediate minidump generation, and own the crash report
+//!     upload thread and database.
+class InProcessHandler {
+ public:
+  InProcessHandler();
+  ~InProcessHandler();
+  InProcessHandler(const InProcessHandler&) = delete;
+  InProcessHandler& operator=(const InProcessHandler&) = delete;
+
+  //! \brief Observation callback invoked each time this object finishes
+  //!     processing and attempting to upload on-disk crash reports (whether or
+  //!     not the uploads succeeded).
+  //!
+  //! This callback is copied into this object. Any references or pointers
+  //! inside must outlive this object.
+  //!
+  //! The callback might be invoked on a background thread, so clients must
+  //! synchronize appropriately.
+  using ProcessPendingReportsObservationCallback = std::function<void()>;
+
+  //! \brief Initializes the in-process handler.
+  //!
+  //! This method must be called only once, and must be successfully called
+  //! before any other method in this class may be called.
+  //!
+  //! \param[in] database The path to a Crashpad database.
+  //! \param[in] url The URL of an upload server.
+  //! \param[in] annotations Process annotations to set in each crash report.
+  //! \param[in] callback Optional callback invoked zero or more times
+  //!     on a background thread each time this object finishes
+  //!     processing and attempting to upload on-disk crash reports.
+  //! \return `true` if a handler to a pending intermediate dump could be
+  //!     opened.
+  bool Initialize(const base::FilePath& database,
+                  const std::string& url,
+                  const std::map<std::string, std::string>& annotations,
+                  ProcessPendingReportsObservationCallback callback =
+                      ProcessPendingReportsObservationCallback());
+
+  //! \brief Generate an intermediate dump from a signal handler exception.
+  //!      Writes the dump with the cached writer does not allow concurrent
+  //!      exceptions to be written. It is expected the system will terminate
+  //!      the application after this call.
+  //!
+  //! \param[in] siginfo A pointer to a `siginfo_t` object received by a signal
+  //!     handler.
+  //! \param[in] context A pointer to a `ucontext_t` object received by a
+  //!     signal.
+  void DumpExceptionFromSignal(siginfo_t* siginfo, ucontext_t* context);
+
+  //! \brief Generate an intermediate dump from a mach exception. Writes the
+  //!     dump with the cached writer does not allow concurrent exceptions to be
+  //!     written. It is expected the system will terminate the application
+  //!     after this call.
+  //!
+  //! \param[in] behavior
+  //! \param[in] thread
+  //! \param[in] exception
+  //! \param[in] code
+  //! \param[in] code_count
+  //! \param[in,out] flavor
+  //! \param[in] old_state
+  //! \param[in] old_state_count
+  void DumpExceptionFromMachException(exception_behavior_t behavior,
+                                      thread_t thread,
+                                      exception_type_t exception,
+                                      const mach_exception_data_type_t* code,
+                                      mach_msg_type_number_t code_count,
+                                      thread_state_flavor_t flavor,
+                                      ConstThreadState old_state,
+                                      mach_msg_type_number_t old_state_count);
+
+  //! \brief Generate an intermediate dump from an uncaught NSException.
+  //!
+  //! When the ObjcExceptionPreprocessor does not detect an NSException as it is
+  //! thrown, the last-chance uncaught exception handler passes a list of call
+  //! stack frame addresses.  Record them in the intermediate dump so a minidump
+  //! with a 'fake' call stack is generated.  Writes the dump with the cached
+  //! writer does not allow concurrent exceptions to be written. It is expected
+  //! the system will terminate the application after this call.
+
+  //!
+  //! \param[in] frames An array of call stack frame addresses.
+  //! \param[in] num_frames The number of frames in |frames|.
+  void DumpExceptionFromNSExceptionWithFrames(const uint64_t* frames,
+                                              const size_t num_frames);
+
+  //! \brief Generate a simulated intermediate dump similar to a Mach exception
+  //!     in the same base directory as other exceptions. Does not use the
+  //!     cached writer.
+  //!
+  //! \param[in] context A pointer to a NativeCPUContext object for this
+  //!     simulated exception.
+  //! \param[in] exception
+  //! \param[out] path The path of the intermediate dump generated.
+  //! \return `true` if the pending intermediate dump could be written.
+  bool DumpExceptionFromSimulatedMachException(const NativeCPUContext* context,
+                                               exception_type_t exception,
+                                               base::FilePath* path);
+
+  //! \brief Generate a simulated intermediate dump similar to a Mach exception
+  //!     at a specific path. Does not use the cached writer.
+  //!
+  //! \param[in] context A pointer to a NativeCPUContext object for this
+  //!     simulated exception.
+  //! \param[in] exception
+  //! \param[in] path Path to where the intermediate dump should be written.
+  //! \return `true` if the pending intermediate dump could be written.
+  bool DumpExceptionFromSimulatedMachExceptionAtPath(
+      const NativeCPUContext* context,
+      exception_type_t exception,
+      const base::FilePath& path);
+
+  //! \brief Moves an intermediate dump to the pending directory. This is meant
+  //!     to be used by the UncaughtExceptionHandler, when NSException caught
+  //!     by the preprocessor matches the UncaughtExceptionHandler.
+  //!
+  //! \param[in] path Path to the specific intermediate dump.
+  bool MoveIntermediateDumpAtPathToPending(const base::FilePath& path);
+
+  //! \brief Requests that the handler convert all intermediate dumps into
+  //!     minidumps and trigger an upload if possible.
+  //!
+  //! \param[in] annotations Process annotations to set in each crash report.
+  //! \param[in] user_stream_sources An optional vector containing the
+  //!     extensibility data sources to call on crash. Each time a minidump is
+  //!     created, the sources are called in turn. Any streams returned are
+  //!     added to the minidump.
+  void ProcessIntermediateDumps(
+      const std::map<std::string, std::string>& annotations,
+      const UserStreamDataSources* user_stream_sources);
+
+  //! \brief Requests that the handler convert a specific intermediate dump into
+  //!     a minidump and trigger an upload if possible.
+  //!
+  //! \param[in] path Path to the specific intermediate dump.
+  //! \param[in] annotations Process annotations to set in each crash report.
+  //! \param[in] user_stream_sources An optional vector containing the
+  //!     extensibility data sources to call on crash. Each time a minidump is
+  //!     created, the sources are called in turn. Any streams returned are
+  //!     added to the minidump.
+  void ProcessIntermediateDump(
+      const base::FilePath& path,
+      const std::map<std::string, std::string>& annotations = {},
+      const UserStreamDataSources* user_stream_sources = {});
+
+  //! \brief Requests that the handler begin in-process uploading of any
+  //!     pending reports.
+  //!
+  //! \param[in] upload_behavior Controls when the upload thread will run and
+  //!     process pending reports. By default, only uploads pending reports
+  //!     when the application is active.
+  void StartProcessingPendingReports(
+      UploadBehavior upload_behavior = UploadBehavior::kUploadWhenAppIsActive);
+
+  //! \brief Inject a callback into the Mach exception and signal handling
+  //!     mechanisms. Intended to be used by tests to trigger a reentrant
+  //      exception.
+  void SetExceptionCallbackForTesting(void (*callback)()) {
+    exception_callback_for_testing_ = callback;
+  }
+
+ private:
+  //! \brief Helper to start and end intermediate reports.
+  class ScopedReport {
+   public:
+    ScopedReport(IOSIntermediateDumpWriter* writer,
+                 const IOSSystemDataCollector& system_data,
+                 const std::map<std::string, std::string>& annotations,
+                 const uint64_t* frames = nullptr,
+                 const size_t num_frames = 0);
+    ~ScopedReport();
+    ScopedReport(const ScopedReport&) = delete;
+    ScopedReport& operator=(const ScopedReport&) = delete;
+
+   private:
+    IOSIntermediateDumpWriter* writer_;
+    const uint64_t* frames_;
+    const size_t num_frames_;
+    IOSIntermediateDumpWriter::ScopedRootMap rootMap_;
+  };
+
+  //! \brief Helper to manage closing the intermediate dump writer and unlocking
+  //!     the dump file (renaming the file) after the report is written.
+  class ScopedLockedWriter {
+   public:
+    ScopedLockedWriter(IOSIntermediateDumpWriter* writer,
+                       const char* writer_path,
+                       const char* writer_unlocked_path);
+
+    //! \brief Close the writer_ and rename to the file with path without the
+    //!     .locked extension.
+    ~ScopedLockedWriter();
+
+    ScopedLockedWriter(const ScopedLockedWriter&) = delete;
+    ScopedLockedWriter& operator=(const ScopedLockedWriter&) = delete;
+
+    IOSIntermediateDumpWriter* GetWriter() { return writer_; }
+
+   private:
+    const char* writer_path_;
+    const char* writer_unlocked_path_;
+    IOSIntermediateDumpWriter* writer_;
+  };
+
+  //! \brief Manage the prune and upload thread when the active state changes.
+  //!
+  //! \param[in] active `true` if the application is actively running in the
+  //!     foreground, `false` otherwise.
+  //! \param[in] upload_behavior Controls when the upload thread will run and
+  //!     process pending reports.
+  void UpdatePruneAndUploadThreads(bool active, UploadBehavior upload_behavior);
+
+  //! \brief Writes a minidump to the Crashpad database from the
+  //!     \a process_snapshot, and triggers the upload_thread_ if started.
+  //! \param[in] user_stream_sources An optional vector containing the
+  //!     extensibility data sources to call on crash. Each time a minidump is
+  //!     created, the sources are called in turn. Any streams returned are
+  //!     added to the minidump.
+  void SaveSnapshot(ProcessSnapshotIOSIntermediateDump& process_snapshot,
+                    const UserStreamDataSources* user_stream_sources = {});
+
+  //! \brief Process a maximum of 20 pending intermediate dumps. Dumps named
+  //!     with our bundle id get first priority to prevent spamming.
+  std::vector<base::FilePath> PendingFiles();
+
+  //! \brief Lock access to the cached intermediate dump writer from
+  //!     concurrent signal, Mach exception and uncaught NSExceptions so that
+  //!     the first exception wins. If the same thread triggers another
+  //!     reentrant exception, ignore it. If a different thread triggers a
+  //!     concurrent exception, sleep indefinitely.
+  IOSIntermediateDumpWriter* GetCachedWriter();
+
+  //! \brief Open a new intermediate dump writer from \a writer_path.
+  std::unique_ptr<IOSIntermediateDumpWriter> CreateWriterWithPath(
+      const base::FilePath& writer_path);
+
+  //! \brief Generates a new file path to be used by an intermediate dump
+  //! writer built from base_dir_,, bundle_identifier_and_seperator_, a new
+  //! UUID, with a .locked extension.
+  const base::FilePath NewLockedFilePath();
+
+  // Intended to be used by tests triggering a reentrant exception. Called
+  // in DumpExceptionFromMachException and DumpExceptionFromSignal after
+  // acquiring the cached_writer_.
+  void (*exception_callback_for_testing_)() = nullptr;
+
+  // Used to synchronize access to UpdatePruneAndUploadThreads().
+  base::Lock prune_and_upload_lock_;
+  std::atomic_bool upload_thread_enabled_ = false;
+  std::map<std::string, std::string> annotations_;
+  base::FilePath base_dir_;
+  std::string cached_writer_path_;
+  std::string cached_writer_unlocked_path_;
+  std::unique_ptr<IOSIntermediateDumpWriter> cached_writer_;
+  std::atomic<uint64_t> exception_thread_id_ = 0;
+  std::unique_ptr<CrashReportUploadThread> upload_thread_;
+  std::unique_ptr<PruneIntermediateDumpsAndCrashReportsThread> prune_thread_;
+  std::unique_ptr<CrashReportDatabase> database_;
+  std::string bundle_identifier_and_seperator_;
+  IOSSystemDataCollector system_data_;
+  InitializationStateDcheck initialized_;
+};
+
+}  // namespace internal
+}  // namespace crashpad
+
+#endif  // CRASHPAD_CLIENT_IOS_HANDLER_IN_PROCESS_IN_PROCESS_HANDLER_H_
diff --git a/extern/crashpad/crashpad/client/ios_handler/in_process_handler_test.cc b/extern/crashpad/crashpad/client/ios_handler/in_process_handler_test.cc
new file mode 100644
index 0000000000..43c9db68b1
--- /dev/null
+++ b/extern/crashpad/crashpad/client/ios_handler/in_process_handler_test.cc
@@ -0,0 +1,148 @@
+// Copyright 2021 The Crashpad Authors
+//
+// 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.
+
+#include "client/ios_handler/in_process_handler.h"
+
+#include "gtest/gtest.h"
+#include "test/scoped_temp_dir.h"
+#include "test/test_paths.h"
+#include "util/file/directory_reader.h"
+#include "util/file/filesystem.h"
+
+namespace crashpad {
+namespace test {
+namespace {
+
+bool CreateFile(const base::FilePath& file) {
+  ScopedFileHandle fd(LoggingOpenFileForWrite(
+      file, FileWriteMode::kCreateOrFail, FilePermissions::kOwnerOnly));
+  EXPECT_TRUE(fd.is_valid());
+  return fd.is_valid();
+}
+
+class InProcessHandlerTest : public testing::Test {
+ protected:
+  // testing::Test:
+
+  void SetUp() override {
+    ASSERT_TRUE(in_process_handler_.Initialize(temp_dir_.path(), "", {}));
+    pending_dir_ = temp_dir_.path().Append("pending-serialized-ios-dump");
+    bundle_identifier_and_seperator_ = system_data_.BundleIdentifier() + "@";
+  }
+
+  const auto& path() const { return pending_dir_; }
+  auto& handler() { return in_process_handler_; }
+
+  void CreateFiles(int files, int other_files) {
+    base::FilePath::StringType file_prepend =
+        FILE_PATH_LITERAL(bundle_identifier_and_seperator_);
+    base::FilePath::StringType file_name = FILE_PATH_LITERAL("file");
+    for (int i = 0; i < files; i++) {
+      std::string i_str = std::to_string(i);
+      base::FilePath file(file_prepend + file_name + i_str);
+      CreateFile(path().Append(file));
+    }
+
+    for (int i = 0; i < other_files; i++) {
+      std::string i_str = std::to_string(i);
+      base::FilePath file(file_name + i_str);
+      CreateFile(path().Append(file));
+    }
+  }
+
+  void VerifyRemainingFileCount(int expected_files_count,
+                                int expected_other_files_count) {
+    DirectoryReader reader;
+    ASSERT_TRUE(reader.Open(path()));
+    DirectoryReader::Result result;
+    base::FilePath filename;
+    int files_count = 0;
+    int other_files_count = 0;
+    while ((result = reader.NextFile(&filename)) ==
+           DirectoryReader::Result::kSuccess) {
+      bool bundle_match =
+          filename.value().compare(0,
+                                   bundle_identifier_and_seperator_.size(),
+                                   bundle_identifier_and_seperator_) == 0;
+      if (bundle_match) {
+        files_count++;
+      } else {
+        other_files_count++;
+      }
+    }
+    EXPECT_EQ(expected_files_count, files_count);
+    EXPECT_EQ(expected_other_files_count, other_files_count);
+  }
+
+  void ClearFiles() {
+    DirectoryReader reader;
+    ASSERT_TRUE(reader.Open(path()));
+    DirectoryReader::Result result;
+    base::FilePath filename;
+    while ((result = reader.NextFile(&filename)) ==
+           DirectoryReader::Result::kSuccess) {
+      LoggingRemoveFile(path().Append(filename));
+    }
+  }
+
+ private:
+  ScopedTempDir temp_dir_;
+  base::FilePath pending_dir_;
+  std::string bundle_identifier_and_seperator_;
+  internal::IOSSystemDataCollector system_data_;
+  internal::InProcessHandler in_process_handler_;
+};
+
+TEST_F(InProcessHandlerTest, TestPendingFileLimit) {
+  // Clear this first to blow away the pending file held by InProcessHandler.
+  ClearFiles();
+
+  // Only process other app files.
+  CreateFiles(0, 20);
+  handler().ProcessIntermediateDumps({}, nullptr);
+  VerifyRemainingFileCount(0, 0);
+  ClearFiles();
+
+  // Only process our app files.
+  CreateFiles(20, 20);
+  handler().ProcessIntermediateDumps({}, nullptr);
+  VerifyRemainingFileCount(0, 20);
+  ClearFiles();
+
+  // Process all of our files and 10   remaining.
+  CreateFiles(10, 30);
+  handler().ProcessIntermediateDumps({}, nullptr);
+  VerifyRemainingFileCount(0, 20);
+  ClearFiles();
+
+  // Process 20 our files, leaving 10 remaining, and all other files remaining.
+  CreateFiles(30, 10);
+  handler().ProcessIntermediateDumps({}, nullptr);
+  VerifyRemainingFileCount(10, 10);
+  ClearFiles();
+
+  CreateFiles(0, 0);
+  handler().ProcessIntermediateDumps({}, nullptr);
+  VerifyRemainingFileCount(0, 0);
+  ClearFiles();
+
+  CreateFiles(10, 0);
+  handler().ProcessIntermediateDumps({}, nullptr);
+  VerifyRemainingFileCount(0, 0);
+  ClearFiles();
+}
+
+}  // namespace
+}  // namespace test
+}  // namespace crashpad
diff --git a/extern/crashpad/crashpad/client/ios_handler/in_process_intermediate_dump_handler.cc b/extern/crashpad/crashpad/client/ios_handler/in_process_intermediate_dump_handler.cc
index 9c1a31644b..6900d4ed4e 100644
--- a/extern/crashpad/crashpad/client/ios_handler/in_process_intermediate_dump_handler.cc
+++ b/extern/crashpad/crashpad/client/ios_handler/in_process_intermediate_dump_handler.cc
@@ -1,4 +1,4 @@
-// Copyright 2021 The Crashpad Authors. All rights reserved.
+// Copyright 2021 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,12 +21,17 @@
 #include <sys/sysctl.h>
 #include <time.h>
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+#include <optional>
+
+#include "base/check_op.h"
 #include "build/build_config.h"
 #include "snapshot/snapshot_constants.h"
 #include "util/ios/ios_intermediate_dump_writer.h"
 #include "util/ios/raw_logging.h"
+#include "util/ios/scoped_vm_map.h"
 #include "util/ios/scoped_vm_read.h"
+#include "util/synchronization/scoped_spin_guard.h"
 
 namespace crashpad {
 namespace internal {
@@ -47,6 +52,7 @@ using thread_state_type = arm_thread_state64_t;
 
 // From snapshot/mac/process_types/crashreporterclient.proctype
 struct crashreporter_annotations_t {
+  // Version 4
   uint64_t version;
   uint64_t message;
   uint64_t signature_string;
@@ -54,7 +60,23 @@ struct crashreporter_annotations_t {
   uint64_t message2;
   uint64_t thread;
   uint64_t dialog_mode;
+
+  // Version 5
   uint64_t abort_cause;
+
+  // The structure here is only defined through version 5, although version 7 is
+  // also known, and contains an additional 264 bytes from this point. Version 7
+  // was first used in iOS 26. The version 7 extension is not defined here
+  // because it would cause the reader to attempt to read the full length of a
+  // version 7 structure, even in cases where only a version 5 structure is
+  // present at runtime, as it will be in iOS versions before 26.
+  //
+  // If it ever becomes necessary to read fields beyond version 5 (or whatever
+  // the minimum structure version that would be encountered at runtime is at
+  // that time in the future), the reader will need to take additional care to
+  // consult the `version` field and only read as much of the structure as is
+  // appropriate for the indicated version. The macOS implementation implements
+  // this logic.
 };
 
 //! \brief Manage memory and ports after calling `task_threads`.
@@ -86,7 +108,7 @@ class ScopedTaskThreads {
 void WriteError(IntermediateDumpKey key) {
   CRASHPAD_RAW_LOG("Unable to write key");
   switch (key) {
-// clang-format off
+    // clang-format off
 #define CASE_KEY(Name, Value)       \
     case IntermediateDumpKey::Name: \
       CRASHPAD_RAW_LOG(#Name);      \
@@ -117,7 +139,7 @@ void WriteProperty(IOSIntermediateDumpWriter* writer,
 //! \param[in] writer The dump writer
 //! \param[in] key The key to write.
 //! \param[in] value Memory to be written.
-//! \param[in] count Length of \a data.
+//! \param[in] value_length Length of \a data.
 void WritePropertyBytes(IOSIntermediateDumpWriter* writer,
                         IntermediateDumpKey key,
                         const void* value,
@@ -126,6 +148,20 @@ void WritePropertyBytes(IOSIntermediateDumpWriter* writer,
     WriteError(key);
 }
 
+//! \brief Call AddPropertyCString with raw error log.
+//!
+//! \param[in] writer The dump writer
+//! \param[in] key The key to write.
+//! \param[in] max_length The maximum string length.
+//! \param[in] value Memory to be written.
+void WritePropertyCString(IOSIntermediateDumpWriter* writer,
+                          IntermediateDumpKey key,
+                          size_t max_length,
+                          const char* value) {
+  if (!writer->AddPropertyCString(key, max_length, value))
+    WriteError(key);
+}
+
 kern_return_t MachVMRegionRecurseDeepest(task_t task,
                                          vm_address_t* address,
                                          vm_size_t* size,
@@ -396,7 +432,7 @@ void MaybeCaptureMemoryAround(IOSIntermediateDumpWriter* writer,
 
   IOSIntermediateDumpWriter::ScopedArrayMap memory_region(writer);
   WriteProperty(
-      writer, IntermediateDumpKey::kThreadContextMemoryRegionAddress, &address);
+      writer, IntermediateDumpKey::kThreadContextMemoryRegionAddress, &target);
   // Don't use WritePropertyBytes, this one will fail regularly if |target|
   // cannot be read.
   writer->AddPropertyBytes(IntermediateDumpKey::kThreadContextMemoryRegionData,
@@ -427,8 +463,8 @@ void CaptureMemoryPointedToByThreadState(IOSIntermediateDumpWriter* writer,
   MaybeCaptureMemoryAround(writer, thread_state.__r15);
   MaybeCaptureMemoryAround(writer, thread_state.__rip);
 #elif defined(ARCH_CPU_ARM_FAMILY)
-  MaybeCaptureMemoryAround(writer, thread_state.__pc);
-  for (size_t i = 0; i < base::size(thread_state.__x); ++i) {
+  MaybeCaptureMemoryAround(writer, arm_thread_state64_get_pc(thread_state));
+  for (size_t i = 0; i < std::size(thread_state.__x); ++i) {
     MaybeCaptureMemoryAround(writer, thread_state.__x[i]);
   }
 #endif
@@ -474,9 +510,14 @@ void WriteCrashpadSimpleAnnotationsDictionary(IOSIntermediateDumpWriter* writer,
 void WriteAppleCrashReporterAnnotations(
     IOSIntermediateDumpWriter* writer,
     crashreporter_annotations_t* crash_info) {
-  // This number was totally made up out of nowhere, but it seems prudent to
-  // enforce some limit.
-  constexpr size_t kMaxMessageSize = 1024;
+  // It seems prudent to enforce some limit. Different users of
+  // CRSetCrashLogMessage and CRSetCrashLogMessage2, apparently the private
+  // <CrashReporterClient.h> functions used to set message and message2, use
+  // different buffer lengths. dyld-1231.3 libdyld/dyld_process_info.cpp has
+  // `static char sCrashReporterInfo[4096]`, which seems like a reasonable
+  // limit.
+  constexpr size_t kMaxMessageSize = 4096;
+
   IOSIntermediateDumpWriter::ScopedMap annotation_map(
       writer, IntermediateDumpKey::kAnnotationsCrashInfo);
   if (crash_info->message) {
@@ -497,80 +538,6 @@ void WriteAppleCrashReporterAnnotations(
   }
 }
 
-void WriteDyldErrorStringAnnotation(
-    IOSIntermediateDumpWriter* writer,
-    const uint64_t address,
-    const symtab_command* symtab_command_ptr,
-    const dysymtab_command* dysymtab_command_ptr,
-    const segment_command_64* text_seg_ptr,
-    const segment_command_64* linkedit_seg_ptr,
-    vm_size_t slide) {
-  if (text_seg_ptr == nullptr || linkedit_seg_ptr == nullptr ||
-      symtab_command_ptr == nullptr) {
-    return;
-  }
-
-  ScopedVMRead<symtab_command> symtab_command;
-  ScopedVMRead<dysymtab_command> dysymtab_command;
-  ScopedVMRead<segment_command_64> text_seg;
-  ScopedVMRead<segment_command_64> linkedit_seg;
-  if (!symtab_command.Read(symtab_command_ptr) ||
-      !text_seg.Read(text_seg_ptr) || !linkedit_seg.Read(linkedit_seg_ptr) ||
-      (dysymtab_command_ptr && !dysymtab_command.Read(dysymtab_command_ptr))) {
-    CRASHPAD_RAW_LOG("Unable to load dyld symbol table.");
-  }
-
-  uint64_t file_slide =
-      (linkedit_seg->vmaddr - text_seg->vmaddr) - linkedit_seg->fileoff;
-  uint64_t strings = address + (symtab_command->stroff + file_slide);
-  nlist_64* symbol_ptr = reinterpret_cast<nlist_64*>(
-      address + (symtab_command->symoff + file_slide));
-
-  // If a dysymtab is present, use it to filter the symtab for just the
-  // portion used for extdefsym. If no dysymtab is present, the entire symtab
-  // will need to be consulted.
-  uint32_t symbol_count = symtab_command->nsyms;
-  if (dysymtab_command_ptr) {
-    symbol_ptr += dysymtab_command->iextdefsym;
-    symbol_count = dysymtab_command->nextdefsym;
-  }
-
-  for (uint32_t i = 0; i < symbol_count; i++, symbol_ptr++) {
-    ScopedVMRead<nlist_64> symbol;
-    if (!symbol.Read(symbol_ptr)) {
-      CRASHPAD_RAW_LOG("Unable to load dyld symbol table symbol.");
-      return;
-    }
-
-    if (!symbol->n_value)
-      continue;
-
-    ScopedVMRead<const char> symbol_name;
-    if (!symbol_name.Read(strings + symbol->n_un.n_strx)) {
-      CRASHPAD_RAW_LOG("Unable to load dyld symbol name.");
-    }
-
-    if (strcmp(symbol_name.get(), "_error_string") == 0) {
-      ScopedVMRead<const char> symbol_value;
-      if (!symbol_value.Read(symbol->n_value + slide)) {
-        CRASHPAD_RAW_LOG("Unable to load dyld symbol value.");
-      }
-      // 1024 here is distinct from kMaxMessageSize above, because it refers to
-      // a precisely-sized buffer inside dyld.
-      const size_t value_len = strnlen(symbol_value.get(), 1024);
-      if (value_len) {
-        WriteProperty(writer,
-                      IntermediateDumpKey::kAnnotationsDyldErrorString,
-                      symbol_value.get(),
-                      value_len);
-      }
-      return;
-    }
-
-    continue;
-  }
-}
-
 }  // namespace
 
 // static
@@ -582,7 +549,8 @@ void InProcessIntermediateDumpHandler::WriteHeader(
 
 // static
 void InProcessIntermediateDumpHandler::WriteProcessInfo(
-    IOSIntermediateDumpWriter* writer) {
+    IOSIntermediateDumpWriter* writer,
+    const std::map<std::string, std::string>& annotations) {
   IOSIntermediateDumpWriter::ScopedMap process_map(
       writer, IntermediateDumpKey::kProcessInfo);
 
@@ -597,7 +565,7 @@ void InProcessIntermediateDumpHandler::WriteProcessInfo(
   kinfo_proc kern_proc_info;
   int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid()};
   size_t len = sizeof(kern_proc_info);
-  if (sysctl(mib, base::size(mib), &kern_proc_info, &len, nullptr, 0) == 0) {
+  if (sysctl(mib, std::size(mib), &kern_proc_info, &len, nullptr, 0) == 0) {
     WriteProperty(
         writer, IntermediateDumpKey::kPID, &kern_proc_info.kp_proc.p_pid);
     WriteProperty(writer,
@@ -645,14 +613,33 @@ void InProcessIntermediateDumpHandler::WriteProcessInfo(
                   IntermediateDumpKey::kSystemTime,
                   &task_thread_times.system_time);
   } else {
-    CRASHPAD_RAW_LOG("task_info task_basic_info");
+    CRASHPAD_RAW_LOG("task_info thread_times_info");
+  }
+
+  if (!annotations.empty()) {
+    IOSIntermediateDumpWriter::ScopedArray simple_annotations_array(
+        writer, IntermediateDumpKey::kAnnotationsSimpleMap);
+    for (const auto& annotation_pair : annotations) {
+      const std::string& key = annotation_pair.first;
+      const std::string& value = annotation_pair.second;
+      IOSIntermediateDumpWriter::ScopedArrayMap annotation_map(writer);
+      WriteProperty(writer,
+                    IntermediateDumpKey::kAnnotationName,
+                    key.c_str(),
+                    key.length());
+      WriteProperty(writer,
+                    IntermediateDumpKey::kAnnotationValue,
+                    value.c_str(),
+                    value.length());
+    }
   }
 }
 
 // static
 void InProcessIntermediateDumpHandler::WriteSystemInfo(
     IOSIntermediateDumpWriter* writer,
-    const IOSSystemDataCollector& system_data) {
+    const IOSSystemDataCollector& system_data,
+    uint64_t report_time_nanos) {
   IOSIntermediateDumpWriter::ScopedMap system_map(
       writer, IntermediateDumpKey::kSystemInfo);
 
@@ -712,6 +699,8 @@ void InProcessIntermediateDumpHandler::WriteSystemInfo(
                 IntermediateDumpKey::kDaylightName,
                 daylight_name.c_str(),
                 daylight_name.length());
+  uint64_t address_mask = system_data.AddressMask();
+  WriteProperty(writer, IntermediateDumpKey::kAddressMask, &address_mask);
 
   vm_size_t page_size;
   host_page_size(mach_host_self(), &page_size);
@@ -736,6 +725,11 @@ void InProcessIntermediateDumpHandler::WriteSystemInfo(
   } else {
     CRASHPAD_RAW_LOG("host_statistics");
   }
+
+  uint64_t crashpad_uptime_nanos =
+      report_time_nanos - system_data.InitializationTime();
+  WriteProperty(
+      writer, IntermediateDumpKey::kCrashpadUptime, &crashpad_uptime_nanos);
 }
 
 // static
@@ -747,7 +741,9 @@ void InProcessIntermediateDumpHandler::WriteThreadInfo(
       writer, IntermediateDumpKey::kThreads);
 
   // Exception thread ID.
+#if defined(ARCH_CPU_ARM64)
   uint64_t exception_thread_id = 0;
+#endif
   thread_identifier_info identifier_info;
   mach_msg_type_number_t count = THREAD_IDENTIFIER_INFO_COUNT;
   kern_return_t kr =
@@ -756,7 +752,9 @@ void InProcessIntermediateDumpHandler::WriteThreadInfo(
                   reinterpret_cast<thread_info_t>(&identifier_info),
                   &count);
   if (kr == KERN_SUCCESS) {
+#if defined(ARCH_CPU_ARM64)
     exception_thread_id = identifier_info.thread_id;
+#endif
   } else {
     CRASHPAD_RAW_LOG_ERROR(kr, "thread_info::THREAD_IDENTIFIER_INFO");
   }
@@ -774,7 +772,7 @@ void InProcessIntermediateDumpHandler::WriteThreadInfo(
     thread_t thread = threads[thread_index];
 
     thread_basic_info basic_info;
-    mach_msg_type_number_t count = THREAD_BASIC_INFO_COUNT;
+    count = THREAD_BASIC_INFO_COUNT;
     kr = thread_info(thread,
                      THREAD_BASIC_INFO,
                      reinterpret_cast<thread_info_t>(&basic_info),
@@ -787,6 +785,22 @@ void InProcessIntermediateDumpHandler::WriteThreadInfo(
       CRASHPAD_RAW_LOG_ERROR(kr, "thread_info::THREAD_BASIC_INFO");
     }
 
+    thread_extended_info extended_info;
+    count = THREAD_EXTENDED_INFO_COUNT;
+    kr = thread_info(thread,
+                     THREAD_EXTENDED_INFO,
+                     reinterpret_cast<thread_info_t>(&extended_info),
+                     &count);
+    if (kr == KERN_SUCCESS) {
+      WritePropertyBytes(
+          writer,
+          IntermediateDumpKey::kThreadName,
+          reinterpret_cast<const void*>(extended_info.pth_name),
+          strnlen(extended_info.pth_name, sizeof(extended_info.pth_name)));
+    } else {
+      CRASHPAD_RAW_LOG_ERROR(kr, "thread_info::THREAD_EXTENDED_INFO");
+    }
+
     thread_precedence_policy precedence;
     count = THREAD_PRECEDENCE_POLICY_COUNT;
     boolean_t get_default = FALSE;
@@ -803,15 +817,18 @@ void InProcessIntermediateDumpHandler::WriteThreadInfo(
     }
 
     // Thread ID.
+#if defined(ARCH_CPU_ARM64)
     uint64_t thread_id;
-    thread_identifier_info identifier_info;
+#endif
     count = THREAD_IDENTIFIER_INFO_COUNT;
     kr = thread_info(thread,
                      THREAD_IDENTIFIER_INFO,
                      reinterpret_cast<thread_info_t>(&identifier_info),
                      &count);
     if (kr == KERN_SUCCESS) {
+#if defined(ARCH_CPU_ARM64)
       thread_id = identifier_info.thread_id;
+#endif
       WriteProperty(
           writer, IntermediateDumpKey::kThreadID, &identifier_info.thread_id);
       WriteProperty(writer,
@@ -851,11 +868,10 @@ void InProcessIntermediateDumpHandler::WriteThreadInfo(
     mach_msg_type_number_t debug_state_count = ARM_DEBUG_STATE64_COUNT;
 #endif
 
-    kern_return_t kr =
-        thread_get_state(thread,
-                         kThreadStateFlavor,
-                         reinterpret_cast<thread_state_t>(&thread_state),
-                         &thread_state_count);
+    kr = thread_get_state(thread,
+                          kThreadStateFlavor,
+                          reinterpret_cast<thread_state_t>(&thread_state),
+                          &thread_state_count);
     if (kr != KERN_SUCCESS) {
       CRASHPAD_RAW_LOG_ERROR(kr, "thread_get_state::kThreadStateFlavor");
     }
@@ -882,7 +898,7 @@ void InProcessIntermediateDumpHandler::WriteThreadInfo(
 #if defined(ARCH_CPU_X86_64)
     vm_address_t stack_pointer = thread_state.__rsp;
 #elif defined(ARCH_CPU_ARM64)
-    vm_address_t stack_pointer = thread_state.__sp;
+    vm_address_t stack_pointer = arm_thread_state64_get_sp(thread_state);
 #endif
 
     vm_size_t stack_region_size;
@@ -929,18 +945,18 @@ void InProcessIntermediateDumpHandler::WriteModuleInfo(
 
   uint32_t image_count = image_infos->infoArrayCount;
   const dyld_image_info* image_array = image_infos->infoArray;
-  for (uint32_t image_index = 0; image_index < image_count; ++image_index) {
+  for (int32_t image_index = image_count - 1; image_index >= 0; --image_index) {
     IOSIntermediateDumpWriter::ScopedArrayMap modules(writer);
     ScopedVMRead<dyld_image_info> image;
     if (!image.Read(&image_array[image_index])) {
       CRASHPAD_RAW_LOG("Unable to dyld_image_info");
-      return;
+      continue;
     }
 
-    WriteProperty(writer,
-                  IntermediateDumpKey::kName,
-                  image->imageFilePath,
-                  strlen(image->imageFilePath));
+    if (image->imageFilePath) {
+      WritePropertyCString(
+          writer, IntermediateDumpKey::kName, PATH_MAX, image->imageFilePath);
+    }
     uint64_t address = FromPointerCast<uint64_t>(image->imageLoadAddress);
     WriteProperty(writer, IntermediateDumpKey::kAddress, &address);
     WriteProperty(
@@ -950,7 +966,10 @@ void InProcessIntermediateDumpHandler::WriteModuleInfo(
 
   {
     IOSIntermediateDumpWriter::ScopedArrayMap modules(writer);
-    WriteProperty(writer, IntermediateDumpKey::kName, image_infos->dyldPath);
+    if (image_infos->dyldPath) {
+      WritePropertyCString(
+          writer, IntermediateDumpKey::kName, PATH_MAX, image_infos->dyldPath);
+    }
     uint64_t address =
         FromPointerCast<uint64_t>(image_infos->dyldImageLoadAddress);
     WriteProperty(writer, IntermediateDumpKey::kAddress, &address);
@@ -970,19 +989,19 @@ void InProcessIntermediateDumpHandler::WriteExceptionFromSignal(
   WriteProperty(writer, IntermediateDumpKey::kSignalNumber, &siginfo->si_signo);
   WriteProperty(writer, IntermediateDumpKey::kSignalCode, &siginfo->si_code);
   WriteProperty(writer, IntermediateDumpKey::kSignalAddress, &siginfo->si_addr);
+
 #if defined(ARCH_CPU_X86_64)
-  WriteProperty(
-      writer, IntermediateDumpKey::kThreadState, &context->uc_mcontext->__ss);
-  WriteProperty(
-      writer, IntermediateDumpKey::kFloatState, &context->uc_mcontext->__fs);
+  x86_thread_state64_t thread_state = context->uc_mcontext->__ss;
+  x86_float_state64_t float_state = context->uc_mcontext->__fs;
 #elif defined(ARCH_CPU_ARM64)
-  WriteProperty(
-      writer, IntermediateDumpKey::kThreadState, &context->uc_mcontext->__ss);
-  WriteProperty(
-      writer, IntermediateDumpKey::kFloatState, &context->uc_mcontext->__ns);
+  arm_thread_state64_t thread_state = context->uc_mcontext->__ss;
+  arm_neon_state64_t float_state = context->uc_mcontext->__ns;
 #else
 #error Port to your CPU architecture
 #endif
+  WriteProperty(writer, IntermediateDumpKey::kThreadState, &thread_state);
+  WriteProperty(writer, IntermediateDumpKey::kFloatState, &float_state);
+  CaptureMemoryPointedToByThreadState(writer, thread_state);
 
   // Thread ID.
   thread_identifier_info identifier_info;
@@ -1068,132 +1087,106 @@ void InProcessIntermediateDumpHandler::WriteModuleInfoAtAddress(
     return;
   }
 
-  const load_command* command_ptr = reinterpret_cast<const load_command*>(
-      reinterpret_cast<const mach_header_64*>(address) + 1);
+  const load_command* unsafe_command_ptr =
+      reinterpret_cast<const load_command*>(
+          reinterpret_cast<const mach_header_64*>(address) + 1);
 
-  ScopedVMRead<load_command> command;
-  if (!command.Read(command_ptr)) {
-    CRASHPAD_RAW_LOG("Invalid module command");
+  // Rather than using an individual ScopedVMRead for each load_command, load
+  // the entire block of commands at once.
+  ScopedVMRead<char> all_commands;
+  if (!all_commands.Read(unsafe_command_ptr, header->sizeofcmds)) {
+    CRASHPAD_RAW_LOG("Unable to read module load_commands.");
     return;
   }
 
+  // All the *_vm_read_ptr variables in the load_command loop below have been
+  // vm_read in `all_commands` above, and may be dereferenced without additional
+  // ScopedVMReads.
+  const load_command* command_vm_read_ptr =
+      reinterpret_cast<const load_command*>(all_commands.get());
+
   // Make sure that the basic load command structure doesn’t overflow the
   // space allotted for load commands, as well as iterating through ncmds.
   vm_size_t slide = 0;
-  const symtab_command* symtab_command = nullptr;
-  const dysymtab_command* dysymtab_command = nullptr;
-  const segment_command_64* linkedit_seg = nullptr;
-  const segment_command_64* text_seg = nullptr;
   for (uint32_t cmd_index = 0, cumulative_cmd_size = 0;
-       cmd_index <= header->ncmds && cumulative_cmd_size < header->sizeofcmds;
-       ++cmd_index, cumulative_cmd_size += command->cmdsize) {
-    if (command->cmd == LC_SEGMENT_64) {
-      ScopedVMRead<segment_command_64> segment;
-      if (!segment.Read(command_ptr)) {
-        CRASHPAD_RAW_LOG("Invalid LC_SEGMENT_64 segment");
-        return;
-      }
-      const segment_command_64* segment_ptr =
-          reinterpret_cast<const segment_command_64*>(command_ptr);
-      if (strcmp(segment->segname, SEG_TEXT) == 0) {
-        text_seg = segment_ptr;
-        WriteProperty(writer, IntermediateDumpKey::kSize, &segment->vmsize);
-        slide = address - segment->vmaddr;
-      } else if (strcmp(segment->segname, SEG_DATA) == 0) {
-        WriteDataSegmentAnnotations(writer, segment_ptr, slide);
-      } else if (strcmp(segment->segname, SEG_LINKEDIT) == 0) {
-        linkedit_seg = segment_ptr;
-      }
-    } else if (command->cmd == LC_SYMTAB) {
-      symtab_command =
-          reinterpret_cast<const struct symtab_command*>(command_ptr);
-    } else if (command->cmd == LC_DYSYMTAB) {
-      dysymtab_command =
-          reinterpret_cast<const struct dysymtab_command*>(command_ptr);
-    } else if (command->cmd == LC_ID_DYLIB) {
-      ScopedVMRead<dylib_command> dylib;
-      if (!dylib.Read(command_ptr)) {
-        CRASHPAD_RAW_LOG("Invalid LC_ID_DYLIB segment");
-        return;
+       cmd_index < header->ncmds && cumulative_cmd_size < header->sizeofcmds;
+       ++cmd_index) {
+    if (command_vm_read_ptr->cmd == LC_SEGMENT_64) {
+      const segment_command_64* segment_vm_read_ptr =
+          reinterpret_cast<const segment_command_64*>(command_vm_read_ptr);
+      if (strcmp(segment_vm_read_ptr->segname, SEG_TEXT) == 0) {
+        WriteProperty(
+            writer, IntermediateDumpKey::kSize, &segment_vm_read_ptr->vmsize);
+        slide = address - segment_vm_read_ptr->vmaddr;
+      } else if (strcmp(segment_vm_read_ptr->segname, SEG_DATA) == 0 ||
+                 // dyld puts __crash_info in __DATA_DIRTY.
+                 strcmp(segment_vm_read_ptr->segname, "__DATA_DIRTY") == 0) {
+        WriteDataSegmentAnnotations(writer, segment_vm_read_ptr, slide);
       }
+    } else if (command_vm_read_ptr->cmd == LC_ID_DYLIB) {
+      const dylib_command* dylib_vm_read_ptr =
+          reinterpret_cast<const dylib_command*>(command_vm_read_ptr);
       WriteProperty(writer,
                     IntermediateDumpKey::kDylibCurrentVersion,
-                    &dylib->dylib.current_version);
-    } else if (command->cmd == LC_SOURCE_VERSION) {
-      ScopedVMRead<source_version_command> source_version;
-      if (!source_version.Read(command_ptr)) {
-        CRASHPAD_RAW_LOG("Invalid LC_SOURCE_VERSION segment");
-        return;
-      }
+                    &dylib_vm_read_ptr->dylib.current_version);
+    } else if (command_vm_read_ptr->cmd == LC_SOURCE_VERSION) {
+      const source_version_command* source_version_vm_read_ptr =
+          reinterpret_cast<const source_version_command*>(command_vm_read_ptr);
       WriteProperty(writer,
                     IntermediateDumpKey::kSourceVersion,
-                    &source_version->version);
-    } else if (command->cmd == LC_UUID) {
-      ScopedVMRead<uuid_command> uuid;
-      if (!uuid.Read(command_ptr)) {
-        CRASHPAD_RAW_LOG("Invalid LC_UUID segment");
-        return;
-      }
-      WriteProperty(writer, IntermediateDumpKey::kUUID, &uuid->uuid);
+                    &source_version_vm_read_ptr->version);
+    } else if (command_vm_read_ptr->cmd == LC_UUID) {
+      const uuid_command* uuid_vm_read_ptr =
+          reinterpret_cast<const uuid_command*>(command_vm_read_ptr);
+      WriteProperty(
+          writer, IntermediateDumpKey::kUUID, &uuid_vm_read_ptr->uuid);
     }
 
-    command_ptr = reinterpret_cast<const load_command*>(
-        reinterpret_cast<const uint8_t*>(command_ptr) + command->cmdsize);
-    if (!command.Read(command_ptr)) {
-      CRASHPAD_RAW_LOG("Invalid module command");
-      return;
-    }
+    cumulative_cmd_size += command_vm_read_ptr->cmdsize;
+    command_vm_read_ptr = reinterpret_cast<const load_command*>(
+        reinterpret_cast<const uint8_t*>(command_vm_read_ptr) +
+        command_vm_read_ptr->cmdsize);
   }
 
   WriteProperty(writer, IntermediateDumpKey::kFileType, &header->filetype);
-
-  if (is_dyld && header->filetype == MH_DYLINKER) {
-    WriteDyldErrorStringAnnotation(writer,
-                                   address,
-                                   symtab_command,
-                                   dysymtab_command,
-                                   text_seg,
-                                   linkedit_seg,
-                                   slide);
-  }
 }
 
 void InProcessIntermediateDumpHandler::WriteDataSegmentAnnotations(
     IOSIntermediateDumpWriter* writer,
-    const segment_command_64* segment_ptr,
+    const segment_command_64* segment_vm_read_ptr,
     vm_size_t slide) {
-  ScopedVMRead<segment_command_64> segment;
-  if (!segment.Read(segment_ptr)) {
-    CRASHPAD_RAW_LOG("Unable to read SEG_DATA.");
-    return;
-  }
-  const section_64* section_ptr = reinterpret_cast<const section_64*>(
-      reinterpret_cast<uint64_t>(segment_ptr) + sizeof(segment_command_64));
-  for (uint32_t sect_index = 0; sect_index <= segment->nsects; ++sect_index) {
-    ScopedVMRead<section_64> section;
-    if (!section.Read(section_ptr)) {
-      CRASHPAD_RAW_LOG("Unable to read SEG_DATA section.");
-      return;
-    }
-    if (strcmp(section->sectname, "crashpad_info") == 0) {
-      ScopedVMRead<CrashpadInfo> crashpad_info;
-      if (crashpad_info.Read(section->addr + slide) &&
-          crashpad_info->size() == sizeof(CrashpadInfo) &&
-          crashpad_info->signature() == CrashpadInfo::kSignature &&
-          crashpad_info->version() == 1) {
-        WriteCrashpadAnnotationsList(writer, crashpad_info.get());
-        WriteCrashpadSimpleAnnotationsDictionary(writer, crashpad_info.get());
+  const section_64* section_vm_read_ptr = reinterpret_cast<const section_64*>(
+      reinterpret_cast<uint64_t>(segment_vm_read_ptr) +
+      sizeof(segment_command_64));
+  for (uint32_t sect_index = 0; sect_index <= segment_vm_read_ptr->nsects;
+       ++sect_index) {
+    if (strcmp(section_vm_read_ptr->sectname, "crashpad_info") == 0) {
+      if (section_vm_read_ptr->size >= sizeof(CrashpadInfo)) {
+        ScopedVMRead<CrashpadInfo> crashpad_info;
+        if (crashpad_info.Read(section_vm_read_ptr->addr + slide) &&
+            crashpad_info->size() <= section_vm_read_ptr->size &&
+            crashpad_info->size() >= sizeof(CrashpadInfo) &&
+            crashpad_info->signature() == CrashpadInfo::kSignature &&
+            crashpad_info->version() == 1) {
+          WriteCrashpadAnnotationsList(writer, crashpad_info.get());
+          WriteCrashpadSimpleAnnotationsDictionary(writer, crashpad_info.get());
+          WriteCrashpadExtraMemoryRanges(writer, crashpad_info.get());
+          WriteCrashpadIntermediateDumpExtraMemoryRanges(writer,
+                                                         crashpad_info.get());
+        }
       }
-    } else if (strcmp(section->sectname, "__crash_info") == 0) {
-      ScopedVMRead<crashreporter_annotations_t> crash_info;
-      if (!crash_info.Read(section->addr + slide) ||
-          (crash_info->version != 4 && crash_info->version != 5)) {
-        continue;
+    } else if (strcmp(section_vm_read_ptr->sectname, "__crash_info") == 0) {
+      if (section_vm_read_ptr->size >= sizeof(crashreporter_annotations_t)) {
+        ScopedVMRead<crashreporter_annotations_t> crash_info;
+        if (crash_info.Read(section_vm_read_ptr->addr + slide) &&
+            (crash_info->version == 4 || crash_info->version == 5 ||
+             crash_info->version == 7)) {
+          WriteAppleCrashReporterAnnotations(writer, crash_info.get());
+        }
       }
-      WriteAppleCrashReporterAnnotations(writer, crash_info.get());
     }
-    section_ptr = reinterpret_cast<const section_64*>(
-        reinterpret_cast<uint64_t>(section_ptr) + sizeof(section_64));
+    section_vm_read_ptr = reinterpret_cast<const section_64*>(
+        reinterpret_cast<uint64_t>(section_vm_read_ptr) + sizeof(section_64));
   }
 }
 
@@ -1212,6 +1205,13 @@ void InProcessIntermediateDumpHandler::WriteCrashpadAnnotationsList(
   IOSIntermediateDumpWriter::ScopedArray annotations_array(
       writer, IntermediateDumpKey::kAnnotationObjects);
   ScopedVMRead<Annotation> current;
+
+  // Use vm_read() to ensure that the linked-list AnnotationList head (which is
+  // a dummy node of type kInvalid) is valid and copy its memory into a
+  // newly-allocated buffer.
+  //
+  // In the case where the pointer has been clobbered or the memory range is not
+  // readable, skip reading all the Annotations.
   if (!current.Read(annotation_list->head())) {
     CRASHPAD_RAW_LOG("Unable to read annotation");
     return;
@@ -1222,6 +1222,12 @@ void InProcessIntermediateDumpHandler::WriteCrashpadAnnotationsList(
        index < kMaxNumberOfAnnotations;
        ++index) {
     ScopedVMRead<Annotation> node;
+
+    // Like above, use vm_read() to ensure that the node in the linked list is
+    // valid and copy its memory into a newly-allocated buffer.
+    //
+    // In the case where the pointer has been clobbered or the memory range is
+    // not readable, skip reading this and all further Annotations.
     if (!node.Read(current->link_node())) {
       CRASHPAD_RAW_LOG("Unable to read annotation");
       return;
@@ -1236,13 +1242,41 @@ void InProcessIntermediateDumpHandler::WriteCrashpadAnnotationsList(
       continue;
     }
 
+    // For Annotations which support guarding reads from concurrent writes, map
+    // their memory read-write using vm_remap(), then declare a ScopedSpinGuard
+    // which lives for the duration of the read.
+    ScopedVMMap<Annotation> mapped_node;
+    std::optional<ScopedSpinGuard> annotation_guard;
+    if (node->concurrent_access_guard_mode() ==
+        Annotation::ConcurrentAccessGuardMode::kScopedSpinGuard) {
+      constexpr vm_prot_t kDesiredProtection = VM_PROT_WRITE | VM_PROT_READ;
+      if (!mapped_node.Map(node.get()) ||
+          (mapped_node.CurrentProtection() & kDesiredProtection) !=
+              kDesiredProtection) {
+        CRASHPAD_RAW_LOG("Unable to map annotation");
+
+        // Skip this annotation rather than giving up entirely, since the linked
+        // node should still be valid.
+        continue;
+      }
+
+      // TODO(https://crbug.com/crashpad/438): Pass down a `params` object into
+      // this method to optionally enable a timeout here.
+      constexpr uint64_t kTimeoutNanoseconds = 0;
+      annotation_guard =
+          mapped_node->TryCreateScopedSpinGuard(kTimeoutNanoseconds);
+      if (!annotation_guard) {
+        // This is expected if the process is writing to the Annotation, so
+        // don't log here and skip the annotation.
+        continue;
+      }
+    }
+
     IOSIntermediateDumpWriter::ScopedArrayMap annotation_map(writer);
-    const size_t name_len = strnlen(reinterpret_cast<const char*>(node->name()),
-                                    Annotation::kNameMaxLength);
-    WritePropertyBytes(writer,
-                       IntermediateDumpKey::kAnnotationName,
-                       reinterpret_cast<const void*>(node->name()),
-                       name_len);
+    WritePropertyCString(writer,
+                         IntermediateDumpKey::kAnnotationName,
+                         Annotation::kNameMaxLength,
+                         reinterpret_cast<const char*>(node->name()));
     WritePropertyBytes(writer,
                        IntermediateDumpKey::kAnnotationValue,
                        reinterpret_cast<const void*>(node->value()),
@@ -1255,5 +1289,72 @@ void InProcessIntermediateDumpHandler::WriteCrashpadAnnotationsList(
   }
 }
 
+void InProcessIntermediateDumpHandler::WriteCrashpadExtraMemoryRanges(
+    IOSIntermediateDumpWriter* writer,
+    CrashpadInfo* crashpad_info) {
+  if (!crashpad_info->extra_memory_ranges()) {
+    return;
+  }
+
+  ScopedVMRead<SimpleAddressRangeBag> extra_memory_ranges;
+  if (!extra_memory_ranges.Read(crashpad_info->extra_memory_ranges())) {
+    CRASHPAD_RAW_LOG("Unable to read extra memory ranges object");
+    return;
+  }
+
+  IOSIntermediateDumpWriter::ScopedArray module_extra_memory_regions_array(
+      writer, IntermediateDumpKey::kModuleExtraMemoryRegions);
+
+  SimpleAddressRangeBag::Iterator iterator(*(extra_memory_ranges.get()));
+  while (const SimpleAddressRangeBag::Entry* entry = iterator.Next()) {
+    const uint64_t& address = entry->base;
+    const uint64_t& size = entry->size;
+    IOSIntermediateDumpWriter::ScopedArrayMap memory_region_map(writer);
+    WriteProperty(
+        writer, IntermediateDumpKey::kModuleExtraMemoryRegionAddress, &address);
+    WritePropertyBytes(writer,
+                       IntermediateDumpKey::kModuleExtraMemoryRegionData,
+                       reinterpret_cast<const void*>(address),
+                       size);
+  }
+}
+
+void InProcessIntermediateDumpHandler::
+    WriteCrashpadIntermediateDumpExtraMemoryRanges(
+        IOSIntermediateDumpWriter* writer,
+        CrashpadInfo* crashpad_info) {
+  if (!crashpad_info->intermediate_dump_extra_memory_ranges()) {
+    return;
+  }
+
+  ScopedVMRead<SimpleAddressRangeBag> intermediate_dump_extra_memory;
+  if (!intermediate_dump_extra_memory.Read(
+          crashpad_info->intermediate_dump_extra_memory_ranges())) {
+    CRASHPAD_RAW_LOG(
+        "Unable to read intermediate dump extra memory ranges object");
+    return;
+  }
+
+  IOSIntermediateDumpWriter::ScopedArray module_extra_memory_regions_array(
+      writer, IntermediateDumpKey::kModuleIntermediateDumpExtraMemoryRegions);
+
+  SimpleAddressRangeBag::Iterator iterator(
+      *(intermediate_dump_extra_memory.get()));
+  while (const SimpleAddressRangeBag::Entry* entry = iterator.Next()) {
+    const uint64_t& address = entry->base;
+    const uint64_t& size = entry->size;
+    IOSIntermediateDumpWriter::ScopedArrayMap memory_region_map(writer);
+    WriteProperty(
+        writer,
+        IntermediateDumpKey::kModuleIntermediateDumpExtraMemoryRegionAddress,
+        &address);
+    WritePropertyBytes(
+        writer,
+        IntermediateDumpKey::kModuleIntermediateDumpExtraMemoryRegionData,
+        reinterpret_cast<const void*>(address),
+        size);
+  }
+}
+
 }  // namespace internal
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/client/ios_handler/in_process_intermediate_dump_handler.h b/extern/crashpad/crashpad/client/ios_handler/in_process_intermediate_dump_handler.h
index 6281563006..0fa43b6ff0 100644
--- a/extern/crashpad/crashpad/client/ios_handler/in_process_intermediate_dump_handler.h
+++ b/extern/crashpad/crashpad/client/ios_handler/in_process_intermediate_dump_handler.h
@@ -1,4 +1,4 @@
-// Copyright 2021 The Crashpad Authors. All rights reserved.
+// Copyright 2021 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,9 +17,10 @@
 
 #include <mach-o/loader.h>
 #include <mach/mach.h>
-#include <signal.h>
 #include <sys/types.h>
 
+#include <map>
+
 #include "client/crashpad_info.h"
 #include "util/ios/ios_intermediate_dump_writer.h"
 #include "util/ios/ios_system_data_collector.h"
@@ -46,13 +47,20 @@ class InProcessIntermediateDumpHandler final {
   //! \brief Write ProcessSnapshot data to the intermediate dump.
   //!
   //! \param[in] writer The dump writer
-  static void WriteProcessInfo(IOSIntermediateDumpWriter* writer);
+  //! \param[in] annotations The simple map annotations.
+  static void WriteProcessInfo(
+      IOSIntermediateDumpWriter* writer,
+      const std::map<std::string, std::string>& annotations);
 
   //! \brief Write SystemSnapshot data to the intermediate dump.
   //!
   //! \param[in] writer The dump writer
+  //! \param[in] system_data An object containing various system data points.
+  //! \param[in] report_time_nanos Report creation time in nanoseconds as
+  //!     returned by ClockMonotonicNanoseconds().
   static void WriteSystemInfo(IOSIntermediateDumpWriter* writer,
-                              const IOSSystemDataCollector& system_data);
+                              const IOSSystemDataCollector& system_data,
+                              uint64_t report_time_nanos);
 
   //! \brief Write ThreadSnapshot data to the intermediate dump.
   //!
@@ -94,11 +102,10 @@ class InProcessIntermediateDumpHandler final {
   //! \brief Write an ExceptionSnapshot from a mach exception to the
   //!     intermediate dump.
   //!
-  //!  Only one of the WriteExceptionFromSignal, WriteExceptionFromMachException
-  //!  and WriteExceptionFromNSException should be called per intermediate dump.
+  //! Only one of the WriteExceptionFromSignal, WriteExceptionFromMachException
+  //! and WriteExceptionFromNSException should be called per intermediate dump.
   //!
   //! \param[in] writer The dump writer
-  //! \param[in] system_data An object containing various system data points.
   //! \param[in] behavior
   //! \param[in] thread
   //! \param[in] exception
@@ -134,14 +141,25 @@ class InProcessIntermediateDumpHandler final {
                                        bool is_dyld);
 
   //! \brief Extract and write Apple crashreporter_annotations_t data and
-  //!     Crashpad annotations.
-  static void WriteDataSegmentAnnotations(IOSIntermediateDumpWriter* writer,
-                                          const segment_command_64* segment_ptr,
-                                          vm_size_t slide);
+  //!     Crashpad annotations. Note that \a segment_vm_read_ptr has already
+  //!     been read via vm_read and may be dereferenced without a ScopedVMRead.
+  static void WriteDataSegmentAnnotations(
+      IOSIntermediateDumpWriter* writer,
+      const segment_command_64* segment_vm_read_ptr,
+      vm_size_t slide);
 
   //! \brief Write Crashpad annotations list.
   static void WriteCrashpadAnnotationsList(IOSIntermediateDumpWriter* writer,
                                            CrashpadInfo* crashpad_info);
+
+  //! \brief Write Crashpad extra memory data.
+  static void WriteCrashpadExtraMemoryRanges(IOSIntermediateDumpWriter* writer,
+                                             CrashpadInfo* crashpad_info);
+
+  //! \brief Write Crashpad intermediate dump extra memory data.
+  static void WriteCrashpadIntermediateDumpExtraMemoryRanges(
+      IOSIntermediateDumpWriter* writer,
+      CrashpadInfo* crashpad_info);
 };
 
 }  // namespace internal
diff --git a/extern/crashpad/crashpad/client/ios_handler/in_process_intermediate_dump_handler_test.cc b/extern/crashpad/crashpad/client/ios_handler/in_process_intermediate_dump_handler_test.cc
index 9616ce75e5..3b1a200807 100644
--- a/extern/crashpad/crashpad/client/ios_handler/in_process_intermediate_dump_handler_test.cc
+++ b/extern/crashpad/crashpad/client/ios_handler/in_process_intermediate_dump_handler_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2021 The Crashpad Authors. All rights reserved.
+// Copyright 2021 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,7 +16,10 @@
 
 #include <sys/utsname.h>
 
-#include "base/cxx17_backports.h"
+#include <atomic>
+#include <iterator>
+#include <thread>
+
 #include "base/files/file_path.h"
 #include "build/build_config.h"
 #include "client/annotation.h"
@@ -24,7 +27,10 @@
 #include "client/crashpad_info.h"
 #include "client/simple_string_dictionary.h"
 #include "gtest/gtest.h"
+#include "minidump/minidump_file_writer.h"
 #include "snapshot/ios/process_snapshot_ios_intermediate_dump.h"
+#include "snapshot/minidump/process_snapshot_minidump.h"
+#include "test/scoped_set_thread_name.h"
 #include "test/scoped_temp_dir.h"
 #include "test/test_paths.h"
 #include "util/file/filesystem.h"
@@ -36,6 +42,16 @@ namespace {
 
 using internal::InProcessIntermediateDumpHandler;
 
+class ReadToString : public crashpad::MemorySnapshot::Delegate {
+ public:
+  std::string result;
+
+  bool MemorySnapshotDelegateRead(void* data, size_t size) override {
+    result = std::string(reinterpret_cast<const char*>(data), size);
+    return true;
+  }
+};
+
 class InProcessIntermediateDumpHandlerTest : public testing::Test {
  protected:
   // testing::Test:
@@ -48,18 +64,23 @@ class InProcessIntermediateDumpHandlerTest : public testing::Test {
   }
 
   void TearDown() override {
+    EXPECT_TRUE(writer_->Close());
     writer_.reset();
     EXPECT_FALSE(IsRegularFile(path_));
   }
 
-  void WriteReport() {
-    internal::IOSIntermediateDumpWriter::ScopedRootMap rootMap(writer_.get());
-    InProcessIntermediateDumpHandler::WriteHeader(writer_.get());
-    InProcessIntermediateDumpHandler::WriteProcessInfo(writer_.get());
-    InProcessIntermediateDumpHandler::WriteSystemInfo(writer_.get(),
-                                                      system_data_);
-    InProcessIntermediateDumpHandler::WriteThreadInfo(writer_.get(), 0, 0);
-    InProcessIntermediateDumpHandler::WriteModuleInfo(writer_.get());
+  void WriteReportAndCloseWriter() {
+    {
+      internal::IOSIntermediateDumpWriter::ScopedRootMap rootMap(writer_.get());
+      InProcessIntermediateDumpHandler::WriteHeader(writer_.get());
+      InProcessIntermediateDumpHandler::WriteProcessInfo(
+          writer_.get(), {{"before_dump", "pre"}});
+      InProcessIntermediateDumpHandler::WriteSystemInfo(
+          writer_.get(), system_data_, ClockMonotonicNanoseconds());
+      InProcessIntermediateDumpHandler::WriteThreadInfo(writer_.get(), 0, 0);
+      InProcessIntermediateDumpHandler::WriteModuleInfo(writer_.get());
+    }
+    EXPECT_TRUE(writer_->Close());
   }
 
   void WriteMachException() {
@@ -73,7 +94,7 @@ class InProcessIntermediateDumpHandlerTest : public testing::Test {
         mach_thread_self(),
         kSimulatedException,
         code,
-        base::size(code),
+        std::size(code),
         MACHINE_THREAD_STATE,
         reinterpret_cast<ConstThreadState>(&cpu_context),
         MACHINE_THREAD_STATE_COUNT);
@@ -82,6 +103,25 @@ class InProcessIntermediateDumpHandlerTest : public testing::Test {
   const auto& path() const { return path_; }
   auto writer() const { return writer_.get(); }
 
+#if TARGET_OS_SIMULATOR
+  // macOS 14.0 is 23A344, macOS 13.6.5 is 22G621, so if the first two
+  // characters in the kern.osversion are > 22, this build will reproduce the
+  // simulator bug in crbug.com/328282286
+  // This now reproduces on macOS 15.4 24E248 as well for iOS17 simulators.
+  bool HasMacOSBrokeDYLDTaskInfo() {
+    if (__builtin_available(iOS 18, *)) {
+      return false;
+    }
+    if (std::stoi(system_data_.Build().substr(0, 2)) >= 24) {
+      return true;
+    }
+    if (__builtin_available(iOS 17, *)) {
+      return false;
+    }
+    return std::stoi(system_data_.Build().substr(0, 2)) > 22;
+  }
+#endif
+
  private:
   std::unique_ptr<internal::IOSIntermediateDumpWriter> writer_;
   internal::IOSSystemDataCollector system_data_;
@@ -90,28 +130,43 @@ class InProcessIntermediateDumpHandlerTest : public testing::Test {
 };
 
 TEST_F(InProcessIntermediateDumpHandlerTest, TestSystem) {
-  WriteReport();
+  WriteReportAndCloseWriter();
   internal::ProcessSnapshotIOSIntermediateDump process_snapshot;
-  ASSERT_TRUE(process_snapshot.Initialize(path(), {}));
+  ASSERT_TRUE(process_snapshot.InitializeWithFilePath(path(), {}));
 
   // Snpahot
   const SystemSnapshot* system = process_snapshot.System();
   ASSERT_NE(system, nullptr);
 #if defined(ARCH_CPU_X86_64)
   EXPECT_EQ(system->GetCPUArchitecture(), kCPUArchitectureX86_64);
-  EXPECT_STREQ(system->CPUVendor().c_str(), "GenuineIntel");
 #elif defined(ARCH_CPU_ARM64)
   EXPECT_EQ(system->GetCPUArchitecture(), kCPUArchitectureARM64);
+#else
+#error Port to your CPU architecture
+#endif
+#if TARGET_OS_SIMULATOR
+  EXPECT_EQ(system->MachineDescription().substr(0, 13),
+            std::string("iOS Simulator"));
+#elif TARGET_OS_IPHONE
   utsname uts;
   ASSERT_EQ(uname(&uts), 0);
   EXPECT_STREQ(system->MachineDescription().c_str(), uts.machine);
-#else
-#error Port to your CPU architecture
 #endif
+
   EXPECT_EQ(system->GetOperatingSystem(), SystemSnapshot::kOperatingSystemIOS);
 }
 
 TEST_F(InProcessIntermediateDumpHandlerTest, TestAnnotations) {
+#if TARGET_OS_SIMULATOR
+  // This test will fail on <iOS17 simulators when running on macOS >=14.3 or
+  // <iOS18 simulators when running on macOS >=15.4 due to a bug in Simulator.
+  // crbug.com/328282286
+  if (HasMacOSBrokeDYLDTaskInfo()) {
+    // For TearDown.
+    ASSERT_TRUE(LoggingRemoveFile(path()));
+    return;
+  }
+#endif
   // This is “leaked” to crashpad_info.
   crashpad::SimpleStringDictionary* simple_annotations =
       new crashpad::SimpleStringDictionary();
@@ -142,13 +197,16 @@ TEST_F(InProcessIntermediateDumpHandlerTest, TestAnnotations) {
   test_annotation_four.Set("same-name 4");
   test_annotation_two.Clear();
 
-  WriteReport();
+  WriteReportAndCloseWriter();
   internal::ProcessSnapshotIOSIntermediateDump process_snapshot;
-  ASSERT_TRUE(process_snapshot.Initialize(path(), {{"after_dump", "post"}}));
+  ASSERT_TRUE(process_snapshot.InitializeWithFilePath(
+      path(), {{"after_dump", "post"}}));
 
   auto process_map = process_snapshot.AnnotationsSimpleMap();
-  EXPECT_EQ(process_map.size(), 1u);
+  EXPECT_EQ(process_map.size(), 3u);
+  EXPECT_EQ(process_map["before_dump"], "pre");
   EXPECT_EQ(process_map["after_dump"], "post");
+  EXPECT_TRUE(process_map.find("crashpad_uptime_ns") != process_map.end());
 
   std::map<std::string, std::string> all_annotations_simple_map;
   std::vector<AnnotationSnapshot> all_annotations;
@@ -194,10 +252,114 @@ TEST_F(InProcessIntermediateDumpHandlerTest, TestAnnotations) {
   }
 }
 
+TEST_F(InProcessIntermediateDumpHandlerTest, TestExtraMemoryRanges) {
+#if TARGET_OS_SIMULATOR
+  // This test will fail on <iOS17 simulators when running on macOS >=14.3 or
+  // <iOS18 simulators when running on macOS >=15.4 due to a bug in Simulator.
+  // crbug.com/328282286
+  if (HasMacOSBrokeDYLDTaskInfo()) {
+    // For TearDown.
+    ASSERT_TRUE(LoggingRemoveFile(path()));
+    return;
+  }
+#endif
+
+  // Put the string on the heap so the memory doesn't coalesce with the stack.
+  std::unique_ptr<std::string> someExtraMemoryString(
+      new std::string("extra memory range"));
+  crashpad::SimpleAddressRangeBag* ios_extra_ranges =
+      new crashpad::SimpleAddressRangeBag();
+  crashpad::CrashpadInfo::GetCrashpadInfo()->set_extra_memory_ranges(
+      ios_extra_ranges);
+  ios_extra_ranges->Insert((void*)someExtraMemoryString->c_str(), 18);
+  WriteReportAndCloseWriter();
+  crashpad::CrashpadInfo::GetCrashpadInfo()->set_extra_memory_ranges(nullptr);
+  internal::ProcessSnapshotIOSIntermediateDump process_snapshot;
+  ASSERT_TRUE(process_snapshot.InitializeWithFilePath(path(), {}));
+  ASSERT_EQ(process_snapshot.ExtraMemory().size(), 1LU);
+  auto memory = process_snapshot.ExtraMemory()[0];
+  EXPECT_EQ(memory->Address(),
+            reinterpret_cast<uint64_t>(someExtraMemoryString->c_str()));
+  EXPECT_EQ(memory->Size(), 18LU);
+  ReadToString delegate;
+  ASSERT_TRUE(memory->Read(&delegate));
+  EXPECT_EQ(delegate.result, someExtraMemoryString->c_str());
+
+  StringFile string_file;
+  MinidumpFileWriter minidump_file_writer;
+  minidump_file_writer.InitializeFromSnapshot(&process_snapshot);
+  ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
+
+  ProcessSnapshotMinidump process_snapshot_minidump;
+  EXPECT_TRUE(process_snapshot_minidump.Initialize(&string_file));
+  bool found;
+  for (auto minidump_memory : process_snapshot_minidump.ExtraMemory()) {
+    if (minidump_memory->Address() ==
+            reinterpret_cast<uint64_t>(someExtraMemoryString->c_str()) &&
+        minidump_memory->Size() == 18LU) {
+      found = true;
+      break;
+    }
+  }
+  EXPECT_TRUE(found);
+}
+
+TEST_F(InProcessIntermediateDumpHandlerTest,
+       TestIntermediateDumpExtraMemoryRanges) {
+#if TARGET_OS_SIMULATOR
+  // This test will fail on <iOS17 simulators when running on macOS >=14.3 or
+  // <iOS18 simulators when running on macOS >=15.4 due to a bug in Simulator.
+  // crbug.com/328282286
+  if (HasMacOSBrokeDYLDTaskInfo()) {
+    // For TearDown.
+    ASSERT_TRUE(LoggingRemoveFile(path()));
+    return;
+  }
+#endif
+
+  // Put the string on the heap so the memory doesn't coalesce with the stack.
+  std::unique_ptr<std::string> someExtraMemoryString(
+      new std::string("extra memory range"));
+  crashpad::SimpleAddressRangeBag* ios_extra_ranges =
+      new crashpad::SimpleAddressRangeBag();
+  crashpad::CrashpadInfo::GetCrashpadInfo()
+      ->set_intermediate_dump_extra_memory_ranges(ios_extra_ranges);
+  ios_extra_ranges->Insert((void*)someExtraMemoryString->c_str(), 18);
+  WriteReportAndCloseWriter();
+  crashpad::CrashpadInfo::GetCrashpadInfo()
+      ->set_intermediate_dump_extra_memory_ranges(nullptr);
+  internal::ProcessSnapshotIOSIntermediateDump process_snapshot;
+  ASSERT_TRUE(process_snapshot.InitializeWithFilePath(path(), {}));
+  ASSERT_EQ(process_snapshot.IntermediateDumpExtraMemory().size(), 1LU);
+  auto memory = process_snapshot.IntermediateDumpExtraMemory()[0];
+  EXPECT_EQ(memory->Address(),
+            reinterpret_cast<uint64_t>(someExtraMemoryString->c_str()));
+  EXPECT_EQ(memory->Size(), 18LU);
+  ReadToString delegate;
+  ASSERT_TRUE(memory->Read(&delegate));
+  EXPECT_EQ(delegate.result, someExtraMemoryString->c_str());
+
+  StringFile string_file;
+  MinidumpFileWriter minidump_file_writer;
+  minidump_file_writer.InitializeFromSnapshot(&process_snapshot);
+  ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
+
+  ProcessSnapshotMinidump process_snapshot_minidump;
+  EXPECT_TRUE(process_snapshot_minidump.Initialize(&string_file));
+  for (auto minidump_memory : process_snapshot_minidump.ExtraMemory()) {
+    EXPECT_FALSE(
+        minidump_memory->Address() ==
+            reinterpret_cast<uint64_t>(someExtraMemoryString->c_str()) &&
+        minidump_memory->Size() == 18LU);
+  }
+}
+
 TEST_F(InProcessIntermediateDumpHandlerTest, TestThreads) {
-  WriteReport();
+  const ScopedSetThreadName scoped_set_thread_name("TestThreads");
+
+  WriteReportAndCloseWriter();
   internal::ProcessSnapshotIOSIntermediateDump process_snapshot;
-  ASSERT_TRUE(process_snapshot.Initialize(path(), {}));
+  ASSERT_TRUE(process_snapshot.InitializeWithFilePath(path(), {}));
 
   const auto& threads = process_snapshot.Threads();
   ASSERT_GT(threads.size(), 0u);
@@ -210,33 +372,97 @@ TEST_F(InProcessIntermediateDumpHandlerTest, TestThreads) {
                         &count),
             0);
   EXPECT_EQ(threads[0]->ThreadID(), identifier_info.thread_id);
+  EXPECT_EQ(threads[0]->ThreadName(), "TestThreads");
 }
 
 TEST_F(InProcessIntermediateDumpHandlerTest, TestProcess) {
-  WriteReport();
+  WriteReportAndCloseWriter();
   internal::ProcessSnapshotIOSIntermediateDump process_snapshot;
-  ASSERT_TRUE(process_snapshot.Initialize(path(), {}));
+  ASSERT_TRUE(process_snapshot.InitializeWithFilePath(path(), {}));
   EXPECT_EQ(process_snapshot.ProcessID(), getpid());
 }
 
 TEST_F(InProcessIntermediateDumpHandlerTest, TestMachException) {
-  WriteReport();
+  WriteReportAndCloseWriter();
   internal::ProcessSnapshotIOSIntermediateDump process_snapshot;
-  ASSERT_TRUE(process_snapshot.Initialize(path(), {}));
+  ASSERT_TRUE(process_snapshot.InitializeWithFilePath(path(), {}));
 }
 
 TEST_F(InProcessIntermediateDumpHandlerTest, TestSignalException) {
-  WriteReport();
+  WriteReportAndCloseWriter();
   internal::ProcessSnapshotIOSIntermediateDump process_snapshot;
-  ASSERT_TRUE(process_snapshot.Initialize(path(), {}));
+  ASSERT_TRUE(process_snapshot.InitializeWithFilePath(path(), {}));
 }
 
 TEST_F(InProcessIntermediateDumpHandlerTest, TestNSException) {
-  WriteReport();
+  WriteReportAndCloseWriter();
   internal::ProcessSnapshotIOSIntermediateDump process_snapshot;
-  ASSERT_TRUE(process_snapshot.Initialize(path(), {}));
+  ASSERT_TRUE(process_snapshot.InitializeWithFilePath(path(), {}));
 }
 
 }  // namespace
+
+TEST_F(InProcessIntermediateDumpHandlerTest,
+       TestCaptureMemoryPointedToByThreadState) {
+  char test_buffer[1024];
+  memset(test_buffer, 'A', sizeof(test_buffer));
+  test_buffer[128] = 'B';
+
+  // Use a std::atomic and a std::thread to simulate an arbitrary thread with a
+  // known register state.
+  std::atomic<bool> wait_for_main_thread(true);
+  std::atomic<bool> thread_started(false);
+
+  std::string thread_name("CaptureMemoryThread");
+  std::thread t([&]() {
+    pthread_setname_np(thread_name.c_str());
+    void* ptr = test_buffer + 128;
+    // Force the compiler to store our pointer in a designated register rather
+    // than on the stack
+#if defined(ARCH_CPU_ARM64)
+    register void* reg_ptr asm("x20") = ptr;
+#elif defined(ARCH_CPU_X86_64)
+    register void* reg_ptr asm("r12") = ptr;
+#endif
+    thread_started = true;
+    while (wait_for_main_thread.load(std::memory_order_relaxed)) {
+      // Dummy operation to prevent the optimizer from discarding our register
+      // assignment.
+      asm volatile("" : : "r"(reg_ptr));
+    }
+  });
+
+  while (!thread_started.load(std::memory_order_relaxed)) {
+    std::this_thread::yield();
+  }
+
+  WriteReportAndCloseWriter();
+
+  wait_for_main_thread = false;
+  t.join();
+
+  internal::ProcessSnapshotIOSIntermediateDump process_snapshot;
+  ASSERT_TRUE(process_snapshot.InitializeWithFilePath(path(), {}));
+
+  bool found_our_buffer = false;
+  for (const auto* thread : process_snapshot.Threads()) {
+    if (thread->ThreadName() == thread_name) {
+      for (const auto* memory : thread->ExtraMemory()) {
+        if (memory->Address() == reinterpret_cast<uint64_t>(test_buffer)) {
+          found_our_buffer = true;
+          EXPECT_EQ(memory->Size(), 512u);
+
+          ReadToString delegate;
+          ASSERT_TRUE(memory->Read(&delegate));
+          EXPECT_EQ(delegate.result.size(), 512u);
+          EXPECT_EQ(delegate.result[128], 'B');
+          EXPECT_EQ(delegate.result[129], 'A');
+        }
+      }
+    }
+  }
+  EXPECT_TRUE(found_our_buffer);
+}
+
 }  // namespace test
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/client/ios_handler/prune_intermediate_dumps_and_crash_reports_thread.cc b/extern/crashpad/crashpad/client/ios_handler/prune_intermediate_dumps_and_crash_reports_thread.cc
new file mode 100644
index 0000000000..e2716a7f47
--- /dev/null
+++ b/extern/crashpad/crashpad/client/ios_handler/prune_intermediate_dumps_and_crash_reports_thread.cc
@@ -0,0 +1,148 @@
+// Copyright 2021 The Crashpad Authors
+//
+// 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.
+
+#include "client/ios_handler/prune_intermediate_dumps_and_crash_reports_thread.h"
+
+#include <utility>
+
+#include "client/prune_crash_reports.h"
+#include "util/file/directory_reader.h"
+#include "util/file/filesystem.h"
+#include "util/ios/scoped_background_task.h"
+
+namespace crashpad {
+
+namespace {
+
+// The file extension used to indicate a file is locked.
+constexpr char kLockedExtension[] = ".locked";
+
+// Prune onces a day.
+constexpr time_t prune_interval = 60 * 60 * 24;
+
+// If the client finds a locked file matching it's own bundle id, unlock it
+// after 24 hours.
+constexpr time_t matching_bundle_locked_ttl = 60 * 60 * 24;
+
+// Unlock any locked intermediate dump after 60 days.
+constexpr time_t max_locked_ttl = 60 * 60 * 24 * 60;
+
+// The initial thread delay for applications.  Delay the thread's file i/o to
+// not interfere with application startup.
+constexpr double app_delay = 60;
+
+// The initial thread delay for app extensions. Because iOS extensions are often
+// very short lived, do not wait the full |app_delay|, and instead use a shorter
+// time.
+constexpr double extension_delay = 5;
+
+
+//! \brief Unlocks old intermediate dumps.
+//!
+//! This function can unlock (remove the .locked extension) intermediate dumps
+//! that are either too old to be useful, or are likely leftover dumps from
+//! clean app exits.
+//!
+//! \param[in] pending_path The path to any locked intermediate dump files.
+//! \param[in] bundle_identifier_and_seperator The identifier for this client,
+//!     used to determine when locked files are considered stale.
+void UnlockOldIntermediateDumps(base::FilePath pending_path,
+                                std::string bundle_identifier_and_seperator) {
+  DirectoryReader reader;
+  std::vector<base::FilePath> files;
+  if (!reader.Open(pending_path)) {
+    return;
+  }
+  base::FilePath file;
+  DirectoryReader::Result result;
+  while ((result = reader.NextFile(&file)) ==
+         DirectoryReader::Result::kSuccess) {
+    if (file.FinalExtension() != kLockedExtension)
+      continue;
+
+    const base::FilePath file_path(pending_path.Append(file));
+    timespec file_time;
+    time_t now = time(nullptr);
+    if (!FileModificationTime(file_path, &file_time)) {
+      continue;
+    }
+
+    if ((file.value().compare(0,
+                              bundle_identifier_and_seperator.size(),
+                              bundle_identifier_and_seperator) == 0 &&
+         file_time.tv_sec <= now - matching_bundle_locked_ttl) ||
+        (file_time.tv_sec <= now - max_locked_ttl)) {
+      base::FilePath new_path = file_path.RemoveFinalExtension();
+      MoveFileOrDirectory(file_path, new_path);
+      continue;
+    }
+  }
+}
+
+}  // namespace
+
+PruneIntermediateDumpsAndCrashReportsThread::
+    PruneIntermediateDumpsAndCrashReportsThread(
+        CrashReportDatabase* database,
+        std::unique_ptr<PruneCondition> condition,
+        base::FilePath pending_path,
+        std::string bundle_identifier_and_seperator,
+        bool is_extension)
+    : thread_(prune_interval, this),
+      condition_(std::move(condition)),
+      pending_path_(pending_path),
+      bundle_identifier_and_seperator_(bundle_identifier_and_seperator),
+      initial_work_delay_(is_extension ? extension_delay : app_delay),
+      last_start_time_(0),
+      database_(database) {}
+
+PruneIntermediateDumpsAndCrashReportsThread::
+    ~PruneIntermediateDumpsAndCrashReportsThread() {}
+
+void PruneIntermediateDumpsAndCrashReportsThread::Start() {
+  thread_.Start(initial_work_delay_);
+}
+
+void PruneIntermediateDumpsAndCrashReportsThread::Stop() {
+  thread_.Stop();
+}
+
+void PruneIntermediateDumpsAndCrashReportsThread::DoWork(
+    const WorkerThread* thread) {
+  // This thread may be stopped and started a number of times throughout the
+  // lifetime of the process to prevent 0xdead10cc kills (see
+  // crbug.com/crashpad/400), but it should only run once per prune_interval
+  // after initial_work_delay_.
+  time_t now = time(nullptr);
+  if (now - last_start_time_ < prune_interval)
+    return;
+  last_start_time_ = now;
+
+  internal::ScopedBackgroundTask scoper("PruneThread");
+  database_->CleanDatabase(60 * 60 * 24 * 3);
+
+  // Here and below, respect Stop() being called after each task.
+  if (!thread_.is_running())
+    return;
+  PruneCrashReportDatabase(database_, condition_.get());
+
+  if (!thread_.is_running())
+    return;
+  if (!clean_old_intermediate_dumps_) {
+    clean_old_intermediate_dumps_ = true;
+    UnlockOldIntermediateDumps(pending_path_, bundle_identifier_and_seperator_);
+  }
+}
+
+}  // namespace crashpad
diff --git a/extern/crashpad/crashpad/client/ios_handler/prune_intermediate_dumps_and_crash_reports_thread.h b/extern/crashpad/crashpad/client/ios_handler/prune_intermediate_dumps_and_crash_reports_thread.h
new file mode 100644
index 0000000000..670ee00fb7
--- /dev/null
+++ b/extern/crashpad/crashpad/client/ios_handler/prune_intermediate_dumps_and_crash_reports_thread.h
@@ -0,0 +1,109 @@
+// Copyright 2021 The Crashpad Authors
+//
+// 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.
+
+#ifndef CRASHPAD_HANDLER_PRUNE_CRASH_REPORTS_THREAD_H_
+#define CRASHPAD_HANDLER_PRUNE_CRASH_REPORTS_THREAD_H_
+
+#include <memory>
+
+#include "base/files/file_path.h"
+#include "util/thread/stoppable.h"
+#include "util/thread/worker_thread.h"
+
+namespace crashpad {
+
+class CrashReportDatabase;
+class PruneCondition;
+
+//! \brief A thread that periodically prunes crash reports from the database
+//!     using the specified condition, and any leftover locked intermediate
+//!     dumps.
+//!
+//! After the thread is started, the database is pruned using the condition
+//! every 24 hours. Upon calling Start(), the thread waits before performing
+//! the initial prune operation.
+//!
+//! Locked intermediate dump files are unlocked only once, not periodically.
+//! Locked dumps that match this bundle id can be unlocked if they are over a
+//! day old. Otherwise, unlock dumps that are over 60 days old.
+class PruneIntermediateDumpsAndCrashReportsThread
+    : public WorkerThread::Delegate,
+      public Stoppable {
+ public:
+  //! \brief Constructs a new object.
+  //!
+  //! \param[in] database The database to prune crash reports from.
+  //! \param[in] condition The condition used to evaluate crash reports for
+  //!     pruning.
+  //! \param[in] pending_path The path to any locked intermediate dump files.
+  //! \param[in] bundle_identifier_and_seperator The identifier for this client,
+  //!     used to determine when locked files are considered stale, with a
+  //!     seperator at the end to allow for substring searches.
+  //! \param[in] is_extension Whether the process is an app extension. If
+  //!     `true`, the inital prune will occur after a 5-second delay. If
+  //!     `false`, the initial prune will occur after a 60-second delay.
+  PruneIntermediateDumpsAndCrashReportsThread(
+      CrashReportDatabase* database,
+      std::unique_ptr<PruneCondition> condition,
+      base::FilePath pending_path,
+      std::string bundle_identifier_and_seperator,
+      bool is_extension);
+
+  PruneIntermediateDumpsAndCrashReportsThread(
+      const PruneIntermediateDumpsAndCrashReportsThread&) = delete;
+  PruneIntermediateDumpsAndCrashReportsThread& operator=(
+      const PruneIntermediateDumpsAndCrashReportsThread&) = delete;
+
+  ~PruneIntermediateDumpsAndCrashReportsThread();
+
+  // Stoppable:
+
+  //! \brief Starts a dedicated pruning thread.
+  //!
+  //! The thread waits before running the initial prune, so as to not interfere
+  //! with any startup-related IO performed by the client.
+  //!
+  //! This method may only be be called on a newly-constructed object or after
+  //! a call to Stop().
+  void Start() override;
+
+  //! \brief Stops the pruning thread.
+  //!
+  //! This method must only be called after Start(). If Start() has been called,
+  //! this method must be called before destroying an object of this class.
+  //!
+  //! This method may be called from any thread other than the pruning thread.
+  //! It is expected to only be called from the same thread that called Start().
+  void Stop() override;
+
+  //! \return `true` if the thread is running, `false` if it is not.
+  bool is_running() const { return thread_.is_running(); }
+
+ private:
+  // WorkerThread::Delegate:
+  void DoWork(const WorkerThread* thread) override;
+
+  WorkerThread thread_;
+  std::unique_ptr<PruneCondition> condition_;
+  base::FilePath pending_path_;
+  std::string bundle_identifier_and_seperator_;
+  bool clean_old_intermediate_dumps_;
+  double initial_work_delay_;
+  time_t last_start_time_;
+  CrashReportDatabase* database_;  // weak
+};
+
+}  // namespace crashpad
+
+#endif  // CRASHPAD_HANDLER_PRUNE_CRASH_REPORTS_THREAD_H_
diff --git a/extern/crashpad/crashpad/client/length_delimited_ring_buffer.h b/extern/crashpad/crashpad/client/length_delimited_ring_buffer.h
new file mode 100644
index 0000000000..20a0bf149e
--- /dev/null
+++ b/extern/crashpad/crashpad/client/length_delimited_ring_buffer.h
@@ -0,0 +1,603 @@
+// Copyright 2023 The Crashpad Authors
+//
+// 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.
+
+#ifndef CRASHPAD_CLIENT_LENGTH_DELIMITED_RING_BUFFER_H_
+#define CRASHPAD_CLIENT_LENGTH_DELIMITED_RING_BUFFER_H_
+
+#include <stdint.h>
+#include <string.h>
+
+#include <algorithm>
+#include <array>
+#include <limits>
+#include <optional>
+#include <type_traits>
+#include <vector>
+
+#include "base/numerics/safe_math.h"
+
+namespace crashpad {
+
+//! \brief Capacity of a `RingBufferData`, in bytes.
+using RingBufferCapacity = uint32_t;
+
+namespace internal {
+
+//! \brief Default capacity of `RingBufferData`, in bytes.
+inline constexpr RingBufferCapacity kDefaultRingBufferDataCapacity = 8192;
+
+//! \brief A tuple holding the current range of bytes which can be read from or
+//!     have been written to.
+struct Range final {
+  //! \brief The offset into a `RingBufferData` at which a `Range` begins.
+  using Offset = uint32_t;
+
+  //! \brief The length inside a `RingBufferData` of a `Range` of data.
+  using Length = uint32_t;
+
+  Offset offset;
+  Length length;
+};
+
+// This struct is persisted to disk, so its size must not change.
+static_assert(sizeof(Range) == 8,
+              "struct Range is not packed on this platform");
+
+//! \brief The number of bits encoded in each byte of a Base 128-encoded varint.
+inline constexpr int kBase128ByteValueBits = 7;
+
+//! \!brief Calculates the length in bytes of `value` encoded using
+//!    little-endian Base 128 varint encoding.
+//! \sa https://developers.google.com/protocol-buffers/docs/encoding#varints
+//!
+//! `LengthDelimitedRingBufferWriter` uses varint-encoded delimiters to enable
+//! zero-copy deserialization of the ringbuffer's contents when storing
+//! protobufs inside the ringbuffer, e.g. via
+//! `google::protobuf::util::ParseDelimitedFromZeroCopyStream()` or similar.
+//!
+//! \sa
+//! https://github.com/protocolbuffers/protobuf/blob/3202b9da88ceb75b65bbabaf4033c95e872f828d/src/google/protobuf/util/delimited_message_util.h#L85
+//! \sa
+//! https://github.com/protocolbuffers/protobuf/blob/8bd49dea5e167a389d94b71d24c981d8f9fa0c99/src/google/protobuf/io/zero_copy_stream_impl_lite.h#L68
+//! \sa
+//! https://github.com/protocolbuffers/protobuf/blob/8bd49dea5e167a389d94b71d24c981d8f9fa0c99/src/google/protobuf/io/coded_stream.h#L171
+//!
+//! \!param[in] value Value to be encoded in Base 128 varint encoding.
+//! \!return The length in bytes of `value` in Base 128 varint encoding.
+template <typename IntegerType>
+constexpr Range::Length Base128VarintEncodedLength(IntegerType value) {
+  static_assert(std::is_unsigned<IntegerType>::value);
+
+  Range::Length size = 1;
+  while (value >= 0x80) {
+    value >>= kBase128ByteValueBits;
+    size++;
+  }
+  return size;
+}
+
+// Note that std::array capacity is a size_t, not a RingBufferCapacity.
+template <size_t ArrayCapacity>
+using RingBufferArray = std::array<uint8_t, ArrayCapacity>;
+
+//! \return The size of the `RingBufferArray` as a `Range::Length`.
+template <size_t ArrayCapacity>
+constexpr Range::Length RingBufferArraySize(
+    const RingBufferArray<ArrayCapacity>& ring_buffer_data) {
+  static_assert(ArrayCapacity <= std::numeric_limits<Range::Length>::max());
+  return static_cast<Range::Length>(ring_buffer_data.size());
+}
+
+//! \brief Reads data from the ring buffer into a target buffer.
+//! \param[in] ring_buffer_data The ring buffer to read.
+//! \param[in,out] ring_buffer_read_range The range of the data available
+//!     to read. Upon return, set to the remaining range of data available
+//!     to read, if any.
+//! \param[in] target_buffer Buffer into which data will be written.
+//! \param[in] target_buffer_length Number of bytes to write into
+//!     `target_buffer`.
+//!
+//! \return `true` if the read succeeded, `false` otherwise. On success, updates
+//!     `ring_buffer_read_range` to reflect the bytes consumed.
+//!
+//! The bytes can wrap around the end of the ring buffer, in which case the read
+//! continues at the beginning of the ring buffer (if the ring buffer is long
+//! enough).
+template <typename RingBufferArrayType>
+bool ReadBytesFromRingBuffer(const RingBufferArrayType& ring_buffer_data,
+                             internal::Range& ring_buffer_read_range,
+                             uint8_t* target_buffer,
+                             Range::Length target_buffer_length) {
+  if (target_buffer_length > ring_buffer_read_range.length) {
+    return false;
+  }
+  if (target_buffer_length == 0) {
+    return true;
+  }
+  const Range::Length initial_read_length = std::min(
+      target_buffer_length,
+      RingBufferArraySize(ring_buffer_data) - ring_buffer_read_range.offset);
+  memcpy(target_buffer,
+         &ring_buffer_data[ring_buffer_read_range.offset],
+         initial_read_length);
+  if (initial_read_length < target_buffer_length) {
+    const Range::Length remaining_read_length =
+        target_buffer_length - initial_read_length;
+    memcpy(target_buffer + initial_read_length,
+           &ring_buffer_data[0],
+           remaining_read_length);
+  }
+  ring_buffer_read_range.offset =
+      (ring_buffer_read_range.offset + target_buffer_length) %
+      RingBufferArraySize(ring_buffer_data);
+  ring_buffer_read_range.length -= target_buffer_length;
+  return true;
+}
+
+//! \brief Reads a single little-endian Base 128 varint-encoded integer from
+//!     the ring buffer.
+//! \param[in] ring_buffer_data The ring buffer to read.
+//! \param[in,out] ring_buffer_read_range The range of the data available
+//!     to read. Upon return, set to the remaining range of data available
+//!     to read, if any.
+//! \param[out] result Upon success, set to the decoded value read from the
+//!     buffer.
+//!
+//! \return The length in bytes of the varint if the read succeeded,
+//!    `std::nullopt` otherwise. On success, updates `ring_buffer_read_range`
+//!    to reflect the bytes available to read.
+//!
+//! The varint can wrap around the end of the ring buffer, in which case the
+//! read continues at the beginning of the ring buffer (if the ring buffer is
+//! long enough).
+template <typename RingBufferArrayType, typename IntegerType>
+std::optional<Range::Length> ReadBase128VarintFromRingBuffer(
+    const RingBufferArrayType& ring_buffer_data,
+    internal::Range& ring_buffer_read_range,
+    IntegerType& result) {
+  static_assert(std::is_unsigned<IntegerType>::value);
+
+  result = 0;
+  uint8_t cur_varint_byte = 0;
+  constexpr uint8_t kValueMask = 0x7f;
+  constexpr uint8_t kContinuationMask = 0x80;
+  Range::Length length = 0;
+  do {
+    if (!ReadBytesFromRingBuffer(
+            ring_buffer_data, ring_buffer_read_range, &cur_varint_byte, 1)) {
+      // No capacity remaining in `ring_buffer_read_range` to read the varint.
+      return std::nullopt;
+    }
+    IntegerType cur_varint_value =
+        static_cast<IntegerType>(cur_varint_byte & kValueMask);
+
+    // This is equivalent to:
+    //
+    // result |= (cur_varint_value << (length * kBase128ByteValueBits));
+    //
+    // but checks the result at each step for overflow, which handles two types
+    // of invalid input:
+    //
+    // 1) Too many bytes with kContinuationMask set (e.g., trying to encode 6
+    //    bytes worth of data in a 32-bit value)
+    // 2) Too many bits in the final byte (e.g., the 5th byte for a 32-bit value
+    //    has bits 33 and 34 set)
+    IntegerType next_result_bits;
+    if (!base::CheckLsh(cur_varint_value, length * kBase128ByteValueBits)
+             .AssignIfValid(&next_result_bits)) {
+      return std::nullopt;
+    }
+    result |= next_result_bits;
+    ++length;
+  } while ((cur_varint_byte & kContinuationMask) == kContinuationMask);
+  return length;
+}
+
+//! \brief Writes data from the source buffer into the ring buffer.
+//! \param[in] source_buffer Buffer from which data will be read.
+//! \param[in] source_buffer_length The length in bytes of `source_buffer`.
+//! \param[in] ring_buffer_data The ring buffer into which data will be read.
+//! \param[in,out] ring_buffer_write_range The range of the data available
+//!     to write. Upon return, set to the remaining range of data available
+//!     to write, if any.
+//!
+//! \return `true` if write read succeeded, `false` otherwise. On success,
+//! updates
+//!     `ring_buffer_write_range` to reflect the bytes written.
+//!
+//! The bytes can wrap around the end of the ring buffer, in which case the
+//! write continues at the beginning of the ring buffer (if the ring buffer is
+//! long enough).
+template <typename RingBufferArrayType>
+bool WriteBytesToRingBuffer(const uint8_t* const source_buffer,
+                            Range::Length source_buffer_length,
+                            RingBufferArrayType& ring_buffer_data,
+                            internal::Range& ring_buffer_write_range) {
+  const Range::Length ring_buffer_bytes_remaining =
+      RingBufferArraySize(ring_buffer_data) - ring_buffer_write_range.length;
+  if (source_buffer_length > ring_buffer_bytes_remaining) {
+    return false;
+  }
+  const Range::Length initial_write_length = std::min(
+      source_buffer_length,
+      RingBufferArraySize(ring_buffer_data) - ring_buffer_write_range.offset);
+  memcpy(&ring_buffer_data[ring_buffer_write_range.offset],
+         source_buffer,
+         initial_write_length);
+  if (initial_write_length < source_buffer_length) {
+    const Range::Length remaining_write_length =
+        source_buffer_length - initial_write_length;
+    memcpy(&ring_buffer_data[0],
+           source_buffer + initial_write_length,
+           remaining_write_length);
+  }
+  ring_buffer_write_range.offset =
+      (ring_buffer_write_range.offset + source_buffer_length) %
+      RingBufferArraySize(ring_buffer_data);
+  ring_buffer_write_range.length -= source_buffer_length;
+  return true;
+}
+
+//! \brief Writes a single Base 128 varint-encoded little-endian unsigned
+//!     integer into the ring buffer.
+//! \param[in] value The value to encode and write into the ring buffer.
+//! \param[in] ring_buffer_data The ring buffer into which to write.
+//! \param[in,out] ring_buffer_write_range The range of the data available
+//!     to write. Upon return, set to the remaining range of data available
+//!     to write, if any.
+//!
+//! \return The length in bytes of the varint if the write succeeded,
+//!    `std::nullopt` otherwise. On success, updates `write_buffer_read_range`
+//!    to reflect the range available to write, if any.
+//!
+//! The varint can wrap around the end of the ring buffer, in which case the
+//! write continues at the beginning of the ring buffer (if the ring buffer is
+//! long enough).
+template <typename RingBufferArrayType, typename IntegerType>
+std::optional<int> WriteBase128VarintToRingBuffer(
+    IntegerType value,
+    RingBufferArrayType& ring_buffer_data,
+    internal::Range& ring_buffer_write_range) {
+  static_assert(std::is_unsigned<IntegerType>::value);
+
+  uint8_t cur_varint_byte;
+  constexpr uint8_t kValueMask = 0x7f;
+  constexpr uint8_t kContinuationMask = 0x80;
+
+  // Every varint encodes to at least 1 byte of data.
+  int length = 1;
+
+  while (value > kValueMask) {
+    cur_varint_byte =
+        (static_cast<uint8_t>(value) & kValueMask) | kContinuationMask;
+    if (!WriteBytesToRingBuffer(
+            &cur_varint_byte, 1, ring_buffer_data, ring_buffer_write_range)) {
+      return std::nullopt;
+    }
+    value >>= kBase128ByteValueBits;
+    ++length;
+  }
+  cur_varint_byte = static_cast<uint8_t>(value);
+  if (!WriteBytesToRingBuffer(
+          &cur_varint_byte, 1, ring_buffer_data, ring_buffer_write_range)) {
+    return std::nullopt;
+  }
+  return length;
+}
+
+}  // namespace internal
+
+//! \brief Storage for a ring buffer which can hold up to
+//! `RingBufferCapacity`
+//!     bytes of Base 128-varint delimited variable-length items.
+//!
+//! This struct contains a header immediately followed by the ring buffer
+//! data. The current read offset and length are stored in `header.data_range`.
+//!
+//! The structure of this object is:
+//!
+//! `|magic|version|data_offset|data_length|ring_buffer_data|`
+//!
+//! To write data to this object, see `LengthDelimitedRingBufferWriter`.
+//! To read data from this object, see `LengthDelimitedRingBufferReader`.
+//!
+//! The bytes of this structure are suitable for direct serialization from
+//! memory to disk, e.g. as a crashpad::Annotation.
+template <RingBufferCapacity Capacity>
+struct RingBufferData final {
+  RingBufferData() = default;
+  RingBufferData(RingBufferData&) = delete;
+  RingBufferData& operator=(RingBufferData&) = delete;
+
+  //! \brief The type of the array holding the data in this object.
+  using RingBufferArrayType = internal::RingBufferArray<Capacity>;
+
+  //! \brief The type of the size in bytes of operations on this object.
+  using SizeType = internal::Range::Length;
+
+  //! \brief Attempts to overwrite the contents of this object by deserializing
+  //!     the buffer into this object.
+  //! \param[in] buffer The bytes to deserialize into this object.
+  //! \param[in] length The length in bytes of `buffer`.
+  //!
+  //! \return `true` if the buffer was a valid RingBufferData and this object
+  //!     has enough capacity to store its bytes, `false` otherwise.
+  bool DeserializeFromBuffer(const void* buffer, SizeType length) {
+    if (length < sizeof(header) || length > sizeof(header) + sizeof(data)) {
+      return false;
+    }
+    const Header* other_header = reinterpret_cast<const Header*>(buffer);
+    if (other_header->magic != kMagic || other_header->version != kVersion) {
+      return false;
+    }
+    header.data_range = other_header->data_range;
+    const uint8_t* other_ring_buffer_bytes =
+        reinterpret_cast<const uint8_t*>(buffer) + sizeof(*other_header);
+    const SizeType other_ring_buffer_len = length - sizeof(*other_header);
+    memcpy(&data[0], other_ring_buffer_bytes, other_ring_buffer_len);
+    return true;
+  }
+
+  //! \return The current length in bytes of the data written to the ring
+  //!     buffer.
+  SizeType GetRingBufferLength() const {
+    internal::Range data_range = header.data_range;
+    return sizeof(header) + std::min(internal::RingBufferArraySize(data),
+                                     data_range.offset + data_range.length);
+  }
+
+  //! \brief Resets the state of the ring buffer (e.g., for testing).
+  void ResetForTesting() { header.data_range = {0, 0}; }
+
+  //! \brief The magic signature of the ring buffer.
+  static constexpr uint32_t kMagic = 0xcab00d1e;
+  //! \brief The version of the ring buffer.
+  static constexpr uint32_t kVersion = 1;
+
+  //! \brief A header containing metadata preceding the ring buffer data.
+  struct Header final {
+    Header() : magic(kMagic), version(kVersion), data_range({0, 0}) {}
+
+    //! \brief The fixed magic value identifying this as a ring buffer.
+    const uint32_t magic;
+
+    //! \brief The version of this ring buffer data.
+    const uint32_t version;
+
+    //! \brief The range of readable data in the ring buffer.
+    internal::Range data_range;
+  };
+
+  //! \brief The header containing ring buffer metadata.
+  Header header;
+
+  //! \brief The bytes of the ring buffer data.
+  RingBufferArrayType data;
+
+  // This struct is persisted to disk, so its size must not change.
+  static_assert(sizeof(Header) == 16);
+  static_assert(Capacity <= std::numeric_limits<uint32_t>::max());
+};
+
+// Ensure the ring buffer is packed correctly at its default capacity.
+static_assert(
+    sizeof(RingBufferData<internal::kDefaultRingBufferDataCapacity>) ==
+    16 + internal::kDefaultRingBufferDataCapacity);
+
+// Allow just `RingBufferData foo;` to be declared without template arguments
+// using C++17 class template argument deduction.
+template <
+    RingBufferCapacity Capacity = internal::kDefaultRingBufferDataCapacity>
+RingBufferData() -> RingBufferData<Capacity>;
+
+//! \brief Reads variable-length data buffers from a `RingBufferData`,
+//!     delimited by Base128 varint-encoded length delimiters.
+//!
+//! Holds a reference to a `RingBufferData` with the capacity to hold
+//! `RingBufferDataType::size()` bytes of variable-length buffers each
+//! preceded by its length (encoded as a Base128 length varint).
+//!
+//! Provides reading capabilities via `Pop()`.
+template <typename RingBufferDataType>
+class LengthDelimitedRingBufferReader final {
+ public:
+  //! \brief Constructs a reader which holds a reference to `ring_buffer`.
+  //! \param[in] ring_buffer The ring buffer from which data will be read.
+  //!     This object must outlive the lifetime of `ring_buffer`.
+  constexpr explicit LengthDelimitedRingBufferReader(
+      RingBufferDataType& ring_buffer)
+      : ring_buffer_(ring_buffer),
+        data_range_(ring_buffer_.header.data_range) {}
+
+  LengthDelimitedRingBufferReader(const LengthDelimitedRingBufferReader&) =
+      delete;
+  LengthDelimitedRingBufferReader& operator=(
+      const LengthDelimitedRingBufferReader&) = delete;
+
+  //! \brief Pops off the next buffer from the front of the ring buffer.
+  //!
+  //! \param[in] target_buffer On success, the buffer into which data will
+  //!     be read.
+  //! \return On success, returns `true` and advances `ring_buffer.data_range`
+  //!     past the end of the buffer read. Otherwise, returns `false`.
+  bool Pop(std::vector<uint8_t>& target_buffer) {
+    return PopWithRange(target_buffer, data_range_);
+  }
+
+  //! \brief Resets the state of the reader (e.g., for testing).
+  void ResetForTesting() { data_range_ = {0, 0}; }
+
+ private:
+  //! \brief Pops off the next buffer from the front of the ring buffer.
+  //! \param[in] target_buffer On success, the buffer into which data will
+  //!     be read.
+  //! \param[in,out] data_range The range of data available to read.
+  //!     On success, updated to the remaining range avilable to read.
+  //! \return On success, returns `true` and advances `ring_buffer.data_range`
+  //!     past the end of the buffer read. Otherwise, returns `false`.
+  bool PopWithRange(std::vector<uint8_t>& target_buffer,
+                    internal::Range& data_range) {
+    internal::Range::Length buffer_length;
+    if (!ReadBase128VarintFromRingBuffer(
+            ring_buffer_.data, data_range, buffer_length)) {
+      return false;
+    }
+    if (buffer_length == 0) {
+      // A zero-length buffer means the buffer was truncated in the middle of a
+      // Push().
+      return false;
+    }
+    const auto previous_target_buffer_size = target_buffer.size();
+    target_buffer.resize(previous_target_buffer_size + buffer_length);
+    if (!ReadBytesFromRingBuffer(ring_buffer_.data,
+                                 data_range,
+                                 &target_buffer[previous_target_buffer_size],
+                                 buffer_length)) {
+      return false;
+    }
+    return true;
+  }
+
+  //! \brief Reference to the ring buffer from which data is read.
+  const RingBufferDataType& ring_buffer_;
+  //! \brief Range of data currently available to read.
+  internal::Range data_range_;
+};
+
+// Allow just `LengthDelimitedRingBufferReader reader(foo);` to be declared
+// without template arguments using C++17 class template argument deduction.
+template <typename RingBufferDataType>
+LengthDelimitedRingBufferReader(RingBufferDataType&)
+    -> LengthDelimitedRingBufferReader<RingBufferDataType>;
+
+//! \brief Writes variable-length data buffers to a `RingBufferData`,
+//!     delimited by Base128 varint-encoded length delimiters.
+//!
+//! Holds a reference to a `RingBufferData` with the capacity to hold
+//! `RingBufferDataType::size()` bytes of variable-length buffers each
+//! preceded by its length (encoded as a Base128 length varint).
+//!
+//! Provides writing capabilities via `Push()`.
+template <typename RingBufferDataType>
+class LengthDelimitedRingBufferWriter final {
+ public:
+  //! \brief Constructs a writer which holds a reference to `ring_buffer`.
+  //! \param[in] ring_buffer The ring buffer into which data will be written.
+  //!     This object must outlive the lifetime of `ring_buffer`.
+  constexpr explicit LengthDelimitedRingBufferWriter(
+      RingBufferDataType& ring_buffer)
+      : ring_buffer_(ring_buffer), ring_buffer_write_offset_(0) {}
+
+  LengthDelimitedRingBufferWriter(const LengthDelimitedRingBufferWriter&) =
+      delete;
+  LengthDelimitedRingBufferWriter& operator=(
+      const LengthDelimitedRingBufferWriter&) = delete;
+
+  //! \brief Writes data to the ring buffer.
+  //!
+  //! If there is not enough room remaining in the ring buffer to store the new
+  //! data, old data will be removed from the ring buffer in FIFO order until
+  //! there is room for the new data.
+  //!
+  //! \param[in] buffer The data to be written.
+  //! \param[in] buffer_length The lengh of `buffer`, in bytes.
+  //! \return On success, returns `true`, updates `ring_buffer.data_range`
+  //!     to reflect the remaining data available to read, and updates
+  //!     `ring_buffer_write_offset_` to reflec the current write positionl.
+  //!     Otherwise, returns `false`.
+  bool Push(const void* const buffer,
+            typename RingBufferDataType::SizeType buffer_length) {
+    if (buffer_length == 0) {
+      // Pushing a zero-length buffer is not allowed
+      // (`LengthDelimitedRingBufferWriter` reserves that to represent a
+      // temporarily truncated item below).
+      return false;
+    }
+    const internal::Range::Length buffer_varint_encoded_length =
+        internal::Base128VarintEncodedLength(buffer_length);
+    const internal::Range::Length bytes_needed =
+        buffer_varint_encoded_length + buffer_length;
+    if (bytes_needed > ring_buffer_.data.size()) {
+      return false;
+    }
+    // If needed, move the readable region forward one buffer at a time to make
+    // room for `buffer_length` bytes of new data.
+    auto readable_data_range = ring_buffer_.header.data_range;
+    internal::Range::Length bytes_available =
+        internal::RingBufferArraySize(ring_buffer_.data) -
+        readable_data_range.length;
+    while (bytes_available < bytes_needed) {
+      internal::Range::Length bytes_to_skip;
+      auto varint_length = ReadBase128VarintFromRingBuffer(
+          ring_buffer_.data, readable_data_range, bytes_to_skip);
+      if (!varint_length.has_value()) {
+        return false;
+      }
+      // Skip past the next entry including its prepended varint length.
+      readable_data_range.offset =
+          (readable_data_range.offset + bytes_to_skip) %
+          internal::RingBufferArraySize(ring_buffer_.data);
+      readable_data_range.length -= bytes_to_skip;
+      bytes_available += varint_length.value() + bytes_to_skip;
+    }
+    // Write the varint containing `buffer_length` to the current write
+    // position.
+    internal::Range write_range = {
+        ring_buffer_write_offset_,
+        bytes_needed,
+    };
+
+    internal::WriteBase128VarintToRingBuffer(
+        buffer_length, ring_buffer_.data, write_range);
+    // Next, write the bytes from `buffer`.
+    internal::WriteBytesToRingBuffer(
+        reinterpret_cast<const uint8_t* const>(buffer),
+        buffer_length,
+        ring_buffer_.data,
+        write_range);
+    // Finally, update the write position and read data range taking into
+    // account any items skipped to make room plus the new buffer's varint
+    // length and the new buffer's length.
+    ring_buffer_write_offset_ = write_range.offset;
+    const internal::Range final_data_range = {
+        readable_data_range.offset,
+        readable_data_range.length + bytes_needed,
+    };
+    ring_buffer_.header.data_range = final_data_range;
+    return true;
+  }
+
+  //! \brief Resets the state of the ring buffer and writer (e.g., for testing).
+  void ResetForTesting() {
+    ring_buffer_.ResetForTesting();
+    ring_buffer_write_offset_ = 0;
+  }
+
+ private:
+  //! \brief Reference to the ring buffer from which data is written.
+  RingBufferDataType& ring_buffer_;
+
+  // \brief Current write position next time `Push()` is invoked.
+  internal::Range::Offset ring_buffer_write_offset_;
+};
+
+// Allow just `LengthDelimitedRingBufferWriter writer(foo);` to be declared
+// without template arguments using C++17 class template argument deduction.
+template <typename RingBufferDataType>
+LengthDelimitedRingBufferWriter(RingBufferDataType&)
+    -> LengthDelimitedRingBufferWriter<RingBufferDataType>;
+
+}  // namespace crashpad
+
+#endif  // CRASHPAD_CLIENT_LENGTH_DELIMITED_RING_BUFFER_H_
diff --git a/extern/crashpad/crashpad/client/length_delimited_ring_buffer_test.cc b/extern/crashpad/crashpad/client/length_delimited_ring_buffer_test.cc
new file mode 100644
index 0000000000..6ead898107
--- /dev/null
+++ b/extern/crashpad/crashpad/client/length_delimited_ring_buffer_test.cc
@@ -0,0 +1,348 @@
+// Copyright 2023 The Crashpad Authors
+//
+// 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.
+
+#include "client/length_delimited_ring_buffer.h"
+
+#include <stdint.h>
+
+#include <array>
+#include <string>
+#include <vector>
+
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+namespace crashpad {
+namespace test {
+namespace {
+
+using testing::Eq;
+using testing::IsFalse;
+using testing::IsTrue;
+
+// Buffer with magic 0xcab00d1e, version 1, read_pos 0, length 3, and 3 bytes of
+// data (1 varint length, 2 bytes data)
+constexpr char kValidBufferSize3[] =
+    "\x1e\x0d\xb0\xca\x01\x00\x00\x00\x00\x00\x00\x00\x03\x00\x00\x00\x02\x42"
+    "\x23";
+constexpr size_t kValidBufferSize3Len =
+    sizeof(kValidBufferSize3) - 1;  // Remove trailing NUL.
+
+// Buffer with magic 0xcab00d1e, version 8, read_pos 0, length 3, and 3 bytes of
+// data (1 varint length, 2 bytes data).
+constexpr char kInvalidVersionBuffer[] =
+    "\x1e\x0d\xb0\xca\x08\x00\x00\x00\x00\x00\x00\x00\x03\x00\x00\x00\x02\xab"
+    "\xcd";
+constexpr size_t kInvalidVersionBufferLen =
+    sizeof(kInvalidVersionBuffer) - 1;  // Remove trailing NUL.
+
+// Buffer representing process which crashed while in the middle of a Push()
+// operation, with a previously-Push()ed buffer whose length was zeroed out at
+// the start.
+constexpr char kMidCrashBuffer[] =
+    "\x1e\x0d\xb0\xca\x01\x00\x00\x00\x00\x00\x00\x00\x03\x00\x00\x00\x00\x42"
+    "\x23";
+constexpr size_t kMidCrashBufferLen =
+    sizeof(kMidCrashBuffer) - 1;  // Remove trailing NUL.
+
+constexpr uint8_t kHello[] = {0x68, 0x65, 0x6c, 0x6c, 0x6f};
+
+// Invalid buffer containing malformed varint in data payload (Base 128 varint
+// with length 6, which would represent a data length > 32 bits).
+constexpr char kInvalidBase128VarintBuffer[] =
+    "\x1e\x0d\xb0\xca\x01\x00\x00\x00\x00\x00\x00\x00\x06\x00\x00\x00\x80\x80"
+    "\x80\x80\x80\x01";
+constexpr size_t kInvalidBase128VarintBufferLen =
+    sizeof(kInvalidBase128VarintBuffer) - 1;  // Remove trailing NUL.
+
+// Invalid buffer containing malformed varint in data payload (Base 128 varint
+// with length 5 but bits 33 and 34 set, which would represent a data length >
+// 32 bits).
+constexpr char kInvalidBase128VarintBits33And34SetBuffer[] =
+    "\x1e\x0d\xb0\xca\x01\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x80\x80"
+    "\x80\x80\x60";
+constexpr size_t kInvalidBase128VarintBits33And34SetBufferLen =
+    sizeof(kInvalidBase128VarintBits33And34SetBuffer) -
+    1;  // Remove trailing NUL.
+
+// Invalid buffer containing too-short data payload (varint length indicates
+// payload length is 4 but payload only contains 3 bytes).
+constexpr char kInvalidPayloadBufferTooShort[] =
+    "\x1e\x0d\xb0\xca\x01\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x04"
+    "\x42\x42\x42";
+constexpr size_t kInvalidPayloadBufferTooShortLen =
+    sizeof(kInvalidPayloadBufferTooShort) - 1;  // Remove trailing NUL.
+
+TEST(LengthDelimitedRingBufferTest,
+     RingBufferDataShouldStartWithMagicAndVersion) {
+  RingBufferData ring_buffer;
+  const void* ring_buffer_bytes = static_cast<const void*>(&ring_buffer);
+  EXPECT_THAT(memcmp(ring_buffer_bytes, "\x1e\x0d\xb0\xca\x01\x00\x00\x00", 8),
+              Eq(0));
+}
+
+TEST(LengthDelimitedRingBufferTest,
+     EmptyBufferSizeShouldIncludeHeaderInRingBufferLength) {
+  RingBufferData ring_buffer;
+  EXPECT_THAT(ring_buffer.GetRingBufferLength(),
+              Eq(16U));  // 4 for uint32 magic, 4 for uint32 version, 4 for
+                         // uint32 read_pos, 4 for uint32 length
+}
+
+TEST(LengthDelimitedRingBufferTest,
+     NonEmptyBufferSizeShouldIncludeHeaderAndData) {
+  RingBufferData ring_buffer;
+  LengthDelimitedRingBufferWriter writer(ring_buffer);
+  ASSERT_THAT(writer.Push(kHello, sizeof(kHello)), IsTrue());
+  EXPECT_THAT(ring_buffer.GetRingBufferLength(),
+              Eq(22U));  // 16 for header, 1 for varint length, 5 for data
+}
+
+TEST(LengthDelimitedRingBufferTest, PopOnEmptyBufferShouldFail) {
+  RingBufferData ring_buffer;
+  LengthDelimitedRingBufferReader reader(ring_buffer);
+  std::vector<uint8_t> result;
+  EXPECT_THAT(reader.Pop(result), IsFalse());
+}
+
+TEST(LengthDelimitedRingBufferTest, PushZeroLengthShouldFail) {
+  RingBufferData ring_buffer;
+  LengthDelimitedRingBufferWriter writer(ring_buffer);
+  ASSERT_THAT(writer.Push(nullptr, 0), IsFalse());
+}
+
+TEST(LengthDelimitedRingBufferTest, PushExactlyBufferSizeThenPopShouldSucceed) {
+  RingBufferData ring_buffer;
+  LengthDelimitedRingBufferWriter writer(ring_buffer);
+  ASSERT_THAT(writer.Push(kHello, sizeof(kHello)), IsTrue());
+
+  LengthDelimitedRingBufferReader reader(ring_buffer);
+  std::vector<uint8_t> result;
+  EXPECT_THAT(reader.Pop(result), IsTrue());
+  const std::vector<uint8_t> expected_first = {0x68, 0x65, 0x6c, 0x6c, 0x6f};
+  EXPECT_THAT(result, Eq(expected_first));
+}
+
+TEST(LengthDelimitedRingBufferTest, PushLargerThanBufferSizeShouldFail) {
+  RingBufferData<4> ring_buffer;
+  LengthDelimitedRingBufferWriter writer(ring_buffer);
+  EXPECT_THAT(writer.Push(kHello, sizeof(kHello)), IsFalse());
+}
+
+TEST(LengthDelimitedRingBufferTest,
+     PushUntilFullThenPopUntilEmptyShouldReturnInFIFOOrder) {
+  RingBufferData<4> ring_buffer;
+  LengthDelimitedRingBufferWriter writer(ring_buffer);
+  constexpr uint8_t a = 0x41;
+  EXPECT_THAT(writer.Push(&a, sizeof(a)),
+              IsTrue());  // Writes 2 bytes (1 for length)
+  constexpr uint8_t b = 0x42;
+  EXPECT_THAT(writer.Push(&b, sizeof(b)),
+              IsTrue());  // Writes 2 bytes (1 for length)
+
+  LengthDelimitedRingBufferReader reader(ring_buffer);
+  std::vector<uint8_t> first;
+  EXPECT_THAT(reader.Pop(first), IsTrue());
+  const std::vector<uint8_t> expected_first = {0x41};
+  EXPECT_THAT(first, Eq(expected_first));
+
+  std::vector<uint8_t> second;
+  EXPECT_THAT(reader.Pop(second), IsTrue());
+  const std::vector<uint8_t> expected_second = {0x42};
+  EXPECT_THAT(second, Eq(expected_second));
+
+  std::vector<uint8_t> empty;
+  EXPECT_THAT(reader.Pop(empty), IsFalse());
+}
+
+TEST(LengthDelimitedRingBufferTest,
+     PushThenPopBuffersOfDifferingLengthsShouldReturnBuffers) {
+  RingBufferData<5> ring_buffer;
+  LengthDelimitedRingBufferWriter writer(ring_buffer);
+  constexpr uint8_t ab[2] = {0x41, 0x42};
+  EXPECT_THAT(writer.Push(ab, sizeof(ab)),
+              IsTrue());  // Writes 3 bytes (1 for length)
+  constexpr uint8_t c = 0x43;
+  EXPECT_THAT(writer.Push(&c, sizeof(c)),
+              IsTrue());  // Writes 2 bytes (1 for length)
+
+  LengthDelimitedRingBufferReader reader(ring_buffer);
+  std::vector<uint8_t> first;
+  EXPECT_THAT(reader.Pop(first), IsTrue());
+  const std::vector<uint8_t> expected_first = {0x41, 0x42};
+  EXPECT_THAT(first, Eq(expected_first));
+
+  std::vector<uint8_t> second;
+  EXPECT_THAT(reader.Pop(second), IsTrue());
+  const std::vector<uint8_t> expected_second = {0x43};
+  EXPECT_THAT(second, Eq(expected_second));
+
+  std::vector<uint8_t> empty;
+  EXPECT_THAT(reader.Pop(empty), IsFalse());
+}
+
+TEST(LengthDelimitedRingBufferDataTest, PushOnFullBufferShouldOverwriteOldest) {
+  RingBufferData<4> ring_buffer;
+  LengthDelimitedRingBufferWriter writer(ring_buffer);
+  constexpr uint8_t a = 0x41;
+  EXPECT_THAT(writer.Push(&a, sizeof(a)),
+              IsTrue());  // Writes 2 bytes (1 for length)
+  constexpr uint8_t b = 0x42;
+  EXPECT_THAT(writer.Push(&b, sizeof(b)),
+              IsTrue());  // Writes 2 bytes (1 for length)
+  constexpr uint8_t c = 0x43;
+  EXPECT_THAT(writer.Push(&c, sizeof(c)), IsTrue());  // Should overwrite "A"
+
+  LengthDelimitedRingBufferReader reader(ring_buffer);
+  std::vector<uint8_t> first;
+  EXPECT_THAT(reader.Pop(first), IsTrue());
+  const std::vector<uint8_t> expected_first = {uint8_t{0x42}};
+  EXPECT_THAT(first, Eq(expected_first));
+
+  std::vector<uint8_t> second;
+  EXPECT_THAT(reader.Pop(second), IsTrue());
+  const std::vector<uint8_t> expected_second = {uint8_t{0x43}};
+  EXPECT_THAT(second, Eq(expected_second));
+}
+
+TEST(LengthDelimitedRingBufferDataTest,
+     PushOnFullBufferShouldOverwriteMultipleOldest) {
+  RingBufferData<4> ring_buffer;
+  LengthDelimitedRingBufferWriter writer(ring_buffer);
+  constexpr uint8_t a = 0x41;
+  EXPECT_THAT(writer.Push(&a, sizeof(a)),
+              IsTrue());  // Writes 2 bytes (1 for length)
+  constexpr uint8_t b = 0x42;
+  EXPECT_THAT(writer.Push(&b, sizeof(b)),
+              IsTrue());  // Writes 2 bytes (1 for length)
+  constexpr uint8_t cd[] = {0x43, 0x44};
+  EXPECT_THAT(writer.Push(cd, sizeof(cd)),
+              IsTrue());  // Needs 3 bytes; should overwrite "A" and "B"
+
+  LengthDelimitedRingBufferReader reader(ring_buffer);
+  std::vector<uint8_t> first;
+  EXPECT_THAT(reader.Pop(first), IsTrue());
+  const std::vector<uint8_t> expected_first = {0x43, 0x44};
+  EXPECT_THAT(first, Eq(expected_first));
+
+  std::vector<uint8_t> empty;
+  EXPECT_THAT(reader.Pop(empty), IsFalse());
+}
+
+TEST(LengthDelimitedRingBufferDataTest, PushThenPopWithLengthVarintTwoBytes) {
+  RingBufferData ring_buffer;
+  decltype(ring_buffer)::SizeType size = 150;
+  std::string s(size, 'X');
+  LengthDelimitedRingBufferWriter writer(ring_buffer);
+  ASSERT_THAT(writer.Push(reinterpret_cast<const uint8_t*>(s.c_str()), size),
+              IsTrue());
+
+  LengthDelimitedRingBufferReader reader(ring_buffer);
+  std::vector<uint8_t> first;
+  EXPECT_THAT(reader.Pop(first), IsTrue());
+  std::string result(reinterpret_cast<const char*>(first.data()), first.size());
+  EXPECT_THAT(result, Eq(s));
+}
+
+TEST(LengthDelimitedRingBufferDataTest, DeserializeFromTooShortShouldFail) {
+  RingBufferData<1> ring_buffer;
+  EXPECT_THAT(ring_buffer.DeserializeFromBuffer(nullptr, 0), IsFalse());
+}
+
+TEST(LengthDelimitedRingBufferDataTest, DeserializeFromTooLongShouldFail) {
+  RingBufferData<1> ring_buffer;
+  // This buffer is size 3; it won't fit in the template arg (size 1).
+  EXPECT_THAT(ring_buffer.DeserializeFromBuffer(
+                  reinterpret_cast<const uint8_t*>(kValidBufferSize3),
+                  kValidBufferSize3Len),
+              IsFalse());
+}
+
+TEST(LengthDelimitedRingBufferDataTest,
+     DeserializeFromInvalidVersionShouldFail) {
+  RingBufferData<3> ring_buffer;
+  EXPECT_THAT(ring_buffer.DeserializeFromBuffer(
+                  reinterpret_cast<const uint8_t*>(kInvalidVersionBuffer),
+                  kInvalidVersionBufferLen),
+              IsFalse());
+}
+
+TEST(LengthDelimitedRingBufferDataTest,
+     DeserializeFromInvalidVarintLengthShouldSucceedButPopShouldFail) {
+  RingBufferData ring_buffer;
+  EXPECT_THAT(ring_buffer.DeserializeFromBuffer(
+                  reinterpret_cast<const uint8_t*>(kInvalidBase128VarintBuffer),
+                  kInvalidBase128VarintBufferLen),
+              IsTrue());
+  LengthDelimitedRingBufferReader reader(ring_buffer);
+  std::vector<uint8_t> data;
+  EXPECT_THAT(reader.Pop(data), IsFalse());
+}
+
+TEST(LengthDelimitedRingBufferDataTest,
+     DeserializeFromInvalidVarintBitsShouldSucceedButPopShouldFail) {
+  RingBufferData ring_buffer;
+  EXPECT_THAT(ring_buffer.DeserializeFromBuffer(
+                  reinterpret_cast<const uint8_t*>(
+                      kInvalidBase128VarintBits33And34SetBuffer),
+                  kInvalidBase128VarintBits33And34SetBufferLen),
+              IsTrue());
+  LengthDelimitedRingBufferReader reader(ring_buffer);
+  std::vector<uint8_t> data;
+  EXPECT_THAT(reader.Pop(data), IsFalse());
+}
+
+TEST(LengthDelimitedRingBufferDataTest,
+     DeserializeFromInvalidPayloadBufferTooShortShouldSucceedButPopShouldFail) {
+  RingBufferData ring_buffer;
+  EXPECT_THAT(
+      ring_buffer.DeserializeFromBuffer(
+          reinterpret_cast<const uint8_t*>(kInvalidPayloadBufferTooShort),
+          kInvalidPayloadBufferTooShortLen),
+      IsTrue());
+  LengthDelimitedRingBufferReader reader(ring_buffer);
+  std::vector<uint8_t> data;
+  EXPECT_THAT(reader.Pop(data), IsFalse());
+}
+
+TEST(LengthDelimitedRingBufferDataTest,
+     DeserializeFromFullBufferShouldSucceed) {
+  RingBufferData<3> ring_buffer;
+  EXPECT_THAT(ring_buffer.DeserializeFromBuffer(
+                  reinterpret_cast<const uint8_t*>(kValidBufferSize3),
+                  kValidBufferSize3Len),
+              IsTrue());
+  LengthDelimitedRingBufferReader reader(ring_buffer);
+  std::vector<uint8_t> data;
+  EXPECT_THAT(reader.Pop(data), IsTrue());
+  const std::vector<uint8_t> expected = {0x42, 0x23};
+  EXPECT_THAT(data, Eq(expected));
+}
+
+TEST(LengthDelimitedRingBufferDataTest,
+     DeserializeFromMidCrashBufferShouldSucceedButSubsequentPopShouldFail) {
+  RingBufferData ring_buffer;
+  EXPECT_THAT(ring_buffer.DeserializeFromBuffer(
+                  reinterpret_cast<const uint8_t*>(kMidCrashBuffer),
+                  kMidCrashBufferLen),
+              IsTrue());
+  LengthDelimitedRingBufferReader reader(ring_buffer);
+  // Pop should fail since the length was written to be 0.
+  std::vector<uint8_t> data;
+  EXPECT_THAT(reader.Pop(data), IsFalse());
+}
+
+}  // namespace
+}  // namespace test
+}  // namespace crashpad
diff --git a/extern/crashpad/crashpad/client/prune_crash_reports.cc b/extern/crashpad/crashpad/client/prune_crash_reports.cc
index 492d466239..ae71aee249 100644
--- a/extern/crashpad/crashpad/client/prune_crash_reports.cc
+++ b/extern/crashpad/crashpad/client/prune_crash_reports.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -122,10 +122,8 @@ bool BinaryPruneCondition::ShouldPruneReport(
       return lhs_->ShouldPruneReport(report) && rhs_->ShouldPruneReport(report);
     case OR:
       return lhs_->ShouldPruneReport(report) || rhs_->ShouldPruneReport(report);
-    default:
-      NOTREACHED();
-      return false;
   }
+  NOTREACHED();
 }
 
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/client/prune_crash_reports.h b/extern/crashpad/crashpad/client/prune_crash_reports.h
index b80cf7a591..add0988d1f 100644
--- a/extern/crashpad/crashpad/client/prune_crash_reports.h
+++ b/extern/crashpad/crashpad/client/prune_crash_reports.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/client/prune_crash_reports_test.cc b/extern/crashpad/crashpad/client/prune_crash_reports_test.cc
index b989d2f615..ba8179c0ca 100644
--- a/extern/crashpad/crashpad/client/prune_crash_reports_test.cc
+++ b/extern/crashpad/crashpad/client/prune_crash_reports_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -69,6 +69,7 @@ class MockDatabase : public CrashReportDatabase {
               (override));
   MOCK_METHOD(OperationStatus, DeleteReport, (const UUID&), (override));
   MOCK_METHOD(OperationStatus, RequestUpload, (const UUID&), (override));
+  MOCK_METHOD(base::FilePath, DatabasePath, (), (override));
 
   // Google Mock doesn't support mocking methods with non-copyable types such as
   // unique_ptr.
diff --git a/extern/crashpad/crashpad/client/pthread_create_linux.cc b/extern/crashpad/crashpad/client/pthread_create_linux.cc
index d4a255c16b..86ff8dba62 100644
--- a/extern/crashpad/crashpad/client/pthread_create_linux.cc
+++ b/extern/crashpad/crashpad/client/pthread_create_linux.cc
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
 #include <dlfcn.h>
 #include <pthread.h>
 
+#include "base/check.h"
 #include "base/logging.h"
 #include "client/crashpad_client.h"
 #include "util/misc/no_cfi_icall.h"
diff --git a/extern/crashpad/crashpad/client/ring_buffer_annotation.h b/extern/crashpad/crashpad/client/ring_buffer_annotation.h
new file mode 100644
index 0000000000..fc0482ea29
--- /dev/null
+++ b/extern/crashpad/crashpad/client/ring_buffer_annotation.h
@@ -0,0 +1,136 @@
+// Copyright 2023 The Crashpad Authors
+//
+// 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.
+
+#ifndef CRASHPAD_CLIENT_RING_BUFFER_ANNOTATION_H_
+#define CRASHPAD_CLIENT_RING_BUFFER_ANNOTATION_H_
+
+#include <stdio.h>
+
+#include "client/annotation.h"
+#include "client/length_delimited_ring_buffer.h"
+
+namespace crashpad {
+
+//! \brief Capacity of `RingBufferAnnotation`, in bytes.
+using RingBufferAnnotationCapacity = RingBufferCapacity;
+
+namespace internal {
+
+//! \brief Default capacity of `RingBufferAnnotation`, in bytes.
+inline constexpr RingBufferAnnotationCapacity
+    kDefaultRingBufferAnnotationCapacity = 8192;
+
+}  // namespace internal
+
+//! \brief An `Annotation` which wraps a `LengthDelimitedRingBuffer`
+//!     of up to `Capacity` bytes in length.
+//!
+//! Supports writing variable-length data via `Push()`. When the ring buffer is
+//! full, it will drop old data items in FIFO order until enough space is
+//! available for the write.
+//!
+//! Supports guarding concurrent reads from writes via `ScopedSpinGuard`, so
+//! writing to this object is thread-safe.
+//!
+//! Clients which read this `Annotation`'s memory can optionally invoke
+//! `TryCreateScopedSpinGuard()` on this object to ensure any pending write
+//! finishes before the memory is read.
+//!
+//! Each item in this ring buffer is delimited by its length encoded in
+//! little-endian Base 128 varint encoding.
+//!
+//! `RingBufferAnnotation` uses varint-encoded delimiters to enable
+//! zero-copy deserialization of the ringbuffer's contents when storing
+//! protobufs inside the ringbuffer, e.g. via
+//! `google::protobuf::util::ParseDelimitedFromZeroCopyStream()` or similar.
+//!
+//! \sa
+//! https://github.com/protocolbuffers/protobuf/blob/3202b9da88ceb75b65bbabaf4033c95e872f828d/src/google/protobuf/util/delimited_message_util.h#L85
+//! \sa
+//! https://github.com/protocolbuffers/protobuf/blob/8bd49dea5e167a389d94b71d24c981d8f9fa0c99/src/google/protobuf/io/zero_copy_stream_impl_lite.h#L68
+//! \sa
+//! https://github.com/protocolbuffers/protobuf/blob/8bd49dea5e167a389d94b71d24c981d8f9fa0c99/src/google/protobuf/io/coded_stream.h#L171
+//!
+//! To deserialize the items stored in this annotation, use
+//! `LengthDelimitedRingBufferReader`.
+template <RingBufferAnnotationCapacity Capacity =
+              internal::kDefaultRingBufferAnnotationCapacity>
+class RingBufferAnnotation final : public Annotation {
+ public:
+  //! \brief Constructs a `RingBufferAnnotation`.
+  //! \param[in] type A unique identifier for the type of data in the ring
+  //!     buffer.
+  //! \param[in] name The name of the annotation.
+  constexpr RingBufferAnnotation(Annotation::Type type, const char name[])
+      : Annotation(type,
+                   name,
+                   reinterpret_cast<void* const>(&ring_buffer_data_),
+                   ConcurrentAccessGuardMode::kScopedSpinGuard),
+        ring_buffer_data_(),
+        ring_buffer_writer_(ring_buffer_data_) {}
+  RingBufferAnnotation(const RingBufferAnnotation&) = delete;
+  RingBufferAnnotation& operator=(const RingBufferAnnotation&) = delete;
+  RingBufferAnnotation(RingBufferAnnotation&&) = default;
+  RingBufferAnnotation& operator=(RingBufferAnnotation&&) = default;
+
+  //! \brief Pushes data onto this annotation's ring buffer.
+  //!
+  //! If the ring buffer does not have enough space to store `buffer_length`
+  //! bytes of data, old data items are dropped in FIFO order until
+  //! enough space is available to store the new data.
+  bool Push(const void* const buffer,
+            RingBufferAnnotationCapacity buffer_length) {
+    // Use a zero timeout so the operation immediately fails if another thread
+    // or process is currently reading this Annotation.
+    constexpr uint64_t kSpinGuardTimeoutNanoseconds = 0;
+
+    auto spin_guard = TryCreateScopedSpinGuard(kSpinGuardTimeoutNanoseconds);
+    if (!spin_guard) {
+      return false;
+    }
+    bool success = ring_buffer_writer_.Push(buffer, buffer_length);
+    if (success) {
+      SetSize(ring_buffer_data_.GetRingBufferLength());
+    }
+    return success;
+  }
+
+  //! \brief Reset the annotation (e.g., for testing).
+  //! This method is not thread-safe.
+  void ResetForTesting() {
+    ring_buffer_data_.ResetForTesting();
+    ring_buffer_writer_.ResetForTesting();
+  }
+
+ private:
+  using RingBufferWriter =
+      LengthDelimitedRingBufferWriter<RingBufferData<Capacity>>;
+
+  //! \brief The ring buffer data stored in this Anotation.
+  RingBufferData<Capacity> ring_buffer_data_;
+
+  //! \brief The writer which wraps `ring_buffer_data_`.
+  RingBufferWriter ring_buffer_writer_;
+};
+
+// Allow just `RingBufferAnnotation foo;` to be declared without template
+// arguments using C++17 class template argument deduction.
+template <RingBufferAnnotationCapacity Capacity =
+              internal::kDefaultRingBufferAnnotationCapacity>
+RingBufferAnnotation(Annotation::Type type, const char name[])
+    -> RingBufferAnnotation<Capacity>;
+
+}  // namespace crashpad
+
+#endif  // CRASHPAD_CLIENT_RING_BUFFER_ANNOTATION_H_
diff --git a/extern/crashpad/crashpad/client/ring_buffer_annotation_load_test_main.cc b/extern/crashpad/crashpad/client/ring_buffer_annotation_load_test_main.cc
new file mode 100644
index 0000000000..50ca9eb18d
--- /dev/null
+++ b/extern/crashpad/crashpad/client/ring_buffer_annotation_load_test_main.cc
@@ -0,0 +1,476 @@
+// Copyright 2023 The Crashpad Authors
+//
+// 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.
+
+#include <getopt.h>
+#include <inttypes.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <chrono>
+#include <condition_variable>
+#include <functional>
+#include <mutex>
+#include <optional>
+#include <random>
+#include <ratio>
+#include <string>
+#include <string_view>
+
+#include "base/notreached.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/strings/stringprintf.h"
+#include "build/build_config.h"
+#include "client/annotation.h"
+#include "client/length_delimited_ring_buffer.h"
+#include "client/ring_buffer_annotation.h"
+#include "tools/tool_support.h"
+#include "util/stdlib/string_number_conversion.h"
+#include "util/synchronization/scoped_spin_guard.h"
+#include "util/thread/thread.h"
+
+#if BUILDFLAG(IS_WIN)
+#include <windows.h>
+#else
+#include <signal.h>
+#endif  // BUILDFLAG(IS_WIN)
+
+namespace crashpad {
+
+namespace test {
+
+namespace {
+
+constexpr Annotation::Type kRingBufferLoadTestType =
+    Annotation::UserDefinedType(0x0042);
+std::atomic<bool> g_should_exit = false;
+
+struct RingBufferAnnotationSnapshotParams final {
+  enum class Mode {
+    kUseScopedSpinGuard = 1,
+    kDoNotUseSpinGuard = 2,
+  };
+  Mode mode = Mode::kUseScopedSpinGuard;
+  using Duration = std::chrono::duration<uint64_t, std::nano>;
+  Duration producer_thread_min_run_duration = std::chrono::milliseconds(1);
+  Duration producer_thread_max_run_duration = std::chrono::milliseconds(10);
+  Duration producer_thread_sleep_duration = std::chrono::nanoseconds(10);
+  Duration consumer_thread_min_run_duration = std::chrono::milliseconds(5);
+  Duration consumer_thread_max_run_duration = std::chrono::milliseconds(100);
+  Duration quiesce_timeout = std::chrono::microseconds(500);
+  uint64_t num_loops = std::numeric_limits<uint64_t>::max();
+  std::optional<Duration> main_thread_run_duration = std::nullopt;
+};
+
+template <uint32_t RingBufferCapacity>
+class RingBufferAnnotationSnapshot final {
+  using RingBufferAnnotationType = RingBufferAnnotation<RingBufferCapacity>;
+
+  struct State final {
+    State()
+        : ring_buffer_annotation(kRingBufferLoadTestType,
+                                 "ring-buffer-load-test"),
+          ring_buffer_ready(false),
+          producer_thread_running(false),
+          producer_thread_finished(false),
+          consumer_thread_finished(false),
+          should_exit(false) {}
+
+    State(const State&) = delete;
+    State& operator=(const State&) = delete;
+
+    RingBufferAnnotationType ring_buffer_annotation;
+    bool ring_buffer_ready;
+    bool producer_thread_running;
+    bool producer_thread_finished;
+    bool consumer_thread_finished;
+    bool should_exit;
+  };
+
+  class Thread final : public crashpad::Thread {
+   public:
+    Thread(std::function<void()> thread_main)
+        : thread_main_(std::move(thread_main)) {}
+
+   private:
+    void ThreadMain() override { thread_main_(); }
+
+    const std::function<void()> thread_main_;
+  };
+
+ public:
+  RingBufferAnnotationSnapshot(const RingBufferAnnotationSnapshotParams& params)
+      : params_(params),
+        main_loop_thread_([this]() { MainLoopThreadMain(); }),
+        producer_thread_([this]() { ProducerThreadMain(); }),
+        consumer_thread_([this]() { ConsumerThreadMain(); }),
+        mutex_(),
+        state_changed_condition_(),
+        state_() {}
+
+  RingBufferAnnotationSnapshot(const RingBufferAnnotationSnapshot&) = delete;
+  RingBufferAnnotationSnapshot& operator=(const RingBufferAnnotationSnapshot&) =
+      delete;
+
+  void Start() {
+    main_loop_thread_.Start();
+    producer_thread_.Start();
+    consumer_thread_.Start();
+  }
+
+  void Stop() {
+    consumer_thread_.Join();
+    producer_thread_.Join();
+    main_loop_thread_.Join();
+  }
+
+ private:
+  void MainLoopThreadMain() {
+    std::chrono::steady_clock::time_point main_thread_end_time;
+    if (params_.main_thread_run_duration) {
+      main_thread_end_time =
+          std::chrono::steady_clock::now() + *params_.main_thread_run_duration;
+    } else {
+      main_thread_end_time = std::chrono::steady_clock::time_point::max();
+    }
+    for (uint64_t i = 0;
+         i < params_.num_loops &&
+         std::chrono::steady_clock::now() < main_thread_end_time;
+         i++) {
+      {
+        std::unique_lock<std::mutex> start_lock(mutex_);
+        state_.ring_buffer_annotation.ResetForTesting();
+        state_.ring_buffer_ready = true;
+        state_changed_condition_.notify_all();
+      }
+
+      {
+        std::unique_lock<std::mutex> lock(mutex_);
+        state_changed_condition_.wait(lock, [this] {
+          return state_.producer_thread_finished &&
+                 state_.consumer_thread_finished;
+        });
+        state_.ring_buffer_ready = false;
+        if (g_should_exit) {
+          printf("Exiting on Control-C.\n");
+          break;
+        }
+        printf(".");
+        fflush(stdout);
+        state_changed_condition_.notify_all();
+      }
+    }
+    state_.should_exit = true;
+    state_changed_condition_.notify_all();
+  }
+
+  void ProducerThreadMain() {
+    while (true) {
+      {
+        std::unique_lock<std::mutex> lock(mutex_);
+        state_changed_condition_.wait(lock, [this] {
+          return state_.should_exit || state_.ring_buffer_ready;
+        });
+        if (state_.should_exit) {
+          return;
+        }
+        state_.producer_thread_running = true;
+        state_.producer_thread_finished = false;
+        state_changed_condition_.notify_all();
+      }
+
+      auto min_run_duration_micros =
+          std::chrono::duration_cast<std::chrono::microseconds>(
+              params_.producer_thread_min_run_duration);
+      auto max_run_duration_micros =
+          std::chrono::duration_cast<std::chrono::microseconds>(
+              params_.producer_thread_max_run_duration);
+      std::uniform_int_distribution<std::chrono::microseconds::rep>
+          run_duration_distribution(min_run_duration_micros.count(),
+                                    max_run_duration_micros.count());
+      static thread_local std::mt19937 random_number_generator;
+      auto run_duration = std::chrono::microseconds(
+          run_duration_distribution(random_number_generator));
+      auto end_time = std::chrono::steady_clock::now() + run_duration;
+      uint64_t next_value = 0;
+      while (std::chrono::steady_clock::now() < end_time) {
+        if (!Produce(next_value++)) {
+          // The consumer thread interrupted this.
+          break;
+        }
+      }
+      {
+        std::unique_lock<std::mutex> lock(mutex_);
+        state_changed_condition_.wait(
+            lock, [this] { return state_.consumer_thread_finished; });
+        state_.producer_thread_running = false;
+        state_.producer_thread_finished = true;
+        state_changed_condition_.notify_all();
+      }
+    }
+  }
+
+  bool Produce(uint64_t value) {
+    std::string hex_value = base::StringPrintf("0x%08" PRIx64, value);
+    if (!state_.ring_buffer_annotation.Push(
+            hex_value.data(), static_cast<uint32_t>(hex_value.size()))) {
+      fprintf(stderr,
+              "Ignoring failed call to Push(0x%" PRIx64
+              ") (ScopedSpinGuard was held by snapshot thread)\n",
+              value);
+      return false;
+    }
+    return true;
+  }
+
+  void ConsumerThreadMain() {
+    while (true) {
+      {
+        std::unique_lock<std::mutex> lock(mutex_);
+        state_changed_condition_.wait(lock, [this] {
+          return state_.should_exit ||
+                 (state_.ring_buffer_ready && state_.producer_thread_running);
+        });
+        if (state_.should_exit) {
+          return;
+        }
+        state_.consumer_thread_finished = false;
+        state_changed_condition_.notify_all();
+      }
+      auto min_run_duration_micros =
+          std::chrono::duration_cast<std::chrono::microseconds>(
+              params_.consumer_thread_min_run_duration);
+      auto max_run_duration_micros =
+          std::chrono::duration_cast<std::chrono::microseconds>(
+              params_.consumer_thread_max_run_duration);
+      std::uniform_int_distribution<std::chrono::microseconds::rep>
+          run_duration_distribution(min_run_duration_micros.count(),
+                                    max_run_duration_micros.count());
+      static thread_local std::mt19937 random_number_generator;
+      auto run_duration = std::chrono::microseconds(
+          run_duration_distribution(random_number_generator));
+      auto end_time = std::chrono::steady_clock::now() + run_duration;
+      while (std::chrono::steady_clock::now() < end_time) {
+        constexpr uint64_t kSleepTimeNs = 10000;  // 10 us
+        SleepNanoseconds(kSleepTimeNs);
+      }
+      Snapshot();
+      {
+        std::unique_lock<std::mutex> lock(mutex_);
+        state_.consumer_thread_finished = true;
+        state_.ring_buffer_ready = false;
+        state_changed_condition_.notify_all();
+      }
+    }
+  }
+
+  void Snapshot() {
+    int64_t timeout_ns = static_cast<int64_t>(
+        std::chrono::duration_cast<std::chrono::nanoseconds>(
+            params_.quiesce_timeout)
+            .count());
+    uint8_t serialized_ring_buffer[sizeof(state_.ring_buffer_annotation)];
+    Annotation::ValueSizeType ring_buffer_size;
+    {
+      std::optional<ScopedSpinGuard> scoped_spin_guard;
+      if (params_.mode ==
+          RingBufferAnnotationSnapshotParams::Mode::kUseScopedSpinGuard) {
+        scoped_spin_guard =
+            state_.ring_buffer_annotation.TryCreateScopedSpinGuard(timeout_ns);
+      }
+      if (params_.mode ==
+              RingBufferAnnotationSnapshotParams::Mode::kUseScopedSpinGuard &&
+          !scoped_spin_guard) {
+        fprintf(stderr,
+                "Could not quiesce writes within %" PRIi64 " ns\n",
+                timeout_ns);
+        abort();
+      }
+      ring_buffer_size = state_.ring_buffer_annotation.size();
+      memcpy(&serialized_ring_buffer[0],
+             state_.ring_buffer_annotation.value(),
+             ring_buffer_size);
+    }
+    RingBufferData ring_buffer;
+    if (!ring_buffer.DeserializeFromBuffer(serialized_ring_buffer,
+                                           ring_buffer_size)) {
+      fprintf(stderr, "Could not deserialize ring buffer\n");
+      abort();
+    }
+    LengthDelimitedRingBufferReader ring_buffer_reader(ring_buffer);
+    int value = std::numeric_limits<int>::max();
+    std::vector<uint8_t> bytes;
+    while (ring_buffer_reader.Pop(bytes)) {
+      int next_value;
+      std::string_view str(reinterpret_cast<const char*>(&bytes[0]),
+                           bytes.size());
+      if (!base::HexStringToInt(str, &next_value)) {
+        fprintf(stderr,
+                "Couldn't parse value: [%.*s]\n",
+                base::checked_cast<int>(bytes.size()),
+                bytes.data());
+        abort();
+      }
+      if (value == std::numeric_limits<int>::max()) {
+        // First value in buffer.
+      } else if (value + 1 != next_value) {
+        fprintf(stderr,
+                "Expected value 0x%08x, got 0x%08x\n",
+                value + 1,
+                next_value);
+        abort();
+      }
+      value = next_value;
+      bytes.clear();
+    }
+  }
+
+  const RingBufferAnnotationSnapshotParams params_;
+  Thread main_loop_thread_;
+  Thread producer_thread_;
+  Thread consumer_thread_;
+  std::mutex mutex_;
+
+  // Fired whenever `state_` changes.
+  std::condition_variable state_changed_condition_;
+
+  // Protected by `mutex_`.
+  State state_;
+};
+
+void Usage(const base::FilePath& me) {
+  // clang-format off
+  fprintf(stderr,
+"Usage: %" PRFilePath " [OPTION]...\n"
+"Runs a load test for concurrent I/O to RingBufferAnnotation.\n"
+"\n"
+"By default, enables the annotation spin guard and runs indefinitely\n"
+"until interrupted (e.g., with Control-C or SIGINT).\n"
+"\n"
+"  -d,--disable-spin-guard  Disables the annotation spin guard\n"
+"                           (the test is expected to crash in this case)\n"
+"  -n,--num-loops=N         Runs the test for N iterations, not indefinitely\n"
+"  -s,--duration-secs=SECS  Runs the test for SECS seconds, not indefinitely\n",
+          me.value().c_str());
+  // clang-format on
+  ToolSupport::UsageTail(me);
+}
+
+int TestMain(int argc, char** argv) {
+  const base::FilePath argv0(
+      ToolSupport::CommandLineArgumentToFilePathStringType(argv[0]));
+  const base::FilePath me(argv0.BaseName());
+
+#if BUILDFLAG(IS_WIN)
+  auto handler_routine = [](DWORD type) -> BOOL {
+    if (type == CTRL_C_EVENT) {
+      g_should_exit = true;
+      return TRUE;
+    }
+    return FALSE;
+  };
+  if (!SetConsoleCtrlHandler(handler_routine, /*Add=*/TRUE)) {
+    fprintf(stderr, "Couldn't set Control-C handler\n");
+    return EXIT_FAILURE;
+  }
+#else
+  signal(SIGINT, [](int signal) { g_should_exit = true; });
+#endif  // BUILDFLAG(IS_WIN)
+  RingBufferAnnotationSnapshotParams params;
+  enum OptionFlags {
+    // "Short" (single-character) options.
+    kOptionDisableSpinGuard = 'd',
+    kOptionNumLoops = 'n',
+    kOptionDurationSecs = 's',
+
+    // Standard options.
+    kOptionHelp = -2,
+    kOptionVersion = -3,
+  };
+  static constexpr option long_options[] = {
+      {"disable-spin-guard", no_argument, nullptr, kOptionDisableSpinGuard},
+      {"num-loops", required_argument, nullptr, kOptionNumLoops},
+      {"duration-secs", required_argument, nullptr, kOptionDurationSecs},
+      {"help", no_argument, nullptr, kOptionHelp},
+      {"version", no_argument, nullptr, kOptionVersion},
+      {nullptr, 0, nullptr, 0},
+  };
+
+  int opt;
+  while ((opt = getopt_long(argc, argv, "dn:s:", long_options, nullptr)) !=
+         -1) {
+    switch (opt) {
+      case kOptionDisableSpinGuard:
+        printf("Disabling spin guard logic (this test will fail!)\n");
+        params.mode =
+            RingBufferAnnotationSnapshotParams::Mode::kDoNotUseSpinGuard;
+        break;
+      case kOptionNumLoops: {
+        std::string num_loops(optarg);
+        uint64_t num_loops_value;
+        if (!StringToNumber(num_loops, &num_loops_value)) {
+          ToolSupport::UsageHint(me, "--num-loops requires integer value");
+          return EXIT_FAILURE;
+        }
+        params.num_loops = num_loops_value;
+        break;
+      }
+      case kOptionDurationSecs: {
+        std::string duration_secs(optarg);
+        uint64_t duration_secs_value;
+        if (!StringToNumber(duration_secs, &duration_secs_value)) {
+          ToolSupport::UsageHint(me, "--duration-secs requires integer value");
+          return EXIT_FAILURE;
+        }
+        params.main_thread_run_duration =
+            std::chrono::seconds(duration_secs_value);
+        break;
+      }
+      case kOptionHelp:
+        Usage(me);
+        return EXIT_SUCCESS;
+      case kOptionVersion:
+        ToolSupport::Version(me);
+        return EXIT_SUCCESS;
+      default:
+        ToolSupport::UsageHint(me, nullptr);
+        return EXIT_FAILURE;
+    }
+  }
+
+  RingBufferAnnotationSnapshot<8192> test_producer_snapshot(params);
+  printf("Starting test (Control-C to exit)...\n");
+  test_producer_snapshot.Start();
+  test_producer_snapshot.Stop();
+  printf("Test finished.\n");
+  return EXIT_SUCCESS;
+}
+
+}  // namespace
+}  // namespace test
+}  // namespace crashpad
+
+#if BUILDFLAG(IS_POSIX)
+
+int main(int argc, char** argv) {
+  return crashpad::test::TestMain(argc, argv);
+}
+
+#elif BUILDFLAG(IS_WIN)
+
+int wmain(int argc, wchar_t* argv[]) {
+  return crashpad::ToolSupport::Wmain(argc, argv, crashpad::test::TestMain);
+}
+
+#endif
diff --git a/extern/crashpad/crashpad/client/ring_buffer_annotation_test.cc b/extern/crashpad/crashpad/client/ring_buffer_annotation_test.cc
new file mode 100644
index 0000000000..0893470ee0
--- /dev/null
+++ b/extern/crashpad/crashpad/client/ring_buffer_annotation_test.cc
@@ -0,0 +1,188 @@
+// Copyright 2023 The Crashpad Authors
+//
+// 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.
+
+#include "client/ring_buffer_annotation.h"
+#include "client/length_delimited_ring_buffer.h"
+
+#include <array>
+#include <string>
+
+#include "client/annotation_list.h"
+#include "client/crashpad_info.h"
+#include "gtest/gtest.h"
+#include "test/gtest_death.h"
+
+namespace crashpad {
+namespace test {
+namespace {
+
+constexpr uint32_t kRingBufferHeaderSize = 16;
+constexpr uint32_t kLengthDelimiter1ByteSize = 1;
+
+class RingBufferAnnotationTest : public testing::Test {
+ public:
+  void SetUp() override {
+    CrashpadInfo::GetCrashpadInfo()->set_annotations_list(&annotations_);
+  }
+
+  void TearDown() override {
+    CrashpadInfo::GetCrashpadInfo()->set_annotations_list(nullptr);
+  }
+
+  size_t AnnotationsCount() {
+    size_t result = 0;
+    for (auto* annotation : annotations_) {
+      if (annotation->is_set())
+        ++result;
+    }
+    return result;
+  }
+
+ protected:
+  AnnotationList annotations_;
+};
+
+TEST_F(RingBufferAnnotationTest, Basics) {
+  constexpr Annotation::Type kType = Annotation::UserDefinedType(1);
+
+  constexpr char kName[] = "annotation 1";
+  RingBufferAnnotation annotation(kType, kName);
+
+  EXPECT_FALSE(annotation.is_set());
+  EXPECT_EQ(0u, AnnotationsCount());
+
+  EXPECT_EQ(kType, annotation.type());
+  EXPECT_EQ(0u, annotation.size());
+  EXPECT_EQ(std::string(kName), annotation.name());
+
+  EXPECT_TRUE(
+      annotation.Push(reinterpret_cast<const uint8_t*>("0123456789"), 10));
+
+  EXPECT_TRUE(annotation.is_set());
+  EXPECT_EQ(1u, AnnotationsCount());
+
+  constexpr Annotation::ValueSizeType kExpectedSize =
+      kRingBufferHeaderSize + kLengthDelimiter1ByteSize + 10u;
+  EXPECT_EQ(kExpectedSize, annotation.size());
+  EXPECT_EQ(&annotation, *annotations_.begin());
+
+  RingBufferData data;
+  EXPECT_TRUE(
+      data.DeserializeFromBuffer(annotation.value(), annotation.size()));
+  EXPECT_EQ(kExpectedSize, data.GetRingBufferLength());
+
+  std::vector<uint8_t> popped_value;
+  LengthDelimitedRingBufferReader reader(data);
+  EXPECT_TRUE(reader.Pop(popped_value));
+
+  const std::vector<uint8_t> expected = {
+      '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'};
+  EXPECT_EQ(expected, popped_value);
+
+  annotation.Clear();
+
+  EXPECT_FALSE(annotation.is_set());
+  EXPECT_EQ(0u, AnnotationsCount());
+
+  EXPECT_EQ(0u, annotation.size());
+}
+
+TEST_F(RingBufferAnnotationTest, MultiplePushesWithoutWrapping) {
+  constexpr Annotation::Type kType = Annotation::UserDefinedType(1);
+
+  constexpr char kName[] = "annotation 1";
+  RingBufferAnnotation annotation(kType, kName);
+
+  EXPECT_TRUE(
+      annotation.Push(reinterpret_cast<const uint8_t*>("0123456789"), 10));
+  EXPECT_TRUE(annotation.Push(reinterpret_cast<const uint8_t*>("ABCDEF"), 6));
+
+  EXPECT_TRUE(annotation.is_set());
+  EXPECT_EQ(1u, AnnotationsCount());
+
+  constexpr Annotation::ValueSizeType kExpectedSize =
+      kRingBufferHeaderSize + kLengthDelimiter1ByteSize + 10u +
+      kLengthDelimiter1ByteSize + 6u;
+  EXPECT_EQ(kExpectedSize, annotation.size());
+  EXPECT_EQ(&annotation, *annotations_.begin());
+
+  RingBufferData data;
+  EXPECT_TRUE(
+      data.DeserializeFromBuffer(annotation.value(), annotation.size()));
+  EXPECT_EQ(kExpectedSize, data.GetRingBufferLength());
+
+  std::vector<uint8_t> popped_value;
+  LengthDelimitedRingBufferReader reader(data);
+  EXPECT_TRUE(reader.Pop(popped_value));
+
+  const std::vector<uint8_t> expected1 = {
+      '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'};
+  EXPECT_EQ(expected1, popped_value);
+
+  popped_value.clear();
+  EXPECT_TRUE(reader.Pop(popped_value));
+
+  const std::vector<uint8_t> expected2 = {'A', 'B', 'C', 'D', 'E', 'F'};
+  EXPECT_EQ(expected2, popped_value);
+}
+
+TEST_F(RingBufferAnnotationTest,
+       MultiplePushCallsWithWrappingShouldOverwriteInFIFOOrder) {
+  constexpr Annotation::Type kType = Annotation::UserDefinedType(1);
+
+  constexpr char kName[] = "annotation 1";
+  RingBufferAnnotation<10> annotation(kType, kName);
+
+  // Each Push() call will push 1 byte for the varint 128-encoded length,
+  // then the number of bytes specified.
+  constexpr char kFirst[] = "AAA";
+  constexpr char kSecond[] = "BBB";
+  constexpr char kThird[] = "CCC";
+
+  // This takes up bytes 0-3 of the 10-byte RingBufferAnnotation.
+  ASSERT_TRUE(annotation.Push(reinterpret_cast<const uint8_t*>(kFirst), 3));
+
+  // This takes up bytes 4-7 of the 10-byte RingBufferAnnotation.
+  ASSERT_TRUE(annotation.Push(reinterpret_cast<const uint8_t*>(kSecond), 3));
+
+  // This should wrap around the end of the array and overwrite kFirst since it
+  // needs 4 bytes but there are only 2 left.
+  ASSERT_TRUE(annotation.Push(reinterpret_cast<const uint8_t*>(kThird), 3));
+
+  // The size of the annotation should include the header and the full 10 bytes
+  // of the ring buffer, since the third write wrapped around the end.
+  ASSERT_EQ(kRingBufferHeaderSize + 10u, annotation.size());
+
+  // This data size needs to match the size in the RingBufferAnnotation above.
+  RingBufferData<10> data;
+  ASSERT_TRUE(
+      data.DeserializeFromBuffer(annotation.value(), annotation.size()));
+
+  std::vector<uint8_t> popped_value;
+  LengthDelimitedRingBufferReader reader(data);
+  ASSERT_TRUE(reader.Pop(popped_value));
+
+  // "AAA" has been overwritten, so the first thing popped should be "BBB".
+  const std::vector<uint8_t> expected_b = {'B', 'B', 'B'};
+  EXPECT_EQ(expected_b, popped_value);
+
+  popped_value.clear();
+  ASSERT_TRUE(reader.Pop(popped_value));
+  const std::vector<uint8_t> expected_c = {'C', 'C', 'C'};
+  EXPECT_EQ(expected_c, popped_value);
+}
+
+}  // namespace
+}  // namespace test
+}  // namespace crashpad
diff --git a/extern/crashpad/crashpad/client/settings.cc b/extern/crashpad/crashpad/client/settings.cc
index 3855b9b6a4..38da08b8b5 100644
--- a/extern/crashpad/crashpad/client/settings.cc
+++ b/extern/crashpad/crashpad/client/settings.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,17 +15,20 @@
 #include "client/settings.h"
 
 #include <stdint.h>
+#include <string.h>
 
 #include <limits>
 
 #include "base/logging.h"
+#include "base/notreached.h"
 #include "base/posix/eintr_wrapper.h"
+#include "build/build_config.h"
 #include "util/file/filesystem.h"
 #include "util/numeric/in_range_cast.h"
 
 namespace crashpad {
 
-#if defined(OS_FUCHSIA)
+#if !CRASHPAD_FLOCK_ALWAYS_SUPPORTED
 
 Settings::ScopedLockedFileHandle::ScopedLockedFileHandle()
     : handle_(kInvalidFileHandle), lockfile_path_() {
@@ -68,7 +71,36 @@ void Settings::ScopedLockedFileHandle::Destroy() {
   }
 }
 
-#else // OS_FUCHSIA
+#else  // !CRASHPAD_FLOCK_ALWAYS_SUPPORTED
+
+#if BUILDFLAG(IS_IOS)
+
+Settings::ScopedLockedFileHandle::ScopedLockedFileHandle(
+    const FileHandle& value)
+    : ScopedGeneric(value) {
+  ios_background_task_ = std::make_unique<internal::ScopedBackgroundTask>(
+      "ScopedLockedFileHandle");
+}
+
+Settings::ScopedLockedFileHandle::ScopedLockedFileHandle(
+    Settings::ScopedLockedFileHandle&& rvalue) {
+  ios_background_task_.reset(rvalue.ios_background_task_.release());
+  reset(rvalue.release());
+}
+
+Settings::ScopedLockedFileHandle& Settings::ScopedLockedFileHandle::operator=(
+    Settings::ScopedLockedFileHandle&& rvalue) {
+  ios_background_task_.reset(rvalue.ios_background_task_.release());
+  reset(rvalue.release());
+  return *this;
+}
+
+Settings::ScopedLockedFileHandle::~ScopedLockedFileHandle() {
+  // Call reset() to ensure the lock is released before the ios_background_task.
+  reset();
+}
+
+#endif  // BUILDFLAG(IS_IOS)
 
 namespace internal {
 
@@ -82,10 +114,14 @@ void ScopedLockedFileHandleTraits::Free(FileHandle handle) {
 
 }  // namespace internal
 
-#endif  // OS_FUCHSIA
+#endif  // BUILDFLAG(IS_FUCHSIA)
 
-struct Settings::Data {
+struct SettingsReader::Data {
   static constexpr uint32_t kSettingsMagic = 'CPds';
+
+  // Version number only used for incompatible changes to Data. Do not change
+  // this when adding additional fields at the end. Modifying `kSettingsVersion`
+  // will wipe away the entire struct when reading from other versions.
   static constexpr uint32_t kSettingsVersion = 1;
 
   enum Options : uint32_t {
@@ -107,47 +143,117 @@ struct Settings::Data {
   UUID client_id;
 };
 
-Settings::Settings() = default;
+SettingsReader::SettingsReader(const base::FilePath& file_path)
+    : SettingsReader(file_path, InitializationState::kStateValid) {}
 
-Settings::~Settings() = default;
+SettingsReader::SettingsReader(const base::FilePath& file_path,
+                               InitializationState::State state)
+    : file_path_(file_path), initialized_(state) {}
+
+SettingsReader::~SettingsReader() = default;
 
-bool Settings::Initialize(const base::FilePath& file_path) {
-  DCHECK(initialized_.is_uninitialized());
-  initialized_.set_invalid();
-  file_path_ = file_path;
+bool SettingsReader::GetClientID(UUID* client_id) {
+  DCHECK(initialized().is_valid());
 
   Data settings;
-  if (!OpenForWritingAndReadSettings(&settings).is_valid())
+  if (!OpenAndReadSettings(&settings))
     return false;
 
-  initialized_.set_valid();
+  *client_id = settings.client_id;
   return true;
 }
 
-bool Settings::GetClientID(UUID* client_id) {
-  DCHECK(initialized_.is_valid());
+bool SettingsReader::GetUploadsEnabled(bool* enabled) {
+  DCHECK(initialized().is_valid());
 
   Data settings;
   if (!OpenAndReadSettings(&settings))
     return false;
 
-  *client_id = settings.client_id;
+  *enabled = (settings.options & Data::Options::kUploadsEnabled) != 0;
   return true;
 }
 
-bool Settings::GetUploadsEnabled(bool* enabled) {
-  DCHECK(initialized_.is_valid());
+bool SettingsReader::GetLastUploadAttemptTime(time_t* time) {
+  DCHECK(initialized().is_valid());
 
   Data settings;
   if (!OpenAndReadSettings(&settings))
     return false;
 
-  *enabled = (settings.options & Data::Options::kUploadsEnabled) != 0;
+  *time = InRangeCast<time_t>(settings.last_upload_attempt_time,
+                              std::numeric_limits<time_t>::max());
+  return true;
+}
+
+bool SettingsReader::OpenAndReadSettings(Data* out_data) {
+  ScopedFileHandle handle(LoggingOpenFileForRead(file_path_));
+  return handle.is_valid() && ReadSettings(handle.get(), out_data, true);
+}
+
+bool SettingsReader::ReadSettings(FileHandle handle,
+                                  Data* out_data,
+                                  bool log_read_error) {
+  if (LoggingSeekFile(handle, 0, SEEK_SET) != 0) {
+    return false;
+  }
+
+  // This clears `out_data` so that any bytes not read from disk are zero
+  // initialized. This is expected when reading from an older settings file with
+  // fewer fields.
+  memset(out_data, 0, sizeof(*out_data));
+
+  const FileOperationResult read_result =
+      log_read_error ? LoggingReadFileUntil(handle, out_data, sizeof(*out_data))
+                     : ReadFileUntil(handle, out_data, sizeof(*out_data));
+
+  if (read_result <= 0) {
+    return false;
+  }
+
+  // Newer versions of crashpad may add fields to Data, but all versions have
+  // the data members up to `client_id`. Do not attempt to understand a smaller
+  // struct read.
+  const size_t min_size =
+      offsetof(Data, client_id) + sizeof(out_data->client_id);
+  if (static_cast<size_t>(read_result) < min_size) {
+    LOG(ERROR) << "Settings file too small: minimum " << min_size
+               << ", observed " << read_result;
+    return false;
+  }
+
+  if (out_data->magic != Data::kSettingsMagic) {
+    LOG(ERROR) << "Settings magic is not " << Data::kSettingsMagic;
+    return false;
+  }
+
+  if (out_data->version != Data::kSettingsVersion) {
+    LOG(ERROR) << "Settings version is not " << Data::kSettingsVersion;
+    return false;
+  }
+
+  return true;
+}
+
+Settings::Settings(const base::FilePath& path)
+    : SettingsReader(path, InitializationState::kStateUninitialized) {}
+
+Settings::~Settings() = default;
+
+bool Settings::Initialize() {
+  DCHECK(initialized().is_uninitialized());
+  initialized().set_invalid();
+
+  Data settings;
+  if (!OpenForWritingAndReadSettings(&settings).is_valid())
+    return false;
+
+  initialized().set_valid();
   return true;
 }
 
 bool Settings::SetUploadsEnabled(bool enabled) {
-  DCHECK(initialized_.is_valid());
+  DCHECK(initialized().is_valid());
 
   Data settings;
   ScopedLockedFileHandle handle = OpenForWritingAndReadSettings(&settings);
@@ -162,20 +268,8 @@ bool Settings::SetUploadsEnabled(bool enabled) {
   return WriteSettings(handle.get(), settings);
 }
 
-bool Settings::GetLastUploadAttemptTime(time_t* time) {
-  DCHECK(initialized_.is_valid());
-
-  Data settings;
-  if (!OpenAndReadSettings(&settings))
-    return false;
-
-  *time = InRangeCast<time_t>(settings.last_upload_attempt_time,
-                              std::numeric_limits<time_t>::max());
-  return true;
-}
-
 bool Settings::SetLastUploadAttemptTime(time_t time) {
-  DCHECK(initialized_.is_valid());
+  DCHECK(initialized().is_valid());
 
   Data settings;
   ScopedLockedFileHandle handle = OpenForWritingAndReadSettings(&settings);
@@ -187,25 +281,54 @@ bool Settings::SetLastUploadAttemptTime(time_t time) {
   return WriteSettings(handle.get(), settings);
 }
 
+#if !CRASHPAD_FLOCK_ALWAYS_SUPPORTED
+// static
+bool Settings::IsLockExpired(const base::FilePath& file_path,
+                             time_t lockfile_ttl) {
+  time_t now = time(nullptr);
+  base::FilePath lock_path(file_path.value() + Settings::kLockfileExtension);
+  ScopedFileHandle lock_fd(LoggingOpenFileForRead(lock_path));
+  time_t lock_timestamp;
+  if (!LoggingReadFileExactly(
+          lock_fd.get(), &lock_timestamp, sizeof(lock_timestamp))) {
+    return false;
+  }
+  return now >= lock_timestamp + lockfile_ttl;
+}
+#endif  // !CRASHPAD_FLOCK_ALWAYS_SUPPORTED
+
 // static
 Settings::ScopedLockedFileHandle Settings::MakeScopedLockedFileHandle(
-    FileHandle file,
+    const internal::MakeScopedLockedFileHandleOptions& options,
     FileLocking locking,
     const base::FilePath& file_path) {
-  ScopedFileHandle scoped(file);
-#if defined(OS_FUCHSIA)
-  base::FilePath lockfile_path(file_path.value() + ".__lock__");
+#if !CRASHPAD_FLOCK_ALWAYS_SUPPORTED
+  base::FilePath lockfile_path(file_path.value() +
+                               Settings::kLockfileExtension);
+  ScopedFileHandle lockfile_scoped(
+      LoggingOpenFileForWrite(lockfile_path,
+                              FileWriteMode::kCreateOrFail,
+                              FilePermissions::kWorldReadable));
+  if (!lockfile_scoped.is_valid()) {
+    return ScopedLockedFileHandle();
+  }
+  time_t now = time(nullptr);
+  if (!LoggingWriteFile(lockfile_scoped.get(), &now, sizeof(now))) {
+    return ScopedLockedFileHandle();
+  }
+  ScopedFileHandle scoped(GetHandleFromOptions(file_path, options));
   if (scoped.is_valid()) {
-    ScopedFileHandle lockfile_scoped(
-        LoggingOpenFileForWrite(lockfile_path,
-                                FileWriteMode::kCreateOrFail,
-                                FilePermissions::kWorldReadable));
-    // This is a lightweight attempt to try to catch racy behavior.
-    DCHECK(lockfile_scoped.is_valid());
     return ScopedLockedFileHandle(scoped.release(), lockfile_path);
   }
-  return ScopedLockedFileHandle(scoped.release(), base::FilePath());
+  bool success = LoggingRemoveFile(lockfile_path);
+  DCHECK(success);
+  return ScopedLockedFileHandle();
 #else
+  ScopedFileHandle scoped(GetHandleFromOptions(file_path, options));
+  // It's important to create the ScopedLockedFileHandle before calling
+  // LoggingLockFile on iOS, so a ScopedBackgroundTask is created *before*
+  // the LoggingLockFile call below.
+  ScopedLockedFileHandle handle(kInvalidFileHandle);
   if (scoped.is_valid()) {
     if (LoggingLockFile(
             scoped.get(), locking, FileLockingBlocking::kBlocking) !=
@@ -213,33 +336,57 @@ Settings::ScopedLockedFileHandle Settings::MakeScopedLockedFileHandle(
       scoped.reset();
     }
   }
-  return ScopedLockedFileHandle(scoped.release());
-#endif
+  handle.reset(scoped.release());
+  return handle;
+#endif  // !CRASHPAD_FLOCK_ALWAYS_SUPPORTED
 }
 
-Settings::ScopedLockedFileHandle Settings::OpenForReading() {
-  return MakeScopedLockedFileHandle(
-      LoggingOpenFileForRead(file_path()), FileLocking::kShared, file_path());
+// static
+FileHandle Settings::GetHandleFromOptions(
+    const base::FilePath& file_path,
+    const internal::MakeScopedLockedFileHandleOptions& options) {
+  switch (options.function_enum) {
+    case internal::FileOpenFunction::kLoggingOpenFileForRead:
+      return LoggingOpenFileForRead(file_path);
+    case internal::FileOpenFunction::kLoggingOpenFileForReadAndWrite:
+      return LoggingOpenFileForReadAndWrite(
+          file_path, options.mode, options.permissions);
+    case internal::FileOpenFunction::kOpenFileForReadAndWrite:
+      return OpenFileForReadAndWrite(
+          file_path, options.mode, options.permissions);
+  }
+  NOTREACHED();
+}
+
+Settings::ScopedLockedFileHandle Settings::OpenForReading() const {
+  internal::MakeScopedLockedFileHandleOptions options;
+  options.function_enum = internal::FileOpenFunction::kLoggingOpenFileForRead;
+  return MakeScopedLockedFileHandle(options, FileLocking::kShared, file_path());
 }
 
 Settings::ScopedLockedFileHandle Settings::OpenForReadingAndWriting(
     FileWriteMode mode, bool log_open_error) {
   DCHECK(mode != FileWriteMode::kTruncateOrCreate);
 
-  FileHandle handle;
+  internal::MakeScopedLockedFileHandleOptions options;
+  options.mode = mode;
+  options.permissions = FilePermissions::kOwnerOnly;
   if (log_open_error) {
-    handle = LoggingOpenFileForReadAndWrite(
-        file_path(), mode, FilePermissions::kOwnerOnly);
+    options.function_enum =
+        internal::FileOpenFunction::kLoggingOpenFileForReadAndWrite;
   } else {
-    handle = OpenFileForReadAndWrite(
-        file_path(), mode, FilePermissions::kOwnerOnly);
+    options.function_enum =
+        internal::FileOpenFunction::kOpenFileForReadAndWrite;
   }
 
   return MakeScopedLockedFileHandle(
-      handle, FileLocking::kExclusive, file_path());
+      options, FileLocking::kExclusive, file_path());
 }
 
 bool Settings::OpenAndReadSettings(Data* out_data) {
+  // Because this implementation distinguishes between a failure to open and a
+  // failure to read the settings file, it cannot simply invoke
+  // SettingsReader::OpenAndReadSettings.
   ScopedLockedFileHandle handle = OpenForReading();
   if (!handle.is_valid())
     return false;
@@ -258,7 +405,7 @@ Settings::ScopedLockedFileHandle Settings::OpenForWritingAndReadSettings(
     Data* out_data) {
   ScopedLockedFileHandle handle;
   bool created = false;
-  if (!initialized_.is_valid()) {
+  if (!initialized().is_valid()) {
     // If this object is initializing, it hasn’t seen a settings file already,
     // so go easy on errors. Creating a new settings file for the first time
     // shouldn’t spew log messages.
@@ -305,33 +452,6 @@ Settings::ScopedLockedFileHandle Settings::OpenForWritingAndReadSettings(
   return handle;
 }
 
-bool Settings::ReadSettings(FileHandle handle,
-                            Data* out_data,
-                            bool log_read_error) {
-  if (LoggingSeekFile(handle, 0, SEEK_SET) != 0)
-    return false;
-
-  bool read_result =
-      log_read_error
-          ? LoggingReadFileExactly(handle, out_data, sizeof(*out_data))
-          : ReadFileExactly(handle, out_data, sizeof(*out_data));
-
-  if (!read_result)
-    return false;
-
-  if (out_data->magic != Data::kSettingsMagic) {
-    LOG(ERROR) << "Settings magic is not " << Data::kSettingsMagic;
-    return false;
-  }
-
-  if (out_data->version != Data::kSettingsVersion) {
-    LOG(ERROR) << "Settings version is not " << Data::kSettingsVersion;
-    return false;
-  }
-
-  return true;
-}
-
 bool Settings::WriteSettings(FileHandle handle, const Data& data) {
   if (LoggingSeekFile(handle, 0, SEEK_SET) != 0)
     return false;
diff --git a/extern/crashpad/crashpad/client/settings.h b/extern/crashpad/crashpad/client/settings.h
index d17f357ed4..7da179de2e 100644
--- a/extern/crashpad/crashpad/client/settings.h
+++ b/extern/crashpad/crashpad/client/settings.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,8 +17,6 @@
 
 #include <time.h>
 
-#include <string>
-
 #include "base/files/file_path.h"
 #include "base/scoped_generic.h"
 #include "build/build_config.h"
@@ -26,6 +24,10 @@
 #include "util/misc/initialization_state.h"
 #include "util/misc/uuid.h"
 
+#if BUILDFLAG(IS_IOS)
+#include "util/ios/scoped_background_task.h"
+#endif  // BUILDFLAG(IS_IOS)
+
 namespace crashpad {
 
 namespace internal {
@@ -35,38 +37,48 @@ struct ScopedLockedFileHandleTraits {
   static void Free(FileHandle handle);
 };
 
+enum class FileOpenFunction {
+  kLoggingOpenFileForRead,
+  kLoggingOpenFileForReadAndWrite,
+  kOpenFileForReadAndWrite,
+};
+
+struct MakeScopedLockedFileHandleOptions {
+  FileOpenFunction function_enum;
+  FileWriteMode mode;
+  FilePermissions permissions;
+};
+
+// TODO(mark): The timeout should be configurable by the client.
+#if BUILDFLAG(IS_IOS)
+// iOS background assertions only last 30 seconds, keep the timeout shorter.
+constexpr double kUploadReportTimeoutSeconds = 20;
+#else
+constexpr double kUploadReportTimeoutSeconds = 60;
+#endif
+
 }  // namespace internal
 
-//! \brief An interface for accessing and modifying the settings of a
-//!     CrashReportDatabase.
+//! \brief A class for accessing the settings of a CrashReportDatabase.
+//!
+//! SettingsReader does not participate in file locking.
 //!
 //! This class must not be instantiated directly, but rather an instance of it
-//! should be retrieved via CrashReportDatabase::GetSettings().
-class Settings {
+//! should be retrieved via
+//! CrashReportDatabase::GetSettingsReaderForDatabasePath.
+class SettingsReader {
  public:
-  Settings();
+  explicit SettingsReader(const base::FilePath& path);
 
-  Settings(const Settings&) = delete;
-  Settings& operator=(const Settings&) = delete;
+  SettingsReader(const SettingsReader&) = delete;
+  SettingsReader& operator=(const SettingsReader&) = delete;
 
-  ~Settings();
-
-  //! \brief Initializes the settings data store.
-  //!
-  //! This method must be called only once, and must be successfully called
-  //! before any other method in this class may be called.
-  //!
-  //! \param[in] path The location to store the settings data.
-  //! \return `true` if the data store was initialized successfully, otherwise
-  //!     `false` with an error logged.
-  bool Initialize(const base::FilePath& path);
+  virtual ~SettingsReader();
 
   //! \brief Retrieves the immutable identifier for this client, which is used
   //!     on a server to locate all crash reports from a specific Crashpad
   //!     database.
   //!
-  //! This is automatically initialized when the database is created.
-  //!
   //! \param[out] client_id The unique client identifier.
   //!
   //! \return On success, returns `true`, otherwise returns `false` with an
@@ -88,15 +100,6 @@ class Settings {
   //!     error logged.
   bool GetUploadsEnabled(bool* enabled);
 
-  //! \brief Sets the user’s preference for submitting crash reports to a
-  //!     collection server.
-  //!
-  //! \param[in] enabled Whether crash reports should be uploaded.
-  //!
-  //! \return On success, returns `true`, otherwise returns `false` with an
-  //!     error logged.
-  bool SetUploadsEnabled(bool enabled);
-
   //! \brief Retrieves the last time at which a report was attempted to be
   //!     uploaded.
   //!
@@ -108,6 +111,67 @@ class Settings {
   //!     error logged.
   bool GetLastUploadAttemptTime(time_t* time);
 
+ protected:
+  struct Data;
+
+  SettingsReader(const base::FilePath& path, InitializationState::State state);
+
+  // Opens the settings file and reads the data. If that fails, an error will
+  // be logged and the function will return false.
+  virtual bool OpenAndReadSettings(Data* out_data);
+
+  // Reads the settings from |handle|. Logs an error and returns false on
+  // failure.
+  //
+  // If |log_read_error| is false, nothing will be logged for a read error, but
+  // this method will still return false. This is intended to be used to
+  // suppress error messages when attempting to read a newly created settings
+  // file.
+  bool ReadSettings(FileHandle handle, Data* out_data, bool log_read_error);
+
+  const base::FilePath& file_path() const { return file_path_; }
+
+  InitializationState& initialized() { return initialized_; }
+
+ private:
+  const base::FilePath file_path_;
+  InitializationState initialized_;
+};
+
+//! \brief An interface for accessing and modifying the settings of a
+//!     CrashReportDatabase.
+//!
+//! This class must not be instantiated directly, but rather an instance of it
+//! should be retrieved via CrashReportDatabase::GetSettings().
+//!
+//! Settings will lock files prior to reading or writing them, and respect
+//! existing locks.
+class Settings final : public SettingsReader {
+ public:
+  static inline constexpr char kLockfileExtension[] = ".__lock__";
+
+  explicit Settings(const base::FilePath& file_path);
+
+  ~Settings();
+
+  //! \brief Initializes the settings data store.
+  //!
+  //! This method must be called only once, and must be successfully called
+  //! before any other method in this class may be called.
+  //!
+  //! \return `true` if the data store was initialized successfully, otherwise
+  //!     `false` with an error logged.
+  bool Initialize();
+
+  //! \brief Sets the user’s preference for submitting crash reports to a
+  //!     collection server.
+  //!
+  //! \param[in] enabled Whether crash reports should be uploaded.
+  //!
+  //! \return On success, returns `true`, otherwise returns `false` with an
+  //!     error logged.
+  bool SetUploadsEnabled(bool enabled);
+
   //! \brief Sets the last time at which a report was attempted to be uploaded.
   //!
   //! This is only meant to be used internally by the CrashReportDatabase.
@@ -118,14 +182,26 @@ class Settings {
   //!     error logged.
   bool SetLastUploadAttemptTime(time_t time);
 
- private:
-  struct Data;
+#if !CRASHPAD_FLOCK_ALWAYS_SUPPORTED
+  //! \brief Returns whether the lockfile for a file is expired.
+  //!
+  //! This could be part of ScopedLockedFileHandle, but this needs to be
+  //! public while ScopedLockedFileHandle is private to Settings.
+  //!
+  //! \param[in] file_path The path to the file whose lockfile will be checked.
+  //! \param[in] lockfile_ttl How long the lockfile has to live before expiring.
+  //!
+  //! \return `true` if the lock for the file is expired, otherwise `false`.
+  static bool IsLockExpired(const base::FilePath& file_path,
+                            time_t lockfile_ttl);
+#endif  // !CRASHPAD_FLOCK_ALWAYS_SUPPORTED
 
+ private:
   // This must be constructed with MakeScopedLockedFileHandle(). It both unlocks
   // and closes the file on destruction. Note that on Fuchsia, this handle DOES
   // NOT offer correct operation, only an attempt to DCHECK if racy behavior is
   // detected.
-#if defined(OS_FUCHSIA)
+#if !CRASHPAD_FLOCK_ALWAYS_SUPPORTED
   struct ScopedLockedFileHandle {
    public:
     ScopedLockedFileHandle();
@@ -155,18 +231,41 @@ class Settings {
     FileHandle handle_;
     base::FilePath lockfile_path_;
   };
-#else  // OS_FUCHSIA
+#elif BUILDFLAG(IS_IOS)
+  // iOS needs to use ScopedBackgroundTask anytime a file lock is used.
+  class ScopedLockedFileHandle
+      : public base::ScopedGeneric<FileHandle,
+                                   internal::ScopedLockedFileHandleTraits> {
+   public:
+    using base::ScopedGeneric<
+        FileHandle,
+        internal::ScopedLockedFileHandleTraits>::ScopedGeneric;
+
+    ScopedLockedFileHandle(const FileHandle& value);
+    ScopedLockedFileHandle(ScopedLockedFileHandle&& rvalue);
+    ScopedLockedFileHandle& operator=(ScopedLockedFileHandle&& rvalue);
+
+    ~ScopedLockedFileHandle();
+
+   private:
+    std::unique_ptr<internal::ScopedBackgroundTask> ios_background_task_;
+  };
+#else
   using ScopedLockedFileHandle =
       base::ScopedGeneric<FileHandle, internal::ScopedLockedFileHandleTraits>;
-#endif  // OS_FUCHSIA
+#endif  // !CRASHPAD_FLOCK_ALWAYS_SUPPORTED
   static ScopedLockedFileHandle MakeScopedLockedFileHandle(
-      FileHandle file,
+      const internal::MakeScopedLockedFileHandleOptions& options,
       FileLocking locking,
       const base::FilePath& file_path);
 
+  static FileHandle GetHandleFromOptions(
+      const base::FilePath& file_path,
+      const internal::MakeScopedLockedFileHandleOptions& options);
+
   // Opens the settings file for reading. On error, logs a message and returns
   // the invalid handle.
-  ScopedLockedFileHandle OpenForReading();
+  ScopedLockedFileHandle OpenForReading() const;
 
   // Opens the settings file for reading and writing. On error, logs a message
   // and returns the invalid handle. |mode| determines how the file will be
@@ -182,25 +281,13 @@ class Settings {
   // Opens the settings file and reads the data. If that fails, an error will
   // be logged and the settings will be recovered and re-initialized. If that
   // also fails, returns false with additional log data from recovery.
-  bool OpenAndReadSettings(Data* out_data);
+  bool OpenAndReadSettings(Data* out_data) override;
 
   // Opens the settings file for writing and reads the data. If reading fails,
   // recovery is attempted. Returns the opened file handle on success, or the
   // invalid file handle on failure, with an error logged.
   ScopedLockedFileHandle OpenForWritingAndReadSettings(Data* out_data);
 
-  // Reads the settings from |handle|. Logs an error and returns false on
-  // failure. This does not perform recovery.
-  //
-  // |handle| must be the result of OpenForReading() or
-  // OpenForReadingAndWriting().
-  //
-  // If |log_read_error| is false, nothing will be logged for a read error, but
-  // this method will still return false. This is intended to be used to
-  // suppress error messages when attempting to read a newly created settings
-  // file.
-  bool ReadSettings(FileHandle handle, Data* out_data, bool log_read_error);
-
   // Writes the settings to |handle|. Logs an error and returns false on
   // failure. This does not perform recovery.
   //
@@ -220,12 +307,6 @@ class Settings {
   //
   // |handle| must be the result of OpenForReadingAndWriting().
   bool InitializeSettings(FileHandle handle);
-
-  const base::FilePath& file_path() const { return file_path_; }
-
-  base::FilePath file_path_;
-
-  InitializationState initialized_;
 };
 
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/client/settings_test.cc b/extern/crashpad/crashpad/client/settings_test.cc
index 5f13cfcca8..941031474e 100644
--- a/extern/crashpad/crashpad/client/settings_test.cc
+++ b/extern/crashpad/crashpad/client/settings_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -26,14 +26,15 @@ namespace {
 
 class SettingsTest : public testing::Test {
  public:
-  SettingsTest() = default;
+  SettingsTest()
+      : temp_dir_(),
+        settings_path_(temp_dir_.path().Append(FILE_PATH_LITERAL("settings"))),
+        settings_(settings_path_) {}
 
   SettingsTest(const SettingsTest&) = delete;
   SettingsTest& operator=(const SettingsTest&) = delete;
 
-  base::FilePath settings_path() {
-    return temp_dir_.path().Append(FILE_PATH_LITERAL("settings"));
-  }
+  base::FilePath settings_path() { return settings_path_; }
 
   Settings* settings() { return &settings_; }
 
@@ -51,12 +52,11 @@ class SettingsTest : public testing::Test {
 
  protected:
   // testing::Test:
-  void SetUp() override {
-    ASSERT_TRUE(settings()->Initialize(settings_path()));
-  }
+  void SetUp() override { ASSERT_TRUE(settings()->Initialize()); }
 
  private:
-  ScopedTempDir temp_dir_;
+  const ScopedTempDir temp_dir_;
+  const base::FilePath settings_path_;
   Settings settings_;
 };
 
@@ -65,8 +65,8 @@ TEST_F(SettingsTest, ClientID) {
   EXPECT_TRUE(settings()->GetClientID(&client_id));
   EXPECT_NE(client_id, UUID());
 
-  Settings local_settings;
-  EXPECT_TRUE(local_settings.Initialize(settings_path()));
+  Settings local_settings(settings_path());
+  EXPECT_TRUE(local_settings.Initialize());
   UUID actual;
   EXPECT_TRUE(local_settings.GetClientID(&actual));
   EXPECT_EQ(actual, client_id);
@@ -82,8 +82,8 @@ TEST_F(SettingsTest, UploadsEnabled) {
   EXPECT_TRUE(settings()->GetUploadsEnabled(&enabled));
   EXPECT_TRUE(enabled);
 
-  Settings local_settings;
-  EXPECT_TRUE(local_settings.Initialize(settings_path()));
+  Settings local_settings(settings_path());
+  EXPECT_TRUE(local_settings.Initialize());
   enabled = false;
   EXPECT_TRUE(local_settings.GetUploadsEnabled(&enabled));
   EXPECT_TRUE(enabled);
@@ -108,21 +108,43 @@ TEST_F(SettingsTest, LastUploadAttemptTime) {
   EXPECT_TRUE(settings()->GetLastUploadAttemptTime(&actual));
   EXPECT_EQ(actual, expected);
 
-  Settings local_settings;
-  EXPECT_TRUE(local_settings.Initialize(settings_path()));
+  Settings local_settings(settings_path());
+  EXPECT_TRUE(local_settings.Initialize());
   actual = -1;
   EXPECT_TRUE(local_settings.GetLastUploadAttemptTime(&actual));
   EXPECT_EQ(actual, expected);
 }
 
+TEST_F(SettingsTest, ReadOnly) {
+  {  // A SettingsReader can read an existing setting...
+    SettingsReader reader(settings_path());
+    bool enabled = true;
+    // Default value is false.
+    EXPECT_TRUE(reader.GetUploadsEnabled(&enabled));
+    EXPECT_FALSE(enabled);
+
+    settings()->SetUploadsEnabled(true);
+    EXPECT_TRUE(reader.GetUploadsEnabled(&enabled));
+    EXPECT_TRUE(enabled);
+  }
+
+  {  // ...but not one that doesn't exist.
+    base::FilePath bad_path =
+        settings_path().DirName().Append(FILE_PATH_LITERAL("does_not_exist"));
+    SettingsReader reader(bad_path);
+    bool enabled = true;
+    EXPECT_FALSE(reader.GetUploadsEnabled(&enabled));
+  }
+}
+
 // The following tests write a corrupt settings file and test the recovery
 // operation.
 
 TEST_F(SettingsTest, BadFileOnInitialize) {
   InitializeBadFile();
 
-  Settings settings;
-  EXPECT_TRUE(settings.Initialize(settings_path()));
+  Settings settings(settings_path());
+  EXPECT_TRUE(settings.Initialize());
 }
 
 TEST_F(SettingsTest, BadFileOnGet) {
@@ -132,8 +154,8 @@ TEST_F(SettingsTest, BadFileOnGet) {
   EXPECT_TRUE(settings()->GetClientID(&client_id));
   EXPECT_NE(client_id, UUID());
 
-  Settings local_settings;
-  EXPECT_TRUE(local_settings.Initialize(settings_path()));
+  Settings local_settings(settings_path());
+  EXPECT_TRUE(local_settings.Initialize());
   UUID actual;
   EXPECT_TRUE(local_settings.GetClientID(&actual));
   EXPECT_EQ(actual, client_id);
@@ -154,7 +176,7 @@ TEST_F(SettingsTest, UnlinkFile) {
   EXPECT_TRUE(settings()->SetUploadsEnabled(true));
   EXPECT_TRUE(settings()->SetLastUploadAttemptTime(time(nullptr)));
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   EXPECT_EQ(_wunlink(settings_path().value().c_str()), 0)
       << ErrnoMessage("_wunlink");
 #else
@@ -162,8 +184,8 @@ TEST_F(SettingsTest, UnlinkFile) {
       << ErrnoMessage("unlink");
 #endif
 
-  Settings local_settings;
-  EXPECT_TRUE(local_settings.Initialize(settings_path()));
+  Settings local_settings(settings_path());
+  EXPECT_TRUE(local_settings.Initialize());
   UUID new_client_id;
   EXPECT_TRUE(local_settings.GetClientID(&new_client_id));
   EXPECT_NE(new_client_id, client_id);
diff --git a/extern/crashpad/crashpad/client/simple_address_range_bag.h b/extern/crashpad/crashpad/client/simple_address_range_bag.h
index 1bdfa82494..18e38243d9 100644
--- a/extern/crashpad/crashpad/client/simple_address_range_bag.h
+++ b/extern/crashpad/crashpad/client/simple_address_range_bag.h
@@ -1,4 +1,4 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
+// Copyright 2016 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/client/simple_address_range_bag_test.cc b/extern/crashpad/crashpad/client/simple_address_range_bag_test.cc
index 4c3f34d1e1..2a995ae97d 100644
--- a/extern/crashpad/crashpad/client/simple_address_range_bag_test.cc
+++ b/extern/crashpad/crashpad/client/simple_address_range_bag_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
+// Copyright 2016 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/client/simple_string_dictionary.h b/extern/crashpad/crashpad/client/simple_string_dictionary.h
index 43483dd87f..f4a2f8ffeb 100644
--- a/extern/crashpad/crashpad/client/simple_string_dictionary.h
+++ b/extern/crashpad/crashpad/client/simple_string_dictionary.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,10 +19,10 @@
 #include <sys/types.h>
 
 #include <algorithm>
+#include <string_view>
 #include <type_traits>
 
 #include "base/check_op.h"
-#include "base/strings/string_piece.h"
 #include "util/misc/implicit_cast.h"
 
 namespace crashpad {
@@ -133,10 +133,10 @@ class TSimpleStringDictionary {
   //!
   //! \return The corresponding value for \a key, or if \a key is not found,
   //!     `nullptr`.
-  const char* GetValueForKey(base::StringPiece key) const {
+  const char* GetValueForKey(std::string_view key) const {
     DCHECK(key.data());
     DCHECK(key.size());
-    DCHECK_EQ(key.find('\0', 0), base::StringPiece::npos);
+    DCHECK_EQ(key.find('\0', 0), std::string_view::npos);
     if (!key.data() || !key.size()) {
       return nullptr;
     }
@@ -159,7 +159,7 @@ class TSimpleStringDictionary {
   //!     string. It must not contain embedded `NUL`s.
   //! \param[in] value The value to store. If `nullptr`, \a key is removed from
   //!     the map. Must not contain embedded `NUL`s.
-  void SetKeyValue(base::StringPiece key, base::StringPiece value) {
+  void SetKeyValue(std::string_view key, std::string_view value) {
     if (!value.data()) {
       RemoveKey(key);
       return;
@@ -167,7 +167,7 @@ class TSimpleStringDictionary {
 
     DCHECK(key.data());
     DCHECK(key.size());
-    DCHECK_EQ(key.find('\0', 0), base::StringPiece::npos);
+    DCHECK_EQ(key.find('\0', 0), std::string_view::npos);
     if (!key.data() || !key.size()) {
       return;
     }
@@ -179,7 +179,7 @@ class TSimpleStringDictionary {
     }
 
     // |value| must not contain embedded NULs.
-    DCHECK_EQ(value.find('\0', 0), base::StringPiece::npos);
+    DCHECK_EQ(value.find('\0', 0), std::string_view::npos);
 
     Entry* entry = GetEntryForKey(key);
 
@@ -188,7 +188,7 @@ class TSimpleStringDictionary {
       for (size_t i = 0; i < num_entries; ++i) {
         if (!entries_[i].is_active()) {
           entry = &entries_[i];
-          SetFromStringPiece(key, entry->key, key_size);
+          SetFromStringView(key, entry->key, key_size);
           break;
         }
       }
@@ -210,7 +210,7 @@ class TSimpleStringDictionary {
     DCHECK_EQ(count, 1);
 #endif
 
-    SetFromStringPiece(value, entry->value, value_size);
+    SetFromStringView(value, entry->value, value_size);
   }
 
   //! \brief Removes \a key from the map.
@@ -219,10 +219,10 @@ class TSimpleStringDictionary {
   //!
   //! \param[in] key The key of the entry to remove. This must not be `nullptr`,
   //!     nor an empty string. It must not contain embedded `NUL`s.
-  void RemoveKey(base::StringPiece key) {
+  void RemoveKey(std::string_view key) {
     DCHECK(key.data());
     DCHECK(key.size());
-    DCHECK_EQ(key.find('\0', 0), base::StringPiece::npos);
+    DCHECK_EQ(key.find('\0', 0), std::string_view::npos);
     if (!key.data() || !key.size()) {
       return;
     }
@@ -237,15 +237,15 @@ class TSimpleStringDictionary {
   }
 
  private:
-  static void SetFromStringPiece(base::StringPiece src,
-                                 char* dst,
-                                 size_t dst_size) {
+  static void SetFromStringView(std::string_view src,
+                                char* dst,
+                                size_t dst_size) {
     size_t copy_len = std::min(dst_size - 1, src.size());
     src.copy(dst, copy_len);
     dst[copy_len] = '\0';
   }
 
-  static bool EntryKeyEquals(base::StringPiece key, const Entry& entry) {
+  static bool EntryKeyEquals(std::string_view key, const Entry& entry) {
     if (key.size() >= KeySize)
       return false;
 
@@ -258,7 +258,7 @@ class TSimpleStringDictionary {
     return strncmp(key.data(), entry.key, key.size()) == 0;
   }
 
-  const Entry* GetConstEntryForKey(base::StringPiece key) const {
+  const Entry* GetConstEntryForKey(std::string_view key) const {
     for (size_t i = 0; i < num_entries; ++i) {
       if (EntryKeyEquals(key, entries_[i])) {
         return &entries_[i];
@@ -267,7 +267,7 @@ class TSimpleStringDictionary {
     return nullptr;
   }
 
-  Entry* GetEntryForKey(base::StringPiece key) {
+  Entry* GetEntryForKey(std::string_view key) {
     return const_cast<Entry*>(GetConstEntryForKey(key));
   }
 
diff --git a/extern/crashpad/crashpad/client/simple_string_dictionary_test.cc b/extern/crashpad/crashpad/client/simple_string_dictionary_test.cc
index cc025a1741..c32594c34b 100644
--- a/extern/crashpad/crashpad/client/simple_string_dictionary_test.cc
+++ b/extern/crashpad/crashpad/client/simple_string_dictionary_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,6 +14,8 @@
 
 #include "client/simple_string_dictionary.h"
 
+#include <string_view>
+
 #include "base/check_op.h"
 #include "gtest/gtest.h"
 #include "test/gtest_death.h"
@@ -73,7 +75,7 @@ TEST(SimpleStringDictionary, SimpleStringDictionary) {
   EXPECT_FALSE(dict.GetValueForKey("key3"));
 
   // Remove by setting value to nullptr
-  dict.SetKeyValue("key2", base::StringPiece(nullptr, 0));
+  dict.SetKeyValue("key2", std::string_view(nullptr, 0));
 
   // Now make sure it's not there anymore
   EXPECT_FALSE(dict.GetValueForKey("key2"));
@@ -132,8 +134,10 @@ TEST(SimpleStringDictionary, Iterator) {
 
   // Set a bunch of key/value pairs like key0/value0, key1/value1, ...
   for (int i = 0; i < kPartitionIndex; ++i) {
-    sprintf(key, "key%d", i);
-    sprintf(value, "value%d", i);
+    ASSERT_LT(snprintf(key, sizeof(key), "key%d", i),
+              static_cast<int>(sizeof(key)));
+    ASSERT_LT(snprintf(value, sizeof(value), "value%d", i),
+              static_cast<int>(sizeof(value)));
     dict.SetKeyValue(key, value);
   }
   expected_dictionary_size = kPartitionIndex;
@@ -152,8 +156,10 @@ TEST(SimpleStringDictionary, Iterator) {
 
   // Set some more key/value pairs like key59/value59, key60/value60, ...
   for (int i = kPartitionIndex; i < kDictionaryCapacity; ++i) {
-    sprintf(key, "key%d", i);
-    sprintf(value, "value%d", i);
+    ASSERT_LT(snprintf(key, sizeof(key), "key%d", i),
+              static_cast<int>(sizeof(key)));
+    ASSERT_LT(snprintf(value, sizeof(value), "value%d", i),
+              static_cast<int>(sizeof(value)));
     dict.SetKeyValue(key, value);
   }
   expected_dictionary_size += kDictionaryCapacity - kPartitionIndex;
@@ -254,14 +260,14 @@ TEST(SimpleStringDictionary, OutOfSpace) {
 
 TEST(SimpleStringDictionaryDeathTest, SetKeyValueWithNullKey) {
   TSimpleStringDictionary<4, 6, 6> map;
-  ASSERT_DEATH_CHECK(map.SetKeyValue(base::StringPiece(nullptr, 0), "hello"),
+  ASSERT_DEATH_CHECK(map.SetKeyValue(std::string_view(nullptr, 0), "hello"),
                      "key");
 }
 
 TEST(SimpleStringDictionaryDeathTest, GetValueForKeyWithNullKey) {
   TSimpleStringDictionary<4, 6, 6> map;
   map.SetKeyValue("hi", "there");
-  ASSERT_DEATH_CHECK(map.GetValueForKey(base::StringPiece(nullptr, 0)), "key");
+  ASSERT_DEATH_CHECK(map.GetValueForKey(std::string_view(nullptr, 0)), "key");
   EXPECT_STREQ("there", map.GetValueForKey("hi"));
 }
 
diff --git a/extern/crashpad/crashpad/client/simulate_crash.h b/extern/crashpad/crashpad/client/simulate_crash.h
index d01e1682d7..36477914fd 100644
--- a/extern/crashpad/crashpad/client/simulate_crash.h
+++ b/extern/crashpad/crashpad/client/simulate_crash.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,14 +17,16 @@
 
 #include "build/build_config.h"
 
-#if defined(OS_MAC)
+// IWYU pragma: begin_exports
+#if BUILDFLAG(IS_MAC)
 #include "client/simulate_crash_mac.h"
-#elif defined(OS_IOS)
+#elif BUILDFLAG(IS_IOS)
 #include "client/simulate_crash_ios.h"
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 #include "client/simulate_crash_win.h"
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
 #include "client/simulate_crash_linux.h"
 #endif
+// IWYU pragma: end_exports
 
 #endif  // CRASHPAD_CLIENT_SIMULATE_CRASH_H_
diff --git a/extern/crashpad/crashpad/client/simulate_crash_ios.h b/extern/crashpad/crashpad/client/simulate_crash_ios.h
index 14e1e153b1..6e2edde52b 100644
--- a/extern/crashpad/crashpad/client/simulate_crash_ios.h
+++ b/extern/crashpad/crashpad/client/simulate_crash_ios.h
@@ -1,4 +1,4 @@
-// Copyright 2021 The Crashpad Authors. All rights reserved.
+// Copyright 2021 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/client/simulate_crash_linux.h b/extern/crashpad/crashpad/client/simulate_crash_linux.h
index e6c3e4874d..a635c03b4d 100644
--- a/extern/crashpad/crashpad/client/simulate_crash_linux.h
+++ b/extern/crashpad/crashpad/client/simulate_crash_linux.h
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/client/simulate_crash_mac.cc b/extern/crashpad/crashpad/client/simulate_crash_mac.cc
index 48d81a0d9c..427d9d542e 100644
--- a/extern/crashpad/crashpad/client/simulate_crash_mac.cc
+++ b/extern/crashpad/crashpad/client/simulate_crash_mac.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,11 +17,12 @@
 #include <string.h>
 #include <sys/types.h>
 
+#include <iterator>
+
+#include "base/apple/mach_logging.h"
+#include "base/apple/scoped_mach_port.h"
 #include "base/check_op.h"
-#include "base/cxx17_backports.h"
 #include "base/logging.h"
-#include "base/mac/mach_logging.h"
-#include "base/mac/scoped_mach_port.h"
 #include "build/build_config.h"
 #include "util/mach/exc_client_variants.h"
 #include "util/mach/exception_behaviors.h"
@@ -204,10 +205,10 @@ void SimulateCrash(const NativeCPUContext& cpu_context) {
 #error Port to your CPU architecture
 #endif
 
-  base::mac::ScopedMachSendRight thread(mach_thread_self());
+  base::apple::ScopedMachSendRight thread(mach_thread_self());
   exception_type_t exception = kMachExceptionSimulated;
   mach_exception_data_type_t codes[] = {0, 0};
-  mach_msg_type_number_t code_count = base::size(codes);
+  mach_msg_type_number_t code_count = std::size(codes);
 
   // Look up the handler for EXC_CRASH exceptions in the same way that the
   // kernel would: try a thread handler, then a task handler, and finally a host
@@ -229,7 +230,7 @@ void SimulateCrash(const NativeCPUContext& cpu_context) {
   bool success = false;
 
   for (size_t target_type_index = 0;
-       !success && target_type_index < base::size(kTargetTypes);
+       !success && target_type_index < std::size(kTargetTypes);
        ++target_type_index) {
     ExceptionPorts::ExceptionHandlerVector handlers;
     ExceptionPorts exception_ports(kTargetTypes[target_type_index],
diff --git a/extern/crashpad/crashpad/client/simulate_crash_mac.h b/extern/crashpad/crashpad/client/simulate_crash_mac.h
index dcbcaae3b5..eab161867f 100644
--- a/extern/crashpad/crashpad/client/simulate_crash_mac.h
+++ b/extern/crashpad/crashpad/client/simulate_crash_mac.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/client/simulate_crash_mac_test.cc b/extern/crashpad/crashpad/client/simulate_crash_mac_test.cc
index f22b2a69de..ebee4a1610 100644
--- a/extern/crashpad/crashpad/client/simulate_crash_mac_test.cc
+++ b/extern/crashpad/crashpad/client/simulate_crash_mac_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,7 +18,8 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"
@@ -370,13 +371,13 @@ TEST(SimulateCrash, SimulateCrash) {
 #endif
   };
 
-  for (size_t target_index = 0; target_index < base::size(kTargets);
+  for (size_t target_index = 0; target_index < std::size(kTargets);
        ++target_index) {
     TestSimulateCrashMac::ExceptionPortsTarget target = kTargets[target_index];
     SCOPED_TRACE(base::StringPrintf(
         "target_index %zu, target %d", target_index, target));
 
-    for (size_t behavior_index = 0; behavior_index < base::size(kBehaviors);
+    for (size_t behavior_index = 0; behavior_index < std::size(kBehaviors);
          ++behavior_index) {
       exception_behavior_t behavior = kBehaviors[behavior_index];
       SCOPED_TRACE(base::StringPrintf(
@@ -390,7 +391,7 @@ TEST(SimulateCrash, SimulateCrash) {
             target, behavior, THREAD_STATE_NONE);
         test_simulate_crash_mac.Run();
       } else {
-        for (size_t flavor_index = 0; flavor_index < base::size(kFlavors);
+        for (size_t flavor_index = 0; flavor_index < std::size(kFlavors);
              ++flavor_index) {
           thread_state_flavor_t flavor = kFlavors[flavor_index];
           SCOPED_TRACE(base::StringPrintf(
diff --git a/extern/crashpad/crashpad/client/simulate_crash_win.h b/extern/crashpad/crashpad/client/simulate_crash_win.h
index 140424f32b..6a88949bf5 100644
--- a/extern/crashpad/crashpad/client/simulate_crash_win.h
+++ b/extern/crashpad/crashpad/client/simulate_crash_win.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/client/upload_behavior_ios.h b/extern/crashpad/crashpad/client/upload_behavior_ios.h
new file mode 100644
index 0000000000..7e022d8ff4
--- /dev/null
+++ b/extern/crashpad/crashpad/client/upload_behavior_ios.h
@@ -0,0 +1,33 @@
+// Copyright 2022 The Crashpad Authors
+//
+// 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.
+
+#ifndef CRASHPAD_CLIENT_UPLOAD_BEHAVIOR_IOS_H_
+#define CRASHPAD_CLIENT_UPLOAD_BEHAVIOR_IOS_H_
+
+namespace crashpad {
+
+//! \brief Enum to control upload behavior when processing pending reports.
+enum class UploadBehavior {
+  //! \brief Only upload reports while the application is active (e.g., in the
+  //!     foreground).
+  kUploadWhenAppIsActive = 1,
+
+  //! \brief Upload reports immediately, regardless of whether or not the
+  //!     application is active.
+  kUploadImmediately = 2,
+};
+
+}  // namespace crashpad
+
+#endif  // CRASHPAD_CLIENT_UPLOAD_BEHAVIOR_IOS_H_
diff --git a/extern/crashpad/crashpad/codereview.settings b/extern/crashpad/crashpad/codereview.settings
index 976f8e532a..e31258ce82 100644
--- a/extern/crashpad/crashpad/codereview.settings
+++ b/extern/crashpad/crashpad/codereview.settings
@@ -1,4 +1,4 @@
-# Copyright 2014 The Crashpad Authors. All rights reserved.
+# Copyright 2014 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +16,3 @@ GERRIT_HOST: True
 CODE_REVIEW_SERVER: https://chromium-review.googlesource.com/
 VIEW_VC: https://chromium.googlesource.com/crashpad/crashpad/+/
 PROJECT: crashpad
-BUG_PREFIX: crashpad:
diff --git a/extern/crashpad/crashpad/compat/BUILD.gn b/extern/crashpad/crashpad/compat/BUILD.gn
index 8d76325dbc..d75c26e1d8 100644
--- a/extern/crashpad/crashpad/compat/BUILD.gn
+++ b/extern/crashpad/crashpad/compat/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2015 The Crashpad Authors. All rights reserved.
+# Copyright 2015 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@ import("../build/crashpad_buildconfig.gni")
 config("compat_config") {
   include_dirs = []
 
-  if (crashpad_is_mac || crashpad_is_ios) {
+  if (crashpad_is_apple) {
     include_dirs += [ "mac" ]
   }
 
@@ -41,7 +41,7 @@ config("compat_config") {
 }
 
 template("compat_target") {
-  if (crashpad_is_mac || crashpad_is_ios) {
+  if (crashpad_is_apple) {
     # There are no sources to compile, which doesn’t mix will with a
     # static_library.
     group(target_name) {
@@ -64,7 +64,7 @@ template("compat_target") {
 compat_target("compat") {
   sources = []
 
-  if (crashpad_is_mac || crashpad_is_ios) {
+  if (crashpad_is_apple) {
     sources += [
       "mac/Availability.h",
       "mac/AvailabilityVersions.h",
diff --git a/extern/crashpad/crashpad/compat/android/dlfcn_internal.cc b/extern/crashpad/crashpad/compat/android/dlfcn_internal.cc
index 5d98fe8472..11c4031564 100644
--- a/extern/crashpad/crashpad/compat/android/dlfcn_internal.cc
+++ b/extern/crashpad/crashpad/compat/android/dlfcn_internal.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/android/dlfcn_internal.h b/extern/crashpad/crashpad/compat/android/dlfcn_internal.h
index ed4083dbc8..b6ac58ef70 100644
--- a/extern/crashpad/crashpad/compat/android/dlfcn_internal.h
+++ b/extern/crashpad/crashpad/compat/android/dlfcn_internal.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/android/elf.h b/extern/crashpad/crashpad/compat/android/elf.h
index 9fa923875b..5db6af0b8c 100644
--- a/extern/crashpad/crashpad/compat/android/elf.h
+++ b/extern/crashpad/crashpad/compat/android/elf.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/android/linux/elf.h b/extern/crashpad/crashpad/compat/android/linux/elf.h
index e65d15327c..df2465e498 100644
--- a/extern/crashpad/crashpad/compat/android/linux/elf.h
+++ b/extern/crashpad/crashpad/compat/android/linux/elf.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/android/linux/prctl.h b/extern/crashpad/crashpad/compat/android/linux/prctl.h
index 046f900f0a..a4bfefaf5b 100644
--- a/extern/crashpad/crashpad/compat/android/linux/prctl.h
+++ b/extern/crashpad/crashpad/compat/android/linux/prctl.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/android/linux/ptrace.h b/extern/crashpad/crashpad/compat/android/linux/ptrace.h
index 7db46aa3f1..2ba2335126 100644
--- a/extern/crashpad/crashpad/compat/android/linux/ptrace.h
+++ b/extern/crashpad/crashpad/compat/android/linux/ptrace.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/android/sched.h b/extern/crashpad/crashpad/compat/android/sched.h
index c4a027ae48..53f405345f 100644
--- a/extern/crashpad/crashpad/compat/android/sched.h
+++ b/extern/crashpad/crashpad/compat/android/sched.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/android/sys/epoll.cc b/extern/crashpad/crashpad/compat/android/sys/epoll.cc
index 6c1a476635..285b680f60 100644
--- a/extern/crashpad/crashpad/compat/android/sys/epoll.cc
+++ b/extern/crashpad/crashpad/compat/android/sys/epoll.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/android/sys/epoll.h b/extern/crashpad/crashpad/compat/android/sys/epoll.h
index 387813e6a5..4c3a5fe76d 100644
--- a/extern/crashpad/crashpad/compat/android/sys/epoll.h
+++ b/extern/crashpad/crashpad/compat/android/sys/epoll.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/android/sys/mman.h b/extern/crashpad/crashpad/compat/android/sys/mman.h
index 5e7cd69f18..ffc273cfea 100644
--- a/extern/crashpad/crashpad/compat/android/sys/mman.h
+++ b/extern/crashpad/crashpad/compat/android/sys/mman.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/android/sys/mman_mmap.cc b/extern/crashpad/crashpad/compat/android/sys/mman_mmap.cc
index c929cfe731..c32bdfb967 100644
--- a/extern/crashpad/crashpad/compat/android/sys/mman_mmap.cc
+++ b/extern/crashpad/crashpad/compat/android/sys/mman_mmap.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/android/sys/syscall.h b/extern/crashpad/crashpad/compat/android/sys/syscall.h
index facce20f79..50a09dc769 100644
--- a/extern/crashpad/crashpad/compat/android/sys/syscall.h
+++ b/extern/crashpad/crashpad/compat/android/sys/syscall.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/android/sys/user.h b/extern/crashpad/crashpad/compat/android/sys/user.h
index 4352a20677..9f537c5a4e 100644
--- a/extern/crashpad/crashpad/compat/android/sys/user.h
+++ b/extern/crashpad/crashpad/compat/android/sys/user.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/ios/mach/exc.defs b/extern/crashpad/crashpad/compat/ios/mach/exc.defs
index d1648e97c1..0de4ac0f93 100644
--- a/extern/crashpad/crashpad/compat/ios/mach/exc.defs
+++ b/extern/crashpad/crashpad/compat/ios/mach/exc.defs
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/ios/mach/mach_exc.defs b/extern/crashpad/crashpad/compat/ios/mach/mach_exc.defs
index c562128e8a..48aeb116a9 100644
--- a/extern/crashpad/crashpad/compat/ios/mach/mach_exc.defs
+++ b/extern/crashpad/crashpad/compat/ios/mach/mach_exc.defs
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/ios/mach/mach_types.defs b/extern/crashpad/crashpad/compat/ios/mach/mach_types.defs
index dc18b8eb0b..773a36b736 100644
--- a/extern/crashpad/crashpad/compat/ios/mach/mach_types.defs
+++ b/extern/crashpad/crashpad/compat/ios/mach/mach_types.defs
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/ios/mach/machine/machine_types.defs b/extern/crashpad/crashpad/compat/ios/mach/machine/machine_types.defs
index e906466f5a..615913db23 100644
--- a/extern/crashpad/crashpad/compat/ios/mach/machine/machine_types.defs
+++ b/extern/crashpad/crashpad/compat/ios/mach/machine/machine_types.defs
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/ios/mach/std_types.defs b/extern/crashpad/crashpad/compat/ios/mach/std_types.defs
index e49c6e46b7..cad2baa0a0 100644
--- a/extern/crashpad/crashpad/compat/ios/mach/std_types.defs
+++ b/extern/crashpad/crashpad/compat/ios/mach/std_types.defs
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/linux/signal.h b/extern/crashpad/crashpad/compat/linux/signal.h
index a007246633..757b84fe8e 100644
--- a/extern/crashpad/crashpad/compat/linux/signal.h
+++ b/extern/crashpad/crashpad/compat/linux/signal.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,6 +22,12 @@
 #define SS_AUTODISARM (1u << 31)
 #endif
 
+// Linux Kernel >= 5.11 flag for `sigaction::sa_flags`. Missing in headers from
+// earlier versions of Linux.
+#if !defined(SA_EXPOSE_TAGBITS)
+#define SA_EXPOSE_TAGBITS 0x00000800
+#endif
+
 // Missing from glibc and bionic-x86_64
 
 #if defined(__x86_64__) || defined(__i386__)
diff --git a/extern/crashpad/crashpad/compat/linux/sys/mman.h b/extern/crashpad/crashpad/compat/linux/sys/mman.h
index 43155da541..6b43d42190 100644
--- a/extern/crashpad/crashpad/compat/linux/sys/mman.h
+++ b/extern/crashpad/crashpad/compat/linux/sys/mman.h
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/linux/sys/mman_memfd_create.cc b/extern/crashpad/crashpad/compat/linux/sys/mman_memfd_create.cc
index 619431e498..0b559ec405 100644
--- a/extern/crashpad/crashpad/compat/linux/sys/mman_memfd_create.cc
+++ b/extern/crashpad/crashpad/compat/linux/sys/mman_memfd_create.cc
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/linux/sys/ptrace.h b/extern/crashpad/crashpad/compat/linux/sys/ptrace.h
index f8be372cc6..604a46ab06 100644
--- a/extern/crashpad/crashpad/compat/linux/sys/ptrace.h
+++ b/extern/crashpad/crashpad/compat/linux/sys/ptrace.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/linux/sys/user.h b/extern/crashpad/crashpad/compat/linux/sys/user.h
index d698c351ef..a41ffe668a 100644
--- a/extern/crashpad/crashpad/compat/linux/sys/user.h
+++ b/extern/crashpad/crashpad/compat/linux/sys/user.h
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/mac/Availability.h b/extern/crashpad/crashpad/compat/mac/Availability.h
index b8f8f2d6bf..6e0ae6b070 100644
--- a/extern/crashpad/crashpad/compat/mac/Availability.h
+++ b/extern/crashpad/crashpad/compat/mac/Availability.h
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/mac/AvailabilityVersions.h b/extern/crashpad/crashpad/compat/mac/AvailabilityVersions.h
index 0bedb3d2c0..427f755b9a 100644
--- a/extern/crashpad/crashpad/compat/mac/AvailabilityVersions.h
+++ b/extern/crashpad/crashpad/compat/mac/AvailabilityVersions.h
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -87,4 +87,10 @@
 #define __MAC_11_0 110000
 #endif
 
+// 12.0 SDK
+
+#ifndef __MAC_12_0
+#define __MAC_12_0 120000
+#endif
+
 #endif  // CRASHPAD_COMPAT_MAC_AVAILABILITYVERSIONS_H_
diff --git a/extern/crashpad/crashpad/compat/mac/kern/exc_resource.h b/extern/crashpad/crashpad/compat/mac/kern/exc_resource.h
index ca8943d37d..10b26098b7 100644
--- a/extern/crashpad/crashpad/compat/mac/kern/exc_resource.h
+++ b/extern/crashpad/crashpad/compat/mac/kern/exc_resource.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/mac/mach-o/loader.h b/extern/crashpad/crashpad/compat/mac/mach-o/loader.h
index 95a735747f..46298c7884 100644
--- a/extern/crashpad/crashpad/compat/mac/mach-o/loader.h
+++ b/extern/crashpad/crashpad/compat/mac/mach-o/loader.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/mac/mach/i386/thread_state.h b/extern/crashpad/crashpad/compat/mac/mach/i386/thread_state.h
index de744d64de..91dfd94824 100644
--- a/extern/crashpad/crashpad/compat/mac/mach/i386/thread_state.h
+++ b/extern/crashpad/crashpad/compat/mac/mach/i386/thread_state.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/mac/mach/mach.h b/extern/crashpad/crashpad/compat/mac/mach/mach.h
index 55f5fdd2e2..f5305d4ddc 100644
--- a/extern/crashpad/crashpad/compat/mac/mach/mach.h
+++ b/extern/crashpad/crashpad/compat/mac/mach/mach.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/mac/sys/resource.h b/extern/crashpad/crashpad/compat/mac/sys/resource.h
index 0697e169b5..8fc541612d 100644
--- a/extern/crashpad/crashpad/compat/mac/sys/resource.h
+++ b/extern/crashpad/crashpad/compat/mac/sys/resource.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/non_elf/elf.h b/extern/crashpad/crashpad/compat/non_elf/elf.h
deleted file mode 100644
index 1245f16dd8..0000000000
--- a/extern/crashpad/crashpad/compat/non_elf/elf.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
-//
-// 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.
-
-#ifndef CRASHPAD_COMPAT_NON_ELF_ELF_H_
-#define CRASHPAD_COMPAT_NON_ELF_ELF_H_
-
-#include "third_party/glibc/elf/elf.h"
-
-#endif  // CRASHPAD_COMPAT_NON_ELF_ELF_H_
diff --git a/extern/crashpad/crashpad/compat/non_mac/mach-o/loader.h b/extern/crashpad/crashpad/compat/non_mac/mach-o/loader.h
index 98a8b5fa4d..1f1114581f 100644
--- a/extern/crashpad/crashpad/compat/non_mac/mach-o/loader.h
+++ b/extern/crashpad/crashpad/compat/non_mac/mach-o/loader.h
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/non_mac/mach/mach.h b/extern/crashpad/crashpad/compat/non_mac/mach/mach.h
index f33bb10f38..cee76b25fc 100644
--- a/extern/crashpad/crashpad/compat/non_mac/mach/mach.h
+++ b/extern/crashpad/crashpad/compat/non_mac/mach/mach.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/non_mac/mach/machine.h b/extern/crashpad/crashpad/compat/non_mac/mach/machine.h
index 54d4742b99..4d4ab83324 100644
--- a/extern/crashpad/crashpad/compat/non_mac/mach/machine.h
+++ b/extern/crashpad/crashpad/compat/non_mac/mach/machine.h
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/non_mac/mach/vm_prot.h b/extern/crashpad/crashpad/compat/non_mac/mach/vm_prot.h
index 12001791fe..117bf09dde 100644
--- a/extern/crashpad/crashpad/compat/non_mac/mach/vm_prot.h
+++ b/extern/crashpad/crashpad/compat/non_mac/mach/vm_prot.h
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/non_win/dbghelp.h b/extern/crashpad/crashpad/compat/non_win/dbghelp.h
index 0d9852bb69..4c3d1b6ce3 100644
--- a/extern/crashpad/crashpad/compat/non_win/dbghelp.h
+++ b/extern/crashpad/crashpad/compat/non_win/dbghelp.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -42,6 +42,15 @@
 //! \sa MINIDUMP_LOCATION_DESCRIPTOR
 typedef uint32_t RVA;
 
+//! \brief A 64-bit offset within a minidump file, relative to the start of its
+//!     MINIDUMP_HEADER.
+//!
+//! RVA stands for “relative virtual address”. Within a minidump file, RVAs are
+//! used as pointers to link structures together.
+//!
+//! \sa MINIDUMP_LOCATION_DESCRIPTOR64
+typedef uint64_t RVA64;
+
 //! \brief A pointer to a structure or union within a minidump file.
 struct __attribute__((packed, aligned(4))) MINIDUMP_LOCATION_DESCRIPTOR {
   //! \brief The size of the referenced structure or union, in bytes.
@@ -52,6 +61,16 @@ struct __attribute__((packed, aligned(4))) MINIDUMP_LOCATION_DESCRIPTOR {
   RVA Rva;
 };
 
+//! \brief A 64-bit pointer to a structure or union within a minidump file.
+struct __attribute__((packed, aligned(4))) MINIDUMP_LOCATION_DESCRIPTOR64 {
+  //! \brief The size of the referenced structure or union, in bytes.
+  uint64_t DataSize;
+
+  //! \brief The 64-bit relative virtual address of the structure or union
+  //!     within the minidump file.
+  RVA64 Rva;
+};
+
 //! \brief A pointer to a snapshot of a region of memory contained within a
 //!     minidump file.
 //!
@@ -176,6 +195,9 @@ enum MINIDUMP_STREAM_TYPE {
   //! \brief The stream type for MINIDUMP_MEMORY_INFO_LIST.
   MemoryInfoListStream = 16,
 
+  //! \brief The stream type for MINIDUMP_THREAD_NAME_LIST.
+  ThreadNamesStream = 24,
+
   //! \brief Values greater than this value will not be used by the system
   //!     and can be used for custom user data streams.
   LastReservedStream = 0xffff,
@@ -1080,6 +1102,27 @@ struct __attribute__((packed, aligned(4))) MINIDUMP_MEMORY_INFO_LIST {
   uint64_t NumberOfEntries;
 };
 
+//! \brief Contains the name of the thread with the given thread ID.
+struct __attribute__((packed, aligned(4))) MINIDUMP_THREAD_NAME {
+  //! \brief The identifier of the thread.
+  uint32_t ThreadId;
+
+  //! \brief RVA64 of a MINIDUMP_STRING containing the name of the thread.
+  RVA64 RvaOfThreadName;
+};
+
+//! \brief Variable-sized struct which contains a list of MINIDUMP_THREAD_NAME
+//! structs.
+struct __attribute__((packed, aligned(4))) MINIDUMP_THREAD_NAME_LIST {
+  //! \brief The number of MINIDUMP_THREAD_NAME structs following this field.
+  uint32_t NumberOfThreadNames;
+
+  //! \brief A variably-sized array containing zero or more
+  //!    MINIDUMP_THREAD_NAME structs. The length of the array is indicated by
+  //!    the NumberOfThreadNames field in this struct.
+  struct MINIDUMP_THREAD_NAME ThreadNames[0];
+};
+
 //! \brief Minidump file type values for MINIDUMP_HEADER::Flags. These bits
 //!     describe the types of data carried within a minidump file.
 enum MINIDUMP_TYPE {
@@ -1100,6 +1143,11 @@ enum MINIDUMP_TYPE {
   //!    MINIDUMP_MEMORY_DESCRIPTOR containing the 256 bytes centered around
   //!    the exception address or the instruction pointer.
   MiniDumpNormal = 0x00000000,
+
+  //! \brief A minidump with extended contexts.
+  //!
+  //! Contains Normal plus a MISC_INFO_5 structure describing the contexts.
+  MiniDumpWithAvxXStateContext = 0x00200000,
 };
 
 #endif  // CRASHPAD_COMPAT_NON_WIN_DBGHELP_H_
diff --git a/extern/crashpad/crashpad/compat/non_win/minwinbase.h b/extern/crashpad/crashpad/compat/non_win/minwinbase.h
index 2761b1cccd..482cfba2eb 100644
--- a/extern/crashpad/crashpad/compat/non_win/minwinbase.h
+++ b/extern/crashpad/crashpad/compat/non_win/minwinbase.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/non_win/timezoneapi.h b/extern/crashpad/crashpad/compat/non_win/timezoneapi.h
index 6e7b095175..27d5716efa 100644
--- a/extern/crashpad/crashpad/compat/non_win/timezoneapi.h
+++ b/extern/crashpad/crashpad/compat/non_win/timezoneapi.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/non_win/verrsrc.h b/extern/crashpad/crashpad/compat/non_win/verrsrc.h
index 70f5344240..84dd97ac0d 100644
--- a/extern/crashpad/crashpad/compat/non_win/verrsrc.h
+++ b/extern/crashpad/crashpad/compat/non_win/verrsrc.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/non_win/windows.h b/extern/crashpad/crashpad/compat/non_win/windows.h
index 4577451493..52066f9333 100644
--- a/extern/crashpad/crashpad/compat/non_win/windows.h
+++ b/extern/crashpad/crashpad/compat/non_win/windows.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/non_win/winnt.h b/extern/crashpad/crashpad/compat/non_win/winnt.h
index f2ed6ace07..5fd78b0d8e 100644
--- a/extern/crashpad/crashpad/compat/non_win/winnt.h
+++ b/extern/crashpad/crashpad/compat/non_win/winnt.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -155,6 +155,17 @@
 //! Architecture (253665-060), 13.4.2 “XSAVE Header”.
 #define MAXIMUM_XSTATE_FEATURES (64)
 
+//! \anchor XSTATE_x
+//! \name XSTATE_*
+//!
+//! \brief Offsets and constants for extended state.
+//! \{
+#define XSTATE_COMPACTION_ENABLE (63)
+#define XSTATE_COMPACTION_ENABLE_MASK (1ull << XSTATE_COMPACTION_ENABLE)
+#define XSTATE_CET_U (11)
+#define XSTATE_MASK_CET_U (1ull << XSTATE_CET_U)
+//! \}
+
 //! \brief The location of a single state component within an XSAVE area.
 struct XSTATE_FEATURE {
   //! \brief The location of a state component within a CPU-specific context
diff --git a/extern/crashpad/crashpad/compat/win/getopt.h b/extern/crashpad/crashpad/compat/win/getopt.h
index 45fcbccc39..930bb6959c 100644
--- a/extern/crashpad/crashpad/compat/win/getopt.h
+++ b/extern/crashpad/crashpad/compat/win/getopt.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/win/strings.cc b/extern/crashpad/crashpad/compat/win/strings.cc
index 6af256e651..102398a6de 100644
--- a/extern/crashpad/crashpad/compat/win/strings.cc
+++ b/extern/crashpad/crashpad/compat/win/strings.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/win/strings.h b/extern/crashpad/crashpad/compat/win/strings.h
index 50360b16d7..497553fe59 100644
--- a/extern/crashpad/crashpad/compat/win/strings.h
+++ b/extern/crashpad/crashpad/compat/win/strings.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/win/sys/time.h b/extern/crashpad/crashpad/compat/win/sys/time.h
index 71ddcdc21f..65ec3a0ab0 100644
--- a/extern/crashpad/crashpad/compat/win/sys/time.h
+++ b/extern/crashpad/crashpad/compat/win/sys/time.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/win/sys/types.h b/extern/crashpad/crashpad/compat/win/sys/types.h
index e8fae88f4a..208ac8f57d 100644
--- a/extern/crashpad/crashpad/compat/win/sys/types.h
+++ b/extern/crashpad/crashpad/compat/win/sys/types.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/win/time.cc b/extern/crashpad/crashpad/compat/win/time.cc
index e6738879a2..491c3776fb 100644
--- a/extern/crashpad/crashpad/compat/win/time.cc
+++ b/extern/crashpad/crashpad/compat/win/time.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/win/time.h b/extern/crashpad/crashpad/compat/win/time.h
index 37048daf71..534dc34679 100644
--- a/extern/crashpad/crashpad/compat/win/time.h
+++ b/extern/crashpad/crashpad/compat/win/time.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/win/winbase.h b/extern/crashpad/crashpad/compat/win/winbase.h
index ffd850bf28..6ac32f7c51 100644
--- a/extern/crashpad/crashpad/compat/win/winbase.h
+++ b/extern/crashpad/crashpad/compat/win/winbase.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/win/winnt.h b/extern/crashpad/crashpad/compat/win/winnt.h
index 34ea80f91c..be441a5271 100644
--- a/extern/crashpad/crashpad/compat/win/winnt.h
+++ b/extern/crashpad/crashpad/compat/win/winnt.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/compat/win/winternl.h b/extern/crashpad/crashpad/compat/win/winternl.h
index ee4f53c654..103886643e 100644
--- a/extern/crashpad/crashpad/compat/win/winternl.h
+++ b/extern/crashpad/crashpad/compat/win/winternl.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/doc/appengine/README b/extern/crashpad/crashpad/doc/appengine/README
index ee0e319adb..7beefc6167 100644
--- a/extern/crashpad/crashpad/doc/appengine/README
+++ b/extern/crashpad/crashpad/doc/appengine/README
@@ -9,26 +9,37 @@ To work on this app, obtain the following packages:
    instructions were tested with Go 1.14 locally but a Go 1.11 runtime when
    deployed), but if problems are encountered, it would be wise to use the same
    version for both local development and AppEngine deployment.
- - The Google Cloud SDK from, https://cloud.google.com/sdk/docs. This is
-   necessary for both local development and for AppEngine deployment. Unpacking
-   this package produces a google-cloud-sdk directory, whose bin child directory
-   may be added to $PATH for convenience, although this is not strictly
-   necessary.
+ - The Google Cloud SDK (gcloud CLI) from
+   https://cloud.google.com/sdk/docs/install-sdk. This is necessary for both
+   local development and for AppEngine deployment. Unpacking this package
+   produces a google-cloud-sdk directory, whose bin child directory may be
+   added to $PATH for convenience, although this is not strictly necessary.
 
 The commands in this README are expected to be run from the directory containing
-it. $GOPATH must also be set to include this directory:
-
-% export GOPATH="$(go env GOPATH):$(pwd)"
+it.
 
 To test locally:
 
-% go get -d crashpad-home
-% …/google-cloud-sdk/bin/dev_appserver.py src/crashpad-home
+% go get -d ./src/crashpad-home
+% python3 …/google-cloud-sdk/bin/dev_appserver.py src/crashpad-home
+
+dev_appserver.py must be invoked using Python 3, but internally will use Python
+2, and a Python 2 interpreter must be available in the PATH as python2.
 
 Look for the “Starting module "default" running at: http://localhost:8080” line,
 which tells you the URL of the local running instance of the app. Test
-http://localhost:8080/ and http://localhost:8080/doxygen to ensure that they
-work.
+http://localhost:8080/ to ensure that it works.
+
+It would be good to test http://localhost:8080/doxygen as well, but it may fail
+with HTTP status 500 and the following error returned as the HTTP response body
+because memcache seems to not be available in the local dev_appserver
+environment:
+
+service bridge HTTP failed: Post "http://appengine.googleapis.internal:10001/rpc_http": dial tcp: lookup appengine.googleapis.internal: no such host
+
+The /doxygen URL can be tested in a verison of the app that’s been deployed
+before traffic has been migrated to it by visiting the staged deployed version
+from the App Engine console.
 
 To deploy:
 
diff --git a/extern/crashpad/crashpad/doc/appengine/go.mod b/extern/crashpad/crashpad/doc/appengine/go.mod
new file mode 100644
index 0000000000..398c008b25
--- /dev/null
+++ b/extern/crashpad/crashpad/doc/appengine/go.mod
@@ -0,0 +1,10 @@
+module src/crashpad-home
+
+go 1.21.6
+
+require google.golang.org/appengine/v2 v2.0.5
+
+require (
+	github.com/golang/protobuf v1.5.2 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
+)
diff --git a/extern/crashpad/crashpad/doc/appengine/go.sum b/extern/crashpad/crashpad/doc/appengine/go.sum
new file mode 100644
index 0000000000..987d3692bb
--- /dev/null
+++ b/extern/crashpad/crashpad/doc/appengine/go.sum
@@ -0,0 +1,37 @@
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/appengine/v2 v2.0.5 h1:4C+F3Cd3L2nWEfSmFEZDPjQvDwL8T0YCeZBysZifP3k=
+google.golang.org/appengine/v2 v2.0.5/go.mod h1:WoEXGoXNfa0mLvaH5sV3ZSGXwVmy8yf7Z1JKf3J3wLI=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
+google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
diff --git a/extern/crashpad/crashpad/doc/appengine/src/crashpad-home/app.yaml b/extern/crashpad/crashpad/doc/appengine/src/crashpad-home/app.yaml
index 82f61675eb..2966ba0d1b 100644
--- a/extern/crashpad/crashpad/doc/appengine/src/crashpad-home/app.yaml
+++ b/extern/crashpad/crashpad/doc/appengine/src/crashpad-home/app.yaml
@@ -1,4 +1,4 @@
-# Copyright 2015 The Crashpad Authors. All rights reserved.
+# Copyright 2015 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-runtime: go111
+runtime: go121
+app_engine_apis: true
 
 handlers:
 - url: /.*
diff --git a/extern/crashpad/crashpad/doc/appengine/src/crashpad-home/main.go b/extern/crashpad/crashpad/doc/appengine/src/crashpad-home/main.go
index 5ce7d0ab95..e7995596d3 100644
--- a/extern/crashpad/crashpad/doc/appengine/src/crashpad-home/main.go
+++ b/extern/crashpad/crashpad/doc/appengine/src/crashpad-home/main.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -25,9 +25,9 @@ import (
 	"strings"
 	"time"
 
-	"google.golang.org/appengine"
-	"google.golang.org/appengine/memcache"
-	"google.golang.org/appengine/urlfetch"
+	"google.golang.org/appengine/v2"
+	"google.golang.org/appengine/v2/memcache"
+	"google.golang.org/appengine/v2/urlfetch"
 )
 
 func main() {
@@ -41,29 +41,29 @@ func init() {
 func handler(w http.ResponseWriter, r *http.Request) {
 	const (
 		baseURL             = "https://chromium.googlesource.com/crashpad/crashpad/+/"
-		masterBaseURL       = baseURL + "master/"
+		mainBaseURL         = baseURL + "main/"
 		generatedDocBaseURL = baseURL + "doc/doc/generated/?format=TEXT"
 		bugBaseURL          = "https://bugs.chromium.org/p/crashpad/"
 	)
 
 	redirectMap := map[string]string{
-		"/":                                masterBaseURL + "README.md",
+		"/":                                mainBaseURL + "README.md",
 		"/bug":                             bugBaseURL,
 		"/bug/":                            bugBaseURL,
 		"/bug/new":                         bugBaseURL + "issues/entry",
-		"/doc/developing.html":             masterBaseURL + "/doc/developing.md",
-		"/doc/status.html":                 masterBaseURL + "/doc/status.md",
-		"/index.html":                      masterBaseURL + "README.md",
-		"/man":                             masterBaseURL + "doc/man.md",
-		"/man/":                            masterBaseURL + "doc/man.md",
-		"/man/catch_exception_tool.html":   masterBaseURL + "tools/mac/catch_exception_tool.md",
-		"/man/crashpad_database_util.html": masterBaseURL + "tools/crashpad_database_util.md",
-		"/man/crashpad_handler.html":       masterBaseURL + "handler/crashpad_handler.md",
-		"/man/exception_port_tool.html":    masterBaseURL + "tools/mac/exception_port_tool.md",
-		"/man/generate_dump.html":          masterBaseURL + "tools/generate_dump.md",
-		"/man/index.html":                  masterBaseURL + "doc/man.md",
-		"/man/on_demand_service_tool.html": masterBaseURL + "tools/mac/on_demand_service_tool.md",
-		"/man/run_with_crashpad.html":      masterBaseURL + "tools/mac/run_with_crashpad.md",
+		"/doc/developing.html":             mainBaseURL + "/doc/developing.md",
+		"/doc/status.html":                 mainBaseURL + "/doc/status.md",
+		"/index.html":                      mainBaseURL + "README.md",
+		"/man":                             mainBaseURL + "doc/man.md",
+		"/man/":                            mainBaseURL + "doc/man.md",
+		"/man/catch_exception_tool.html":   mainBaseURL + "tools/mac/catch_exception_tool.md",
+		"/man/crashpad_database_util.html": mainBaseURL + "tools/crashpad_database_util.md",
+		"/man/crashpad_handler.html":       mainBaseURL + "handler/crashpad_handler.md",
+		"/man/exception_port_tool.html":    mainBaseURL + "tools/mac/exception_port_tool.md",
+		"/man/generate_dump.html":          mainBaseURL + "tools/generate_dump.md",
+		"/man/index.html":                  mainBaseURL + "doc/man.md",
+		"/man/on_demand_service_tool.html": mainBaseURL + "tools/mac/on_demand_service_tool.md",
+		"/man/run_with_crashpad.html":      mainBaseURL + "tools/run_with_crashpad.md",
 	}
 
 	ctx := appengine.NewContext(r)
@@ -146,11 +146,12 @@ func handler(w http.ResponseWriter, r *http.Request) {
 // contentType returns the appropriate content type header for file.
 func contentType(file string) string {
 	contentTypes := map[string]string{
-		".html": "text/html; charset=UTF-8",
 		".css":  "text/css; charset=UTF-8",
+		".html": "text/html; charset=UTF-8",
+		".ico":  "image/x-icon",
 		".js":   "text/javascript; charset=UTF-8",
 		".png":  "image/png",
-		".ico":  "image/x-icon",
+		".svg":  "image/svg+xml",
 	}
 	for suffix, typ := range contentTypes {
 		if strings.HasSuffix(file, suffix) {
diff --git a/extern/crashpad/crashpad/doc/developing.md b/extern/crashpad/crashpad/doc/developing.md
index 60c4155360..6ec7e7ef4f 100644
--- a/extern/crashpad/crashpad/doc/developing.md
+++ b/extern/crashpad/crashpad/doc/developing.md
@@ -1,5 +1,5 @@
 <!--
-Copyright 2015 The Crashpad Authors. All rights reserved.
+Copyright 2015 The Crashpad Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ other projects, Crashpad uses
 [mini_chromium](https://chromium.googlesource.com/chromium/mini_chromium/), a
 small, self-contained library that provides many of Chromium’s useful low-level
 base routines. [mini_chromium’s
-README](https://chromium.googlesource.com/chromium/mini_chromium/+/master/README.md)
+README](https://chromium.googlesource.com/chromium/mini_chromium/+/main/README.md)
 provides more detail.
 
 ## Prerequisites
@@ -46,8 +46,9 @@ the `$PATH` environment variable:
       Windows](https://docs.microsoft.com/en-us/windows-hardware/drivers/debugger/).
     * On Linux, obtain appropriate tools for C++ development through any
       appropriate means including the system’s package manager. On Debian and
-      Debian-based distributions, the `build-essential` and `zlib1g-dev`
-      packages should suffice.
+      Debian-based distributions, the `build-essential`, `zlib1g-dev`, and any
+      one of the `libcurl4-*-dev` packages such as `libcurl4-openssl-dev` should
+      suffice.
  * Chromium’s
    [depot_tools](https://www.chromium.org/developers/how-tos/depottools).
  * [Git](https://git-scm.com/). This is provided by Xcode on macOS, by
@@ -152,7 +153,7 @@ suitable location. These instructions assume that it’s been expanded to
 
 Note that Chrome uses Android API level 21 for both 64-bit platforms and
 32-bit platforms. See Chrome’s
-[`build/config/android/config.gni`](https://chromium.googlesource.com/chromium/src/+/master/build/config/android/config.gni)
+[`build/config/android/config.gni`](https://chromium.googlesource.com/chromium/src/+/main/build/config/android/config.gni)
 which sets `android32_ndk_api_level` and `android64_ndk_api_level`.
 
 Set these gn args
@@ -240,7 +241,7 @@ $ ZIRCON_NODENAME=scare-brook-skip-dried python build/run_tests.py out/fuchsia
 ## Contributing
 
 Crashpad’s contribution process is very similar to [Chromium’s contribution
-process](https://chromium.googlesource.com/chromium/src/+/master/docs/contributing.md).
+process](https://chromium.googlesource.com/chromium/src/+/main/docs/contributing.md).
 
 ### Code Review
 
@@ -249,7 +250,7 @@ review is conducted on [Chromium’s
 Gerrit](https://chromium-review.googlesource.com/) system, and all code reviews
 must be sent to an appropriate reviewer, with a Cc sent to
 [crashpad-dev](https://groups.google.com/a/chromium.org/group/crashpad-dev). The
-[`codereview.settings`](https://chromium.googlesource.com/crashpad/crashpad/+/master/codereview.settings)
+[`codereview.settings`](https://chromium.googlesource.com/crashpad/crashpad/+/main/codereview.settings)
 file specifies this environment to `git-cl`.
 
 `git-cl` is part of the
@@ -258,7 +259,7 @@ no need to install it separately.
 
 ```
 $ cd ~/crashpad/crashpad
-$ git checkout -b work_branch origin/master
+$ git checkout -b work_branch origin/main
 …do some work…
 $ git add …
 $ git commit
@@ -279,7 +280,7 @@ patch set with `git cl upload` and let your reviewer know you’ve addressed the
 feedback.
 
 The most recently uploaded patch set on a review may be tested on a
-[trybot](https://chromium.googlesource.com/chromium/src/+/master/docs/infra/trybot_usage.md)
+[trybot](https://chromium.googlesource.com/chromium/src/+/main/docs/infra/trybot_usage.md)
 by running `git cl try` or by clicking the “CQ Dry Run” button in Gerrit. These
 set the “Commit-Queue: +1” label. This does not mean that the patch will be
 committed, but the trybot and commit queue share infrastructure and a Gerrit
@@ -291,7 +292,7 @@ Crashpad and Chromium committers.
 
 After code review is complete and “Code-Review: +1” has been received from all
 reviewers, the patch can be submitted to Crashpad’s [commit
-queue](https://chromium.googlesource.com/chromium/src/+/master/docs/infra/cq.md)
+queue](https://chromium.googlesource.com/chromium/src/+/main/docs/infra/cq.md)
 by clicking the “Submit to CQ” button in Gerrit. This sets the “Commit-Queue:
 +2” label, which tests the patch on trybots before landing it. Commit queue
 access is available to Crashpad and Chromium committers.
@@ -313,9 +314,9 @@ Agreement](https://cla.developers.google.com/about/google-individual) or
 [Corporate Contributor License
 Agreement](https://cla.developers.google.com/about/google-corporate) as
 appropriate before any submission can be accepted, and must be listed in the
-[`AUTHORS`](https://chromium.googlesource.com/crashpad/crashpad/+/master/AUTHORS)
+[`AUTHORS`](https://chromium.googlesource.com/crashpad/crashpad/+/main/AUTHORS)
 file. Contributors may be listed in the
-[`CONTRIBUTORS`](https://chromium.googlesource.com/crashpad/crashpad/+/master/CONTRIBUTORS)
+[`CONTRIBUTORS`](https://chromium.googlesource.com/crashpad/crashpad/+/main/CONTRIBUTORS)
 file.
 
 ## Buildbot
diff --git a/extern/crashpad/crashpad/doc/ios_overview_design.md b/extern/crashpad/crashpad/doc/ios_overview_design.md
index 1c4d6dd0e5..3fca252833 100644
--- a/extern/crashpad/crashpad/doc/ios_overview_design.md
+++ b/extern/crashpad/crashpad/doc/ios_overview_design.md
@@ -1,5 +1,5 @@
 <!--
-Copyright 2021 The Crashpad Authors. All rights reserved.
+Copyright 2021 The Crashpad Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -69,6 +69,71 @@ arrays.
 
 Similar to JSON, maps can contain other maps, arrays and properties.
 
+## The life of an iOS crash report
+
+Immediately upon calling StartCrashpadInProcessHandler, the iOS in-process
+handler is installed. This will open a temporary file within the database
+directory, in a subdirectory named `pending-serialized-ios-dump`. This file will
+be used to write an intermediate dump in the event of a crash. This must happen
+before installing the various types of crash handlers, as each depends on having
+a valid handler with an intermediate dump ready to be written to.
+
+After the in-process handler is initialized, the Mach exception, POSIX signal
+and Objective-C exception preprocessor handlers are installed.
+
+### Intermediate Dump File Locking
+
+It is expected that multiple Crashpad clients may share the same database
+directory, and this directory may be inside an iOS app group directory. While
+it's possible for each Crashpad client to write to its own private directory,
+if a shared directory is used, it's possible for different applications to
+upload a crash report from any application in a shared group. This might be
+used, for example, by an application and its various app extensions, where each
+client may generate a crash report but only the main application uploads
+reports. Alternatively, a suite of applications may upload each other's crash
+reports. Otherwise, the only opportunity to upload a report would be when a
+specific app that crashed relaunches.
+
+To prevent multiple clients from processing a pending intermediate dump, files
+must be locked. However, POSIX locks on app group files will trigger app
+termination on app backgrounding, so a custom file locking protocol is used.
+Locked temporary files are named `<bundle-id>@<uuid>.locked`. The `.locked`
+extension is removed when the file is unlocked. The `bundle-id` is used to
+determine which Crashpad clients can process leftover locked files.
+
+### Writing Crashes to Intermediate Dumps
+
+When an app encounters a crash (via a Mach exception, Objective-C exception, or
+a POSIX signal), an intermediate dump is written to the temporary locked file,
+the .locked extension is removed, and a new temporary locked file is opened.
+
+App terminations not handled by Crashpad will leave behind a temporary
+locked file, to be cleaned up on next launch. These files are still processed,
+because it is possible for the app to be terminated while writing an
+intermediate dump, and if enough data is written this may still be valuable.
+
+Note: Generally iOS apps are single-process, so it's safe for the client to
+consider any files matching its `bundle-id`, but there are edge-cases (such as
+if a share-to app extension is opened at the same time in two different apps) so
+old locked files won't be cleared until after 24 hours. Any locked file found
+after 60 days is unlocked regardless of `bundle-id`.
+
+### Writing to Intermediate Dumps without a Crash
+
+Apps may also generate intermediate dumps without a crash, often used for
+debugging. Chromium makes heavy use of this for detecting main thread hangs,
+something that can appear as a crash for the user, but is uncatchable for crash
+handlers like Crashpad. When an app requests this (via DumpWithoutCrash,
+DumpWithoutCrashAndDeferProcessing), an intermediate dump is written to the
+temporary locked file, the .locked extension is removed, and a new temporary
+locked file is opened.
+
+Note: DumpWithoutCrashAndDeferProcessingAtPath writes an intermediate dump to
+the requested location, not the previously opened temporary file. This is useful
+because Chromium's main thread hang detection will throw away hang reports in
+certain circumstances (if the app recovers, if a different crash report is
+written, etc).
+
 ## The Crashpad In-Process Client
 
 Other Crashpad platforms handle exceptions and upload minidumps out-of-process.
@@ -81,6 +146,11 @@ intermediate dumps into pending minidumps and begin processing pending
 minidumps, possibly for upload, at suitable times following the next application
 restart.
 
+Note: Applications are not required to call either of these methods. For
+example, application extensions may choose to generate dumps but leave
+processing and uploading to the main applications. Clients that share the
+same database directory between apps can take advantage of processing and
+uploading crash reports from different applications.
 
 ### `ProcessIntermediateDumps`
 For performance and stability reasons applications may choose the correct time
@@ -96,9 +166,26 @@ the next call to `ProcessIntermediateDumps`. Conversely,
 stability concerns. In this case, intermediate dumps are automatically
 converted to minidumps and immediately eligible for uploading.
 
+Applications can include annotations here as well. Chromium uses this for its
+insta-crash logic, which detects if an app is crashing repeatedly on startup.
+
 ### `StartProcessingPendingReports`
 For similar reasons, applications may choose the correct time to begin uploading
 pending reports, such as when ideal network conditions exist. By default,
 clients start with uploading disabled. Applications should call this API when
 it is determined that it is appropriate to do so (such as on a few seconds after
 startup, or when network connectivity is appropriate).
+
+## tvOS considerations
+
+tvOS, an operating system based on iOS, shares the constraints described above
+and uses the same architecture. Additionally, tvOS does not allow the use of
+the `mach_msg()` APIs so using Mach exceptions is impossible.
+
+Consequently, the Mach exception handler is _not_ installed once the in-process
+handler is initialized; the tvOS handler only uses the POSIX signals and
+Objective-C exception preprocessors. Furthermore, the POSIX signal handler is
+unable to handle all crashes that the Mach exception handler can (e.g. stack
+overflows, as `sigaltstack()` cannot be used either). In other words, the tvOS
+in-process handler can only handle a subset of all exceptions that the iOS
+in-process handler does.
diff --git a/extern/crashpad/crashpad/doc/man.md b/extern/crashpad/crashpad/doc/man.md
index 0344fe7e16..098c8483f8 100644
--- a/extern/crashpad/crashpad/doc/man.md
+++ b/extern/crashpad/crashpad/doc/man.md
@@ -1,5 +1,5 @@
 <!--
-Copyright 2016 The Crashpad Authors. All rights reserved.
+Copyright 2016 The Crashpad Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@ limitations under the License.
  * [catch_exception_tool](../tools/mac/catch_exception_tool.md)
  * [exception_port_tool](../tools/mac/exception_port_tool.md)
  * [on_demand_service_tool](../tools/mac/on_demand_service_tool.md)
- * [run_with_crashpad](../tools/mac/run_with_crashpad.md)
+ * [run_with_crashpad](../tools/run_with_crashpad.md)
 
 ## Section 8: Dӕmons
 
diff --git a/extern/crashpad/crashpad/doc/overview_design.md b/extern/crashpad/crashpad/doc/overview_design.md
index 01dba17365..718444fdf2 100644
--- a/extern/crashpad/crashpad/doc/overview_design.md
+++ b/extern/crashpad/crashpad/doc/overview_design.md
@@ -1,5 +1,5 @@
 <!--
-Copyright 2017 The Crashpad Authors. All rights reserved.
+Copyright 2017 The Crashpad Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/doc/status.md b/extern/crashpad/crashpad/doc/status.md
index 3948b44980..2786d10264 100644
--- a/extern/crashpad/crashpad/doc/status.md
+++ b/extern/crashpad/crashpad/doc/status.md
@@ -1,5 +1,5 @@
 <!--
-Copyright 2015 The Crashpad Authors. All rights reserved.
+Copyright 2015 The Crashpad Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/doc/support/compat.sh b/extern/crashpad/crashpad/doc/support/compat.sh
index 8c5d30d32f..6fb30de8fc 100644
--- a/extern/crashpad/crashpad/doc/support/compat.sh
+++ b/extern/crashpad/crashpad/doc/support/compat.sh
@@ -1,4 +1,4 @@
-# Copyright 2015 The Crashpad Authors. All rights reserved.
+# Copyright 2015 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/doc/support/crashpad.doxy b/extern/crashpad/crashpad/doc/support/crashpad.doxy
index ca1ea25178..ab96856083 100644
--- a/extern/crashpad/crashpad/doc/support/crashpad.doxy
+++ b/extern/crashpad/crashpad/doc/support/crashpad.doxy
@@ -1,7 +1,7 @@
-# Doxyfile 1.8.18
+# Doxyfile 1.13.2
 
 # This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project.
+# Doxygen (www.doxygen.org) for a project.
 #
 # All text after a double hash (##) is considered a comment and is placed in
 # front of the TAG it is preceding.
@@ -12,6 +12,16 @@
 # For lists, items can also be appended using:
 # TAG += value [value, ...]
 # Values that contain spaces should be placed between quotes (\" \").
+#
+# Note:
+#
+# Use Doxygen to compare the used configuration file with the template
+# configuration file:
+# doxygen -x [configFile]
+# Use Doxygen to compare the used configuration file with the template
+# configuration file without replacing the environment variables or CMake type
+# replacement variables:
+# doxygen -x_noenv [configFile]
 
 #---------------------------------------------------------------------------
 # Project related configuration options
@@ -32,7 +42,7 @@ DOXYFILE_ENCODING      = UTF-8
 # title of most generated pages and in a few other places.
 # The default value is: My Project.
 
-PROJECT_NAME           = "Crashpad"
+PROJECT_NAME           = Crashpad
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. This
 # could be handy for archiving the generated documentation or if some version
@@ -41,7 +51,7 @@ PROJECT_NAME           = "Crashpad"
 PROJECT_NUMBER         =
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
-# for a project that appears at the top of each page and should give viewer a
+# for a project that appears at the top of each page and should give viewers a
 # quick idea about the purpose of the project. Keep the description short.
 
 PROJECT_BRIEF          =
@@ -53,24 +63,42 @@ PROJECT_BRIEF          =
 
 PROJECT_LOGO           =
 
+# With the PROJECT_ICON tag one can specify an icon that is included in the tabs
+# when the HTML document is shown. Doxygen will copy the logo to the output
+# directory.
+
+PROJECT_ICON           =
+
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
 # into which the generated documentation will be written. If a relative path is
-# entered, it will be relative to the location where doxygen was started. If
+# entered, it will be relative to the location where Doxygen was started. If
 # left blank the current directory will be used.
 
 OUTPUT_DIRECTORY       = out/doc/doxygen
 
-# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
-# directories (in 2 levels) under the output directory of each output format and
-# will distribute the generated files over these directories. Enabling this
-# option can be useful when feeding doxygen a huge amount of source files, where
-# putting all generated files in the same directory would otherwise causes
-# performance problems for the file system.
+# If the CREATE_SUBDIRS tag is set to YES then Doxygen will create up to 4096
+# sub-directories (in 2 levels) under the output directory of each output format
+# and will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding Doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise cause
+# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to
+# control the number of sub-directories.
 # The default value is: NO.
 
 CREATE_SUBDIRS         = NO
 
-# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# Controls the number of sub-directories that will be created when
+# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every
+# level increment doubles the number of directories, resulting in 4096
+# directories at level 8 which is the default and also the maximum value. The
+# sub-directories are organized in 2 levels, the first level always has a fixed
+# number of 16 directories.
+# Minimum value: 0, maximum value: 8, default value: 8.
+# This tag requires that the tag CREATE_SUBDIRS is set to YES.
+
+CREATE_SUBDIRS_LEVEL   = 8
+
+# If the ALLOW_UNICODE_NAMES tag is set to YES, Doxygen will allow non-ASCII
 # characters to appear in the names of generated files. If set to NO, non-ASCII
 # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
 # U+3044.
@@ -79,36 +107,28 @@ CREATE_SUBDIRS         = NO
 ALLOW_UNICODE_NAMES    = NO
 
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
+# documentation generated by Doxygen is written. Doxygen will use this
 # information to generate all constant output in the proper language.
-# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
-# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
-# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
-# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
-# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
-# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
-# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
-# Ukrainian and Vietnamese.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian,
+# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English
+# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek,
+# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with
+# English messages), Korean, Korean-en (Korean with English messages), Latvian,
+# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese,
+# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish,
+# Swedish, Turkish, Ukrainian and Vietnamese.
 # The default value is: English.
 
 OUTPUT_LANGUAGE        = English
 
-# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all generated output in the proper direction.
-# Possible values are: None, LTR, RTL and Context.
-# The default value is: None.
-
-OUTPUT_TEXT_DIRECTION  = None
-
-# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
+# If the BRIEF_MEMBER_DESC tag is set to YES, Doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
 # The default value is: YES.
 
 BRIEF_MEMBER_DESC      = YES
 
-# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
+# If the REPEAT_BRIEF tag is set to YES, Doxygen will prepend the brief
 # description of a member or function before the detailed description
 #
 # Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
@@ -129,13 +149,13 @@ REPEAT_BRIEF           = YES
 ABBREVIATE_BRIEF       =
 
 # If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# doxygen will generate a detailed section even if there is only a brief
+# Doxygen will generate a detailed section even if there is only a brief
 # description.
 # The default value is: NO.
 
 ALWAYS_DETAILED_SEC    = NO
 
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# If the INLINE_INHERITED_MEMB tag is set to YES, Doxygen will show all
 # inherited members of a class in the documentation of that class as if those
 # members were ordinary class members. Constructors, destructors and assignment
 # operators of the base classes will not be shown.
@@ -143,7 +163,7 @@ ALWAYS_DETAILED_SEC    = NO
 
 INLINE_INHERITED_MEMB  = NO
 
-# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
+# If the FULL_PATH_NAMES tag is set to YES, Doxygen will prepend the full path
 # before files name in the file list and in the header files. If set to NO the
 # shortest path that makes the file name unique will be used
 # The default value is: YES.
@@ -153,11 +173,11 @@ FULL_PATH_NAMES        = YES
 # The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
 # Stripping is only done if one of the specified strings matches the left-hand
 # part of the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the path to
+# If left blank the directory from which Doxygen is run is used as the path to
 # strip.
 #
 # Note that you can specify absolute paths here, but also relative paths, which
-# will be relative from the directory where doxygen is started.
+# will be relative from the directory where Doxygen is started.
 # This tag requires that the tag FULL_PATH_NAMES is set to YES.
 
 STRIP_FROM_PATH        =
@@ -173,41 +193,42 @@ STRIP_FROM_INC_PATH    = . \
                          compat/non_mac \
                          compat/non_win
 
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
-# less readable) file names. This can be useful is your file systems doesn't
+# If the SHORT_NAMES tag is set to YES, Doxygen will generate much shorter (but
+# less readable) file names. This can be useful if your file system doesn't
 # support long names like on DOS, Mac, or CD-ROM.
 # The default value is: NO.
 
 SHORT_NAMES            = NO
 
-# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
-# first line (until the first dot) of a Javadoc-style comment as the brief
-# description. If set to NO, the Javadoc-style will behave just like regular Qt-
-# style comments (thus requiring an explicit @brief command for a brief
-# description.)
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen will interpret the
+# first line (until the first dot, question mark or exclamation mark) of a
+# Javadoc-style comment as the brief description. If set to NO, the Javadoc-
+# style will behave just like regular Qt-style comments (thus requiring an
+# explicit @brief command for a brief description.)
 # The default value is: NO.
 
 JAVADOC_AUTOBRIEF      = NO
 
-# If the JAVADOC_BANNER tag is set to YES then doxygen will interpret a line
+# If the JAVADOC_BANNER tag is set to YES then Doxygen will interpret a line
 # such as
 # /***************
 # as being the beginning of a Javadoc-style comment "banner". If set to NO, the
 # Javadoc-style will behave just like regular comments and it will not be
-# interpreted by doxygen.
+# interpreted by Doxygen.
 # The default value is: NO.
 
 JAVADOC_BANNER         = NO
 
-# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
-# line (until the first dot) of a Qt-style comment as the brief description. If
-# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
-# requiring an explicit \brief command for a brief description.)
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will interpret the first
+# line (until the first dot, question mark or exclamation mark) of a Qt-style
+# comment as the brief description. If set to NO, the Qt-style will behave just
+# like regular Qt-style comments (thus requiring an explicit \brief command for
+# a brief description.)
 # The default value is: NO.
 
 QT_AUTOBRIEF           = NO
 
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen treat a
 # multi-line C++ special comment block (i.e. a block of //! or /// comments) as
 # a brief description. This used to be the default behavior. The new default is
 # to treat a multi-line C++ comment block as a detailed description. Set this
@@ -219,13 +240,21 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and Doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# Doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as Doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
 
 INHERIT_DOCS           = YES
 
-# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then Doxygen will produce a new
 # page for each member. If set to NO, the documentation of a member will be part
 # of the file/class/namespace that contains it.
 # The default value is: NO.
@@ -242,16 +271,16 @@ TAB_SIZE               = 4
 # the documentation. An alias has the form:
 # name=value
 # For example adding
-# "sideeffect=@par Side Effects:\n"
+# "sideeffect=@par Side Effects:^^"
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines (in the resulting output). You can put ^^ in the value part of an
-# alias to insert a newline as if a physical newline was in the original file.
-# When you need a literal { or } or , in the value part of an alias you have to
-# escape them by means of a backslash (\), this can lead to conflicts with the
-# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# a double escape (\\{ and \\})
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
 
 ALIASES                =
 
@@ -295,27 +324,30 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
-# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# language is one of the parsers supported by Doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
 # tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files). For instance to make doxygen treat .inc files
+# default for Fortran type files). For instance to make Doxygen treat .inc files
 # as Fortran files (default is PHP), and .f files as C (default is Fortran),
 # use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
 # Note that for custom extensions you also need to set FILE_PATTERNS otherwise
-# the files are not read by doxygen.
+# the files are not read by Doxygen. When specifying no_extension you should add
+# * to the FILE_PATTERNS.
+#
+# Note see also the list of default file extension mappings.
 
 EXTENSION_MAPPING      =
 
-# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# If the MARKDOWN_SUPPORT tag is enabled then Doxygen pre-processes all comments
 # according to the Markdown format, which allows for more readable
 # documentation. See https://daringfireball.net/projects/markdown/ for details.
-# The output of markdown processing is further processed by doxygen, so you can
-# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# The output of markdown processing is further processed by Doxygen, so you can
+# mix Doxygen, HTML, and XML commands with Markdown formatting. Disable only in
 # case of backward compatibilities issues.
 # The default value is: YES.
 
@@ -325,25 +357,45 @@ MARKDOWN_SUPPORT       = YES
 # to that level are automatically included in the table of contents, even if
 # they do not have an id attribute.
 # Note: This feature currently applies only to Markdown headings.
-# Minimum value: 0, maximum value: 99, default value: 5.
+# Minimum value: 0, maximum value: 99, default value: 6.
 # This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
 
 TOC_INCLUDE_HEADINGS   = 0
 
-# When enabled doxygen tries to link words that correspond to documented
+# The MARKDOWN_ID_STYLE tag can be used to specify the algorithm used to
+# generate identifiers for the Markdown headings. Note: Every identifier is
+# unique.
+# Possible values are: DOXYGEN use a fixed 'autotoc_md' string followed by a
+# sequence number starting at 0 and GITHUB use the lower case version of title
+# with any whitespace replaced by '-' and punctuation characters removed.
+# The default value is: DOXYGEN.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+MARKDOWN_ID_STYLE      = DOXYGEN
+
+# When enabled Doxygen tries to link words that correspond to documented
 # classes, or namespaces to their corresponding documentation. Such a link can
 # be prevented in individual cases by putting a % sign in front of the word or
-# globally by setting AUTOLINK_SUPPORT to NO.
+# globally by setting AUTOLINK_SUPPORT to NO. Words listed in the
+# AUTOLINK_IGNORE_WORDS tag are excluded from automatic linking.
 # The default value is: YES.
 
 AUTOLINK_SUPPORT       = YES
 
+# This tag specifies a list of words that, when matching the start of a word in
+# the documentation, will suppress auto links generation, if it is enabled via
+# AUTOLINK_SUPPORT. This list does not affect affect links explicitly created
+# using \# or the \link or commands.
+# This tag requires that the tag AUTOLINK_SUPPORT is set to YES.
+
+AUTOLINK_IGNORE_WORDS  =
+
 # If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
 # to include (a tag file for) the STL sources as input, then you should set this
-# tag to YES in order to let doxygen match functions declarations and
+# tag to YES in order to let Doxygen match functions declarations and
 # definitions whose arguments contain STL classes (e.g. func(std::string);
-# versus func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
+# versus func(std::string) {}). This also makes the inheritance and
+# collaboration diagrams that involve STL classes more complete and accurate.
 # The default value is: NO.
 
 BUILTIN_STL_SUPPORT    = NO
@@ -355,16 +407,16 @@ BUILTIN_STL_SUPPORT    = NO
 CPP_CLI_SUPPORT        = NO
 
 # Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
-# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen
-# will parse them like normal C++ but will assume all classes use public instead
-# of private inheritance when no explicit protection keyword is present.
+# https://www.riverbankcomputing.com/software) sources only. Doxygen will parse
+# them like normal C++ but will assume all classes use public instead of private
+# inheritance when no explicit protection keyword is present.
 # The default value is: NO.
 
 SIP_SUPPORT            = NO
 
 # For Microsoft's IDL there are propget and propput attributes to indicate
 # getter and setter methods for a property. Setting this option to YES will make
-# doxygen to replace the get and set methods by a property in the documentation.
+# Doxygen to replace the get and set methods by a property in the documentation.
 # This will only work if the methods are indeed getting or setting a simple
 # type. If this is not the case, or you want to show the methods anyway, you
 # should set this option to NO.
@@ -373,7 +425,7 @@ SIP_SUPPORT            = NO
 IDL_PROPERTY_SUPPORT   = YES
 
 # If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES then doxygen will reuse the documentation of the first
+# tag is set to YES then Doxygen will reuse the documentation of the first
 # member in the group (if any) for the other members of the group. By default
 # all members of a group must be documented explicitly.
 # The default value is: NO.
@@ -431,21 +483,42 @@ TYPEDEF_HIDES_STRUCT   = NO
 # The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
 # cache is used to resolve symbols given their name and scope. Since this can be
 # an expensive process and often the same symbol appears multiple times in the
-# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
-# doxygen will become slower. If the cache is too large, memory is wasted. The
+# code, Doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# Doxygen will become slower. If the cache is too large, memory is wasted. The
 # cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
 # is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
-# symbols. At the end of a run doxygen will report the cache usage and suggest
+# symbols. At the end of a run Doxygen will report the cache usage and suggest
 # the optimal cache size from a speed point of view.
 # Minimum value: 0, maximum value: 9, default value: 0.
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number of threads Doxygen is allowed to use
+# during processing. When set to 0 Doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# than 0 to get more control over the balance between CPU load and processing
+# speed. At this moment only the input processing can be done using multiple
+# threads. Since this is still an experimental feature the default is set to 1,
+# which effectively disables parallel processing. Please report any issues you
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
+# If the TIMESTAMP tag is set different from NO then each generated page will
+# contain the date or date and time when the page was generated. Setting this to
+# NO can help when comparing the output of multiple runs.
+# Possible values are: YES, NO, DATETIME and DATE.
+# The default value is: NO.
+
+TIMESTAMP              = NO
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
 
-# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
+# If the EXTRACT_ALL tag is set to YES, Doxygen will assume all entities in
 # documentation are documented, even if no documentation was available. Private
 # class members and static file members will be hidden unless the
 # EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
@@ -504,7 +577,14 @@ EXTRACT_LOCAL_METHODS  = NO
 
 EXTRACT_ANON_NSPACES   = NO
 
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# If this flag is set to YES, the name of an unnamed parameter in a declaration
+# will be determined by the corresponding definition. By default unnamed
+# parameters remain unnamed in the output.
+# The default value is: YES.
+
+RESOLVE_UNNAMED_PARAMS = YES
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
 # undocumented members inside documented classes or files. If set to NO these
 # members will be included in the various overviews, but no documentation
 # section is generated. This option has no effect if EXTRACT_ALL is enabled.
@@ -512,22 +592,31 @@ EXTRACT_ANON_NSPACES   = NO
 
 HIDE_UNDOC_MEMBERS     = NO
 
-# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
 # undocumented classes that are normally visible in the class hierarchy. If set
 # to NO, these classes will be included in the various overviews. This option
-# has no effect if EXTRACT_ALL is enabled.
+# will also hide undocumented C++ concepts if enabled. This option has no effect
+# if EXTRACT_ALL is enabled.
 # The default value is: NO.
 
 HIDE_UNDOC_CLASSES     = NO
 
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# If the HIDE_UNDOC_NAMESPACES tag is set to YES, Doxygen will hide all
+# undocumented namespaces that are normally visible in the namespace hierarchy.
+# If set to NO, these namespaces will be included in the various overviews. This
+# option has no effect if EXTRACT_ALL is enabled.
+# The default value is: YES.
+
+HIDE_UNDOC_NAMESPACES  = YES
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all friend
 # declarations. If set to NO, these declarations will be included in the
 # documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
 
-# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
 # documentation blocks found inside the body of a function. If set to NO, these
 # blocks will be appended to the function's detailed documentation block.
 # The default value is: NO.
@@ -541,30 +630,44 @@ HIDE_IN_BODY_DOCS      = NO
 
 INTERNAL_DOCS          = NO
 
-# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
-# names in lower-case letters. If set to YES, upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
-# The default value is: system dependent.
+# With the correct setting of option CASE_SENSE_NAMES Doxygen will better be
+# able to match the capabilities of the underlying filesystem. In case the
+# filesystem is case sensitive (i.e. it supports files in the same directory
+# whose names only differ in casing), the option must be set to YES to properly
+# deal with such files in case they appear in the input. For filesystems that
+# are not case sensitive the option should be set to NO to properly deal with
+# output files written for symbols that only differ in casing, such as for two
+# classes, one named CLASS and the other named Class, and to also support
+# references to files without having to specify the exact matching casing. On
+# Windows (including Cygwin) and macOS, users should typically set this option
+# to NO, whereas on Linux or other Unix flavors it should typically be set to
+# YES.
+# Possible values are: SYSTEM, NO and YES.
+# The default value is: SYSTEM.
 
 CASE_SENSE_NAMES       = YES
 
-# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# If the HIDE_SCOPE_NAMES tag is set to NO then Doxygen will show members with
 # their full class and namespace scopes in the documentation. If set to YES, the
 # scope will be hidden.
 # The default value is: NO.
 
 HIDE_SCOPE_NAMES       = NO
 
-# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then Doxygen will
 # append additional text to a page's title, such as Class Reference. If set to
 # YES the compound reference will be hidden.
 # The default value is: NO.
 
 HIDE_COMPOUND_REFERENCE= NO
 
-# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then Doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
 
@@ -577,7 +680,7 @@ SHOW_INCLUDE_FILES     = YES
 
 SHOW_GROUPED_MEMB_INC  = NO
 
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen will list include
 # files with double quotes in the documentation rather than with sharp brackets.
 # The default value is: NO.
 
@@ -589,14 +692,14 @@ FORCE_LOCAL_INCLUDES   = YES
 
 INLINE_INFO            = YES
 
-# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# If the SORT_MEMBER_DOCS tag is set to YES then Doxygen will sort the
 # (detailed) documentation of file and class members alphabetically by member
 # name. If set to NO, the members will appear in declaration order.
 # The default value is: YES.
 
 SORT_MEMBER_DOCS       = YES
 
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# If the SORT_BRIEF_DOCS tag is set to YES then Doxygen will sort the brief
 # descriptions of file, namespace and class members alphabetically by member
 # name. If set to NO, the members will appear in declaration order. Note that
 # this will also influence the order of the classes in the class list.
@@ -604,7 +707,7 @@ SORT_MEMBER_DOCS       = YES
 
 SORT_BRIEF_DOCS        = NO
 
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then Doxygen will sort the
 # (brief and detailed) documentation of class members so that constructors and
 # destructors are listed first. If set to NO the constructors will appear in the
 # respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
@@ -616,7 +719,7 @@ SORT_BRIEF_DOCS        = NO
 
 SORT_MEMBERS_CTORS_1ST = NO
 
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# If the SORT_GROUP_NAMES tag is set to YES then Doxygen will sort the hierarchy
 # of group names into alphabetical order. If set to NO the group names will
 # appear in their defined order.
 # The default value is: NO.
@@ -633,11 +736,11 @@ SORT_GROUP_NAMES       = NO
 
 SORT_BY_SCOPE_NAME     = NO
 
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# If the STRICT_PROTO_MATCHING option is enabled and Doxygen fails to do proper
 # type resolution of all parameters of a function it will reject a match between
 # the prototype and the implementation of a member function even if there is
 # only one candidate or it is obvious which candidate to choose by doing a
-# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# simple string match. By disabling STRICT_PROTO_MATCHING Doxygen will still
 # accept a match between prototype and implementation in such cases.
 # The default value is: NO.
 
@@ -647,26 +750,26 @@ STRICT_PROTO_MATCHING  = NO
 # list. This list is created by putting \todo commands in the documentation.
 # The default value is: YES.
 
-GENERATE_TODOLIST      = YES
+GENERATE_TODOLIST      = NO
 
 # The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
 # list. This list is created by putting \test commands in the documentation.
 # The default value is: YES.
 
-GENERATE_TESTLIST      = YES
+GENERATE_TESTLIST      = NO
 
 # The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
 # list. This list is created by putting \bug commands in the documentation.
 # The default value is: YES.
 
-GENERATE_BUGLIST       = YES
+GENERATE_BUGLIST       = NO
 
 # The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
 # the deprecated list. This list is created by putting \deprecated commands in
 # the documentation.
 # The default value is: YES.
 
-GENERATE_DEPRECATEDLIST= YES
+GENERATE_DEPRECATEDLIST= NO
 
 # The ENABLED_SECTIONS tag can be used to enable conditional documentation
 # sections, marked by \if <section_label> ... \endif and \cond <section_label>
@@ -707,24 +810,25 @@ SHOW_FILES             = YES
 SHOW_NAMESPACES        = YES
 
 # The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
+# Doxygen should invoke to get the current version for each file (typically from
 # the version control system). Doxygen will invoke the program by executing (via
 # popen()) the command command input-file, where command is the value of the
 # FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
-# by doxygen. Whatever the program writes to standard output is used as the file
+# by Doxygen. Whatever the program writes to standard output is used as the file
 # version. For an example see the documentation.
 
 FILE_VERSION_FILTER    =
 
 # The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-# by doxygen. The layout file controls the global structure of the generated
+# by Doxygen. The layout file controls the global structure of the generated
 # output files in an output format independent way. To create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option. You can
+# that represents Doxygen's defaults, run Doxygen with the -l option. You can
 # optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
 #
-# Note that if you run doxygen from a directory containing a file called
-# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# Note that if you run Doxygen from a directory containing a file called
+# DoxygenLayout.xml, Doxygen will parse it automatically even if the LAYOUT_FILE
 # tag is left empty.
 
 LAYOUT_FILE            =
@@ -739,19 +843,35 @@ LAYOUT_FILE            =
 
 CITE_BIB_FILES         =
 
+# The EXTERNAL_TOOL_PATH tag can be used to extend the search path (PATH
+# environment variable) so that external tools such as latex and gs can be
+# found.
+# Note: Directories specified with EXTERNAL_TOOL_PATH are added in front of the
+# path already specified by the PATH variable, and are added in the order
+# specified.
+# Note: This option is particularly useful for macOS version 14 (Sonoma) and
+# higher, when running Doxygen from Doxywizard, because in this case any user-
+# defined changes to the PATH are ignored. A typical example on macOS is to set
+# EXTERNAL_TOOL_PATH = /Library/TeX/texbin /usr/local/bin
+# together with the standard path, the full search path used by doxygen when
+# launching external tools will then become
+# PATH=/Library/TeX/texbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin
+
+EXTERNAL_TOOL_PATH     =
+
 #---------------------------------------------------------------------------
 # Configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
 
 # The QUIET tag can be used to turn on/off the messages that are generated to
-# standard output by doxygen. If QUIET is set to YES this implies that the
+# standard output by Doxygen. If QUIET is set to YES this implies that the
 # messages are off.
 # The default value is: NO.
 
 QUIET                  = YES
 
 # The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
+# generated to standard error (stderr) by Doxygen. If WARNINGS is set to YES
 # this implies that the warnings are on.
 #
 # Tip: Turn warnings on while writing the documentation.
@@ -759,49 +879,97 @@ QUIET                  = YES
 
 WARNINGS               = YES
 
-# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then Doxygen will generate
 # warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
 # will automatically be disabled.
 # The default value is: YES.
 
 WARN_IF_UNDOCUMENTED   = NO
 
-# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
+# If the WARN_IF_DOC_ERROR tag is set to YES, Doxygen will generate warnings for
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
 # The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
+# If WARN_IF_INCOMPLETE_DOC is set to YES, Doxygen will warn about incomplete
+# function parameter documentation. If set to NO, Doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation. If
-# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# value. If set to NO, Doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
 
-# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
-# a warning is encountered.
+# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, Doxygen will warn about
+# undocumented enumeration values. If set to NO, Doxygen will accept
+# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: NO.
+
+WARN_IF_UNDOC_ENUM_VAL = NO
+
+# If WARN_LAYOUT_FILE option is set to YES, Doxygen will warn about issues found
+# while parsing the user defined layout file, such as missing or wrong elements.
+# See also LAYOUT_FILE for details. If set to NO, problems with the layout file
+# will be suppressed.
+# The default value is: YES.
+
+WARN_LAYOUT_FILE       = YES
+
+# If the WARN_AS_ERROR tag is set to YES then Doxygen will immediately stop when
+# a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS
+# then Doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but
+# at the end of the Doxygen process Doxygen will return with a non-zero status.
+# If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS_PRINT then Doxygen behaves
+# like FAIL_ON_WARNINGS but in case no WARN_LOGFILE is defined Doxygen will not
+# write the warning messages in between other messages but write them at the end
+# of a run, in case a WARN_LOGFILE is defined the warning messages will be
+# besides being in the defined file also be shown at the end of a run, unless
+# the WARN_LOGFILE is defined as - i.e. standard output (stdout) in that case
+# the behavior will remain as with the setting FAIL_ON_WARNINGS.
+# Possible values are: NO, YES, FAIL_ON_WARNINGS and FAIL_ON_WARNINGS_PRINT.
 # The default value is: NO.
 
 WARN_AS_ERROR          = NO
 
-# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# The WARN_FORMAT tag determines the format of the warning messages that Doxygen
 # can produce. The string should contain the $file, $line, and $text tags, which
 # will be replaced by the file and line number from which the warning originated
 # and the warning text. Optionally the format may contain $version, which will
 # be replaced by the version of the file (if it could be obtained via
 # FILE_VERSION_FILTER)
+# See also: WARN_LINE_FORMAT
 # The default value is: $file:$line: $text.
 
 WARN_FORMAT            = "$file:$line: $text"
 
+# In the $text part of the WARN_FORMAT command it is possible that a reference
+# to a more specific place is given. To make it easier to jump to this place
+# (outside of Doxygen) the user can define a custom "cut" / "paste" string.
+# Example:
+# WARN_LINE_FORMAT = "'vi $file +$line'"
+# See also: WARN_FORMAT
+# The default value is: at line $line of file $file.
+
+WARN_LINE_FORMAT       = "at line $line of file $file"
+
 # The WARN_LOGFILE tag can be used to specify a file to which warning and error
 # messages should be written. If left blank the output is written to standard
-# error (stderr).
+# error (stderr). In case the file specified cannot be opened for writing the
+# warning and error messages are written to standard error. When as file - is
+# specified the warning and error messages are written to standard output
+# (stdout).
 
 WARN_LOGFILE           =
 
@@ -818,29 +986,42 @@ WARN_LOGFILE           =
 INPUT                  =
 
 # This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# that Doxygen parses. Internally Doxygen uses the UTF-8 encoding. Doxygen uses
 # libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see: https://www.gnu.org/software/libiconv/) for the list of
-# possible encodings.
+# documentation (see:
+# https://www.gnu.org/software/libiconv/) for the list of possible encodings.
+# See also: INPUT_FILE_ENCODING
 # The default value is: UTF-8.
 
 INPUT_ENCODING         = UTF-8
 
+# This tag can be used to specify the character encoding of the source files
+# that Doxygen parses. The INPUT_FILE_ENCODING tag can be used to specify
+# character encoding on a per file pattern basis. Doxygen will compare the file
+# name with each pattern and apply the encoding instead of the default
+# INPUT_ENCODING if there is a match. The character encodings are a list of the
+# form: pattern=encoding (like *.php=ISO-8859-1).
+# See also: INPUT_ENCODING for further information on supported encodings.
+
+INPUT_FILE_ENCODING    =
+
 # If the value of the INPUT tag contains directories, you can use the
 # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
 # *.h) to filter out the source-files in the directories.
 #
 # Note that for custom extensions or not directly supported extensions you also
 # need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# read by doxygen.
+# read by Doxygen.
+#
+# Note the list of default checked file patterns might differ from the list of
+# default file extension mappings.
 #
-# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
-# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
-# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
-# *.vhdl, *.ucf, *.qsf and *.ice.
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cxxm,
+# *.cpp, *.cppm, *.ccm, *.c++, *.c++m, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl,
+# *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp, *.h++, *.ixx, *.l, *.cs, *.d,
+# *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to
+# be provided as Doxygen C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
+# *.f18, *.f, *.for, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.c \
                          *.cc \
@@ -858,11 +1039,13 @@ RECURSIVE              = YES
 # excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 #
-# Note that relative paths are relative to the directory from which doxygen is
+# Note that relative paths are relative to the directory from which Doxygen is
 # run.
 
-EXCLUDE                = compat/mac \
-                         compat/non_cxx11_lib \
+EXCLUDE                = compat/android \
+                         compat/ios \
+                         compat/linux \
+                         compat/mac \
                          compat/win \
                          third_party
 
@@ -886,10 +1069,7 @@ EXCLUDE_PATTERNS       = out*
 # (namespaces, classes, functions, etc.) that should be excluded from the
 # output. The symbol name can be a fully qualified name, a word, or if the
 # wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories use the pattern */test/*
+# ANamespace::AClass, ANamespace::*Test
 
 EXCLUDE_SYMBOLS        =
 
@@ -904,7 +1084,7 @@ EXAMPLE_PATH           =
 # *.h) to filter out the source-files in the directories. If left blank all
 # files are included.
 
-EXAMPLE_PATTERNS       =
+EXAMPLE_PATTERNS       = *
 
 # If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
 # searched for input files to be used with the \include or \dontinclude commands
@@ -919,7 +1099,7 @@ EXAMPLE_RECURSIVE      = NO
 
 IMAGE_PATH             =
 
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# The INPUT_FILTER tag can be used to specify a program that Doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program
 # by executing (via popen()) the command:
 #
@@ -934,9 +1114,14 @@ IMAGE_PATH             =
 # code is scanned, but not when the output code is generated. If lines are added
 # or removed, the anchors will not be placed correctly.
 #
+# Note that Doxygen will use the data processed and written to standard output
+# for further processing, therefore nothing else, like debug statements or used
+# commands (so in case of a Windows batch file always use @echo OFF), should be
+# written to standard output.
+#
 # Note that for custom extensions or not directly supported extensions you also
 # need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# properly processed by doxygen.
+# properly processed by Doxygen.
 
 INPUT_FILTER           =
 
@@ -949,7 +1134,7 @@ INPUT_FILTER           =
 #
 # Note that for custom extensions or not directly supported extensions you also
 # need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# properly processed by doxygen.
+# properly processed by Doxygen.
 
 FILTER_PATTERNS        =
 
@@ -971,10 +1156,28 @@ FILTER_SOURCE_PATTERNS =
 # If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
 # is part of the input, its contents will be placed on the main page
 # (index.html). This can be useful if you have a project on for instance GitHub
-# and want to reuse the introduction page also for the doxygen output.
+# and want to reuse the introduction page also for the Doxygen output.
 
 USE_MDFILE_AS_MAINPAGE =
 
+# If the IMPLICIT_DIR_DOCS tag is set to YES, any README.md file found in sub-
+# directories of the project's root, is used as the documentation for that sub-
+# directory, except when the README.md starts with a \dir, \page or \mainpage
+# command. If set to NO, the README.md file needs to start with an explicit \dir
+# command in order to be used as directory documentation.
+# The default value is: YES.
+
+IMPLICIT_DIR_DOCS      = YES
+
+# The Fortran standard specifies that for fixed formatted Fortran code all
+# characters from position 72 are to be considered as comment. A common
+# extension is to allow longer lines before the automatic comment starts. The
+# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can
+# be processed before the automatic comment starts.
+# Minimum value: 7, maximum value: 10000, default value: 72.
+
+FORTRAN_COMMENT_AFTER  = 72
+
 #---------------------------------------------------------------------------
 # Configuration options related to source browsing
 #---------------------------------------------------------------------------
@@ -989,12 +1192,13 @@ USE_MDFILE_AS_MAINPAGE =
 SOURCE_BROWSER         = NO
 
 # Setting the INLINE_SOURCES tag to YES will include the body of functions,
-# classes and enums directly into the documentation.
+# multi-line macros, enums or list initialized variables directly into the
+# documentation.
 # The default value is: NO.
 
 INLINE_SOURCES         = NO
 
-# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct Doxygen to hide any
 # special comment blocks from generated source code fragments. Normal C, C++ and
 # Fortran comments will always remain visible.
 # The default value is: YES.
@@ -1032,7 +1236,7 @@ REFERENCES_LINK_SOURCE = YES
 SOURCE_TOOLTIPS        = YES
 
 # If the USE_HTAGS tag is set to YES then the references to source code will
-# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# point to the HTML generated by the htags(1) tool instead of Doxygen built-in
 # source browser. The htags tool is part of GNU's global source tagging system
 # (see https://www.gnu.org/software/global/global.html). You will need version
 # 4.8.6 or higher.
@@ -1046,14 +1250,14 @@ SOURCE_TOOLTIPS        = YES
 # Doxygen will invoke htags (and that will in turn invoke gtags), so these
 # tools must be available from the command line (i.e. in the search path).
 #
-# The result: instead of the source browser generated by doxygen, the links to
+# The result: instead of the source browser generated by Doxygen, the links to
 # source code will now point to the output of htags.
 # The default value is: NO.
 # This tag requires that the tag SOURCE_BROWSER is set to YES.
 
 USE_HTAGS              = NO
 
-# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# If the VERBATIM_HEADERS tag is set the YES then Doxygen will generate a
 # verbatim copy of the header file for each class for which an include is
 # specified. Set to NO to disable this.
 # See also: Section \class.
@@ -1072,17 +1276,11 @@ VERBATIM_HEADERS       = NO
 
 ALPHABETICAL_INDEX     = YES
 
-# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
-# which the alphabetical index list will be split.
-# Minimum value: 1, maximum value: 20, default value: 5.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-COLS_IN_ALPHA_INDEX    = 5
-
-# In case all classes in a project start with a common prefix, all classes will
-# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
-# can be used to specify a prefix (or a list of prefixes) that should be ignored
-# while generating the index headers.
+# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes)
+# that should be ignored while generating the index headers. The IGNORE_PREFIX
+# tag works for classes, function and member names. The entity will be placed in
+# the alphabetical list under the first letter of the entity name that remains
+# after removing the prefix.
 # This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
 
 IGNORE_PREFIX          =
@@ -1091,7 +1289,7 @@ IGNORE_PREFIX          =
 # Configuration options related to the HTML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# If the GENERATE_HTML tag is set to YES, Doxygen will generate HTML output
 # The default value is: YES.
 
 GENERATE_HTML          = YES
@@ -1112,40 +1310,40 @@ HTML_OUTPUT            = html
 HTML_FILE_EXTENSION    = .html
 
 # The HTML_HEADER tag can be used to specify a user-defined HTML header file for
-# each generated HTML page. If the tag is left blank doxygen will generate a
+# each generated HTML page. If the tag is left blank Doxygen will generate a
 # standard header.
 #
 # To get valid HTML the header file that includes any scripts and style sheets
-# that doxygen needs, which is dependent on the configuration options used (e.g.
+# that Doxygen needs, which is dependent on the configuration options used (e.g.
 # the setting GENERATE_TREEVIEW). It is highly recommended to start with a
 # default header using
 # doxygen -w html new_header.html new_footer.html new_stylesheet.css
 # YourConfigFile
 # and then modify the file new_header.html. See also section "Doxygen usage"
-# for information on how to generate the default header that doxygen normally
+# for information on how to generate the default header that Doxygen normally
 # uses.
 # Note: The header is subject to change so you typically have to regenerate the
-# default header when upgrading to a newer version of doxygen. For a description
+# default header when upgrading to a newer version of Doxygen. For a description
 # of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_HEADER            =
 
 # The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
-# generated HTML page. If the tag is left blank doxygen will generate a standard
+# generated HTML page. If the tag is left blank Doxygen will generate a standard
 # footer. See HTML_HEADER for more information on how to generate a default
 # footer and what special commands can be used inside the footer. See also
 # section "Doxygen usage" for information on how to generate the default footer
-# that doxygen normally uses.
+# that Doxygen normally uses.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_FOOTER            =
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
 # sheet that is used by each HTML page. It can be used to fine-tune the look of
-# the HTML output. If left blank doxygen will generate a default style sheet.
+# the HTML output. If left blank Doxygen will generate a default style sheet.
 # See also section "Doxygen usage" for information on how to generate the style
-# sheet that doxygen normally uses.
+# sheet that Doxygen normally uses.
 # Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
 # it is more robust and this tag (HTML_STYLESHEET) will in the future become
 # obsolete.
@@ -1155,13 +1353,18 @@ HTML_STYLESHEET        =
 
 # The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
 # cascading style sheets that are included after the standard style sheets
-# created by doxygen. Using this option one can overrule certain style aspects.
+# created by Doxygen. Using this option one can overrule certain style aspects.
 # This is preferred over using HTML_STYLESHEET since it does not replace the
 # standard style sheet and is therefore more robust against future updates.
 # Doxygen will copy the style sheet files to the output directory.
 # Note: The order of the extra style sheet files is of importance (e.g. the last
 # style sheet in the list overrules the setting of the previous ones in the
-# list). For an example see the documentation.
+# list).
+# Note: Since the styling of scrollbars can currently not be overruled in
+# Webkit/Chromium, the styling will be left out of the default doxygen.css if
+# one or more extra stylesheets have been specified. So if scrollbar
+# customization is desired it has to be added explicitly. For an example see the
+# documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_EXTRA_STYLESHEET  = doc/support/crashpad_doxygen.css
@@ -1176,9 +1379,22 @@ HTML_EXTRA_STYLESHEET  = doc/support/crashpad_doxygen.css
 
 HTML_EXTRA_FILES       =
 
+# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output
+# should be rendered with a dark or light theme.
+# Possible values are: LIGHT always generates light mode output, DARK always
+# generates dark mode output, AUTO_LIGHT automatically sets the mode according
+# to the user preference, uses light mode if no preference is set (the default),
+# AUTO_DARK automatically sets the mode according to the user preference, uses
+# dark mode if no preference is set and TOGGLE allows a user to switch between
+# light and dark mode via a button.
+# The default value is: AUTO_LIGHT.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE        = AUTO_LIGHT
+
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
+# this color. Hue is specified as an angle on a color-wheel, see
 # https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
@@ -1188,7 +1404,7 @@ HTML_EXTRA_FILES       =
 HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
 # value of 255 will produce the most vivid colors.
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1206,15 +1422,6 @@ HTML_COLORSTYLE_SAT    = 100
 
 HTML_COLORSTYLE_GAMMA  = 80
 
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting this
-# to YES can help to show when doxygen was last run and thus if the
-# documentation is up to date.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_TIMESTAMP         = NO
-
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
 # are dynamically created via JavaScript. If disabled, the navigation index will
@@ -1234,6 +1441,33 @@ HTML_DYNAMIC_MENUS     = YES
 
 HTML_DYNAMIC_SECTIONS  = NO
 
+# If the HTML_CODE_FOLDING tag is set to YES then classes and functions can be
+# dynamically folded and expanded in the generated HTML source code.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_CODE_FOLDING      = YES
+
+# If the HTML_COPY_CLIPBOARD tag is set to YES then Doxygen will show an icon in
+# the top right corner of code and text fragments that allows the user to copy
+# its content to the clipboard. Note this only works if supported by the browser
+# and the web page is served via a secure context (see:
+# https://www.w3.org/TR/secure-contexts/), i.e. using the https: or file:
+# protocol.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COPY_CLIPBOARD    = YES
+
+# Doxygen stores a couple of settings persistently in the browser (via e.g.
+# cookies). By default these settings apply to all HTML pages generated by
+# Doxygen across all projects. The HTML_PROJECT_COOKIE tag can be used to store
+# the settings under a project specific key, such that the user preferences will
+# be stored separately.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_PROJECT_COOKIE    =
+
 # With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
 # shown in the various tree structured indices initially; the user can expand
 # and collapse entries dynamically later on. Doxygen will expand the tree to
@@ -1249,10 +1483,11 @@ HTML_INDEX_NUM_ENTRIES = 100
 
 # If the GENERATE_DOCSET tag is set to YES, additional index files will be
 # generated that can be used as input for Apple's Xcode 3 integrated development
-# environment (see: https://developer.apple.com/xcode/), introduced with OSX
-# 10.5 (Leopard). To create a documentation set, doxygen will generate a
-# Makefile in the HTML output directory. Running make will produce the docset in
-# that directory and running make install will install the docset in
+# environment (see:
+# https://developer.apple.com/xcode/), introduced with OSX 10.5 (Leopard). To
+# create a documentation set, Doxygen will generate a Makefile in the HTML
+# output directory. Running make will produce the docset in that directory and
+# running make install will install the docset in
 # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
 # startup. See https://developer.apple.com/library/archive/featuredarticles/Doxy
 # genXcode/_index.html for more information.
@@ -1269,6 +1504,13 @@ GENERATE_DOCSET        = NO
 
 DOCSET_FEEDNAME        = "Doxygen generated docs"
 
+# This tag determines the URL of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDURL         =
+
 # This tag specifies a string that should uniquely identify the documentation
 # set bundle. This should be a reverse domain-name style string, e.g.
 # com.mycompany.MyDocSet. Doxygen will append .docset to the name.
@@ -1291,14 +1533,18 @@ DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
 
 DOCSET_PUBLISHER_NAME  = Publisher
 
-# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# If the GENERATE_HTMLHELP tag is set to YES then Doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see: https://www.microsoft.com/en-us/download/details.aspx?id=21138) on
-# Windows.
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline (the HTML help workshop was already many
+# years in maintenance mode). You can download the HTML help workshop from the
+# web archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
-# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# generated by Doxygen into a single compiled HTML file (.chm). Compiled HTML
 # files are now used as the Windows 98 help format, and will replace the old
 # Windows help format (.hlp) on all Windows platforms in the future. Compressed
 # HTML files also contain an index, a table of contents, and you can search for
@@ -1318,14 +1564,14 @@ CHM_FILE               =
 
 # The HHC_LOCATION tag can be used to specify the location (absolute path
 # including file name) of the HTML help compiler (hhc.exe). If non-empty,
-# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# Doxygen will try to run the HTML help compiler on the generated index.hhp.
 # The file has to be specified with full path.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1352,6 +1598,16 @@ BINARY_TOC             = NO
 
 TOC_EXPAND             = NO
 
+# The SITEMAP_URL tag is used to specify the full URL of the place where the
+# generated documentation will be placed on the server by the user during the
+# deployment of the documentation. The generated sitemap is called sitemap.xml
+# and placed on the directory specified by HTML_OUTPUT. In case no SITEMAP_URL
+# is specified no sitemap is generated. For information about the sitemap
+# protocol see https://www.sitemaps.org
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SITEMAP_URL            =
+
 # If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
 # QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
 # can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
@@ -1370,7 +1626,8 @@ QCH_FILE               =
 
 # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
 # Project output. For more information please see Qt Help Project / Namespace
-# (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace).
+# (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace).
 # The default value is: org.doxygen.Project.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
@@ -1378,8 +1635,8 @@ QHP_NAMESPACE          = org.doxygen.Project
 
 # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
 # Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-
-# folders).
+# Folders (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-folders).
 # The default value is: doc.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
@@ -1387,16 +1644,16 @@ QHP_VIRTUAL_FOLDER     = doc
 
 # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
 # filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-
-# filters).
+# Filters (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_CUST_FILTER_NAME   =
 
 # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
 # custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-
-# filters).
+# Filters (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_CUST_FILTER_ATTRS  =
@@ -1408,9 +1665,9 @@ QHP_CUST_FILTER_ATTRS  =
 
 QHP_SECT_FILTER_ATTRS  =
 
-# The QHG_LOCATION tag can be used to specify the location of Qt's
-# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
-# generated .qhp file.
+# The QHG_LOCATION tag can be used to specify the location (absolute path
+# including file name) of Qt's qhelpgenerator. If non-empty Doxygen will try to
+# run qhelpgenerator on the generated .qhp file.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHG_LOCATION           =
@@ -1441,10 +1698,10 @@ ECLIPSE_DOC_ID         = org.doxygen.Project
 # of each HTML page. A value of NO enables the index and the value YES disables
 # it. Since the tabs in the index contain the same information as the navigation
 # tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
-# The default value is: NO.
+# The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-DISABLE_INDEX          = NO
+DISABLE_INDEX          = YES
 
 # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
 # structure should be generated to display hierarchical information. If the tag
@@ -1453,18 +1710,30 @@ DISABLE_INDEX          = NO
 # to work a browser that supports JavaScript, DHTML, CSS and frames is required
 # (i.e. any modern browser). Windows users are probably better off using the
 # HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by Doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_TREEVIEW      = YES
+
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATE_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-GENERATE_TREEVIEW      = NO
+FULL_SIDEBAR           = NO
 
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
-# doxygen will group on one line in the generated HTML documentation.
+# Doxygen will group on one line in the generated HTML documentation.
 #
 # Note that a value of 0 will completely suppress the enum values from appearing
 # in the overview section.
@@ -1473,6 +1742,12 @@ GENERATE_TREEVIEW      = NO
 
 ENUM_VALUES_PER_LINE   = 0
 
+# When the SHOW_ENUM_VALUES tag is set doxygen will show the specified
+# enumeration values besides the enumeration mnemonics.
+# The default value is: NO.
+
+SHOW_ENUM_VALUES       = NO
+
 # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
 # to set the initial width (in pixels) of the frame in which the tree is shown.
 # Minimum value: 0, maximum value: 1500, default value: 250.
@@ -1480,19 +1755,26 @@ ENUM_VALUES_PER_LINE   = 0
 
 TREEVIEW_WIDTH         = 250
 
-# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
+# If the EXT_LINKS_IN_WINDOW option is set to YES, Doxygen will open links to
 # external symbols imported via tag files in a separate window.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 EXT_LINKS_IN_WINDOW    = NO
 
-# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# If the OBFUSCATE_EMAILS tag is set to YES, Doxygen will obfuscate email
+# addresses.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+OBFUSCATE_EMAILS       = YES
+
+# If the HTML_FORMULA_FORMAT option is set to svg, Doxygen will use the pdf2svg
 # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
 # https://inkscape.org) to generate formulas as SVG images instead of PNGs for
 # the HTML output. These images will generally look nicer at scaled resolutions.
-# Possible values are: png The default and svg Looks nicer but requires the
-# pdf2svg tool.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
 # The default value is: png.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
@@ -1500,24 +1782,13 @@ HTML_FORMULA_FORMAT    = png
 
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
-# doxygen run you need to manually remove any form_*.png images from the HTML
+# Doxygen run you need to manually remove any form_*.png images from the HTML
 # output directory to force them to be regenerated.
 # Minimum value: 8, maximum value: 50, default value: 10.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 FORMULA_FONTSIZE       = 10
 
-# Use the FORMULA_TRANSPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are not
-# supported properly for IE 6.0, but are supported on all modern browsers.
-#
-# Note that when changing this option you need to delete any form_*.png files in
-# the HTML output directory before the changes have effect.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_TRANSPARENT    = YES
-
 # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
 # to create new LaTeX commands to be used in formulas as building blocks. See
 # the section "Including formulas" for details.
@@ -1535,11 +1806,29 @@ FORMULA_MACROFILE      =
 
 USE_MATHJAX            = NO
 
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION        = MathJax_2
+
 # When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/latest/output.html) for more details.
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
 # Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for MathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
 # The default value is: HTML-CSS.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1552,33 +1841,40 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
-MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+MATHJAX_RELPATH        =
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
 
-# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# The MATHJAX_CODEFILE tag can be used to specify a file with JavaScript pieces
 # of code that will be used on startup of the MathJax code. See the MathJax site
-# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details. For an
 # example see the documentation.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_CODEFILE       =
 
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
-# the HTML output. The underlying search engine uses javascript and DHTML and
+# When the SEARCHENGINE tag is enabled Doxygen will generate a search box for
+# the HTML output. The underlying search engine uses JavaScript and DHTML and
 # should work on any modern browser. Note that when using HTML help
 # (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
 # there is already a search function so this one should typically be disabled.
-# For large projects the javascript based search engine can be slow, then
+# For large projects the JavaScript based search engine can be slow, then
 # enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
 # search using the keyboard; to jump to the search box use <access key> + S
 # (what the <access key> is depends on the OS and browser, but it is typically
@@ -1597,7 +1893,7 @@ SEARCHENGINE           = YES
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
 # implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
-# setting. When disabled, doxygen will generate a PHP script for searching and
+# setting. When disabled, Doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
 # and searching needs to be provided by external tools. See the section
 # "External Indexing and Searching" for details.
@@ -1606,7 +1902,7 @@ SEARCHENGINE           = YES
 
 SERVER_BASED_SEARCH    = NO
 
-# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# When EXTERNAL_SEARCH tag is enabled Doxygen will no longer generate the PHP
 # script for searching. Instead the search results are written to an XML file
 # which needs to be processed by an external indexer. Doxygen will invoke an
 # external search engine pointed to by the SEARCHENGINE_URL option to obtain the
@@ -1614,7 +1910,8 @@ SERVER_BASED_SEARCH    = NO
 #
 # Doxygen ships with an example indexer (doxyindexer) and search engine
 # (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: https://xapian.org/).
+# Xapian (see:
+# https://xapian.org/).
 #
 # See the section "External Indexing and Searching" for details.
 # The default value is: NO.
@@ -1627,8 +1924,9 @@ EXTERNAL_SEARCH        = NO
 #
 # Doxygen ships with an example indexer (doxyindexer) and search engine
 # (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: https://xapian.org/). See the section "External Indexing and
-# Searching" for details.
+# Xapian (see:
+# https://xapian.org/). See the section "External Indexing and Searching" for
+# details.
 # This tag requires that the tag SEARCHENGINE is set to YES.
 
 SEARCHENGINE_URL       =
@@ -1649,7 +1947,7 @@ SEARCHDATA_FILE        = searchdata.xml
 
 EXTERNAL_SEARCH_ID     =
 
-# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through Doxygen
 # projects other than the one defined by this configuration file, but that are
 # all added to the same external search index. Each project needs to have a
 # unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
@@ -1663,7 +1961,7 @@ EXTRA_SEARCH_MAPPINGS  =
 # Configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
+# If the GENERATE_LATEX tag is set to YES, Doxygen will generate LaTeX output.
 # The default value is: YES.
 
 GENERATE_LATEX         = NO
@@ -1686,7 +1984,7 @@ LATEX_OUTPUT           = latex
 # the output language.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-LATEX_CMD_NAME         = latex
+LATEX_CMD_NAME         =
 
 # The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
 # index for LaTeX.
@@ -1708,7 +2006,7 @@ MAKEINDEX_CMD_NAME     = makeindex
 
 LATEX_MAKEINDEX_CMD    = makeindex
 
-# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
+# If the COMPACT_LATEX tag is set to YES, Doxygen generates more compact LaTeX
 # documents. This may be useful for small projects and may help to save some
 # trees in general.
 # The default value is: NO.
@@ -1737,36 +2035,38 @@ PAPER_TYPE             = a4
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank Doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that Doxygen normally uses.
 #
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of Doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank Doxygen will generate a standard footer. See
 # LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that Doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
 
 # The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
 # LaTeX style sheets that are included after the standard style sheets created
-# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# by Doxygen. Using this option one can overrule certain style aspects. Doxygen
 # will copy the style sheet files to the output directory.
 # Note: The order of the extra style sheet files is of importance (e.g. the last
 # style sheet in the list overrules the setting of the previous ones in the
@@ -1792,55 +2092,45 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = YES
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, Doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 USE_PDFLATEX           = YES
 
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
-# command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
+# The LATEX_BATCHMODE tag signals the behavior of LaTeX in case of an error.
+# Possible values are: NO same as ERROR_STOP, YES same as BATCH, BATCH In batch
+# mode nothing is printed on the terminal, errors are scrolled as if <return> is
+# hit at every error; missing files that TeX tries to input or request from
+# keyboard input (\read on a not open input stream) cause the job to abort,
+# NON_STOP In nonstop mode the diagnostic message will appear on the terminal,
+# but there is no possibility of user interaction just like in batch mode,
+# SCROLL In scroll mode, TeX will stop only for missing files to input or if
+# keyboard input is necessary and ERROR_STOP In errorstop mode, TeX will stop at
+# each error, asking for user intervention.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_BATCHMODE        = NO
 
-# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# If the LATEX_HIDE_INDICES tag is set to YES then Doxygen will not include the
 # index chapters (such as File Index, Compound Index, etc.) in the output.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HIDE_INDICES     = NO
 
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
 # https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
-# The default value is: plain.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BIB_STYLE        = plain
-
-# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
-# page will contain the date and time when the page was generated. Setting this
-# to NO can help when comparing the output of multiple runs.
-# The default value is: NO.
+# The default value is: plainnat.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-LATEX_TIMESTAMP        = NO
+LATEX_BIB_STYLE        = plainnat
 
 # The LATEX_EMOJI_DIRECTORY tag is used to specify the (relative or absolute)
 # path from which the emoji images will be read. If a relative path is entered,
@@ -1854,7 +2144,7 @@ LATEX_EMOJI_DIRECTORY  =
 # Configuration options related to the RTF output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
+# If the GENERATE_RTF tag is set to YES, Doxygen will generate RTF output. The
 # RTF output is optimized for Word 97 and may not look too pretty with other RTF
 # readers/editors.
 # The default value is: NO.
@@ -1869,7 +2159,7 @@ GENERATE_RTF           = NO
 
 RTF_OUTPUT             = rtf
 
-# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
+# If the COMPACT_RTF tag is set to YES, Doxygen generates more compact RTF
 # documents. This may be useful for small projects and may help to save some
 # trees in general.
 # The default value is: NO.
@@ -1889,38 +2179,36 @@ COMPACT_RTF            = NO
 
 RTF_HYPERLINKS         = NO
 
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# Load stylesheet definitions from file. Syntax is similar to Doxygen's
 # configuration file, i.e. a series of assignments. You only have to provide
 # replacements, missing definitions are set to their default value.
 #
 # See also section "Doxygen usage" for information on how to generate the
-# default style sheet that doxygen normally uses.
+# default style sheet that Doxygen normally uses.
 # This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_STYLESHEET_FILE    =
 
 # Set optional variables used in the generation of an RTF document. Syntax is
-# similar to doxygen's configuration file. A template extensions file can be
+# similar to Doxygen's configuration file. A template extensions file can be
 # generated using doxygen -e rtf extensionFile.
 # This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_EXTENSIONS_FILE    =
 
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
+# The RTF_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the RTF_OUTPUT output directory.
+# Note that the files will be copied as-is; there are no commands or markers
+# available.
 # This tag requires that the tag GENERATE_RTF is set to YES.
 
-RTF_SOURCE_CODE        = NO
+RTF_EXTRA_FILES        =
 
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
+# If the GENERATE_MAN tag is set to YES, Doxygen will generate man pages for
 # classes and files.
 # The default value is: NO.
 
@@ -1951,7 +2239,7 @@ MAN_EXTENSION          = .3
 
 MAN_SUBDIR             =
 
-# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output, then it
 # will generate one additional man file for each entity documented in the real
 # man page(s). These additional files only source the real man page, but without
 # them the man command would be unable to find the correct page.
@@ -1964,7 +2252,7 @@ MAN_LINKS              = NO
 # Configuration options related to the XML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
+# If the GENERATE_XML tag is set to YES, Doxygen will generate an XML file that
 # captures the structure of the code including all documentation.
 # The default value is: NO.
 
@@ -1978,7 +2266,7 @@ GENERATE_XML           = NO
 
 XML_OUTPUT             = xml
 
-# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
+# If the XML_PROGRAMLISTING tag is set to YES, Doxygen will dump the program
 # listings (including syntax highlighting and cross-referencing information) to
 # the XML output. Note that enabling this will significantly increase the size
 # of the XML output.
@@ -1987,7 +2275,7 @@ XML_OUTPUT             = xml
 
 XML_PROGRAMLISTING     = YES
 
-# If the XML_NS_MEMB_FILE_SCOPE tag is set to YES, doxygen will include
+# If the XML_NS_MEMB_FILE_SCOPE tag is set to YES, Doxygen will include
 # namespace members in file scope as well, matching the HTML output.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_XML is set to YES.
@@ -1998,7 +2286,7 @@ XML_NS_MEMB_FILE_SCOPE = NO
 # Configuration options related to the DOCBOOK output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
+# If the GENERATE_DOCBOOK tag is set to YES, Doxygen will generate Docbook files
 # that can be used to generate PDF.
 # The default value is: NO.
 
@@ -2012,32 +2300,49 @@ GENERATE_DOCBOOK       = NO
 
 DOCBOOK_OUTPUT         = docbook
 
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
-# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, Doxygen will generate an
+# AutoGen Definitions (see https://autogen.sourceforge.net/) file that captures
 # the structure of the code including all documentation. Note that this feature
 # is still experimental and incomplete at the moment.
 # The default value is: NO.
 
 GENERATE_AUTOGEN_DEF   = NO
 
+#---------------------------------------------------------------------------
+# Configuration options related to Sqlite3 output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_SQLITE3 tag is set to YES Doxygen will generate a Sqlite3
+# database with symbols found by Doxygen stored in tables.
+# The default value is: NO.
+
+GENERATE_SQLITE3       = NO
+
+# The SQLITE3_OUTPUT tag is used to specify where the Sqlite3 database will be
+# put. If a relative path is entered the value of OUTPUT_DIRECTORY will be put
+# in front of it.
+# The default directory is: sqlite3.
+# This tag requires that the tag GENERATE_SQLITE3 is set to YES.
+
+SQLITE3_OUTPUT         = sqlite3
+
+# The SQLITE3_RECREATE_DB tag is set to YES, the existing doxygen_sqlite3.db
+# database file will be recreated with each Doxygen run. If set to NO, Doxygen
+# will warn if a database file is already found and not modify it.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_SQLITE3 is set to YES.
+
+SQLITE3_RECREATE_DB    = YES
+
 #---------------------------------------------------------------------------
 # Configuration options related to the Perl module output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
+# If the GENERATE_PERLMOD tag is set to YES, Doxygen will generate a Perl module
 # file that captures the structure of the code including all documentation.
 #
 # Note that this feature is still experimental and incomplete at the moment.
@@ -2045,7 +2350,7 @@ GENERATE_AUTOGEN_DEF   = NO
 
 GENERATE_PERLMOD       = NO
 
-# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
+# If the PERLMOD_LATEX tag is set to YES, Doxygen will generate the necessary
 # Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
 # output from the Perl module output.
 # The default value is: NO.
@@ -2075,13 +2380,13 @@ PERLMOD_MAKEVAR_PREFIX =
 # Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
 
-# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
+# If the ENABLE_PREPROCESSING tag is set to YES, Doxygen will evaluate all
 # C-preprocessor directives found in the sources and include files.
 # The default value is: YES.
 
 ENABLE_PREPROCESSING   = YES
 
-# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# If the MACRO_EXPANSION tag is set to YES, Doxygen will expand all macro names
 # in the source code. If set to NO, only conditional compilation will be
 # performed. Macro expansion can be done in a controlled way by setting
 # EXPAND_ONLY_PREDEF to YES.
@@ -2107,7 +2412,8 @@ SEARCH_INCLUDES        = YES
 
 # The INCLUDE_PATH tag can be used to specify one or more directories that
 # contain include files that are not input files but should be processed by the
-# preprocessor.
+# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of
+# RECURSIVE has no effect here.
 # This tag requires that the tag SEARCH_INCLUDES is set to YES.
 
 INCLUDE_PATH           =
@@ -2143,7 +2449,7 @@ PREDEFINED             = ALIGNAS(x)= \
 
 EXPAND_AS_DEFINED      =
 
-# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# If the SKIP_FUNCTION_MACROS tag is set to YES then Doxygen's preprocessor will
 # remove all references to function-like macros that are alone on a line, have
 # an all uppercase name, and do not end with a semicolon. Such function macros
 # are typically used for boiler-plate code, and will confuse the parser if not
@@ -2167,26 +2473,26 @@ SKIP_FUNCTION_MACROS   = YES
 # section "Linking to external documentation" for more information about the use
 # of tag files.
 # Note: Each tag file must have a unique name (where the name does NOT include
-# the path). If a tag file is not located in the directory in which doxygen is
+# the path). If a tag file is not located in the directory in which Doxygen is
 # run, you must also specify the path to the tagfile here.
 
 TAGFILES               =
 
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# When a file name is specified after GENERATE_TAGFILE, Doxygen will create a
 # tag file that is based on the input files it reads. See section "Linking to
 # external documentation" for more information about the usage of tag files.
 
 GENERATE_TAGFILE       =
 
-# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
-# the class index. If set to NO, only the inherited external classes will be
-# listed.
+# If the ALLEXTERNALS tag is set to YES, all external classes and namespaces
+# will be listed in the class and namespace index. If set to NO, only the
+# inherited external classes will be listed.
 # The default value is: NO.
 
 ALLEXTERNALS           = NO
 
 # If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will be
+# in the topic index. If set to NO, only the current project's groups will be
 # listed.
 # The default value is: YES.
 
@@ -2200,42 +2506,26 @@ EXTERNAL_GROUPS        = YES
 EXTERNAL_PAGES         = YES
 
 #---------------------------------------------------------------------------
-# Configuration options related to the dot tool
+# Configuration options related to diagram generator tools
 #---------------------------------------------------------------------------
 
-# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
-# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
-# NO turns the diagrams off. Note that this option also works with HAVE_DOT
-# disabled, but it is recommended to install and use dot, since it yields more
-# powerful graphs.
-# The default value is: YES.
-
-CLASS_DIAGRAMS         = YES
-
-# You can include diagrams made with dia in doxygen documentation. Doxygen will
-# then run dia to produce the diagram and insert it in the documentation. The
-# DIA_PATH tag allows you to specify the directory where the dia binary resides.
-# If left empty dia is assumed to be found in the default search path.
-
-DIA_PATH               =
-
 # If set to YES the inheritance and collaboration graphs will hide inheritance
 # and usage relations if the target is undocumented or is not a class.
 # The default value is: YES.
 
 HIDE_UNDOC_RELATIONS   = YES
 
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# If you set the HAVE_DOT tag to YES then Doxygen will assume the dot tool is
 # available from the path. This tool is part of Graphviz (see:
-# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# https://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
 # Bell Labs. The other options in this section have no effect if this option is
 # set to NO
 # The default value is: NO.
 
-HAVE_DOT               = NO
+HAVE_DOT               = YES
 
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
-# to run in parallel. When set to 0 doxygen will base this on the number of
+# The DOT_NUM_THREADS specifies the number of dot invocations Doxygen is allowed
+# to run in parallel. When set to 0 Doxygen will base this on the number of
 # processors available in the system. You can set it explicitly to a value
 # larger than 0 to get control over the balance between CPU load and processing
 # speed.
@@ -2244,55 +2534,83 @@ HAVE_DOT               = NO
 
 DOT_NUM_THREADS        = 0
 
-# When you want a differently looking font in the dot files that doxygen
-# generates you can specify the font name using DOT_FONTNAME. You need to make
-# sure dot is able to find the font, which can be done by putting it in a
-# standard location or by setting the DOTFONTPATH environment variable or by
-# setting DOT_FONTPATH to the directory containing the font.
-# The default value is: Helvetica.
+# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of
+# subgraphs. When you want a differently looking font in the dot files that
+# Doxygen generates you can specify fontname, fontcolor and fontsize attributes.
+# For details please see <a href=https://graphviz.org/doc/info/attrs.html>Node,
+# Edge and Graph Attributes specification</a> You need to make sure dot is able
+# to find the font, which can be done by putting it in a standard location or by
+# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
+# directory containing the font. Default graphviz fontsize is 14.
+# The default value is: fontname=Helvetica,fontsize=10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_COMMON_ATTR        = "fontname=\"Noto Sans, Lucida Grande, Lucida Sans Unicode, Helvetica, Arial, sans-serif\",fontsize=10"
+
+# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can
+# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. <a
+# href=https://graphviz.org/doc/info/arrows.html>Complete documentation about
+# arrows shapes.</a>
+# The default value is: labelfontname=Helvetica,labelfontsize=10.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_FONTNAME           = Helvetica
+DOT_EDGE_ATTR          = "labelfontname=\"Noto Sans, Lucida Grande, Lucida Sans Unicode, Helvetica, Arial, sans-serif\",labelfontsize=10"
 
-# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
-# dot graphs.
-# Minimum value: 4, maximum value: 24, default value: 10.
+# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes
+# around nodes set 'shape=plain' or 'shape=plaintext' <a
+# href=https://www.graphviz.org/doc/info/shapes.html>Shapes specification</a>
+# The default value is: shape=box,height=0.2,width=0.4.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_FONTSIZE           = 10
+DOT_NODE_ATTR          = "shape=box,height=0.2,width=0.4"
 
-# By default doxygen will tell dot to use the default font as specified with
-# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
-# the path where dot can find it using this tag.
+# You can set the path where dot can find font specified with fontname in
+# DOT_COMMON_ATTR and others dot attributes.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_FONTPATH           =
 
-# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
-# each documented class showing the direct and indirect inheritance relations.
-# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# If the CLASS_GRAPH tag is set to YES or GRAPH or BUILTIN then Doxygen will
+# generate a graph for each documented class showing the direct and indirect
+# inheritance relations. In case the CLASS_GRAPH tag is set to YES or GRAPH and
+# HAVE_DOT is enabled as well, then dot will be used to draw the graph. In case
+# the CLASS_GRAPH tag is set to YES and HAVE_DOT is disabled or if the
+# CLASS_GRAPH tag is set to BUILTIN, then the built-in generator will be used.
+# If the CLASS_GRAPH tag is set to TEXT the direct and indirect inheritance
+# relations will be shown as texts / links. Explicit enabling an inheritance
+# graph or choosing a different representation for an inheritance graph of a
+# specific class, can be accomplished by means of the command \inheritancegraph.
+# Disabling an inheritance graph can be accomplished by means of the command
+# \hideinheritancegraph.
+# Possible values are: NO, YES, TEXT, GRAPH and BUILTIN.
 # The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
 
 CLASS_GRAPH            = YES
 
-# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# If the COLLABORATION_GRAPH tag is set to YES then Doxygen will generate a
 # graph for each documented class showing the direct and indirect implementation
 # dependencies (inheritance, containment, and class references variables) of the
-# class with other documented classes.
+# class with other documented classes. Explicit enabling a collaboration graph,
+# when COLLABORATION_GRAPH is set to NO, can be accomplished by means of the
+# command \collaborationgraph. Disabling a collaboration graph can be
+# accomplished by means of the command \hidecollaborationgraph.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
 COLLABORATION_GRAPH    = YES
 
-# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
-# groups, showing the direct groups dependencies.
+# If the GROUP_GRAPHS tag is set to YES then Doxygen will generate a graph for
+# groups, showing the direct groups dependencies. Explicit enabling a group
+# dependency graph, when GROUP_GRAPHS is set to NO, can be accomplished by means
+# of the command \groupgraph. Disabling a directory graph can be accomplished by
+# means of the command \hidegroupgraph. See also the chapter Grouping in the
+# manual.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
 GROUP_GRAPHS           = YES
 
-# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
+# If the UML_LOOK tag is set to YES, Doxygen will generate inheritance and
 # collaboration diagrams in a style similar to the OMG's Unified Modeling
 # Language.
 # The default value is: NO.
@@ -2309,10 +2627,32 @@ UML_LOOK               = NO
 # but if the number exceeds 15, the total amount of fields shown is limited to
 # 10.
 # Minimum value: 0, maximum value: 100, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
+# This tag requires that the tag UML_LOOK is set to YES.
 
 UML_LIMIT_NUM_FIELDS   = 10
 
+# If the DOT_UML_DETAILS tag is set to NO, Doxygen will show attributes and
+# methods without types and arguments in the UML graphs. If the DOT_UML_DETAILS
+# tag is set to YES, Doxygen will add type and arguments for attributes and
+# methods in the UML graphs. If the DOT_UML_DETAILS tag is set to NONE, Doxygen
+# will not generate fields with class member information in the UML graphs. The
+# class diagrams will look similar to the default class diagrams but using UML
+# notation for the relationships.
+# Possible values are: NO, YES and NONE.
+# The default value is: NO.
+# This tag requires that the tag UML_LOOK is set to YES.
+
+DOT_UML_DETAILS        = NO
+
+# The DOT_WRAP_THRESHOLD tag can be used to set the maximum number of characters
+# to display on a single line. If the actual line length exceeds this threshold
+# significantly it will be wrapped across multiple lines. Some heuristics are
+# applied to avoid ugly line breaks.
+# Minimum value: 0, maximum value: 1000, default value: 17.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_WRAP_THRESHOLD     = 17
+
 # If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
 # collaboration graphs will show the relations between templates and their
 # instances.
@@ -2322,24 +2662,29 @@ UML_LIMIT_NUM_FIELDS   = 10
 TEMPLATE_RELATIONS     = NO
 
 # If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
-# YES then doxygen will generate a graph for each documented file showing the
+# YES then Doxygen will generate a graph for each documented file showing the
 # direct and indirect include dependencies of the file with other documented
-# files.
+# files. Explicit enabling an include graph, when INCLUDE_GRAPH is is set to NO,
+# can be accomplished by means of the command \includegraph. Disabling an
+# include graph can be accomplished by means of the command \hideincludegraph.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
 INCLUDE_GRAPH          = YES
 
 # If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
-# set to YES then doxygen will generate a graph for each documented file showing
+# set to YES then Doxygen will generate a graph for each documented file showing
 # the direct and indirect include dependencies of the file with other documented
-# files.
+# files. Explicit enabling an included by graph, when INCLUDED_BY_GRAPH is set
+# to NO, can be accomplished by means of the command \includedbygraph. Disabling
+# an included by graph can be accomplished by means of the command
+# \hideincludedbygraph.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
 INCLUDED_BY_GRAPH      = YES
 
-# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# If the CALL_GRAPH tag is set to YES then Doxygen will generate a call
 # dependency graph for every global function or class method.
 #
 # Note that enabling this option will significantly increase the time of a run.
@@ -2351,7 +2696,7 @@ INCLUDED_BY_GRAPH      = YES
 
 CALL_GRAPH             = NO
 
-# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# If the CALLER_GRAPH tag is set to YES then Doxygen will generate a caller
 # dependency graph for every global function or class method.
 #
 # Note that enabling this option will significantly increase the time of a run.
@@ -2363,44 +2708,59 @@ CALL_GRAPH             = NO
 
 CALLER_GRAPH           = NO
 
-# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# If the GRAPHICAL_HIERARCHY tag is set to YES then Doxygen will graphical
 # hierarchy of all classes instead of a textual one.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
 GRAPHICAL_HIERARCHY    = YES
 
-# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# If the DIRECTORY_GRAPH tag is set to YES then Doxygen will show the
 # dependencies a directory has on other directories in a graphical way. The
 # dependency relations are determined by the #include relations between the
-# files in the directories.
+# files in the directories. Explicit enabling a directory graph, when
+# DIRECTORY_GRAPH is set to NO, can be accomplished by means of the command
+# \directorygraph. Disabling a directory graph can be accomplished by means of
+# the command \hidedirectorygraph.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
 DIRECTORY_GRAPH        = YES
 
+# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels
+# of child directories generated in directory dependency graphs by dot.
+# Minimum value: 1, maximum value: 25, default value: 1.
+# This tag requires that the tag DIRECTORY_GRAPH is set to YES.
+
+DIR_GRAPH_MAX_DEPTH    = 1
+
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
 # generated by dot. For an explanation of the image formats see the section
 # output formats in the documentation of the dot tool (Graphviz (see:
-# http://www.graphviz.org/)).
-# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
-# to make the SVG files visible in IE 9+ (other browsers do not have this
-# requirement).
+# https://www.graphviz.org/)).
+#
+# Note the formats svg:cairo and svg:cairo:cairo cannot be used in combination
+# with INTERACTIVE_SVG (the INTERACTIVE_SVG will be set to NO).
 # Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo,
-# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
-# png:gdiplus:gdiplus.
+# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus,
+# png:gdiplus:gdiplus, svg:cairo, svg:cairo:cairo, svg:svg, svg:svg:core,
+# gif:cairo, gif:cairo:gd, gif:cairo:gdiplus, gif:gdiplus, gif:gdiplus:gdiplus,
+# gif:gd, gif:gd:gd, jpg:cairo, jpg:cairo:gd, jpg:cairo:gdiplus, jpg:gd,
+# jpg:gd:gd, jpg:gdiplus and jpg:gdiplus:gdiplus.
 # The default value is: png.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_IMAGE_FORMAT       = png
+DOT_IMAGE_FORMAT       = svg
 
-# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
-# enable generation of interactive SVG images that allow zooming and panning.
+# If DOT_IMAGE_FORMAT is set to svg or svg:svg or svg:svg:core, then this option
+# can be set to YES to enable generation of interactive SVG images that allow
+# zooming and panning.
 #
 # Note that this requires a modern browser other than Internet Explorer. Tested
 # and working are Firefox, Chrome, Safari, and Opera.
-# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
-# the SVG files visible. Older versions of IE do not have SVG support.
+#
+# Note This option will be automatically disabled when DOT_IMAGE_FORMAT is set
+# to svg:cairo or svg:cairo:cairo.
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
@@ -2419,11 +2779,12 @@ DOT_PATH               =
 
 DOTFILE_DIRS           =
 
-# The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the \mscfile
-# command).
+# You can include diagrams made with dia in Doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
 
-MSCFILE_DIRS           =
+DIA_PATH               =
 
 # The DIAFILE_DIRS tag can be used to specify one or more directories that
 # contain dia files that are included in the documentation (see the \diafile
@@ -2431,28 +2792,34 @@ MSCFILE_DIRS           =
 
 DIAFILE_DIRS           =
 
-# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
-# path where java can find the plantuml.jar file. If left blank, it is assumed
-# PlantUML is not used or called during a preprocessing step. Doxygen will
-# generate a warning when it encounters a \startuml command in this case and
-# will not generate output for the diagram.
+# When using PlantUML, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file or to the filename of jar file
+# to be used. If left blank, it is assumed PlantUML is not used or called during
+# a preprocessing step. Doxygen will generate a warning when it encounters a
+# \startuml command in this case and will not generate output for the diagram.
 
 PLANTUML_JAR_PATH      =
 
-# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
-# configuration file for plantuml.
+# When using PlantUML, the PLANTUML_CFG_FILE tag can be used to specify a
+# configuration file for PlantUML.
 
 PLANTUML_CFG_FILE      =
 
-# When using plantuml, the specified paths are searched for files specified by
-# the !include statement in a plantuml block.
+# When using PlantUML, the specified paths are searched for files specified by
+# the !include statement in a PlantUML block.
 
 PLANTUML_INCLUDE_PATH  =
 
+# The PLANTUMLFILE_DIRS tag can be used to specify one or more directories that
+# contain PlantUml files that are included in the documentation (see the
+# \plantumlfile command).
+
+PLANTUMLFILE_DIRS      =
+
 # The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
 # that will be shown in the graph. If the number of nodes in a graph becomes
-# larger than this value, doxygen will truncate the graph, which is visualized
-# by representing a node as a red box. Note that doxygen if the number of direct
+# larger than this value, Doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that if the number of direct
 # children of the root node in a graph is already larger than
 # DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
 # the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
@@ -2473,18 +2840,6 @@ DOT_GRAPH_MAX_NODES    = 50
 
 MAX_DOT_GRAPH_DEPTH    = 0
 
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not seem
-# to support this out of the box.
-#
-# Warning: Depending on the platform used, enabling this option may lead to
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
-# read).
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_TRANSPARENT        = NO
-
 # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
 # files in one run (i.e. multiple -o and -T options on the command line). This
 # makes dot run faster, but since only newer versions of dot (>1.8.10) support
@@ -2494,17 +2849,37 @@ DOT_TRANSPARENT        = NO
 
 DOT_MULTI_TARGETS      = NO
 
-# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# If the GENERATE_LEGEND tag is set to YES Doxygen will generate a legend page
 # explaining the meaning of the various boxes and arrows in the dot generated
 # graphs.
+# Note: This tag requires that UML_LOOK isn't set, i.e. the Doxygen internal
+# graphical representation for inheritance and collaboration diagrams is used.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
 GENERATE_LEGEND        = YES
 
-# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
+# If the DOT_CLEANUP tag is set to YES, Doxygen will remove the intermediate
 # files that are used to generate the various graphs.
+#
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
 # The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_CLEANUP            = YES
+
+# You can define message sequence charts within Doxygen comments using the \msc
+# command. If the MSCGEN_TOOL tag is left empty (the default), then Doxygen will
+# use a built-in version of mscgen tool to produce the charts. Alternatively,
+# the MSCGEN_TOOL tag can also specify the name an external tool. For instance,
+# specifying prog as the value, Doxygen will call the tool as prog -T
+# <outfile_format> -o <outputfile> <inputfile>. The external tool should support
+# output file formats "png", "eps", "svg", and "ismap".
+
+MSCGEN_TOOL            =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           =
diff --git a/extern/crashpad/crashpad/doc/support/crashpad.doxy.h b/extern/crashpad/crashpad/doc/support/crashpad.doxy.h
index ae328d3091..ebd65e5f92 100644
--- a/extern/crashpad/crashpad/doc/support/crashpad.doxy.h
+++ b/extern/crashpad/crashpad/doc/support/crashpad.doxy.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/doc/support/crashpad_doxygen.css b/extern/crashpad/crashpad/doc/support/crashpad_doxygen.css
index f21cfe904e..13ce3854ca 100644
--- a/extern/crashpad/crashpad/doc/support/crashpad_doxygen.css
+++ b/extern/crashpad/crashpad/doc/support/crashpad_doxygen.css
@@ -1,4 +1,4 @@
-/* Copyright 2016 The Crashpad Authors. All rights reserved.
+/* Copyright 2016 The Crashpad Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,47 +12,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. */
 
-@import "https://fonts.googleapis.com/css?family=Open+Sans:300,400,700&subset=latin,cyrillic-ext,greek-ext,cyrillic,greek,vietnamese,latin-ext";
-@import "https://fonts.googleapis.com/css?family=Source+Code+Pro";
+@import url('https://fonts.googleapis.com/css2?family=Noto+Sans:ital,wght@0,100..900;1,100..900&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Source+Code+Pro:ital,wght@0,200..900;1,200..900&display=swap');
 
-body,
-table,
-div,
-p,
-dl,
-.title,
-.icon,
-table.directory,
-.navpath li.navelem a,
-#projectname,
-#projectbrief,
-#projectnumber,
-div.toc li,
-div.toc h3,
-#powerTip div,
-.sm-dox a,
-.sm-dox a:focus,
-.sm-dox a:hover,
-.sm-dox a:active {
-  font-family: 'Open Sans',
-               'Lucida Grande',
-               'Lucida Sans Unicode',
-               Helvetica,
-               Arial,
-               sans-serif;
-}
+:root {
+  --font-family-normal: 'Noto Sans',
+    'Lucida Grande',
+    'Lucida Sans Unicode',
+    Helvetica,
+    Arial,
+    sans-serif;
+  --font-family-nav: var(--font-family-normal);
+  --font-family-title: var(--font-family-normal);
+  --font-family-toc: var(--font-family-normal);
+  --font-family-search: var(--font-family-normal);
+  --font-family-icon: var(--font-family-normal);
+  --font-family-tooltip: var(--font-family-normal);
 
-code,
-tt,
-pre.fragment,
-div.line,
-.overload,
-.params .paramdir,
-.sm-dox a span.sub-arrow {
-  font-family: 'Source Code Pro',
-               Monaco,
-               'Lucida Console',
-               monospace;
+  --font-family-monospace: 'Source Code Pro',
+    Monaco,
+    'Lucida Console',
+    monospace;
 }
 
 .icon {
diff --git a/extern/crashpad/crashpad/doc/support/generate.sh b/extern/crashpad/crashpad/doc/support/generate.sh
index c3065c1dfe..18b505ad34 100755
--- a/extern/crashpad/crashpad/doc/support/generate.sh
+++ b/extern/crashpad/crashpad/doc/support/generate.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2015 The Crashpad Authors. All rights reserved.
+# Copyright 2015 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ cd "$(dirname "${0}")/../.."
 
 source doc/support/compat.sh
 
-python doc/support/generate_doxygen.py
+doc/support/generate_doxygen.py
 
 output_dir=doc/generated
 maybe_mkdir "${output_dir}"
diff --git a/extern/crashpad/crashpad/doc/support/generate_doxygen.py b/extern/crashpad/crashpad/doc/support/generate_doxygen.py
index 577b51e596..5de77e3dfb 100755
--- a/extern/crashpad/crashpad/doc/support/generate_doxygen.py
+++ b/extern/crashpad/crashpad/doc/support/generate_doxygen.py
@@ -1,6 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
-# Copyright 2017 The Crashpad Authors. All rights reserved.
+# Copyright 2017 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/doc/support/generate_git.sh b/extern/crashpad/crashpad/doc/support/generate_git.sh
index 209c11b95e..0e4e6404d9 100755
--- a/extern/crashpad/crashpad/doc/support/generate_git.sh
+++ b/extern/crashpad/crashpad/doc/support/generate_git.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2015 The Crashpad Authors. All rights reserved.
+# Copyright 2015 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -38,8 +38,8 @@ local_branch="\
 $(${sed_ext} -e 's/(.*)\..*/\1/' <<< "${basename}").${$}.${RANDOM}"
 
 remote_name=origin
-remote_master_branch_name=master
-remote_master_branch="${remote_name}/${remote_master_branch_name}"
+remote_main_branch_name=main
+remote_main_branch="${remote_name}/${remote_main_branch_name}"
 remote_doc_branch_name=doc
 remote_doc_branch="${remote_name}/${remote_doc_branch_name}"
 
@@ -61,9 +61,9 @@ function cleanup() {
 
 trap cleanup EXIT
 
-master_hash=$(git rev-parse --short=12 "${remote_master_branch}")
-git merge "${remote_master_branch}" \
-    -m "Merge ${remote_master_branch_name} ${master_hash} into doc"
+main_hash=$(git rev-parse --short=12 "${remote_main_branch}")
+git merge "${remote_main_branch}" \
+    -m "Merge ${remote_main_branch_name} ${main_hash} into doc"
 
 dirty=y
 
@@ -74,7 +74,7 @@ git add -A doc/generated
 count="$(git diff --staged --numstat | wc -l)"
 if [[ $count -gt 0 ]]; then
   git commit \
-      -m "Update documentation to ${remote_master_branch_name} ${master_hash}"
+      -m "Update documentation to ${remote_main_branch_name} ${main_hash}"
   dirty=
 
   git push "${remote_name}" "HEAD:${remote_doc_branch_name}"
diff --git a/extern/crashpad/crashpad/handler/BUILD.gn b/extern/crashpad/crashpad/handler/BUILD.gn
index a697b338e8..9061c2cbcd 100644
--- a/extern/crashpad/crashpad/handler/BUILD.gn
+++ b/extern/crashpad/crashpad/handler/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2015 The Crashpad Authors. All rights reserved.
+# Copyright 2015 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,90 +14,18 @@
 
 import("../build/crashpad_buildconfig.gni")
 
-static_library("handler") {
-  sources = [
-    "handler_main.cc",
-    "handler_main.h",
-    "prune_crash_reports_thread.cc",
-    "prune_crash_reports_thread.h",
-    "user_stream_data_source.cc",
-    "user_stream_data_source.h",
-  ]
-
-  if (crashpad_is_mac) {
-    sources += [
-      "mac/crash_report_exception_handler.cc",
-      "mac/crash_report_exception_handler.h",
-      "mac/exception_handler_server.cc",
-      "mac/exception_handler_server.h",
-    ]
-  }
-
-  if (crashpad_is_linux || crashpad_is_android) {
-    sources += [
-      "linux/capture_snapshot.cc",
-      "linux/capture_snapshot.h",
-      "linux/crash_report_exception_handler.cc",
-      "linux/crash_report_exception_handler.h",
-      "linux/exception_handler_server.cc",
-      "linux/exception_handler_server.h",
-    ]
-  }
-
-  if (crashpad_is_linux) {
-    sources += [
-      "linux/cros_crash_report_exception_handler.cc",
-      "linux/cros_crash_report_exception_handler.h",
-    ]
-  }
-
-  if (crashpad_is_win) {
-    sources += [
-      "win/crash_report_exception_handler.cc",
-      "win/crash_report_exception_handler.h",
-    ]
-  }
-
-  public_configs = [ "..:crashpad_config" ]
-
-  public_deps = [
-    ":common",
-    "../client",
-    "../third_party/mini_chromium:base",
-    "../util",
-  ]
-
-  deps = [
-    ":common",
-    "../minidump",
-    "../snapshot",
-    "../third_party/mini_chromium:chromeos_buildflags",
-    "../tools:tool_support",
-  ]
-
-  if (crashpad_is_win) {
-    cflags = [ "/wd4201" ]  # nonstandard extension used : nameless struct/union
-  }
-}
-
-if (crashpad_is_android) {
-  # CrashpadHandlerMain is defined in a separate target so that it can be
-  # overriden by implementers
-  source_set("crashpad_handler_main") {
-    sources = [ "crashpad_handler_main.cc" ]
-
-    deps = [ ":handler" ]
-  }
-}
-
 static_library("common") {
   sources = [
+    "crash_report_upload_rate_limit.cc",
+    "crash_report_upload_rate_limit.h",
     "crash_report_upload_thread.cc",
     "crash_report_upload_thread.h",
     "minidump_to_upload_parameters.cc",
     "minidump_to_upload_parameters.h",
+    "user_stream_data_source.cc",
+    "user_stream_data_source.h",
   ]
-  if (crashpad_is_mac || crashpad_is_ios) {
+  if (crashpad_is_apple) {
     sources += [
       "mac/file_limit_annotation.cc",
       "mac/file_limit_annotation.h",
@@ -110,50 +38,134 @@ static_library("common") {
   ]
   deps = [
     "../client:common",
+    "../minidump",
     "../snapshot",
     "../util",
+    "../util:net",
   ]
   if (crashpad_is_win) {
     cflags = [ "/wd4201" ]  # nonstandard extension used : nameless struct/union
   }
 }
 
-source_set("handler_test") {
-  testonly = true
+if (!crashpad_is_ios) {
+  static_library("handler") {
+    sources = [
+      "handler_main.cc",
+      "handler_main.h",
+      "prune_crash_reports_thread.cc",
+      "prune_crash_reports_thread.h",
+    ]
+
+    if (crashpad_is_mac) {
+      sources += [
+        "mac/crash_report_exception_handler.cc",
+        "mac/crash_report_exception_handler.h",
+        "mac/exception_handler_server.cc",
+        "mac/exception_handler_server.h",
+      ]
+    }
+
+    if (crashpad_is_linux || crashpad_is_android) {
+      sources += [
+        "linux/capture_snapshot.cc",
+        "linux/capture_snapshot.h",
+        "linux/crash_report_exception_handler.cc",
+        "linux/crash_report_exception_handler.h",
+        "linux/exception_handler_server.cc",
+        "linux/exception_handler_server.h",
+      ]
+    }
+
+    if (crashpad_is_linux) {
+      sources += [
+        "linux/cros_crash_report_exception_handler.cc",
+        "linux/cros_crash_report_exception_handler.h",
+      ]
+
+      # TODO(https://crbug.com/1420445): Remove this config when M115 branches.
+      configs += [ "../build:crashpad_is_in_chromium" ]
+    }
+
+    if (crashpad_is_win) {
+      sources += [
+        "win/crash_report_exception_handler.cc",
+        "win/crash_report_exception_handler.h",
+      ]
+    }
 
-  sources = [ "minidump_to_upload_parameters_test.cc" ]
+    public_configs = [ "..:crashpad_config" ]
 
-  if (crashpad_is_linux || crashpad_is_android) {
-    sources += [ "linux/exception_handler_server_test.cc" ]
+    public_deps = [
+      ":common",
+      "../client",
+      "../third_party/mini_chromium:base",
+      "../util",
+    ]
+
+    deps = [
+      ":common",
+      "../minidump",
+      "../snapshot",
+      "../tools:tool_support",
+    ]
+
+    if (crashpad_is_win) {
+      cflags = [ "/wd4201" ]  # nonstandard extension used : nameless struct/union
+    }
   }
 
-  if (crashpad_is_win) {
-    sources += [ "crashpad_handler_test.cc" ]
+  if (crashpad_is_android) {
+    # CrashpadHandlerMain is defined in a separate target so that it can be
+    # overriden by implementers
+    source_set("crashpad_handler_main") {
+      sources = [ "crashpad_handler_main.cc" ]
+
+      deps = [ ":handler" ]
+    }
   }
 
-  deps = [
-    ":handler",
-    "../client",
-    "../compat",
-    "../snapshot",
-    "../snapshot:test_support",
-    "../test",
-    "../third_party/googletest:googletest",
-    "../third_party/mini_chromium:base",
-    "../util",
-  ]
+  source_set("handler_test") {
+    testonly = true
 
-  if (crashpad_is_win) {
-    deps += [ "../minidump:test_support" ]
+    sources = [
+      "crash_report_upload_rate_limit_test.cc",
+      "minidump_to_upload_parameters_test.cc",
+    ]
+
+    if (crashpad_is_linux || crashpad_is_android) {
+      sources += [ "linux/exception_handler_server_test.cc" ]
+    }
 
-    data_deps = [
-      ":crashpad_handler_test_extended_handler",
-      ":fake_handler_that_crashes_at_startup",
+    if (crashpad_is_win) {
+      sources += [ "crashpad_handler_test.cc" ]
+    }
+
+    deps = [
+      ":handler",
+      "../client",
+      "../compat",
+      "../snapshot",
+      "../snapshot:test_support",
+      "../test",
+      "../third_party/googletest",
+      "../third_party/mini_chromium:base",
+      "../util",
     ]
+
+    if (crashpad_is_win) {
+      deps += [
+        "../minidump:test_support",
+        "win/wer:crashpad_wer_test",
+      ]
+
+      data_deps = [
+        ":crashpad_handler_test_extended_handler",
+        ":fake_handler_that_crashes_at_startup",
+      ]
+    }
   }
-}
 
-if (!crashpad_is_ios) {
   crashpad_executable("crashpad_handler") {
     sources = [ "main.cc" ]
 
@@ -169,6 +181,11 @@ if (!crashpad_is_ios) {
       if (crashpad_is_in_chromium || crashpad_is_in_dart) {
         remove_configs = [ "//build/config/win:console" ]
         configs = [ "//build/config/win:windowed" ]
+      } else if (crashpad_is_external) {
+        remove_configs =
+            [ "//../../mini_chromium/mini_chromium/build/config:win_console" ]
+        configs =
+            [ "//../../mini_chromium/mini_chromium/build/config:win_windowed" ]
       } else {
         remove_configs = [
           "//third_party/mini_chromium/mini_chromium/build/config:win_console",
@@ -208,7 +225,16 @@ if (crashpad_is_android) {
     libs = [ "log" ]
 
     if (crashpad_is_in_chromium) {
-      no_default_deps = true
+      # Chromium's sanitizer runtime libraries do not include an unwinder,
+      # so add Chromium's standard dependencies to link against the in-tree
+      # libunwind. The coverage wrapper similarly requires an unwinder, as
+      # well as a few other bits from libc++abi. There are some issues with pgo
+      # as well.
+      import("//build/config/compiler/pgo/pgo.gni")
+      import("//build/config/coverage/coverage.gni")
+      import("//build/config/sanitizers/sanitizers.gni")
+      no_default_deps =
+          !use_clang_coverage && !using_sanitizer && chrome_pgo_phase != 1
       remove_configs =
           [ "//build/config/android:default_orderfile_instrumentation" ]
     }
@@ -264,7 +290,7 @@ if (crashpad_is_win) {
     deps = [
       "../client",
       "../test",
-      "../third_party/googletest:googletest",
+      "../third_party/googletest",
       "../third_party/mini_chromium:base",
     ]
   }
@@ -329,6 +355,19 @@ if (crashpad_is_win) {
     ]
   }
 
+  crashpad_executable("heap_corrupting_program") {
+    testonly = true
+
+    sources = [ "win/heap_corrupting_program.cc" ]
+
+    deps = [
+      "../client",
+      "../compat",
+      "../snapshot",
+      "../third_party/mini_chromium:base",
+    ]
+  }
+
   if (current_cpu == "x86") {
     # Cannot create an x64 DLL with embedded debug info.
     crashpad_executable("crashy_z7_loader") {
@@ -343,4 +382,20 @@ if (crashpad_is_win) {
       ]
     }
   }
+
+  config("enable_cfg") {
+    cflags = [ "/guard:cf" ]
+    ldflags = [ "/guard:cf" ]
+  }
+  crashpad_executable("fastfail_program") {
+    testonly = true
+
+    sources = [ "win/fastfail_test_program.cc" ]
+    configs = [ ":enable_cfg" ]
+
+    deps = [
+      "../client",
+      "../third_party/mini_chromium:base",
+    ]
+  }
 }
diff --git a/extern/crashpad/crashpad/handler/crash_report_upload_rate_limit.cc b/extern/crashpad/crashpad/handler/crash_report_upload_rate_limit.cc
new file mode 100644
index 0000000000..10cb196dbd
--- /dev/null
+++ b/extern/crashpad/crashpad/handler/crash_report_upload_rate_limit.cc
@@ -0,0 +1,47 @@
+// Copyright 2025 The Crashpad Authors
+//
+// 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.
+
+#include "handler/crash_report_upload_rate_limit.h"
+
+#include <time.h>
+
+#include <optional>
+
+#include "util/misc/metrics.h"
+
+namespace crashpad {
+
+ShouldRateLimitResult ShouldRateLimit(time_t now,
+                                      time_t last_upload_attempt_time,
+                                      time_t interval_seconds) {
+  if (now >= last_upload_attempt_time) {
+    // If the most recent upload attempt occurred within the past interval,
+    // don’t attempt to upload the new report. If it happened longer ago,
+    // attempt to upload the report.
+    if (now - last_upload_attempt_time < interval_seconds) {
+      return {1, Metrics::CrashSkippedReason::kUploadThrottled};
+    }
+  } else if (last_upload_attempt_time - now < kBackwardsClockTolerance) {
+    // The most recent upload attempt purportedly occurred in the future. If
+    // it “happened” at least `kBackwardsClockTolerance` in the future, assume
+    // that the last upload attempt time is bogus, and attempt to upload the
+    // report. If the most recent upload time is in the future but within
+    // `kBackwardsClockTolerance`, accept it and don’t attempt to upload the
+    // report.
+    return {1, Metrics::CrashSkippedReason::kUnexpectedTime};
+  }
+  return {0, std::nullopt};
+}
+
+}  // namespace crashpad
diff --git a/extern/crashpad/crashpad/handler/crash_report_upload_rate_limit.h b/extern/crashpad/crashpad/handler/crash_report_upload_rate_limit.h
new file mode 100644
index 0000000000..bd046c5fc4
--- /dev/null
+++ b/extern/crashpad/crashpad/handler/crash_report_upload_rate_limit.h
@@ -0,0 +1,60 @@
+// Copyright 2025 The Crashpad Authors
+//
+// 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.
+
+#ifndef CRASHPAD_HANDLER_CRASH_REPORT_UPLOAD_RATE_LIMIT_H_
+#define CRASHPAD_HANDLER_CRASH_REPORT_UPLOAD_RATE_LIMIT_H_
+
+#include <time.h>
+
+#include <optional>
+
+#include "util/misc/metrics.h"
+
+namespace crashpad {
+
+//! \brief How far into the future an upload-attempt timestamp can be and still
+//!     be treated as valid. Beyond this tolerance, timestamps are disregarded.
+//!     Exposed for testing.
+inline constexpr int kBackwardsClockTolerance = 60 * 60 * 24;  // 1 day
+
+//! \brief The return type of `ShouldRateLimit()`. Describes the number of
+//!     crash-report upload attempts in the past interval, and if upload
+//!     should be skipped, the reason why.
+struct ShouldRateLimitResult {
+  //! \brief The number of upload attempts in the past interval.
+  unsigned int attempts_in_interval;
+
+  //! \brief If the crash should be skipped, the reason why. `std::nullopt`
+  //!     otherwise.
+  std::optional<Metrics::CrashSkippedReason> skip_reason;
+};
+
+//! \brief Determines whether a crash report can be uploaded now, or whether
+//!     uploads should be rate limited at this time.
+//!
+//! \param[in] now The current time.
+//! \param[in] last_upload_attempt_time The timestamp of the last crash-report
+//!     upload attempt.
+//! \param[in] interval_seconds The unit of time, in seconds, over which to
+//!     perform rate-limiting calculations (an "interval").
+//!
+//! \return The number of upload attempts in the past interval, and if the
+//!     current crash report should be skipped, the reason why.
+ShouldRateLimitResult ShouldRateLimit(time_t now,
+                                      time_t last_upload_attempt_time,
+                                      time_t interval_seconds);
+
+}  // namespace crashpad
+
+#endif  // CRASHPAD_HANDLER_CRASH_REPORT_UPLOAD_RATE_LIMIT_H_
diff --git a/extern/crashpad/crashpad/handler/crash_report_upload_rate_limit_test.cc b/extern/crashpad/crashpad/handler/crash_report_upload_rate_limit_test.cc
new file mode 100644
index 0000000000..8cdced5327
--- /dev/null
+++ b/extern/crashpad/crashpad/handler/crash_report_upload_rate_limit_test.cc
@@ -0,0 +1,76 @@
+// Copyright 2025 The Crashpad Authors
+//
+// 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.
+
+#include "handler/crash_report_upload_rate_limit.h"
+
+#include <time.h>
+
+#include <optional>
+
+#include "gtest/gtest.h"
+#include "util/misc/metrics.h"
+
+namespace crashpad::test {
+namespace {
+
+using Metrics::CrashSkippedReason::kUnexpectedTime;
+using Metrics::CrashSkippedReason::kUploadThrottled;
+
+constexpr time_t kOneHour = 60 * 60;
+
+TEST(CrashReportUploadRateLimitTest, ShouldRateLimit_OnePerHour) {
+  const time_t now = time(nullptr);
+
+  // Allow upload if the last upload attempt time is in the future, at or beyond
+  // `kBackwardsClockTolerance`.
+  auto should_rate_limit =
+      ShouldRateLimit(now, now + kBackwardsClockTolerance + 1, kOneHour);
+  EXPECT_EQ(should_rate_limit.skip_reason, std::nullopt);
+
+  should_rate_limit =
+      ShouldRateLimit(now, now + kBackwardsClockTolerance, kOneHour);
+  EXPECT_EQ(should_rate_limit.skip_reason, std::nullopt);
+
+  // Skip upload if the last attempt time is in the future but within
+  // `kBackwardsClockTolerance`.
+  should_rate_limit =
+      ShouldRateLimit(now, now + kBackwardsClockTolerance - 1, kOneHour);
+  EXPECT_EQ(should_rate_limit.skip_reason, kUnexpectedTime);
+
+  should_rate_limit = ShouldRateLimit(now, now + 1, kOneHour);
+  EXPECT_EQ(should_rate_limit.skip_reason, kUnexpectedTime);
+
+  // Skip upload if the last attempt was under one interval ago.
+  should_rate_limit = ShouldRateLimit(now, now, kOneHour);
+  EXPECT_EQ(should_rate_limit.skip_reason, kUploadThrottled);
+
+  should_rate_limit = ShouldRateLimit(now, now - 1, kOneHour);
+  EXPECT_EQ(should_rate_limit.skip_reason, kUploadThrottled);
+
+  should_rate_limit = ShouldRateLimit(now, now - kOneHour + 1, kOneHour);
+  EXPECT_EQ(should_rate_limit.skip_reason, kUploadThrottled);
+
+  // Allow upload if the last attempt was one interval or more ago.
+  should_rate_limit = ShouldRateLimit(now, now - kOneHour, kOneHour);
+  EXPECT_EQ(should_rate_limit.skip_reason, std::nullopt);
+
+  should_rate_limit = ShouldRateLimit(now, now - kOneHour - 1, kOneHour);
+  EXPECT_EQ(should_rate_limit.skip_reason, std::nullopt);
+
+  should_rate_limit = ShouldRateLimit(now, 0, kOneHour);
+  EXPECT_EQ(should_rate_limit.skip_reason, std::nullopt);
+}
+
+}  // namespace
+}  // namespace crashpad::test
diff --git a/extern/crashpad/crashpad/handler/crash_report_upload_thread.cc b/extern/crashpad/crashpad/handler/crash_report_upload_thread.cc
index b7e445fd9f..bec8714263 100644
--- a/extern/crashpad/crashpad/handler/crash_report_upload_thread.cc
+++ b/extern/crashpad/crashpad/handler/crash_report_upload_thread.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "client/settings.h"
+#include "handler/crash_report_upload_rate_limit.h"
 #include "handler/minidump_to_upload_parameters.h"
 #include "snapshot/minidump/process_snapshot_minidump.h"
 #include "snapshot/module_snapshot.h"
@@ -40,22 +41,65 @@
 #include "util/net/url.h"
 #include "util/stdlib/map_insert.h"
 
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
 #include "handler/mac/file_limit_annotation.h"
-#endif  // OS_APPLE
+#endif  // BUILDFLAG(IS_APPLE)
+
+#if BUILDFLAG(IS_IOS)
+#include "util/ios/scoped_background_task.h"
+#endif  // BUILDFLAG(IS_IOS)
 
 namespace crashpad {
 
-CrashReportUploadThread::CrashReportUploadThread(CrashReportDatabase* database,
-                                                 const std::string& url,
-                                                 const Options& options)
+namespace {
+
+// The number of seconds to wait between checking for pending reports.
+const int kRetryWorkIntervalSeconds = 15 * 60;
+
+#if BUILDFLAG(IS_IOS)
+// The number of times to attempt to upload a pending report, repeated on
+// failure. Attempts will happen once per launch, once per call to
+// ReportPending(), and, if Options.watch_pending_reports is true, once every
+// kRetryWorkIntervalSeconds. Currently iOS only.
+const int kRetryAttempts = 5;
+#endif
+
+// Wraps a reference to a no-args function (which can be empty). When this
+// object goes out of scope, invokes the function if it is non-empty.
+//
+// The lifetime of the function must outlive the lifetime of this object.
+class ScopedFunctionInvoker final {
+ public:
+  ScopedFunctionInvoker(const std::function<void()>& function)
+      : function_(function) {}
+  ScopedFunctionInvoker(const ScopedFunctionInvoker&) = delete;
+  ScopedFunctionInvoker& operator=(const ScopedFunctionInvoker&) = delete;
+
+  ~ScopedFunctionInvoker() {
+    if (function_) {
+      function_();
+    }
+  }
+
+ private:
+  const std::function<void()>& function_;
+};
+
+}  // namespace
+
+CrashReportUploadThread::CrashReportUploadThread(
+    CrashReportDatabase* database,
+    const std::string& url,
+    const Options& options,
+    ProcessPendingReportsObservationCallback callback)
     : options_(options),
+      callback_(callback),
       url_(url),
       // When watching for pending reports, check every 15 minutes, even in the
       // absence of a signal from the handler thread. This allows for failed
       // uploads to be retried periodically, and for pending reports written by
       // other processes to be recognized.
-      thread_(options.watch_pending_reports ? 15 * 60.0
+      thread_(options.watch_pending_reports ? kRetryWorkIntervalSeconds
                                             : WorkerThread::kIndefiniteWait,
               this),
       known_pending_report_uuids_(),
@@ -68,7 +112,8 @@ CrashReportUploadThread::~CrashReportUploadThread() {
 
 void CrashReportUploadThread::ReportPending(const UUID& report_uuid) {
   known_pending_report_uuids_.PushBack(report_uuid);
-  thread_.DoWorkNow();
+  if (thread_.is_running())
+    thread_.DoWorkNow();
 }
 
 void CrashReportUploadThread::Start() {
@@ -81,6 +126,14 @@ void CrashReportUploadThread::Stop() {
 }
 
 void CrashReportUploadThread::ProcessPendingReports() {
+#if BUILDFLAG(IS_IOS)
+  internal::ScopedBackgroundTask scoper("CrashReportUploadThread");
+#endif  // BUILDFLAG(IS_IOS)
+
+  // If callback_ is non-empty, invoke it when this function returns after
+  // uploads complete (regardless of whether or not that succeeded).
+  ScopedFunctionInvoker scoped_function_invoker(callback_);
+
   std::vector<UUID> known_report_uuids = known_pending_report_uuids_.Drain();
   for (const UUID& report_uuid : known_report_uuids) {
     CrashReportDatabase::Report report;
@@ -136,9 +189,9 @@ void CrashReportUploadThread::ProcessPendingReports() {
 
 void CrashReportUploadThread::ProcessPendingReport(
     const CrashReportDatabase::Report& report) {
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
   RecordFileLimitAnnotation();
-#endif  // OS_APPLE
+#endif  // BUILDFLAG(IS_APPLE)
 
   Settings* const settings = database_->GetSettings();
 
@@ -153,45 +206,13 @@ void CrashReportUploadThread::ProcessPendingReport(
     return;
   }
 
-  // This currently implements very simplistic rate-limiting, compatible with
-  // the Breakpad client, where the strategy is to permit one upload attempt per
-  // hour, and retire reports that would exceed this limit or for which the
-  // upload fails on the first attempt.
-  //
-  // If upload was requested explicitly (i.e. by user action), we do not
-  // throttle the upload.
-  //
-  // TODO(mark): Provide a proper rate-limiting strategy and allow for failed
-  // upload attempts to be retried.
-  if (!report.upload_explicitly_requested && options_.rate_limit) {
-    time_t last_upload_attempt_time;
-    if (settings->GetLastUploadAttemptTime(&last_upload_attempt_time)) {
-      time_t now = time(nullptr);
-      if (now >= last_upload_attempt_time) {
-        // If the most recent upload attempt occurred within the past hour,
-        // don’t attempt to upload the new report. If it happened longer ago,
-        // attempt to upload the report.
-        constexpr int kUploadAttemptIntervalSeconds = 60 * 60;  // 1 hour
-        if (now - last_upload_attempt_time < kUploadAttemptIntervalSeconds) {
-          database_->SkipReportUpload(
-              report.uuid, Metrics::CrashSkippedReason::kUploadThrottled);
-          return;
-        }
-      } else {
-        // The most recent upload attempt purportedly occurred in the future. If
-        // it “happened” at least one day in the future, assume that the last
-        // upload attempt time is bogus, and attempt to upload the report. If
-        // the most recent upload time is in the future but within one day,
-        // accept it and don’t attempt to upload the report.
-        constexpr int kBackwardsClockTolerance = 60 * 60 * 24;  // 1 day
-        if (last_upload_attempt_time - now < kBackwardsClockTolerance) {
-          database_->SkipReportUpload(
-              report.uuid, Metrics::CrashSkippedReason::kUnexpectedTime);
-          return;
-        }
-      }
-    }
-  }
+  if (ShouldRateLimitUpload(report))
+    return;
+
+#if BUILDFLAG(IS_IOS)
+  if (ShouldRateLimitRetry(report))
+    return;
+#endif  // BUILDFLAG(IS_IOS)
 
   std::unique_ptr<const CrashReportDatabase::UploadReport> upload_report;
   CrashReportDatabase::OperationStatus status =
@@ -217,7 +238,6 @@ void CrashReportUploadThread::ProcessPendingReport(
 
     case CrashReportDatabase::kCannotRequestUpload:
       NOTREACHED();
-      return;
   }
 
   std::string response_body;
@@ -233,6 +253,19 @@ void CrashReportUploadThread::ProcessPendingReport(
           report.uuid, Metrics::CrashSkippedReason::kPrepareForUploadFailed);
       break;
     case UploadResult::kRetry:
+#if BUILDFLAG(IS_IOS)
+      if (upload_report->upload_attempts > kRetryAttempts) {
+        upload_report.reset();
+        database_->SkipReportUpload(report.uuid,
+                                    Metrics::CrashSkippedReason::kUploadFailed);
+      } else {
+        Metrics::CrashUploadSkipped(
+            Metrics::CrashSkippedReason::kUploadFailedButCanRetry);
+        retry_uuid_time_map_[report.uuid] =
+            time(nullptr) +
+            (1 << upload_report->upload_attempts) * kRetryWorkIntervalSeconds;
+      }
+#else
       upload_report.reset();
 
       // TODO(mark): Deal with retries properly: don’t call SkipReportUplaod()
@@ -240,6 +273,7 @@ void CrashReportUploadThread::ProcessPendingReport(
       // too many times.
       database_->SkipReportUpload(report.uuid,
                                   Metrics::CrashSkippedReason::kUploadFailed);
+#endif
       break;
   }
 }
@@ -305,7 +339,7 @@ CrashReportUploadThread::UploadResult CrashReportUploadThread::UploadReport(
   }
   http_transport->SetBodyStream(http_multipart_builder.GetBodyStream());
   // TODO(mark): The timeout should be configurable by the client.
-  http_transport->SetTimeout(60.0);  // 1 minute.
+  http_transport->SetTimeout(internal::kUploadReportTimeoutSeconds);
 
   std::string url = url_;
   if (options_.identify_client_via_url) {
@@ -343,4 +377,39 @@ void CrashReportUploadThread::DoWork(const WorkerThread* thread) {
   ProcessPendingReports();
 }
 
+bool CrashReportUploadThread::ShouldRateLimitUpload(
+    const CrashReportDatabase::Report& report) {
+  if (report.upload_explicitly_requested || !options_.rate_limit)
+    return false;
+
+  Settings* const settings = database_->GetSettings();
+  time_t last_upload_attempt_time;
+  if (settings->GetLastUploadAttemptTime(&last_upload_attempt_time)) {
+    const time_t now = time(nullptr);
+    constexpr int kUploadAttemptIntervalSeconds = 60 * 60;  // 1 hour
+    const auto should_rate_limit = ShouldRateLimit(
+        now, last_upload_attempt_time, kUploadAttemptIntervalSeconds);
+    if (should_rate_limit.skip_reason.has_value()) {
+      database_->SkipReportUpload(report.uuid, *should_rate_limit.skip_reason);
+      return true;
+    }
+  }
+  return false;
+}
+
+#if BUILDFLAG(IS_IOS)
+bool CrashReportUploadThread::ShouldRateLimitRetry(
+    const CrashReportDatabase::Report& report) {
+  if (retry_uuid_time_map_.find(report.uuid) != retry_uuid_time_map_.end()) {
+    time_t now = time(nullptr);
+    if (now < retry_uuid_time_map_[report.uuid]) {
+      return true;
+    } else {
+      retry_uuid_time_map_.erase(report.uuid);
+    }
+  }
+  return false;
+}
+#endif
+
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/handler/crash_report_upload_thread.h b/extern/crashpad/crashpad/handler/crash_report_upload_thread.h
index 1a88a087b5..22bb26e318 100644
--- a/extern/crashpad/crashpad/handler/crash_report_upload_thread.h
+++ b/extern/crashpad/crashpad/handler/crash_report_upload_thread.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,9 +15,12 @@
 #ifndef CRASHPAD_HANDLER_CRASH_REPORT_UPLOAD_THREAD_H_
 #define CRASHPAD_HANDLER_CRASH_REPORT_UPLOAD_THREAD_H_
 
+#include <functional>
 #include <memory>
 #include <string>
+#include <unordered_map>
 
+#include "build/build_config.h"
 #include "client/crash_report_database.h"
 #include "util/misc/uuid.h"
 #include "util/stdlib/thread_safe_vector.h"
@@ -61,14 +64,30 @@ class CrashReportUploadThread : public WorkerThread::Delegate,
     bool watch_pending_reports;
   };
 
+  //! \brief Observation callback invoked each time the in-process handler
+  //!     finishes processing and attempting to upload on-disk crash reports
+  //!     (whether or not the uploads succeeded).
+  //!
+  //! This callback is copied into this object. Any references or pointers
+  //! inside must outlive this object.
+  //!
+  //! The callback might be invoked on a background thread, so clients must
+  //! synchronize appropriately.
+  using ProcessPendingReportsObservationCallback = std::function<void()>;
+
   //! \brief Constructs a new object.
   //!
   //! \param[in] database The database to upload crash reports from.
   //! \param[in] url The URL of the server to upload crash reports to.
   //! \param[in] options Options for the report uploads.
+  //! \param[in] callback Optional callback invoked zero or more times
+  //!     on a background thread each time the this object finishes
+  //!     processing and attempting to upload on-disk crash reports.
+  //!     If this callback is empty, it is not invoked.
   CrashReportUploadThread(CrashReportDatabase* database,
                           const std::string& url,
-                          const Options& options);
+                          const Options& options,
+                          ProcessPendingReportsObservationCallback callback);
 
   CrashReportUploadThread(const CrashReportUploadThread&) = delete;
   CrashReportUploadThread& operator=(const CrashReportUploadThread&) = delete;
@@ -106,6 +125,9 @@ class CrashReportUploadThread : public WorkerThread::Delegate,
   //! It is expected to only be called from the same thread that called Start().
   void Stop() override;
 
+  //! \return `true` if the thread is running, `false` if it is not.
+  bool is_running() const { return thread_.is_running(); }
+
  private:
   //! \brief The result code from UploadReport().
   enum class UploadResult {
@@ -170,10 +192,46 @@ class CrashReportUploadThread : public WorkerThread::Delegate,
   //!     been called on any thread, as well as periodically on a timer.
   void DoWork(const WorkerThread* thread) override;
 
+  //! \brief Rate-limit uploads.
+  //!
+  //! \param[in] report The crash report to process.
+  //!
+  //! This currently implements very simplistic rate-limiting, compatible with
+  //! the Breakpad client, where the strategy is to permit one upload attempt
+  //! per hour, and retire reports that would exceed this limit or for which the
+  //! upload fails on the first attempt.
+  //! If upload was requested explicitly (i.e. by user action), do not throttle
+  //! the upload.
+  //!
+  //! TODO(mark): Provide a proper rate-limiting strategy and allow for failed
+  //! upload attempts to be retried.
+  bool ShouldRateLimitUpload(const CrashReportDatabase::Report& report);
+
+#if BUILDFLAG(IS_IOS)
+  //! \brief Rate-limit report retries.
+  //!
+  //! \param[in] report The crash report to process.
+  //!
+  //! This implements a per-report retry rate limit (as opposed to per upload
+  //! rate limit in ShouldRateLimitUpload). When a report upload ends in a retry
+  //! state, an in-memory only timestamp is stored in |retry_uuid_time_map_|
+  //! with the next possible retry time. This timestamp is a backoff from the
+  //! main thread work interval, doubling on each attemt. Because this is only
+  //! stored in memory, on restart reports in the retry state will always be
+  //! tried once, and then fall back into the next backoff. This continues until
+  //! kRetryAttempts is reached.
+  bool ShouldRateLimitRetry(const CrashReportDatabase::Report& report);
+#endif
+
   const Options options_;
+  const ProcessPendingReportsObservationCallback callback_;
   const std::string url_;
   WorkerThread thread_;
   ThreadSafeVector<UUID> known_pending_report_uuids_;
+#if BUILDFLAG(IS_IOS)
+  // This is not thread-safe, and only used by the worker thread.
+  std::map<UUID, time_t> retry_uuid_time_map_;
+#endif
   CrashReportDatabase* database_;  // weak
 };
 
diff --git a/extern/crashpad/crashpad/handler/crashpad_handler.md b/extern/crashpad/crashpad/handler/crashpad_handler.md
index 6d055ed175..3e722bad5f 100644
--- a/extern/crashpad/crashpad/handler/crashpad_handler.md
+++ b/extern/crashpad/crashpad/handler/crashpad_handler.md
@@ -1,5 +1,5 @@
 <!--
-Copyright 2014 The Crashpad Authors. All rights reserved.
+Copyright 2014 The Crashpad Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -83,7 +83,7 @@ closed.
 It is not normally appropriate to invoke this program directly. Usually, it will
 be invoked by a Crashpad client using the Crashpad client library, or started by
 another system service. On macOS, arbitrary programs may be run with a Crashpad
-handler by using [run_with_crashpad(1)](../tools/mac/run_with_crashpad.md) to
+handler by using [run_with_crashpad(1)](../tools/run_with_crashpad.md) to
 establish the Crashpad client environment before running a program.
 
 ## Options
@@ -321,7 +321,7 @@ establish the Crashpad client environment before running a program.
 [catch_exception_tool(1)](../tools/mac/catch_exception_tool.md),
 [crashpad_database_util(1)](../tools/crashpad_database_util.md),
 [generate_dump(1)](../tools/generate_dump.md),
-[run_with_crashpad(1)](../tools/mac/run_with_crashpad.md)
+[run_with_crashpad(1)](../tools/run_with_crashpad.md)
 
 ## Resources
 
@@ -332,7 +332,7 @@ Report bugs at https://crashpad.chromium.org/bug/new.
 ## Copyright
 
 Copyright 2014 [The Crashpad
-Authors](https://chromium.googlesource.com/crashpad/crashpad/+/master/AUTHORS).
+Authors](https://chromium.googlesource.com/crashpad/crashpad/+/main/AUTHORS).
 
 ## License
 
diff --git a/extern/crashpad/crashpad/handler/crashpad_handler_main.cc b/extern/crashpad/crashpad/handler/crashpad_handler_main.cc
index b47488ef76..6c17a1d199 100644
--- a/extern/crashpad/crashpad/handler/crashpad_handler_main.cc
+++ b/extern/crashpad/crashpad/handler/crashpad_handler_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/handler/crashpad_handler_test.cc b/extern/crashpad/crashpad/handler/crashpad_handler_test.cc
index 70e5da927c..5600c04bc4 100644
--- a/extern/crashpad/crashpad/handler/crashpad_handler_test.cc
+++ b/extern/crashpad/crashpad/handler/crashpad_handler_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/handler/crashpad_handler_test_extended_handler.cc b/extern/crashpad/crashpad/handler/crashpad_handler_test_extended_handler.cc
index 4abcacd50f..32e462edaf 100644
--- a/extern/crashpad/crashpad/handler/crashpad_handler_test_extended_handler.cc
+++ b/extern/crashpad/crashpad/handler/crashpad_handler_test_extended_handler.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 #include "minidump/test/minidump_user_extension_stream_util.h"
 #include "tools/tool_support.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include <windows.h>
 #endif
 
@@ -55,16 +55,16 @@ int ExtendedHandlerMain(int argc, char* argv[]) {
 
 }  // namespace
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 
 int main(int argc, char* argv[]) {
   return ExtendedHandlerMain(argc, argv);
 }
 
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 
 int wmain(int argc, wchar_t* argv[]) {
   return crashpad::ToolSupport::Wmain(argc, argv, &ExtendedHandlerMain);
 }
 
-#endif  // OS_POSIX
+#endif  // BUILDFLAG(IS_POSIX)
diff --git a/extern/crashpad/crashpad/handler/handler_main.cc b/extern/crashpad/crashpad/handler/handler_main.cc
index 5733463bed..7a0607991a 100644
--- a/extern/crashpad/crashpad/handler/handler_main.cc
+++ b/extern/crashpad/crashpad/handler/handler_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 #include <sys/types.h>
 
 #include <algorithm>
+#include <atomic>
 #include <map>
 #include <memory>
 #include <string>
@@ -28,7 +29,6 @@
 #include <vector>
 
 #include "base/auto_reset.h"
-#include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_file.h"
 #include "base/logging.h"
@@ -38,7 +38,6 @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
-#include "build/chromeos_buildflags.h"
 #include "client/crash_report_database.h"
 #include "client/crashpad_client.h"
 #include "client/crashpad_info.h"
@@ -57,21 +56,21 @@
 #include "util/string/split_string.h"
 #include "util/synchronization/semaphore.h"
 
-#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#if BUILDFLAG(IS_CHROMEOS)
 #include "handler/linux/cros_crash_report_exception_handler.h"
 #endif
 
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
 #include <unistd.h>
 
 #include "handler/linux/crash_report_exception_handler.h"
 #include "handler/linux/exception_handler_server.h"
 #include "util/posix/signals.h"
-#elif defined(OS_APPLE)
+#elif BUILDFLAG(IS_APPLE)
 #include <libgen.h>
 #include <signal.h>
 
-#include "base/mac/scoped_mach_port.h"
+#include "base/apple/scoped_mach_port.h"
 #include "handler/mac/crash_report_exception_handler.h"
 #include "handler/mac/exception_handler_server.h"
 #include "handler/mac/file_limit_annotation.h"
@@ -79,7 +78,7 @@
 #include "util/mach/child_port_handshake.h"
 #include "util/posix/close_stdio.h"
 #include "util/posix/signals.h"
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 #include <windows.h>
 
 #include "handler/win/crash_report_exception_handler.h"
@@ -87,32 +86,42 @@
 #include "util/win/handle.h"
 #include "util/win/initial_client_data.h"
 #include "util/win/session_end_watcher.h"
-#endif  // OS_APPLE
+#endif  // BUILDFLAG(IS_APPLE)
 
 namespace crashpad {
 
 namespace {
 
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
-    defined(OS_ANDROID)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC)
 #define ATTACHMENTS_SUPPORTED 1
-#endif  // OS_WIN || OS_LINUX || OS_CHROMEOS || OS_ANDROID
+#endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
+        // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC)
 
 void Usage(const base::FilePath& me) {
+  // clang-format off
   fprintf(stderr,
 "Usage: %" PRFilePath " [OPTION]...\n"
 "Crashpad's exception handler server.\n"
 "\n"
 "      --annotation=KEY=VALUE  set a process annotation in each crash report\n"
+  // clang-format on
 #if defined(ATTACHMENTS_SUPPORTED)
+      // clang-format off
 "      --attachment=FILE_PATH  attach specified file to each crash report\n"
 "                              at the time of the crash\n"
+  // clang-format on
 #endif  // ATTACHMENTS_SUPPORTED
+      // clang-format off
 "      --database=PATH         store the crash report database at PATH\n"
-#if defined(OS_APPLE)
+  // clang-format on
+#if BUILDFLAG(IS_APPLE)
+      // clang-format off
 "      --handshake-fd=FD       establish communication with the client over FD\n"
-#endif  // OS_APPLE
-#if defined(OS_WIN)
+  // clang-format on
+#endif  // BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+      // clang-format off
 "      --initial-client-data=HANDLE_request_crash_dump,\n"
 "                            HANDLE_request_non_crash_dump,\n"
 "                            HANDLE_non_crash_dump_completed,\n"
@@ -122,13 +131,20 @@ void Usage(const base::FilePath& me) {
 "                            Address_non_crash_exception_information,\n"
 "                            Address_debug_critical_section\n"
 "                              use precreated data to register initial client\n"
-#endif  // OS_WIN
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+  // clang-format on
+#endif  // BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+      // clang-format off
 "      --initial-client-fd=FD  a socket connected to a client.\n"
-#endif  // OS_ANDROID || OS_LINUX || OS_CHROMEOS
-#if defined(OS_APPLE)
+  // clang-format on
+#endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ||
+        // BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_APPLE)
+      // clang-format off
 "      --mach-service=SERVICE  register SERVICE with the bootstrap server\n"
-#endif  // OS_APPLE
+  // clang-format on
+#endif  // BUILDFLAG(IS_APPLE)
+      // clang-format off
 "      --metrics-dir=DIR       store metrics files in DIR (only in Chromium)\n"
 "      --monitor-self          run a second handler to catch crashes in the first\n"
 "      --monitor-self-annotation=KEY=VALUE\n"
@@ -141,18 +157,26 @@ void Usage(const base::FilePath& me) {
 "      --no-periodic-tasks     don't scan for new reports or prune the database\n"
 "      --no-rate-limit         don't rate limit crash uploads\n"
 "      --no-upload-gzip        don't use gzip compression when uploading\n"
-#if defined(OS_ANDROID)
+  // clang-format on
+#if BUILDFLAG(IS_ANDROID)
+      // clang-format off
 "      --no-write-minidump-to-database\n"
 "                              don't write minidump to database\n"
-#endif  // OS_ANDROID
-#if defined(OS_WIN)
+  // clang-format on
+#endif  // BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_WIN)
+      // clang-format off
 "      --pipe-name=PIPE        communicate with the client over PIPE\n"
-#endif  // OS_WIN
-#if defined(OS_APPLE)
+  // clang-format on
+#endif  // BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_APPLE)
+      // clang-format off
 "      --reset-own-crash-exception-port-to-system-default\n"
 "                              reset the server's exception handler to default\n"
-#endif  // OS_APPLE
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+  // clang-format on
+#endif  // BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
+      // clang-format off
 "      --sanitization-information=SANITIZATION_INFORMATION_ADDRESS\n"
 "                              the address of a SanitizationInformation struct.\n"
 "      --shared-client-connection the file descriptor provided by\n"
@@ -160,10 +184,15 @@ void Usage(const base::FilePath& me) {
 "                              clients\n"
 "      --trace-parent-with-exception=EXCEPTION_INFORMATION_ADDRESS\n"
 "                              request a dump for the handler's parent process\n"
-#endif  // OS_LINUX || OS_CHROMEOS || OS_ANDROID
+  // clang-format on
+#endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
+        // BUILDFLAG(IS_ANDROID)
+      // clang-format off
 "      --url=URL               send crash reports to this Breakpad server URL,\n"
 "                              only if uploads are enabled for the database\n"
-#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
+  // clang-format on
+#if BUILDFLAG(IS_CHROMEOS)
+      // clang-format off
 "      --use-cros-crash-reporter\n"
 "                              pass crash reports to /sbin/crash_reporter\n"
 "                              instead of storing them in the database\n"
@@ -174,13 +203,18 @@ void Usage(const base::FilePath& me) {
 "                              pass the --always_allow_feedback flag to\n"
 "                              crash_reporter, thus skipping metrics consent\n"
 "                              checks\n"
-#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
-#if defined(OS_ANDROID)
+  // clang-format on
+#endif  // BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_ANDROID)
+      // clang-format off
 "      --write-minidump-to-log write minidump to log\n"
-#endif  // OS_ANDROID
+  // clang-format on
+#endif  // BUILDFLAG(IS_ANDROID)
+      // clang-format off
 "      --help                  display this help and exit\n"
 "      --version               output version information and exit\n",
           me.value().c_str());
+  // clang-format on
   ToolSupport::UsageTail(me);
 }
 
@@ -191,33 +225,33 @@ struct Options {
   base::FilePath database;
   base::FilePath metrics_dir;
   std::vector<std::string> monitor_self_arguments;
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
   std::string mach_service;
   int handshake_fd;
   bool reset_own_crash_exception_port_to_system_default;
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
   VMAddress exception_information_address;
   VMAddress sanitization_information_address;
   int initial_client_fd;
   bool shared_client_connection;
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
   bool write_minidump_to_log;
   bool write_minidump_to_database;
-#endif  // OS_ANDROID
-#elif defined(OS_WIN)
+#endif  // BUILDFLAG(IS_ANDROID)
+#elif BUILDFLAG(IS_WIN)
   std::string pipe_name;
   InitialClientData initial_client_data;
-#endif  // OS_APPLE
+#endif  // BUILDFLAG(IS_APPLE)
   bool identify_client_via_url;
   bool monitor_self;
   bool periodic_tasks;
   bool rate_limit;
   bool upload_gzip;
-#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#if BUILDFLAG(IS_CHROMEOS)
   bool use_cros_crash_reporter = false;
   base::FilePath minidump_dir_for_tests;
   bool always_allow_feedback = false;
-#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#endif  // BUILDFLAG(IS_CHROMEOS)
 #if defined(ATTACHMENTS_SUPPORTED)
   std::vector<base::FilePath> attachments;
 #endif  // ATTACHMENTS_SUPPORTED
@@ -252,11 +286,15 @@ bool AddKeyValueToMap(std::map<std::string, std::string>* map,
 // a normal exit, or if a CallMetricsRecordNormalExit object is destroyed after
 // something else logs an exit event.
 void MetricsRecordExit(Metrics::LifetimeMilestone milestone) {
-  static bool once = [](Metrics::LifetimeMilestone milestone) {
+#if !defined(__cpp_lib_atomic_value_initialization) || \
+    __cpp_lib_atomic_value_initialization < 201911L
+  static std::atomic_flag metrics_exit_recorded = ATOMIC_FLAG_INIT;
+#else
+  static std::atomic_flag metrics_exit_recorded;
+#endif
+  if (!metrics_exit_recorded.test_and_set()) {
     Metrics::HandlerLifetimeMilestone(milestone);
-    return true;
-  }(milestone);
-  ALLOW_UNUSED_LOCAL(once);
+  }
 }
 
 // Calls MetricsRecordExit() to record a failure, and returns EXIT_FAILURE for
@@ -280,8 +318,8 @@ class CallMetricsRecordNormalExit {
   }
 };
 
-#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
-  defined(OS_ANDROID)
+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+    BUILDFLAG(IS_ANDROID)
 
 void HandleCrashSignal(int sig, siginfo_t* siginfo, void* context) {
   MetricsRecordExit(Metrics::LifetimeMilestone::kCrashed);
@@ -341,7 +379,7 @@ void InstallCrashHandler() {
   Signals::InstallTerminateHandlers(HandleTerminateSignal, 0, nullptr);
 }
 
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
 
 struct ResetSIGTERMTraits {
   static struct sigaction* InvalidValue() {
@@ -367,9 +405,9 @@ void HandleSIGTERM(int sig, siginfo_t* siginfo, void* context) {
   g_exception_handler_server->Stop();
 }
 
-#endif  // OS_APPLE
+#endif  // BUILDFLAG(IS_APPLE)
 
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 
 LONG(WINAPI* g_original_exception_filter)(EXCEPTION_POINTERS*) = nullptr;
 
@@ -422,11 +460,11 @@ void InstallCrashHandler() {
   // enough. Note that destroying the TerminateHandler would wait for its thread
   // to exit, which isn’t necessary or desirable.
   SetConsoleCtrlHandler(ConsoleHandler, true);
-  static TerminateHandler* terminate_handler = new TerminateHandler();
-  ALLOW_UNUSED_LOCAL(terminate_handler);
+  [[maybe_unused]] static TerminateHandler* terminate_handler =
+      new TerminateHandler();
 }
 
-#endif  // OS_APPLE
+#endif  // BUILDFLAG(IS_APPLE)
 
 void MonitorSelf(const Options& options) {
   base::FilePath executable_path;
@@ -462,7 +500,7 @@ void MonitorSelf(const Options& options) {
   // instance of crashpad_handler to be writing metrics at a time, and it should
   // be the primary instance.
   CrashpadClient crashpad_client;
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
   if (!crashpad_client.StartHandlerAtCrash(executable_path,
                                            options.database,
                                            base::FilePath(),
@@ -512,10 +550,10 @@ class ScopedStoppable {
 
 void InitCrashpadLogging() {
   logging::LoggingSettings settings;
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS)
   settings.logging_dest = logging::LOG_TO_FILE;
   settings.log_file_path = "/var/log/chrome/chrome";
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
 #else
   settings.logging_dest =
@@ -542,23 +580,23 @@ int HandlerMain(int argc,
     // Long options without short equivalents.
     kOptionLastChar = 255,
     kOptionAnnotation,
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
-    defined(OS_ANDROID)
+#if defined(ATTACHMENTS_SUPPORTED)
     kOptionAttachment,
-#endif  // OS_WIN || OS_LINUX
+#endif  // defined(ATTACHMENTS_SUPPORTED)
     kOptionDatabase,
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
     kOptionHandshakeFD,
-#endif  // OS_APPLE
-#if defined(OS_WIN)
+#endif  // BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
     kOptionInitialClientData,
-#endif  // OS_WIN
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+#endif  // BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
     kOptionInitialClientFD,
-#endif  // OS_ANDROID || OS_LINUX || OS_CHROMEOS
-#if defined(OS_APPLE)
+#endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ||
+        // BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_APPLE)
     kOptionMachService,
-#endif  // OS_APPLE
+#endif  // BUILDFLAG(IS_APPLE)
     kOptionMetrics,
     kOptionMonitorSelf,
     kOptionMonitorSelfAnnotation,
@@ -567,29 +605,29 @@ int HandlerMain(int argc,
     kOptionNoPeriodicTasks,
     kOptionNoRateLimit,
     kOptionNoUploadGzip,
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
     kOptionNoWriteMinidumpToDatabase,
-#endif  // OS_ANDROID
-#if defined(OS_WIN)
+#endif  // BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_WIN)
     kOptionPipeName,
-#endif  // OS_WIN
-#if defined(OS_APPLE)
+#endif  // BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_APPLE)
     kOptionResetOwnCrashExceptionPortToSystemDefault,
-#endif  // OS_APPLE
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#endif  // BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
     kOptionSanitizationInformation,
     kOptionSharedClientConnection,
     kOptionTraceParentWithException,
 #endif
     kOptionURL,
-#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#if BUILDFLAG(IS_CHROMEOS)
     kOptionUseCrosCrashReporter,
     kOptionMinidumpDirForTests,
     kOptionAlwaysAllowFeedback,
-#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
-#if defined(OS_ANDROID)
+#endif  // BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_ANDROID)
     kOptionWriteMinidumpToLog,
-#endif  // OS_ANDROID
+#endif  // BUILDFLAG(IS_ANDROID)
 
     // Standard options.
     kOptionHelp = -2,
@@ -602,21 +640,22 @@ int HandlerMain(int argc,
     {"attachment", required_argument, nullptr, kOptionAttachment},
 #endif  // ATTACHMENTS_SUPPORTED
     {"database", required_argument, nullptr, kOptionDatabase},
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
     {"handshake-fd", required_argument, nullptr, kOptionHandshakeFD},
-#endif  // OS_APPLE
-#if defined(OS_WIN)
+#endif  // BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
     {"initial-client-data",
      required_argument,
      nullptr,
      kOptionInitialClientData},
-#endif  // OS_APPLE
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+#endif  // BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
     {"initial-client-fd", required_argument, nullptr, kOptionInitialClientFD},
-#endif  // OS_ANDROID || OS_LINUX || OS_CHROMEOS
-#if defined(OS_APPLE)
+#endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ||
+        // BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_APPLE)
     {"mach-service", required_argument, nullptr, kOptionMachService},
-#endif  // OS_APPLE
+#endif  // BUILDFLAG(IS_APPLE)
     {"metrics-dir", required_argument, nullptr, kOptionMetrics},
     {"monitor-self", no_argument, nullptr, kOptionMonitorSelf},
     {"monitor-self-annotation",
@@ -634,22 +673,22 @@ int HandlerMain(int argc,
     {"no-periodic-tasks", no_argument, nullptr, kOptionNoPeriodicTasks},
     {"no-rate-limit", no_argument, nullptr, kOptionNoRateLimit},
     {"no-upload-gzip", no_argument, nullptr, kOptionNoUploadGzip},
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
     {"no-write-minidump-to-database",
      no_argument,
      nullptr,
      kOptionNoWriteMinidumpToDatabase},
-#endif  // OS_ANDROID
-#if defined(OS_WIN)
+#endif  // BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_WIN)
     {"pipe-name", required_argument, nullptr, kOptionPipeName},
-#endif  // OS_WIN
-#if defined(OS_APPLE)
+#endif  // BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_APPLE)
     {"reset-own-crash-exception-port-to-system-default",
      no_argument,
      nullptr,
      kOptionResetOwnCrashExceptionPortToSystemDefault},
-#endif  // OS_APPLE
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#endif  // BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
     {"sanitization-information",
      required_argument,
      nullptr,
@@ -662,42 +701,40 @@ int HandlerMain(int argc,
      required_argument,
      nullptr,
      kOptionTraceParentWithException},
-#endif  // OS_LINUX || OS_CHROMEOS || OS_ANDROID
+#endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
+        // BUILDFLAG(IS_ANDROID)
     {"url", required_argument, nullptr, kOptionURL},
-#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#if BUILDFLAG(IS_CHROMEOS)
     {"use-cros-crash-reporter",
-      no_argument,
-      nullptr,
-      kOptionUseCrosCrashReporter},
+     no_argument,
+     nullptr,
+     kOptionUseCrosCrashReporter},
     {"minidump-dir-for-tests",
-      required_argument,
-      nullptr,
-      kOptionMinidumpDirForTests},
-    {"always-allow-feedback",
-      no_argument,
-      nullptr,
-      kOptionAlwaysAllowFeedback},
-#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
-#if defined(OS_ANDROID)
+     required_argument,
+     nullptr,
+     kOptionMinidumpDirForTests},
+    {"always-allow-feedback", no_argument, nullptr, kOptionAlwaysAllowFeedback},
+#endif  // BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_ANDROID)
     {"write-minidump-to-log", no_argument, nullptr, kOptionWriteMinidumpToLog},
-#endif  // OS_ANDROID
+#endif  // BUILDFLAG(IS_ANDROID)
     {"help", no_argument, nullptr, kOptionHelp},
     {"version", no_argument, nullptr, kOptionVersion},
     {nullptr, 0, nullptr, 0},
   };
 
   Options options = {};
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
   options.handshake_fd = -1;
 #endif
   options.identify_client_via_url = true;
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
   options.initial_client_fd = kInvalidFileHandle;
 #endif
   options.periodic_tasks = true;
   options.rate_limit = true;
   options.upload_gzip = true;
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
   options.write_minidump_to_database = true;
 #endif
 
@@ -722,7 +759,7 @@ int HandlerMain(int argc,
             ToolSupport::CommandLineArgumentToFilePathStringType(optarg));
         break;
       }
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
       case kOptionHandshakeFD: {
         if (!StringToNumber(optarg, &options.handshake_fd) ||
             options.handshake_fd < 0) {
@@ -736,8 +773,8 @@ int HandlerMain(int argc,
         options.mach_service = optarg;
         break;
       }
-#endif  // OS_APPLE
-#if defined(OS_WIN)
+#endif  // BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
       case kOptionInitialClientData: {
         if (!options.initial_client_data.InitializeFromString(optarg)) {
           ToolSupport::UsageHint(
@@ -746,8 +783,8 @@ int HandlerMain(int argc,
         }
         break;
       }
-#endif  // OS_WIN
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+#endif  // BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
       case kOptionInitialClientFD: {
         if (!base::StringToInt(optarg, &options.initial_client_fd)) {
           ToolSupport::UsageHint(me, "failed to parse --initial-client-fd");
@@ -755,7 +792,8 @@ int HandlerMain(int argc,
         }
         break;
       }
-#endif  // OS_ANDROID || OS_LINUX || OS_CHROMEOS
+#endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ||
+        // BUILDFLAG(IS_CHROMEOS)
       case kOptionMetrics: {
         options.metrics_dir = base::FilePath(
             ToolSupport::CommandLineArgumentToFilePathStringType(optarg));
@@ -793,25 +831,25 @@ int HandlerMain(int argc,
         options.upload_gzip = false;
         break;
       }
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
       case kOptionNoWriteMinidumpToDatabase: {
         options.write_minidump_to_database = false;
         break;
       }
-#endif  // OS_ANDROID
-#if defined(OS_WIN)
+#endif  // BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_WIN)
       case kOptionPipeName: {
         options.pipe_name = optarg;
         break;
       }
-#endif  // OS_WIN
-#if defined(OS_APPLE)
+#endif  // BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_APPLE)
       case kOptionResetOwnCrashExceptionPortToSystemDefault: {
         options.reset_own_crash_exception_port_to_system_default = true;
         break;
       }
-#endif  // OS_APPLE
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#endif  // BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
       case kOptionSanitizationInformation: {
         if (!StringToNumber(optarg,
                             &options.sanitization_information_address)) {
@@ -833,12 +871,13 @@ int HandlerMain(int argc,
         }
         break;
       }
-#endif  // OS_LINUX || OS_CHROMEOS || OS_ANDROID
+#endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
+        // BUILDFLAG(IS_ANDROID)
       case kOptionURL: {
         options.url = optarg;
         break;
       }
-#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#if BUILDFLAG(IS_CHROMEOS)
       case kOptionUseCrosCrashReporter: {
         options.use_cros_crash_reporter = true;
         break;
@@ -852,13 +891,13 @@ int HandlerMain(int argc,
         options.always_allow_feedback = true;
         break;
       }
-#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
-#if defined(OS_ANDROID)
+#endif  // BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_ANDROID)
       case kOptionWriteMinidumpToLog: {
         options.write_minidump_to_log = true;
         break;
       }
-#endif  // OS_ANDROID
+#endif  // BUILDFLAG(IS_ANDROID)
       case kOptionHelp: {
         Usage(me);
         MetricsRecordExit(Metrics::LifetimeMilestone::kExitedEarly);
@@ -878,7 +917,7 @@ int HandlerMain(int argc,
   argc -= optind;
   argv += optind;
 
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
   if (options.handshake_fd < 0 && options.mach_service.empty()) {
     ToolSupport::UsageHint(me, "--handshake-fd or --mach-service is required");
     return ExitFailure();
@@ -888,7 +927,7 @@ int HandlerMain(int argc,
         me, "--handshake-fd and --mach-service are incompatible");
     return ExitFailure();
   }
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   if (!options.initial_client_data.IsValid() && options.pipe_name.empty()) {
     ToolSupport::UsageHint(me,
                            "--initial-client-data or --pipe-name is required");
@@ -899,7 +938,7 @@ int HandlerMain(int argc,
         me, "--initial-client-data and --pipe-name are incompatible");
     return ExitFailure();
   }
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
   if (!options.exception_information_address &&
       options.initial_client_fd == kInvalidFileHandle) {
     ToolSupport::UsageHint(
@@ -919,15 +958,15 @@ int HandlerMain(int argc,
         me, "--shared-client-connection requires --initial-client-fd");
     return ExitFailure();
   }
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
   if (!options.write_minidump_to_log && !options.write_minidump_to_database) {
     ToolSupport::UsageHint(me,
                            "--no_write_minidump_to_database is required to use "
                            "with --write_minidump_to_log.");
     ExitFailure();
   }
-#endif  // OS_ANDROID
-#endif  // OS_APPLE
+#endif  // BUILDFLAG(IS_ANDROID)
+#endif  // BUILDFLAG(IS_APPLE)
 
   if (options.database.empty()) {
     ToolSupport::UsageHint(me, "--database is required");
@@ -939,11 +978,11 @@ int HandlerMain(int argc,
     return ExitFailure();
   }
 
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
   if (options.reset_own_crash_exception_port_to_system_default) {
     CrashpadClient::UseSystemDefaultHandler();
   }
-#endif  // OS_APPLE
+#endif  // BUILDFLAG(IS_APPLE)
 
   if (options.monitor_self) {
     MonitorSelf(options);
@@ -988,17 +1027,20 @@ int HandlerMain(int argc,
     upload_thread_options.watch_pending_reports = options.periodic_tasks;
 
     upload_thread.Reset(new CrashReportUploadThread(
-        database.get(), options.url, upload_thread_options));
+        database.get(),
+        options.url,
+        upload_thread_options,
+        CrashReportUploadThread::ProcessPendingReportsObservationCallback()));
     upload_thread.Get()->Start();
   }
 
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
   std::unique_ptr<ExceptionHandlerServer::Delegate> exception_handler;
 #else
   std::unique_ptr<CrashReportExceptionHandler> exception_handler;
 #endif
 
-#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#if BUILDFLAG(IS_CHROMEOS)
   if (options.use_cros_crash_reporter) {
     auto cros_handler = std::make_unique<CrosCrashReportExceptionHandler>(
         database.get(),
@@ -1032,18 +1074,18 @@ int HandlerMain(int argc,
 #if defined(ATTACHMENTS_SUPPORTED)
       &options.attachments,
 #endif  // ATTACHMENTS_SUPPORTED
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
       options.write_minidump_to_database,
       options.write_minidump_to_log,
-#endif  // OS_ANDROID
-#if defined(OS_LINUX)
+#endif  // BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_LINUX)
       true,
       false,
-#endif  // OS_LINUX
+#endif  // BUILDFLAG(IS_LINUX)
       user_stream_sources);
-#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#endif  // BUILDFLAG(IS_CHROMEOS)
 
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
   if (options.exception_information_address) {
     ExceptionHandlerProtocol::ClientInformation info;
     info.exception_information_address = options.exception_information_address;
@@ -1053,7 +1095,8 @@ int HandlerMain(int argc,
                ? EXIT_SUCCESS
                : ExitFailure();
   }
-#endif  // OS_LINUX || OS_CHROMEOS || OS_ANDROID
+#endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
+        // BUILDFLAG(IS_ANDROID)
 
   ScopedStoppable prune_thread;
   if (options.periodic_tasks) {
@@ -1062,13 +1105,13 @@ int HandlerMain(int argc,
     prune_thread.Get()->Start();
   }
 
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
   if (options.mach_service.empty()) {
     // Don’t do this when being run by launchd. See launchd.plist(5).
     CloseStdinAndStdout();
   }
 
-  base::mac::ScopedMachReceiveRight receive_right;
+  base::apple::ScopedMachReceiveRight receive_right;
 
   if (options.handshake_fd >= 0) {
     receive_right.reset(
@@ -1105,7 +1148,7 @@ int HandlerMain(int argc,
   }
 
   RecordFileLimitAnnotation();
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   // Shut down as late as possible relative to programs we're watching.
   if (!SetProcessShutdownParameters(0x100, SHUTDOWN_NORETRY))
     PLOG(ERROR) << "SetProcessShutdownParameters";
@@ -1115,9 +1158,9 @@ int HandlerMain(int argc,
   if (!options.pipe_name.empty()) {
     exception_handler_server.SetPipeName(base::UTF8ToWide(options.pipe_name));
   }
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
   ExceptionHandlerServer exception_handler_server;
-#endif  // OS_APPLE
+#endif  // BUILDFLAG(IS_APPLE)
 
   base::GlobalHistogramAllocator* histogram_allocator = nullptr;
   if (!options.metrics_dir.empty()) {
@@ -1132,19 +1175,19 @@ int HandlerMain(int argc,
 
   Metrics::HandlerLifetimeMilestone(Metrics::LifetimeMilestone::kStarted);
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   if (options.initial_client_data.IsValid()) {
     exception_handler_server.InitializeWithInheritedDataForInitialClient(
         options.initial_client_data, exception_handler.get());
   }
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
   if (options.initial_client_fd == kInvalidFileHandle ||
       !exception_handler_server.InitializeWithClient(
           ScopedFileHandle(options.initial_client_fd),
           options.shared_client_connection)) {
     return ExitFailure();
   }
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
 
   exception_handler_server.Run(exception_handler.get());
 
diff --git a/extern/crashpad/crashpad/handler/handler_main.h b/extern/crashpad/crashpad/handler/handler_main.h
index 252654118a..35fa4e60f3 100644
--- a/extern/crashpad/crashpad/handler/handler_main.h
+++ b/extern/crashpad/crashpad/handler/handler_main.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@ int HandlerMain(int argc,
                 char* argv[],
                 const UserStreamDataSources* user_stream_sources);
 
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
 //! \brief The `main()` entry point for Android libraries.
 //!
 //! This symbol is the entry point for crashpad when it is dynamically loaded
diff --git a/extern/crashpad/crashpad/handler/linux/capture_snapshot.cc b/extern/crashpad/crashpad/handler/linux/capture_snapshot.cc
index 12beddfccf..0948d48313 100644
--- a/extern/crashpad/crashpad/handler/linux/capture_snapshot.cc
+++ b/extern/crashpad/crashpad/handler/linux/capture_snapshot.cc
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/handler/linux/capture_snapshot.h b/extern/crashpad/crashpad/handler/linux/capture_snapshot.h
index 78886dc5af..993ab39bf2 100644
--- a/extern/crashpad/crashpad/handler/linux/capture_snapshot.h
+++ b/extern/crashpad/crashpad/handler/linux/capture_snapshot.h
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/handler/linux/crash_report_exception_handler.cc b/extern/crashpad/crashpad/handler/linux/crash_report_exception_handler.cc
index 4d37582b7f..fff357864e 100644
--- a/extern/crashpad/crashpad/handler/linux/crash_report_exception_handler.cc
+++ b/extern/crashpad/crashpad/handler/linux/crash_report_exception_handler.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@
 #include "util/stream/log_output_stream.h"
 #include "util/stream/zlib_output_stream.h"
 
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
 #include <android/log.h>
 #endif
 
@@ -52,10 +52,10 @@ class Logger final : public LogOutputStream::Delegate {
 
   ~Logger() override = default;
 
-#if defined(OS_ANDROID)
-  int Log(const char* buf) override {
+#if BUILDFLAG(IS_ANDROID)
+  bool Log(const char* buf) override {
     return __android_log_buf_write(
-        LOG_ID_CRASH, ANDROID_LOG_FATAL, "crashpad", buf);
+        LOG_ID_CRASH, ANDROID_LOG_FATAL, "crashpad", buf) > 0;
   }
 
   size_t OutputCap() override {
@@ -72,7 +72,7 @@ class Logger final : public LogOutputStream::Delegate {
   }
 #else
   // TODO(jperaza): Log to an appropriate location on Linux.
-  int Log(const char* buf) override { return -ENOTCONN; }
+  bool Log(const char* buf) override { return false; }
   size_t OutputCap() override { return 0; }
   size_t LineWidth() override { return 0; }
 #endif
@@ -184,13 +184,9 @@ bool CrashReportExceptionHandler::HandleExceptionWithConnection(
 
   UUID client_id;
   Settings* const settings = database_->GetSettings();
-  if (settings) {
-    // If GetSettings() or GetClientID() fails, something else will log a
-    // message and client_id will be left at its default value, all zeroes,
-    // which is appropriate.
-    settings->GetClientID(&client_id);
+  if (settings && settings->GetClientID(&client_id)) {
+    process_snapshot->SetClientID(client_id);
   }
-  process_snapshot->SetClientID(client_id);
 
   return write_minidump_to_database_
              ? WriteMinidumpToDatabase(process_snapshot.get(),
diff --git a/extern/crashpad/crashpad/handler/linux/crash_report_exception_handler.h b/extern/crashpad/crashpad/handler/linux/crash_report_exception_handler.h
index 76fce92fbf..9dd153370e 100644
--- a/extern/crashpad/crashpad/handler/linux/crash_report_exception_handler.h
+++ b/extern/crashpad/crashpad/handler/linux/crash_report_exception_handler.h
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/handler/linux/cros_crash_report_exception_handler.cc b/extern/crashpad/crashpad/handler/linux/cros_crash_report_exception_handler.cc
index 9e58d94aa4..51486a1077 100644
--- a/extern/crashpad/crashpad/handler/linux/cros_crash_report_exception_handler.cc
+++ b/extern/crashpad/crashpad/handler/linux/cros_crash_report_exception_handler.cc
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,6 +17,10 @@
 #include <vector>
 
 #include "base/logging.h"
+#include "base/strings/stringprintf.h"
+#if defined(CRASHPAD_IS_IN_CHROMIUM)
+#include "base/system/sys_info.h"
+#endif // CRASHPAD_IS_IN_CHROMIUM
 #include "client/settings.h"
 #include "handler/linux/capture_snapshot.h"
 #include "handler/minidump_to_upload_parameters.h"
@@ -29,7 +33,7 @@
 #include "util/linux/ptrace_client.h"
 #include "util/misc/metrics.h"
 #include "util/misc/uuid.h"
-#include "util/posix/double_fork_and_exec.h"
+#include "util/posix/spawn_subprocess.h"
 
 namespace crashpad {
 
@@ -40,14 +44,13 @@ const std::string GetProcessNameFromPid(pid_t pid) {
   // Symlink to process binary is at /proc/###/exe.
   std::string link_path = "/proc/" + std::to_string(pid) + "/exe";
 
-  constexpr int kMaxSize = 4096;
-  std::unique_ptr<char[]> buf(new char[kMaxSize]);
-  ssize_t size = readlink(link_path.c_str(), buf.get(), kMaxSize);
-  std::string result;
+  std::string result(4096, '\0');
+  ssize_t size = readlink(link_path.c_str(), result.data(), result.size());
   if (size < 0) {
     PLOG(ERROR) << "Failed to readlink " << link_path;
+    result.clear();
   } else {
-    result.assign(buf.get(), size);
+    result.resize(size);
     size_t last_slash_pos = result.rfind('/');
     if (last_slash_pos != std::string::npos) {
       result = result.substr(last_slash_pos + 1);
@@ -246,6 +249,27 @@ bool CrosCrashReportExceptionHandler::HandleExceptionWithConnection(
   // crash_reporter needs to know the pid and uid of the crashing process.
   std::vector<std::string> argv({"/sbin/crash_reporter"});
 
+#if defined(CRASHPAD_IS_IN_CHROMIUM)
+  int32_t major_version = 0, minor_version = 0, bugfix_version = 0;
+  base::SysInfo::OperatingSystemVersionNumbers(
+      &major_version, &minor_version, &bugfix_version);
+  // The version on which https://crrev.com/c/4265753 landed.
+  constexpr int32_t kFixedVersion = 15363;
+  // TODO(https://crbug.com/1420445): Remove this check (and the
+  // CRASHPAD_IS_IN_CHROMIUM defines) when M115 branches.
+  if (major_version >= kFixedVersion) {
+    // Used to distinguish between non-fatal and fatal crashes.
+    const ExceptionSnapshot* const exception_snapshot = snapshot->Exception();
+    if (exception_snapshot) {
+      // convert to int32, since crashpad uses -1 as a signal for non-fatal
+      // crashes.
+      argv.push_back(base::StringPrintf(
+          "--chrome_signal=%d",
+          static_cast<int32_t>(exception_snapshot->Exception())));
+    }
+  }
+#endif // CRASHPAD_IS_IN_CHROMIUM
+
   argv.push_back("--chrome_memfd=" + std::to_string(file_writer.fd()));
 
   const pid_t pid = process_snapshot->ProcessID();
@@ -266,12 +290,11 @@ bool CrosCrashReportExceptionHandler::HandleExceptionWithConnection(
     argv.push_back("--always_allow_feedback");
   }
 
-  if (!DoubleForkAndExec(argv,
-                         nullptr /* envp */,
-                         file_writer.fd() /* preserve_fd */,
-                         false /* use_path */,
-                         nullptr /* child_function */)) {
-    LOG(ERROR) << "DoubleForkAndExec failed";
+  if (!SpawnSubprocess(argv,
+                       nullptr /* envp */,
+                       file_writer.fd() /* preserve_fd */,
+                       false /* use_path */,
+                       nullptr /* child_function */)) {
     Metrics::ExceptionCaptureResult(
         Metrics::CaptureResult::kFinishedWritingCrashReportFailed);
     return false;
diff --git a/extern/crashpad/crashpad/handler/linux/cros_crash_report_exception_handler.h b/extern/crashpad/crashpad/handler/linux/cros_crash_report_exception_handler.h
index eaa6eb1659..0ac0c29f8d 100644
--- a/extern/crashpad/crashpad/handler/linux/cros_crash_report_exception_handler.h
+++ b/extern/crashpad/crashpad/handler/linux/cros_crash_report_exception_handler.h
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
 #ifndef CRASHPAD_HANDLER_LINUX_CROS_CRASH_REPORT_EXCEPTION_HANDLER_H_
 #define CRASHPAD_HANDLER_LINUX_CROS_CRASH_REPORT_EXCEPTION_HANDLER_H_
 
+#include <sys/types.h>
+
 #include <map>
 #include <string>
 
diff --git a/extern/crashpad/crashpad/handler/linux/exception_handler_server.cc b/extern/crashpad/crashpad/handler/linux/exception_handler_server.cc
index c9fbb0add0..00b076469b 100644
--- a/extern/crashpad/crashpad/handler/linux/exception_handler_server.cc
+++ b/extern/crashpad/crashpad/handler/linux/exception_handler_server.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
 
 #include <utility>
 
+#include "base/check_op.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
@@ -198,7 +199,7 @@ class PtraceStrategyDeciderImpl : public PtraceStrategyDecider {
         if (HaveCapSysPtrace()) {
           return Strategy::kDirectPtrace;
         }
-        FALLTHROUGH;
+        [[fallthrough]];
       case PtraceScope::kNoAttach:
         LOG(WARNING) << "no ptrace";
         return Strategy::kNoPtrace;
diff --git a/extern/crashpad/crashpad/handler/linux/exception_handler_server.h b/extern/crashpad/crashpad/handler/linux/exception_handler_server.h
index 60bf496d91..738881ad3e 100644
--- a/extern/crashpad/crashpad/handler/linux/exception_handler_server.h
+++ b/extern/crashpad/crashpad/handler/linux/exception_handler_server.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/handler/linux/exception_handler_server_test.cc b/extern/crashpad/crashpad/handler/linux/exception_handler_server_test.cc
index 786bab1baa..e16d93b757 100644
--- a/extern/crashpad/crashpad/handler/linux/exception_handler_server_test.cc
+++ b/extern/crashpad/crashpad/handler/linux/exception_handler_server_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@
 #include "util/synchronization/semaphore.h"
 #include "util/thread/thread.h"
 
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
 #include <android/api-level.h>
 #endif
 
@@ -253,7 +253,10 @@ class ExceptionHandlerServerTest : public testing::TestWithParam<bool> {
         pid_t last_client;
         ASSERT_TRUE(server_test_->Delegate()->WaitForException(
             5.0, &last_client, &last_address));
-        EXPECT_EQ(last_address, info.exception_information_address);
+        // `exception_information_address` is underaligned and `EXPECT_EQ`
+        // internally takes arguments by reference. Copy it into a temporary
+        // before comparing to avoid undefined behavior.
+        EXPECT_EQ(last_address, VMAddress{info.exception_information_address});
         EXPECT_EQ(last_client, ChildPID());
       } else {
         CheckedReadFileAtEOF(ReadPipeHandle());
diff --git a/extern/crashpad/crashpad/handler/linux/handler_trampoline.cc b/extern/crashpad/crashpad/handler/linux/handler_trampoline.cc
index 1596d77f4f..5bfcad23f4 100644
--- a/extern/crashpad/crashpad/handler/linux/handler_trampoline.cc
+++ b/extern/crashpad/crashpad/handler/linux/handler_trampoline.cc
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/handler/mac/crash_report_exception_handler.cc b/extern/crashpad/crashpad/handler/mac/crash_report_exception_handler.cc
index cccf1e94ed..280f5ba9c0 100644
--- a/extern/crashpad/crashpad/handler/mac/crash_report_exception_handler.cc
+++ b/extern/crashpad/crashpad/handler/mac/crash_report_exception_handler.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,9 +17,10 @@
 #include <utility>
 #include <vector>
 
+#include "base/apple/mach_logging.h"
+#include "base/apple/scoped_mach_port.h"
+#include "base/files/scoped_file.h"
 #include "base/logging.h"
-#include "base/mac/mach_logging.h"
-#include "base/mac/scoped_mach_port.h"
 #include "base/strings/stringprintf.h"
 #include "client/settings.h"
 #include "handler/mac/file_limit_annotation.h"
@@ -27,10 +28,14 @@
 #include "minidump/minidump_user_extension_stream_data_source.h"
 #include "snapshot/crashpad_info_client_options.h"
 #include "snapshot/mac/process_snapshot_mac.h"
+#include "util/file/file_helper.h"
+#include "util/file/file_io.h"
+#include "util/file/file_reader.h"
 #include "util/file/file_writer.h"
 #include "util/mach/bootstrap.h"
 #include "util/mach/exc_client_variants.h"
 #include "util/mach/exception_behaviors.h"
+#include "util/mach/exception_ports.h"
 #include "util/mach/exception_types.h"
 #include "util/mach/mach_extensions.h"
 #include "util/mach/mach_message.h"
@@ -46,10 +51,12 @@ CrashReportExceptionHandler::CrashReportExceptionHandler(
     CrashReportDatabase* database,
     CrashReportUploadThread* upload_thread,
     const std::map<std::string, std::string>* process_annotations,
+    const std::vector<base::FilePath>* attachments,
     const UserStreamDataSources* user_stream_data_sources)
     : database_(database),
       upload_thread_(upload_thread),
       process_annotations_(process_annotations),
+      attachments_(attachments),
       user_stream_data_sources_(user_stream_data_sources) {}
 
 CrashReportExceptionHandler::~CrashReportExceptionHandler() {
@@ -147,14 +154,9 @@ kern_return_t CrashReportExceptionHandler::CatchMachException(
 
     UUID client_id;
     Settings* const settings = database_->GetSettings();
-    if (settings) {
-      // If GetSettings() or GetClientID() fails, something else will log a
-      // message and client_id will be left at its default value, all zeroes,
-      // which is appropriate.
-      settings->GetClientID(&client_id);
+    if (settings && settings->GetClientID(&client_id)) {
+      process_snapshot.SetClientID(client_id);
     }
-
-    process_snapshot.SetClientID(client_id);
     process_snapshot.SetAnnotationsSimpleMap(*process_annotations_);
 
     std::unique_ptr<CrashReportDatabase::NewReport> new_report;
@@ -173,6 +175,21 @@ kern_return_t CrashReportExceptionHandler::CatchMachException(
     AddUserExtensionStreams(
         user_stream_data_sources_, &process_snapshot, &minidump);
 
+    for (const auto& attachment : *attachments_) {
+      base::FilePath name = attachment.BaseName();
+      FileWriter* writer = new_report->AddAttachment(name.value());
+      if (!writer) {
+        LOG(WARNING) << "Failed to add attachment";
+        continue;
+      }
+      FileReader reader;
+      if (!reader.Open(attachment)) {
+        LOG(WARNING) << "Failed to open attachment " << attachment.value();
+        continue;
+      }
+      CopyFileContent(&reader, writer);
+    }
+
     if (!minidump.WriteEverything(new_report->Writer())) {
       Metrics::ExceptionCaptureResult(
           Metrics::CaptureResult::kMinidumpWriteFailed);
@@ -193,51 +210,71 @@ kern_return_t CrashReportExceptionHandler::CatchMachException(
     }
   }
 
-  if (client_options.system_crash_reporter_forwarding != TriState::kDisabled &&
-      (exception == EXC_CRASH ||
-       exception == EXC_RESOURCE ||
-       exception == EXC_GUARD)) {
-    // Don’t forward simulated exceptions such as kMachExceptionSimulated to the
-    // system crash reporter. Only forward the types of exceptions that it would
-    // receive under normal conditions. Although the system crash reporter is
-    // able to deal with other exceptions including simulated ones, forwarding
-    // them to the system crash reporter could present the system’s crash UI for
-    // processes that haven’t actually crashed, and could result in reports not
-    // actually associated with crashes being sent to the operating system
-    // vendor.
-    base::mac::ScopedMachSendRight
-        system_crash_reporter_handler(SystemCrashReporterHandler());
-    if (system_crash_reporter_handler.get()) {
-      // Make copies of mutable out parameters so that the system crash reporter
-      // can’t influence the state returned by this method.
-      thread_state_flavor_t flavor_forward = *flavor;
-      mach_msg_type_number_t new_state_forward_count = *new_state_count;
-      std::vector<natural_t> new_state_forward(
-          new_state, new_state + new_state_forward_count);
-
-      // The system crash reporter requires the behavior to be
-      // EXCEPTION_STATE_IDENTITY | MACH_EXCEPTION_CODES. It uses the identity
-      // parameters but doesn’t appear to use the state parameters, including
-      // |flavor|, and doesn’t care if they are 0 or invalid. As long as an
-      // identity is available (checked above), any other exception behavior is
-      // converted to what the system crash reporter wants, with the caveat that
-      // problems may arise if the state wasn’t available and the system crash
-      // reporter changes in the future to use it. However, normally, the state
-      // will be available.
-      kern_return_t kr = UniversalExceptionRaise(
-          EXCEPTION_STATE_IDENTITY | MACH_EXCEPTION_CODES,
-          system_crash_reporter_handler.get(),
-          thread,
-          task,
-          exception,
-          code,
-          code_count,
-          &flavor_forward,
-          old_state,
-          old_state_count,
-          new_state_forward_count ? &new_state_forward[0] : nullptr,
-          &new_state_forward_count);
-      MACH_LOG_IF(WARNING, kr != KERN_SUCCESS, kr) << "UniversalExceptionRaise";
+  if (client_options.system_crash_reporter_forwarding != TriState::kDisabled) {
+    if (exception == EXC_CRASH) {
+      // For exception handlers that respond to state-carrying behaviors, when
+      // the handler is called by the kernel (as it is normally), the kernel
+      // will attempt to set a new thread state when the exception handler
+      // returns successfully. Other code that mimics the kernel’s
+      // exception-delivery semantics may implement the same or similar
+      // behavior. In some situations, it is undesirable to set a new thread
+      // state. If the exception handler were to return unsuccessfully, however,
+      // the kernel would continue searching for an exception handler at a wider
+      // (task or host) scope. This may also be undesirable.
+      //
+      // If such exception handlers return `MACH_RCV_PORT_DIED`, the kernel will
+      // not set a new thread state and will also not search for another
+      // exception handler. See 15.3 xnu-11215.84.4/osfmk/kern/exception.c.
+      // `exception_deliver()` will only set a new thread state if the handler’s
+      // return code was `MACH_MSG_SUCCESS` (a synonym for `KERN_SUCCESS`), and
+      // subsequently, `exception_triage()` will not search for a new handler if
+      // the handler’s return code was `KERN_SUCCESS` or `MACH_RCV_PORT_DIED`.
+      //
+      // Another effect of returning `MACH_RCV_PORT_DIED` for `EXC_CRASH` is
+      // that an `EXC_CORPSE_NOTIFY` exception is generated. Starting with macOS
+      // 10.15, for the system crash reporter to generate a report,
+      // `EXC_CORPSE_NOTIFY` *must* be generated and forwarding `EXC_CRASH` (as
+      // we do below with `EXC_RESOURCE` and pre-macOS 13 `EXC_GUARD`) is not
+      // sufficient. Between macOS 10.11 and macOS 10.14 (inclusive), both
+      // forwarding as below, and causing `EXC_CORPSE_NOTIFY` to be generated
+      // are sufficient (and in fact, if we do both, two crash reports are
+      // generated).
+      return MACH_RCV_PORT_DIED;
+    }
+    if (exception == EXC_RESOURCE || exception == EXC_GUARD) {
+      // Only forward the types of exceptions that the crash reporter would
+      // receive under normal conditions. Otherwise, system crash reporter could
+      // present the system’s crash UI for processes that haven’t actually
+      // crashed, and could result in reports not actually associated with
+      // crashes being sent to the operating system vendor.
+      base::apple::ScopedMachSendRight system_crash_reporter_handler(
+          SystemCrashReporterHandler());
+      if (system_crash_reporter_handler.get()) {
+        // Make copies of mutable out parameters so that the system crash
+        // reporter can’t influence the state returned by this method.
+        thread_state_flavor_t flavor_forward = *flavor;
+        mach_msg_type_number_t new_state_forward_count = *new_state_count;
+        std::vector<natural_t> new_state_forward;
+        if (new_state_forward_count) {
+          new_state_forward.assign(new_state,
+                                   new_state + new_state_forward_count);
+        }
+        kern_return_t kr = UniversalExceptionRaise(
+            EXCEPTION_STATE_IDENTITY | MACH_EXCEPTION_CODES,
+            system_crash_reporter_handler.get(),
+            thread,
+            task,
+            exception,
+            code,
+            code_count,
+            &flavor_forward,
+            old_state,
+            old_state_count,
+            new_state_forward_count ? &new_state_forward[0] : nullptr,
+            &new_state_forward_count);
+        MACH_LOG_IF(WARNING, kr != KERN_SUCCESS, kr)
+            << "UniversalExceptionRaise";
+      }
     }
   }
 
@@ -245,7 +282,7 @@ kern_return_t CrashReportExceptionHandler::CatchMachException(
       behavior, old_state, old_state_count, new_state, new_state_count);
 
   Metrics::ExceptionCaptureResult(Metrics::CaptureResult::kSuccess);
-  return ExcServerSuccessfulReturnValue(exception, behavior, false);
+  return KERN_SUCCESS;
 }
 
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/handler/mac/crash_report_exception_handler.h b/extern/crashpad/crashpad/handler/mac/crash_report_exception_handler.h
index 16c669126e..934cbb1ba6 100644
--- a/extern/crashpad/crashpad/handler/mac/crash_report_exception_handler.h
+++ b/extern/crashpad/crashpad/handler/mac/crash_report_exception_handler.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,7 +19,9 @@
 
 #include <map>
 #include <string>
+#include <vector>
 
+#include "base/files/file_path.h"
 #include "client/crash_report_database.h"
 #include "handler/crash_report_upload_thread.h"
 #include "handler/user_stream_data_source.h"
@@ -56,6 +58,7 @@ class CrashReportExceptionHandler final
       CrashReportDatabase* database,
       CrashReportUploadThread* upload_thread,
       const std::map<std::string, std::string>* process_annotations,
+      const std::vector<base::FilePath>* attachments,
       const UserStreamDataSources* user_stream_data_sources);
 
   CrashReportExceptionHandler(const CrashReportExceptionHandler&) = delete;
@@ -88,6 +91,7 @@ class CrashReportExceptionHandler final
   CrashReportDatabase* database_;  // weak
   CrashReportUploadThread* upload_thread_;  // weak
   const std::map<std::string, std::string>* process_annotations_;  // weak
+  const std::vector<base::FilePath>* attachments_;  // weak
   const UserStreamDataSources* user_stream_data_sources_;  // weak
 };
 
diff --git a/extern/crashpad/crashpad/handler/mac/exception_handler_server.cc b/extern/crashpad/crashpad/handler/mac/exception_handler_server.cc
index 83bb269686..5c1814c8c9 100644
--- a/extern/crashpad/crashpad/handler/mac/exception_handler_server.cc
+++ b/extern/crashpad/crashpad/handler/mac/exception_handler_server.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,8 +16,9 @@
 
 #include <utility>
 
+#include "base/apple/mach_logging.h"
+#include "base/check.h"
 #include "base/logging.h"
-#include "base/mac/mach_logging.h"
 #include "util/mach/composite_mach_message_server.h"
 #include "util/mach/mach_extensions.h"
 #include "util/mach/mach_message.h"
@@ -73,7 +74,7 @@ class ExceptionHandlerServerRun : public UniversalMachExcServer::Interface,
                                           MACH_MSG_TYPE_MAKE_SEND_ONCE,
                                           &previous);
       MACH_CHECK(kr == KERN_SUCCESS, kr) << "mach_port_request_notification";
-      base::mac::ScopedMachSendRight previous_owner(previous);
+      base::apple::ScopedMachSendRight previous_owner(previous);
     }
 
     // A single CompositeMachMessageServer will dispatch both exception messages
@@ -84,7 +85,7 @@ class ExceptionHandlerServerRun : public UniversalMachExcServer::Interface,
     // from ever existing. Using distinct receive rights also allows the handler
     // methods to ensure that the messages they process were sent by a holder of
     // the proper send right.
-    base::mac::ScopedMachPortSet server_port_set(
+    base::apple::ScopedMachPortSet server_port_set(
         NewMachPort(MACH_PORT_RIGHT_PORT_SET));
     CHECK(server_port_set.is_valid());
 
@@ -192,7 +193,7 @@ class ExceptionHandlerServerRun : public UniversalMachExcServer::Interface,
 }  // namespace
 
 ExceptionHandlerServer::ExceptionHandlerServer(
-    base::mac::ScopedMachReceiveRight receive_port,
+    base::apple::ScopedMachReceiveRight receive_port,
     bool launchd)
     : receive_port_(std::move(receive_port)),
       notify_port_(NewMachPort(MACH_PORT_RIGHT_RECEIVE)),
diff --git a/extern/crashpad/crashpad/handler/mac/exception_handler_server.h b/extern/crashpad/crashpad/handler/mac/exception_handler_server.h
index c27ecf340f..6d63a290da 100644
--- a/extern/crashpad/crashpad/handler/mac/exception_handler_server.h
+++ b/extern/crashpad/crashpad/handler/mac/exception_handler_server.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 
 #include <mach/mach.h>
 
-#include "base/mac/scoped_mach_port.h"
+#include "base/apple/scoped_mach_port.h"
 #include "util/mach/exc_server_variants.h"
 
 namespace crashpad {
@@ -34,7 +34,7 @@ class ExceptionHandlerServer {
   //!     launchd. \a receive_port is not monitored for no-senders
   //!     notifications, and instead, Stop() must be called to provide a “quit”
   //!     signal.
-  ExceptionHandlerServer(base::mac::ScopedMachReceiveRight receive_port,
+  ExceptionHandlerServer(base::apple::ScopedMachReceiveRight receive_port,
                          bool launchd);
 
   ExceptionHandlerServer(const ExceptionHandlerServer&) = delete;
@@ -73,8 +73,8 @@ class ExceptionHandlerServer {
   void Stop();
 
  private:
-  base::mac::ScopedMachReceiveRight receive_port_;
-  base::mac::ScopedMachReceiveRight notify_port_;
+  base::apple::ScopedMachReceiveRight receive_port_;
+  base::apple::ScopedMachReceiveRight notify_port_;
   bool launchd_;
 };
 
diff --git a/extern/crashpad/crashpad/handler/mac/file_limit_annotation.cc b/extern/crashpad/crashpad/handler/mac/file_limit_annotation.cc
index 0813b9502c..34f2a80c24 100644
--- a/extern/crashpad/crashpad/handler/mac/file_limit_annotation.cc
+++ b/extern/crashpad/crashpad/handler/mac/file_limit_annotation.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,9 +21,9 @@
 #include <sys/sysctl.h>
 #include <sys/types.h>
 
+#include <iterator>
 #include <string>
 
-#include "base/cxx17_backports.h"
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "client/crashpad_info.h"
@@ -108,7 +108,7 @@ void RecordFileLimitAnnotation() {
   int mib[] = {CTL_KERN, KERN_MAXFILES};
   size = sizeof(value);
   std::string max_files = FormatFromSysctl(
-      sysctl(mib, base::size(mib), &value, &size, nullptr, 0), &value, &size);
+      sysctl(mib, std::size(mib), &value, &size, nullptr, 0), &value, &size);
 
   std::string open_files = CountOpenFileDescriptors();
 
diff --git a/extern/crashpad/crashpad/handler/mac/file_limit_annotation.h b/extern/crashpad/crashpad/handler/mac/file_limit_annotation.h
index 1131986e63..5e906f7912 100644
--- a/extern/crashpad/crashpad/handler/mac/file_limit_annotation.h
+++ b/extern/crashpad/crashpad/handler/mac/file_limit_annotation.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/handler/main.cc b/extern/crashpad/crashpad/handler/main.cc
index 3ae73ecddf..90e0d8d7d6 100644
--- a/extern/crashpad/crashpad/handler/main.cc
+++ b/extern/crashpad/crashpad/handler/main.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,17 +17,18 @@
 #include "build/build_config.h"
 #include "tools/tool_support.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
+#include <stdlib.h>
 #include <windows.h>
 #endif
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 
 int main(int argc, char* argv[]) {
   return crashpad::HandlerMain(argc, argv, nullptr);
 }
 
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 
 namespace {
 
@@ -50,4 +51,4 @@ int wmain(int argc, wchar_t* argv[]) {
   return crashpad::ToolSupport::Wmain(argc, argv, HandlerMainAdaptor);
 }
 
-#endif  // OS_POSIX
+#endif  // BUILDFLAG(IS_POSIX)
diff --git a/extern/crashpad/crashpad/handler/minidump_to_upload_parameters.cc b/extern/crashpad/crashpad/handler/minidump_to_upload_parameters.cc
index 6b64081eac..3b240f593b 100644
--- a/extern/crashpad/crashpad/handler/minidump_to_upload_parameters.cc
+++ b/extern/crashpad/crashpad/handler/minidump_to_upload_parameters.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/handler/minidump_to_upload_parameters.h b/extern/crashpad/crashpad/handler/minidump_to_upload_parameters.h
index 94d396fa77..7f294a3ef2 100644
--- a/extern/crashpad/crashpad/handler/minidump_to_upload_parameters.h
+++ b/extern/crashpad/crashpad/handler/minidump_to_upload_parameters.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/handler/minidump_to_upload_parameters_test.cc b/extern/crashpad/crashpad/handler/minidump_to_upload_parameters_test.cc
index 0c3a0e7c31..d900719fa6 100644
--- a/extern/crashpad/crashpad/handler/minidump_to_upload_parameters_test.cc
+++ b/extern/crashpad/crashpad/handler/minidump_to_upload_parameters_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/handler/prune_crash_reports_thread.cc b/extern/crashpad/crashpad/handler/prune_crash_reports_thread.cc
index 7876c2fefb..0f337653f7 100644
--- a/extern/crashpad/crashpad/handler/prune_crash_reports_thread.cc
+++ b/extern/crashpad/crashpad/handler/prune_crash_reports_thread.cc
@@ -1,4 +1,4 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
+// Copyright 2016 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/handler/prune_crash_reports_thread.h b/extern/crashpad/crashpad/handler/prune_crash_reports_thread.h
index 5009ed6559..a6dfa06d64 100644
--- a/extern/crashpad/crashpad/handler/prune_crash_reports_thread.h
+++ b/extern/crashpad/crashpad/handler/prune_crash_reports_thread.h
@@ -1,4 +1,4 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
+// Copyright 2016 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/handler/user_stream_data_source.cc b/extern/crashpad/crashpad/handler/user_stream_data_source.cc
index 7e30fa8ca6..c7f958317c 100644
--- a/extern/crashpad/crashpad/handler/user_stream_data_source.cc
+++ b/extern/crashpad/crashpad/handler/user_stream_data_source.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/handler/user_stream_data_source.h b/extern/crashpad/crashpad/handler/user_stream_data_source.h
index 11bb9c3d47..f3fa795e76 100644
--- a/extern/crashpad/crashpad/handler/user_stream_data_source.h
+++ b/extern/crashpad/crashpad/handler/user_stream_data_source.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/handler/win/.gitattributes b/extern/crashpad/crashpad/handler/win/.gitattributes
index 6495e51261..962118f5cb 100644
--- a/extern/crashpad/crashpad/handler/win/.gitattributes
+++ b/extern/crashpad/crashpad/handler/win/.gitattributes
@@ -1,4 +1,4 @@
-# Copyright 2019 The Crashpad Authors. All rights reserved.
+# Copyright 2019 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/handler/win/crash_other_program.cc b/extern/crashpad/crashpad/handler/win/crash_other_program.cc
index bbd25af5df..ee8d3c24d0 100644
--- a/extern/crashpad/crashpad/handler/win/crash_other_program.cc
+++ b/extern/crashpad/crashpad/handler/win/crash_other_program.cc
@@ -1,4 +1,4 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
+// Copyright 2016 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
 #include "test/test_paths.h"
 #include "test/win/child_launcher.h"
 #include "util/file/file_io.h"
+#include "util/win/exception_codes.h"
 #include "util/win/scoped_handle.h"
 #include "util/win/xp_compat.h"
 
@@ -108,7 +109,7 @@ int CrashOtherProgram(int argc, wchar_t* argv[]) {
 
   DWORD expect_exit_code;
   if (argc == 3 && wcscmp(argv[2], L"noexception") == 0) {
-    expect_exit_code = CrashpadClient::kTriggeredExceptionCode;
+    expect_exit_code = ExceptionCodes::kTriggeredExceptionCode;
     if (!CrashpadClient::DumpAndCrashTargetProcess(
             child.process_handle(), 0, 0))
       return EXIT_FAILURE;
diff --git a/extern/crashpad/crashpad/handler/win/crash_report_exception_handler.cc b/extern/crashpad/crashpad/handler/win/crash_report_exception_handler.cc
index d78d9e6e30..84979f1000 100644
--- a/extern/crashpad/crashpad/handler/win/crash_report_exception_handler.cc
+++ b/extern/crashpad/crashpad/handler/win/crash_report_exception_handler.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -82,14 +82,10 @@ unsigned int CrashReportExceptionHandler::ExceptionHandlerServerException(
   if (client_options.crashpad_handler_behavior != TriState::kDisabled) {
     UUID client_id;
     Settings* const settings = database_->GetSettings();
-    if (settings) {
-      // If GetSettings() or GetClientID() fails, something else will log a
-      // message and client_id will be left at its default value, all zeroes,
-      // which is appropriate.
-      settings->GetClientID(&client_id);
+    if (settings && settings->GetClientID(&client_id)) {
+      process_snapshot.SetClientID(client_id);
     }
 
-    process_snapshot.SetClientID(client_id);
     process_snapshot.SetAnnotationsSimpleMap(*process_annotations_);
 
     std::unique_ptr<CrashReportDatabase::NewReport> new_report;
@@ -119,7 +115,7 @@ unsigned int CrashReportExceptionHandler::ExceptionHandlerServerException(
     for (const auto& attachment : (*attachments_)) {
       FileReader file_reader;
       if (!file_reader.Open(attachment)) {
-        LOG(ERROR) << "attachment " << attachment.value().c_str()
+        LOG(ERROR) << "attachment " << attachment
                    << " couldn't be opened, skipping";
         continue;
       }
@@ -128,7 +124,7 @@ unsigned int CrashReportExceptionHandler::ExceptionHandlerServerException(
       FileWriter* file_writer =
           new_report->AddAttachment(base::WideToUTF8(filename.value()));
       if (file_writer == nullptr) {
-        LOG(ERROR) << "attachment " << filename.value().c_str()
+        LOG(ERROR) << "attachment " << filename
                    << " couldn't be created, skipping";
         continue;
       }
diff --git a/extern/crashpad/crashpad/handler/win/crash_report_exception_handler.h b/extern/crashpad/crashpad/handler/win/crash_report_exception_handler.h
index d322370f14..7e354d34a8 100644
--- a/extern/crashpad/crashpad/handler/win/crash_report_exception_handler.h
+++ b/extern/crashpad/crashpad/handler/win/crash_report_exception_handler.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/handler/win/crashy_signal.cc b/extern/crashpad/crashpad/handler/win/crashy_signal.cc
index e2deacaf67..183f14ccb5 100644
--- a/extern/crashpad/crashpad/handler/win/crashy_signal.cc
+++ b/extern/crashpad/crashpad/handler/win/crashy_signal.cc
@@ -1,4 +1,4 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
+// Copyright 2016 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/handler/win/crashy_test_program.cc b/extern/crashpad/crashpad/handler/win/crashy_test_program.cc
index 4fb2554774..a1449798aa 100644
--- a/extern/crashpad/crashpad/handler/win/crashy_test_program.cc
+++ b/extern/crashpad/crashpad/handler/win/crashy_test_program.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,12 +19,13 @@
 #include <windows.h>
 #include <winternl.h>
 
+#include <iterator>
 #include <map>
 #include <string>
 #include <type_traits>
 #include <vector>
 
-#include "base/cxx17_backports.h"
+#include "base/check.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "build/build_config.h"
@@ -83,11 +84,11 @@ void AllocateMemoryOfVariousProtections() {
   // All of these allocations are leaked, we want to view them in windbg via
   // !vprot.
   void* reserve = VirtualAlloc(
-      nullptr, base::size(kPageTypes) * kPageSize, MEM_RESERVE, PAGE_READWRITE);
+      nullptr, std::size(kPageTypes) * kPageSize, MEM_RESERVE, PAGE_READWRITE);
   PCHECK(reserve) << "VirtualAlloc MEM_RESERVE";
   uintptr_t reserve_as_int = reinterpret_cast<uintptr_t>(reserve);
 
-  for (size_t i = 0; i < base::size(kPageTypes); ++i) {
+  for (size_t i = 0; i < std::size(kPageTypes); ++i) {
     void* result =
         VirtualAlloc(reinterpret_cast<void*>(reserve_as_int + (kPageSize * i)),
                      kPageSize,
@@ -132,7 +133,7 @@ bool CreateThreadWithRegisterPointingToTestMemory() {
   return true;
 }
 
-void SomeCrashyFunction() {
+__declspec(noinline) void SomeCrashyFunction() {
   // SetLastError and NTSTATUS so that we have something to view in !gle in
   // windbg. RtlNtStatusToDosError() stores STATUS_NO_SUCH_FILE into the
   // LastStatusError of the TEB as a side-effect, and we'll be setting
diff --git a/extern/crashpad/crashpad/handler/win/crashy_test_z7_loader.cc b/extern/crashpad/crashpad/handler/win/crashy_test_z7_loader.cc
index 4ffcc031f3..3f458e27fe 100644
--- a/extern/crashpad/crashpad/handler/win/crashy_test_z7_loader.cc
+++ b/extern/crashpad/crashpad/handler/win/crashy_test_z7_loader.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/handler/win/fake_handler_that_crashes_at_startup.cc b/extern/crashpad/crashpad/handler/win/fake_handler_that_crashes_at_startup.cc
index 028190a465..7ecd457d98 100644
--- a/extern/crashpad/crashpad/handler/win/fake_handler_that_crashes_at_startup.cc
+++ b/extern/crashpad/crashpad/handler/win/fake_handler_that_crashes_at_startup.cc
@@ -1,4 +1,4 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
+// Copyright 2016 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/handler/win/fastfail_test_program.cc b/extern/crashpad/crashpad/handler/win/fastfail_test_program.cc
new file mode 100644
index 0000000000..5e27c50ff1
--- /dev/null
+++ b/extern/crashpad/crashpad/handler/win/fastfail_test_program.cc
@@ -0,0 +1,152 @@
+// Copyright 2022 The Crashpad Authors
+//
+// 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.
+
+#include <string.h>
+
+#include "base/check.h"
+#include "base/files/file_path.h"
+#include "base/logging.h"
+#include "base/notreached.h"
+#include "client/crashpad_client.h"
+#include "util/misc/paths.h"
+
+#include <Windows.h>
+
+// We set up a program that crashes with a CFG exception so must be built and
+// linked with /guard:cf. We register the crashpad runtime exception helper
+// module to intercept and trigger the crashpad handler. Note that Windows only
+// loads the module in WerFault after the crash for Windows 10 >= 20h1 (19041).
+namespace crashpad {
+namespace {
+
+// This function should not be on our stack as CFG prevents the modified
+// icall from happening.
+int CallRffeManyTimes() {
+  RaiseFailFastException(nullptr, nullptr, 0);
+  RaiseFailFastException(nullptr, nullptr, 0);
+  RaiseFailFastException(nullptr, nullptr, 0);
+  RaiseFailFastException(nullptr, nullptr, 0);
+  return 1;
+}
+
+using FuncType = decltype(&CallRffeManyTimes);
+void IndirectCall(FuncType* func) {
+  // This code always generates CFG guards.
+  (*func)();
+}
+
+void CfgCrash() {
+  // Call into the middle of the Crashy function.
+  FuncType func = reinterpret_cast<FuncType>(
+      (reinterpret_cast<uintptr_t>(CallRffeManyTimes)) + 16);
+  __try {
+    // Generates a STATUS_STACK_BUFFER_OVERRUN exception if CFG triggers.
+    IndirectCall(&func);
+  } __except (EXCEPTION_EXECUTE_HANDLER) {
+    // CFG fast fail should never be caught.
+    NOTREACHED();
+  }
+  // Should only reach here if CFG is disabled.
+  abort();
+}
+
+void FastFailCrash() {
+  __fastfail(77);
+}
+
+int CrashyMain(int argc, wchar_t* argv[]) {
+  static CrashpadClient* client = new crashpad::CrashpadClient();
+
+  std::wstring type;
+  if (argc == 3) {
+    type = argv[2];
+    // We call this from end_to_end_test.py.
+    if (!client->SetHandlerIPCPipe(argv[1])) {
+      LOG(ERROR) << "SetHandler";
+      return EXIT_FAILURE;
+    }
+  } else if (argc == 4) {
+    type = argv[3];
+    // This is helpful for debugging.
+    if (!client->StartHandler(base::FilePath(argv[1]),
+                              base::FilePath(argv[2]),
+                              base::FilePath(),
+                              std::string(),
+                              std::map<std::string, std::string>(),
+                              std::vector<std::string>(),
+                              false,
+                              true)) {
+      LOG(ERROR) << "StartHandler";
+      return EXIT_FAILURE;
+    }
+    // Got to have a handler & registration.
+    if (!client->WaitForHandlerStart(10000)) {
+      LOG(ERROR) << "Handler failed to start";
+      return EXIT_FAILURE;
+    }
+  } else {
+    fprintf(stderr, "Usage: %ls <server_pipe_name> [cf|ff]\n", argv[0]);
+    fprintf(
+        stderr, "       %ls <handler_path> <database_path> [cf|ff]\n", argv[0]);
+    return EXIT_FAILURE;
+  }
+
+  base::FilePath exe_path;
+  if (!Paths::Executable(&exe_path)) {
+    LOG(ERROR) << "Failed getting path";
+    return EXIT_FAILURE;
+  }
+
+  // Find the module.
+  auto mod_path = exe_path.DirName().Append(L"crashpad_wer.dll");
+
+  // Make sure it is registered in the registry.
+  DWORD dwOne = 1;
+  LSTATUS reg_res =
+      RegSetKeyValueW(HKEY_CURRENT_USER,
+                      L"Software\\Microsoft\\Windows\\Windows Error Reporting\\"
+                      L"RuntimeExceptionHelperModules",
+                      mod_path.value().c_str(),
+                      REG_DWORD,
+                      &dwOne,
+                      sizeof(DWORD));
+  if (reg_res != ERROR_SUCCESS) {
+    LOG(ERROR) << "RegSetKeyValueW";
+    return EXIT_FAILURE;
+  }
+
+  if (!client->RegisterWerModule(mod_path.value())) {
+    LOG(ERROR) << "WerRegisterRuntimeExceptionModule";
+    return EXIT_FAILURE;
+  }
+
+  // Some versions of python call SetErrorMode() which extends to children, and
+  // prevents the WerFault infrastructure from running.
+  SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX);
+
+  if (type == L"cf")
+    CfgCrash();
+  if (type == L"ff")
+    FastFailCrash();
+
+  LOG(ERROR) << "Invalid type or exception failed.";
+  return EXIT_FAILURE;
+}
+
+}  // namespace
+}  // namespace crashpad
+
+int wmain(int argc, wchar_t* argv[]) {
+  return crashpad::CrashyMain(argc, argv);
+}
diff --git a/extern/crashpad/crashpad/handler/win/hanging_program.cc b/extern/crashpad/crashpad/handler/win/hanging_program.cc
index b65d46db82..371eadb93b 100644
--- a/extern/crashpad/crashpad/handler/win/hanging_program.cc
+++ b/extern/crashpad/crashpad/handler/win/hanging_program.cc
@@ -1,4 +1,4 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
+// Copyright 2016 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,7 +15,9 @@
 #include <stdio.h>
 #include <windows.h>
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+
+#include "base/check.h"
 #include "base/debug/alias.h"
 #include "base/logging.h"
 #include "base/notreached.h"
@@ -26,7 +28,7 @@
 
 namespace {
 
-DWORD WINAPI Thread1(LPVOID context) {
+[[noreturn]] DWORD WINAPI Thread1(LPVOID context) {
   HANDLE event = context;
 
   // Increase the thread priority as a hacky way to signal to
@@ -39,16 +41,14 @@ DWORD WINAPI Thread1(LPVOID context) {
   Sleep(INFINITE);
 
   NOTREACHED();
-  return 0;
 }
 
-DWORD WINAPI Thread2(LPVOID dummy) {
+[[noreturn]] DWORD WINAPI Thread2(LPVOID dummy) {
   Sleep(INFINITE);
   NOTREACHED();
-  return 0;
 }
 
-DWORD WINAPI Thread3(LPVOID context) {
+[[noreturn]] DWORD WINAPI Thread3(LPVOID context) {
   // This is a convenient way to pass the event handle to loader_lock_dll.dll.
   HANDLE event = context;
   PCHECK(SetEnvironmentVariable(
@@ -56,15 +56,12 @@ DWORD WINAPI Thread3(LPVOID context) {
       base::UTF8ToWide(base::StringPrintf("%p", event)).c_str()));
 
   HMODULE dll = LoadLibrary(L"loader_lock_dll.dll");
-  if (!dll)
-    PLOG(FATAL) << "LoadLibrary";
+  PCHECK(dll) << "LoadLibrary";
 
   // This call is not expected to return.
-  if (!FreeLibrary(dll))
-    PLOG(FATAL) << "FreeLibrary";
+  PCHECK(FreeLibrary(dll));
 
   NOTREACHED();
-  return 0;
 }
 
 }  // namespace
@@ -125,7 +122,7 @@ int wmain(int argc, wchar_t* argv[]) {
 
   // This is not expected to return.
   DWORD count = WaitForMultipleObjects(
-      static_cast<DWORD>(base::size(threads)), threads, true, INFINITE);
+      static_cast<DWORD>(std::size(threads)), threads, true, INFINITE);
   if (count == WAIT_FAILED) {
     PLOG(ERROR) << "WaitForMultipleObjects";
   } else {
diff --git a/extern/crashpad/crashpad/handler/win/heap_corrupting_program.cc b/extern/crashpad/crashpad/handler/win/heap_corrupting_program.cc
new file mode 100644
index 0000000000..7516d4a263
--- /dev/null
+++ b/extern/crashpad/crashpad/handler/win/heap_corrupting_program.cc
@@ -0,0 +1,97 @@
+// Copyright 2023 The Crashpad Authors
+//
+// 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.
+
+#include <string.h>
+
+#include "base/check.h"
+#include "base/files/file_path.h"
+#include "base/logging.h"
+#include "base/notreached.h"
+#include "client/crashpad_client.h"
+#include "util/misc/paths.h"
+
+#include <Windows.h>
+
+// We set up a program that crashes with a heap corruption exception.
+// STATUS_HEAP_CORRUPTION (0xC0000374 3221226356).
+namespace crashpad {
+namespace {
+
+void HeapCorruptionCrash() {
+  __try {
+    HANDLE heap = ::HeapCreate(0, 0, 0);
+    CHECK(heap);
+    CHECK(HeapSetInformation(
+        heap, HeapEnableTerminationOnCorruption, nullptr, 0));
+    void* addr = ::HeapAlloc(heap, 0, 0x1000);
+    CHECK(addr);
+    // Corrupt heap header.
+    char* addr_mutable = reinterpret_cast<char*>(addr);
+    memset(addr_mutable - sizeof(addr), 0xCC, sizeof(addr));
+
+    HeapFree(heap, 0, addr);
+    HeapDestroy(heap);
+  } __except (EXCEPTION_EXECUTE_HANDLER) {
+    // Heap corruption exception should never be caught.
+    NOTREACHED();
+  }
+  // Should never reach here.
+  abort();
+}
+
+int CrashyMain(int argc, wchar_t* argv[]) {
+  static CrashpadClient* client = new crashpad::CrashpadClient();
+
+  if (argc == 2) {
+    // We call this from end_to_end_test.py.
+    if (!client->SetHandlerIPCPipe(argv[1])) {
+      LOG(ERROR) << "SetHandler";
+      return EXIT_FAILURE;
+    }
+  } else if (argc == 3) {
+    // This is helpful for debugging.
+    if (!client->StartHandler(base::FilePath(argv[1]),
+                              base::FilePath(argv[2]),
+                              base::FilePath(),
+                              std::string(),
+                              std::map<std::string, std::string>(),
+                              std::vector<std::string>(),
+                              false,
+                              true)) {
+      LOG(ERROR) << "StartHandler";
+      return EXIT_FAILURE;
+    }
+    // Got to have a handler & registration.
+    if (!client->WaitForHandlerStart(10000)) {
+      LOG(ERROR) << "Handler failed to start";
+      return EXIT_FAILURE;
+    }
+  } else {
+    fprintf(stderr, "Usage: %ls <server_pipe_name>\n", argv[0]);
+    fprintf(stderr, "       %ls <handler_path> <database_path>\n", argv[0]);
+    return EXIT_FAILURE;
+  }
+
+  HeapCorruptionCrash();
+
+  LOG(ERROR) << "Invalid type or exception failed.";
+  return EXIT_FAILURE;
+}
+
+}  // namespace
+}  // namespace crashpad
+
+int wmain(int argc, wchar_t* argv[]) {
+  return crashpad::CrashyMain(argc, argv);
+}
diff --git a/extern/crashpad/crashpad/handler/win/loader_lock_dll.cc b/extern/crashpad/crashpad/handler/win/loader_lock_dll.cc
index 63c145cfab..cdcd9ccf2c 100644
--- a/extern/crashpad/crashpad/handler/win/loader_lock_dll.cc
+++ b/extern/crashpad/crashpad/handler/win/loader_lock_dll.cc
@@ -1,4 +1,4 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
+// Copyright 2016 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/handler/win/self_destroying_test_program.cc b/extern/crashpad/crashpad/handler/win/self_destroying_test_program.cc
index 8466ff2657..1e98a2f704 100644
--- a/extern/crashpad/crashpad/handler/win/self_destroying_test_program.cc
+++ b/extern/crashpad/crashpad/handler/win/self_destroying_test_program.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -24,11 +24,17 @@
 namespace crashpad {
 namespace {
 
+// Without this, clang optimizes away the _alloca below, which in turn
+// makes the VirtualFree() crash with an access violation.
+#if defined(__clang__)
+#pragma clang optimize off
+#endif
+
 // We VirtualFree a region in ourselves (the stack) to confirm that the
 // exception reporter captures as much as possible in the minidump and doesn't
 // abort. __debugbreak() immediately after doing so because the process is
 // clearly in a very broken state at this point.
-bool FreeOwnStackAndBreak() {
+__declspec(noinline) bool FreeOwnStackAndBreak() {
   ProcessReaderWin process_reader;
   if (!process_reader.Initialize(GetCurrentProcess(),
                                  ProcessSuspensionState::kRunning)) {
@@ -45,7 +51,7 @@ bool FreeOwnStackAndBreak() {
 
   // Push the stack up a bit so that hopefully the crash handler can succeed,
   // but won't be able to read the base of the stack.
-  _alloca(16384);
+  [[maybe_unused]] volatile void* do_not_optimize_away = _alloca(16384);
 
   // We can't succeed at MEM_RELEASEing this memory, but MEM_DECOMMIT is good
   // enough to make it inaccessible.
@@ -63,7 +69,7 @@ bool FreeOwnStackAndBreak() {
   return true;
 }
 
-int SelfDestroyingMain(int argc, wchar_t* argv[]) {
+__declspec(noinline) int SelfDestroyingMain(int argc, wchar_t* argv[]) {
   if (argc != 2) {
     fprintf(stderr, "Usage: %ls <server_pipe_name>\n", argv[0]);
     return EXIT_FAILURE;
@@ -83,6 +89,10 @@ int SelfDestroyingMain(int argc, wchar_t* argv[]) {
   return EXIT_SUCCESS;
 }
 
+#if defined(__clang__)
+#pragma clang optimize on
+#endif
+
 }  // namespace
 }  // namespace crashpad
 
diff --git a/extern/crashpad/crashpad/handler/win/wer/BUILD.gn b/extern/crashpad/crashpad/handler/win/wer/BUILD.gn
new file mode 100644
index 0000000000..084d209c12
--- /dev/null
+++ b/extern/crashpad/crashpad/handler/win/wer/BUILD.gn
@@ -0,0 +1,48 @@
+# Copyright 2022 The Crashpad Authors
+#
+# 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.
+
+import("../../../build/crashpad_buildconfig.gni")
+
+assert(crashpad_is_win)
+
+# Allows other projects (e.g. Chrome) to wrap this as a dll.
+source_set("crashpad_wer_handler") {
+  sources = [
+    "crashpad_wer.cc",
+    "crashpad_wer.h",
+  ]
+  deps = [ "../../../util:util_registration_protocol" ]
+}
+
+crashpad_loadable_module("crashpad_wer") {
+  sources = [
+    "crashpad_wer.def",
+    "crashpad_wer_main.cc",
+  ]
+  deps = [ ":crashpad_wer_handler" ]
+  configs = [ "../../../:crashpad_config" ]
+}
+
+source_set("crashpad_wer_test") {
+  testonly = true
+  sources = [ "crashpad_wer_module_unittest.cc" ]
+  deps = [
+    ":crashpad_wer",
+    ":crashpad_wer_handler",
+    "../../../client",
+    "../../../test",
+    "../../../third_party/googletest",
+    "../../../util:util_registration_protocol",
+  ]
+}
diff --git a/extern/crashpad/crashpad/handler/win/wer/crashpad_wer.cc b/extern/crashpad/crashpad/handler/win/wer/crashpad_wer.cc
new file mode 100644
index 0000000000..1973e7fc65
--- /dev/null
+++ b/extern/crashpad/crashpad/handler/win/wer/crashpad_wer.cc
@@ -0,0 +1,208 @@
+// Copyright 2022 The Crashpad Authors
+//
+// 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.
+
+// See:
+// https://docs.microsoft.com/en-us/windows/win32/api/werapi/nf-werapi-werregisterruntimeexceptionmodule
+
+#include "handler/win/wer/crashpad_wer.h"
+
+#include "util/misc/address_types.h"
+#include "util/win/registration_protocol_win_structs.h"
+
+#include <stddef.h>
+#include <Windows.h>
+#include <werapi.h>
+
+namespace crashpad::wer {
+namespace {
+using crashpad::WerRegistration;
+
+// bIsFatal and dwReserved fields are not present in SDK < 19041.
+struct WER_RUNTIME_EXCEPTION_INFORMATION_19041 {
+  DWORD dwSize;
+  HANDLE hProcess;
+  HANDLE hThread;
+  EXCEPTION_RECORD exceptionRecord;
+  CONTEXT context;
+  PCWSTR pwszReportId;
+  BOOL bIsFatal;
+  DWORD dwReserved;
+};
+
+// We have our own version of this to avoid pulling in //base.
+class ScopedHandle {
+ public:
+  ScopedHandle() : handle_(INVALID_HANDLE_VALUE) {}
+  ScopedHandle(HANDLE from) : handle_(from) {}
+  ~ScopedHandle() {
+    if (IsValid())
+      CloseHandle(handle_);
+  }
+  bool IsValid() {
+    if (handle_ == INVALID_HANDLE_VALUE || handle_ == 0)
+      return false;
+    return true;
+  }
+  HANDLE Get() { return handle_; }
+
+ private:
+  HANDLE handle_;
+};
+
+ScopedHandle DuplicateFromTarget(HANDLE target_process, HANDLE target_handle) {
+  HANDLE hTmp;
+  if (!DuplicateHandle(target_process,
+                       target_handle,
+                       GetCurrentProcess(),
+                       &hTmp,
+                       SYNCHRONIZE | EVENT_MODIFY_STATE,
+                       false,
+                       0)) {
+    return ScopedHandle();
+  }
+  return ScopedHandle(hTmp);
+}
+
+bool ProcessException(const DWORD* handled_exceptions,
+                      size_t num_handled_exceptions,
+                      const PVOID pContext,
+                      const PWER_RUNTIME_EXCEPTION_INFORMATION e_info) {
+  // Need to have been given a context.
+  if (!pContext)
+    return false;
+
+  // Older OSes might provide a smaller structure than SDK 19041 defines.
+  if (e_info->dwSize <=
+      offsetof(WER_RUNTIME_EXCEPTION_INFORMATION_19041, bIsFatal)) {
+    return false;
+  }
+
+  // If building with SDK < 19041 then the bIsFatal field isn't defined, so
+  // use our internal definition here.
+  if (!reinterpret_cast<const WER_RUNTIME_EXCEPTION_INFORMATION_19041*>(e_info)
+           ->bIsFatal) {
+    return false;
+  }
+
+  // Only deal with exceptions that crashpad would not have handled.
+  bool found = false;
+  for (size_t i = 0; i < num_handled_exceptions; i++) {
+    if (handled_exceptions[i] == e_info->exceptionRecord.ExceptionCode) {
+      found = true;
+      break;
+    }
+  }
+  // If num_handled_exceptions == 0, all exceptions should be passed on.
+  if (!found && num_handled_exceptions != 0)
+    return false;
+
+  // Grab out the handles to the crashpad server.
+  WerRegistration target_registration = {};
+  if (!ReadProcessMemory(e_info->hProcess,
+                         pContext,
+                         &target_registration,
+                         sizeof(target_registration),
+                         nullptr)) {
+    return false;
+  }
+
+  // Validate version of registration struct.
+  if (target_registration.version != WerRegistration::kWerRegistrationVersion)
+    return false;
+
+  // Dupe handles for triggering the dump.
+  auto dump_start = DuplicateFromTarget(
+      e_info->hProcess, target_registration.dump_without_crashing);
+  auto dump_done =
+      DuplicateFromTarget(e_info->hProcess, target_registration.dump_completed);
+
+  if (!dump_start.IsValid() || !dump_done.IsValid())
+    return false;
+
+  // It's possible that the target crashed while inside a DumpWithoutCrashing
+  // call - either in the DumpWithoutCrashing call or in another thread - if so
+  // we cannot trigger the dump until the first call's crash is dealth with as
+  // the crashpad handler might be reading from structures we will write to. We
+  // give the event a short while to be triggered and give up if it is not
+  // signalled.
+  if (target_registration.in_dump_without_crashing) {
+    constexpr DWORD kOneSecondInMs = 1000;
+    DWORD wait_result = WaitForSingleObject(dump_done.Get(), kOneSecondInMs);
+    if (wait_result != WAIT_OBJECT_0)
+      return false;
+  }
+
+  // Set up the crashpad handler's info structure.
+  crashpad::ExceptionInformation target_non_crash_exception_info{};
+  target_non_crash_exception_info.thread_id = GetThreadId(e_info->hThread);
+  target_non_crash_exception_info.exception_pointers =
+      static_cast<crashpad::VMAddress>(reinterpret_cast<uintptr_t>(pContext)) +
+      offsetof(WerRegistration, pointers);
+
+  if (!WriteProcessMemory(e_info->hProcess,
+                          target_registration.crashpad_exception_info,
+                          &target_non_crash_exception_info,
+                          sizeof(target_non_crash_exception_info),
+                          nullptr)) {
+    return false;
+  }
+
+  // Write Exception & Context to the areas reserved by the client.
+  if (!WriteProcessMemory(
+          e_info->hProcess,
+          reinterpret_cast<PVOID>(target_registration.pointers.ExceptionRecord),
+          &e_info->exceptionRecord,
+          sizeof(e_info->exceptionRecord),
+          nullptr)) {
+    return false;
+  }
+  if (!WriteProcessMemory(
+          e_info->hProcess,
+          reinterpret_cast<PVOID>(target_registration.pointers.ContextRecord),
+          &e_info->context,
+          sizeof(e_info->context),
+          nullptr)) {
+    return false;
+  }
+
+  // Request dump.
+  if (!SetEvent(dump_start.Get()))
+    return false;
+
+  constexpr DWORD kTenSecondsInMs = 10 * 1000;
+  DWORD result = WaitForSingleObject(dump_done.Get(), kTenSecondsInMs);
+
+  if (result == WAIT_OBJECT_0) {
+    // The handler signalled that it has written a dump, so we can terminate the
+    // target - this takes over from WER, sorry WER.
+    TerminateProcess(e_info->hProcess, e_info->exceptionRecord.ExceptionCode);
+    return true;
+  }
+  // Maybe some other handler can have a go.
+  return false;
+}
+}  // namespace
+
+bool ExceptionEvent(
+    const DWORD* handled_exceptions,
+    size_t num_handled_exceptions,
+    const PVOID pContext,
+    const PWER_RUNTIME_EXCEPTION_INFORMATION pExceptionInformation) {
+  return ProcessException(handled_exceptions,
+                          num_handled_exceptions,
+                          pContext,
+                          pExceptionInformation);
+}
+
+}  // namespace crashpad::wer
diff --git a/extern/crashpad/crashpad/handler/win/wer/crashpad_wer.def b/extern/crashpad/crashpad/handler/win/wer/crashpad_wer.def
new file mode 100644
index 0000000000..5aa5c5191b
--- /dev/null
+++ b/extern/crashpad/crashpad/handler/win/wer/crashpad_wer.def
@@ -0,0 +1,20 @@
+; Copyright 2022 The Crashpad Authors
+;
+; 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.
+LIBRARY  "crashpad_wer.dll"
+
+EXPORTS
+  ; These are required for the WER api.
+  OutOfProcessExceptionEventCallback
+  OutOfProcessExceptionEventSignatureCallback
+  OutOfProcessExceptionEventDebuggerLaunchCallback
diff --git a/extern/crashpad/crashpad/handler/win/wer/crashpad_wer.h b/extern/crashpad/crashpad/handler/win/wer/crashpad_wer.h
new file mode 100644
index 0000000000..ee99e40c84
--- /dev/null
+++ b/extern/crashpad/crashpad/handler/win/wer/crashpad_wer.h
@@ -0,0 +1,47 @@
+// Copyright 2022 The Crashpad Authors
+//
+// 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.
+
+#ifndef CRASHPAD_HANDLER_WIN_WER_CRASHPAD_WER_H_
+#define CRASHPAD_HANDLER_WIN_WER_CRASHPAD_WER_H_
+
+#include <Windows.h>
+#include <werapi.h>
+
+namespace crashpad::wer {
+//! \brief Embedder calls this from OutOfProcessExceptionEventCallback().
+//!
+//! In the embedder's WER runtime exception helper, call this during
+//! OutOfProcessExceptionEventCallback().
+//!
+//! \param[in] handled_exceptions is an array of exception codes that the helper
+//!     should pass on to crashpad handler (if possible). Pass nullptr and set
+//!     num_handled_exceptions to 0 to pass every exception on to the crashpad
+//!     handler.
+//! \param[in] num_handled_exceptions is the number of elements in the array
+//!     passed to handled_exceptions.
+//! \param[in] pContext is the context provided by WerFault to the helper.
+//! \param[in] pExceptionInformation is the exception information provided by
+//!     WerFault to the helper DLL.
+//!
+//! \return `true` if the target process was dumped by the crashpad handler then
+//! terminated, or `false` otherwise.
+bool ExceptionEvent(
+    const DWORD* handled_exceptions,
+    size_t num_handled_exceptions,
+    const PVOID pContext,
+    const PWER_RUNTIME_EXCEPTION_INFORMATION pExceptionInformation);
+
+}  // namespace crashpad::wer
+
+#endif  // CRASHPAD_HANDLER_WIN_WER_CRASHPAD_WER_H_
diff --git a/extern/crashpad/crashpad/handler/win/wer/crashpad_wer.ver b/extern/crashpad/crashpad/handler/win/wer/crashpad_wer.ver
new file mode 100644
index 0000000000..0fee2e9f91
--- /dev/null
+++ b/extern/crashpad/crashpad/handler/win/wer/crashpad_wer.ver
@@ -0,0 +1,2 @@
+INTERNAL_NAME=crashpad_wer
+ORIGINAL_FILENAME=crashpad_wer.dll
diff --git a/extern/crashpad/crashpad/handler/win/wer/crashpad_wer_main.cc b/extern/crashpad/crashpad/handler/win/wer/crashpad_wer_main.cc
new file mode 100644
index 0000000000..1b767e38b3
--- /dev/null
+++ b/extern/crashpad/crashpad/handler/win/wer/crashpad_wer_main.cc
@@ -0,0 +1,86 @@
+// Copyright 2022 The Crashpad Authors
+//
+// 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.
+
+// See:
+// https://docs.microsoft.com/en-us/windows/win32/api/werapi/nf-werapi-werregisterruntimeexceptionmodule
+
+#include "handler/win/wer/crashpad_wer.h"
+
+#include <Windows.h>
+#include <werapi.h>
+
+// Functions that will be exported from the DLL.
+extern "C" {
+BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) {
+  return true;
+}
+
+// PFN_WER_RUNTIME_EXCEPTION_EVENT
+// pContext is the address of a crashpad::internal::WerRegistration in the
+// target process.
+HRESULT OutOfProcessExceptionEventCallback(
+    PVOID pContext,
+    const PWER_RUNTIME_EXCEPTION_INFORMATION pExceptionInformation,
+    BOOL* pbOwnershipClaimed,
+    PWSTR pwszEventName,
+    PDWORD pchSize,
+    PDWORD pdwSignatureCount) {
+  static constexpr DWORD wanted_exceptions[] = {
+      0xC0000602,  // STATUS_FAIL_FAST_EXCEPTION
+      0xC0000409,  // STATUS_STACK_BUFFER_OVERRUN
+  };
+  // Default to not-claiming as bailing out is easier.
+  *pbOwnershipClaimed = FALSE;
+  bool result = crashpad::wer::ExceptionEvent(
+      wanted_exceptions,
+      sizeof(wanted_exceptions) / sizeof(wanted_exceptions[0]),
+      pContext,
+      pExceptionInformation);
+
+  if (result) {
+    *pbOwnershipClaimed = TRUE;
+    // Technically we failed as we terminated the process.
+    return E_FAIL;
+  }
+  // Pass.
+  return S_OK;
+}
+
+// PFN_WER_RUNTIME_EXCEPTION_EVENT_SIGNATURE
+HRESULT OutOfProcessExceptionEventSignatureCallback(
+    PVOID pContext,
+    const PWER_RUNTIME_EXCEPTION_INFORMATION pExceptionInformation,
+    DWORD dwIndex,
+    PWSTR pwszName,
+    PDWORD pchName,
+    PWSTR pwszValue,
+    PDWORD pchValue) {
+  // We handle everything in the call to OutOfProcessExceptionEventCallback.
+  // This function should never be called.
+  return E_FAIL;
+}
+
+// PFN_WER_RUNTIME_EXCEPTION_DEBUGGER_LAUNCH
+HRESULT OutOfProcessExceptionEventDebuggerLaunchCallback(
+    PVOID pContext,
+    const PWER_RUNTIME_EXCEPTION_INFORMATION pExceptionInformation,
+    PBOOL pbIsCustomDebugger,
+    PWSTR pwszDebuggerLaunch,
+    PDWORD pchDebuggerLaunch,
+    PBOOL pbIsDebuggerAutolaunch) {
+  // We handle everything in the call to OutOfProcessExceptionEventCallback.
+  // This function should never be called.
+  return E_FAIL;
+}
+}  // extern "C"
diff --git a/extern/crashpad/crashpad/handler/win/wer/crashpad_wer_module_unittest.cc b/extern/crashpad/crashpad/handler/win/wer/crashpad_wer_module_unittest.cc
new file mode 100644
index 0000000000..529398f1df
--- /dev/null
+++ b/extern/crashpad/crashpad/handler/win/wer/crashpad_wer_module_unittest.cc
@@ -0,0 +1,90 @@
+// Copyright 2022 The Crashpad Authors
+//
+// 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.
+
+#include "client/crashpad_client.h"
+
+#include "base/files/file_path.h"
+#include "gtest/gtest.h"
+#include "test/test_paths.h"
+#include "util/win/registration_protocol_win.h"
+
+#include <Windows.h>
+#include <werapi.h>
+
+namespace crashpad {
+namespace test {
+namespace {
+base::FilePath ModulePath() {
+  auto dir = TestPaths::Executable().DirName();
+  return dir.Append(FILE_PATH_LITERAL("crashpad_wer.dll"));
+}
+
+// Quick sanity check of the module, can't really test dumping etc. outside of
+// WerFault.exe loading it.
+TEST(CrashpadWerModule, Basic) {
+  HRESULT res = 0;
+  // Module loads.
+  HMODULE hMod = LoadLibraryW(ModulePath().value().c_str());
+  ASSERT_TRUE(hMod);
+
+  // Required functions exist.
+  auto wref = reinterpret_cast<PFN_WER_RUNTIME_EXCEPTION_EVENT>(
+      GetProcAddress(hMod, WER_RUNTIME_EXCEPTION_EVENT_FUNCTION));
+  ASSERT_TRUE(wref);
+  auto wrees = reinterpret_cast<PFN_WER_RUNTIME_EXCEPTION_EVENT_SIGNATURE>(
+      GetProcAddress(hMod, WER_RUNTIME_EXCEPTION_EVENT_SIGNATURE_FUNCTION));
+  ASSERT_TRUE(wrees);
+  auto wredl = reinterpret_cast<PFN_WER_RUNTIME_EXCEPTION_DEBUGGER_LAUNCH>(
+      GetProcAddress(hMod, WER_RUNTIME_EXCEPTION_DEBUGGER_LAUNCH));
+  ASSERT_TRUE(wredl);
+
+  // Not-implemented functions return E_FAIL as expected.
+  res = wrees(nullptr, nullptr, 0, nullptr, nullptr, nullptr, nullptr);
+  ASSERT_EQ(res, E_FAIL);
+  res = wredl(nullptr, nullptr, nullptr, nullptr, nullptr, nullptr);
+  ASSERT_EQ(res, E_FAIL);
+
+  // Dummy args for OutOfProcessExceptionEventCallback.
+  WER_RUNTIME_EXCEPTION_INFORMATION wer_ex;
+  wer_ex.dwSize = sizeof(WER_RUNTIME_EXCEPTION_INFORMATION);
+  BOOL bClaimed = FALSE;
+
+  // No context => skip.
+  res = wref(nullptr, &wer_ex, &bClaimed, nullptr, nullptr, nullptr);
+  ASSERT_EQ(res, S_OK);
+  ASSERT_EQ(bClaimed, FALSE);
+
+  // Following tests only make sense if building on SDK >= 19041 as
+  // bIsFatalField only exists after that.
+#if defined(NTDDI_WIN10_VB) && (WDK_NTDDI_VERSION >= NTDDI_WIN10_VB)
+  crashpad::WerRegistration registration;
+  // Non-fatal exceptions are skipped.
+  wer_ex.bIsFatal = FALSE;
+  res = wref(&registration, &wer_ex, &bClaimed, nullptr, nullptr, nullptr);
+  ASSERT_EQ(res, S_OK);
+  ASSERT_EQ(bClaimed, FALSE);
+
+  // Fatal exception with unhandled code is skipped.
+  wer_ex.bIsFatal = TRUE;
+  wer_ex.exceptionRecord.ExceptionCode = 0xc0000005;
+  res = wref(&registration, &wer_ex, &bClaimed, nullptr, nullptr, nullptr);
+  ASSERT_EQ(res, S_OK);
+  ASSERT_EQ(bClaimed, FALSE);
+#endif  // defined(NTDDI_WIN10_VB) && WDK_NTDDI_VERSION >= NTDDI_WIN10_VB
+  FreeLibrary(hMod);
+}
+
+}  // namespace
+}  // namespace test
+}  // namespace crashpad
diff --git a/extern/crashpad/crashpad/handler/win/z7_test.cpp b/extern/crashpad/crashpad/handler/win/z7_test.cpp
index ad7b5d982e..dc93629e14 100644
--- a/extern/crashpad/crashpad/handler/win/z7_test.cpp
+++ b/extern/crashpad/crashpad/handler/win/z7_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/infra/config/PRESUBMIT.py b/extern/crashpad/crashpad/infra/config/PRESUBMIT.py
index a1bf82f78f..09ef66a222 100644
--- a/extern/crashpad/crashpad/infra/config/PRESUBMIT.py
+++ b/extern/crashpad/crashpad/infra/config/PRESUBMIT.py
@@ -1,4 +1,4 @@
-# Copyright 2018 The Crashpad Authors. All rights reserved.
+# Copyright 2018 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,13 +14,15 @@
 
 
 USE_PYTHON3 = True
+PRESUBMIT_VERSION = '2.0.0'
 
 
-def CheckChangeOnUpload(input_api, output_api):
+def CheckChangedLUCIConfigs(input_api, output_api):
     return input_api.canned_checks.CheckChangedLUCIConfigs(
         input_api, output_api)
 
 
-def CheckChangeOnCommit(input_api, output_api):
-    return input_api.canned_checks.CheckChangedLUCIConfigs(
-        input_api, output_api)
+def CheckLucicfgGenOutputMain(input_api, output_api):
+    return input_api.RunTests(
+        input_api.canned_checks.CheckLucicfgGenOutput(input_api, output_api,
+                                                      'main.star'))
diff --git a/extern/crashpad/crashpad/infra/config/generated/commit-queue.cfg b/extern/crashpad/crashpad/infra/config/generated/commit-queue.cfg
new file mode 100644
index 0000000000..154c6b0c8f
--- /dev/null
+++ b/extern/crashpad/crashpad/infra/config/generated/commit-queue.cfg
@@ -0,0 +1,86 @@
+# Auto-generated by lucicfg.
+# Do not modify manually.
+#
+# For the schema of this file, see Config message:
+#   https://config.luci.app/schemas/projects:commit-queue.cfg
+
+cq_status_host: "chromium-cq-status.appspot.com"
+submit_options {
+  max_burst: 4
+  burst_delay {
+    seconds: 480
+  }
+}
+config_groups {
+  name: "crashpad"
+  gerrit {
+    url: "https://chromium-review.googlesource.com"
+    projects {
+      name: "crashpad/crashpad"
+      ref_regexp: "refs/heads/.+"
+    }
+  }
+  verifiers {
+    gerrit_cq_ability {
+      committer_list: "project-crashpad-tryjob-access"
+      dry_run_access_list: "project-crashpad-tryjob-access"
+    }
+    tryjob {
+      builders {
+        name: "crashpad/try/crashpad_fuchsia_arm64_dbg"
+      }
+      builders {
+        name: "crashpad/try/crashpad_fuchsia_arm64_rel"
+      }
+      builders {
+        name: "crashpad/try/crashpad_fuchsia_x64_dbg"
+      }
+      builders {
+        name: "crashpad/try/crashpad_fuchsia_x64_rel"
+      }
+      builders {
+        name: "crashpad/try/crashpad_ios_arm64_dbg"
+      }
+      builders {
+        name: "crashpad/try/crashpad_ios_arm64_rel"
+      }
+      builders {
+        name: "crashpad/try/crashpad_ios_x64_dbg"
+      }
+      builders {
+        name: "crashpad/try/crashpad_ios_x64_rel"
+      }
+      builders {
+        name: "crashpad/try/crashpad_linux_x64_dbg"
+      }
+      builders {
+        name: "crashpad/try/crashpad_linux_x64_rel"
+      }
+      builders {
+        name: "crashpad/try/crashpad_mac_arm64_dbg"
+      }
+      builders {
+        name: "crashpad/try/crashpad_mac_arm64_rel"
+      }
+      builders {
+        name: "crashpad/try/crashpad_mac_x64_dbg"
+      }
+      builders {
+        name: "crashpad/try/crashpad_mac_x64_rel"
+      }
+      builders {
+        name: "crashpad/try/crashpad_win_x64_dbg"
+      }
+      builders {
+        name: "crashpad/try/crashpad_win_x64_rel"
+      }
+      retry_config {
+        single_quota: 1
+        global_quota: 2
+        failure_weight: 1
+        transient_failure_weight: 1
+        timeout_weight: 2
+      }
+    }
+  }
+}
diff --git a/extern/crashpad/crashpad/infra/config/generated/cr-buildbucket.cfg b/extern/crashpad/crashpad/infra/config/generated/cr-buildbucket.cfg
new file mode 100644
index 0000000000..afb4d53490
--- /dev/null
+++ b/extern/crashpad/crashpad/infra/config/generated/cr-buildbucket.cfg
@@ -0,0 +1,1198 @@
+# Auto-generated by lucicfg.
+# Do not modify manually.
+#
+# For the schema of this file, see BuildbucketCfg message:
+#   https://config.luci.app/schemas/projects:buildbucket.cfg
+
+buckets {
+  name: "ci"
+  acls {
+    role: WRITER
+    group: "project-crashpad-admins"
+  }
+  acls {
+    group: "all"
+  }
+  acls {
+    role: SCHEDULER
+    identity: "user:luci-scheduler@appspot.gserviceaccount.com"
+  }
+  swarming {
+    builders {
+      name: "crashpad_fuchsia_arm64_dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-24.04"
+      dimensions: "pool:luci.flex.ci"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$gatekeeper": {'
+        '    "group": "client.crashpad"'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "config": "Debug",'
+        '  "recipe": "crashpad/build",'
+        '  "target_cpu": "arm64",'
+        '  "target_os": "fuchsia"'
+        '}'
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "crashpad_fuchsia_arm64_rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-24.04"
+      dimensions: "pool:luci.flex.ci"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$gatekeeper": {'
+        '    "group": "client.crashpad"'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "config": "Release",'
+        '  "recipe": "crashpad/build",'
+        '  "target_cpu": "arm64",'
+        '  "target_os": "fuchsia"'
+        '}'
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "crashpad_fuchsia_x64_dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-24.04"
+      dimensions: "pool:luci.flex.ci"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$gatekeeper": {'
+        '    "group": "client.crashpad"'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "config": "Debug",'
+        '  "recipe": "crashpad/build",'
+        '  "target_os": "fuchsia"'
+        '}'
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "crashpad_fuchsia_x64_rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-24.04"
+      dimensions: "pool:luci.flex.ci"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$gatekeeper": {'
+        '    "group": "client.crashpad"'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "config": "Release",'
+        '  "recipe": "crashpad/build",'
+        '  "target_os": "fuchsia"'
+        '}'
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "crashpad_ios_arm64_dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-15"
+      dimensions: "pool:luci.flex.ci"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "17c52"'
+        '  },'
+        '  "$gatekeeper": {'
+        '    "group": "client.crashpad"'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "config": "Debug",'
+        '  "recipe": "crashpad/build",'
+        '  "target_cpu": "arm64",'
+        '  "target_os": "ios"'
+        '}'
+      execution_timeout_secs: 10800
+      caches {
+        name: "osx_sdk_ios"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "crashpad_ios_arm64_rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-15"
+      dimensions: "pool:luci.flex.ci"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "17c52"'
+        '  },'
+        '  "$gatekeeper": {'
+        '    "group": "client.crashpad"'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "config": "Release",'
+        '  "recipe": "crashpad/build",'
+        '  "target_cpu": "arm64",'
+        '  "target_os": "ios"'
+        '}'
+      execution_timeout_secs: 10800
+      caches {
+        name: "osx_sdk_ios"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "crashpad_ios_x64_dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-15"
+      dimensions: "pool:luci.flex.ci"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "17c52"'
+        '  },'
+        '  "$gatekeeper": {'
+        '    "group": "client.crashpad"'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "config": "Debug",'
+        '  "recipe": "crashpad/build",'
+        '  "target_os": "ios"'
+        '}'
+      execution_timeout_secs: 10800
+      caches {
+        name: "osx_sdk_ios"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "crashpad_ios_x64_rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-15"
+      dimensions: "pool:luci.flex.ci"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "17c52"'
+        '  },'
+        '  "$gatekeeper": {'
+        '    "group": "client.crashpad"'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "config": "Release",'
+        '  "recipe": "crashpad/build",'
+        '  "target_os": "ios"'
+        '}'
+      execution_timeout_secs: 10800
+      caches {
+        name: "osx_sdk_ios"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "crashpad_linux_x64_dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-24.04"
+      dimensions: "pool:luci.flex.ci"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$gatekeeper": {'
+        '    "group": "client.crashpad"'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "config": "Debug",'
+        '  "recipe": "crashpad/build",'
+        '  "target_os": "linux"'
+        '}'
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "crashpad_linux_x64_rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-24.04"
+      dimensions: "pool:luci.flex.ci"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$gatekeeper": {'
+        '    "group": "client.crashpad"'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "config": "Release",'
+        '  "recipe": "crashpad/build",'
+        '  "target_os": "linux"'
+        '}'
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "crashpad_mac_arm64_dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "os:Mac-15"
+      dimensions: "pool:luci.flex.ci"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "17c52"'
+        '  },'
+        '  "$gatekeeper": {'
+        '    "group": "client.crashpad"'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "config": "Debug",'
+        '  "recipe": "crashpad/build",'
+        '  "target_cpu": "arm64",'
+        '  "target_os": "mac"'
+        '}'
+      execution_timeout_secs: 10800
+      caches {
+        name: "osx_sdk_mac"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "crashpad_mac_arm64_rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "os:Mac-15"
+      dimensions: "pool:luci.flex.ci"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "17c52"'
+        '  },'
+        '  "$gatekeeper": {'
+        '    "group": "client.crashpad"'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "config": "Release",'
+        '  "recipe": "crashpad/build",'
+        '  "target_cpu": "arm64",'
+        '  "target_os": "mac"'
+        '}'
+      execution_timeout_secs: 10800
+      caches {
+        name: "osx_sdk_mac"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "crashpad_mac_x64_dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-15"
+      dimensions: "pool:luci.flex.ci"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "17c52"'
+        '  },'
+        '  "$gatekeeper": {'
+        '    "group": "client.crashpad"'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "config": "Debug",'
+        '  "recipe": "crashpad/build",'
+        '  "target_os": "mac"'
+        '}'
+      execution_timeout_secs: 10800
+      caches {
+        name: "osx_sdk_mac"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "crashpad_mac_x64_rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-15"
+      dimensions: "pool:luci.flex.ci"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "17c52"'
+        '  },'
+        '  "$gatekeeper": {'
+        '    "group": "client.crashpad"'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "config": "Release",'
+        '  "recipe": "crashpad/build",'
+        '  "target_os": "mac"'
+        '}'
+      execution_timeout_secs: 10800
+      caches {
+        name: "osx_sdk_mac"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "crashpad_win_x64_dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.flex.ci"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$depot_tools/windows_sdk": {'
+        '    "version": "uploaded:2024-01-11"'
+        '  },'
+        '  "$gatekeeper": {'
+        '    "group": "client.crashpad"'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "config": "Debug",'
+        '  "recipe": "crashpad/build",'
+        '  "target_os": "win"'
+        '}'
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "crashpad_win_x64_rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.flex.ci"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$depot_tools/windows_sdk": {'
+        '    "version": "uploaded:2024-01-11"'
+        '  },'
+        '  "$gatekeeper": {'
+        '    "group": "client.crashpad"'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "config": "Release",'
+        '  "recipe": "crashpad/build",'
+        '  "target_os": "win"'
+        '}'
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+  }
+  shadow: "ci.shadow"
+}
+buckets {
+  name: "ci.shadow"
+  acls {
+    group: "all"
+  }
+  constraints {
+    pools: "luci.flex.ci"
+    service_accounts: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  dynamic_builder_template {}
+}
+buckets {
+  name: "try"
+  acls {
+    role: WRITER
+    group: "project-crashpad-admins"
+  }
+  acls {
+    role: WRITER
+    group: "service-account-crashpad-cq"
+  }
+  acls {
+    group: "all"
+  }
+  acls {
+    role: SCHEDULER
+    group: "project-crashpad-tryjob-access"
+  }
+  acls {
+    role: SCHEDULER
+    group: "service-account-cq"
+  }
+  swarming {
+    builders {
+      name: "crashpad_fuchsia_arm64_dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-24.04"
+      dimensions: "pool:luci.flex.try"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "config": "Debug",'
+        '  "recipe": "crashpad/build",'
+        '  "target_cpu": "arm64",'
+        '  "target_os": "fuchsia"'
+        '}'
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "crashpad_fuchsia_arm64_rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-24.04"
+      dimensions: "pool:luci.flex.try"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "config": "Release",'
+        '  "recipe": "crashpad/build",'
+        '  "target_cpu": "arm64",'
+        '  "target_os": "fuchsia"'
+        '}'
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "crashpad_fuchsia_x64_dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-24.04"
+      dimensions: "pool:luci.flex.try"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "config": "Debug",'
+        '  "recipe": "crashpad/build",'
+        '  "target_os": "fuchsia"'
+        '}'
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "crashpad_fuchsia_x64_rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-24.04"
+      dimensions: "pool:luci.flex.try"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "config": "Release",'
+        '  "recipe": "crashpad/build",'
+        '  "target_os": "fuchsia"'
+        '}'
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "crashpad_ios_arm64_dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-15"
+      dimensions: "pool:luci.flex.try"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "17c52"'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "config": "Debug",'
+        '  "recipe": "crashpad/build",'
+        '  "target_cpu": "arm64",'
+        '  "target_os": "ios"'
+        '}'
+      execution_timeout_secs: 10800
+      caches {
+        name: "osx_sdk_ios"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "crashpad_ios_arm64_rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-15"
+      dimensions: "pool:luci.flex.try"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "17c52"'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "config": "Release",'
+        '  "recipe": "crashpad/build",'
+        '  "target_cpu": "arm64",'
+        '  "target_os": "ios"'
+        '}'
+      execution_timeout_secs: 10800
+      caches {
+        name: "osx_sdk_ios"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "crashpad_ios_x64_dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-15"
+      dimensions: "pool:luci.flex.try"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "17c52"'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "config": "Debug",'
+        '  "recipe": "crashpad/build",'
+        '  "target_os": "ios"'
+        '}'
+      execution_timeout_secs: 10800
+      caches {
+        name: "osx_sdk_ios"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "crashpad_ios_x64_rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-15"
+      dimensions: "pool:luci.flex.try"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "17c52"'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "config": "Release",'
+        '  "recipe": "crashpad/build",'
+        '  "target_os": "ios"'
+        '}'
+      execution_timeout_secs: 10800
+      caches {
+        name: "osx_sdk_ios"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "crashpad_linux_x64_dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-24.04"
+      dimensions: "pool:luci.flex.try"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "config": "Debug",'
+        '  "recipe": "crashpad/build",'
+        '  "target_os": "linux"'
+        '}'
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "crashpad_linux_x64_rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-24.04"
+      dimensions: "pool:luci.flex.try"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "config": "Release",'
+        '  "recipe": "crashpad/build",'
+        '  "target_os": "linux"'
+        '}'
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "crashpad_mac_arm64_dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "os:Mac-15"
+      dimensions: "pool:luci.flex.try"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "17c52"'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "config": "Debug",'
+        '  "recipe": "crashpad/build",'
+        '  "target_cpu": "arm64",'
+        '  "target_os": "mac"'
+        '}'
+      execution_timeout_secs: 10800
+      caches {
+        name: "osx_sdk_mac"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "crashpad_mac_arm64_rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "os:Mac-15"
+      dimensions: "pool:luci.flex.try"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "17c52"'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "config": "Release",'
+        '  "recipe": "crashpad/build",'
+        '  "target_cpu": "arm64",'
+        '  "target_os": "mac"'
+        '}'
+      execution_timeout_secs: 10800
+      caches {
+        name: "osx_sdk_mac"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "crashpad_mac_x64_dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-15"
+      dimensions: "pool:luci.flex.try"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "17c52"'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "config": "Debug",'
+        '  "recipe": "crashpad/build",'
+        '  "target_os": "mac"'
+        '}'
+      execution_timeout_secs: 10800
+      caches {
+        name: "osx_sdk_mac"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "crashpad_mac_x64_rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-15"
+      dimensions: "pool:luci.flex.try"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "17c52"'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "config": "Release",'
+        '  "recipe": "crashpad/build",'
+        '  "target_os": "mac"'
+        '}'
+      execution_timeout_secs: 10800
+      caches {
+        name: "osx_sdk_mac"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "crashpad_win_x64_dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.flex.try"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$depot_tools/windows_sdk": {'
+        '    "version": "uploaded:2024-01-11"'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "config": "Debug",'
+        '  "recipe": "crashpad/build",'
+        '  "target_os": "win"'
+        '}'
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "crashpad_win_x64_rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.flex.try"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$depot_tools/windows_sdk": {'
+        '    "version": "uploaded:2024-01-11"'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "config": "Release",'
+        '  "recipe": "crashpad/build",'
+        '  "target_os": "win"'
+        '}'
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+  }
+  shadow: "try.shadow"
+}
+buckets {
+  name: "try.shadow"
+  acls {
+    group: "all"
+  }
+  constraints {
+    pools: "luci.flex.try"
+    service_accounts: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  dynamic_builder_template {}
+}
diff --git a/extern/crashpad/crashpad/infra/config/generated/luci-logdog.cfg b/extern/crashpad/crashpad/infra/config/generated/luci-logdog.cfg
new file mode 100644
index 0000000000..01a391261d
--- /dev/null
+++ b/extern/crashpad/crashpad/infra/config/generated/luci-logdog.cfg
@@ -0,0 +1,9 @@
+# Auto-generated by lucicfg.
+# Do not modify manually.
+#
+# For the schema of this file, see ProjectConfig message:
+#   https://config.luci.app/schemas/projects:luci-logdog.cfg
+
+reader_auth_groups: "all"
+writer_auth_groups: "luci-logdog-chromium-writers"
+archive_gs_bucket: "chromium-luci-logdog"
diff --git a/extern/crashpad/crashpad/infra/config/generated/luci-milo.cfg b/extern/crashpad/crashpad/infra/config/generated/luci-milo.cfg
new file mode 100644
index 0000000000..9ff20ab344
--- /dev/null
+++ b/extern/crashpad/crashpad/infra/config/generated/luci-milo.cfg
@@ -0,0 +1,147 @@
+# Auto-generated by lucicfg.
+# Do not modify manually.
+#
+# For the schema of this file, see Project message:
+#   https://config.luci.app/schemas/projects:luci-milo.cfg
+
+consoles {
+  id: "main"
+  name: "Crashpad Main Console"
+  repo_url: "https://chromium.googlesource.com/crashpad/crashpad"
+  refs: "regexp:refs/heads/main"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.crashpad.ci/crashpad_fuchsia_arm64_dbg"
+    category: "fuchsia|arm64"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.crashpad.ci/crashpad_fuchsia_arm64_rel"
+    category: "fuchsia|arm64"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.crashpad.ci/crashpad_fuchsia_x64_dbg"
+    category: "fuchsia|x64"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.crashpad.ci/crashpad_fuchsia_x64_rel"
+    category: "fuchsia|x64"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.crashpad.ci/crashpad_ios_arm64_dbg"
+    category: "ios|arm64"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.crashpad.ci/crashpad_ios_arm64_rel"
+    category: "ios|arm64"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.crashpad.ci/crashpad_ios_x64_dbg"
+    category: "ios|x64"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.crashpad.ci/crashpad_ios_x64_rel"
+    category: "ios|x64"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.crashpad.ci/crashpad_linux_x64_dbg"
+    category: "linux|x64"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.crashpad.ci/crashpad_linux_x64_rel"
+    category: "linux|x64"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.crashpad.ci/crashpad_mac_x64_dbg"
+    category: "mac|x64"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.crashpad.ci/crashpad_mac_x64_rel"
+    category: "mac|x64"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.crashpad.ci/crashpad_mac_arm64_dbg"
+    category: "mac|arm64"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.crashpad.ci/crashpad_mac_arm64_rel"
+    category: "mac|arm64"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.crashpad.ci/crashpad_win_x64_dbg"
+    category: "win|x64"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.crashpad.ci/crashpad_win_x64_rel"
+    category: "win|x64"
+    short_name: "rel"
+  }
+}
+consoles {
+  id: "try"
+  name: "Crashpad Try Builders"
+  builders {
+    name: "buildbucket/luci.crashpad.try/crashpad_fuchsia_arm64_dbg"
+  }
+  builders {
+    name: "buildbucket/luci.crashpad.try/crashpad_fuchsia_arm64_rel"
+  }
+  builders {
+    name: "buildbucket/luci.crashpad.try/crashpad_fuchsia_x64_dbg"
+  }
+  builders {
+    name: "buildbucket/luci.crashpad.try/crashpad_fuchsia_x64_rel"
+  }
+  builders {
+    name: "buildbucket/luci.crashpad.try/crashpad_ios_arm64_dbg"
+  }
+  builders {
+    name: "buildbucket/luci.crashpad.try/crashpad_ios_arm64_rel"
+  }
+  builders {
+    name: "buildbucket/luci.crashpad.try/crashpad_ios_x64_dbg"
+  }
+  builders {
+    name: "buildbucket/luci.crashpad.try/crashpad_ios_x64_rel"
+  }
+  builders {
+    name: "buildbucket/luci.crashpad.try/crashpad_linux_x64_dbg"
+  }
+  builders {
+    name: "buildbucket/luci.crashpad.try/crashpad_linux_x64_rel"
+  }
+  builders {
+    name: "buildbucket/luci.crashpad.try/crashpad_mac_x64_dbg"
+  }
+  builders {
+    name: "buildbucket/luci.crashpad.try/crashpad_mac_x64_rel"
+  }
+  builders {
+    name: "buildbucket/luci.crashpad.try/crashpad_mac_arm64_dbg"
+  }
+  builders {
+    name: "buildbucket/luci.crashpad.try/crashpad_mac_arm64_rel"
+  }
+  builders {
+    name: "buildbucket/luci.crashpad.try/crashpad_win_x64_dbg"
+  }
+  builders {
+    name: "buildbucket/luci.crashpad.try/crashpad_win_x64_rel"
+  }
+  builder_view_only: true
+}
+logo_url: "https://storage.googleapis.com/chrome-infra-public/logo/crashpad-logo.svg"
diff --git a/extern/crashpad/crashpad/infra/config/generated/luci-scheduler.cfg b/extern/crashpad/crashpad/infra/config/generated/luci-scheduler.cfg
new file mode 100644
index 0000000000..5ac9433a13
--- /dev/null
+++ b/extern/crashpad/crashpad/infra/config/generated/luci-scheduler.cfg
@@ -0,0 +1,201 @@
+# Auto-generated by lucicfg.
+# Do not modify manually.
+#
+# For the schema of this file, see ProjectConfig message:
+#   https://config.luci.app/schemas/projects:luci-scheduler.cfg
+
+job {
+  id: "crashpad_fuchsia_arm64_dbg"
+  realm: "ci"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "crashpad_fuchsia_arm64_dbg"
+  }
+}
+job {
+  id: "crashpad_fuchsia_arm64_rel"
+  realm: "ci"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "crashpad_fuchsia_arm64_rel"
+  }
+}
+job {
+  id: "crashpad_fuchsia_x64_dbg"
+  realm: "ci"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "crashpad_fuchsia_x64_dbg"
+  }
+}
+job {
+  id: "crashpad_fuchsia_x64_rel"
+  realm: "ci"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "crashpad_fuchsia_x64_rel"
+  }
+}
+job {
+  id: "crashpad_ios_arm64_dbg"
+  realm: "ci"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "crashpad_ios_arm64_dbg"
+  }
+}
+job {
+  id: "crashpad_ios_arm64_rel"
+  realm: "ci"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "crashpad_ios_arm64_rel"
+  }
+}
+job {
+  id: "crashpad_ios_x64_dbg"
+  realm: "ci"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "crashpad_ios_x64_dbg"
+  }
+}
+job {
+  id: "crashpad_ios_x64_rel"
+  realm: "ci"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "crashpad_ios_x64_rel"
+  }
+}
+job {
+  id: "crashpad_linux_x64_dbg"
+  realm: "ci"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "crashpad_linux_x64_dbg"
+  }
+}
+job {
+  id: "crashpad_linux_x64_rel"
+  realm: "ci"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "crashpad_linux_x64_rel"
+  }
+}
+job {
+  id: "crashpad_mac_arm64_dbg"
+  realm: "ci"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "crashpad_mac_arm64_dbg"
+  }
+}
+job {
+  id: "crashpad_mac_arm64_rel"
+  realm: "ci"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "crashpad_mac_arm64_rel"
+  }
+}
+job {
+  id: "crashpad_mac_x64_dbg"
+  realm: "ci"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "crashpad_mac_x64_dbg"
+  }
+}
+job {
+  id: "crashpad_mac_x64_rel"
+  realm: "ci"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "crashpad_mac_x64_rel"
+  }
+}
+job {
+  id: "crashpad_win_x64_dbg"
+  realm: "ci"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "crashpad_win_x64_dbg"
+  }
+}
+job {
+  id: "crashpad_win_x64_rel"
+  realm: "ci"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "crashpad_win_x64_rel"
+  }
+}
+trigger {
+  id: "master-gitiles-trigger"
+  realm: "ci"
+  acl_sets: "ci"
+  triggers: "crashpad_fuchsia_arm64_dbg"
+  triggers: "crashpad_fuchsia_arm64_rel"
+  triggers: "crashpad_fuchsia_x64_dbg"
+  triggers: "crashpad_fuchsia_x64_rel"
+  triggers: "crashpad_ios_arm64_dbg"
+  triggers: "crashpad_ios_arm64_rel"
+  triggers: "crashpad_ios_x64_dbg"
+  triggers: "crashpad_ios_x64_rel"
+  triggers: "crashpad_linux_x64_dbg"
+  triggers: "crashpad_linux_x64_rel"
+  triggers: "crashpad_mac_arm64_dbg"
+  triggers: "crashpad_mac_arm64_rel"
+  triggers: "crashpad_mac_x64_dbg"
+  triggers: "crashpad_mac_x64_rel"
+  triggers: "crashpad_win_x64_dbg"
+  triggers: "crashpad_win_x64_rel"
+  gitiles {
+    repo: "https://chromium.googlesource.com/crashpad/crashpad"
+    refs: "regexp:refs/heads/main"
+  }
+}
+acl_sets {
+  name: "ci"
+  acls {
+    role: OWNER
+    granted_to: "group:project-crashpad-admins"
+  }
+  acls {
+    granted_to: "group:all"
+  }
+}
diff --git a/extern/crashpad/crashpad/infra/config/generated/project.cfg b/extern/crashpad/crashpad/infra/config/generated/project.cfg
new file mode 100644
index 0000000000..daaf1fb611
--- /dev/null
+++ b/extern/crashpad/crashpad/infra/config/generated/project.cfg
@@ -0,0 +1,15 @@
+# Auto-generated by lucicfg.
+# Do not modify manually.
+#
+# For the schema of this file, see ProjectCfg message:
+#   https://config.luci.app/schemas/projects:project.cfg
+
+name: "crashpad"
+access: "group:all"
+lucicfg {
+  version: "1.46.2"
+  package_dir: ".."
+  config_dir: "generated"
+  entry_point: "main.star"
+  experiments: "crbug.com/1182002"
+}
diff --git a/extern/crashpad/crashpad/infra/config/generated/realms.cfg b/extern/crashpad/crashpad/infra/config/generated/realms.cfg
new file mode 100644
index 0000000000..84a8c69904
--- /dev/null
+++ b/extern/crashpad/crashpad/infra/config/generated/realms.cfg
@@ -0,0 +1,87 @@
+# Auto-generated by lucicfg.
+# Do not modify manually.
+#
+# For the schema of this file, see RealmsCfg message:
+#   https://config.luci.app/schemas/projects:realms.cfg
+
+realms {
+  name: "@root"
+  bindings {
+    role: "role/buildbucket.reader"
+    principals: "group:all"
+  }
+  bindings {
+    role: "role/configs.reader"
+    principals: "group:all"
+  }
+  bindings {
+    role: "role/logdog.reader"
+    principals: "group:all"
+  }
+  bindings {
+    role: "role/logdog.writer"
+    principals: "group:luci-logdog-chromium-writers"
+  }
+  bindings {
+    role: "role/scheduler.owner"
+    principals: "group:project-crashpad-admins"
+  }
+  bindings {
+    role: "role/scheduler.reader"
+    principals: "group:all"
+  }
+}
+realms {
+  name: "ci"
+  bindings {
+    role: "role/buildbucket.builderServiceAccount"
+    principals: "user:crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  bindings {
+    role: "role/buildbucket.owner"
+    principals: "group:project-crashpad-admins"
+  }
+  bindings {
+    role: "role/buildbucket.triggerer"
+    principals: "user:luci-scheduler@appspot.gserviceaccount.com"
+  }
+}
+realms {
+  name: "ci.shadow"
+  bindings {
+    role: "role/buildbucket.builderServiceAccount"
+    principals: "user:crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  bindings {
+    role: "role/buildbucket.creator"
+    principals: "group:mdb/chrome-build-access-sphinx"
+  }
+}
+realms {
+  name: "try"
+  bindings {
+    role: "role/buildbucket.builderServiceAccount"
+    principals: "user:crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  bindings {
+    role: "role/buildbucket.owner"
+    principals: "group:project-crashpad-admins"
+    principals: "group:service-account-crashpad-cq"
+  }
+  bindings {
+    role: "role/buildbucket.triggerer"
+    principals: "group:project-crashpad-tryjob-access"
+    principals: "group:service-account-cq"
+  }
+}
+realms {
+  name: "try.shadow"
+  bindings {
+    role: "role/buildbucket.builderServiceAccount"
+    principals: "user:crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  bindings {
+    role: "role/buildbucket.creator"
+    principals: "group:mdb/chrome-build-access-sphinx"
+  }
+}
diff --git a/extern/crashpad/crashpad/infra/config/main.star b/extern/crashpad/crashpad/infra/config/main.star
new file mode 100644
index 0000000000..5e0de5343b
--- /dev/null
+++ b/extern/crashpad/crashpad/infra/config/main.star
@@ -0,0 +1,319 @@
+#!/usr/bin/env lucicfg
+
+# Copyright 2021 The Crashpad Authors
+#
+# 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.
+
+lucicfg.check_version("1.30.9", "Please update depot_tools")
+
+REPO_URL = "https://chromium.googlesource.com/crashpad/crashpad"
+REVIEW_URL = "https://chromium-review.googlesource.com/crashpad/crashpad"
+
+# Use LUCI Scheduler BBv2 names and add Scheduler realms configs.
+lucicfg.enable_experiment("crbug.com/1182002")
+
+luci.project(
+    name = "crashpad",
+    buildbucket = "cr-buildbucket.appspot.com",
+    swarming = "chromium-swarm.appspot.com",
+    acls = [
+        acl.entry(
+            roles = [
+                acl.LOGDOG_READER,
+                acl.PROJECT_CONFIGS_READER,
+                acl.SCHEDULER_READER,
+                acl.BUILDBUCKET_READER,
+            ],
+            groups = "all",
+        ),
+        acl.entry(
+            roles = acl.LOGDOG_WRITER,
+            groups = "luci-logdog-chromium-writers",
+        ),
+        acl.entry(
+            roles = acl.SCHEDULER_OWNER,
+            groups = "project-crashpad-admins",
+        ),
+    ],
+    logdog = "luci-logdog.appspot.com",
+    milo = "luci-milo.appspot.com",
+    scheduler = "luci-scheduler.appspot.com",
+)
+
+luci.cq(
+    status_host = "chromium-cq-status.appspot.com",
+    submit_max_burst = 4,
+    submit_burst_delay = 8 * time.minute,
+)
+
+luci.cq_group(
+    name = "crashpad",
+    watch = cq.refset(repo = REVIEW_URL, refs = ["refs/heads/.+"]),
+    retry_config = cq.retry_config(
+        single_quota = 1,
+        global_quota = 2,
+        failure_weight = 1,
+        transient_failure_weight = 1,
+        timeout_weight = 2,
+    ),
+    acls = [
+        acl.entry(
+            roles = acl.CQ_COMMITTER,
+            groups = "project-crashpad-tryjob-access",
+        ),
+        acl.entry(
+            roles = acl.CQ_DRY_RUNNER,
+            groups = "project-crashpad-tryjob-access",
+        ),
+    ],
+)
+
+luci.gitiles_poller(
+    name = "master-gitiles-trigger",
+    bucket = "ci",
+    repo = REPO_URL,
+)
+
+luci.logdog(
+    gs_bucket = "chromium-luci-logdog",
+)
+
+luci.milo(
+    logo = "https://storage.googleapis.com/chrome-infra-public/logo/crashpad-logo.svg",
+)
+
+luci.console_view(
+    name = "main",
+    repo = REPO_URL,
+    title = "Crashpad Main Console",
+)
+
+luci.list_view(
+    name = "try",
+    title = "Crashpad Try Builders",
+)
+
+luci.bucket(
+    name = "ci",
+    acls = [
+        acl.entry(
+            acl.BUILDBUCKET_OWNER,
+            groups = "project-crashpad-admins",
+        ),
+        acl.entry(
+            acl.BUILDBUCKET_TRIGGERER,
+            users = "luci-scheduler@appspot.gserviceaccount.com",
+        ),
+    ],
+)
+
+luci.bucket(
+    name = "ci.shadow",
+    shadows = "ci",
+    constraints = luci.bucket_constraints(
+        pools = ["luci.flex.ci"],
+        service_accounts = [
+            "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com",
+        ],
+    ),
+    bindings = [
+        # For led permissions.
+        luci.binding(
+            roles = "role/buildbucket.creator",
+            groups = [
+                "mdb/chrome-build-access-sphinx",
+            ],
+        ),
+    ],
+    dynamic = True,
+)
+
+luci.bucket(
+    name = "try",
+    acls = [
+        acl.entry(
+            acl.BUILDBUCKET_OWNER,
+            groups = [
+                "service-account-crashpad-cq",
+                "project-crashpad-admins",
+            ],
+        ),
+        acl.entry(
+            acl.BUILDBUCKET_TRIGGERER,
+            groups = "service-account-cq",
+        ),
+        acl.entry(
+            acl.BUILDBUCKET_TRIGGERER,
+            groups = "project-crashpad-tryjob-access",
+        ),
+    ],
+)
+
+luci.bucket(
+    name = "try.shadow",
+    shadows = "try",
+    constraints = luci.bucket_constraints(
+        pools = ["luci.flex.try"],
+        service_accounts = [
+            "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com",
+        ],
+    ),
+    bindings = [
+        # For led permissions.
+        luci.binding(
+            roles = "role/buildbucket.creator",
+            groups = [
+                "mdb/chrome-build-access-sphinx",
+            ],
+        ),
+    ],
+    dynamic = True,
+)
+
+def crashpad_recipe():
+    return luci.recipe(
+        name = "crashpad/build",
+        cipd_package = "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",
+        use_python3 = True,
+    )
+
+def crashpad_caches(platform):
+    if platform == "ios":
+        return [swarming.cache("osx_sdk", name = "osx_sdk_ios")]
+    elif platform == "mac":
+        return [swarming.cache("osx_sdk", name = "osx_sdk_mac")]
+
+def crashpad_dimensions(platform, cpu, bucket):
+    dimensions = {}
+    dimensions["cpu"] = "x86-64"
+    dimensions["pool"] = "luci.flex." + bucket
+
+    if platform == "fuchsia":
+        dimensions["os"] = "Ubuntu-24.04"
+    elif platform == "ios":
+        dimensions["os"] = "Mac-15"
+    elif platform == "linux":
+        dimensions["os"] = "Ubuntu-24.04"
+    elif platform == "mac":
+        dimensions["os"] = "Mac-15"
+        if cpu == "arm64":
+            dimensions["cpu"] = cpu
+    elif platform == "win":
+        dimensions["os"] = "Windows-10"
+
+    if platform == "fuchsia" or platform == "linux" or platform == "win":
+        dimensions["cores"] = "8"
+
+    return dimensions
+
+def crashpad_properties(platform, cpu, config, bucket):
+    properties = {}
+    properties["target_os"] = platform
+    properties["$kitchen"] = {
+        "devshell": True,
+        "git_auth": True,
+    }
+
+    if cpu != "x64":
+        properties["target_cpu"] = cpu
+
+    if platform == "win":
+        properties["$depot_tools/windows_sdk"] = {
+            "version": "uploaded:2024-01-11",
+        }
+
+    if platform == "mac" or platform == "ios":
+        properties["$depot_tools/osx_sdk"] = {
+            "sdk_version": "17c52",
+        }
+
+    if bucket == "ci":
+        properties["$gatekeeper"] = {
+            "group": "client.crashpad",
+        }
+
+    if config == "dbg":
+        properties["config"] = "Debug"
+    elif config == "rel":
+        properties["config"] = "Release"
+
+    return properties
+
+def crashpad_builder(platform, cpu, config, bucket):
+    name = "_".join(["crashpad", platform, cpu, config])
+    triggered_by = None
+
+    if bucket == "ci":
+        luci.console_view_entry(
+            builder = "ci/" + name,
+            console_view = "main",
+            short_name = config,
+            category = platform + "|" + cpu,
+        )
+        triggered_by = ["master-gitiles-trigger"]
+    elif bucket == "try":
+        luci.list_view_entry(
+            builder = "try/" + name,
+            list_view = "try",
+        )
+        luci.cq_tryjob_verifier(
+            "try/" + name,
+            cq_group = "crashpad",
+        )
+
+    return luci.builder(
+        name = name,
+        bucket = bucket,
+        executable = crashpad_recipe(),
+        build_numbers = True,
+        caches = crashpad_caches(platform),
+        dimensions = crashpad_dimensions(platform, cpu, bucket),
+        execution_timeout = 3 * time.hour,
+        properties = crashpad_properties(platform, cpu, config, bucket),
+        service_account = "crashpad-" + bucket + "-builder@chops-service-accounts.iam.gserviceaccount.com",
+        triggered_by = triggered_by,
+    )
+
+crashpad_builder("fuchsia", "arm64", "dbg", "ci")
+crashpad_builder("fuchsia", "arm64", "rel", "ci")
+crashpad_builder("fuchsia", "x64", "dbg", "ci")
+crashpad_builder("fuchsia", "x64", "rel", "ci")
+crashpad_builder("ios", "arm64", "dbg", "ci")
+crashpad_builder("ios", "arm64", "rel", "ci")
+crashpad_builder("ios", "x64", "dbg", "ci")
+crashpad_builder("ios", "x64", "rel", "ci")
+crashpad_builder("linux", "x64", "dbg", "ci")
+crashpad_builder("linux", "x64", "rel", "ci")
+crashpad_builder("mac", "x64", "dbg", "ci")
+crashpad_builder("mac", "x64", "rel", "ci")
+crashpad_builder("mac", "arm64", "dbg", "ci")
+crashpad_builder("mac", "arm64", "rel", "ci")
+crashpad_builder("win", "x64", "dbg", "ci")
+crashpad_builder("win", "x64", "rel", "ci")
+
+crashpad_builder("fuchsia", "arm64", "dbg", "try")
+crashpad_builder("fuchsia", "arm64", "rel", "try")
+crashpad_builder("fuchsia", "x64", "dbg", "try")
+crashpad_builder("fuchsia", "x64", "rel", "try")
+crashpad_builder("ios", "arm64", "dbg", "try")
+crashpad_builder("ios", "arm64", "rel", "try")
+crashpad_builder("ios", "x64", "dbg", "try")
+crashpad_builder("ios", "x64", "rel", "try")
+crashpad_builder("linux", "x64", "dbg", "try")
+crashpad_builder("linux", "x64", "rel", "try")
+crashpad_builder("mac", "x64", "dbg", "try")
+crashpad_builder("mac", "x64", "rel", "try")
+crashpad_builder("mac", "arm64", "dbg", "try")
+crashpad_builder("mac", "arm64", "rel", "try")
+crashpad_builder("win", "x64", "dbg", "try")
+crashpad_builder("win", "x64", "rel", "try")
diff --git a/extern/crashpad/crashpad/minidump/BUILD.gn b/extern/crashpad/crashpad/minidump/BUILD.gn
index 515ec0f377..5b235aa5b6 100644
--- a/extern/crashpad/crashpad/minidump/BUILD.gn
+++ b/extern/crashpad/crashpad/minidump/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2015 The Crashpad Authors. All rights reserved.
+# Copyright 2015 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -52,6 +52,8 @@ crashpad_static_library("minidump") {
     "minidump_system_info_writer.h",
     "minidump_thread_id_map.cc",
     "minidump_thread_id_map.h",
+    "minidump_thread_name_list_writer.cc",
+    "minidump_thread_name_list_writer.h",
     "minidump_thread_writer.cc",
     "minidump_thread_writer.h",
     "minidump_unloaded_module_writer.cc",
@@ -74,8 +76,8 @@ crashpad_static_library("minidump") {
   ]
 
   deps = [
-    "../snapshot",
     "$mini_chromium_source_parent:base",
+    "../snapshot",
     "../util",
   ]
 
@@ -100,8 +102,8 @@ static_library("format") {
   public_deps = [ "../compat" ]
 
   deps = [
-    "../snapshot:context",
     "$mini_chromium_source_parent:base",
+    "../snapshot:context",
     "../util",
   ]
 }
@@ -133,10 +135,10 @@ static_library("test_support") {
   public_deps = [ ":minidump" ]
 
   deps = [
+    "$mini_chromium_source_parent:base",
     "../snapshot:test_support",
     "../test",
-    "../third_party/googletest:googletest",
-    "$mini_chromium_source_parent:base",
+    "../third_party/googletest",
     "../util",
   ]
 
@@ -166,6 +168,7 @@ source_set("minidump_test") {
     "minidump_string_writer_test.cc",
     "minidump_system_info_writer_test.cc",
     "minidump_thread_id_map_test.cc",
+    "minidump_thread_name_list_writer_test.cc",
     "minidump_thread_writer_test.cc",
     "minidump_unloaded_module_writer_test.cc",
     "minidump_user_stream_writer_test.cc",
@@ -176,10 +179,10 @@ source_set("minidump_test") {
 
   deps = [
     ":test_support",
+    "$mini_chromium_source_parent:base",
     "../snapshot:test_support",
     "../test",
-    "../third_party/googletest:googletest",
-    "$mini_chromium_source_parent:base",
+    "../third_party/googletest",
     "../util",
   ]
 
diff --git a/extern/crashpad/crashpad/minidump/minidump_annotation_writer.cc b/extern/crashpad/crashpad/minidump/minidump_annotation_writer.cc
index 54a3ecba16..751dd013b4 100644
--- a/extern/crashpad/crashpad/minidump/minidump_annotation_writer.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_annotation_writer.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 #include <memory>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "util/file/file_writer.h"
 #include "util/numeric/safe_assignment.h"
@@ -147,9 +148,10 @@ bool MinidumpAnnotationListWriter::WriteObject(
     FileWriterInterface* file_writer) {
   DCHECK_EQ(state(), kStateWritable);
 
-  std::vector<WritableIoVec> iov(1 + objects_.size());
-  iov[0].iov_base = minidump_list_.get();
-  iov[0].iov_len = sizeof(*minidump_list_);
+  std::vector<WritableIoVec> iov;
+  iov.reserve(1 + objects_.size());
+  iov.emplace_back(
+      WritableIoVec{minidump_list_.get(), sizeof(*minidump_list_)});
 
   for (const auto& object : objects_) {
     iov.emplace_back(WritableIoVec{object->minidump_annotation(),
diff --git a/extern/crashpad/crashpad/minidump/minidump_annotation_writer.h b/extern/crashpad/crashpad/minidump/minidump_annotation_writer.h
index ffb931de44..6814a7003a 100644
--- a/extern/crashpad/crashpad/minidump/minidump_annotation_writer.h
+++ b/extern/crashpad/crashpad/minidump/minidump_annotation_writer.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/minidump_annotation_writer_test.cc b/extern/crashpad/crashpad/minidump/minidump_annotation_writer_test.cc
index c862f023e5..4916f3866b 100644
--- a/extern/crashpad/crashpad/minidump/minidump_annotation_writer_test.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_annotation_writer_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
 
 #include "minidump/minidump_annotation_writer.h"
 
+#include <iterator>
 #include <memory>
 
-#include "base/cxx17_backports.h"
 #include "gtest/gtest.h"
 #include "minidump/minidump_extensions.h"
 #include "minidump/test/minidump_byte_array_writer_test_util.h"
@@ -107,7 +107,7 @@ TEST(MinidumpAnnotationWriter, ThreeItems) {
 
   MinidumpAnnotationListWriter list_writer;
 
-  for (size_t i = 0; i < base::size(kNames); ++i) {
+  for (size_t i = 0; i < std::size(kNames); ++i) {
     auto annotation = std::make_unique<MinidumpAnnotationWriter>();
     annotation->InitializeWithData(kNames[i], kTypes[i], kValues[i]);
     list_writer.AddObject(std::move(annotation));
diff --git a/extern/crashpad/crashpad/minidump/minidump_byte_array_writer.cc b/extern/crashpad/crashpad/minidump/minidump_byte_array_writer.cc
index 05b698dbe5..b3c8aa9d11 100644
--- a/extern/crashpad/crashpad/minidump/minidump_byte_array_writer.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_byte_array_writer.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,6 +14,7 @@
 
 #include "minidump/minidump_byte_array_writer.h"
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "util/file/file_writer.h"
 #include "util/numeric/safe_assignment.h"
diff --git a/extern/crashpad/crashpad/minidump/minidump_byte_array_writer.h b/extern/crashpad/crashpad/minidump/minidump_byte_array_writer.h
index 2cbc279c59..6b60e892a7 100644
--- a/extern/crashpad/crashpad/minidump/minidump_byte_array_writer.h
+++ b/extern/crashpad/crashpad/minidump/minidump_byte_array_writer.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/minidump_byte_array_writer_test.cc b/extern/crashpad/crashpad/minidump/minidump_byte_array_writer_test.cc
index 526e38badf..785edacca7 100644
--- a/extern/crashpad/crashpad/minidump/minidump_byte_array_writer_test.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_byte_array_writer_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
 
 #include "minidump/minidump_byte_array_writer.h"
 
+#include <iterator>
 #include <memory>
 
-#include "base/cxx17_backports.h"
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
@@ -35,7 +35,7 @@ TEST(MinidumpByteArrayWriter, Write) {
       {},
   };
 
-  for (size_t i = 0; i < base::size(kTests); ++i) {
+  for (size_t i = 0; i < std::size(kTests); ++i) {
     SCOPED_TRACE(base::StringPrintf("index %" PRIuS, i));
 
     StringFile string_file;
@@ -67,7 +67,7 @@ TEST(MinidumpByteArrayWriter, SetData) {
     {},
   };
 
-  for (size_t i = 0; i < base::size(kTests); ++i) {
+  for (size_t i = 0; i < std::size(kTests); ++i) {
     SCOPED_TRACE(base::StringPrintf("index %" PRIuS, i));
 
     crashpad::MinidumpByteArrayWriter writer;
diff --git a/extern/crashpad/crashpad/minidump/minidump_context.h b/extern/crashpad/crashpad/minidump/minidump_context.h
index 3a3e603cb0..9dcbcb468c 100644
--- a/extern/crashpad/crashpad/minidump/minidump_context.h
+++ b/extern/crashpad/crashpad/minidump/minidump_context.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -80,7 +80,7 @@ enum MinidumpContextX86Flags : uint32_t {
   //! \brief Indicates the validity of non-control integer registers
   //!     (`CONTEXT_INTEGER`).
   //!
-  //! The `edi`, `esi`, `ebx`, `edx`, `ecx, and `eax` fields are valid.
+  //! The `edi`, `esi`, `ebx`, `edx`, `ecx`, and `eax` fields are valid.
   kMinidumpContextX86Integer = kMinidumpContextX86 | 0x00000002,
 
   //! \brief Indicates the validity of non-control segment registers
@@ -122,10 +122,9 @@ enum MinidumpContextX86Flags : uint32_t {
 
   //! \brief Indicates the validity of all registers except `xsave` data.
   //!     (`CONTEXT_ALL`).
-  kMinidumpContextX86All = kMinidumpContextX86Full |
-                           kMinidumpContextX86FloatingPoint |
-                           kMinidumpContextX86Debug |
-                           kMinidumpContextX86Extended,
+  kMinidumpContextX86All =
+      kMinidumpContextX86Full | kMinidumpContextX86FloatingPoint |
+      kMinidumpContextX86Debug | kMinidumpContextX86Extended,
 };
 
 //! \brief A 32-bit x86 CPU context (register state) carried in a minidump file.
@@ -225,7 +224,7 @@ enum MinidumpContextAMD64Flags : uint32_t {
   //! \brief Indicates the validity of `xsave` data (`CONTEXT_XSTATE`).
   //!
   //! The context contains `xsave` data. This is used with an extended context
-  //! structure not currently defined here.
+  //! structure which is partly implemented for CET state only.
   kMinidumpContextAMD64Xstate = kMinidumpContextAMD64 | 0x00000040,
 
   //! \brief Indicates the validity of control, integer, and floating-point
@@ -386,6 +385,51 @@ struct MinidumpContextARM {
   uint32_t extra[8];
 };
 
+//! \brief CONTEXT_CHUNK
+struct MinidumpContextChunk {
+  int32_t offset;
+  uint32_t size;
+};
+
+//! \brief CONTEXT_EX
+struct MinidumpContextExHeader {
+  MinidumpContextChunk all;
+  MinidumpContextChunk legacy;
+  MinidumpContextChunk xstate;
+};
+
+//! \brief XSAVE_AREA_HEADER
+struct MinidumpXSaveAreaHeader {
+  uint64_t mask;
+  uint64_t compaction_mask;
+  uint64_t xsave_header_reserved[6];
+};
+
+//! \brief Offset of first xsave feature in the full extended context.
+//!
+//! This is used to calculate the final size of the extended context, and
+//! can be validated by calling InitializeContext2 with one XSTATE feature,
+//! and LocateXStateFeature to determine the first offset.
+//! Also see “MANAGING STATE USING THE XSAVE FEATURE SET”, Ch. 13, Intel SDM.
+constexpr uint32_t kMinidumpAMD64XSaveOffset = 0x550;
+
+//! \brief Offset of first xsave feature within the extended context area.
+//!
+//! 0x240 is the size of the legacy area (512) + the xsave header(64 bytes)
+//! Intel SDM 13.4.1. This is not where the item is in the extended compacted
+//! context, but is the offset recorded in the minidump. It needs to be correct
+//! there. See https://windows-internals.com/cet-on-windows/ for some discussion
+//! “CONTEXT_XSTATE: Extended processor state chunk. The state is stored in the
+//! same format the XSAVE operation stores it with exception of the first 512
+//! bytes, i.e. starting from XSAVE_AREA_HEADER.” This may vary by cpuid.
+constexpr uint32_t kXSaveAreaFirstOffset = 0x240;
+
+//! \brief XSAVE_CET_U_FORMAT
+struct MinidumpAMD64XSaveFormatCetU {
+  uint64_t cetmsr;
+  uint64_t ssp;
+};
+
 //! \brief 64-bit ARM-specifc flags for MinidumpContextARM64::context_flags.
 enum MinidumpContextARM64Flags : uint32_t {
   //! \brief Identifies the context structure as 64-bit ARM.
@@ -592,6 +636,56 @@ struct MinidumpContextMIPS64 {
   uint64_t fir;
 };
 
+//! \brief 64-bit RISCV-specific flags for
+//! MinidumpContextRISCV64::context_flags.
+enum MinidumpContextRISCV64Flags : uint32_t {
+  //! \brief Identifies the context structure as RISCV64.
+  kMinidumpContextRISCV64 = 0x08000000,
+
+  //! \brief Indicates the validity of integer registers.
+  //!
+  //! Registers 'pc' and `x1`-`x31` are valid.
+  kMinidumpContextRISCV64Integer = kMinidumpContextRISCV64 | 0x00000001,
+
+  //! \brief Indicates the validity of floating point registers.
+  //!
+  //! Floating point registers `f0`-`f31` are valid.
+  kMinidumpContextRISCV64FloatingPoint = kMinidumpContextRISCV64 | 0x00000002,
+
+  //! \brief Indicates the validity of all registers.
+  kMinidumpContextRISCV64All = kMinidumpContextRISCV64Integer |
+                               kMinidumpContextRISCV64FloatingPoint,
+};
+
+//! \brief A 64-bit RISC-V CPU context (register state) carried in a minidump
+//! file.
+//!
+//! This structure is versioned. Increment |kVersion| when changing this
+//! structure.
+struct MinidumpContextRISCV64 {
+
+  //! \brief The structure’s currently-defined version number.
+  static constexpr uint32_t kVersion = 1;
+
+  //! \brief Indicates the validity of fields in this structure.
+  uint32_t context_flags;
+
+  //! \brief The structure’s version number.
+  uint32_t version;
+
+  //! \brief The program counter register.
+  uint64_t pc;
+
+  //! \brief The integer registers, x1 through x31.
+  uint64_t regs[31];
+
+  //! \brief The floating point registers.
+  uint64_t fpregs[32];
+
+  //! \brief The floating point control and status register.
+  uint32_t fcsr;
+};
+
 }  // namespace crashpad
 
 #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_
diff --git a/extern/crashpad/crashpad/minidump/minidump_context_writer.cc b/extern/crashpad/crashpad/minidump/minidump_context_writer.cc
index d7e53a4932..4a6130b63e 100644
--- a/extern/crashpad/crashpad/minidump/minidump_context_writer.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_context_writer.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,8 +19,10 @@
 #include <stdint.h>
 #include <string.h>
 
+#include "base/check_op.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
+#include "build/build_config.h"
 #include "snapshot/cpu_context.h"
 #include "util/file/file_writer.h"
 #include "util/stdlib/aligned_allocator.h"
@@ -35,7 +37,7 @@ static_assert(sizeof(MinidumpContextAMD64) == 1232,
               "MinidumpContextAMD64 size");
 
 // These structures can also be checked against definitions in the Windows SDK.
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #if defined(ARCH_CPU_X86_FAMILY)
 static_assert(sizeof(MinidumpContextX86) == sizeof(WOW64_CONTEXT),
               "WOW64_CONTEXT size");
@@ -45,7 +47,7 @@ static_assert(sizeof(MinidumpContextX86) == sizeof(CONTEXT), "CONTEXT size");
 static_assert(sizeof(MinidumpContextAMD64) == sizeof(CONTEXT), "CONTEXT size");
 #endif
 #endif  // ARCH_CPU_X86_FAMILY
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
 
 }  // namespace
 
@@ -101,6 +103,13 @@ MinidumpContextWriter::CreateFromSnapshot(const CPUContext* context_snapshot) {
       break;
     }
 
+    case kCPUArchitectureRISCV64: {
+      context = std::make_unique<MinidumpContextRISCV64Writer>();
+      reinterpret_cast<MinidumpContextRISCV64Writer*>(context.get())
+          ->InitializeFromSnapshot(context_snapshot->riscv64);
+      break;
+    }
+
     default: {
       LOG(ERROR) << "unknown context architecture "
                  << context_snapshot->architecture;
@@ -117,6 +126,11 @@ size_t MinidumpContextWriter::SizeOfObject() {
   return ContextSize();
 }
 
+size_t MinidumpContextWriter::FreezeAndGetSizeOfObject() {
+  Freeze();
+  return SizeOfObject();
+}
+
 MinidumpContextX86Writer::MinidumpContextX86Writer()
     : MinidumpContextWriter(), context_() {
   context_.context_flags = kMinidumpContextX86;
@@ -125,7 +139,6 @@ MinidumpContextX86Writer::MinidumpContextX86Writer()
 MinidumpContextX86Writer::~MinidumpContextX86Writer() {
 }
 
-
 void MinidumpContextX86Writer::InitializeFromSnapshot(
     const CPUContextX86* context_snapshot) {
   DCHECK_EQ(state(), kStateMutable);
@@ -212,7 +225,14 @@ void MinidumpContextAMD64Writer::InitializeFromSnapshot(
   DCHECK_EQ(state(), kStateMutable);
   DCHECK_EQ(context_.context_flags, kMinidumpContextAMD64);
 
-  context_.context_flags = kMinidumpContextAMD64All;
+  if (context_snapshot->xstate.enabled_features != 0) {
+    // Extended context.
+    context_.context_flags =
+        kMinidumpContextAMD64All | kMinidumpContextAMD64Xstate;
+  } else {
+    // Fixed size context - no xsave components.
+    context_.context_flags = kMinidumpContextAMD64All;
+  }
 
   context_.mx_csr = context_snapshot->fxsave.mxcsr;
   context_.cs = context_snapshot->cs;
@@ -246,6 +266,15 @@ void MinidumpContextAMD64Writer::InitializeFromSnapshot(
 
   // This is effectively a memcpy() of a big structure.
   context_.fxsave = context_snapshot->fxsave;
+
+  // If XSave features are being recorded store in xsave_entries in xcomp_bv
+  // order. We will not see features we do not support as we provide flags
+  // to the OS when first obtaining a snapshot.
+  if (context_snapshot->xstate.enabled_features & XSTATE_MASK_CET_U) {
+    auto cet_u = std::make_unique<MinidumpXSaveAMD64CetU>();
+    cet_u->InitializeFromSnapshot(context_snapshot);
+    xsave_entries_.push_back(std::move(cet_u));
+  }
 }
 
 size_t MinidumpContextAMD64Writer::Alignment() {
@@ -257,14 +286,100 @@ size_t MinidumpContextAMD64Writer::Alignment() {
 
 bool MinidumpContextAMD64Writer::WriteObject(FileWriterInterface* file_writer) {
   DCHECK_EQ(state(), kStateWritable);
+  // Note: all sizes here come from our constants, not from untrustworthy data.
+  std::vector<unsigned char> data(ContextSize());
+  unsigned char* const buf = data.data();
+
+  // CONTEXT always comes first.
+  DCHECK_LE(sizeof(context_), data.size());
+  memcpy(buf, &context_, sizeof(context_));
+
+  if (xsave_entries_.size() > 0) {
+    MinidumpContextExHeader context_ex = {{0, 0}, {0, 0}, {0, 0}};
+    MinidumpXSaveAreaHeader xsave_header = {0, 0, {}};
+
+    // CONTEXT_EX goes directly after the CONTEXT. |offset| is relative to
+    // &CONTEXT_EX.
+    context_ex.all.offset = -static_cast<int32_t>(sizeof(context_));
+    context_ex.all.size = static_cast<uint32_t>(ContextSize());
+    context_ex.legacy.offset = context_ex.all.offset;
+    context_ex.legacy.size = sizeof(context_);
+    // Then... there is a gap.
+    //
+    // In the compacted format the XSave area header goes just before
+    // the first xsave entry.  It has a total size given by the header
+    // + (padded) sizes of all the entries.
+    context_ex.xstate.offset = static_cast<int32_t>(
+        kMinidumpAMD64XSaveOffset - sizeof(MinidumpXSaveAreaHeader) -
+        sizeof(context_));
+    context_ex.xstate.size =
+        static_cast<uint32_t>(sizeof(MinidumpXSaveAreaHeader) + ContextSize() -
+                              kMinidumpAMD64XSaveOffset);
+
+    // Store CONTEXT_EX now it is complete.
+    DCHECK_LE(sizeof(context_) + sizeof(context_ex), data.size());
+    memcpy(&buf[sizeof(context_)], &context_ex, sizeof(context_ex));
+
+    // Calculate flags for xsave header & write entries (they will be
+    // *after* the xsave header).
+    size_t cursor = kMinidumpAMD64XSaveOffset;
+    for (auto const& entry : xsave_entries_) {
+      xsave_header.mask |= 1ull << entry->XCompBVBit();
+      DCHECK_LE(cursor + entry->Size(), data.size());
+      entry->Copy(&buf[cursor]);
+      cursor += entry->Size();
+    }
 
-  return file_writer->Write(&context_, sizeof(context_));
+    xsave_header.compaction_mask =
+        xsave_header.mask | XSTATE_COMPACTION_ENABLE_MASK;
+
+    // Store xsave header at its calculated offset. It is before the entries
+    // above, but we need to add the |mask| bits before writing it.
+    DCHECK_LE(
+        context_ex.xstate.offset + sizeof(context_) + sizeof(xsave_header),
+        data.size());
+    memcpy(&buf[context_ex.xstate.offset + sizeof(context_)],
+           &xsave_header,
+           sizeof(xsave_header));
+  }
+
+  if (!file_writer->Write(data.data(), data.size()))
+    return false;
+
+  return true;
 }
 
 size_t MinidumpContextAMD64Writer::ContextSize() const {
   DCHECK_GE(state(), kStateFrozen);
+  if (xsave_entries_.size() == 0) {
+    return sizeof(context_);
+  } else {
+    DCHECK_EQ(context_.context_flags,
+              kMinidumpContextAMD64All | kMinidumpContextAMD64Xstate);
+    DCHECK(xsave_entries_.size() != 0);
+    size_t size = kMinidumpAMD64XSaveOffset;
+    for (auto& entry : xsave_entries_) {
+      size += entry->Size();
+    }
+    return size;
+  }
+}
 
-  return sizeof(context_);
+bool MinidumpXSaveAMD64CetU::InitializeFromSnapshot(
+    const CPUContextX86_64* context_snapshot) {
+  // Exception records do not carry CET registers but we have to provide the
+  // same shaped context for threads and exception contexts, so both 0 (no ssp
+  // present) and 1 (ssp present) are expected.
+  DCHECK(context_snapshot->xstate.cet_u.cetmsr == 0ull ||
+         context_snapshot->xstate.cet_u.cetmsr == 1ull);
+  cet_u_.cetmsr = context_snapshot->xstate.cet_u.cetmsr;
+  cet_u_.ssp = context_snapshot->xstate.cet_u.ssp;
+  return true;
+}
+
+bool MinidumpXSaveAMD64CetU::Copy(void* dst) const {
+  memcpy(dst, &cet_u_, sizeof(cet_u_));
+  return true;
 }
 
 MinidumpContextARMWriter::MinidumpContextARMWriter()
@@ -453,4 +568,42 @@ size_t MinidumpContextMIPS64Writer::ContextSize() const {
   return sizeof(context_);
 }
 
+MinidumpContextRISCV64Writer::MinidumpContextRISCV64Writer()
+    : MinidumpContextWriter(), context_() {
+  context_.context_flags = kMinidumpContextRISCV64;
+  context_.version = MinidumpContextRISCV64::kVersion;
+}
+
+MinidumpContextRISCV64Writer::~MinidumpContextRISCV64Writer() = default;
+
+void MinidumpContextRISCV64Writer::InitializeFromSnapshot(
+    const CPUContextRISCV64* context_snapshot) {
+  DCHECK_EQ(state(), kStateMutable);
+  DCHECK_EQ(context_.context_flags, kMinidumpContextRISCV64);
+
+  context_.context_flags = kMinidumpContextRISCV64All;
+  context_.version = MinidumpContextRISCV64::kVersion;
+  context_.pc = context_snapshot->pc;
+
+  static_assert(sizeof(context_.regs) == sizeof(context_snapshot->regs),
+                "GPRs size mismatch");
+  memcpy(context_.regs, context_snapshot->regs, sizeof(context_.regs));
+
+  static_assert(sizeof(context_.fpregs) == sizeof(context_snapshot->fpregs),
+                "FPRs size mismatch");
+  memcpy(context_.fpregs, context_snapshot->fpregs, sizeof(context_.fpregs));
+  context_.fcsr = context_snapshot->fcsr;
+}
+
+bool MinidumpContextRISCV64Writer::WriteObject(
+    FileWriterInterface* file_writer) {
+  DCHECK_EQ(state(), kStateWritable);
+  return file_writer->Write(&context_, sizeof(context_));
+}
+
+size_t MinidumpContextRISCV64Writer::ContextSize() const {
+  DCHECK_GE(state(), kStateFrozen);
+  return sizeof(context_);
+}
+
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/minidump/minidump_context_writer.h b/extern/crashpad/crashpad/minidump/minidump_context_writer.h
index 80b312b23c..8e39c6692f 100644
--- a/extern/crashpad/crashpad/minidump/minidump_context_writer.h
+++ b/extern/crashpad/crashpad/minidump/minidump_context_writer.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@ namespace crashpad {
 struct CPUContext;
 struct CPUContextX86;
 struct CPUContextX86_64;
+class MinidumpMiscInfoWriter;
 
 //! \brief The base class for writers of CPU context structures in minidump
 //!     files.
@@ -49,6 +50,12 @@ class MinidumpContextWriter : public internal::MinidumpWritable {
   static std::unique_ptr<MinidumpContextWriter> CreateFromSnapshot(
       const CPUContext* context_snapshot);
 
+  //! \brief Returns the size of the context structure that this object will
+  //!     write.
+  //!
+  //! \note This method will force this to #kStateFrozen, if it is not already.
+  size_t FreezeAndGetSizeOfObject();
+
  protected:
   MinidumpContextWriter() : MinidumpWritable() {}
 
@@ -105,6 +112,36 @@ class MinidumpContextX86Writer final : public MinidumpContextWriter {
   MinidumpContextX86 context_;
 };
 
+//! \brief Wraps an xsave feature that knows where and how big it is.
+class MinidumpXSaveFeatureAMD64 {
+ public:
+  virtual ~MinidumpXSaveFeatureAMD64() = default;
+  // Number of bytes that will be written. May need to vary by CPUID (see
+  // Intel 13.5).
+  virtual size_t Size() const = 0;
+  // Intel 13.4.2 XCOMP_BV.
+  virtual uint8_t XCompBVBit() const = 0;
+  // Write data to dst. Does not write padding.
+  virtual bool Copy(void* dst) const = 0;
+};
+
+//! \brief XSAVE_CET_U_FORMAT
+class MinidumpXSaveAMD64CetU final : public MinidumpXSaveFeatureAMD64 {
+ public:
+  MinidumpXSaveAMD64CetU() {}
+  ~MinidumpXSaveAMD64CetU() {}
+  MinidumpXSaveAMD64CetU(const MinidumpXSaveAMD64CetU&) = delete;
+  MinidumpXSaveAMD64CetU& operator=(const MinidumpXSaveAMD64CetU&) = delete;
+
+  size_t Size() const override { return sizeof(cet_u_); }
+  uint8_t XCompBVBit() const override { return XSTATE_CET_U; }
+  bool Copy(void* dst) const override;
+  bool InitializeFromSnapshot(const CPUContextX86_64* context_snapshot);
+
+ private:
+  MinidumpAMD64XSaveFormatCetU cet_u_;
+};
+
 //! \brief The writer for a MinidumpContextAMD64 structure in a minidump file.
 class MinidumpContextAMD64Writer final : public MinidumpContextWriter {
  public:
@@ -157,6 +194,8 @@ class MinidumpContextAMD64Writer final : public MinidumpContextWriter {
 
  private:
   MinidumpContextAMD64 context_;
+  // These should be in order of XCompBVBit().
+  std::vector<std::unique_ptr<MinidumpXSaveFeatureAMD64>> xsave_entries_;
 };
 
 //! \brief The writer for a MinidumpContextARM structure in a minidump file.
@@ -330,6 +369,50 @@ class MinidumpContextMIPS64Writer final : public MinidumpContextWriter {
   MinidumpContextMIPS64 context_;
 };
 
+//! \brief The writer for a MinidumpContextRISCV64 structure in a minidump file.
+class MinidumpContextRISCV64Writer final : public MinidumpContextWriter {
+ public:
+  MinidumpContextRISCV64Writer();
+
+  MinidumpContextRISCV64Writer(const MinidumpContextRISCV64Writer&) = delete;
+  MinidumpContextRISCV64Writer& operator=(const MinidumpContextRISCV64Writer&) =
+      delete;
+
+  ~MinidumpContextRISCV64Writer() override;
+
+  //! \brief Initializes the MinidumpContextRISCV64 based on \a
+  //! context_snapshot.
+  //!
+  //! \param[in] context_snapshot The context snapshot to use as source data.
+  //!
+  //! \note Valid in #kStateMutable. No mutation of context() may be done before
+  //!     calling this method, and it is not normally necessary to alter
+  //!     context() after calling this method.
+  void InitializeFromSnapshot(const CPUContextRISCV64* context_snapshot);
+
+  //! \brief Returns a pointer to the context structure that this object will
+  //!     write.
+  //!
+  //! \attention This returns a non-`const` pointer to this object’s private
+  //!     data so that a caller can populate the context structure directly.
+  //!     This is done because providing setter interfaces to each field in the
+  //!     context structure would be unwieldy and cumbersome. Care must be taken
+  //!     to populate the context structure correctly. The context structure
+  //!     must only be modified while this object is in the #kStateMutable
+  //!     state.
+  MinidumpContextRISCV64* context() { return &context_; }
+
+ protected:
+  // MinidumpWritable:
+  bool WriteObject(FileWriterInterface* file_writer) override;
+
+  // MinidumpContextWriter:
+  size_t ContextSize() const override;
+
+ private:
+  MinidumpContextRISCV64 context_;
+};
+
 }  // namespace crashpad
 
 #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_
diff --git a/extern/crashpad/crashpad/minidump/minidump_context_writer_test.cc b/extern/crashpad/crashpad/minidump/minidump_context_writer_test.cc
index 3216a906ba..277bd4d347 100644
--- a/extern/crashpad/crashpad/minidump/minidump_context_writer_test.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_context_writer_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,6 +16,10 @@
 
 #include <stdint.h>
 
+#include <string>
+#include <type_traits>
+
+#include "base/notreached.h"
 #include "gtest/gtest.h"
 #include "minidump/minidump_context.h"
 #include "minidump/test/minidump_context_test_util.h"
@@ -28,7 +32,7 @@ namespace crashpad {
 namespace test {
 namespace {
 
-template <typename Writer, typename Context>
+template <typename Writer, typename Context, typename RVAType>
 void EmptyContextTest(void (*expect_context)(uint32_t, const Context*, bool)) {
   Writer context_writer;
   StringFile string_file;
@@ -36,13 +40,28 @@ void EmptyContextTest(void (*expect_context)(uint32_t, const Context*, bool)) {
   ASSERT_EQ(string_file.string().size(), sizeof(Context));
 
   const Context* observed =
-      MinidumpWritableAtRVA<Context>(string_file.string(), 0);
+      MinidumpWritableAtRVA<Context>(string_file.string(), RVAType(0));
   ASSERT_TRUE(observed);
 
   expect_context(0, observed, false);
 }
 
-TEST(MinidumpContextWriter, MinidumpContextX86Writer) {
+class TestTypeNames {
+ public:
+  template <typename T>
+  static std::string GetName(int) {
+    static_assert(std::is_same<T, RVA>() || std::is_same<T, RVA64>());
+    return std::is_same<T, RVA>() ? "RVA" : "RVA64";
+  }
+};
+
+template <typename RVAType>
+class MinidumpContextWriter : public ::testing::Test {};
+
+using RVATypes = ::testing::Types<RVA, RVA64>;
+TYPED_TEST_SUITE(MinidumpContextWriter, RVATypes, TestTypeNames);
+
+TYPED_TEST(MinidumpContextWriter, MinidumpContextX86Writer) {
   StringFile string_file;
 
   {
@@ -50,7 +69,7 @@ TEST(MinidumpContextWriter, MinidumpContextX86Writer) {
     // context.
     SCOPED_TRACE("zero");
 
-    EmptyContextTest<MinidumpContextX86Writer, MinidumpContextX86>(
+    EmptyContextTest<MinidumpContextX86Writer, MinidumpContextX86, TypeParam>(
         ExpectMinidumpContextX86);
   }
 
@@ -67,14 +86,15 @@ TEST(MinidumpContextWriter, MinidumpContextX86Writer) {
     ASSERT_EQ(string_file.string().size(), sizeof(MinidumpContextX86));
 
     const MinidumpContextX86* observed =
-        MinidumpWritableAtRVA<MinidumpContextX86>(string_file.string(), 0);
+        MinidumpWritableAtRVA<MinidumpContextX86>(string_file.string(),
+                                                  TypeParam(0));
     ASSERT_TRUE(observed);
 
     ExpectMinidumpContextX86(kSeed, observed, false);
   }
 }
 
-TEST(MinidumpContextWriter, MinidumpContextAMD64Writer) {
+TYPED_TEST(MinidumpContextWriter, MinidumpContextAMD64Writer) {
   {
     // Make sure that a heap-allocated context writer has the proper alignment,
     // because it may be nonstandard.
@@ -91,8 +111,9 @@ TEST(MinidumpContextWriter, MinidumpContextAMD64Writer) {
     // context.
     SCOPED_TRACE("zero");
 
-    EmptyContextTest<MinidumpContextAMD64Writer, MinidumpContextAMD64>(
-        ExpectMinidumpContextAMD64);
+    EmptyContextTest<MinidumpContextAMD64Writer,
+                     MinidumpContextAMD64,
+                     TypeParam>(ExpectMinidumpContextAMD64);
   }
 
   {
@@ -108,109 +129,197 @@ TEST(MinidumpContextWriter, MinidumpContextAMD64Writer) {
     ASSERT_EQ(string_file.string().size(), sizeof(MinidumpContextAMD64));
 
     const MinidumpContextAMD64* observed =
-        MinidumpWritableAtRVA<MinidumpContextAMD64>(string_file.string(), 0);
+        MinidumpWritableAtRVA<MinidumpContextAMD64>(string_file.string(),
+                                                    TypeParam(0));
     ASSERT_TRUE(observed);
 
     ExpectMinidumpContextAMD64(kSeed, observed, false);
   }
 }
 
-template <typename Writer, typename Context>
+TYPED_TEST(MinidumpContextWriter, MinidumpContextRISCV64Writer) {
+  {
+    // Make sure that a heap-allocated context writer has the proper alignment,
+    // because it may be nonstandard.
+    auto context_writer = std::make_unique<MinidumpContextRISCV64Writer>();
+    EXPECT_EQ(reinterpret_cast<uintptr_t>(context_writer.get()) &
+                  (alignof(MinidumpContextRISCV64Writer) - 1),
+              0u);
+  }
+
+  StringFile string_file;
+
+  {
+    // Make sure that a context writer that’s untouched writes a zeroed-out
+    // context.
+    SCOPED_TRACE("zero");
+
+    EmptyContextTest<MinidumpContextRISCV64Writer,
+                     MinidumpContextRISCV64,
+                     TypeParam>(ExpectMinidumpContextRISCV64);
+  }
+
+  {
+    SCOPED_TRACE("nonzero");
+
+    string_file.Reset();
+    constexpr uint32_t kSeed = 0x808664;
+
+    MinidumpContextRISCV64Writer context_writer;
+    InitializeMinidumpContextRISCV64(context_writer.context(), kSeed);
+
+    EXPECT_TRUE(context_writer.WriteEverything(&string_file));
+    ASSERT_EQ(string_file.string().size(), sizeof(MinidumpContextRISCV64));
+
+    const MinidumpContextRISCV64* observed =
+        MinidumpWritableAtRVA<MinidumpContextRISCV64>(string_file.string(),
+                                                      TypeParam(0));
+    ASSERT_TRUE(observed);
+
+    ExpectMinidumpContextRISCV64(kSeed, observed, false);
+  }
+}
+
+template <typename Writer, typename Context, typename RVAType>
 void FromSnapshotTest(const CPUContext& snapshot_context,
                       void (*expect_context)(uint32_t, const Context*, bool),
                       uint32_t seed) {
-  std::unique_ptr<MinidumpContextWriter> context_writer =
-      MinidumpContextWriter::CreateFromSnapshot(&snapshot_context);
+  std::unique_ptr<::crashpad::MinidumpContextWriter> context_writer =
+      ::crashpad::MinidumpContextWriter::CreateFromSnapshot(&snapshot_context);
   ASSERT_TRUE(context_writer);
 
   StringFile string_file;
   ASSERT_TRUE(context_writer->WriteEverything(&string_file));
 
   const Context* observed =
-      MinidumpWritableAtRVA<Context>(string_file.string(), 0);
+      MinidumpWritableAtRVA<Context>(string_file.string(), RVAType(0));
   ASSERT_TRUE(observed);
 
   expect_context(seed, observed, true);
 }
 
-TEST(MinidumpContextWriter, X86_FromSnapshot) {
+TYPED_TEST(MinidumpContextWriter, X86_FromSnapshot) {
   constexpr uint32_t kSeed = 32;
   CPUContextX86 context_x86;
   CPUContext context;
   context.x86 = &context_x86;
   InitializeCPUContextX86(&context, kSeed);
-  FromSnapshotTest<MinidumpContextX86Writer, MinidumpContextX86>(
+  FromSnapshotTest<MinidumpContextX86Writer, MinidumpContextX86, TypeParam>(
       context, ExpectMinidumpContextX86, kSeed);
 }
 
-TEST(MinidumpContextWriter, AMD64_FromSnapshot) {
+TYPED_TEST(MinidumpContextWriter, AMD64_FromSnapshot) {
   constexpr uint32_t kSeed = 64;
   CPUContextX86_64 context_x86_64;
   CPUContext context;
   context.x86_64 = &context_x86_64;
   InitializeCPUContextX86_64(&context, kSeed);
-  FromSnapshotTest<MinidumpContextAMD64Writer, MinidumpContextAMD64>(
+  FromSnapshotTest<MinidumpContextAMD64Writer, MinidumpContextAMD64, TypeParam>(
       context, ExpectMinidumpContextAMD64, kSeed);
 }
 
-TEST(MinidumpContextWriter, ARM_Zeros) {
-  EmptyContextTest<MinidumpContextARMWriter, MinidumpContextARM>(
+TYPED_TEST(MinidumpContextWriter, AMD64_CetFromSnapshot) {
+  constexpr uint32_t kSeed = 77;
+  CPUContextX86_64 context_x86_64;
+  CPUContext context;
+  context.x86_64 = &context_x86_64;
+  InitializeCPUContextX86_64(&context, kSeed);
+  context_x86_64.xstate.enabled_features |= XSTATE_MASK_CET_U;
+  context_x86_64.xstate.cet_u.cetmsr = 1;
+  context_x86_64.xstate.cet_u.ssp = kSeed * kSeed;
+  // We cannot use FromSnapshotTest as we write more than the fixed context.
+  std::unique_ptr<::crashpad::MinidumpContextWriter> context_writer =
+      ::crashpad::MinidumpContextWriter::CreateFromSnapshot(&context);
+  ASSERT_TRUE(context_writer);
+
+  StringFile string_file;
+  ASSERT_TRUE(context_writer->WriteEverything(&string_file));
+
+  const MinidumpContextAMD64* observed =
+      MinidumpWritableAtRVA<MinidumpContextAMD64>(string_file.string(),
+                                                  TypeParam(0));
+  ASSERT_TRUE(observed);
+
+  ExpectMinidumpContextAMD64(kSeed, observed, true);
+}
+
+TYPED_TEST(MinidumpContextWriter, ARM_Zeros) {
+  EmptyContextTest<MinidumpContextARMWriter, MinidumpContextARM, TypeParam>(
       ExpectMinidumpContextARM);
 }
 
-TEST(MinidumpContextWRiter, ARM64_Zeros) {
-  EmptyContextTest<MinidumpContextARM64Writer, MinidumpContextARM64>(
+TYPED_TEST(MinidumpContextWriter, ARM64_Zeros) {
+  EmptyContextTest<MinidumpContextARM64Writer, MinidumpContextARM64, TypeParam>(
       ExpectMinidumpContextARM64);
 }
 
-TEST(MinidumpContextWriter, ARM_FromSnapshot) {
+TYPED_TEST(MinidumpContextWriter, ARM_FromSnapshot) {
   constexpr uint32_t kSeed = 32;
   CPUContextARM context_arm;
   CPUContext context;
   context.arm = &context_arm;
   InitializeCPUContextARM(&context, kSeed);
-  FromSnapshotTest<MinidumpContextARMWriter, MinidumpContextARM>(
+  FromSnapshotTest<MinidumpContextARMWriter, MinidumpContextARM, TypeParam>(
       context, ExpectMinidumpContextARM, kSeed);
 }
 
-TEST(MinidumpContextWriter, ARM64_FromSnapshot) {
+TYPED_TEST(MinidumpContextWriter, ARM64_FromSnapshot) {
   constexpr uint32_t kSeed = 64;
   CPUContextARM64 context_arm64;
   CPUContext context;
   context.arm64 = &context_arm64;
   InitializeCPUContextARM64(&context, kSeed);
-  FromSnapshotTest<MinidumpContextARM64Writer, MinidumpContextARM64>(
+  FromSnapshotTest<MinidumpContextARM64Writer, MinidumpContextARM64, TypeParam>(
       context, ExpectMinidumpContextARM64, kSeed);
 }
 
-TEST(MinidumpContextWriter, MIPS_Zeros) {
-  EmptyContextTest<MinidumpContextMIPSWriter, MinidumpContextMIPS>(
+TYPED_TEST(MinidumpContextWriter, MIPS_Zeros) {
+  EmptyContextTest<MinidumpContextMIPSWriter, MinidumpContextMIPS, TypeParam>(
       ExpectMinidumpContextMIPS);
 }
 
-TEST(MinidumpContextWriter, MIPS64_Zeros) {
-  EmptyContextTest<MinidumpContextMIPS64Writer, MinidumpContextMIPS64>(
-      ExpectMinidumpContextMIPS64);
+TYPED_TEST(MinidumpContextWriter, MIPS64_Zeros) {
+  EmptyContextTest<MinidumpContextMIPS64Writer,
+                   MinidumpContextMIPS64,
+                   TypeParam>(ExpectMinidumpContextMIPS64);
 }
 
-TEST(MinidumpContextWriter, MIPS_FromSnapshot) {
+TYPED_TEST(MinidumpContextWriter, MIPS_FromSnapshot) {
   constexpr uint32_t kSeed = 32;
   CPUContextMIPS context_mips;
   CPUContext context;
   context.mipsel = &context_mips;
   InitializeCPUContextMIPS(&context, kSeed);
-  FromSnapshotTest<MinidumpContextMIPSWriter, MinidumpContextMIPS>(
+  FromSnapshotTest<MinidumpContextMIPSWriter, MinidumpContextMIPS, TypeParam>(
       context, ExpectMinidumpContextMIPS, kSeed);
 }
 
-TEST(MinidumpContextWriter, MIPS64_FromSnapshot) {
+TYPED_TEST(MinidumpContextWriter, MIPS64_FromSnapshot) {
   constexpr uint32_t kSeed = 64;
   CPUContextMIPS64 context_mips;
   CPUContext context;
   context.mips64 = &context_mips;
   InitializeCPUContextMIPS64(&context, kSeed);
-  FromSnapshotTest<MinidumpContextMIPS64Writer, MinidumpContextMIPS64>(
-      context, ExpectMinidumpContextMIPS64, kSeed);
+  FromSnapshotTest<MinidumpContextMIPS64Writer,
+                   MinidumpContextMIPS64,
+                   TypeParam>(context, ExpectMinidumpContextMIPS64, kSeed);
+}
+
+TYPED_TEST(MinidumpContextWriter, RISCV64_Zeros) {
+  EmptyContextTest<MinidumpContextRISCV64Writer,
+                   MinidumpContextRISCV64,
+                   TypeParam>(ExpectMinidumpContextRISCV64);
+}
+
+TYPED_TEST(MinidumpContextWriter, RISCV64_FromSnapshot) {
+  constexpr uint32_t kSeed = 64;
+  CPUContextRISCV64 context_riscv64;
+  CPUContext context;
+  context.riscv64 = &context_riscv64;
+  InitializeCPUContextRISCV64(&context, kSeed);
+  FromSnapshotTest<MinidumpContextRISCV64Writer,
+                   MinidumpContextRISCV64,
+                   TypeParam>(context, ExpectMinidumpContextRISCV64, kSeed);
 }
 
 }  // namespace
diff --git a/extern/crashpad/crashpad/minidump/minidump_crashpad_info_writer.cc b/extern/crashpad/crashpad/minidump/minidump_crashpad_info_writer.cc
index e84f29b8ae..76206a812a 100644
--- a/extern/crashpad/crashpad/minidump/minidump_crashpad_info_writer.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_crashpad_info_writer.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 #include "minidump/minidump_module_crashpad_info_writer.h"
 #include "minidump/minidump_simple_string_dictionary_writer.h"
 #include "snapshot/process_snapshot.h"
+#include "snapshot/system_snapshot.h"
 #include "util/file/file_writer.h"
 
 namespace crashpad {
@@ -30,6 +31,7 @@ MinidumpCrashpadInfoWriter::MinidumpCrashpadInfoWriter()
       simple_annotations_(nullptr),
       module_list_(nullptr) {
   crashpad_info_.version = MinidumpCrashpadInfo::kVersion;
+  crashpad_info_.reserved = 0;
 }
 
 MinidumpCrashpadInfoWriter::~MinidumpCrashpadInfoWriter() {
@@ -56,6 +58,10 @@ void MinidumpCrashpadInfoWriter::InitializeFromSnapshot(
     SetSimpleAnnotations(std::move(simple_annotations));
   }
 
+  if (process_snapshot->System()) {
+    SetAddressMask(process_snapshot->System()->AddressMask());
+  }
+
   auto modules = std::make_unique<MinidumpModuleCrashpadInfoListWriter>();
   modules->InitializeFromSnapshot(process_snapshot->Modules());
 
@@ -90,6 +96,10 @@ void MinidumpCrashpadInfoWriter::SetModuleList(
   module_list_ = std::move(module_list);
 }
 
+void MinidumpCrashpadInfoWriter::SetAddressMask(uint64_t mask) {
+  crashpad_info_.address_mask = mask;
+}
+
 bool MinidumpCrashpadInfoWriter::Freeze() {
   DCHECK_EQ(state(), kStateMutable);
 
diff --git a/extern/crashpad/crashpad/minidump/minidump_crashpad_info_writer.h b/extern/crashpad/crashpad/minidump/minidump_crashpad_info_writer.h
index b7aa2d895a..02907cc844 100644
--- a/extern/crashpad/crashpad/minidump/minidump_crashpad_info_writer.h
+++ b/extern/crashpad/crashpad/minidump/minidump_crashpad_info_writer.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -86,6 +86,9 @@ class MinidumpCrashpadInfoWriter final : public internal::MinidumpStreamWriter {
   void SetModuleList(
       std::unique_ptr<MinidumpModuleCrashpadInfoListWriter> module_list);
 
+  //! \brief Sets MinidumpCrashpadInfo::address_mask.
+  void SetAddressMask(uint64_t mask);
+
   //! \brief Determines whether the object is useful.
   //!
   //! A useful object is one that carries data that makes a meaningful
diff --git a/extern/crashpad/crashpad/minidump/minidump_crashpad_info_writer_test.cc b/extern/crashpad/crashpad/minidump/minidump_crashpad_info_writer_test.cc
index 19d460685d..d01655d84c 100644
--- a/extern/crashpad/crashpad/minidump/minidump_crashpad_info_writer_test.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_crashpad_info_writer_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -122,6 +122,77 @@ TEST(MinidumpCrashpadInfoWriter, ReportAndClientID) {
   EXPECT_FALSE(module_list);
 }
 
+TEST(MinidumpCrashpadInfoWriter, AddressMask) {
+  MinidumpFileWriter minidump_file_writer;
+  auto crashpad_info_writer = std::make_unique<MinidumpCrashpadInfoWriter>();
+
+  constexpr uint64_t mask = 0xFFFFFF8000000000;
+  crashpad_info_writer->SetAddressMask(mask);
+
+  ASSERT_TRUE(minidump_file_writer.AddStream(std::move(crashpad_info_writer)));
+
+  StringFile string_file;
+  ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
+
+  const MinidumpCrashpadInfo* crashpad_info = nullptr;
+  const MinidumpSimpleStringDictionary* simple_annotations = nullptr;
+  const MinidumpModuleCrashpadInfoList* module_list = nullptr;
+
+  ASSERT_NO_FATAL_FAILURE(GetCrashpadInfoStream(
+      string_file.string(), &crashpad_info, &simple_annotations, &module_list));
+
+  UUID empty_report_id;
+  ASSERT_TRUE(empty_report_id.InitializeFromString(
+      "00000000-0000-0000-0000-000000000000"));
+  UUID empty_client_id;
+  ASSERT_TRUE(empty_client_id.InitializeFromString(
+      "00000000-0000-0000-0000-000000000000"));
+
+  // Copy address_mask into a local variable because
+  // |MinidumpCrashpadInfo::address_mask| requires 8-byte alignment but the
+  // struct itself is 4-byte aligned.
+  const auto address_mask = [&crashpad_info] {
+    uint64_t data = 0;
+    memcpy(&data, &crashpad_info->address_mask, sizeof(data));
+    return data;
+  }();
+
+  EXPECT_EQ(crashpad_info->version, MinidumpCrashpadInfo::kVersion);
+  EXPECT_EQ(address_mask, mask);
+  EXPECT_EQ(crashpad_info->report_id, empty_report_id);
+  EXPECT_EQ(crashpad_info->client_id, empty_client_id);
+  EXPECT_FALSE(simple_annotations);
+  EXPECT_FALSE(module_list);
+}
+
+TEST(MinidumpCrashpadInfoWriter, EmptyAddressMask) {
+  MinidumpFileWriter minidump_file_writer;
+  auto crashpad_info_writer = std::make_unique<MinidumpCrashpadInfoWriter>();
+
+  ASSERT_TRUE(minidump_file_writer.AddStream(std::move(crashpad_info_writer)));
+
+  StringFile string_file;
+  ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
+
+  const MinidumpCrashpadInfo* crashpad_info = nullptr;
+  const MinidumpSimpleStringDictionary* simple_annotations = nullptr;
+  const MinidumpModuleCrashpadInfoList* module_list = nullptr;
+
+  ASSERT_NO_FATAL_FAILURE(GetCrashpadInfoStream(
+      string_file.string(), &crashpad_info, &simple_annotations, &module_list));
+
+  // Copy address_mask into a local variable because
+  // |MinidumpCrashpadInfo::address_mask| requires 8-byte alignment but the
+  // struct itself is 4-byte aligned.
+  const auto address_mask = [&crashpad_info] {
+    uint64_t data = 0;
+    memcpy(&data, &crashpad_info->address_mask, sizeof(data));
+    return data;
+  }();
+
+  EXPECT_EQ(address_mask, 0UL);
+}
+
 TEST(MinidumpCrashpadInfoWriter, SimpleAnnotations) {
   MinidumpFileWriter minidump_file_writer;
   auto crashpad_info_writer = std::make_unique<MinidumpCrashpadInfoWriter>();
diff --git a/extern/crashpad/crashpad/minidump/minidump_exception_writer.cc b/extern/crashpad/crashpad/minidump/minidump_exception_writer.cc
index e1a02da2ec..cd3a139d9f 100644
--- a/extern/crashpad/crashpad/minidump/minidump_exception_writer.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_exception_writer.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -34,13 +34,19 @@ MinidumpExceptionWriter::~MinidumpExceptionWriter() {
 
 void MinidumpExceptionWriter::InitializeFromSnapshot(
     const ExceptionSnapshot* exception_snapshot,
-    const MinidumpThreadIDMap& thread_id_map) {
+    const MinidumpThreadIDMap& thread_id_map,
+    bool allow_missing_thread_id_from_map) {
   DCHECK_EQ(state(), kStateMutable);
   DCHECK(!context_);
 
   auto thread_id_it = thread_id_map.find(exception_snapshot->ThreadID());
-  DCHECK(thread_id_it != thread_id_map.end());
-  SetThreadID(thread_id_it->second);
+  bool thread_id_missing = thread_id_it == thread_id_map.end();
+  if (allow_missing_thread_id_from_map && thread_id_missing) {
+    SetThreadID(static_cast<uint32_t>(exception_snapshot->ThreadID()));
+  } else {
+    DCHECK(!thread_id_missing);
+    SetThreadID(thread_id_it->second);
+  }
 
   SetExceptionCode(exception_snapshot->Exception());
   SetExceptionFlags(exception_snapshot->ExceptionInfo());
diff --git a/extern/crashpad/crashpad/minidump/minidump_exception_writer.h b/extern/crashpad/crashpad/minidump/minidump_exception_writer.h
index 82299a5a75..4c71112721 100644
--- a/extern/crashpad/crashpad/minidump/minidump_exception_writer.h
+++ b/extern/crashpad/crashpad/minidump/minidump_exception_writer.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -50,12 +50,17 @@ class MinidumpExceptionWriter final : public internal::MinidumpStreamWriter {
   //! \param[in] thread_id_map A MinidumpThreadIDMap to be consulted to
   //!     determine the 32-bit minidump thread ID to use for the thread
   //!     identified by \a exception_snapshot.
+  //! \param[in] allow_missing_thread_id_from_map Whether it is valid
+  //!     for \a exception_snapshot->ThreadID() to be absent from the
+  //!     \a thread_id_map, such as in an incomplete iOS intermediate dump. When
+  //!     false a missing thread id is considered invalid and will DCHECK.
   //!
   //! \note Valid in #kStateMutable. No mutator methods may be called before
   //!     this method, and it is not normally necessary to call any mutator
   //!     methods after this method.
   void InitializeFromSnapshot(const ExceptionSnapshot* exception_snapshot,
-                              const MinidumpThreadIDMap& thread_id_map);
+                              const MinidumpThreadIDMap& thread_id_map,
+                              bool allow_missing_thread_id_from_map);
 
   //! \brief Arranges for MINIDUMP_EXCEPTION_STREAM::ThreadContext to point to
   //!     the CPU context to be written by \a context.
diff --git a/extern/crashpad/crashpad/minidump/minidump_exception_writer_test.cc b/extern/crashpad/crashpad/minidump/minidump_exception_writer_test.cc
index 0243c175df..06a921eaa4 100644
--- a/extern/crashpad/crashpad/minidump/minidump_exception_writer_test.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_exception_writer_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
 
 #include "minidump/minidump_exception_writer.h"
 
+#include <iterator>
 #include <string>
 #include <utility>
 
-#include "base/cxx17_backports.h"
 #include "gtest/gtest.h"
 #include "minidump/minidump_context.h"
 #include "minidump/minidump_context_writer.h"
@@ -86,7 +86,7 @@ void ExpectExceptionStream(const MINIDUMP_EXCEPTION_STREAM* expected,
             expected_exception.NumberParameters);
   EXPECT_EQ(observed->ExceptionRecord.__unusedAlignment, 0u);
   for (size_t index = 0;
-       index < base::size(observed_exception.ExceptionInformation);
+       index < std::size(observed_exception.ExceptionInformation);
        ++index) {
     EXPECT_EQ(observed_exception.ExceptionInformation[index],
               expected_exception.ExceptionInformation[index]);
@@ -235,7 +235,10 @@ TEST(MinidumpExceptionWriter, InitializeFromSnapshot) {
   thread_id_map[kThreadID] = expect_exception.ThreadId;
 
   auto exception_writer = std::make_unique<MinidumpExceptionWriter>();
-  exception_writer->InitializeFromSnapshot(&exception_snapshot, thread_id_map);
+  exception_writer->InitializeFromSnapshot(
+      &exception_snapshot,
+      thread_id_map,
+      /*allow_missing_thread_id_from_map=*/false);
 
   MinidumpFileWriter minidump_file_writer;
   ASSERT_TRUE(minidump_file_writer.AddStream(std::move(exception_writer)));
diff --git a/extern/crashpad/crashpad/minidump/minidump_extensions.cc b/extern/crashpad/crashpad/minidump/minidump_extensions.cc
index bfb0e60e9b..74cdd46436 100644
--- a/extern/crashpad/crashpad/minidump/minidump_extensions.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_extensions.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/minidump_extensions.h b/extern/crashpad/crashpad/minidump/minidump_extensions.h
index 97276d529a..55af5fa25b 100644
--- a/extern/crashpad/crashpad/minidump/minidump_extensions.h
+++ b/extern/crashpad/crashpad/minidump/minidump_extensions.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -93,6 +93,11 @@ enum MinidumpStreamType : uint32_t {
   //! \sa MemoryInfoListStream
   kMinidumpStreamTypeMemoryInfoList = MemoryInfoListStream,
 
+  //! \brief The stream type for MINIDUMP_THREAD_NAME_LIST.
+  //!
+  //! \sa ThreadNamesStream
+  kMinidumpStreamTypeThreadNameList = ThreadNamesStream,
+
   //! \brief The last reserved minidump stream.
   //!
   //! \sa MemoryInfoListStream
@@ -111,7 +116,7 @@ enum MinidumpStreamType : uint32_t {
 //!     file.
 //!
 //! \sa MINIDUMP_STRING
-struct ALIGNAS(4) PACKED MinidumpUTF8String {
+struct alignas(4) PACKED MinidumpUTF8String {
   // The field names do not conform to typical style, they match the names used
   // in MINIDUMP_STRING. This makes it easier to operate on MINIDUMP_STRING (for
   // UTF-16 strings) and MinidumpUTF8String using templates.
@@ -130,7 +135,7 @@ struct ALIGNAS(4) PACKED MinidumpUTF8String {
 //! \brief A variable-length array of bytes carried within a minidump file.
 //!     The data have no intrinsic type and should be interpreted according
 //!     to their referencing context.
-struct ALIGNAS(4) PACKED MinidumpByteArray {
+struct alignas(4) PACKED MinidumpByteArray {
   //! \brief The length of the #data field.
   uint32_t length;
 
@@ -205,6 +210,9 @@ enum MinidumpCPUArchitecture : uint16_t {
   //! \deprecated Use #kMinidumpCPUArchitectureARM64 instead.
   kMinidumpCPUArchitectureARM64Breakpad = 0x8003,
 
+  //! \brief Used by Breakpad for 64-bit RISC-V.
+  kMinidumpCPUArchitectureRISCV64Breakpad = 0x8006,
+
   //! \brief Unknown CPU architecture.
   kMinidumpCPUArchitectureUnknown = PROCESSOR_ARCHITECTURE_UNKNOWN,
 };
@@ -265,7 +273,7 @@ enum MinidumpOS : uint32_t {
 };
 
 //! \brief A list of ::RVA pointers.
-struct ALIGNAS(4) PACKED MinidumpRVAList {
+struct alignas(4) PACKED MinidumpRVAList {
   //! \brief The number of children present in the #children array.
   uint32_t count;
 
@@ -274,7 +282,7 @@ struct ALIGNAS(4) PACKED MinidumpRVAList {
 };
 
 //! \brief A key-value pair.
-struct ALIGNAS(4) PACKED MinidumpSimpleStringDictionaryEntry {
+struct alignas(4) PACKED MinidumpSimpleStringDictionaryEntry {
   //! \brief ::RVA of a MinidumpUTF8String containing the key of a key-value
   //!     pair.
   RVA key;
@@ -285,7 +293,7 @@ struct ALIGNAS(4) PACKED MinidumpSimpleStringDictionaryEntry {
 };
 
 //! \brief A list of key-value pairs.
-struct ALIGNAS(4) PACKED MinidumpSimpleStringDictionary {
+struct alignas(4) PACKED MinidumpSimpleStringDictionary {
   //! \brief The number of key-value pairs present.
   uint32_t count;
 
@@ -294,7 +302,7 @@ struct ALIGNAS(4) PACKED MinidumpSimpleStringDictionary {
 };
 
 //! \brief A typed annotation object.
-struct ALIGNAS(4) PACKED MinidumpAnnotation {
+struct alignas(4) PACKED MinidumpAnnotation {
   //! \brief ::RVA of a MinidumpUTF8String containing the name of the
   //!     annotation.
   RVA name;
@@ -311,7 +319,7 @@ struct ALIGNAS(4) PACKED MinidumpAnnotation {
 };
 
 //! \brief A list of annotation objects.
-struct ALIGNAS(4) PACKED MinidumpAnnotationList {
+struct alignas(4) PACKED MinidumpAnnotationList {
   //! \brief The number of annotation objects present.
   uint32_t count;
 
@@ -334,7 +342,7 @@ struct ALIGNAS(4) PACKED MinidumpAnnotationList {
 //! fields are valid or not.
 //!
 //! \sa MinidumpModuleCrashpadInfoList
-struct ALIGNAS(4) PACKED MinidumpModuleCrashpadInfo {
+struct alignas(4) PACKED MinidumpModuleCrashpadInfo {
   //! \brief The structure’s currently-defined version number.
   //!
   //! \sa version
@@ -384,7 +392,7 @@ struct ALIGNAS(4) PACKED MinidumpModuleCrashpadInfo {
 //! \brief A link between a MINIDUMP_MODULE structure and additional
 //!     Crashpad-specific information about a module carried within a minidump
 //!     file.
-struct ALIGNAS(4) PACKED MinidumpModuleCrashpadInfoLink {
+struct alignas(4) PACKED MinidumpModuleCrashpadInfoLink {
   //! \brief A link to a MINIDUMP_MODULE structure in the module list stream.
   //!
   //! This field is an index into MINIDUMP_MODULE_LIST::Modules. This field’s
@@ -411,7 +419,7 @@ struct ALIGNAS(4) PACKED MinidumpModuleCrashpadInfoLink {
 //! structure carried within the minidump file will necessarily have
 //! Crashpad-specific information provided by a MinidumpModuleCrashpadInfo
 //! structure.
-struct ALIGNAS(4) PACKED MinidumpModuleCrashpadInfoList {
+struct alignas(4) PACKED MinidumpModuleCrashpadInfoList {
   //! \brief The number of children present in the #modules array.
   uint32_t count;
 
@@ -430,7 +438,7 @@ struct ALIGNAS(4) PACKED MinidumpModuleCrashpadInfoList {
 //! structure. Revise #kVersion and document each field’s validity based on
 //! #version, so that newer parsers will be able to determine whether the added
 //! fields are valid or not.
-struct ALIGNAS(4) PACKED MinidumpCrashpadInfo {
+struct alignas(4) PACKED MinidumpCrashpadInfo {
   // UUID has a constructor, which makes it non-POD, which makes this structure
   // non-POD. In order for the default constructor to zero-initialize other
   // members, an explicit constructor must be provided.
@@ -439,8 +447,9 @@ struct ALIGNAS(4) PACKED MinidumpCrashpadInfo {
         report_id(),
         client_id(),
         simple_annotations(),
-        module_list() {
-  }
+        module_list(),
+        reserved(),
+        address_mask() {}
 
   //! \brief The structure’s currently-defined version number.
   //!
@@ -494,6 +503,28 @@ struct ALIGNAS(4) PACKED MinidumpCrashpadInfo {
   //!
   //! This field is present when #version is at least `1`.
   MINIDUMP_LOCATION_DESCRIPTOR module_list;
+
+  //! \brief This field is always `0`.
+  uint32_t reserved;
+
+  //! \brief A mask indicating the range of valid addresses for a pointer.
+  //!
+  //! ARM64 supports MTE, TBI and PAC masking, generally in the upper bits of
+  //! a pointer. This mask can be used by LLDB to mimic ptrauth_strip and strip
+  //! the pointer authentication codes. To recover `pointer` in userland on
+  //! Darwin, `pointer & (~mask)`. In the case of code running in high memory,
+  //! where bit 55 is set (indicating that all of the high bits should be set
+  //! to 1), `pointer | mask`. See ABIMacOSX_arm64::FixAddress for more details
+  //! here:
+  //! https://github.com/llvm/llvm-project/blob/001d18664f8bcf63af64f10688809f7681dfbf0b/lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.cpp#L817-L830
+  //!
+  //! If the platform does not support pointer authentication, or the range of
+  //! valid addressees for a pointer was inaccessible, this field will be 0 and
+  //! should be ignored.
+  //!
+  //! This field is present when #version is at least `1`, if the size of the
+  //! structure is large enough to accommodate it.
+  uint64_t address_mask;
 };
 
 #if defined(COMPILER_MSVC)
diff --git a/extern/crashpad/crashpad/minidump/minidump_file_writer.cc b/extern/crashpad/crashpad/minidump/minidump_file_writer.cc
index 6727a0dcda..35d226bb5c 100644
--- a/extern/crashpad/crashpad/minidump/minidump_file_writer.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_file_writer.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,7 +16,9 @@
 
 #include <utility>
 
+#include "base/check_op.h"
 #include "base/logging.h"
+#include "build/build_config.h"
 #include "minidump/minidump_crashpad_info_writer.h"
 #include "minidump/minidump_exception_writer.h"
 #include "minidump/minidump_handle_writer.h"
@@ -26,6 +28,7 @@
 #include "minidump/minidump_module_writer.h"
 #include "minidump/minidump_system_info_writer.h"
 #include "minidump/minidump_thread_id_map.h"
+#include "minidump/minidump_thread_name_list_writer.h"
 #include "minidump/minidump_thread_writer.h"
 #include "minidump/minidump_unloaded_module_writer.h"
 #include "minidump/minidump_user_extension_stream_data_source.h"
@@ -34,6 +37,7 @@
 #include "snapshot/exception_snapshot.h"
 #include "snapshot/module_snapshot.h"
 #include "snapshot/process_snapshot.h"
+#include "snapshot/thread_snapshot.h"
 #include "util/file/file_writer.h"
 #include "util/numeric/safe_assignment.h"
 
@@ -79,6 +83,9 @@ void MinidumpFileWriter::InitializeFromSnapshot(
 
   auto misc_info = std::make_unique<MinidumpMiscInfoWriter>();
   misc_info->InitializeFromSnapshot(process_snapshot);
+  if (misc_info->HasXStateData())
+    header_.Flags = header_.Flags | MiniDumpWithAvxXStateContext;
+
   add_stream_result = AddStream(std::move(misc_info));
   DCHECK(add_stream_result);
 
@@ -91,10 +98,34 @@ void MinidumpFileWriter::InitializeFromSnapshot(
   add_stream_result = AddStream(std::move(thread_list));
   DCHECK(add_stream_result);
 
+  bool has_thread_name = false;
+  for (const ThreadSnapshot* thread_snapshot : process_snapshot->Threads()) {
+    if (!thread_snapshot->ThreadName().empty()) {
+      has_thread_name = true;
+      break;
+    }
+  }
+  if (has_thread_name) {
+    auto thread_name_list = std::make_unique<MinidumpThreadNameListWriter>();
+    thread_name_list->InitializeFromSnapshot(process_snapshot->Threads(),
+                                             thread_id_map);
+    add_stream_result = AddStream(std::move(thread_name_list));
+    DCHECK(add_stream_result);
+  }
+
   const ExceptionSnapshot* exception_snapshot = process_snapshot->Exception();
   if (exception_snapshot) {
     auto exception = std::make_unique<MinidumpExceptionWriter>();
-    exception->InitializeFromSnapshot(exception_snapshot, thread_id_map);
+#if BUILDFLAG(IS_IOS)
+    // It's expected that iOS intermediate dumps can be written with missing
+    // information, but it's better to try and report as much as possible
+    // rather than drop the incomplete minidump.
+    constexpr bool allow_missing_thread_id_from_map = true;
+#else
+    constexpr bool allow_missing_thread_id_from_map = false;
+#endif
+    exception->InitializeFromSnapshot(
+        exception_snapshot, thread_id_map, allow_missing_thread_id_from_map);
     add_stream_result = AddStream(std::move(exception));
     DCHECK(add_stream_result);
   }
diff --git a/extern/crashpad/crashpad/minidump/minidump_file_writer.h b/extern/crashpad/crashpad/minidump/minidump_file_writer.h
index 443a947e9d..e983cc0901 100644
--- a/extern/crashpad/crashpad/minidump/minidump_file_writer.h
+++ b/extern/crashpad/crashpad/minidump/minidump_file_writer.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/minidump_file_writer_test.cc b/extern/crashpad/crashpad/minidump/minidump_file_writer_test.cc
index efeaeab4cb..34b19fd3c2 100644
--- a/extern/crashpad/crashpad/minidump/minidump_file_writer_test.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_file_writer_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,10 +17,10 @@
 #include <stdint.h>
 #include <string.h>
 
+#include <iterator>
 #include <string>
 #include <utility>
 
-#include "base/cxx17_backports.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"
 #include "minidump/minidump_stream_writer.h"
@@ -156,7 +156,7 @@ TEST(MinidumpFileWriter, AddUserExtensionStream) {
   minidump_file.SetTimestamp(kTimestamp);
 
   static constexpr uint8_t kStreamData[] = "Hello World!";
-  constexpr size_t kStreamSize = base::size(kStreamData);
+  constexpr size_t kStreamSize = std::size(kStreamData);
   constexpr MinidumpStreamType kStreamType =
       static_cast<MinidumpStreamType>(0x4d);
 
@@ -418,12 +418,13 @@ TEST(MinidumpFileWriter, InitializeFromSnapshot_Exception) {
   // but the test should complete without failure.
   constexpr uint32_t kSnapshotTime = 0xfd469ab8;
   constexpr timeval kSnapshotTimeval = {
-#ifdef OS_WIN
-      static_cast<long>(kSnapshotTime),
+#if BUILDFLAG(IS_WIN)
+    static_cast<long>(kSnapshotTime),
 #else
-      static_cast<time_t>(kSnapshotTime),
+    static_cast<time_t>(kSnapshotTime),
 #endif
-      0};
+    0
+  };
 
   TestProcessSnapshot process_snapshot;
   process_snapshot.SetSnapshotTime(kSnapshotTimeval);
diff --git a/extern/crashpad/crashpad/minidump/minidump_handle_writer.cc b/extern/crashpad/crashpad/minidump/minidump_handle_writer.cc
index 098b40a167..72f1b19654 100644
--- a/extern/crashpad/crashpad/minidump/minidump_handle_writer.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_handle_writer.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 #include <string>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "minidump/minidump_extensions.h"
 #include "util/file/file_writer.h"
diff --git a/extern/crashpad/crashpad/minidump/minidump_handle_writer.h b/extern/crashpad/crashpad/minidump/minidump_handle_writer.h
index 348f55e814..8643f8f1bd 100644
--- a/extern/crashpad/crashpad/minidump/minidump_handle_writer.h
+++ b/extern/crashpad/crashpad/minidump/minidump_handle_writer.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/minidump_handle_writer_test.cc b/extern/crashpad/crashpad/minidump/minidump_handle_writer_test.cc
index 855be2a3cf..d1c3045e42 100644
--- a/extern/crashpad/crashpad/minidump/minidump_handle_writer_test.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_handle_writer_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/minidump_memory_info_writer.cc b/extern/crashpad/crashpad/minidump/minidump_memory_info_writer.cc
index fe09225168..a22a7dafc3 100644
--- a/extern/crashpad/crashpad/minidump/minidump_memory_info_writer.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_memory_info_writer.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/minidump_memory_info_writer.h b/extern/crashpad/crashpad/minidump/minidump_memory_info_writer.h
index a4159a7d3b..09d639ace9 100644
--- a/extern/crashpad/crashpad/minidump/minidump_memory_info_writer.h
+++ b/extern/crashpad/crashpad/minidump/minidump_memory_info_writer.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/minidump_memory_info_writer_test.cc b/extern/crashpad/crashpad/minidump/minidump_memory_info_writer_test.cc
index e45ea57330..78c6d5efa6 100644
--- a/extern/crashpad/crashpad/minidump/minidump_memory_info_writer_test.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_memory_info_writer_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/minidump_memory_writer.cc b/extern/crashpad/crashpad/minidump/minidump_memory_writer.cc
index a3b1f7521c..dd6c91aef4 100644
--- a/extern/crashpad/crashpad/minidump/minidump_memory_writer.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_memory_writer.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 #include <utility>
 
 #include "base/auto_reset.h"
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "util/file/file_writer.h"
 #include "util/numeric/safe_assignment.h"
diff --git a/extern/crashpad/crashpad/minidump/minidump_memory_writer.h b/extern/crashpad/crashpad/minidump/minidump_memory_writer.h
index ef18de24b0..9c93586d12 100644
--- a/extern/crashpad/crashpad/minidump/minidump_memory_writer.h
+++ b/extern/crashpad/crashpad/minidump/minidump_memory_writer.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/minidump_memory_writer_test.cc b/extern/crashpad/crashpad/minidump/minidump_memory_writer_test.cc
index 02a352fcea..214d56935a 100644
--- a/extern/crashpad/crashpad/minidump/minidump_memory_writer_test.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_memory_writer_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
 
 #include "minidump/minidump_memory_writer.h"
 
+#include <iterator>
 #include <utility>
 
-#include "base/cxx17_backports.h"
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
@@ -342,7 +342,7 @@ TEST(MinidumpMemoryWriter, ExtraMemory) {
 
 TEST(MinidumpMemoryWriter, AddFromSnapshot) {
   MINIDUMP_MEMORY_DESCRIPTOR expect_memory_descriptors[3] = {};
-  uint8_t values[base::size(expect_memory_descriptors)] = {};
+  uint8_t values[std::size(expect_memory_descriptors)] = {};
 
   expect_memory_descriptors[0].StartOfMemoryRange = 0;
   expect_memory_descriptors[0].Memory.DataSize = 0x1000;
@@ -358,7 +358,7 @@ TEST(MinidumpMemoryWriter, AddFromSnapshot) {
 
   std::vector<std::unique_ptr<TestMemorySnapshot>> memory_snapshots_owner;
   std::vector<const MemorySnapshot*> memory_snapshots;
-  for (size_t index = 0; index < base::size(expect_memory_descriptors);
+  for (size_t index = 0; index < std::size(expect_memory_descriptors);
        ++index) {
     memory_snapshots_owner.push_back(std::make_unique<TestMemorySnapshot>());
     TestMemorySnapshot* memory_snapshot = memory_snapshots_owner.back().get();
@@ -397,7 +397,7 @@ TEST(MinidumpMemoryWriter, AddFromSnapshot) {
 
 TEST(MinidumpMemoryWriter, CoalesceExplicitMultiple) {
   MINIDUMP_MEMORY_DESCRIPTOR expect_memory_descriptors[4] = {};
-  uint8_t values[base::size(expect_memory_descriptors)] = {};
+  uint8_t values[std::size(expect_memory_descriptors)] = {};
 
   expect_memory_descriptors[0].StartOfMemoryRange = 0;
   expect_memory_descriptors[0].Memory.DataSize = 1000;
diff --git a/extern/crashpad/crashpad/minidump/minidump_misc_info_writer.cc b/extern/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
index 64c3c2371b..1abb46c318 100644
--- a/extern/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,26 +14,29 @@
 
 #include "minidump/minidump_misc_info_writer.h"
 
+#include <iterator>
 #include <limits>
 
 #include "base/check_op.h"
-#include "base/cxx17_backports.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
+#include "minidump/minidump_context_writer.h"
 #include "minidump/minidump_writer_util.h"
 #include "package.h"
+#include "snapshot/cpu_context.h"
 #include "snapshot/process_snapshot.h"
 #include "snapshot/system_snapshot.h"
+#include "snapshot/thread_snapshot.h"
 #include "util/file/file_writer.h"
 #include "util/numeric/in_range_cast.h"
 #include "util/numeric/safe_assignment.h"
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 #include <Availability.h>
-#elif defined(OS_ANDROID)
+#elif BUILDFLAG(IS_ANDROID)
 #include <android/api-level.h>
 #endif
 
@@ -67,7 +70,7 @@ std::string BuildString(const SystemSnapshot* system_snapshot) {
   return machine_description;
 }
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 // Converts the value of the __MAC_OS_X_VERSION_MIN_REQUIRED or
 // __MAC_OS_X_VERSION_MAX_ALLOWED macro from <Availability.h> to a number
 // identifying the macOS version that it represents, in the same format used by
@@ -93,7 +96,44 @@ int AvailabilityVersionToMacOSVersionNumber(int availability) {
 
   return availability;
 }
-#endif  // OS_MAC
+#endif  // BUILDFLAG(IS_MAC)
+
+bool MaybeSetXStateData(const ProcessSnapshot* process_snapshot,
+                        XSTATE_CONFIG_FEATURE_MSC_INFO* xstate) {
+  // Cannot set xstate data if there are no threads.
+  auto threads = process_snapshot->Threads();
+  if (threads.size() == 0)
+    return false;
+
+  // All threads should be the same as we request contexts in the same way.
+  auto context = threads.at(0)->Context();
+
+  // Only support AMD64.
+  if (context->architecture != kCPUArchitectureX86_64)
+    return false;
+
+  // If no extended features, then we will just write the standard context.
+  if (context->x86_64->xstate.enabled_features == 0)
+    return false;
+
+  xstate->SizeOfInfo = sizeof(*xstate);
+  // Needs to match the size of the context we'll write or the dump is invalid,
+  // so ask the first thread how large it will be.
+  auto context_writer = MinidumpContextWriter::CreateFromSnapshot(context);
+  xstate->ContextSize =
+      static_cast<uint32_t>(context_writer->FreezeAndGetSizeOfObject());
+  // Note: This isn't the same as xstateenabledfeatures!
+  xstate->EnabledFeatures =
+      context->x86_64->xstate.enabled_features | XSTATE_COMPACTION_ENABLE_MASK;
+
+  // Note: if other XSAVE entries are to be supported they will be in order,
+  // and may have different offsets depending on what is saved.
+  if (context->x86_64->xstate.enabled_features & XSTATE_MASK_CET_U) {
+    xstate->Features[XSTATE_CET_U].Offset = kXSaveAreaFirstOffset;
+    xstate->Features[XSTATE_CET_U].Size = sizeof(MinidumpAMD64XSaveFormatCetU);
+  }
+  return true;
+}
 
 }  // namespace
 
@@ -107,17 +147,17 @@ std::string MinidumpMiscInfoDebugBuildString() {
   // Caution: the minidump file format only has room for 39 UTF-16 code units
   // plus a UTF-16 NUL terminator. Don’t let strings get longer than this, or
   // they will be truncated and a message will be logged.
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   static constexpr char kOS[] = "mac";
-#elif defined(OS_IOS)
+#elif BUILDFLAG(IS_IOS)
   static constexpr char kOS[] = "ios";
-#elif defined(OS_ANDROID)
+#elif BUILDFLAG(IS_ANDROID)
   static constexpr char kOS[] = "android";
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
   static constexpr char kOS[] = "linux";
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   static constexpr char kOS[] = "win";
-#elif defined(OS_FUCHSIA)
+#elif BUILDFLAG(IS_FUCHSIA)
   static constexpr char kOS[] = "fuchsia";
 #else
 #error define kOS for this operating system
@@ -135,6 +175,8 @@ std::string MinidumpMiscInfoDebugBuildString() {
   static constexpr char kCPU[] = "mips";
 #elif defined(ARCH_CPU_MIPS64EL)
   static constexpr char kCPU[] = "mips64";
+#elif defined(ARCH_CPU_RISCV64)
+  static constexpr char kCPU[] = "riscv64";
 #else
 #error define kCPU for this CPU
 #endif
@@ -145,12 +187,12 @@ std::string MinidumpMiscInfoDebugBuildString() {
                                                       PACKAGE_VERSION,
                                                       kOS);
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   debug_build_string += base::StringPrintf(
       ",%d,%d",
       AvailabilityVersionToMacOSVersionNumber(__MAC_OS_X_VERSION_MIN_REQUIRED),
       AvailabilityVersionToMacOSVersionNumber(__MAC_OS_X_VERSION_MAX_ALLOWED));
-#elif defined(OS_ANDROID)
+#elif BUILDFLAG(IS_ANDROID)
   debug_build_string += base::StringPrintf(",%d", __ANDROID_API__);
 #endif
 
@@ -235,6 +277,11 @@ void MinidumpMiscInfoWriter::InitializeFromSnapshot(
 
   SetBuildString(BuildString(system_snapshot),
                  internal::MinidumpMiscInfoDebugBuildString());
+
+  XSTATE_CONFIG_FEATURE_MSC_INFO xstate{};
+  if (MaybeSetXStateData(process_snapshot, &xstate)) {
+    SetXStateData(xstate);
+  }
 }
 
 void MinidumpMiscInfoWriter::SetProcessID(uint32_t process_id) {
@@ -311,7 +358,7 @@ void MinidumpMiscInfoWriter::SetTimeZone(uint32_t time_zone_id,
 
   internal::MinidumpWriterUtil::AssignUTF8ToUTF16(
       AsU16CStr(misc_info_.TimeZone.StandardName),
-      base::size(misc_info_.TimeZone.StandardName),
+      std::size(misc_info_.TimeZone.StandardName),
       standard_name);
 
   misc_info_.TimeZone.StandardDate = standard_date;
@@ -319,7 +366,7 @@ void MinidumpMiscInfoWriter::SetTimeZone(uint32_t time_zone_id,
 
   internal::MinidumpWriterUtil::AssignUTF8ToUTF16(
       AsU16CStr(misc_info_.TimeZone.DaylightName),
-      base::size(misc_info_.TimeZone.DaylightName),
+      std::size(misc_info_.TimeZone.DaylightName),
       daylight_name);
 
   misc_info_.TimeZone.DaylightDate = daylight_date;
@@ -337,11 +384,11 @@ void MinidumpMiscInfoWriter::SetBuildString(
 
   internal::MinidumpWriterUtil::AssignUTF8ToUTF16(
       AsU16CStr(misc_info_.BuildString),
-      base::size(misc_info_.BuildString),
+      std::size(misc_info_.BuildString),
       build_string);
   internal::MinidumpWriterUtil::AssignUTF8ToUTF16(
       AsU16CStr(misc_info_.DbgBldStr),
-      base::size(misc_info_.DbgBldStr),
+      std::size(misc_info_.DbgBldStr),
       debug_build_string);
 }
 
@@ -353,6 +400,10 @@ void MinidumpMiscInfoWriter::SetXStateData(
   has_xstate_data_ = true;
 }
 
+bool MinidumpMiscInfoWriter::HasXStateData() const {
+  return has_xstate_data_;
+}
+
 void MinidumpMiscInfoWriter::SetProcessCookie(uint32_t process_cookie) {
   DCHECK_EQ(state(), kStateMutable);
 
diff --git a/extern/crashpad/crashpad/minidump/minidump_misc_info_writer.h b/extern/crashpad/crashpad/minidump/minidump_misc_info_writer.h
index 9d89fe6480..6e3bb45a11 100644
--- a/extern/crashpad/crashpad/minidump/minidump_misc_info_writer.h
+++ b/extern/crashpad/crashpad/minidump/minidump_misc_info_writer.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -118,6 +118,9 @@ class MinidumpMiscInfoWriter final : public internal::MinidumpStreamWriter {
   //! \brief Sets MINIDUMP_MISC_INFO_5::XStateData.
   void SetXStateData(const XSTATE_CONFIG_FEATURE_MSC_INFO& xstate_data);
 
+  //! \brief Will this write extended context information?
+  bool HasXStateData() const;
+
   //! \brief Sets the field referenced by #MINIDUMP_MISC5_PROCESS_COOKIE.
   void SetProcessCookie(uint32_t process_cookie);
 
@@ -142,7 +145,7 @@ class MinidumpMiscInfoWriter final : public internal::MinidumpStreamWriter {
 
 //! \brief Conversion functions from a native UTF16 C-string to a char16_t
 //!     C-string. No-op where the native UTF16 string is std::u16string.
-#if defined(WCHAR_T_IS_UTF16) || DOXYGEN
+#if defined(WCHAR_T_IS_16_BIT) || DOXYGEN
 inline const char16_t* AsU16CStr(const wchar_t* str) {
   return reinterpret_cast<const char16_t*>(str);
 }
diff --git a/extern/crashpad/crashpad/minidump/minidump_misc_info_writer_test.cc b/extern/crashpad/crashpad/minidump/minidump_misc_info_writer_test.cc
index 18ac2966bb..ff132b901c 100644
--- a/extern/crashpad/crashpad/minidump/minidump_misc_info_writer_test.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_misc_info_writer_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,11 +16,10 @@
 
 #include <string.h>
 
+#include <iterator>
 #include <string>
 #include <utility>
 
-#include "base/compiler_specific.h"
-#include "base/cxx17_backports.h"
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ -126,7 +125,7 @@ void ExpectMiscInfoEqual<MINIDUMP_MISC_INFO_3>(
     SCOPED_TRACE("Standard");
     ExpectNULPaddedString16Equal(AsU16CStr(expected->TimeZone.StandardName),
                                  AsU16CStr(observed->TimeZone.StandardName),
-                                 base::size(expected->TimeZone.StandardName));
+                                 std::size(expected->TimeZone.StandardName));
     ExpectSystemTimeEqual(&expected->TimeZone.StandardDate,
                           &observed->TimeZone.StandardDate);
     EXPECT_EQ(observed->TimeZone.StandardBias, expected->TimeZone.StandardBias);
@@ -135,7 +134,7 @@ void ExpectMiscInfoEqual<MINIDUMP_MISC_INFO_3>(
     SCOPED_TRACE("Daylight");
     ExpectNULPaddedString16Equal(AsU16CStr(expected->TimeZone.DaylightName),
                                  AsU16CStr(observed->TimeZone.DaylightName),
-                                 base::size(expected->TimeZone.DaylightName));
+                                 std::size(expected->TimeZone.DaylightName));
     ExpectSystemTimeEqual(&expected->TimeZone.DaylightDate,
                           &observed->TimeZone.DaylightDate);
     EXPECT_EQ(observed->TimeZone.DaylightBias, expected->TimeZone.DaylightBias);
@@ -153,13 +152,13 @@ void ExpectMiscInfoEqual<MINIDUMP_MISC_INFO_4>(
     SCOPED_TRACE("BuildString");
     ExpectNULPaddedString16Equal(AsU16CStr(expected->BuildString),
                                  AsU16CStr(observed->BuildString),
-                                 base::size(expected->BuildString));
+                                 std::size(expected->BuildString));
   }
   {
     SCOPED_TRACE("DbgBldStr");
     ExpectNULPaddedString16Equal(AsU16CStr(expected->DbgBldStr),
                                  AsU16CStr(observed->DbgBldStr),
-                                 base::size(expected->DbgBldStr));
+                                 std::size(expected->DbgBldStr));
   }
 }
 
@@ -179,10 +178,13 @@ void ExpectMiscInfoEqual<MINIDUMP_MISC_INFO_5>(
             expected_misc_info.XStateData.SizeOfInfo);
   EXPECT_EQ(observed_misc_info.XStateData.ContextSize,
             expected_misc_info.XStateData.ContextSize);
-  EXPECT_EQ(observed_misc_info.XStateData.EnabledFeatures,
-            expected_misc_info.XStateData.EnabledFeatures);
+  // `EnabledFeatures` is underaligned and `EXPECT_EQ` internally takes
+  // arguments by reference. Copy it into a temporary before comparing to avoid
+  // undefined behavior.
+  EXPECT_EQ(uint64_t{observed_misc_info.XStateData.EnabledFeatures},
+            uint64_t{expected_misc_info.XStateData.EnabledFeatures});
   for (size_t feature_index = 0;
-       feature_index < base::size(observed_misc_info.XStateData.Features);
+       feature_index < std::size(observed_misc_info.XStateData.Features);
        ++feature_index) {
     SCOPED_TRACE(base::StringPrintf("feature_index %" PRIuS, feature_index));
     EXPECT_EQ(observed_misc_info.XStateData.Features[feature_index].Offset,
@@ -409,7 +411,7 @@ TEST(MinidumpMiscInfoWriter, TimeZone) {
       base::UTF8ToUTF16(Crbug1189439Cast(kStandardName));
   c16lcpy(AsU16CStr(expected.TimeZone.StandardName),
           standard_name_utf16.c_str(),
-          base::size(expected.TimeZone.StandardName));
+          std::size(expected.TimeZone.StandardName));
   memcpy(&expected.TimeZone.StandardDate,
          &kStandardDate,
          sizeof(expected.TimeZone.StandardDate));
@@ -418,7 +420,7 @@ TEST(MinidumpMiscInfoWriter, TimeZone) {
       base::UTF8ToUTF16(Crbug1189439Cast(kDaylightName));
   c16lcpy(AsU16CStr(expected.TimeZone.DaylightName),
           daylight_name_utf16.c_str(),
-          base::size(expected.TimeZone.DaylightName));
+          std::size(expected.TimeZone.DaylightName));
   memcpy(&expected.TimeZone.DaylightDate,
          &kDaylightDate,
          sizeof(expected.TimeZone.DaylightDate));
@@ -436,11 +438,10 @@ TEST(MinidumpMiscInfoWriter, TimeZoneStringsOverflow) {
 
   constexpr uint32_t kTimeZoneId = 2;
   constexpr int32_t kBias = 300;
-  MINIDUMP_MISC_INFO_N tmp;
-  ALLOW_UNUSED_LOCAL(tmp);
-  std::string standard_name(base::size(tmp.TimeZone.StandardName) + 1, 's');
+  [[maybe_unused]] MINIDUMP_MISC_INFO_N tmp;
+  std::string standard_name(std::size(tmp.TimeZone.StandardName) + 1, 's');
   constexpr int32_t kStandardBias = 0;
-  std::string daylight_name(base::size(tmp.TimeZone.DaylightName), 'd');
+  std::string daylight_name(std::size(tmp.TimeZone.DaylightName), 'd');
   constexpr int32_t kDaylightBias = -60;
 
   // Test using kSystemTimeZero, because not all platforms will be able to
@@ -471,7 +472,7 @@ TEST(MinidumpMiscInfoWriter, TimeZoneStringsOverflow) {
   std::u16string standard_name_utf16 = base::UTF8ToUTF16(standard_name);
   c16lcpy(AsU16CStr(expected.TimeZone.StandardName),
           standard_name_utf16.c_str(),
-          base::size(expected.TimeZone.StandardName));
+          std::size(expected.TimeZone.StandardName));
   memcpy(&expected.TimeZone.StandardDate,
          &kSystemTimeZero,
          sizeof(expected.TimeZone.StandardDate));
@@ -479,7 +480,7 @@ TEST(MinidumpMiscInfoWriter, TimeZoneStringsOverflow) {
   std::u16string daylight_name_utf16 = base::UTF8ToUTF16(daylight_name);
   c16lcpy(AsU16CStr(expected.TimeZone.DaylightName),
           daylight_name_utf16.c_str(),
-          base::size(expected.TimeZone.DaylightName));
+          std::size(expected.TimeZone.DaylightName));
   memcpy(&expected.TimeZone.DaylightDate,
          &kSystemTimeZero,
          sizeof(expected.TimeZone.DaylightDate));
@@ -511,12 +512,12 @@ TEST(MinidumpMiscInfoWriter, BuildStrings) {
       base::UTF8ToUTF16(Crbug1189439Cast(kBuildString));
   c16lcpy(AsU16CStr(expected.BuildString),
           build_string_utf16.c_str(),
-          base::size(expected.BuildString));
+          std::size(expected.BuildString));
   std::u16string debug_build_string_utf16 =
       base::UTF8ToUTF16(Crbug1189439Cast(kDebugBuildString));
   c16lcpy(AsU16CStr(expected.DbgBldStr),
           debug_build_string_utf16.c_str(),
-          base::size(expected.DbgBldStr));
+          std::size(expected.DbgBldStr));
 
   ExpectMiscInfoEqual(&expected, observed);
 }
@@ -528,10 +529,9 @@ TEST(MinidumpMiscInfoWriter, BuildStringsOverflow) {
   MinidumpFileWriter minidump_file_writer;
   auto misc_info_writer = std::make_unique<MinidumpMiscInfoWriter>();
 
-  MINIDUMP_MISC_INFO_N tmp;
-  ALLOW_UNUSED_LOCAL(tmp);
-  std::string build_string(base::size(tmp.BuildString) + 1, 'B');
-  std::string debug_build_string(base::size(tmp.DbgBldStr), 'D');
+  [[maybe_unused]] MINIDUMP_MISC_INFO_N tmp;
+  std::string build_string(std::size(tmp.BuildString) + 1, 'B');
+  std::string debug_build_string(std::size(tmp.DbgBldStr), 'D');
 
   misc_info_writer->SetBuildString(build_string, debug_build_string);
 
@@ -548,12 +548,12 @@ TEST(MinidumpMiscInfoWriter, BuildStringsOverflow) {
   std::u16string build_string_utf16 = base::UTF8ToUTF16(build_string);
   c16lcpy(AsU16CStr(expected.BuildString),
           build_string_utf16.c_str(),
-          base::size(expected.BuildString));
+          std::size(expected.BuildString));
   std::u16string debug_build_string_utf16 =
       base::UTF8ToUTF16(debug_build_string);
   c16lcpy(AsU16CStr(expected.DbgBldStr),
           debug_build_string_utf16.c_str(),
-          base::size(expected.DbgBldStr));
+          std::size(expected.DbgBldStr));
 
   ExpectMiscInfoEqual(&expected, observed);
 }
@@ -694,7 +694,7 @@ TEST(MinidumpMiscInfoWriter, Everything) {
       base::UTF8ToUTF16(Crbug1189439Cast(kStandardName));
   c16lcpy(AsU16CStr(expected.TimeZone.StandardName),
           standard_name_utf16.c_str(),
-          base::size(expected.TimeZone.StandardName));
+          std::size(expected.TimeZone.StandardName));
   memcpy(&expected.TimeZone.StandardDate,
          &kSystemTimeZero,
          sizeof(expected.TimeZone.StandardDate));
@@ -703,7 +703,7 @@ TEST(MinidumpMiscInfoWriter, Everything) {
       base::UTF8ToUTF16(Crbug1189439Cast(kDaylightName));
   c16lcpy(AsU16CStr(expected.TimeZone.DaylightName),
           daylight_name_utf16.c_str(),
-          base::size(expected.TimeZone.DaylightName));
+          std::size(expected.TimeZone.DaylightName));
   memcpy(&expected.TimeZone.DaylightDate,
          &kSystemTimeZero,
          sizeof(expected.TimeZone.DaylightDate));
@@ -712,12 +712,12 @@ TEST(MinidumpMiscInfoWriter, Everything) {
       base::UTF8ToUTF16(Crbug1189439Cast(kBuildString));
   c16lcpy(AsU16CStr(expected.BuildString),
           build_string_utf16.c_str(),
-          base::size(expected.BuildString));
+          std::size(expected.BuildString));
   std::u16string debug_build_string_utf16 =
       base::UTF8ToUTF16(Crbug1189439Cast(kDebugBuildString));
   c16lcpy(AsU16CStr(expected.DbgBldStr),
           debug_build_string_utf16.c_str(),
-          base::size(expected.DbgBldStr));
+          std::size(expected.DbgBldStr));
 
   ExpectMiscInfoEqual(&expected, observed);
 }
@@ -761,18 +761,18 @@ TEST(MinidumpMiscInfoWriter, InitializeFromSnapshot) {
   expect_misc_info.TimeZone.Bias = 300;
   c16lcpy(AsU16CStr(expect_misc_info.TimeZone.StandardName),
           standard_time_name_utf16.c_str(),
-          base::size(expect_misc_info.TimeZone.StandardName));
+          std::size(expect_misc_info.TimeZone.StandardName));
   expect_misc_info.TimeZone.StandardBias = 0;
   c16lcpy(AsU16CStr(expect_misc_info.TimeZone.DaylightName),
           daylight_time_name_utf16.c_str(),
-          base::size(expect_misc_info.TimeZone.DaylightName));
+          std::size(expect_misc_info.TimeZone.DaylightName));
   expect_misc_info.TimeZone.DaylightBias = -60;
   c16lcpy(AsU16CStr(expect_misc_info.BuildString),
           build_string_utf16.c_str(),
-          base::size(expect_misc_info.BuildString));
+          std::size(expect_misc_info.BuildString));
   c16lcpy(AsU16CStr(expect_misc_info.DbgBldStr),
           debug_build_string_utf16.c_str(),
-          base::size(expect_misc_info.DbgBldStr));
+          std::size(expect_misc_info.DbgBldStr));
 
   const timeval kStartTime = {
       static_cast<long>(expect_misc_info.ProcessCreateTime), 0};
diff --git a/extern/crashpad/crashpad/minidump/minidump_module_crashpad_info_writer.cc b/extern/crashpad/crashpad/minidump/minidump_module_crashpad_info_writer.cc
index a31feaea14..7f3dcda904 100644
--- a/extern/crashpad/crashpad/minidump/minidump_module_crashpad_info_writer.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_module_crashpad_info_writer.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 #include <utility>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "minidump/minidump_annotation_writer.h"
 #include "minidump/minidump_simple_string_dictionary_writer.h"
diff --git a/extern/crashpad/crashpad/minidump/minidump_module_crashpad_info_writer.h b/extern/crashpad/crashpad/minidump/minidump_module_crashpad_info_writer.h
index 9af5c83fa3..ec3f7e4182 100644
--- a/extern/crashpad/crashpad/minidump/minidump_module_crashpad_info_writer.h
+++ b/extern/crashpad/crashpad/minidump/minidump_module_crashpad_info_writer.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/minidump_module_crashpad_info_writer_test.cc b/extern/crashpad/crashpad/minidump/minidump_module_crashpad_info_writer_test.cc
index 613314b3f4..88af7fee30 100644
--- a/extern/crashpad/crashpad/minidump/minidump_module_crashpad_info_writer_test.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_module_crashpad_info_writer_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,9 +17,9 @@
 #include <windows.h>
 #include <dbghelp.h>
 
+#include <iterator>
 #include <utility>
 
-#include "base/cxx17_backports.h"
 #include "gtest/gtest.h"
 #include "minidump/minidump_annotation_writer.h"
 #include "minidump/minidump_simple_string_dictionary_writer.h"
@@ -155,9 +155,9 @@ TEST(MinidumpModuleCrashpadInfoWriter, FullModule) {
                 sizeof(MinidumpSimpleStringDictionaryEntry) +
                 sizeof(MinidumpAnnotationList) + 2 +  // padding
                 sizeof(MinidumpAnnotation) + sizeof(MinidumpUTF8String) +
-                base::size(kEntry) + 2 +  // padding
-                sizeof(MinidumpUTF8String) + base::size(kKey) +
-                sizeof(MinidumpUTF8String) + base::size(kValue) +
+                std::size(kEntry) + 2 +  // padding
+                sizeof(MinidumpUTF8String) + std::size(kKey) +
+                sizeof(MinidumpUTF8String) + std::size(kValue) +
                 sizeof(MinidumpUTF8String) + annotation.name.size() + 1 +
                 sizeof(MinidumpByteArray) + annotation.value.size());
 
diff --git a/extern/crashpad/crashpad/minidump/minidump_module_writer.cc b/extern/crashpad/crashpad/minidump/minidump_module_writer.cc
index 6e533524a4..1287a6de69 100644
--- a/extern/crashpad/crashpad/minidump/minidump_module_writer.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_module_writer.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 #include <limits>
 #include <utility>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "minidump/minidump_string_writer.h"
diff --git a/extern/crashpad/crashpad/minidump/minidump_module_writer.h b/extern/crashpad/crashpad/minidump/minidump_module_writer.h
index d450892c8e..743d7bb31d 100644
--- a/extern/crashpad/crashpad/minidump/minidump_module_writer.h
+++ b/extern/crashpad/crashpad/minidump/minidump_module_writer.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/minidump_module_writer_test.cc b/extern/crashpad/crashpad/minidump/minidump_module_writer_test.cc
index 131575fabc..7d0f9489ae 100644
--- a/extern/crashpad/crashpad/minidump/minidump_module_writer_test.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_module_writer_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,9 +17,9 @@
 #include <stddef.h>
 #include <string.h>
 
+#include <iterator>
 #include <utility>
 
-#include "base/cxx17_backports.h"
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ -793,10 +793,10 @@ void InitializeTestModuleSnapshotFromMinidumpModule(
 
 TEST(MinidumpModuleWriter, InitializeFromSnapshot) {
   MINIDUMP_MODULE expect_modules[3] = {};
-  const char* module_paths[base::size(expect_modules)] = {};
-  const char* module_pdbs[base::size(expect_modules)] = {};
-  UUID uuids[base::size(expect_modules)] = {};
-  uint32_t ages[base::size(expect_modules)] = {};
+  const char* module_paths[std::size(expect_modules)] = {};
+  const char* module_pdbs[std::size(expect_modules)] = {};
+  UUID uuids[std::size(expect_modules)] = {};
+  uint32_t ages[std::size(expect_modules)] = {};
 
   expect_modules[0].BaseOfImage = 0x100101000;
   expect_modules[0].SizeOfImage = 0xf000;
@@ -887,7 +887,7 @@ TEST(MinidumpModuleWriter, InitializeFromSnapshot) {
 
   std::vector<std::unique_ptr<TestModuleSnapshot>> module_snapshots_owner;
   std::vector<const ModuleSnapshot*> module_snapshots;
-  for (size_t index = 0; index < base::size(expect_modules); ++index) {
+  for (size_t index = 0; index < std::size(expect_modules); ++index) {
     module_snapshots_owner.push_back(std::make_unique<TestModuleSnapshot>());
     TestModuleSnapshot* module_snapshot = module_snapshots_owner.back().get();
     InitializeTestModuleSnapshotFromMinidumpModule(module_snapshot,
diff --git a/extern/crashpad/crashpad/minidump/minidump_rva_list_writer.cc b/extern/crashpad/crashpad/minidump/minidump_rva_list_writer.cc
index 88539869f0..3a1ee8e8d8 100644
--- a/extern/crashpad/crashpad/minidump/minidump_rva_list_writer.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_rva_list_writer.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 #include <utility>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "util/file/file_writer.h"
 #include "util/numeric/safe_assignment.h"
diff --git a/extern/crashpad/crashpad/minidump/minidump_rva_list_writer.h b/extern/crashpad/crashpad/minidump/minidump_rva_list_writer.h
index ba7bd68644..b05d3c5f14 100644
--- a/extern/crashpad/crashpad/minidump/minidump_rva_list_writer.h
+++ b/extern/crashpad/crashpad/minidump/minidump_rva_list_writer.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/minidump_rva_list_writer_test.cc b/extern/crashpad/crashpad/minidump/minidump_rva_list_writer_test.cc
index f99d9435c2..bfcb459759 100644
--- a/extern/crashpad/crashpad/minidump/minidump_rva_list_writer_test.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_rva_list_writer_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
 
 #include "minidump/minidump_rva_list_writer.h"
 
+#include <iterator>
 #include <utility>
 
-#include "base/cxx17_backports.h"
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
@@ -89,10 +89,10 @@ TEST(MinidumpRVAListWriter, ThreeChildren) {
   ASSERT_TRUE(list_writer.WriteEverything(&string_file));
 
   const MinidumpRVAList* list =
-      MinidumpRVAListAtStart(string_file.string(), base::size(kValues));
+      MinidumpRVAListAtStart(string_file.string(), std::size(kValues));
   ASSERT_TRUE(list);
 
-  for (size_t index = 0; index < base::size(kValues); ++index) {
+  for (size_t index = 0; index < std::size(kValues); ++index) {
     SCOPED_TRACE(base::StringPrintf("index %" PRIuS, index));
 
     const uint32_t* child = MinidumpWritableAtRVA<uint32_t>(
diff --git a/extern/crashpad/crashpad/minidump/minidump_simple_string_dictionary_writer.cc b/extern/crashpad/crashpad/minidump/minidump_simple_string_dictionary_writer.cc
index 90f943006c..cb25098b84 100644
--- a/extern/crashpad/crashpad/minidump/minidump_simple_string_dictionary_writer.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_simple_string_dictionary_writer.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 #include <utility>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "util/file/file_writer.h"
 #include "util/numeric/safe_assignment.h"
diff --git a/extern/crashpad/crashpad/minidump/minidump_simple_string_dictionary_writer.h b/extern/crashpad/crashpad/minidump/minidump_simple_string_dictionary_writer.h
index 5e46a64795..a8ce665d49 100644
--- a/extern/crashpad/crashpad/minidump/minidump_simple_string_dictionary_writer.h
+++ b/extern/crashpad/crashpad/minidump/minidump_simple_string_dictionary_writer.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/minidump_simple_string_dictionary_writer_test.cc b/extern/crashpad/crashpad/minidump/minidump_simple_string_dictionary_writer_test.cc
index 2c7423d42b..cb0f2f55b7 100644
--- a/extern/crashpad/crashpad/minidump/minidump_simple_string_dictionary_writer_test.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_simple_string_dictionary_writer_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/minidump_stream_writer.cc b/extern/crashpad/crashpad/minidump/minidump_stream_writer.cc
index 3084ffed73..1b3f7da224 100644
--- a/extern/crashpad/crashpad/minidump/minidump_stream_writer.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_stream_writer.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/minidump_stream_writer.h b/extern/crashpad/crashpad/minidump/minidump_stream_writer.h
index 447566b902..0ad658191a 100644
--- a/extern/crashpad/crashpad/minidump/minidump_stream_writer.h
+++ b/extern/crashpad/crashpad/minidump/minidump_stream_writer.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/minidump_string_writer.cc b/extern/crashpad/crashpad/minidump/minidump_string_writer.cc
index f01fc84f4c..0b0a3e86e3 100644
--- a/extern/crashpad/crashpad/minidump/minidump_string_writer.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_string_writer.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 #include <utility>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "minidump/minidump_writer_util.h"
 #include "util/file/file_writer.h"
diff --git a/extern/crashpad/crashpad/minidump/minidump_string_writer.h b/extern/crashpad/crashpad/minidump/minidump_string_writer.h
index d11e8cc18e..2895d0b76b 100644
--- a/extern/crashpad/crashpad/minidump/minidump_string_writer.h
+++ b/extern/crashpad/crashpad/minidump/minidump_string_writer.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/minidump_string_writer_test.cc b/extern/crashpad/crashpad/minidump/minidump_string_writer_test.cc
index bfaf3a9aef..e72832b46d 100644
--- a/extern/crashpad/crashpad/minidump/minidump_string_writer_test.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_string_writer_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,11 +14,12 @@
 
 #include "minidump/minidump_string_writer.h"
 
+#include <iterator>
 #include <string>
+#include <type_traits>
 
-#include "base/compiler_specific.h"
-#include "base/cxx17_backports.h"
 #include "base/format_macros.h"
+#include "base/notreached.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "gtest/gtest.h"
@@ -31,7 +32,22 @@ namespace crashpad {
 namespace test {
 namespace {
 
-TEST(MinidumpStringWriter, MinidumpUTF16StringWriter) {
+class TestTypeNames {
+ public:
+  template <typename T>
+  static std::string GetName(int) {
+    static_assert(std::is_same<T, RVA>() || std::is_same<T, RVA64>());
+    return std::is_same<T, RVA>() ? "RVA" : "RVA64";
+  }
+};
+
+template <typename RVAType>
+class MinidumpStringWriter : public ::testing::Test {};
+
+using RVATypes = ::testing::Types<RVA, RVA64>;
+TYPED_TEST_SUITE(MinidumpStringWriter, RVATypes, TestTypeNames);
+
+TYPED_TEST(MinidumpStringWriter, MinidumpUTF16StringWriter) {
   StringFile string_file;
 
   {
@@ -42,9 +58,9 @@ TEST(MinidumpStringWriter, MinidumpUTF16StringWriter) {
     ASSERT_EQ(string_file.string().size(), 6u);
 
     const MINIDUMP_STRING* minidump_string =
-        MinidumpStringAtRVA(string_file.string(), 0);
+        MinidumpStringAtRVA(string_file.string(), TypeParam(0));
     EXPECT_TRUE(minidump_string);
-    EXPECT_EQ(MinidumpStringAtRVAAsString(string_file.string(), 0),
+    EXPECT_EQ(MinidumpStringAtRVAAsString(string_file.string(), TypeParam(0)),
               std::u16string());
   }
 
@@ -67,16 +83,15 @@ TEST(MinidumpStringWriter, MinidumpUTF16StringWriter) {
       {4, "\360\220\204\202", 2, {0xd800, 0xdd02}},  // 𐄂 (non-BMP)
   };
 
-  for (size_t index = 0; index < base::size(kTestData); ++index) {
+  for (size_t index = 0; index < std::size(kTestData); ++index) {
     SCOPED_TRACE(base::StringPrintf(
         "index %" PRIuS ", input %s", index, kTestData[index].input_string));
 
     // Make sure that the expected output string with its NUL terminator fits in
     // the space provided.
-    ASSERT_EQ(
-        kTestData[index]
-            .output_string[base::size(kTestData[index].output_string) - 1],
-        0);
+    ASSERT_EQ(kTestData[index]
+                  .output_string[std::size(kTestData[index].output_string) - 1],
+              0);
 
     string_file.Reset();
     crashpad::internal::MinidumpUTF16StringWriter string_writer;
@@ -86,23 +101,22 @@ TEST(MinidumpStringWriter, MinidumpUTF16StringWriter) {
 
     const size_t expected_utf16_units_with_nul =
         kTestData[index].output_length + 1;
-    MINIDUMP_STRING* tmp;
-    ALLOW_UNUSED_LOCAL(tmp);
+    [[maybe_unused]] MINIDUMP_STRING* tmp;
     const size_t expected_utf16_bytes =
         expected_utf16_units_with_nul * sizeof(tmp->Buffer[0]);
     ASSERT_EQ(string_file.string().size(), sizeof(*tmp) + expected_utf16_bytes);
 
     const MINIDUMP_STRING* minidump_string =
-        MinidumpStringAtRVA(string_file.string(), 0);
+        MinidumpStringAtRVA(string_file.string(), TypeParam(0));
     EXPECT_TRUE(minidump_string);
     std::u16string expect_string = std::u16string(
         kTestData[index].output_string, kTestData[index].output_length);
-    EXPECT_EQ(MinidumpStringAtRVAAsString(string_file.string(), 0),
+    EXPECT_EQ(MinidumpStringAtRVAAsString(string_file.string(), TypeParam(0)),
               expect_string);
   }
 }
 
-TEST(MinidumpStringWriter, ConvertInvalidUTF8ToUTF16) {
+TYPED_TEST(MinidumpStringWriter, ConvertInvalidUTF8ToUTF16) {
   StringFile string_file;
 
   static constexpr const char* kTestData[] = {
@@ -114,7 +128,7 @@ TEST(MinidumpStringWriter, ConvertInvalidUTF8ToUTF16) {
       "\303\0\251",  // NUL in middle of valid sequence
   };
 
-  for (size_t index = 0; index < base::size(kTestData); ++index) {
+  for (size_t index = 0; index < std::size(kTestData); ++index) {
     SCOPED_TRACE(base::StringPrintf(
         "index %" PRIuS ", input %s", index, kTestData[index]));
     string_file.Reset();
@@ -128,21 +142,20 @@ TEST(MinidumpStringWriter, ConvertInvalidUTF8ToUTF16) {
     // data written, and make sure that at least one U+FFFD replacement
     // character was written.
     const MINIDUMP_STRING* minidump_string =
-        MinidumpStringAtRVA(string_file.string(), 0);
+        MinidumpStringAtRVA(string_file.string(), TypeParam(0));
     EXPECT_TRUE(minidump_string);
-    MINIDUMP_STRING* tmp;
-    ALLOW_UNUSED_LOCAL(tmp);
+    [[maybe_unused]] MINIDUMP_STRING* tmp;
     EXPECT_EQ(
         minidump_string->Length,
         string_file.string().size() - sizeof(*tmp) - sizeof(tmp->Buffer[0]));
     std::u16string output_string =
-        MinidumpStringAtRVAAsString(string_file.string(), 0);
+        MinidumpStringAtRVAAsString(string_file.string(), TypeParam(0));
     EXPECT_FALSE(output_string.empty());
     EXPECT_NE(output_string.find(0xfffd), std::u16string::npos);
   }
 }
 
-TEST(MinidumpStringWriter, MinidumpUTF8StringWriter) {
+TYPED_TEST(MinidumpStringWriter, MinidumpUTF8StringWriter) {
   StringFile string_file;
 
   {
@@ -153,10 +166,11 @@ TEST(MinidumpStringWriter, MinidumpUTF8StringWriter) {
     ASSERT_EQ(string_file.string().size(), 5u);
 
     const MinidumpUTF8String* minidump_string =
-        MinidumpUTF8StringAtRVA(string_file.string(), 0);
+        MinidumpUTF8StringAtRVA(string_file.string(), TypeParam(0));
     EXPECT_TRUE(minidump_string);
-    EXPECT_EQ(MinidumpUTF8StringAtRVAAsString(string_file.string(), 0),
-              std::string());
+    EXPECT_EQ(
+        MinidumpUTF8StringAtRVAAsString(string_file.string(), TypeParam(0)),
+        std::string());
   }
 
   static constexpr struct {
@@ -176,7 +190,7 @@ TEST(MinidumpStringWriter, MinidumpUTF8StringWriter) {
       {4, "\360\220\204\202"},  // 𐄂 (non-BMP)
   };
 
-  for (size_t index = 0; index < base::size(kTestData); ++index) {
+  for (size_t index = 0; index < std::size(kTestData); ++index) {
     SCOPED_TRACE(base::StringPrintf(
         "index %" PRIuS ", input %s", index, kTestData[index].string));
 
@@ -192,10 +206,11 @@ TEST(MinidumpStringWriter, MinidumpUTF8StringWriter) {
               sizeof(MinidumpUTF8String) + expected_utf8_bytes_with_nul);
 
     const MinidumpUTF8String* minidump_string =
-        MinidumpUTF8StringAtRVA(string_file.string(), 0);
+        MinidumpUTF8StringAtRVA(string_file.string(), TypeParam(0));
     EXPECT_TRUE(minidump_string);
-    EXPECT_EQ(MinidumpUTF8StringAtRVAAsString(string_file.string(), 0),
-              test_string);
+    EXPECT_EQ(
+        MinidumpUTF8StringAtRVAAsString(string_file.string(), TypeParam(0)),
+        test_string);
   }
 }
 
@@ -249,11 +264,11 @@ void MinidumpStringListTest() {
   }
 }
 
-TEST(MinidumpStringWriter, MinidumpUTF16StringList) {
+TYPED_TEST(MinidumpStringWriter, MinidumpUTF16StringList) {
   MinidumpStringListTest<MinidumpUTF16StringListWriterTraits>();
 }
 
-TEST(MinidumpStringWriter, MinidumpUTF8StringList) {
+TYPED_TEST(MinidumpStringWriter, MinidumpUTF8StringList) {
   MinidumpStringListTest<MinidumpUTF8StringListWriterTraits>();
 }
 
diff --git a/extern/crashpad/crashpad/minidump/minidump_system_info_writer.cc b/extern/crashpad/crashpad/minidump/minidump_system_info_writer.cc
index 135010103b..e9e05124aa 100644
--- a/extern/crashpad/crashpad/minidump/minidump_system_info_writer.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_system_info_writer.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,8 +16,9 @@
 
 #include <string.h>
 
+#include <iterator>
+
 #include "base/check_op.h"
-#include "base/cxx17_backports.h"
 #include "base/notreached.h"
 #include "minidump/minidump_string_writer.h"
 #include "snapshot/system_snapshot.h"
@@ -131,10 +132,11 @@ void MinidumpSystemInfoWriter::InitializeFromSnapshot(
     case kCPUArchitectureARM64:
       cpu_architecture = kMinidumpCPUArchitectureARM64;
       break;
+    case kCPUArchitectureRISCV64:
+      cpu_architecture = kMinidumpCPUArchitectureRISCV64Breakpad;
+      break;
     default:
       NOTREACHED();
-      cpu_architecture = kMinidumpCPUArchitectureUnknown;
-      break;
   }
   SetCPUArchitecture(cpu_architecture);
 
@@ -182,8 +184,6 @@ void MinidumpSystemInfoWriter::InitializeFromSnapshot(
       break;
     default:
       NOTREACHED();
-      operating_system = kMinidumpOSUnknown;
-      break;
   }
   SetOS(operating_system);
 
@@ -235,7 +235,7 @@ void MinidumpSystemInfoWriter::SetCPUX86VendorString(
       sizeof(registers) == sizeof(system_info_.Cpu.X86CpuInfo.VendorId),
       "VendorId sizes must be equal");
 
-  for (size_t index = 0; index < base::size(registers); ++index) {
+  for (size_t index = 0; index < std::size(registers); ++index) {
     memcpy(&registers[index],
            &vendor[index * sizeof(*registers)],
            sizeof(*registers));
diff --git a/extern/crashpad/crashpad/minidump/minidump_system_info_writer.h b/extern/crashpad/crashpad/minidump/minidump_system_info_writer.h
index 07dbcf35b8..945080d0a4 100644
--- a/extern/crashpad/crashpad/minidump/minidump_system_info_writer.h
+++ b/extern/crashpad/crashpad/minidump/minidump_system_info_writer.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/minidump_system_info_writer_test.cc b/extern/crashpad/crashpad/minidump/minidump_system_info_writer_test.cc
index 206a8e41cc..edca161c55 100644
--- a/extern/crashpad/crashpad/minidump/minidump_system_info_writer_test.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_system_info_writer_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 #include <string>
 #include <utility>
 
-#include "base/compiler_specific.h"
 #include "gtest/gtest.h"
 #include "minidump/minidump_file_writer.h"
 #include "minidump/test/minidump_file_writer_test_util.h"
@@ -39,8 +38,7 @@ void GetSystemInfoStream(const std::string& file_contents,
                          const MINIDUMP_SYSTEM_INFO** system_info,
                          const MINIDUMP_STRING** csd_version) {
   // The expected number of bytes for the CSD version’s MINIDUMP_STRING::Buffer.
-  MINIDUMP_STRING* tmp;
-  ALLOW_UNUSED_LOCAL(tmp);
+  [[maybe_unused]] MINIDUMP_STRING* tmp;
   const size_t kCSDVersionBytes = csd_version_length * sizeof(tmp->Buffer[0]);
   const size_t kCSDVersionBytesWithNUL =
       kCSDVersionBytes + sizeof(tmp->Buffer[0]);
diff --git a/extern/crashpad/crashpad/minidump/minidump_thread_id_map.cc b/extern/crashpad/crashpad/minidump/minidump_thread_id_map.cc
index 3e9e39298e..1413a49864 100644
--- a/extern/crashpad/crashpad/minidump/minidump_thread_id_map.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_thread_id_map.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/minidump_thread_id_map.h b/extern/crashpad/crashpad/minidump/minidump_thread_id_map.h
index 33b105fba1..a4abbea8f1 100644
--- a/extern/crashpad/crashpad/minidump/minidump_thread_id_map.h
+++ b/extern/crashpad/crashpad/minidump/minidump_thread_id_map.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/minidump_thread_id_map_test.cc b/extern/crashpad/crashpad/minidump/minidump_thread_id_map_test.cc
index e972aebc9f..cec51ace3c 100644
--- a/extern/crashpad/crashpad/minidump/minidump_thread_id_map_test.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_thread_id_map_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,9 +16,9 @@
 
 #include <sys/types.h>
 
+#include <iterator>
 #include <vector>
 
-#include "base/cxx17_backports.h"
 #include "gtest/gtest.h"
 #include "snapshot/test/test_thread_snapshot.h"
 
@@ -41,8 +41,7 @@ class MinidumpThreadIDMapTest : public testing::Test {
 
   // testing::Test:
   void SetUp() override {
-    for (size_t index = 0; index < base::size(test_thread_snapshots_);
-         ++index) {
+    for (size_t index = 0; index < std::size(test_thread_snapshots_); ++index) {
       thread_snapshots_.push_back(&test_thread_snapshots_[index]);
     }
   }
@@ -63,7 +62,7 @@ class MinidumpThreadIDMapTest : public testing::Test {
   }
 
   void SetThreadID(size_t index, uint64_t thread_id) {
-    ASSERT_LT(index, base::size(test_thread_snapshots_));
+    ASSERT_LT(index, std::size(test_thread_snapshots_));
     test_thread_snapshots_[index].SetThreadID(thread_id);
   }
 
diff --git a/extern/crashpad/crashpad/minidump/minidump_thread_name_list_writer.cc b/extern/crashpad/crashpad/minidump/minidump_thread_name_list_writer.cc
new file mode 100644
index 0000000000..aba496a5bc
--- /dev/null
+++ b/extern/crashpad/crashpad/minidump/minidump_thread_name_list_writer.cc
@@ -0,0 +1,192 @@
+// Copyright 2022 The Crashpad Authors
+//
+// 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.
+
+#include "minidump/minidump_thread_name_list_writer.h"
+
+#include <utility>
+
+#include "base/check_op.h"
+#include "base/logging.h"
+#include "minidump/minidump_thread_id_map.h"
+#include "snapshot/thread_snapshot.h"
+#include "util/file/file_writer.h"
+#include "util/numeric/safe_assignment.h"
+
+namespace crashpad {
+
+MinidumpThreadNameWriter::MinidumpThreadNameWriter()
+    : MinidumpWritable(), rva_of_thread_name_(), thread_id_(), name_() {}
+
+MinidumpThreadNameWriter::~MinidumpThreadNameWriter() {}
+
+void MinidumpThreadNameWriter::InitializeFromSnapshot(
+    const ThreadSnapshot* thread_snapshot,
+    const MinidumpThreadIDMap& thread_id_map) {
+  DCHECK_EQ(state(), kStateMutable);
+
+  const auto it = thread_id_map.find(thread_snapshot->ThreadID());
+  DCHECK(it != thread_id_map.end());
+  SetThreadId(it->second);
+  SetThreadName(thread_snapshot->ThreadName());
+}
+
+RVA64 MinidumpThreadNameWriter::RvaOfThreadName() const {
+  DCHECK_EQ(state(), kStateWritable);
+
+  return rva_of_thread_name_;
+}
+
+uint32_t MinidumpThreadNameWriter::ThreadId() const {
+  DCHECK_EQ(state(), kStateWritable);
+
+  return thread_id_;
+}
+
+bool MinidumpThreadNameWriter::Freeze() {
+  DCHECK_EQ(state(), kStateMutable);
+
+  name_->RegisterRVA(&rva_of_thread_name_);
+
+  return MinidumpWritable::Freeze();
+}
+
+void MinidumpThreadNameWriter::SetThreadName(const std::string& name) {
+  DCHECK_EQ(state(), kStateMutable);
+
+  if (!name_) {
+    name_.reset(new internal::MinidumpUTF16StringWriter());
+  }
+  name_->SetUTF8(name);
+}
+
+size_t MinidumpThreadNameWriter::SizeOfObject() {
+  DCHECK_GE(state(), kStateFrozen);
+
+  // This object doesn’t directly write anything itself. Its parent writes the
+  // MINIDUMP_THREAD_NAME objects as part of a MINIDUMP_THREAD_NAME_LIST, and
+  // its children are responsible for writing themselves.
+  return 0;
+}
+
+std::vector<internal::MinidumpWritable*> MinidumpThreadNameWriter::Children() {
+  DCHECK_GE(state(), kStateFrozen);
+  DCHECK(name_);
+
+  std::vector<MinidumpWritable*> children;
+  children.emplace_back(name_.get());
+
+  return children;
+}
+
+bool MinidumpThreadNameWriter::WriteObject(FileWriterInterface* file_writer) {
+  DCHECK_EQ(state(), kStateWritable);
+
+  // This object doesn’t directly write anything itself. Its
+  // MINIDUMP_THREAD_NAME is written by its parent as part of a
+  // MINIDUMP_THREAD_NAME_LIST, and its children are responsible for writing
+  // themselves.
+  return true;
+}
+
+MinidumpThreadNameListWriter::MinidumpThreadNameListWriter()
+    : MinidumpStreamWriter(), thread_names_() {}
+
+MinidumpThreadNameListWriter::~MinidumpThreadNameListWriter() {}
+
+void MinidumpThreadNameListWriter::InitializeFromSnapshot(
+    const std::vector<const ThreadSnapshot*>& thread_snapshots,
+    const MinidumpThreadIDMap& thread_id_map) {
+  DCHECK_EQ(state(), kStateMutable);
+  DCHECK(thread_names_.empty());
+
+  for (const ThreadSnapshot* thread_snapshot : thread_snapshots) {
+    auto thread = std::make_unique<MinidumpThreadNameWriter>();
+    thread->InitializeFromSnapshot(thread_snapshot, thread_id_map);
+    AddThreadName(std::move(thread));
+  }
+}
+
+void MinidumpThreadNameListWriter::AddThreadName(
+    std::unique_ptr<MinidumpThreadNameWriter> thread_name) {
+  DCHECK_EQ(state(), kStateMutable);
+
+  thread_names_.emplace_back(std::move(thread_name));
+}
+
+bool MinidumpThreadNameListWriter::Freeze() {
+  DCHECK_EQ(state(), kStateMutable);
+
+  if (!MinidumpStreamWriter::Freeze()) {
+    return false;
+  }
+
+  size_t thread_name_count = thread_names_.size();
+  if (!AssignIfInRange(&thread_name_list_.NumberOfThreadNames,
+                       thread_name_count)) {
+    LOG(ERROR) << "thread_name_count " << thread_name_count << " out of range";
+    return false;
+  }
+
+  return true;
+}
+
+size_t MinidumpThreadNameListWriter::SizeOfObject() {
+  DCHECK_GE(state(), kStateFrozen);
+
+  return sizeof(thread_name_list_) +
+         thread_names_.size() * sizeof(MINIDUMP_THREAD_NAME);
+}
+
+std::vector<internal::MinidumpWritable*>
+MinidumpThreadNameListWriter::Children() {
+  DCHECK_GE(state(), kStateFrozen);
+
+  std::vector<MinidumpWritable*> children;
+  children.reserve(thread_names_.size());
+  for (const auto& thread_name : thread_names_) {
+    children.emplace_back(thread_name.get());
+  }
+
+  return children;
+}
+
+bool MinidumpThreadNameListWriter::WriteObject(
+    FileWriterInterface* file_writer) {
+  DCHECK_EQ(state(), kStateWritable);
+
+  WritableIoVec iov;
+  iov.iov_base = &thread_name_list_;
+  iov.iov_len = sizeof(thread_name_list_);
+  std::vector<WritableIoVec> iovecs(1, iov);
+  iovecs.reserve(thread_names_.size() + 1);
+
+  std::vector<MINIDUMP_THREAD_NAME> minidump_thread_names;
+  minidump_thread_names.reserve(thread_names_.size());
+  for (const auto& thread_name : thread_names_) {
+    auto& minidump_thread_name = minidump_thread_names.emplace_back();
+    minidump_thread_name.ThreadId = thread_name->ThreadId();
+    minidump_thread_name.RvaOfThreadName = thread_name->RvaOfThreadName();
+    iov.iov_base = &minidump_thread_name;
+    iov.iov_len = sizeof(minidump_thread_name);
+    iovecs.push_back(iov);
+  }
+
+  return file_writer->WriteIoVec(&iovecs);
+}
+
+MinidumpStreamType MinidumpThreadNameListWriter::StreamType() const {
+  return kMinidumpStreamTypeThreadNameList;
+}
+
+}  // namespace crashpad
diff --git a/extern/crashpad/crashpad/minidump/minidump_thread_name_list_writer.h b/extern/crashpad/crashpad/minidump/minidump_thread_name_list_writer.h
new file mode 100644
index 0000000000..40dbf6192b
--- /dev/null
+++ b/extern/crashpad/crashpad/minidump/minidump_thread_name_list_writer.h
@@ -0,0 +1,152 @@
+// Copyright 2022 The Crashpad Authors
+//
+// 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.
+
+#ifndef CRASHPAD_MINIDUMP_MINIDUMP_THREAD_NAME_LIST_WRITER_H_
+#define CRASHPAD_MINIDUMP_MINIDUMP_THREAD_NAME_LIST_WRITER_H_
+
+#include <windows.h>
+#include <dbghelp.h>
+#include <stdint.h>
+#include <sys/types.h>
+
+#include <memory>
+#include <vector>
+
+#include "minidump/minidump_stream_writer.h"
+#include "minidump/minidump_string_writer.h"
+#include "minidump/minidump_thread_id_map.h"
+#include "minidump/minidump_writable.h"
+
+namespace crashpad {
+
+//! \brief The writer for a MINIDUMP_THREAD_NAME object in a minidump file.
+//!
+//! Because MINIDUMP_THREAD_NAME objects only appear as elements of
+//! MINIDUMP_THREAD_NAME_LIST objects, this class does not write any data on its
+//! own. It makes its MINIDUMP_THREAD_NAME data available to its
+//! MinidumpThreadNameListWriter parent, which writes it as part of a
+//! MINIDUMP_THREAD_NAME_LIST.
+class MinidumpThreadNameWriter final : public internal::MinidumpWritable {
+ public:
+  MinidumpThreadNameWriter();
+
+  MinidumpThreadNameWriter(const MinidumpThreadNameWriter&) = delete;
+  MinidumpThreadNameWriter& operator=(const MinidumpThreadNameWriter&) = delete;
+
+  ~MinidumpThreadNameWriter() override;
+
+  //! \brief Initializes the MINIDUMP_THREAD_NAME based on \a thread_snapshot.
+  //!
+  //! \param[in] thread_snapshot The thread snapshot to use as source data.
+  //! \param[in] thread_id_map A MinidumpThreadIDMap to be consulted to
+  //!     determine the 32-bit minidump thread ID to use for \a thread_snapshot.
+  //!
+  //! \note Valid in #kStateMutable.
+  void InitializeFromSnapshot(const ThreadSnapshot* thread_snapshot,
+                              const MinidumpThreadIDMap& thread_id_map);
+
+  //! \brief Sets the ThreadId for MINIDUMP_THREAD_NAME::ThreadId.
+  void SetThreadId(uint32_t thread_id) { thread_id_ = thread_id; }
+
+  //! \brief Gets the ThreadId for MINIDUMP_THREAD_NAME::ThreadId.
+  //!
+  //! \note Valid in #kStateWritable.
+  uint32_t ThreadId() const;
+
+  //! \brief Sets MINIDUMP_THREAD_NAME::RvaOfThreadName.
+  void SetThreadName(const std::string& thread_name);
+
+  //! \brief Returns an RVA64 which has been updated with the relative address
+  //!    of the thread name.
+  //!
+  //! This method is expected to be called by a MinidumpThreadNameListWriter in
+  //! order to obtain the RVA64 of the thread name.
+  //!
+  //! \note Valid in #kStateWritable.
+  RVA64 RvaOfThreadName() const;
+
+ private:
+  // MinidumpWritable:
+  bool Freeze() override;
+  size_t SizeOfObject() override;
+  std::vector<MinidumpWritable*> Children() override;
+  bool WriteObject(FileWriterInterface* file_writer) override;
+
+  // This exists as a separate field so MinidumpWritable::RegisterRVA() can be
+  // used on a guaranteed-aligned pointer (MINIDUMP_THREAD_NAME::RvaOfThreadName
+  // is not 64-bit aligned, causing issues on ARM).
+  RVA64 rva_of_thread_name_;
+
+  // Although this class manages the data for a MINIDUMP_THREAD_NAME, it does
+  // not directly hold a MINIDUMP_THREAD_NAME, as that struct contains a
+  // non-aligned RVA64 field which prevents it use with
+  // MinidumpWritable::RegisterRVA().
+  //
+  // Instead, this class individually holds the fields of the
+  // MINIDUMP_THREAD_NAME which are fetched by MinidumpThreadNameListWriter.
+  uint32_t thread_id_;
+
+  std::unique_ptr<internal::MinidumpUTF16StringWriter> name_;
+};
+
+//! \brief The writer for a MINIDUMP_THREAD_NAME_LIST stream in a minidump file,
+//!     containing a list of MINIDUMP_THREAD_NAME objects.
+class MinidumpThreadNameListWriter final
+    : public internal::MinidumpStreamWriter {
+ public:
+  MinidumpThreadNameListWriter();
+
+  MinidumpThreadNameListWriter(const MinidumpThreadNameListWriter&) = delete;
+  MinidumpThreadNameListWriter& operator=(const MinidumpThreadNameListWriter&) =
+      delete;
+
+  ~MinidumpThreadNameListWriter() override;
+
+  //! \brief Adds an initialized MINIDUMP_THREAD_NAME for each thread in \a
+  //!     thread_snapshots to the MINIDUMP_THREAD_NAME_LIST.
+  //!
+  //! \param[in] thread_snapshots The thread snapshots to use as source data.
+  //! \param[in] thread_id_map A MinidumpThreadIDMap previously built by
+  //!     MinidumpThreadListWriter::InitializeFromSnapshot().
+  //!
+  //! \note Valid in #kStateMutable.
+  void InitializeFromSnapshot(
+      const std::vector<const ThreadSnapshot*>& thread_snapshots,
+      const MinidumpThreadIDMap& thread_id_map);
+
+  //! \brief Adds a MinidumpThreadNameWriter to the MINIDUMP_THREAD_LIST.
+  //!
+  //! This object takes ownership of \a thread_name and becomes its parent in
+  //! the overall tree of internal::MinidumpWritable objects.
+  //!
+  //! \note Valid in #kStateMutable.
+  void AddThreadName(std::unique_ptr<MinidumpThreadNameWriter> thread_name);
+
+ private:
+  // MinidumpWritable:
+  bool Freeze() override;
+  size_t SizeOfObject() override;
+  std::vector<MinidumpWritable*> Children() override;
+  bool WriteObject(FileWriterInterface* file_writer) override;
+
+  // MinidumpStreamWriter:
+  MinidumpStreamType StreamType() const override;
+
+  std::vector<std::unique_ptr<MinidumpThreadNameWriter>> thread_names_;
+  MINIDUMP_THREAD_NAME_LIST thread_name_list_;
+};
+
+}  // namespace crashpad
+
+#endif  // CRASHPAD_MINIDUMP_MINIDUMP_THREAD_NAME_LIST_WRITER_H_
diff --git a/extern/crashpad/crashpad/minidump/minidump_thread_name_list_writer_test.cc b/extern/crashpad/crashpad/minidump/minidump_thread_name_list_writer_test.cc
new file mode 100644
index 0000000000..0b48f6abeb
--- /dev/null
+++ b/extern/crashpad/crashpad/minidump/minidump_thread_name_list_writer_test.cc
@@ -0,0 +1,319 @@
+// Copyright 2022 The Crashpad Authors
+//
+// 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.
+
+#include "minidump/minidump_thread_name_list_writer.h"
+
+#include <iterator>
+#include <string>
+#include <utility>
+
+#include "base/compiler_specific.h"
+#include "base/format_macros.h"
+#include "base/strings/stringprintf.h"
+#include "base/strings/utf_string_conversions.h"
+#include "gtest/gtest.h"
+#include "minidump/minidump_file_writer.h"
+#include "minidump/minidump_system_info_writer.h"
+#include "minidump/test/minidump_file_writer_test_util.h"
+#include "minidump/test/minidump_string_writer_test_util.h"
+#include "minidump/test/minidump_writable_test_util.h"
+#include "test/gtest_death.h"
+#include "util/file/string_file.h"
+
+namespace crashpad {
+namespace test {
+namespace {
+
+// This returns the MINIDUMP_THREAD_NAME_LIST stream in |thread_name_list|.
+void GetThreadNameListStream(
+    const std::string& file_contents,
+    const MINIDUMP_THREAD_NAME_LIST** thread_name_list) {
+  constexpr size_t kDirectoryOffset = sizeof(MINIDUMP_HEADER);
+  const uint32_t kExpectedStreams = 1;
+  const size_t kThreadNameListStreamOffset =
+      kDirectoryOffset + kExpectedStreams * sizeof(MINIDUMP_DIRECTORY);
+  const size_t kThreadNameListOffset =
+      kThreadNameListStreamOffset + sizeof(MINIDUMP_THREAD_NAME_LIST);
+
+  ASSERT_GE(file_contents.size(), kThreadNameListOffset);
+
+  const MINIDUMP_DIRECTORY* directory;
+  const MINIDUMP_HEADER* header =
+      MinidumpHeaderAtStart(file_contents, &directory);
+  ASSERT_NO_FATAL_FAILURE(VerifyMinidumpHeader(header, kExpectedStreams, 0));
+  ASSERT_TRUE(directory);
+
+  ASSERT_EQ(directory[0].StreamType, kMinidumpStreamTypeThreadNameList);
+  EXPECT_EQ(directory[0].Location.Rva, kThreadNameListStreamOffset);
+
+  *thread_name_list =
+      MinidumpWritableAtLocationDescriptor<MINIDUMP_THREAD_NAME_LIST>(
+          file_contents, directory[0].Location);
+  ASSERT_TRUE(thread_name_list);
+}
+
+TEST(MinidumpThreadNameListWriter, EmptyThreadNameList) {
+  MinidumpFileWriter minidump_file_writer;
+  auto thread_name_list_writer =
+      std::make_unique<MinidumpThreadNameListWriter>();
+
+  ASSERT_TRUE(
+      minidump_file_writer.AddStream(std::move(thread_name_list_writer)));
+
+  StringFile string_file;
+  ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
+
+  ASSERT_EQ(string_file.string().size(),
+            sizeof(MINIDUMP_HEADER) + sizeof(MINIDUMP_DIRECTORY) +
+                sizeof(MINIDUMP_THREAD_NAME_LIST));
+
+  const MINIDUMP_THREAD_NAME_LIST* thread_name_list = nullptr;
+  ASSERT_NO_FATAL_FAILURE(
+      GetThreadNameListStream(string_file.string(), &thread_name_list));
+
+  EXPECT_EQ(thread_name_list->NumberOfThreadNames, 0u);
+}
+
+// The MINIDUMP_THREAD_NAMEs |expected| and |observed| are compared against
+// each other using Google Test assertions.
+void ExpectThreadName(const MINIDUMP_THREAD_NAME* expected,
+                      const MINIDUMP_THREAD_NAME* observed,
+                      const std::string& file_contents,
+                      const std::string& expected_thread_name) {
+  // Copy RvaOfThreadName into a local variable because
+  // |MINIDUMP_THREAD_NAME::RvaOfThreadName| requires 8-byte alignment but the
+  // struct itself is 4-byte algined.
+  const auto rva_of_thread_name = [&observed] {
+    RVA64 data = 0;
+    memcpy(&data, &observed->RvaOfThreadName, sizeof(RVA64));
+    return data;
+  }();
+
+  EXPECT_EQ(observed->ThreadId, expected->ThreadId);
+  EXPECT_NE(rva_of_thread_name, 0u);
+  const std::string observed_thread_name = base::UTF16ToUTF8(
+      MinidumpStringAtRVAAsString(file_contents, rva_of_thread_name));
+  EXPECT_EQ(observed_thread_name, expected_thread_name);
+}
+
+TEST(MinidumpThreadNameListWriter, OneThread) {
+  MinidumpFileWriter minidump_file_writer;
+  auto thread_list_writer = std::make_unique<MinidumpThreadNameListWriter>();
+
+  constexpr uint32_t kThreadID = 0x11111111;
+  const std::string kThreadName = "ariadne";
+
+  auto thread_name_list_writer =
+      std::make_unique<MinidumpThreadNameListWriter>();
+  auto thread_name_writer = std::make_unique<MinidumpThreadNameWriter>();
+  thread_name_writer->SetThreadId(kThreadID);
+  thread_name_writer->SetThreadName(kThreadName);
+  thread_name_list_writer->AddThreadName(std::move(thread_name_writer));
+
+  ASSERT_TRUE(
+      minidump_file_writer.AddStream(std::move(thread_name_list_writer)));
+
+  StringFile string_file;
+  ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
+
+  ASSERT_GT(string_file.string().size(),
+            sizeof(MINIDUMP_HEADER) + sizeof(MINIDUMP_DIRECTORY) +
+                sizeof(MINIDUMP_THREAD_NAME_LIST) +
+                1 * sizeof(MINIDUMP_THREAD_NAME));
+
+  const MINIDUMP_THREAD_NAME_LIST* thread_name_list = nullptr;
+  ASSERT_NO_FATAL_FAILURE(
+      GetThreadNameListStream(string_file.string(), &thread_name_list));
+
+  EXPECT_EQ(thread_name_list->NumberOfThreadNames, 1u);
+
+  MINIDUMP_THREAD_NAME expected = {};
+  expected.ThreadId = kThreadID;
+
+  ASSERT_NO_FATAL_FAILURE(ExpectThreadName(&expected,
+                                           &thread_name_list->ThreadNames[0],
+                                           string_file.string(),
+                                           kThreadName));
+}
+
+TEST(MinidumpThreadNameListWriter, OneThreadWithLeadingPadding) {
+  MinidumpFileWriter minidump_file_writer;
+
+  // Add a stream before the MINIDUMP_THREAD_NAME_LIST to ensure the thread name
+  // MINIDUMP_STRING requires leading padding to align to a 4-byte boundary.
+  auto system_info_writer = std::make_unique<MinidumpSystemInfoWriter>();
+  system_info_writer->SetCSDVersion("");
+  ASSERT_TRUE(minidump_file_writer.AddStream(std::move(system_info_writer)));
+
+  auto thread_list_writer = std::make_unique<MinidumpThreadNameListWriter>();
+
+  constexpr uint32_t kThreadID = 0x11111111;
+  const std::string kThreadName = "ariadne";
+
+  auto thread_name_list_writer =
+      std::make_unique<MinidumpThreadNameListWriter>();
+  auto thread_name_writer = std::make_unique<MinidumpThreadNameWriter>();
+  thread_name_writer->SetThreadId(kThreadID);
+  thread_name_writer->SetThreadName(kThreadName);
+  thread_name_list_writer->AddThreadName(std::move(thread_name_writer));
+
+  ASSERT_TRUE(
+      minidump_file_writer.AddStream(std::move(thread_name_list_writer)));
+
+  StringFile string_file;
+  ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
+
+  ASSERT_GT(string_file.string().size(),
+            sizeof(MINIDUMP_HEADER) + sizeof(MINIDUMP_DIRECTORY) +
+                sizeof(MINIDUMP_THREAD_NAME_LIST) +
+                1 * sizeof(MINIDUMP_THREAD_NAME));
+
+  const uint32_t kExpectedStreams = 2;
+  const MINIDUMP_DIRECTORY* directory;
+  const MINIDUMP_HEADER* header =
+      MinidumpHeaderAtStart(string_file.string(), &directory);
+  ASSERT_NO_FATAL_FAILURE(VerifyMinidumpHeader(header, kExpectedStreams, 0));
+  ASSERT_TRUE(directory);
+
+  ASSERT_EQ(directory[0].StreamType, kMinidumpStreamTypeSystemInfo);
+  ASSERT_EQ(directory[1].StreamType, kMinidumpStreamTypeThreadNameList);
+
+  const MINIDUMP_THREAD_NAME_LIST* thread_name_list =
+      MinidumpWritableAtLocationDescriptor<MINIDUMP_THREAD_NAME_LIST>(
+          string_file.string(), directory[1].Location);
+  ASSERT_TRUE(thread_name_list);
+
+  EXPECT_EQ(thread_name_list->NumberOfThreadNames, 1u);
+
+  MINIDUMP_THREAD_NAME expected = {};
+  expected.ThreadId = kThreadID;
+
+  ASSERT_NO_FATAL_FAILURE(ExpectThreadName(&expected,
+                                           &thread_name_list->ThreadNames[0],
+                                           string_file.string(),
+                                           kThreadName));
+}
+
+TEST(MinidumpThreadNameListWriter, TwoThreads_DifferentNames) {
+  MinidumpFileWriter minidump_file_writer;
+  auto thread_list_writer = std::make_unique<MinidumpThreadNameListWriter>();
+
+  constexpr uint32_t kFirstThreadID = 0x11111111;
+  const std::string kFirstThreadName = "ariadne";
+
+  constexpr uint32_t kSecondThreadID = 0x22222222;
+  const std::string kSecondThreadName = "theseus";
+
+  auto thread_name_list_writer =
+      std::make_unique<MinidumpThreadNameListWriter>();
+  auto first_thread_name_writer = std::make_unique<MinidumpThreadNameWriter>();
+  first_thread_name_writer->SetThreadId(kFirstThreadID);
+  first_thread_name_writer->SetThreadName(kFirstThreadName);
+  thread_name_list_writer->AddThreadName(std::move(first_thread_name_writer));
+
+  auto second_thread_name_writer = std::make_unique<MinidumpThreadNameWriter>();
+  second_thread_name_writer->SetThreadId(kSecondThreadID);
+  second_thread_name_writer->SetThreadName(kSecondThreadName);
+  thread_name_list_writer->AddThreadName(std::move(second_thread_name_writer));
+
+  ASSERT_TRUE(
+      minidump_file_writer.AddStream(std::move(thread_name_list_writer)));
+
+  StringFile string_file;
+  ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
+
+  ASSERT_GT(string_file.string().size(),
+            sizeof(MINIDUMP_HEADER) + sizeof(MINIDUMP_DIRECTORY) +
+                sizeof(MINIDUMP_THREAD_NAME_LIST) +
+                2 * sizeof(MINIDUMP_THREAD_NAME));
+
+  const MINIDUMP_THREAD_NAME_LIST* thread_name_list = nullptr;
+  ASSERT_NO_FATAL_FAILURE(
+      GetThreadNameListStream(string_file.string(), &thread_name_list));
+
+  EXPECT_EQ(thread_name_list->NumberOfThreadNames, 2u);
+
+  MINIDUMP_THREAD_NAME expected = {};
+  expected.ThreadId = kFirstThreadID;
+
+  ASSERT_NO_FATAL_FAILURE(ExpectThreadName(&expected,
+                                           &thread_name_list->ThreadNames[0],
+                                           string_file.string(),
+                                           kFirstThreadName));
+
+  expected.ThreadId = kSecondThreadID;
+
+  ASSERT_NO_FATAL_FAILURE(ExpectThreadName(&expected,
+                                           &thread_name_list->ThreadNames[1],
+                                           string_file.string(),
+                                           kSecondThreadName));
+}
+
+TEST(MinidumpThreadNameListWriter, TwoThreads_SameNames) {
+  MinidumpFileWriter minidump_file_writer;
+  auto thread_list_writer = std::make_unique<MinidumpThreadNameListWriter>();
+
+  constexpr uint32_t kFirstThreadID = 0x11111111;
+  const std::string kThreadName = "ariadne";
+
+  constexpr uint32_t kSecondThreadID = 0x22222222;
+
+  auto thread_name_list_writer =
+      std::make_unique<MinidumpThreadNameListWriter>();
+  auto first_thread_name_writer = std::make_unique<MinidumpThreadNameWriter>();
+  first_thread_name_writer->SetThreadId(kFirstThreadID);
+  first_thread_name_writer->SetThreadName(kThreadName);
+  thread_name_list_writer->AddThreadName(std::move(first_thread_name_writer));
+
+  auto second_thread_name_writer = std::make_unique<MinidumpThreadNameWriter>();
+  second_thread_name_writer->SetThreadId(kSecondThreadID);
+  second_thread_name_writer->SetThreadName(kThreadName);
+  thread_name_list_writer->AddThreadName(std::move(second_thread_name_writer));
+
+  ASSERT_TRUE(
+      minidump_file_writer.AddStream(std::move(thread_name_list_writer)));
+
+  StringFile string_file;
+  ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
+
+  ASSERT_GT(string_file.string().size(),
+            sizeof(MINIDUMP_HEADER) + sizeof(MINIDUMP_DIRECTORY) +
+                sizeof(MINIDUMP_THREAD_NAME_LIST) +
+                2 * sizeof(MINIDUMP_THREAD_NAME));
+
+  const MINIDUMP_THREAD_NAME_LIST* thread_name_list = nullptr;
+  ASSERT_NO_FATAL_FAILURE(
+      GetThreadNameListStream(string_file.string(), &thread_name_list));
+
+  EXPECT_EQ(thread_name_list->NumberOfThreadNames, 2u);
+
+  MINIDUMP_THREAD_NAME expected = {};
+  expected.ThreadId = kFirstThreadID;
+
+  ASSERT_NO_FATAL_FAILURE(ExpectThreadName(&expected,
+                                           &thread_name_list->ThreadNames[0],
+                                           string_file.string(),
+                                           kThreadName));
+
+  expected.ThreadId = kSecondThreadID;
+
+  ASSERT_NO_FATAL_FAILURE(ExpectThreadName(&expected,
+                                           &thread_name_list->ThreadNames[1],
+                                           string_file.string(),
+                                           kThreadName));
+}
+
+}  // namespace
+}  // namespace test
+}  // namespace crashpad
diff --git a/extern/crashpad/crashpad/minidump/minidump_thread_writer.cc b/extern/crashpad/crashpad/minidump/minidump_thread_writer.cc
index 67658e18aa..b7aa889a6c 100644
--- a/extern/crashpad/crashpad/minidump/minidump_thread_writer.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_thread_writer.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 #include <utility>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "minidump/minidump_context_writer.h"
 #include "minidump/minidump_memory_writer.h"
diff --git a/extern/crashpad/crashpad/minidump/minidump_thread_writer.h b/extern/crashpad/crashpad/minidump/minidump_thread_writer.h
index 9ea428bfc3..d9ed32c892 100644
--- a/extern/crashpad/crashpad/minidump/minidump_thread_writer.h
+++ b/extern/crashpad/crashpad/minidump/minidump_thread_writer.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/minidump_thread_writer_test.cc b/extern/crashpad/crashpad/minidump/minidump_thread_writer_test.cc
index 924c5c11ea..7876c540c0 100644
--- a/extern/crashpad/crashpad/minidump/minidump_thread_writer_test.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_thread_writer_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
 
 #include "minidump/minidump_thread_writer.h"
 
+#include <iterator>
 #include <string>
 #include <utility>
 
 #include "base/compiler_specific.h"
-#include "base/cxx17_backports.h"
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
@@ -531,10 +531,10 @@ template <typename Traits>
 void RunInitializeFromSnapshotTest(bool thread_id_collision) {
   using MinidumpContextType = typename Traits::MinidumpContextType;
   MINIDUMP_THREAD expect_threads[3] = {};
-  uint64_t thread_ids[base::size(expect_threads)] = {};
-  uint8_t memory_values[base::size(expect_threads)] = {};
-  uint32_t context_seeds[base::size(expect_threads)] = {};
-  MINIDUMP_MEMORY_DESCRIPTOR tebs[base::size(expect_threads)] = {};
+  uint64_t thread_ids[std::size(expect_threads)] = {};
+  uint8_t memory_values[std::size(expect_threads)] = {};
+  uint32_t context_seeds[std::size(expect_threads)] = {};
+  MINIDUMP_MEMORY_DESCRIPTOR tebs[std::size(expect_threads)] = {};
 
   constexpr size_t kTebSize = 1024;
 
@@ -590,7 +590,7 @@ void RunInitializeFromSnapshotTest(bool thread_id_collision) {
 
   std::vector<std::unique_ptr<TestThreadSnapshot>> thread_snapshots_owner;
   std::vector<const ThreadSnapshot*> thread_snapshots;
-  for (size_t index = 0; index < base::size(expect_threads); ++index) {
+  for (size_t index = 0; index < std::size(expect_threads); ++index) {
     thread_snapshots_owner.push_back(std::make_unique<TestThreadSnapshot>());
     TestThreadSnapshot* thread_snapshot = thread_snapshots_owner.back().get();
 
diff --git a/extern/crashpad/crashpad/minidump/minidump_unloaded_module_writer.cc b/extern/crashpad/crashpad/minidump/minidump_unloaded_module_writer.cc
index c8a5f0fd1e..c7bf3452bf 100644
--- a/extern/crashpad/crashpad/minidump/minidump_unloaded_module_writer.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_unloaded_module_writer.cc
@@ -1,4 +1,4 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
+// Copyright 2016 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 #include <limits>
 #include <utility>
 
+#include "base/check_op.h"
 #include "minidump/minidump_writer_util.h"
 #include "util/file/file_writer.h"
 #include "util/numeric/in_range_cast.h"
diff --git a/extern/crashpad/crashpad/minidump/minidump_unloaded_module_writer.h b/extern/crashpad/crashpad/minidump/minidump_unloaded_module_writer.h
index 6b3ac90591..b47325f268 100644
--- a/extern/crashpad/crashpad/minidump/minidump_unloaded_module_writer.h
+++ b/extern/crashpad/crashpad/minidump/minidump_unloaded_module_writer.h
@@ -1,4 +1,4 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
+// Copyright 2016 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/minidump_unloaded_module_writer_test.cc b/extern/crashpad/crashpad/minidump/minidump_unloaded_module_writer_test.cc
index d7f8b66eb3..db266a0220 100644
--- a/extern/crashpad/crashpad/minidump/minidump_unloaded_module_writer_test.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_unloaded_module_writer_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
+// Copyright 2016 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/minidump_user_extension_stream_data_source.cc b/extern/crashpad/crashpad/minidump/minidump_user_extension_stream_data_source.cc
index 884bf85911..695c0b161a 100644
--- a/extern/crashpad/crashpad/minidump/minidump_user_extension_stream_data_source.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_user_extension_stream_data_source.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/minidump_user_extension_stream_data_source.h b/extern/crashpad/crashpad/minidump/minidump_user_extension_stream_data_source.h
index 4a45e45f1a..fa5f86af09 100644
--- a/extern/crashpad/crashpad/minidump/minidump_user_extension_stream_data_source.h
+++ b/extern/crashpad/crashpad/minidump/minidump_user_extension_stream_data_source.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/minidump_user_stream_writer.cc b/extern/crashpad/crashpad/minidump/minidump_user_stream_writer.cc
index 4fbe252575..e1b2258ebd 100644
--- a/extern/crashpad/crashpad/minidump/minidump_user_stream_writer.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_user_stream_writer.cc
@@ -1,4 +1,4 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
+// Copyright 2016 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/minidump_user_stream_writer.h b/extern/crashpad/crashpad/minidump/minidump_user_stream_writer.h
index 8f123e2e09..40b8e9d7fc 100644
--- a/extern/crashpad/crashpad/minidump/minidump_user_stream_writer.h
+++ b/extern/crashpad/crashpad/minidump/minidump_user_stream_writer.h
@@ -1,4 +1,4 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
+// Copyright 2016 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/minidump_user_stream_writer_test.cc b/extern/crashpad/crashpad/minidump/minidump_user_stream_writer_test.cc
index c3bbd6e788..c8f14767ed 100644
--- a/extern/crashpad/crashpad/minidump/minidump_user_stream_writer_test.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_user_stream_writer_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
+// Copyright 2016 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/minidump_writable.cc b/extern/crashpad/crashpad/minidump/minidump_writable.cc
index 8f69c9c16b..c0badd72ec 100644
--- a/extern/crashpad/crashpad/minidump/minidump_writable.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_writable.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,7 +16,9 @@
 
 #include <stdint.h>
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "util/file/file_writer.h"
 #include "util/numeric/safe_assignment.h"
@@ -74,6 +76,12 @@ void MinidumpWritable::RegisterRVA(RVA* rva) {
   registered_rvas_.push_back(rva);
 }
 
+void MinidumpWritable::RegisterRVA(RVA64* rva64) {
+  DCHECK_LE(state_, kStateFrozen);
+
+  registered_rva64s_.push_back(rva64);
+}
+
 void MinidumpWritable::RegisterLocationDescriptor(
     MINIDUMP_LOCATION_DESCRIPTOR* location_descriptor) {
   DCHECK_LE(state_, kStateFrozen);
@@ -81,12 +89,20 @@ void MinidumpWritable::RegisterLocationDescriptor(
   registered_location_descriptors_.push_back(location_descriptor);
 }
 
+void MinidumpWritable::RegisterLocationDescriptor(
+    MINIDUMP_LOCATION_DESCRIPTOR64* location_descriptor64) {
+  DCHECK_LE(state_, kStateFrozen);
+
+  registered_location_descriptor64s_.push_back(location_descriptor64);
+}
+
 MinidumpWritable::MinidumpWritable()
     : registered_rvas_(),
+      registered_rva64s_(),
       registered_location_descriptors_(),
+      registered_location_descriptor64s_(),
       leading_pad_bytes_(0),
-      state_(kStateMutable) {
-}
+      state_(kStateMutable) {}
 
 bool MinidumpWritable::Freeze() {
   DCHECK_EQ(state_, kStateMutable);
@@ -159,10 +175,10 @@ size_t MinidumpWritable::WillWriteAtOffset(
       return kInvalidSize;
     }
 
-    // Populate the RVA fields in other objects that have registered to point to
-    // this one. Typically, a parent object will have registered to point to its
-    // children, but this can also occur where no parent-child relationship
-    // exists.
+    // Populate the 32-bit RVA fields in other objects that have registered to
+    // point to this one. Typically, a parent object will have registered to
+    // point to its children, but this can also occur where no parent-child
+    // relationship exists.
     if (!registered_rvas_.empty() ||
         !registered_location_descriptors_.empty()) {
       RVA local_rva;
@@ -190,12 +206,45 @@ size_t MinidumpWritable::WillWriteAtOffset(
       }
     }
 
-    // This object is now considered writable. However, if it contains RVA or
-    // MINIDUMP_LOCATION_DESCRIPTOR fields, they may not be fully updated yet,
-    // because it’s the repsonsibility of these fields’ pointees to update them.
-    // Once WillWriteAtOffset has completed running for both phases on an entire
-    // tree, and the entire tree has moved into kStateFrozen, all RVA and
-    // MINIDUMP_LOCATION_DESCRIPTOR fields within that tree will be populated.
+    // Populate the 64-bit RVA fields in other objects that have registered to
+    // point to this one. Typically, a parent object will have registered to
+    // point to its children, but this can also occur where no parent-child
+    // relationship exists.
+    if (!registered_rva64s_.empty() ||
+        !registered_location_descriptor64s_.empty()) {
+      RVA64 local_rva64;
+      if (!AssignIfInRange(&local_rva64, local_offset)) {
+        LOG(ERROR) << "offset " << local_offset << " out of range";
+        return kInvalidSize;
+      }
+
+      for (RVA64* rva64 : registered_rva64s_) {
+        *rva64 = local_rva64;
+      }
+
+      if (!registered_location_descriptor64s_.empty()) {
+        decltype(registered_location_descriptor64s_[0]->DataSize) local_size;
+        if (!AssignIfInRange(&local_size, size)) {
+          LOG(ERROR) << "size " << size << " out of range";
+          return kInvalidSize;
+        }
+
+        for (MINIDUMP_LOCATION_DESCRIPTOR64* location_descriptor :
+             registered_location_descriptor64s_) {
+          location_descriptor->DataSize = local_size;
+          location_descriptor->Rva = local_rva64;
+        }
+      }
+    }
+
+    // This object is now considered writable. However, if it contains RVA/RVA64
+    // or MINIDUMP_LOCATION_DESCRIPTOR/MINIDUMP_LOCATION_DESCRIPTOR64 fields,
+    // they may not be fully updated yet, because it’s the repsonsibility of
+    // these fields’ pointees to update them. Once WillWriteAtOffset has
+    // completed running for both phases on an entire tree, and the entire tree
+    // has moved into kStateFrozen, all RVA/RVA64 and
+    // MINIDUMP_LOCATION_DESCRIPTOR/MINIDUMP_LOCATION_DESCRIPTOR64 fields within
+    // that tree will be populated.
     state_ = kStateWritable;
   } else {
     if (phase == kPhaseEarly) {
@@ -245,7 +294,7 @@ bool MinidumpWritable::WritePaddingAndObject(FileWriterInterface* file_writer) {
   // The number of elements in kZeroes must be at least one less than the
   // maximum Alignment() ever encountered.
   static constexpr uint8_t kZeroes[kMaximumAlignment - 1] = {};
-  DCHECK_LE(leading_pad_bytes_, base::size(kZeroes));
+  DCHECK_LE(leading_pad_bytes_, std::size(kZeroes));
 
   if (leading_pad_bytes_) {
     if (!file_writer->Write(&kZeroes, leading_pad_bytes_)) {
diff --git a/extern/crashpad/crashpad/minidump/minidump_writable.h b/extern/crashpad/crashpad/minidump/minidump_writable.h
index bc36cb5c05..ee5a19f32d 100644
--- a/extern/crashpad/crashpad/minidump/minidump_writable.h
+++ b/extern/crashpad/crashpad/minidump/minidump_writable.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -70,6 +70,7 @@ class MinidumpWritable {
   // This is public instead of protected because objects of derived classes need
   // to be able to register their own pointers with distinct objects.
   void RegisterRVA(RVA* rva);
+  void RegisterRVA(RVA64* rva);
 
   //! \brief Registers a location descriptor as one that should point to the
   //!     object on which this method is called.
@@ -88,6 +89,8 @@ class MinidumpWritable {
   // to be able to register their own pointers with distinct objects.
   void RegisterLocationDescriptor(
       MINIDUMP_LOCATION_DESCRIPTOR* location_descriptor);
+  void RegisterLocationDescriptor(
+      MINIDUMP_LOCATION_DESCRIPTOR64* location_descriptor64);
 
  protected:
   //! \brief Identifies the state of an object.
@@ -267,9 +270,15 @@ class MinidumpWritable {
  private:
   std::vector<RVA*> registered_rvas_;  // weak
 
+  std::vector<RVA64*> registered_rva64s_;  // weak
+
   // weak
   std::vector<MINIDUMP_LOCATION_DESCRIPTOR*> registered_location_descriptors_;
 
+  // weak
+  std::vector<MINIDUMP_LOCATION_DESCRIPTOR64*>
+      registered_location_descriptor64s_;
+
   size_t leading_pad_bytes_;
   State state_;
 };
diff --git a/extern/crashpad/crashpad/minidump/minidump_writable_test.cc b/extern/crashpad/crashpad/minidump/minidump_writable_test.cc
index ef34e54225..ee38754108 100644
--- a/extern/crashpad/crashpad/minidump/minidump_writable_test.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_writable_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -485,14 +485,15 @@ TEST(MinidumpWritable, MinidumpWritable) {
   }
 }
 
-class TestRVAMinidumpWritable final : public BaseTestMinidumpWritable {
+template <typename RVAType>
+class TTestRVAMinidumpWritable final : public BaseTestMinidumpWritable {
  public:
-  TestRVAMinidumpWritable() : BaseTestMinidumpWritable(), rva_() {}
+  TTestRVAMinidumpWritable() : BaseTestMinidumpWritable(), rva_() {}
 
-  TestRVAMinidumpWritable(const TestRVAMinidumpWritable&) = delete;
-  TestRVAMinidumpWritable& operator=(const TestRVAMinidumpWritable&) = delete;
+  TTestRVAMinidumpWritable(const TTestRVAMinidumpWritable&) = delete;
+  TTestRVAMinidumpWritable& operator=(const TTestRVAMinidumpWritable&) = delete;
 
-  ~TestRVAMinidumpWritable() {}
+  ~TTestRVAMinidumpWritable() {}
 
   void SetRVA(MinidumpWritable* other) { other->RegisterRVA(&rva_); }
 
@@ -509,15 +510,46 @@ class TestRVAMinidumpWritable final : public BaseTestMinidumpWritable {
   }
 
  private:
-  RVA rva_;
+  RVAType rva_;
 };
 
-RVA RVAAtIndex(const std::string& string, size_t index) {
-  return *reinterpret_cast<const RVA*>(&string[index * sizeof(RVA)]);
+template <typename RVAType>
+RVAType TRVAAtIndex(const std::string& string, size_t index) {
+  return *reinterpret_cast<const RVAType*>(&string[index * sizeof(RVAType)]);
 }
 
-TEST(MinidumpWritable, RVA) {
+template <typename T>
+struct TestNames {};
+
+template <>
+struct TestNames<RVA> {
+  static constexpr char kName[] = "RVA";
+};
+
+template <>
+struct TestNames<RVA64> {
+  static constexpr char kName[] = "RVA64";
+};
+
+class TestTypeNames {
+ public:
+  template <typename T>
+  static std::string GetName(int) {
+    return std::string(TestNames<T>::kName);
+  }
+};
+
+template <typename RVAType>
+class MinidumpWritable : public ::testing::Test {};
+
+using RVATypes = ::testing::Types<RVA, RVA64>;
+TYPED_TEST_SUITE(MinidumpWritable, RVATypes, TestTypeNames);
+
+TYPED_TEST(MinidumpWritable, RVA) {
   StringFile string_file;
+  using TestRVAMinidumpWritable = TTestRVAMinidumpWritable<TypeParam>;
+  const auto RVAAtIndex = TRVAAtIndex<TypeParam>;
+  constexpr size_t kRVASize = sizeof(TypeParam);
 
   {
     SCOPED_TRACE("unset");
@@ -525,8 +557,8 @@ TEST(MinidumpWritable, RVA) {
     TestRVAMinidumpWritable rva_writable;
     EXPECT_TRUE(rva_writable.WriteEverything(&string_file));
 
-    ASSERT_EQ(string_file.string().size(), sizeof(RVA));
-    EXPECT_EQ(RVAAtIndex(string_file.string(), 0), 0 * sizeof(RVA));
+    ASSERT_EQ(string_file.string().size(), kRVASize);
+    EXPECT_EQ(RVAAtIndex(string_file.string(), 0), 0 * kRVASize);
     rva_writable.Verify();
   }
 
@@ -537,8 +569,8 @@ TEST(MinidumpWritable, RVA) {
     rva_writable.SetRVA(&rva_writable);
     EXPECT_TRUE(rva_writable.WriteEverything(&string_file));
 
-    ASSERT_EQ(string_file.string().size(), sizeof(RVA));
-    EXPECT_EQ(RVAAtIndex(string_file.string(), 0), 0 * sizeof(RVA));
+    ASSERT_EQ(string_file.string().size(), kRVASize);
+    EXPECT_EQ(RVAAtIndex(string_file.string(), 0), 0 * kRVASize);
     rva_writable.Verify();
   }
 
@@ -552,9 +584,9 @@ TEST(MinidumpWritable, RVA) {
     parent.AddChild(&child);
     EXPECT_TRUE(parent.WriteEverything(&string_file));
 
-    ASSERT_EQ(string_file.string().size(), 2 * sizeof(RVA));
-    EXPECT_EQ(RVAAtIndex(string_file.string(), 0), 0 * sizeof(RVA));
-    EXPECT_EQ(RVAAtIndex(string_file.string(), 1), 1 * sizeof(RVA));
+    ASSERT_EQ(string_file.string().size(), 2 * kRVASize);
+    EXPECT_EQ(RVAAtIndex(string_file.string(), 0), 0 * kRVASize);
+    EXPECT_EQ(RVAAtIndex(string_file.string(), 1), 1 * kRVASize);
     parent.Verify();
   }
 
@@ -567,9 +599,9 @@ TEST(MinidumpWritable, RVA) {
     parent.AddChild(&child);
     EXPECT_TRUE(parent.WriteEverything(&string_file));
 
-    ASSERT_EQ(string_file.string().size(), 2 * sizeof(RVA));
-    EXPECT_EQ(RVAAtIndex(string_file.string(), 0), 1 * sizeof(RVA));
-    EXPECT_EQ(RVAAtIndex(string_file.string(), 1), 0 * sizeof(RVA));
+    ASSERT_EQ(string_file.string().size(), 2 * kRVASize);
+    EXPECT_EQ(RVAAtIndex(string_file.string(), 0), 1 * kRVASize);
+    EXPECT_EQ(RVAAtIndex(string_file.string(), 1), 0 * kRVASize);
     parent.Verify();
   }
 
@@ -583,9 +615,9 @@ TEST(MinidumpWritable, RVA) {
     parent.AddChild(&child);
     EXPECT_TRUE(parent.WriteEverything(&string_file));
 
-    ASSERT_EQ(string_file.string().size(), 2 * sizeof(RVA));
-    EXPECT_EQ(RVAAtIndex(string_file.string(), 0), 1 * sizeof(RVA));
-    EXPECT_EQ(RVAAtIndex(string_file.string(), 1), 0 * sizeof(RVA));
+    ASSERT_EQ(string_file.string().size(), 2 * kRVASize);
+    EXPECT_EQ(RVAAtIndex(string_file.string(), 0), 1 * kRVASize);
+    EXPECT_EQ(RVAAtIndex(string_file.string(), 1), 0 * kRVASize);
     parent.Verify();
   }
 
@@ -607,28 +639,29 @@ TEST(MinidumpWritable, RVA) {
     child.AddChild(&grandchild_2);
     EXPECT_TRUE(parent.WriteEverything(&string_file));
 
-    ASSERT_EQ(string_file.string().size(), 5 * sizeof(RVA));
-    EXPECT_EQ(RVAAtIndex(string_file.string(), 0), 1 * sizeof(RVA));
-    EXPECT_EQ(RVAAtIndex(string_file.string(), 1), 0 * sizeof(RVA));
-    EXPECT_EQ(RVAAtIndex(string_file.string(), 2), 1 * sizeof(RVA));
-    EXPECT_EQ(RVAAtIndex(string_file.string(), 3), 1 * sizeof(RVA));
-    EXPECT_EQ(RVAAtIndex(string_file.string(), 4), 1 * sizeof(RVA));
+    ASSERT_EQ(string_file.string().size(), 5 * kRVASize);
+    EXPECT_EQ(RVAAtIndex(string_file.string(), 0), 1 * kRVASize);
+    EXPECT_EQ(RVAAtIndex(string_file.string(), 1), 0 * kRVASize);
+    EXPECT_EQ(RVAAtIndex(string_file.string(), 2), 1 * kRVASize);
+    EXPECT_EQ(RVAAtIndex(string_file.string(), 3), 1 * kRVASize);
+    EXPECT_EQ(RVAAtIndex(string_file.string(), 4), 1 * kRVASize);
     parent.Verify();
   }
 }
 
-class TestLocationDescriptorMinidumpWritable final
+template <typename MinidumpLocationDescriptorType>
+class TTestLocationDescriptorMinidumpWritable final
     : public BaseTestMinidumpWritable {
  public:
-  TestLocationDescriptorMinidumpWritable()
+  TTestLocationDescriptorMinidumpWritable()
       : BaseTestMinidumpWritable(), location_descriptor_(), string_() {}
 
-  TestLocationDescriptorMinidumpWritable(
-      const TestLocationDescriptorMinidumpWritable&) = delete;
-  TestLocationDescriptorMinidumpWritable& operator=(
-      const TestLocationDescriptorMinidumpWritable&) = delete;
+  TTestLocationDescriptorMinidumpWritable(
+      const TTestLocationDescriptorMinidumpWritable&) = delete;
+  TTestLocationDescriptorMinidumpWritable& operator=(
+      const TTestLocationDescriptorMinidumpWritable&) = delete;
 
-  ~TestLocationDescriptorMinidumpWritable() {}
+  ~TTestLocationDescriptorMinidumpWritable() {}
 
   void SetLocationDescriptor(MinidumpWritable* other) {
     other->RegisterLocationDescriptor(&location_descriptor_);
@@ -658,33 +691,73 @@ class TestLocationDescriptorMinidumpWritable final
   }
 
  private:
-  MINIDUMP_LOCATION_DESCRIPTOR location_descriptor_;
+  MinidumpLocationDescriptorType location_descriptor_;
   std::string string_;
 };
 
-struct LocationDescriptorAndData {
-  MINIDUMP_LOCATION_DESCRIPTOR location_descriptor;
-  char string[1];
+template <typename MinidumpLocationDescriptorType>
+struct TLocationDescriptorAndData {
+  MinidumpLocationDescriptorType location_descriptor;
+  const char* string;
 };
 
-const LocationDescriptorAndData* LDDAtIndex(const std::string& string,
-                                            size_t index) {
-  return reinterpret_cast<const LocationDescriptorAndData*>(&string[index]);
+template <typename MinidumpLocationDescriptorType>
+TLocationDescriptorAndData<MinidumpLocationDescriptorType> TLDDAtIndex(
+    const std::string& str,
+    size_t index) {
+  const MinidumpLocationDescriptorType* location_descriptor =
+      reinterpret_cast<const MinidumpLocationDescriptorType*>(&str[index]);
+
+  const char* string = reinterpret_cast<const char*>(
+      &str[index] +
+      offsetof(TLocationDescriptorAndData<MinidumpLocationDescriptorType>,
+               string));
+
+  return TLocationDescriptorAndData<MinidumpLocationDescriptorType>{
+      *location_descriptor,
+      string,
+  };
 }
 
-TEST(MinidumpWritable, LocationDescriptor) {
+template <typename MinidumpLocationDescriptorType>
+class MinidumpWritableLocationDescriptor : public ::testing::Test {};
+
+template <>
+struct TestNames<MINIDUMP_LOCATION_DESCRIPTOR> {
+  static constexpr char kName[] = "MINIDUMP_LOCATION_DESCRIPTOR";
+};
+
+template <>
+struct TestNames<MINIDUMP_LOCATION_DESCRIPTOR64> {
+  static constexpr char kName[] = "MINIDUMP_LOCATION_DESCRIPTOR64";
+};
+
+using MinidumpLocationDescriptorTypes =
+    ::testing::Types<MINIDUMP_LOCATION_DESCRIPTOR,
+                     MINIDUMP_LOCATION_DESCRIPTOR64>;
+TYPED_TEST_SUITE(MinidumpWritableLocationDescriptor,
+                 MinidumpLocationDescriptorTypes,
+                 TestTypeNames);
+
+TYPED_TEST(MinidumpWritableLocationDescriptor, LocationDescriptor) {
   StringFile string_file;
 
+  using LocationDescriptorAndData = TLocationDescriptorAndData<TypeParam>;
+  const auto LDDAtIndex = TLDDAtIndex<TypeParam>;
+  using TestLocationDescriptorMinidumpWritable =
+      TTestLocationDescriptorMinidumpWritable<TypeParam>;
+  constexpr size_t kMinidumpLocationDescriptorSize = sizeof(TypeParam);
+
   {
     SCOPED_TRACE("unset");
     string_file.Reset();
     TestLocationDescriptorMinidumpWritable location_descriptor_writable;
     EXPECT_TRUE(location_descriptor_writable.WriteEverything(&string_file));
 
-    ASSERT_EQ(string_file.string().size(), 9u);
-    const LocationDescriptorAndData* ldd = LDDAtIndex(string_file.string(), 0);
-    EXPECT_EQ(ldd->location_descriptor.DataSize, 0u);
-    EXPECT_EQ(ldd->location_descriptor.Rva, 0u);
+    ASSERT_EQ(string_file.string().size(), kMinidumpLocationDescriptorSize + 1);
+    LocationDescriptorAndData ldd = LDDAtIndex(string_file.string(), 0);
+    EXPECT_EQ(ldd.location_descriptor.DataSize, 0u);
+    EXPECT_EQ(ldd.location_descriptor.Rva, 0u);
     location_descriptor_writable.Verify();
   }
 
@@ -696,10 +769,11 @@ TEST(MinidumpWritable, LocationDescriptor) {
         &location_descriptor_writable);
     EXPECT_TRUE(location_descriptor_writable.WriteEverything(&string_file));
 
-    ASSERT_EQ(string_file.string().size(), 9u);
-    const LocationDescriptorAndData* ldd = LDDAtIndex(string_file.string(), 0);
-    EXPECT_EQ(ldd->location_descriptor.DataSize, 9u);
-    EXPECT_EQ(ldd->location_descriptor.Rva, 0u);
+    ASSERT_EQ(string_file.string().size(), kMinidumpLocationDescriptorSize + 1);
+    LocationDescriptorAndData ldd = LDDAtIndex(string_file.string(), 0);
+    EXPECT_EQ(ldd.location_descriptor.DataSize,
+              kMinidumpLocationDescriptorSize + 1);
+    EXPECT_EQ(ldd.location_descriptor.Rva, 0u);
     location_descriptor_writable.Verify();
   }
 
@@ -712,11 +786,12 @@ TEST(MinidumpWritable, LocationDescriptor) {
     location_descriptor_writable.SetString("zz");
     EXPECT_TRUE(location_descriptor_writable.WriteEverything(&string_file));
 
-    ASSERT_EQ(string_file.string().size(), 11u);
-    const LocationDescriptorAndData* ldd = LDDAtIndex(string_file.string(), 0);
-    EXPECT_EQ(ldd->location_descriptor.DataSize, 11u);
-    EXPECT_EQ(ldd->location_descriptor.Rva, 0u);
-    EXPECT_STREQ("zz", ldd->string);
+    ASSERT_EQ(string_file.string().size(), kMinidumpLocationDescriptorSize + 3);
+    LocationDescriptorAndData ldd = LDDAtIndex(string_file.string(), 0);
+    EXPECT_EQ(ldd.location_descriptor.DataSize,
+              kMinidumpLocationDescriptorSize + 3);
+    EXPECT_EQ(ldd.location_descriptor.Rva, 0u);
+    EXPECT_STREQ("zz", ldd.string);
     location_descriptor_writable.Verify();
   }
 
@@ -732,15 +807,21 @@ TEST(MinidumpWritable, LocationDescriptor) {
     parent.AddChild(&child);
     EXPECT_TRUE(parent.WriteEverything(&string_file));
 
-    ASSERT_EQ(string_file.string().size(), 22u);
-    const LocationDescriptorAndData* ldd = LDDAtIndex(string_file.string(), 0);
-    EXPECT_EQ(ldd->location_descriptor.DataSize, 11u);
-    EXPECT_EQ(ldd->location_descriptor.Rva, 0u);
-    EXPECT_STREQ("yy", ldd->string);
-    ldd = LDDAtIndex(string_file.string(), 12);
-    EXPECT_EQ(ldd->location_descriptor.DataSize, 10u);
-    EXPECT_EQ(ldd->location_descriptor.Rva, 12u);
-    EXPECT_STREQ("x", ldd->string);
+    ASSERT_EQ(string_file.string().size(),
+              kMinidumpLocationDescriptorSize * 2 + 6);
+    LocationDescriptorAndData ldd = LDDAtIndex(string_file.string(), 0);
+
+    EXPECT_EQ(ldd.location_descriptor.DataSize,
+              kMinidumpLocationDescriptorSize + 3);
+    EXPECT_EQ(ldd.location_descriptor.Rva, 0u);
+    EXPECT_STREQ("yy", ldd.string);
+    ldd = LDDAtIndex(string_file.string(), kMinidumpLocationDescriptorSize + 4);
+
+    EXPECT_EQ(ldd.location_descriptor.DataSize,
+              kMinidumpLocationDescriptorSize + 2);
+
+    EXPECT_EQ(ldd.location_descriptor.Rva, kMinidumpLocationDescriptorSize + 4);
+    EXPECT_STREQ("x", ldd.string);
     parent.Verify();
   }
 
@@ -755,15 +836,20 @@ TEST(MinidumpWritable, LocationDescriptor) {
     parent.AddChild(&child);
     EXPECT_TRUE(parent.WriteEverything(&string_file));
 
-    ASSERT_EQ(string_file.string().size(), 23u);
-    const LocationDescriptorAndData* ldd = LDDAtIndex(string_file.string(), 0);
-    EXPECT_EQ(ldd->location_descriptor.DataSize, 11u);
-    EXPECT_EQ(ldd->location_descriptor.Rva, 12u);
-    EXPECT_STREQ("www", ldd->string);
-    ldd = LDDAtIndex(string_file.string(), 12);
-    EXPECT_EQ(ldd->location_descriptor.DataSize, 0u);
-    EXPECT_EQ(ldd->location_descriptor.Rva, 0u);
-    EXPECT_STREQ("vv", ldd->string);
+    ASSERT_EQ(string_file.string().size(),
+              kMinidumpLocationDescriptorSize * 2 + 7);
+    LocationDescriptorAndData ldd = LDDAtIndex(string_file.string(), 0);
+
+    EXPECT_EQ(ldd.location_descriptor.DataSize,
+              kMinidumpLocationDescriptorSize + 3);
+
+    EXPECT_EQ(ldd.location_descriptor.Rva, kMinidumpLocationDescriptorSize + 4);
+    EXPECT_STREQ("www", ldd.string);
+    ldd = LDDAtIndex(string_file.string(), kMinidumpLocationDescriptorSize + 4);
+
+    EXPECT_EQ(ldd.location_descriptor.DataSize, 0u);
+    EXPECT_EQ(ldd.location_descriptor.Rva, 0u);
+    EXPECT_STREQ("vv", ldd.string);
     parent.Verify();
   }
 
@@ -779,15 +865,18 @@ TEST(MinidumpWritable, LocationDescriptor) {
     parent.AddChild(&child);
     EXPECT_TRUE(parent.WriteEverything(&string_file));
 
-    ASSERT_EQ(string_file.string().size(), 29u);
-    const LocationDescriptorAndData* ldd = LDDAtIndex(string_file.string(), 0);
-    EXPECT_EQ(ldd->location_descriptor.DataSize, 13u);
-    EXPECT_EQ(ldd->location_descriptor.Rva, 16u);
-    EXPECT_STREQ("uuuu", ldd->string);
-    ldd = LDDAtIndex(string_file.string(), 16);
-    EXPECT_EQ(ldd->location_descriptor.DataSize, 13u);
-    EXPECT_EQ(ldd->location_descriptor.Rva, 0u);
-    EXPECT_STREQ("tttt", ldd->string);
+    ASSERT_EQ(string_file.string().size(),
+              kMinidumpLocationDescriptorSize * 2 + 13);
+    LocationDescriptorAndData ldd = LDDAtIndex(string_file.string(), 0);
+    EXPECT_EQ(ldd.location_descriptor.DataSize,
+              kMinidumpLocationDescriptorSize + 5);
+    EXPECT_EQ(ldd.location_descriptor.Rva, kMinidumpLocationDescriptorSize + 8);
+    EXPECT_STREQ("uuuu", ldd.string);
+    ldd = LDDAtIndex(string_file.string(), kMinidumpLocationDescriptorSize + 8);
+    EXPECT_EQ(ldd.location_descriptor.DataSize,
+              kMinidumpLocationDescriptorSize + 5);
+    EXPECT_EQ(ldd.location_descriptor.Rva, 0u);
+    EXPECT_STREQ("tttt", ldd.string);
     parent.Verify();
   }
 
@@ -814,27 +903,35 @@ TEST(MinidumpWritable, LocationDescriptor) {
     child.AddChild(&grandchild_2);
     EXPECT_TRUE(parent.WriteEverything(&string_file));
 
-    ASSERT_EQ(string_file.string().size(), 58u);
-    const LocationDescriptorAndData* ldd = LDDAtIndex(string_file.string(), 0);
-    EXPECT_EQ(ldd->location_descriptor.DataSize, 10u);
-    EXPECT_EQ(ldd->location_descriptor.Rva, 12u);
-    EXPECT_STREQ("s", ldd->string);
-    ldd = LDDAtIndex(string_file.string(), 12);
-    EXPECT_EQ(ldd->location_descriptor.DataSize, 0u);
-    EXPECT_EQ(ldd->location_descriptor.Rva, 0u);
-    EXPECT_STREQ("r", ldd->string);
-    ldd = LDDAtIndex(string_file.string(), 24);
-    EXPECT_EQ(ldd->location_descriptor.DataSize, 10u);
-    EXPECT_EQ(ldd->location_descriptor.Rva, 12u);
-    EXPECT_STREQ("q", ldd->string);
-    ldd = LDDAtIndex(string_file.string(), 36);
-    EXPECT_EQ(ldd->location_descriptor.DataSize, 10u);
-    EXPECT_EQ(ldd->location_descriptor.Rva, 12u);
-    EXPECT_STREQ("p", ldd->string);
-    ldd = LDDAtIndex(string_file.string(), 48);
-    EXPECT_EQ(ldd->location_descriptor.DataSize, 10u);
-    EXPECT_EQ(ldd->location_descriptor.Rva, 12u);
-    EXPECT_STREQ("o", ldd->string);
+    ASSERT_EQ(string_file.string().size(),
+              kMinidumpLocationDescriptorSize * 5 + 18);
+    LocationDescriptorAndData ldd = LDDAtIndex(string_file.string(), 0);
+    EXPECT_EQ(ldd.location_descriptor.DataSize,
+              kMinidumpLocationDescriptorSize + 2);
+    EXPECT_EQ(ldd.location_descriptor.Rva, kMinidumpLocationDescriptorSize + 4);
+    EXPECT_STREQ("s", ldd.string);
+    ldd = LDDAtIndex(string_file.string(), kMinidumpLocationDescriptorSize + 4);
+    EXPECT_EQ(ldd.location_descriptor.DataSize, 0u);
+    EXPECT_EQ(ldd.location_descriptor.Rva, 0u);
+    EXPECT_STREQ("r", ldd.string);
+    ldd = LDDAtIndex(string_file.string(),
+                     kMinidumpLocationDescriptorSize * 2 + 8);
+    EXPECT_EQ(ldd.location_descriptor.DataSize,
+              kMinidumpLocationDescriptorSize + 2);
+    EXPECT_EQ(ldd.location_descriptor.Rva, kMinidumpLocationDescriptorSize + 4);
+    EXPECT_STREQ("q", ldd.string);
+    ldd = LDDAtIndex(string_file.string(),
+                     kMinidumpLocationDescriptorSize * 3 + 12);
+    EXPECT_EQ(ldd.location_descriptor.DataSize,
+              kMinidumpLocationDescriptorSize + 2);
+    EXPECT_EQ(ldd.location_descriptor.Rva, kMinidumpLocationDescriptorSize + 4);
+    EXPECT_STREQ("p", ldd.string);
+    ldd = LDDAtIndex(string_file.string(),
+                     kMinidumpLocationDescriptorSize * 4 + 16);
+    EXPECT_EQ(ldd.location_descriptor.DataSize,
+              kMinidumpLocationDescriptorSize + 2);
+    EXPECT_EQ(ldd.location_descriptor.Rva, kMinidumpLocationDescriptorSize + 4);
+    EXPECT_STREQ("o", ldd.string);
     parent.Verify();
   }
 }
diff --git a/extern/crashpad/crashpad/minidump/minidump_writer_util.cc b/extern/crashpad/crashpad/minidump/minidump_writer_util.cc
index 00f4efa43a..2d0455d612 100644
--- a/extern/crashpad/crashpad/minidump/minidump_writer_util.cc
+++ b/extern/crashpad/crashpad/minidump/minidump_writer_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/minidump_writer_util.h b/extern/crashpad/crashpad/minidump/minidump_writer_util.h
index 6bb7a5c602..21d31f00b3 100644
--- a/extern/crashpad/crashpad/minidump/minidump_writer_util.h
+++ b/extern/crashpad/crashpad/minidump/minidump_writer_util.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/test/minidump_byte_array_writer_test_util.cc b/extern/crashpad/crashpad/minidump/test/minidump_byte_array_writer_test_util.cc
index 01e9d0a6ed..6938fcdeca 100644
--- a/extern/crashpad/crashpad/minidump/test/minidump_byte_array_writer_test_util.cc
+++ b/extern/crashpad/crashpad/minidump/test/minidump_byte_array_writer_test_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/test/minidump_byte_array_writer_test_util.h b/extern/crashpad/crashpad/minidump/test/minidump_byte_array_writer_test_util.h
index d2c926b28e..96dda44b64 100644
--- a/extern/crashpad/crashpad/minidump/test/minidump_byte_array_writer_test_util.h
+++ b/extern/crashpad/crashpad/minidump/test/minidump_byte_array_writer_test_util.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/test/minidump_context_test_util.cc b/extern/crashpad/crashpad/minidump/test/minidump_context_test_util.cc
index 446e5a1526..b40558cf28 100644
--- a/extern/crashpad/crashpad/minidump/test/minidump_context_test_util.cc
+++ b/extern/crashpad/crashpad/minidump/test/minidump_context_test_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,7 +17,8 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
@@ -128,8 +129,7 @@ void InitializeMinidumpContextAMD64(MinidumpContextAMD64* context,
   context->ds = static_cast<uint16_t>(value++);
   context->es = static_cast<uint16_t>(value++);
   context->ss = static_cast<uint16_t>(value++);
-  for (size_t index = 0; index < base::size(context->vector_register);
-       ++index) {
+  for (size_t index = 0; index < std::size(context->vector_register); ++index) {
     context->vector_register[index].lo = value++;
     context->vector_register[index].hi = value++;
   }
@@ -152,7 +152,7 @@ void InitializeMinidumpContextARM(MinidumpContextARM* context, uint32_t seed) {
 
   uint32_t value = seed;
 
-  for (size_t index = 0; index < base::size(context->regs); ++index) {
+  for (size_t index = 0; index < std::size(context->regs); ++index) {
     context->regs[index] = value++;
   }
   context->fp = value++;
@@ -163,7 +163,7 @@ void InitializeMinidumpContextARM(MinidumpContextARM* context, uint32_t seed) {
   context->pc = value++;
   context->cpsr = value++;
 
-  for (size_t index = 0; index < base::size(context->vfp); ++index) {
+  for (size_t index = 0; index < std::size(context->vfp); ++index) {
     context->vfp[index] = value++;
   }
   context->fpscr = value++;
@@ -181,7 +181,7 @@ void InitializeMinidumpContextARM64(MinidumpContextARM64* context,
 
   uint32_t value = seed;
 
-  for (size_t index = 0; index < base::size(context->regs); ++index) {
+  for (size_t index = 0; index < std::size(context->regs); ++index) {
     context->regs[index] = value++;
   }
   context->fp = value++;
@@ -190,7 +190,7 @@ void InitializeMinidumpContextARM64(MinidumpContextARM64* context,
   context->pc = value++;
   context->cpsr = value++;
 
-  for (size_t index = 0; index < base::size(context->fpsimd); ++index) {
+  for (size_t index = 0; index < std::size(context->fpsimd); ++index) {
     context->fpsimd[index].lo = value++;
     context->fpsimd[index].hi = value++;
   }
@@ -210,7 +210,7 @@ void InitializeMinidumpContextMIPS(MinidumpContextMIPS* context,
 
   uint32_t value = seed;
 
-  for (size_t index = 0; index < base::size(context->regs); ++index) {
+  for (size_t index = 0; index < std::size(context->regs); ++index) {
     context->regs[index] = value++;
   }
 
@@ -221,7 +221,7 @@ void InitializeMinidumpContextMIPS(MinidumpContextMIPS* context,
   context->status = value++;
   context->cause = value++;
 
-  for (size_t index = 0; index < base::size(context->fpregs.fregs); ++index) {
+  for (size_t index = 0; index < std::size(context->fpregs.fregs); ++index) {
     context->fpregs.fregs[index]._fp_fregs = static_cast<float>(value++);
   }
 
@@ -248,7 +248,7 @@ void InitializeMinidumpContextMIPS64(MinidumpContextMIPS64* context,
 
   uint64_t value = seed;
 
-  for (size_t index = 0; index < base::size(context->regs); ++index) {
+  for (size_t index = 0; index < std::size(context->regs); ++index) {
     context->regs[index] = value++;
   }
 
@@ -259,7 +259,7 @@ void InitializeMinidumpContextMIPS64(MinidumpContextMIPS64* context,
   context->status = value++;
   context->cause = value++;
 
-  for (size_t index = 0; index < base::size(context->fpregs.dregs); ++index) {
+  for (size_t index = 0; index < std::size(context->fpregs.dregs); ++index) {
     context->fpregs.dregs[index] = static_cast<double>(value++);
   }
   context->fpcsr = value++;
@@ -272,6 +272,31 @@ void InitializeMinidumpContextMIPS64(MinidumpContextMIPS64* context,
   context->dsp_control = value++;
 }
 
+void InitializeMinidumpContextRISCV64(MinidumpContextRISCV64* context,
+                                      uint32_t seed) {
+  if (seed == 0) {
+    memset(context, 0, sizeof(*context));
+    context->context_flags = kMinidumpContextRISCV64;
+    context->version = MinidumpContextRISCV64::kVersion;
+    return;
+  }
+
+  context->context_flags = kMinidumpContextRISCV64All;
+  context->version = MinidumpContextRISCV64::kVersion;
+
+  uint32_t value = seed;
+
+  context->pc = value++;
+  for (size_t index = 0; index < std::size(context->regs); ++index) {
+    context->regs[index] = value++;
+  }
+
+  for (size_t index = 0; index < std::size(context->fpregs); ++index) {
+    context->fpregs[index] = value++;
+  }
+  context->fcsr = value++;
+}
+
 namespace {
 
 // Using Google Test assertions, compares |expected| to |observed|. This is
@@ -294,33 +319,33 @@ void ExpectMinidumpContextFxsave(const FxsaveType* expected,
   EXPECT_EQ(observed->reserved_3, expected->reserved_3);
   EXPECT_EQ(observed->mxcsr, expected->mxcsr);
   EXPECT_EQ(observed->mxcsr_mask, expected->mxcsr_mask);
-  for (size_t st_mm_index = 0; st_mm_index < base::size(expected->st_mm);
+  for (size_t st_mm_index = 0; st_mm_index < std::size(expected->st_mm);
        ++st_mm_index) {
     SCOPED_TRACE(base::StringPrintf("st_mm_index %" PRIuS, st_mm_index));
     EXPECT_EQ(BytesToHexString(observed->st_mm[st_mm_index].st,
-                               base::size(observed->st_mm[st_mm_index].st)),
+                               std::size(observed->st_mm[st_mm_index].st)),
               BytesToHexString(expected->st_mm[st_mm_index].st,
-                               base::size(expected->st_mm[st_mm_index].st)));
+                               std::size(expected->st_mm[st_mm_index].st)));
     EXPECT_EQ(
         BytesToHexString(observed->st_mm[st_mm_index].st_reserved,
-                         base::size(observed->st_mm[st_mm_index].st_reserved)),
+                         std::size(observed->st_mm[st_mm_index].st_reserved)),
         BytesToHexString(expected->st_mm[st_mm_index].st_reserved,
-                         base::size(expected->st_mm[st_mm_index].st_reserved)));
+                         std::size(expected->st_mm[st_mm_index].st_reserved)));
   }
-  for (size_t xmm_index = 0; xmm_index < base::size(expected->xmm);
+  for (size_t xmm_index = 0; xmm_index < std::size(expected->xmm);
        ++xmm_index) {
     EXPECT_EQ(BytesToHexString(observed->xmm[xmm_index],
-                               base::size(observed->xmm[xmm_index])),
+                               std::size(observed->xmm[xmm_index])),
               BytesToHexString(expected->xmm[xmm_index],
-                               base::size(expected->xmm[xmm_index])))
+                               std::size(expected->xmm[xmm_index])))
         << "xmm_index " << xmm_index;
   }
   EXPECT_EQ(
-      BytesToHexString(observed->reserved_4, base::size(observed->reserved_4)),
-      BytesToHexString(expected->reserved_4, base::size(expected->reserved_4)));
+      BytesToHexString(observed->reserved_4, std::size(observed->reserved_4)),
+      BytesToHexString(expected->reserved_4, std::size(expected->reserved_4)));
   EXPECT_EQ(
-      BytesToHexString(observed->available, base::size(observed->available)),
-      BytesToHexString(expected->available, base::size(expected->available)));
+      BytesToHexString(observed->available, std::size(observed->available)),
+      BytesToHexString(expected->available, std::size(expected->available)));
 }
 
 }  // namespace
@@ -345,11 +370,11 @@ void ExpectMinidumpContextX86(
   EXPECT_EQ(observed->fsave.fpu_cs, expected.fsave.fpu_cs);
   EXPECT_EQ(observed->fsave.fpu_dp, expected.fsave.fpu_dp);
   EXPECT_EQ(observed->fsave.fpu_ds, expected.fsave.fpu_ds);
-  for (size_t index = 0; index < base::size(expected.fsave.st); ++index) {
+  for (size_t index = 0; index < std::size(expected.fsave.st); ++index) {
     EXPECT_EQ(BytesToHexString(observed->fsave.st[index],
-                               base::size(observed->fsave.st[index])),
+                               std::size(observed->fsave.st[index])),
               BytesToHexString(expected.fsave.st[index],
-                               base::size(expected.fsave.st[index])))
+                               std::size(expected.fsave.st[index])))
         << "index " << index;
   }
   if (snapshot) {
@@ -383,7 +408,15 @@ void ExpectMinidumpContextAMD64(
   MinidumpContextAMD64 expected;
   InitializeMinidumpContextAMD64(&expected, expect_seed);
 
-  EXPECT_EQ(observed->context_flags, expected.context_flags);
+  // Allow context_flags to include xstate bit - this is added if we will write
+  // an extended context, but is not generated in the fixed context for testing.
+  if ((observed->context_flags & kMinidumpContextAMD64Xstate) ==
+      kMinidumpContextAMD64Xstate) {
+    EXPECT_EQ(observed->context_flags,
+              (expected.context_flags | kMinidumpContextAMD64Xstate));
+  } else {
+    EXPECT_EQ(observed->context_flags, expected.context_flags);
+  }
 
   if (snapshot) {
     EXPECT_EQ(observed->p1_home, 0u);
@@ -448,8 +481,7 @@ void ExpectMinidumpContextAMD64(
 
   ExpectMinidumpContextFxsave(&expected.fxsave, &observed->fxsave);
 
-  for (size_t index = 0; index < base::size(expected.vector_register);
-       ++index) {
+  for (size_t index = 0; index < std::size(expected.vector_register); ++index) {
     if (snapshot) {
       EXPECT_EQ(observed->vector_register[index].lo, 0u) << "index " << index;
       EXPECT_EQ(observed->vector_register[index].hi, 0u) << "index " << index;
@@ -489,7 +521,7 @@ void ExpectMinidumpContextARM(uint32_t expect_seed,
 
   EXPECT_EQ(observed->context_flags, expected.context_flags);
 
-  for (size_t index = 0; index < base::size(expected.regs); ++index) {
+  for (size_t index = 0; index < std::size(expected.regs); ++index) {
     EXPECT_EQ(observed->regs[index], expected.regs[index]);
   }
   EXPECT_EQ(observed->fp, expected.fp);
@@ -500,10 +532,10 @@ void ExpectMinidumpContextARM(uint32_t expect_seed,
   EXPECT_EQ(observed->cpsr, expected.cpsr);
 
   EXPECT_EQ(observed->fpscr, expected.fpscr);
-  for (size_t index = 0; index < base::size(expected.vfp); ++index) {
+  for (size_t index = 0; index < std::size(expected.vfp); ++index) {
     EXPECT_EQ(observed->vfp[index], expected.vfp[index]);
   }
-  for (size_t index = 0; index < base::size(expected.extra); ++index) {
+  for (size_t index = 0; index < std::size(expected.extra); ++index) {
     EXPECT_EQ(observed->extra[index], snapshot ? 0 : expected.extra[index]);
   }
 }
@@ -516,14 +548,14 @@ void ExpectMinidumpContextARM64(uint32_t expect_seed,
 
   EXPECT_EQ(observed->context_flags, expected.context_flags);
 
-  for (size_t index = 0; index < base::size(expected.regs); ++index) {
+  for (size_t index = 0; index < std::size(expected.regs); ++index) {
     EXPECT_EQ(observed->regs[index], expected.regs[index]);
   }
   EXPECT_EQ(observed->cpsr, expected.cpsr);
 
   EXPECT_EQ(observed->fpsr, expected.fpsr);
   EXPECT_EQ(observed->fpcr, expected.fpcr);
-  for (size_t index = 0; index < base::size(expected.fpsimd); ++index) {
+  for (size_t index = 0; index < std::size(expected.fpsimd); ++index) {
     EXPECT_EQ(observed->fpsimd[index].lo, expected.fpsimd[index].lo);
     EXPECT_EQ(observed->fpsimd[index].hi, expected.fpsimd[index].hi);
   }
@@ -537,7 +569,7 @@ void ExpectMinidumpContextMIPS(uint32_t expect_seed,
 
   EXPECT_EQ(observed->context_flags, expected.context_flags);
 
-  for (size_t index = 0; index < base::size(expected.regs); ++index) {
+  for (size_t index = 0; index < std::size(expected.regs); ++index) {
     EXPECT_EQ(observed->regs[index], expected.regs[index]);
   }
 
@@ -548,7 +580,7 @@ void ExpectMinidumpContextMIPS(uint32_t expect_seed,
   EXPECT_EQ(observed->status, expected.status);
   EXPECT_EQ(observed->cause, expected.cause);
 
-  for (size_t index = 0; index < base::size(expected.fpregs.fregs); ++index) {
+  for (size_t index = 0; index < std::size(expected.fpregs.fregs); ++index) {
     EXPECT_EQ(observed->fpregs.fregs[index]._fp_fregs,
               expected.fpregs.fregs[index]._fp_fregs);
   }
@@ -570,7 +602,7 @@ void ExpectMinidumpContextMIPS64(uint32_t expect_seed,
 
   EXPECT_EQ(observed->context_flags, expected.context_flags);
 
-  for (size_t index = 0; index < base::size(expected.regs); ++index) {
+  for (size_t index = 0; index < std::size(expected.regs); ++index) {
     EXPECT_EQ(observed->regs[index], expected.regs[index]);
   }
 
@@ -581,7 +613,7 @@ void ExpectMinidumpContextMIPS64(uint32_t expect_seed,
   EXPECT_EQ(observed->status, expected.status);
   EXPECT_EQ(observed->cause, expected.cause);
 
-  for (size_t index = 0; index < base::size(expected.fpregs.dregs); ++index) {
+  for (size_t index = 0; index < std::size(expected.fpregs.dregs); ++index) {
     EXPECT_EQ(observed->fpregs.dregs[index], expected.fpregs.dregs[index]);
   }
   EXPECT_EQ(observed->fpcsr, expected.fpcsr);
@@ -594,5 +626,24 @@ void ExpectMinidumpContextMIPS64(uint32_t expect_seed,
   EXPECT_EQ(observed->dsp_control, expected.dsp_control);
 }
 
+void ExpectMinidumpContextRISCV64(uint32_t expect_seed,
+                                  const MinidumpContextRISCV64* observed,
+                                  bool snapshot) {
+  MinidumpContextRISCV64 expected;
+  InitializeMinidumpContextRISCV64(&expected, expect_seed);
+
+  EXPECT_EQ(observed->context_flags, expected.context_flags);
+  EXPECT_EQ(observed->version, expected.version);
+
+  for (size_t index = 0; index < std::size(expected.regs); ++index) {
+    EXPECT_EQ(observed->regs[index], expected.regs[index]);
+  }
+
+  for (size_t index = 0; index < std::size(expected.fpregs); ++index) {
+    EXPECT_EQ(observed->fpregs[index], expected.fpregs[index]);
+  }
+  EXPECT_EQ(observed->fcsr, expected.fcsr);
+}
+
 }  // namespace test
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/minidump/test/minidump_context_test_util.h b/extern/crashpad/crashpad/minidump/test/minidump_context_test_util.h
index 0c633decbe..4ce5c1e1c3 100644
--- a/extern/crashpad/crashpad/minidump/test/minidump_context_test_util.h
+++ b/extern/crashpad/crashpad/minidump/test/minidump_context_test_util.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -47,6 +47,8 @@ void InitializeMinidumpContextARM64(MinidumpContextARM64* context,
 void InitializeMinidumpContextMIPS(MinidumpContextMIPS* context, uint32_t seed);
 void InitializeMinidumpContextMIPS64(MinidumpContextMIPS* context,
                                      uint32_t seed);
+void InitializeMinidumpContextRISCV64(MinidumpContextRISCV64* context,
+                                      uint32_t seed);
 //! \}
 
 //! \brief Verifies, via Google Test assertions, that a context structure
@@ -85,6 +87,9 @@ void ExpectMinidumpContextMIPS(uint32_t expect_seed,
 void ExpectMinidumpContextMIPS64(uint32_t expect_seed,
                                  const MinidumpContextMIPS64* observed,
                                  bool snapshot);
+void ExpectMinidumpContextRISCV64(uint32_t expect_seed,
+                                  const MinidumpContextRISCV64* observed,
+                                  bool snapshot);
 //! \}
 
 }  // namespace test
diff --git a/extern/crashpad/crashpad/minidump/test/minidump_file_writer_test_util.cc b/extern/crashpad/crashpad/minidump/test/minidump_file_writer_test_util.cc
index aae357dcfa..422ae56dca 100644
--- a/extern/crashpad/crashpad/minidump/test/minidump_file_writer_test_util.cc
+++ b/extern/crashpad/crashpad/minidump/test/minidump_file_writer_test_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/test/minidump_file_writer_test_util.h b/extern/crashpad/crashpad/minidump/test/minidump_file_writer_test_util.h
index 4efe99e691..c44fc09cee 100644
--- a/extern/crashpad/crashpad/minidump/test/minidump_file_writer_test_util.h
+++ b/extern/crashpad/crashpad/minidump/test/minidump_file_writer_test_util.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/test/minidump_memory_writer_test_util.cc b/extern/crashpad/crashpad/minidump/test/minidump_memory_writer_test_util.cc
index 4e38cfa638..345b781e38 100644
--- a/extern/crashpad/crashpad/minidump/test/minidump_memory_writer_test_util.cc
+++ b/extern/crashpad/crashpad/minidump/test/minidump_memory_writer_test_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/test/minidump_memory_writer_test_util.h b/extern/crashpad/crashpad/minidump/test/minidump_memory_writer_test_util.h
index 83b31384e2..33ce15d1b2 100644
--- a/extern/crashpad/crashpad/minidump/test/minidump_memory_writer_test_util.h
+++ b/extern/crashpad/crashpad/minidump/test/minidump_memory_writer_test_util.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/test/minidump_rva_list_test_util.cc b/extern/crashpad/crashpad/minidump/test/minidump_rva_list_test_util.cc
index 248161c329..077995d8eb 100644
--- a/extern/crashpad/crashpad/minidump/test/minidump_rva_list_test_util.cc
+++ b/extern/crashpad/crashpad/minidump/test/minidump_rva_list_test_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/test/minidump_rva_list_test_util.h b/extern/crashpad/crashpad/minidump/test/minidump_rva_list_test_util.h
index 6b5a2a92f5..e2353f69bb 100644
--- a/extern/crashpad/crashpad/minidump/test/minidump_rva_list_test_util.h
+++ b/extern/crashpad/crashpad/minidump/test/minidump_rva_list_test_util.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/test/minidump_string_writer_test_util.cc b/extern/crashpad/crashpad/minidump/test/minidump_string_writer_test_util.cc
index a8eb5aa46a..89004790d4 100644
--- a/extern/crashpad/crashpad/minidump/test/minidump_string_writer_test_util.cc
+++ b/extern/crashpad/crashpad/minidump/test/minidump_string_writer_test_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -25,8 +25,11 @@ namespace test {
 
 namespace {
 
-template <typename T>
-const T* TMinidumpStringAtRVA(const std::string& file_contents, RVA rva) {
+template <
+    typename T,
+    typename RVAType = RVA,
+    typename MinidumpLocationDescriptorType = MINIDUMP_LOCATION_DESCRIPTOR>
+const T* TMinidumpStringAtRVA(const std::string& file_contents, RVAType rva) {
   const T* string_base = MinidumpWritableAtRVA<T>(file_contents, rva);
   if (!string_base) {
     return nullptr;
@@ -41,7 +44,7 @@ const T* TMinidumpStringAtRVA(const std::string& file_contents, RVA rva) {
   }
 
   // |Length| does not include space for the required NUL terminator.
-  MINIDUMP_LOCATION_DESCRIPTOR location;
+  MinidumpLocationDescriptorType location;
   location.DataSize =
       sizeof(*string_base) + string_base->Length + kCodeUnitSize;
   location.Rva = rva;
@@ -62,11 +65,16 @@ const T* TMinidumpStringAtRVA(const std::string& file_contents, RVA rva) {
   return string;
 }
 
-template <typename StringType, typename MinidumpStringType>
+template <typename StringType,
+          typename MinidumpStringType,
+          typename RVAType,
+          typename MinidumpLocationDescriptorType>
 StringType TMinidumpStringAtRVAAsString(const std::string& file_contents,
-                                        RVA rva) {
+                                        RVAType rva) {
   const MinidumpStringType* minidump_string =
-      TMinidumpStringAtRVA<MinidumpStringType>(file_contents, rva);
+      TMinidumpStringAtRVA<MinidumpStringType,
+                           RVAType,
+                           MinidumpLocationDescriptorType>(file_contents, rva);
   if (!minidump_string) {
     return StringType();
   }
@@ -82,24 +90,69 @@ StringType TMinidumpStringAtRVAAsString(const std::string& file_contents,
 
 const MINIDUMP_STRING* MinidumpStringAtRVA(const std::string& file_contents,
                                            RVA rva) {
-  return TMinidumpStringAtRVA<MINIDUMP_STRING>(file_contents, rva);
+  return TMinidumpStringAtRVA<MINIDUMP_STRING,
+                              RVA,
+                              MINIDUMP_LOCATION_DESCRIPTOR>(file_contents, rva);
+}
+
+const MINIDUMP_STRING* MinidumpStringAtRVA(const std::string& file_contents,
+                                           RVA64 rva) {
+  return TMinidumpStringAtRVA<MINIDUMP_STRING,
+                              RVA64,
+                              MINIDUMP_LOCATION_DESCRIPTOR64>(file_contents,
+                                                              rva);
 }
 
 const MinidumpUTF8String* MinidumpUTF8StringAtRVA(
     const std::string& file_contents,
     RVA rva) {
-  return TMinidumpStringAtRVA<MinidumpUTF8String>(file_contents, rva);
+  return TMinidumpStringAtRVA<MinidumpUTF8String,
+                              RVA,
+                              MINIDUMP_LOCATION_DESCRIPTOR>(file_contents, rva);
+}
+
+const MinidumpUTF8String* MinidumpUTF8StringAtRVA(
+    const std::string& file_contents,
+    RVA64 rva) {
+  return TMinidumpStringAtRVA<MinidumpUTF8String,
+                              RVA64,
+                              MINIDUMP_LOCATION_DESCRIPTOR64>(file_contents,
+                                                              rva);
 }
 
 std::u16string MinidumpStringAtRVAAsString(const std::string& file_contents,
                                            RVA rva) {
-  return TMinidumpStringAtRVAAsString<std::u16string, MINIDUMP_STRING>(
+  return TMinidumpStringAtRVAAsString<std::u16string,
+                                      MINIDUMP_STRING,
+                                      RVA,
+                                      MINIDUMP_LOCATION_DESCRIPTOR>(
+      file_contents, rva);
+}
+
+std::u16string MinidumpStringAtRVAAsString(const std::string& file_contents,
+                                           RVA64 rva) {
+  return TMinidumpStringAtRVAAsString<std::u16string,
+                                      MINIDUMP_STRING,
+                                      RVA64,
+                                      MINIDUMP_LOCATION_DESCRIPTOR64>(
       file_contents, rva);
 }
 
 std::string MinidumpUTF8StringAtRVAAsString(const std::string& file_contents,
                                             RVA rva) {
-  return TMinidumpStringAtRVAAsString<std::string, MinidumpUTF8String>(
+  return TMinidumpStringAtRVAAsString<std::string,
+                                      MinidumpUTF8String,
+                                      RVA,
+                                      MINIDUMP_LOCATION_DESCRIPTOR>(
+      file_contents, rva);
+}
+
+std::string MinidumpUTF8StringAtRVAAsString(const std::string& file_contents,
+                                            RVA64 rva) {
+  return TMinidumpStringAtRVAAsString<std::string,
+                                      MinidumpUTF8String,
+                                      RVA64,
+                                      MINIDUMP_LOCATION_DESCRIPTOR64>(
       file_contents, rva);
 }
 
diff --git a/extern/crashpad/crashpad/minidump/test/minidump_string_writer_test_util.h b/extern/crashpad/crashpad/minidump/test/minidump_string_writer_test_util.h
index c92027a70d..56b06d370a 100644
--- a/extern/crashpad/crashpad/minidump/test/minidump_string_writer_test_util.h
+++ b/extern/crashpad/crashpad/minidump/test/minidump_string_writer_test_util.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,6 +20,11 @@
 
 #include <string>
 
+#include "minidump/minidump_extensions.h"
+#include "minidump/test/minidump_writable_test_util.h"
+
+#include "gtest/gtest.h"
+
 namespace crashpad {
 
 struct MinidumpUTF8String;
@@ -44,6 +49,10 @@ namespace test {
 const MINIDUMP_STRING* MinidumpStringAtRVA(const std::string& file_contents,
                                            RVA rva);
 
+//! \brief 64-bit specialization of MinidumpStringAtRVA.
+const MINIDUMP_STRING* MinidumpStringAtRVA(const std::string& file_contents,
+                                           RVA64 rva);
+
 //! \brief Returns a MinidumpUTF8String located within a minidump file’s
 //!     contents.
 //!
@@ -64,6 +73,11 @@ const MinidumpUTF8String* MinidumpUTF8StringAtRVA(
     const std::string& file_contents,
     RVA rva);
 
+//! \brief 64-bit specialization of MinidumpUTF8StringAtRVA.
+const MinidumpUTF8String* MinidumpUTF8StringAtRVA(
+    const std::string& file_contents,
+    RVA64 rva);
+
 //! \brief Returns the contents of a MINIDUMP_STRING as a `std::u16string`.
 //!
 //! This function uses MinidumpStringAtRVA() to obtain a MINIDUMP_STRING, and
@@ -80,6 +94,10 @@ const MinidumpUTF8String* MinidumpUTF8StringAtRVA(
 std::u16string MinidumpStringAtRVAAsString(const std::string& file_contents,
                                            RVA rva);
 
+//! \brief 64-bit specialization of MinidumpStringAtRVAAsString.
+std::u16string MinidumpStringAtRVAAsString(const std::string& file_contents,
+                                           RVA64 rva);
+
 //! \brief Returns the contents of a MinidumpUTF8String as a `std::string`.
 //!
 //! This function uses MinidumpUTF8StringAtRVA() to obtain a MinidumpUTF8String,
@@ -96,6 +114,10 @@ std::u16string MinidumpStringAtRVAAsString(const std::string& file_contents,
 std::string MinidumpUTF8StringAtRVAAsString(const std::string& file_contents,
                                             RVA rva);
 
+//! \brief 64-bit specialization of MinidumpUTF8StringAtRVAAsString.
+std::string MinidumpUTF8StringAtRVAAsString(const std::string& file_contents,
+                                            RVA64 rva);
+
 }  // namespace test
 }  // namespace crashpad
 
diff --git a/extern/crashpad/crashpad/minidump/test/minidump_user_extension_stream_util.cc b/extern/crashpad/crashpad/minidump/test/minidump_user_extension_stream_util.cc
index 50100822c8..5086d44087 100644
--- a/extern/crashpad/crashpad/minidump/test/minidump_user_extension_stream_util.cc
+++ b/extern/crashpad/crashpad/minidump/test/minidump_user_extension_stream_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/test/minidump_user_extension_stream_util.h b/extern/crashpad/crashpad/minidump/test/minidump_user_extension_stream_util.h
index 2dc60f4a6f..bc8237ea5a 100644
--- a/extern/crashpad/crashpad/minidump/test/minidump_user_extension_stream_util.h
+++ b/extern/crashpad/crashpad/minidump/test/minidump_user_extension_stream_util.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/minidump/test/minidump_writable_test_util.cc b/extern/crashpad/crashpad/minidump/test/minidump_writable_test_util.cc
index 2ae6a9b14c..48beb0e69f 100644
--- a/extern/crashpad/crashpad/minidump/test/minidump_writable_test_util.cc
+++ b/extern/crashpad/crashpad/minidump/test/minidump_writable_test_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 #include "gtest/gtest.h"
 #include "util/file/file_writer.h"
 #include "util/misc/implicit_cast.h"
+#include "util/numeric/in_range_cast.h"
 
 namespace crashpad {
 namespace test {
@@ -39,25 +40,26 @@ namespace {
 //!
 //! Do not call this function. Use the typed version, MinidumpWritableAtRVA<>(),
 //! or another type-specific function.
+template <typename RVAType>
 const void* MinidumpWritableAtRVAInternal(const std::string& file_contents,
-                                          RVA rva) {
-  if (rva >= file_contents.size()) {
-    EXPECT_LT(rva, file_contents.size());
+                                          RVAType rva) {
+  const auto rva_offset = crashpad::InRangeCast(rva, file_contents.size());
+  if (rva_offset >= file_contents.size()) {
+    EXPECT_LT(rva_offset, file_contents.size());
     return nullptr;
   }
 
-  return &file_contents[rva];
+  return &file_contents[rva_offset];
 }
 
-}  // namespace
-
-const void* MinidumpWritableAtLocationDescriptorInternal(
+template <typename RVAType, typename MinidumpLocationDescriptorType>
+const void* TMinidumpWritableAtLocationDescriptorInternal(
     const std::string& file_contents,
-    const MINIDUMP_LOCATION_DESCRIPTOR& location,
+    const MinidumpLocationDescriptorType& location,
     size_t expected_size,
     bool allow_oversized_data) {
   if (location.DataSize == 0) {
-    EXPECT_EQ(location.Rva, 0u);
+    EXPECT_EQ(location.Rva, RVAType(0));
     return nullptr;
   }
 
@@ -71,17 +73,42 @@ const void* MinidumpWritableAtLocationDescriptorInternal(
     return nullptr;
   }
 
-  RVA end = location.Rva + location.DataSize;
+  RVAType end = location.Rva + location.DataSize;
   if (end > file_contents.size()) {
     EXPECT_LE(end, file_contents.size());
     return nullptr;
   }
 
-  const void* rv = MinidumpWritableAtRVAInternal(file_contents, location.Rva);
+  const void* rv =
+      MinidumpWritableAtRVAInternal<RVAType>(file_contents, location.Rva);
 
   return rv;
 }
 
+}  // namespace
+
+const void* MinidumpWritableAtLocationDescriptorInternal(
+    const std::string& file_contents,
+    const MINIDUMP_LOCATION_DESCRIPTOR& location,
+    size_t expected_size,
+    bool allow_oversized_data) {
+  return TMinidumpWritableAtLocationDescriptorInternal<
+      RVA,
+      MINIDUMP_LOCATION_DESCRIPTOR>(
+      file_contents, location, expected_size, allow_oversized_data);
+}
+
+const void* MinidumpWritableAtLocationDescriptorInternal(
+    const std::string& file_contents,
+    const MINIDUMP_LOCATION_DESCRIPTOR64& location,
+    size_t expected_size,
+    bool allow_oversized_data) {
+  return TMinidumpWritableAtLocationDescriptorInternal<
+      RVA64,
+      MINIDUMP_LOCATION_DESCRIPTOR64>(
+      file_contents, location, expected_size, allow_oversized_data);
+}
+
 template <>
 const IMAGE_DEBUG_MISC* MinidumpWritableAtLocationDescriptor<IMAGE_DEBUG_MISC>(
     const std::string& file_contents,
@@ -189,6 +216,14 @@ struct MinidumpThreadListTraits {
   }
 };
 
+struct MinidumpThreadNameListTraits {
+  using ListType = MINIDUMP_THREAD_NAME_LIST;
+  enum : size_t { kElementSize = sizeof(MINIDUMP_THREAD_NAME) };
+  static size_t ElementCount(const ListType* list) {
+    return list->NumberOfThreadNames;
+  }
+};
+
 struct MinidumpHandleDataStreamTraits {
   using ListType = MINIDUMP_HANDLE_DATA_STREAM;
   enum : size_t { kElementSize = sizeof(MINIDUMP_HANDLE_DESCRIPTOR) };
@@ -282,6 +317,15 @@ MinidumpWritableAtLocationDescriptor<MINIDUMP_THREAD_LIST>(
       file_contents, location);
 }
 
+template <>
+const MINIDUMP_THREAD_NAME_LIST*
+MinidumpWritableAtLocationDescriptor<MINIDUMP_THREAD_NAME_LIST>(
+    const std::string& file_contents,
+    const MINIDUMP_LOCATION_DESCRIPTOR& location) {
+  return MinidumpListAtLocationDescriptor<MinidumpThreadNameListTraits>(
+      file_contents, location);
+}
+
 template <>
 const MINIDUMP_HANDLE_DATA_STREAM*
 MinidumpWritableAtLocationDescriptor<MINIDUMP_HANDLE_DATA_STREAM>(
diff --git a/extern/crashpad/crashpad/minidump/test/minidump_writable_test_util.h b/extern/crashpad/crashpad/minidump/test/minidump_writable_test_util.h
index 9ebb9d0266..1aa0327f67 100644
--- a/extern/crashpad/crashpad/minidump/test/minidump_writable_test_util.h
+++ b/extern/crashpad/crashpad/minidump/test/minidump_writable_test_util.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -59,6 +59,17 @@ const void* MinidumpWritableAtLocationDescriptorInternal(
     size_t expected_size,
     bool allow_oversized_data);
 
+//! \brief 64-bit specialization of
+//! MinidumpWritableAtLocationDescriptorInternal.
+//!
+//! Do not call this function. Use the typed version,
+//! MinidumpWritableAtLocationDescriptor<>(), or another type-specific function.
+const void* MinidumpWritableAtLocationDescriptorInternal(
+    const std::string& file_contents,
+    const MINIDUMP_LOCATION_DESCRIPTOR64& location,
+    size_t expected_size,
+    bool allow_oversized_data);
+
 //! \brief A traits class defining whether a minidump object type is required to
 //!     appear only as a fixed-size object or if it is variable-sized.
 //!
@@ -90,6 +101,7 @@ MINIDUMP_ALLOW_OVERSIZED_DATA(MINIDUMP_MEMORY_LIST);
 MINIDUMP_ALLOW_OVERSIZED_DATA(MINIDUMP_MODULE_LIST);
 MINIDUMP_ALLOW_OVERSIZED_DATA(MINIDUMP_UNLOADED_MODULE_LIST);
 MINIDUMP_ALLOW_OVERSIZED_DATA(MINIDUMP_THREAD_LIST);
+MINIDUMP_ALLOW_OVERSIZED_DATA(MINIDUMP_THREAD_NAME_LIST);
 MINIDUMP_ALLOW_OVERSIZED_DATA(MINIDUMP_HANDLE_DATA_STREAM);
 MINIDUMP_ALLOW_OVERSIZED_DATA(MINIDUMP_MEMORY_INFO_LIST);
 MINIDUMP_ALLOW_OVERSIZED_DATA(MinidumpModuleCrashpadInfoList);
@@ -134,6 +146,22 @@ const T* TMinidumpWritableAtLocationDescriptor(
           MinidumpWritableTraits<T>::kAllowOversizedData));
 }
 
+//! \brief 64-bit specialization of TMinidumpWritableAtLocationDescriptor.
+//!
+//! Do not call this function directly. Use
+//! MinidumpWritableAtLocationDescriptor<>() instead.
+template <typename T>
+const T* TMinidumpWritableAtLocationDescriptor(
+    const std::string& file_contents,
+    const MINIDUMP_LOCATION_DESCRIPTOR64& location) {
+  return reinterpret_cast<const T*>(
+      MinidumpWritableAtLocationDescriptorInternal(
+          file_contents,
+          location,
+          sizeof(T),
+          MinidumpWritableTraits<T>::kAllowOversizedData));
+}
+
 //! \brief Returns a typed minidump object located within a minidump file’s
 //!     contents, where the offset and size of the object are known.
 //!
@@ -141,7 +169,8 @@ const T* TMinidumpWritableAtLocationDescriptor(
 //! checking than the default implementation:
 //!  - With a MINIDUMP_HEADER template parameter, a template specialization
 //!    ensures that the structure’s magic number and version fields are correct.
-//!  - With a MINIDUMP_MEMORY_LIST, MINIDUMP_THREAD_LIST, MINIDUMP_MODULE_LIST,
+//!  - With a MINIDUMP_MEMORY_LIST, MINIDUMP_THREAD_LIST,
+//!    MINIDUMP_THREAD_NAME_LIST, MINIDUMP_MODULE_LIST,
 //!    MINIDUMP_MEMORY_INFO_LIST, MinidumpSimpleStringDictionary, or
 //!    MinidumpAnnotationList template parameter, template specializations
 //!    ensure that the size given by \a location matches the size expected of a
@@ -168,6 +197,14 @@ const T* MinidumpWritableAtLocationDescriptor(
   return TMinidumpWritableAtLocationDescriptor<T>(file_contents, location);
 }
 
+//! \brief 64-bit specialization of MinidumpWritableAtLocationDescriptor.
+template <typename T>
+const T* MinidumpWritableAtLocationDescriptor(
+    const std::string& file_contents,
+    const MINIDUMP_LOCATION_DESCRIPTOR64& location) {
+  return TMinidumpWritableAtLocationDescriptor<T>(file_contents, location);
+}
+
 template <>
 const IMAGE_DEBUG_MISC* MinidumpWritableAtLocationDescriptor<IMAGE_DEBUG_MISC>(
     const std::string& file_contents,
@@ -202,6 +239,12 @@ MinidumpWritableAtLocationDescriptor<MINIDUMP_THREAD_LIST>(
     const std::string& file_contents,
     const MINIDUMP_LOCATION_DESCRIPTOR& location);
 
+template <>
+const MINIDUMP_THREAD_NAME_LIST*
+MinidumpWritableAtLocationDescriptor<MINIDUMP_THREAD_NAME_LIST>(
+    const std::string& file_contents,
+    const MINIDUMP_LOCATION_DESCRIPTOR& location);
+
 template <>
 const MINIDUMP_HANDLE_DATA_STREAM*
 MinidumpWritableAtLocationDescriptor<MINIDUMP_HANDLE_DATA_STREAM>(
@@ -270,6 +313,15 @@ const T* MinidumpWritableAtRVA(const std::string& file_contents, RVA rva) {
   return MinidumpWritableAtLocationDescriptor<T>(file_contents, location);
 }
 
+//! \brief 64-bit specialization of MinidumpWritableAtRVA.
+template <typename T>
+const T* MinidumpWritableAtRVA(const std::string& file_contents, RVA64 rva) {
+  MINIDUMP_LOCATION_DESCRIPTOR64 location;
+  location.DataSize = sizeof(T);
+  location.Rva = rva;
+  return MinidumpWritableAtLocationDescriptor<T>(file_contents, location);
+}
+
 //! \brief An internal::MinidumpWritable that carries a `uint32_t` for testing.
 class TestUInt32MinidumpWritable final : public internal::MinidumpWritable {
  public:
diff --git a/extern/crashpad/crashpad/navbar.md b/extern/crashpad/crashpad/navbar.md
index d530414f09..ca6360367e 100644
--- a/extern/crashpad/crashpad/navbar.md
+++ b/extern/crashpad/crashpad/navbar.md
@@ -1,5 +1,5 @@
 <!--
-Copyright 2016 The Crashpad Authors. All rights reserved.
+Copyright 2016 The Crashpad Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/package.h b/extern/crashpad/crashpad/package.h
index e170dec984..df2932c62f 100644
--- a/extern/crashpad/crashpad/package.h
+++ b/extern/crashpad/crashpad/package.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/BUILD.gn b/extern/crashpad/crashpad/snapshot/BUILD.gn
index 8b26e14a5a..5ae9c1018f 100644
--- a/extern/crashpad/crashpad/snapshot/BUILD.gn
+++ b/extern/crashpad/crashpad/snapshot/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2015 The Crashpad Authors. All rights reserved.
+# Copyright 2015 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -128,6 +128,8 @@ crashpad_static_library("snapshot") {
 
   if (crashpad_is_linux || crashpad_is_android) {
     sources += [
+      "linux/capture_memory_delegate_linux.cc",
+      "linux/capture_memory_delegate_linux.h",
       "linux/cpu_context_linux.cc",
       "linux/cpu_context_linux.h",
       "linux/debug_rendezvous.cc",
@@ -244,15 +246,14 @@ crashpad_static_library("snapshot") {
   public_deps = [ ":context" ]
 
   deps = [
+    "$mini_chromium_source_parent:base",
     "../client:common",
     "../compat",
     "../minidump:format",
-    "$mini_chromium_source_parent:base",
     "../util",
   ]
 
   if (crashpad_is_win) {
-    deps += [ "../client" ]
     cflags = [ "/wd4201" ]  # nonstandard extension used : nameless struct/union
     libs = [ "powrprof.lib" ]
   }
@@ -285,7 +286,7 @@ if (crashpad_is_linux) {
     deps = [
       ":snapshot",
       "$mini_chromium_source_parent:base",
-      "../util:util",
+      "../util",
     ]
     seed_corpus = "elf/elf_image_reader_fuzzer_corpus"
   }
@@ -318,8 +319,8 @@ static_library("test_support") {
   public_deps = [ ":snapshot" ]
 
   deps = [
-    "../compat",
     "$mini_chromium_source_parent:base",
+    "../compat",
     "../util",
   ]
 
@@ -362,6 +363,7 @@ source_set("snapshot_test") {
 
   if (crashpad_is_ios) {
     sources += [
+      "ios/memory_snapshot_ios_intermediate_dump_test.cc",
       "ios/process_snapshot_ios_intermediate_dump_test.cc",
       "mac/cpu_context_mac_test.cc",
     ]
@@ -429,22 +431,21 @@ source_set("snapshot_test") {
 
   deps = [
     ":test_support",
+    "$mini_chromium_source_parent:base",
     "../client:common",
     "../compat",
     "../minidump:format",
     "../test",
+    "../third_party/googletest",
     "../third_party/googletest:googlemock",
-    "../third_party/googletest:googletest",
-    "$mini_chromium_source_parent:base",
     "../util",
   ]
 
-  if (crashpad_is_win) {
-    deps += [ "../client" ]
-  }
-
   if (crashpad_is_ios) {
-    deps += [ "../minidump" ]
+    deps += [
+      ":snapshot_test_ios_data",
+      "../minidump",
+    ]
   }
 
   data_deps = [
@@ -485,13 +486,31 @@ source_set("snapshot_test") {
   }
 }
 
+bundle_data("snapshot_test_ios_data") {
+  testonly = true
+
+  sources = [
+    "ios/testdata/crash-1fa088dda0adb41459d063078a0f384a0bb8eefa",
+    "ios/testdata/crash-5726011582644224",
+    "ios/testdata/crash-6605504629637120",
+    "ios/testdata/crash-c44acfcbccd8c7a8",
+  ]
+
+  outputs = [ "{{bundle_resources_dir}}/crashpad_test_data/" +
+              "{{source_root_relative_dir}}/{{source_file_part}}" ]
+}
 crashpad_loadable_module("crashpad_snapshot_test_module") {
   testonly = true
   sources = [ "crashpad_info_client_options_test_module.cc" ]
   deps = [
-    "../client",
     "$mini_chromium_source_parent:base",
+    "../client",
   ]
+  if (crashpad_is_in_fuchsia) {
+    # TODO(fxbug.dev/42059784): Remove this once the underlying issue is
+    # addressed.
+    exclude_toolchain_tags = [ "hwasan" ]
+  }
 }
 
 crashpad_loadable_module("crashpad_snapshot_test_module_large") {
@@ -506,6 +525,12 @@ crashpad_loadable_module("crashpad_snapshot_test_module_large") {
 
   defines = [ "CRASHPAD_INFO_SIZE_TEST_MODULE_LARGE" ]
   deps += [ "$mini_chromium_source_parent:base" ]
+
+  if (crashpad_is_in_fuchsia) {
+    # TODO(fxbug.dev/42059784): Remove this once the underlying issue is
+    # addressed.
+    exclude_toolchain_tags = [ "hwasan" ]
+  }
 }
 
 crashpad_loadable_module("crashpad_snapshot_test_module_small") {
@@ -520,6 +545,12 @@ crashpad_loadable_module("crashpad_snapshot_test_module_small") {
 
   defines = [ "CRASHPAD_INFO_SIZE_TEST_MODULE_SMALL" ]
   deps += [ "$mini_chromium_source_parent:base" ]
+
+  if (crashpad_is_in_fuchsia) {
+    # TODO(fxbug.dev/42059784): Remove this once the underlying issue is
+    # addressed.
+    exclude_toolchain_tags = [ "hwasan" ]
+  }
 }
 
 if ((crashpad_is_linux || crashpad_is_android || crashpad_is_fuchsia) &&
@@ -530,10 +561,16 @@ if ((crashpad_is_linux || crashpad_is_android || crashpad_is_fuchsia) &&
 
     # This makes `ld` emit both .hash and .gnu.hash sections.
     ldflags = [ "-Wl,--hash-style=both" ]
+
+    if (crashpad_is_in_fuchsia) {
+      # TODO(fxbug.dev/42059784): Remove this once the underlying issue is
+      # addressed.
+      exclude_toolchain_tags = [ "hwasan" ]
+    }
   }
 }
 
-if (crashpad_is_mac) {
+if (crashpad_is_apple) {
   crashpad_loadable_module("crashpad_snapshot_test_module_crashy_initializer") {
     testonly = true
     sources = [
@@ -552,9 +589,9 @@ if (crashpad_is_win) {
     testonly = true
     sources = [ "win/crashpad_snapshot_test_annotations.cc" ]
     deps = [
+      "$mini_chromium_source_parent:base",
       "../client",
       "../compat",
-      "$mini_chromium_source_parent:base",
     ]
   }
 
@@ -562,9 +599,9 @@ if (crashpad_is_win) {
     testonly = true
     sources = [ "win/crashpad_snapshot_test_crashing_child.cc" ]
     deps = [
+      "$mini_chromium_source_parent:base",
       "../client",
       "../compat",
-      "$mini_chromium_source_parent:base",
       "../util",
     ]
   }
@@ -573,9 +610,9 @@ if (crashpad_is_win) {
     testonly = true
     sources = [ "win/crashpad_snapshot_test_dump_without_crashing.cc" ]
     deps = [
+      "$mini_chromium_source_parent:base",
       "../client",
       "../compat",
-      "$mini_chromium_source_parent:base",
       "../util",
     ]
   }
@@ -584,9 +621,9 @@ if (crashpad_is_win) {
     testonly = true
     sources = [ "win/crashpad_snapshot_test_extra_memory_ranges.cc" ]
     deps = [
+      "$mini_chromium_source_parent:base",
       "../client",
       "../compat",
-      "$mini_chromium_source_parent:base",
     ]
   }
 
@@ -594,9 +631,9 @@ if (crashpad_is_win) {
     testonly = true
     sources = [ "win/crashpad_snapshot_test_image_reader.cc" ]
     deps = [
+      "$mini_chromium_source_parent:base",
       "../client",
       "../compat",
-      "$mini_chromium_source_parent:base",
       "../util",
     ]
     if (crashpad_is_in_chromium) {
@@ -613,8 +650,8 @@ if (crashpad_is_win) {
     testonly = true
     sources = [ "win/crashpad_snapshot_test_image_reader_module.cc" ]
     deps = [
-      "../client",
       "$mini_chromium_source_parent:base",
+      "../client",
     ]
     if (crashpad_is_in_chromium) {
       if (symbol_level == 0) {
diff --git a/extern/crashpad/crashpad/snapshot/annotation_snapshot.cc b/extern/crashpad/crashpad/snapshot/annotation_snapshot.cc
index c3350ec64b..d99e1aef67 100644
--- a/extern/crashpad/crashpad/snapshot/annotation_snapshot.cc
+++ b/extern/crashpad/crashpad/snapshot/annotation_snapshot.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/annotation_snapshot.h b/extern/crashpad/crashpad/snapshot/annotation_snapshot.h
index 11de475dd4..28005e9a62 100644
--- a/extern/crashpad/crashpad/snapshot/annotation_snapshot.h
+++ b/extern/crashpad/crashpad/snapshot/annotation_snapshot.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/capture_memory.cc b/extern/crashpad/crashpad/snapshot/capture_memory.cc
index 5c7ded46b1..f2ff5d74bb 100644
--- a/extern/crashpad/crashpad/snapshot/capture_memory.cc
+++ b/extern/crashpad/crashpad/snapshot/capture_memory.cc
@@ -1,4 +1,4 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
+// Copyright 2016 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,12 +15,17 @@
 #include "snapshot/capture_memory.h"
 
 #include <stdint.h>
+#include <windows.h>
 
+// dbghelp must be after windows.h.
+#include <dbghelp.h>
+
+#include <iterator>
 #include <limits>
-#include <memory>
 
-#include "base/cxx17_backports.h"
+#include "base/containers/heap_array.h"
 #include "base/logging.h"
+#include "build/build_config.h"
 #include "snapshot/memory_snapshot.h"
 
 namespace crashpad {
@@ -70,6 +75,7 @@ void CaptureMemory::PointedToByContext(const CPUContext& context,
                                        Delegate* delegate) {
 #if defined(ARCH_CPU_X86_FAMILY)
   if (context.architecture == kCPUArchitectureX86_64) {
+    MaybeCaptureMemoryAround(delegate, context.x86_64->rip);
     MaybeCaptureMemoryAround(delegate, context.x86_64->rax);
     MaybeCaptureMemoryAround(delegate, context.x86_64->rbx);
     MaybeCaptureMemoryAround(delegate, context.x86_64->rcx);
@@ -85,8 +91,9 @@ void CaptureMemory::PointedToByContext(const CPUContext& context,
     MaybeCaptureMemoryAround(delegate, context.x86_64->r13);
     MaybeCaptureMemoryAround(delegate, context.x86_64->r14);
     MaybeCaptureMemoryAround(delegate, context.x86_64->r15);
-    MaybeCaptureMemoryAround(delegate, context.x86_64->rip);
+    // Note: Shadow stack region is directly captured.
   } else {
+    MaybeCaptureMemoryAround(delegate, context.x86->eip);
     MaybeCaptureMemoryAround(delegate, context.x86->eax);
     MaybeCaptureMemoryAround(delegate, context.x86->ebx);
     MaybeCaptureMemoryAround(delegate, context.x86->ecx);
@@ -94,24 +101,28 @@ void CaptureMemory::PointedToByContext(const CPUContext& context,
     MaybeCaptureMemoryAround(delegate, context.x86->edi);
     MaybeCaptureMemoryAround(delegate, context.x86->esi);
     MaybeCaptureMemoryAround(delegate, context.x86->ebp);
-    MaybeCaptureMemoryAround(delegate, context.x86->eip);
   }
 #elif defined(ARCH_CPU_ARM_FAMILY)
   if (context.architecture == kCPUArchitectureARM64) {
     MaybeCaptureMemoryAround(delegate, context.arm64->pc);
-    for (size_t i = 0; i < base::size(context.arm64->regs); ++i) {
+    for (size_t i = 0; i < std::size(context.arm64->regs); ++i) {
       MaybeCaptureMemoryAround(delegate, context.arm64->regs[i]);
     }
   } else {
     MaybeCaptureMemoryAround(delegate, context.arm->pc);
-    for (size_t i = 0; i < base::size(context.arm->regs); ++i) {
+    for (size_t i = 0; i < std::size(context.arm->regs); ++i) {
       MaybeCaptureMemoryAround(delegate, context.arm->regs[i]);
     }
   }
 #elif defined(ARCH_CPU_MIPS_FAMILY)
-  for (size_t i = 0; i < base::size(context.mipsel->regs); ++i) {
+  for (size_t i = 0; i < std::size(context.mipsel->regs); ++i) {
     MaybeCaptureMemoryAround(delegate, context.mipsel->regs[i]);
   }
+#elif defined(ARCH_CPU_RISCV64)
+  MaybeCaptureMemoryAround(delegate, context.riscv64->pc);
+  for (size_t i = 0; i < std::size(context.riscv64->regs); ++i) {
+    MaybeCaptureMemoryAround(delegate, context.riscv64->regs[i]);
+  }
 #else
 #error Port.
 #endif
@@ -130,16 +141,16 @@ void CaptureMemory::PointedToByMemoryRange(const MemorySnapshot& memory,
     return;
   }
 
-  std::unique_ptr<uint8_t[]> buffer(new uint8_t[memory.Size()]);
-  if (!delegate->ReadMemory(memory.Address(), memory.Size(), buffer.get())) {
+  auto buffer = base::HeapArray<uint8_t>::Uninit(memory.Size());
+  if (!delegate->ReadMemory(memory.Address(), memory.Size(), buffer.data())) {
     LOG(ERROR) << "ReadMemory";
     return;
   }
 
   if (delegate->Is64Bit())
-    CaptureAtPointersInRange<uint64_t>(buffer.get(), memory.Size(), delegate);
+    CaptureAtPointersInRange<uint64_t>(buffer.data(), buffer.size(), delegate);
   else
-    CaptureAtPointersInRange<uint32_t>(buffer.get(), memory.Size(), delegate);
+    CaptureAtPointersInRange<uint32_t>(buffer.data(), buffer.size(), delegate);
 }
 
 }  // namespace internal
diff --git a/extern/crashpad/crashpad/snapshot/capture_memory.h b/extern/crashpad/crashpad/snapshot/capture_memory.h
index c4ca1f550c..9cfec52dae 100644
--- a/extern/crashpad/crashpad/snapshot/capture_memory.h
+++ b/extern/crashpad/crashpad/snapshot/capture_memory.h
@@ -1,4 +1,4 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
+// Copyright 2016 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/cpu_architecture.h b/extern/crashpad/crashpad/snapshot/cpu_architecture.h
index 811a720958..26d45f8412 100644
--- a/extern/crashpad/crashpad/snapshot/cpu_architecture.h
+++ b/extern/crashpad/crashpad/snapshot/cpu_architecture.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -43,7 +43,10 @@ enum CPUArchitecture {
   kCPUArchitectureMIPSEL,
 
   //! \brief 64-bit MIPSEL.
-  kCPUArchitectureMIPS64EL
+  kCPUArchitectureMIPS64EL,
+
+  //! \brief 64-bit RISC-V.
+  kCPUArchitectureRISCV64,
 };
 
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/snapshot/cpu_context.cc b/extern/crashpad/crashpad/snapshot/cpu_context.cc
index 643ad80f01..6b69edefd5 100644
--- a/extern/crashpad/crashpad/snapshot/cpu_context.cc
+++ b/extern/crashpad/crashpad/snapshot/cpu_context.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,8 +17,10 @@
 #include <stddef.h>
 #include <string.h>
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+
 #include "base/notreached.h"
+#include "cpu_architecture.h"
 #include "util/misc/arraysize.h"
 #include "util/misc/implicit_cast.h"
 
@@ -58,7 +60,7 @@ void CPUContextX86::FxsaveToFsave(const Fxsave& fxsave, Fsave* fsave) {
   fsave->reserved_4 = 0;
   static_assert(ArraySize(fsave->st) == ArraySize(fxsave.st_mm),
                 "FPU stack registers must be equivalent");
-  for (size_t index = 0; index < base::size(fsave->st); ++index) {
+  for (size_t index = 0; index < std::size(fsave->st); ++index) {
     memcpy(fsave->st[index], fxsave.st_mm[index].st, sizeof(fsave->st[index]));
   }
 }
@@ -80,7 +82,7 @@ void CPUContextX86::FsaveToFxsave(const Fsave& fsave, Fxsave* fxsave) {
   fxsave->mxcsr_mask = 0;
   static_assert(ArraySize(fxsave->st_mm) == ArraySize(fsave.st),
                 "FPU stack registers must be equivalent");
-  for (size_t index = 0; index < base::size(fsave.st); ++index) {
+  for (size_t index = 0; index < std::size(fsave.st); ++index) {
     memcpy(fxsave->st_mm[index].st, fsave.st[index], sizeof(fsave.st[index]));
     memset(fxsave->st_mm[index].st_reserved,
            0,
@@ -169,9 +171,10 @@ uint64_t CPUContext::InstructionPointer() const {
       return arm->pc;
     case kCPUArchitectureARM64:
       return arm64->pc;
+    case kCPUArchitectureRISCV64:
+      return riscv64->pc;
     default:
       NOTREACHED();
-      return ~0ull;
   }
 }
 
@@ -185,9 +188,36 @@ uint64_t CPUContext::StackPointer() const {
       return arm->sp;
     case kCPUArchitectureARM64:
       return arm64->sp;
+    case kCPUArchitectureRISCV64:
+      return riscv64->regs[1];
+    default:
+      NOTREACHED();
+  }
+}
+
+uint64_t CPUContext::ShadowStackPointer() const {
+  switch (architecture) {
+    case kCPUArchitectureX86:
+    case kCPUArchitectureARM:
+    case kCPUArchitectureARM64:
+      NOTREACHED();
+    case kCPUArchitectureX86_64:
+      return x86_64->xstate.cet_u.ssp;
+    default:
+      NOTREACHED();
+  }
+}
+
+bool CPUContext::HasShadowStack() const {
+  switch (architecture) {
+    case kCPUArchitectureX86:
+    case kCPUArchitectureARM:
+    case kCPUArchitectureARM64:
+      return false;
+    case kCPUArchitectureX86_64:
+      return x86_64->xstate.cet_u.cetmsr != 0;
     default:
       NOTREACHED();
-      return ~0ull;
   }
 }
 
@@ -196,6 +226,7 @@ bool CPUContext::Is64Bit() const {
     case kCPUArchitectureX86_64:
     case kCPUArchitectureARM64:
     case kCPUArchitectureMIPS64EL:
+    case kCPUArchitectureRISCV64:
       return true;
     case kCPUArchitectureX86:
     case kCPUArchitectureARM:
@@ -203,7 +234,6 @@ bool CPUContext::Is64Bit() const {
       return false;
     default:
       NOTREACHED();
-      return false;
   }
 }
 
diff --git a/extern/crashpad/crashpad/snapshot/cpu_context.h b/extern/crashpad/crashpad/snapshot/cpu_context.h
index fb23c4679f..c3640c328c 100644
--- a/extern/crashpad/crashpad/snapshot/cpu_context.h
+++ b/extern/crashpad/crashpad/snapshot/cpu_context.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -257,6 +257,16 @@ struct CPUContextX86_64 {
   uint64_t dr5;  // obsolete, normally an alias for dr7
   uint64_t dr6;
   uint64_t dr7;
+
+  struct {
+    // If 0 then none of the xsave areas are valid.
+    uint64_t enabled_features;
+    // CET_U registers if XSTATE_CET_U bit is set in enabled_features.
+    struct {
+      uint64_t cetmsr;
+      uint64_t ssp;
+    } cet_u;
+  } xstate;
 };
 
 //! \brief A context structure carrying ARM CPU state.
@@ -352,6 +362,15 @@ struct CPUContextMIPS64 {
   uint64_t fir;
 };
 
+//! \brief A context structure carrying RISCV64 CPU state.
+struct CPUContextRISCV64 {
+  uint64_t pc;
+  uint64_t regs[31];
+
+  uint64_t fpregs[32];
+  uint32_t fcsr;
+};
+
 //! \brief A context structure capable of carrying the context of any supported
 //!     CPU architecture.
 struct CPUContext {
@@ -369,9 +388,19 @@ struct CPUContext {
   //! context structure.
   uint64_t StackPointer() const;
 
+  //! \brief Returns the shadow stack pointer value from the context structure.
+  //!
+  //! This is a CPU architecture-independent method that is capable of
+  //! recovering the shadow stack pointer from any supported CPU architecture’s
+  //! context structure.
+  uint64_t ShadowStackPointer() const;
+
   //! \brief Returns `true` if this context is for a 64-bit architecture.
   bool Is64Bit() const;
 
+  //! \brief Returns `true` if this context has an active shadow stack pointer.
+  bool HasShadowStack() const;
+
   //! \brief The CPU architecture of a context structure. This field controls
   //!     the expression of the union.
   CPUArchitecture architecture;
@@ -382,6 +411,7 @@ struct CPUContext {
     CPUContextARM64* arm64;
     CPUContextMIPS* mipsel;
     CPUContextMIPS64* mips64;
+    CPUContextRISCV64* riscv64;
   };
 };
 
diff --git a/extern/crashpad/crashpad/snapshot/cpu_context_test.cc b/extern/crashpad/crashpad/snapshot/cpu_context_test.cc
index b1340d6ee1..21c048a5a9 100644
--- a/extern/crashpad/crashpad/snapshot/cpu_context_test.cc
+++ b/extern/crashpad/crashpad/snapshot/cpu_context_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,7 +18,8 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+
 #include "gtest/gtest.h"
 #include "test/hex_string.h"
 
@@ -124,7 +125,7 @@ TEST(CPUContextX86, FxsaveToFsave) {
       &fxsave.st_mm[6].st, kExponentAllZero, false, kFractionAllZero);
   SetX87Register(
       &fxsave.st_mm[7].st, kExponentNormal, true, kFractionNormal);  // valid
-  for (size_t index = 0; index < base::size(fxsave.st_mm); ++index) {
+  for (size_t index = 0; index < std::size(fxsave.st_mm); ++index) {
     memset(&fxsave.st_mm[index].st_reserved,
            0x5a,
            sizeof(fxsave.st_mm[index].st_reserved));
@@ -148,10 +149,10 @@ TEST(CPUContextX86, FxsaveToFsave) {
   EXPECT_EQ(fsave.fpu_dp, fxsave.fpu_dp);
   EXPECT_EQ(fsave.fpu_ds, fxsave.fpu_ds);
   EXPECT_EQ(fsave.reserved_4, 0);
-  for (size_t index = 0; index < base::size(fsave.st); ++index) {
-    EXPECT_EQ(BytesToHexString(fsave.st[index], base::size(fsave.st[index])),
+  for (size_t index = 0; index < std::size(fsave.st); ++index) {
+    EXPECT_EQ(BytesToHexString(fsave.st[index], std::size(fsave.st[index])),
               BytesToHexString(fxsave.st_mm[index].st,
-                               base::size(fxsave.st_mm[index].st)))
+                               std::size(fxsave.st_mm[index].st)))
         << "index " << index;
   }
 }
@@ -204,14 +205,14 @@ TEST(CPUContextX86, FsaveToFxsave) {
   EXPECT_EQ(fxsave.reserved_3, 0);
   EXPECT_EQ(fxsave.mxcsr, 0u);
   EXPECT_EQ(fxsave.mxcsr_mask, 0u);
-  for (size_t index = 0; index < base::size(fxsave.st_mm); ++index) {
+  for (size_t index = 0; index < std::size(fxsave.st_mm); ++index) {
     EXPECT_EQ(BytesToHexString(fxsave.st_mm[index].st,
-                               base::size(fxsave.st_mm[index].st)),
-              BytesToHexString(fsave.st[index], base::size(fsave.st[index])))
+                               std::size(fxsave.st_mm[index].st)),
+              BytesToHexString(fsave.st[index], std::size(fsave.st[index])))
         << "index " << index;
     EXPECT_EQ(BytesToHexString(fxsave.st_mm[index].st_reserved,
-                               base::size(fxsave.st_mm[index].st_reserved)),
-              std::string(base::size(fxsave.st_mm[index].st_reserved) * 2, '0'))
+                               std::size(fxsave.st_mm[index].st_reserved)),
+              std::string(std::size(fxsave.st_mm[index].st_reserved) * 2, '0'))
         << "index " << index;
   }
   size_t unused_len = sizeof(fxsave) - offsetof(decltype(fxsave), xmm);
@@ -318,7 +319,7 @@ TEST(CPUContextX86, FxsaveToFsaveTagWord) {
   // In this set, everything is valid.
   fsw = 0 << 11;  // top = 0: logical 0-7 maps to physical 0-7
   fxsave_tag = 0xff;  // nothing empty
-  for (size_t index = 0; index < base::size(st_mm); ++index) {
+  for (size_t index = 0; index < std::size(st_mm); ++index) {
     SetX87OrMMXRegister(&st_mm[index], kExponentNormal, true, kFractionAllZero);
   }
   EXPECT_EQ(CPUContextX86::FxsaveToFsaveTagWord(fsw, fxsave_tag, st_mm), 0);
diff --git a/extern/crashpad/crashpad/snapshot/crashpad_info_client_options.cc b/extern/crashpad/crashpad/snapshot/crashpad_info_client_options.cc
index 3a88a4c01f..c44d5b6326 100644
--- a/extern/crashpad/crashpad/snapshot/crashpad_info_client_options.cc
+++ b/extern/crashpad/crashpad/snapshot/crashpad_info_client_options.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/crashpad_info_client_options.h b/extern/crashpad/crashpad/snapshot/crashpad_info_client_options.h
index 89c947a6ce..ff434d08d8 100644
--- a/extern/crashpad/crashpad/snapshot/crashpad_info_client_options.h
+++ b/extern/crashpad/crashpad/snapshot/crashpad_info_client_options.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/crashpad_info_client_options_test.cc b/extern/crashpad/crashpad/snapshot/crashpad_info_client_options_test.cc
index f5baa5bc68..005dfd590a 100644
--- a/extern/crashpad/crashpad/snapshot/crashpad_info_client_options_test.cc
+++ b/extern/crashpad/crashpad/snapshot/crashpad_info_client_options_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -24,13 +24,13 @@
 #include "test/scoped_module_handle.h"
 #include "test/test_paths.h"
 
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
 #include <dlfcn.h>
 #include "snapshot/mac/process_snapshot_mac.h"
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 #include <windows.h>
 #include "snapshot/win/process_snapshot_win.h"
-#elif defined(OS_FUCHSIA)
+#elif BUILDFLAG(IS_FUCHSIA)
 #include <lib/zx/process.h>
 #include "snapshot/fuchsia/process_snapshot_fuchsia.h"
 #endif
@@ -79,19 +79,19 @@ class ScopedUnsetCrashpadInfoOptions {
 };
 
 CrashpadInfoClientOptions SelfProcessSnapshotAndGetCrashpadOptions() {
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
   ProcessSnapshotMac process_snapshot;
   EXPECT_TRUE(process_snapshot.Initialize(mach_task_self()));
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   ProcessSnapshotWin process_snapshot;
   EXPECT_TRUE(process_snapshot.Initialize(
       GetCurrentProcess(), ProcessSuspensionState::kRunning, 0, 0));
-#elif defined(OS_FUCHSIA)
+#elif BUILDFLAG(IS_FUCHSIA)
   ProcessSnapshotFuchsia process_snapshot;
   EXPECT_TRUE(process_snapshot.Initialize(*zx::process::self()));
 #else
 #error Port.
-#endif  // OS_APPLE
+#endif  // BUILDFLAG(IS_APPLE)
 
   CrashpadInfoClientOptions options;
   process_snapshot.GetCrashpadOptions(&options);
@@ -144,7 +144,7 @@ TEST(CrashpadInfoClientOptions, OneModule) {
     EXPECT_EQ(options.crashpad_handler_behavior, TriState::kUnset);
     EXPECT_EQ(options.system_crash_reporter_forwarding, TriState::kUnset);
     EXPECT_EQ(options.gather_indirectly_referenced_memory, TriState::kEnabled);
-    EXPECT_EQ(options.indirectly_referenced_memory_cap, 1234u);
+    EXPECT_LE(options.indirectly_referenced_memory_cap, 1234u);
   }
 }
 
@@ -154,19 +154,19 @@ TEST(CrashpadInfoClientOptions, TwoModules) {
       TestPaths::BuildArtifact(FILE_PATH_LITERAL("snapshot"),
                                FILE_PATH_LITERAL("module"),
                                TestPaths::FileType::kLoadableModule);
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
   ScopedModuleHandle module(
       dlopen(module_path.value().c_str(), RTLD_LAZY | RTLD_LOCAL));
   ASSERT_TRUE(module.valid()) << "dlopen " << module_path.value() << ": "
                               << dlerror();
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   ScopedModuleHandle module(LoadLibrary(module_path.value().c_str()));
   ASSERT_TRUE(module.valid())
       << "LoadLibrary " << base::WideToUTF8(module_path.value()) << ": "
       << ErrorMessage();
 #else
 #error Port.
-#endif  // OS_APPLE
+#endif  // BUILDFLAG(IS_POSIX)
 
   // Get the function pointer from the module. This wraps GetCrashpadInfo(), but
   // because it runs in the module, it returns the remote module’s CrashpadInfo
@@ -241,6 +241,22 @@ TEST(CrashpadInfoClientOptions, TwoModules) {
 class CrashpadInfoSizes_ClientOptions
     : public testing::TestWithParam<base::FilePath::StringType> {};
 
+// UBSan detects a function type mismatch when calling
+// TestModule_GetCrashpadInfo since the expected function signature should
+// return a CrashpadInfo* but the actual TestModule_GetCrashpadInfo defined for
+// the test returns a TestCrashpadInfo*. CrashpadInfo is a struct with its
+// members set as private and TestCrashpadInfo is a POD meant to replicate the
+// layout of CrashpadInfo byte-for-byte. Note this is intentional since the
+// whole point of the test is to exercise the snapshot reader’s ability to
+// handle CrashpadInfo.
+#if defined(__clang__)
+[[clang::no_sanitize("function")]]
+#endif
+inline CrashpadInfo*
+CallGetCrashpadInfo(CrashpadInfo* (*func)()) {
+  return func();
+}
+
 TEST_P(CrashpadInfoSizes_ClientOptions, DifferentlySizedStruct) {
   base::FilePath::StringType artifact(FILE_PATH_LITERAL("module_"));
   artifact += GetParam();
@@ -252,19 +268,19 @@ TEST_P(CrashpadInfoSizes_ClientOptions, DifferentlySizedStruct) {
       TestPaths::BuildArtifact(FILE_PATH_LITERAL("snapshot"),
                                artifact,
                                TestPaths::FileType::kLoadableModule);
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
   ScopedModuleHandle module(
       dlopen(module_path.value().c_str(), RTLD_LAZY | RTLD_LOCAL));
   ASSERT_TRUE(module.valid())
       << "dlopen " << module_path.value() << ": " << dlerror();
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   ScopedModuleHandle module(LoadLibrary(module_path.value().c_str()));
   ASSERT_TRUE(module.valid())
       << "LoadLibrary " << base::WideToUTF8(module_path.value()) << ": "
       << ErrorMessage();
 #else
 #error Port.
-#endif  // OS_APPLE
+#endif  // BUILDFLAG(IS_POSIX)
 
   // Get the function pointer from the module.
   CrashpadInfo* (*TestModule_GetCrashpadInfo)() =
@@ -279,7 +295,8 @@ TEST_P(CrashpadInfoSizes_ClientOptions, DifferentlySizedStruct) {
   EXPECT_EQ(options.gather_indirectly_referenced_memory, TriState::kUnset);
 
   // Get the remote CrashpadInfo structure.
-  CrashpadInfo* remote_crashpad_info = TestModule_GetCrashpadInfo();
+  CrashpadInfo* remote_crashpad_info =
+      CallGetCrashpadInfo(TestModule_GetCrashpadInfo);
   ASSERT_TRUE(remote_crashpad_info);
 
   {
diff --git a/extern/crashpad/crashpad/snapshot/crashpad_info_client_options_test_module.cc b/extern/crashpad/crashpad/snapshot/crashpad_info_client_options_test_module.cc
index 357d35e659..3cbc089a3c 100644
--- a/extern/crashpad/crashpad/snapshot/crashpad_info_client_options_test_module.cc
+++ b/extern/crashpad/crashpad/snapshot/crashpad_info_client_options_test_module.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,12 +15,12 @@
 #include "build/build_config.h"
 #include "client/crashpad_info.h"
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 #define EXPORT __attribute__((visibility("default")))
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 #include <windows.h>
 #define EXPORT __declspec(dllexport)
-#endif  // OS_POSIX
+#endif  // BUILDFLAG(IS_POSIX)
 
 extern "C" {
 
@@ -40,8 +40,8 @@ EXPORT crashpad::CrashpadInfo* TestModule_GetCrashpadInfo() {
 
 }  // extern "C"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) {
   return TRUE;
 }
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
diff --git a/extern/crashpad/crashpad/snapshot/crashpad_info_size_test_module.cc b/extern/crashpad/crashpad/snapshot/crashpad_info_size_test_module.cc
index 584f83b0b7..9ec736ef3b 100644
--- a/extern/crashpad/crashpad/snapshot/crashpad_info_size_test_module.cc
+++ b/extern/crashpad/crashpad/snapshot/crashpad_info_size_test_module.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,11 +16,11 @@
 
 #include "build/build_config.h"
 
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
 #include <mach-o/loader.h>
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 #include <windows.h>
-#endif  // OS_APPLE
+#endif  // BUILDFLAG(IS_APPLE)
 
 namespace crashpad {
 
@@ -53,6 +53,9 @@ struct TestCrashpadInfo {
 #if !defined(CRASHPAD_INFO_SIZE_TEST_MODULE_SMALL)
   void* user_data_minidump_stream_head_;
   void* annotations_list_;
+#if BUILDFLAG(IS_IOS)
+  void* intermediate_dump_extra_memory_ranges_;
+#endif  // BUILDFLAG(IS_IOS)
 #endif  // CRASHPAD_INFO_SIZE_TEST_MODULE_SMALL
 #if defined(CRASHPAD_INFO_SIZE_TEST_MODULE_LARGE)
   uint8_t trailer_[64 * 1024];
@@ -65,9 +68,9 @@ struct TestCrashpadInfo {
 // to get this test version to be interpreted as a genuine CrashpadInfo
 // structure. The size is set to the actual size of this structure (that’s kind
 // of the point of this test).
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 __attribute__((
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
     section(SEG_DATA ",crashpad_info"),
 #endif
 #if defined(ADDRESS_SANITIZER)
@@ -75,12 +78,12 @@ __attribute__((
 #endif  // defined(ADDRESS_SANITIZER)
     visibility("hidden"),
     used))
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 #pragma section("CPADinfo", read, write)
 __declspec(allocate("CPADinfo"))
-#else  // !defined(OS_POSIX) && !defined(OS_WIN)
+#else  // !BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_WIN)
 #error Port
-#endif  // !defined(OS_POSIX) && !defined(OS_WIN)
+#endif  // !BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_WIN)
 TestCrashpadInfo g_test_crashpad_info = {'CPad',
                                          sizeof(TestCrashpadInfo),
                                          1,
@@ -95,6 +98,10 @@ TestCrashpadInfo g_test_crashpad_info = {'CPad',
 #if !defined(CRASHPAD_INFO_SIZE_TEST_MODULE_SMALL)
                                          nullptr,
                                          nullptr,
+#if BUILDFLAG(IS_IOS)
+                                         nullptr,
+#endif  // BUILDFLAG(IS_IOS)
+
 #endif  // CRASHPAD_INFO_SIZE_TEST_MODULE_SMALL
 #if defined(CRASHPAD_INFO_SIZE_TEST_MODULE_LARGE)
                                          {}
@@ -105,14 +112,15 @@ TestCrashpadInfo g_test_crashpad_info = {'CPad',
 
 extern "C" {
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 __attribute__((visibility("default")))
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 __declspec(dllexport)
 #else
 #error Port
-#endif  // OS_POSIX
-crashpad::TestCrashpadInfo* TestModule_GetCrashpadInfo() {
+#endif  // BUILDFLAG(IS_POSIX)
+crashpad::TestCrashpadInfo*
+TestModule_GetCrashpadInfo() {
   // Note that there's no need to do the back-reference here to the note on
   // POSIX like CrashpadInfo::GetCrashpadInfo() because the note .S file is
   // directly included into this test binary.
@@ -121,8 +129,8 @@ crashpad::TestCrashpadInfo* TestModule_GetCrashpadInfo() {
 
 }  // extern "C"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) {
   return TRUE;
 }
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
diff --git a/extern/crashpad/crashpad/snapshot/crashpad_info_size_test_note.S b/extern/crashpad/crashpad/snapshot/crashpad_info_size_test_note.S
index 16b5d499d7..00cf7bc1f5 100644
--- a/extern/crashpad/crashpad/snapshot/crashpad_info_size_test_note.S
+++ b/extern/crashpad/crashpad/snapshot/crashpad_info_size_test_note.S
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 // that symbol to be in the dynamic symbol table.
 
 #include "util/misc/elf_note_types.h"
+#include "util/misc/arm64_pac_bti.S"
 
 // namespace crashpad {
 // CrashpadInfo g_test_crashpad_info;
diff --git a/extern/crashpad/crashpad/snapshot/crashpad_types/crashpad_info_reader.cc b/extern/crashpad/crashpad/snapshot/crashpad_types/crashpad_info_reader.cc
index cedab59a72..9c8ca085a3 100644
--- a/extern/crashpad/crashpad/snapshot/crashpad_types/crashpad_info_reader.cc
+++ b/extern/crashpad/crashpad/snapshot/crashpad_types/crashpad_info_reader.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,11 +20,11 @@
 #include "client/crashpad_info.h"
 #include "util/misc/as_underlying_type.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include "util/win/traits.h"
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
 #include "util/linux/traits.h"
-#elif defined(OS_FUCHSIA)
+#elif BUILDFLAG(IS_FUCHSIA)
 #include "util/fuchsia/traits.h"
 #endif
 
diff --git a/extern/crashpad/crashpad/snapshot/crashpad_types/crashpad_info_reader.h b/extern/crashpad/crashpad/snapshot/crashpad_types/crashpad_info_reader.h
index 9494522f72..22299c9f28 100644
--- a/extern/crashpad/crashpad/snapshot/crashpad_types/crashpad_info_reader.h
+++ b/extern/crashpad/crashpad/snapshot/crashpad_types/crashpad_info_reader.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/crashpad_types/crashpad_info_reader_test.cc b/extern/crashpad/crashpad/snapshot/crashpad_types/crashpad_info_reader_test.cc
index 3a1806a383..a0dc7bfe17 100644
--- a/extern/crashpad/crashpad/snapshot/crashpad_types/crashpad_info_reader_test.cc
+++ b/extern/crashpad/crashpad/snapshot/crashpad_types/crashpad_info_reader_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@
 #include "util/misc/from_pointer_cast.h"
 #include "util/process/process_memory_native.h"
 
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 #include "test/linux/fake_ptrace_connection.h"
 #endif
 
@@ -109,7 +109,7 @@ void ExpectCrashpadInfo(ProcessType process,
                         VMAddress extra_memory_address,
                         VMAddress simple_annotations_address,
                         VMAddress annotations_list_address) {
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
   FakePtraceConnection connection;
   ASSERT_TRUE(connection.Initialize(process));
   ProcessMemoryLinux memory(&connection);
diff --git a/extern/crashpad/crashpad/snapshot/crashpad_types/image_annotation_reader.cc b/extern/crashpad/crashpad/snapshot/crashpad_types/image_annotation_reader.cc
index bd904979f1..b95a8a8b36 100644
--- a/extern/crashpad/crashpad/snapshot/crashpad_types/image_annotation_reader.cc
+++ b/extern/crashpad/crashpad/snapshot/crashpad_types/image_annotation_reader.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -26,7 +26,11 @@
 #include "client/annotation_list.h"
 #include "client/simple_string_dictionary.h"
 #include "snapshot/snapshot_constants.h"
+#if BUILDFLAG(IS_FUCHSIA)
+#include "util/fuchsia/traits.h"
+#else
 #include "util/linux/traits.h"
+#endif
 
 namespace crashpad {
 
@@ -39,6 +43,8 @@ struct Annotation {
   typename Traits::Address value;
   uint32_t size;
   uint16_t type;
+  crashpad::Annotation::ConcurrentAccessGuardMode concurrent_access_guard_mode;
+  bool spin_guard_state;
 };
 
 template <class Traits>
diff --git a/extern/crashpad/crashpad/snapshot/crashpad_types/image_annotation_reader.h b/extern/crashpad/crashpad/snapshot/crashpad_types/image_annotation_reader.h
index f7bb512573..b74bc84a2c 100644
--- a/extern/crashpad/crashpad/snapshot/crashpad_types/image_annotation_reader.h
+++ b/extern/crashpad/crashpad/snapshot/crashpad_types/image_annotation_reader.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/crashpad_types/image_annotation_reader_test.cc b/extern/crashpad/crashpad/snapshot/crashpad_types/image_annotation_reader_test.cc
index b5289e7a7f..d4eabe55b0 100644
--- a/extern/crashpad/crashpad/snapshot/crashpad_types/image_annotation_reader_test.cc
+++ b/extern/crashpad/crashpad/snapshot/crashpad_types/image_annotation_reader_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@
 #include "util/misc/from_pointer_cast.h"
 #include "util/process/process_memory_native.h"
 
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 #include "test/linux/fake_ptrace_connection.h"
 #endif
 
@@ -94,7 +94,7 @@ void ExpectAnnotations(ProcessType process,
                        bool is_64_bit,
                        VMAddress simple_map_address,
                        VMAddress annotation_list_address) {
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
   FakePtraceConnection connection;
   ASSERT_TRUE(connection.Initialize(process));
   ProcessMemoryLinux memory(&connection);
diff --git a/extern/crashpad/crashpad/snapshot/elf/elf_dynamic_array_reader.cc b/extern/crashpad/crashpad/snapshot/elf/elf_dynamic_array_reader.cc
index a39712ac4c..d453e2be08 100644
--- a/extern/crashpad/crashpad/snapshot/elf/elf_dynamic_array_reader.cc
+++ b/extern/crashpad/crashpad/snapshot/elf/elf_dynamic_array_reader.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/elf/elf_dynamic_array_reader.h b/extern/crashpad/crashpad/snapshot/elf/elf_dynamic_array_reader.h
index f5cddf6f00..71d339a0da 100644
--- a/extern/crashpad/crashpad/snapshot/elf/elf_dynamic_array_reader.h
+++ b/extern/crashpad/crashpad/snapshot/elf/elf_dynamic_array_reader.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/elf/elf_image_reader.cc b/extern/crashpad/crashpad/snapshot/elf/elf_image_reader.cc
index 5ea14c0fe3..b0340e5fbd 100644
--- a/extern/crashpad/crashpad/snapshot/elf/elf_image_reader.cc
+++ b/extern/crashpad/crashpad/snapshot/elf/elf_image_reader.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 #include <utility>
 #include <vector>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/numerics/safe_math.h"
 #include "build/build_config.h"
@@ -56,14 +57,14 @@ template <typename PhdrType>
 class ElfImageReader::ProgramHeaderTableSpecific
     : public ElfImageReader::ProgramHeaderTable {
  public:
-  ProgramHeaderTableSpecific<PhdrType>() {}
+  ProgramHeaderTableSpecific() {}
 
-  ProgramHeaderTableSpecific<PhdrType>(
+  ProgramHeaderTableSpecific(
       const ProgramHeaderTableSpecific<PhdrType>&) = delete;
   ProgramHeaderTableSpecific<PhdrType>& operator=(
       const ProgramHeaderTableSpecific<PhdrType>&) = delete;
 
-  ~ProgramHeaderTableSpecific<PhdrType>() {}
+  ~ProgramHeaderTableSpecific() {}
 
   bool Initialize(const ProcessMemoryRange& memory,
                   VMAddress address,
@@ -733,13 +734,16 @@ bool ElfImageReader::GetAddressFromDynamicArray(uint64_t tag,
   if (!dynamic_array_->GetValue(tag, log, address)) {
     return false;
   }
-#if defined(OS_ANDROID) || defined(OS_FUCHSIA)
-  // The GNU loader updates the dynamic array according to the load bias.
+
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
+    (defined(__GLIBC__) && defined(ARCH_CPU_RISCV64))
+  // The GNU loader updates the dynamic array according to the load bias (except
+  // for RISC-V: https://sourceware.org/bugzilla/show_bug.cgi?id=24484).
   // The Android and Fuchsia loaders only update the debug address.
   if (tag != DT_DEBUG) {
     *address += GetLoadBias();
   }
-#endif  // OS_ANDROID
+#endif  // BUILDFLAG(IS_ANDROID)
   return true;
 }
 
diff --git a/extern/crashpad/crashpad/snapshot/elf/elf_image_reader.h b/extern/crashpad/crashpad/snapshot/elf/elf_image_reader.h
index 1fd399fc41..8a870dc0d9 100644
--- a/extern/crashpad/crashpad/snapshot/elf/elf_image_reader.h
+++ b/extern/crashpad/crashpad/snapshot/elf/elf_image_reader.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/elf/elf_image_reader_fuzzer.cc b/extern/crashpad/crashpad/snapshot/elf/elf_image_reader_fuzzer.cc
index b780af4e13..3a5b16c2cc 100644
--- a/extern/crashpad/crashpad/snapshot/elf/elf_image_reader_fuzzer.cc
+++ b/extern/crashpad/crashpad/snapshot/elf/elf_image_reader_fuzzer.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/elf/elf_image_reader_fuzzer_corpus/.gitattributes b/extern/crashpad/crashpad/snapshot/elf/elf_image_reader_fuzzer_corpus/.gitattributes
index 69463d1368..89849ddd9e 100644
--- a/extern/crashpad/crashpad/snapshot/elf/elf_image_reader_fuzzer_corpus/.gitattributes
+++ b/extern/crashpad/crashpad/snapshot/elf/elf_image_reader_fuzzer_corpus/.gitattributes
@@ -1,4 +1,4 @@
-# Copyright 2019 The Crashpad Authors. All rights reserved.
+# Copyright 2019 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/elf/elf_image_reader_test.cc b/extern/crashpad/crashpad/snapshot/elf/elf_image_reader_test.cc
index 2ea55ad10b..1e3ab29c55 100644
--- a/extern/crashpad/crashpad/snapshot/elf/elf_image_reader_test.cc
+++ b/extern/crashpad/crashpad/snapshot/elf/elf_image_reader_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -30,12 +30,12 @@
 #include "util/misc/from_pointer_cast.h"
 #include "util/process/process_memory_native.h"
 
-#if defined(OS_FUCHSIA)
+#if BUILDFLAG(IS_FUCHSIA)
 #include <lib/zx/process.h>
 
 #include "base/fuchsia/fuchsia_logging.h"
 
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
 
 #include "test/linux/fake_ptrace_connection.h"
 #include "util/linux/auxiliary_vector.h"
@@ -45,7 +45,7 @@
 
 #error Port.
 
-#endif  // OS_FUCHSIA
+#endif  // BUILDFLAG(IS_FUCHSIA)
 
 extern "C" {
 __attribute__((visibility("default"))) void ElfImageReaderTestExportedSymbol() {
@@ -56,8 +56,7 @@ namespace crashpad {
 namespace test {
 namespace {
 
-
-#if defined(OS_FUCHSIA)
+#if BUILDFLAG(IS_FUCHSIA)
 
 void LocateExecutable(const ProcessType& process,
                       ProcessMemory* memory,
@@ -84,7 +83,7 @@ void LocateExecutable(const ProcessType& process,
   *elf_address = base;
 }
 
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
 
 void LocateExecutable(PtraceConnection* connection,
                       ProcessMemory* memory,
@@ -104,7 +103,7 @@ void LocateExecutable(PtraceConnection* connection,
   *elf_address = possible_mappings->Next()->range.Base();
 }
 
-#endif  // OS_FUCHSIA
+#endif  // BUILDFLAG(IS_FUCHSIA)
 
 void ExpectSymbol(ElfImageReader* reader,
                   const std::string& symbol_name,
@@ -128,12 +127,12 @@ void ReadThisExecutableInTarget(ProcessType process,
 #endif  // ARCH_CPU_64_BITS
 
   VMAddress elf_address;
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
   FakePtraceConnection connection;
   ASSERT_TRUE(connection.Initialize(process));
   ProcessMemoryLinux memory(&connection);
   LocateExecutable(&connection, &memory, &elf_address);
-#elif defined(OS_FUCHSIA)
+#elif BUILDFLAG(IS_FUCHSIA)
   ProcessMemoryFuchsia memory;
   ASSERT_TRUE(memory.Initialize(process));
   LocateExecutable(process, &memory, &elf_address);
@@ -192,7 +191,7 @@ void ReadLibcInTarget(ProcessType process,
   constexpr bool am_64_bit = false;
 #endif  // ARCH_CPU_64_BITS
 
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
   FakePtraceConnection connection;
   ASSERT_TRUE(connection.Initialize(process));
   ProcessMemoryLinux memory(&connection);
@@ -301,7 +300,7 @@ TEST(ElfImageReader, OneModuleChild) {
   test.Run();
 }
 
-#if defined(OS_FUCHSIA)
+#if BUILDFLAG(IS_FUCHSIA)
 
 // crashpad_snapshot_test_both_dt_hash_styles is specially built and forced to
 // include both .hash and .gnu.hash sections. Linux, Android, and Fuchsia have
@@ -356,7 +355,7 @@ TEST(ElfImageReader, DtHashAndDtGnuHashMatch) {
   EXPECT_EQ(from_dt_hash, from_dt_gnu_hash);
 }
 
-#endif  // OS_FUCHSIA
+#endif  // BUILDFLAG(IS_FUCHSIA)
 
 }  // namespace
 }  // namespace test
diff --git a/extern/crashpad/crashpad/snapshot/elf/elf_image_reader_test_note.S b/extern/crashpad/crashpad/snapshot/elf/elf_image_reader_test_note.S
index 9ab0338977..2d5421932e 100644
--- a/extern/crashpad/crashpad/snapshot/elf/elf_image_reader_test_note.S
+++ b/extern/crashpad/crashpad/snapshot/elf/elf_image_reader_test_note.S
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 #include "util/misc/elf_note_types.h"
+#include "util/misc/arm64_pac_bti.S"
 
 #define NOTE_ALIGN 4
   .section .note.crashpad.test,"a",%note
diff --git a/extern/crashpad/crashpad/snapshot/elf/elf_symbol_table_reader.cc b/extern/crashpad/crashpad/snapshot/elf/elf_symbol_table_reader.cc
index 5cdf5ba6f0..4c59d74599 100644
--- a/extern/crashpad/crashpad/snapshot/elf/elf_symbol_table_reader.cc
+++ b/extern/crashpad/crashpad/snapshot/elf/elf_symbol_table_reader.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/elf/elf_symbol_table_reader.h b/extern/crashpad/crashpad/snapshot/elf/elf_symbol_table_reader.h
index 89f99e9af2..dff187d4b0 100644
--- a/extern/crashpad/crashpad/snapshot/elf/elf_symbol_table_reader.h
+++ b/extern/crashpad/crashpad/snapshot/elf/elf_symbol_table_reader.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/elf/module_snapshot_elf.cc b/extern/crashpad/crashpad/snapshot/elf/module_snapshot_elf.cc
index 037e7cdb78..dfff9f11de 100644
--- a/extern/crashpad/crashpad/snapshot/elf/module_snapshot_elf.cc
+++ b/extern/crashpad/crashpad/snapshot/elf/module_snapshot_elf.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/elf/module_snapshot_elf.h b/extern/crashpad/crashpad/snapshot/elf/module_snapshot_elf.h
index 86741b3e1b..ef2ea5f90b 100644
--- a/extern/crashpad/crashpad/snapshot/elf/module_snapshot_elf.h
+++ b/extern/crashpad/crashpad/snapshot/elf/module_snapshot_elf.h
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/elf/test_exported_symbols.sym b/extern/crashpad/crashpad/snapshot/elf/test_exported_symbols.sym
index e0785c6e93..6fd09850e5 100644
--- a/extern/crashpad/crashpad/snapshot/elf/test_exported_symbols.sym
+++ b/extern/crashpad/crashpad/snapshot/elf/test_exported_symbols.sym
@@ -1,4 +1,4 @@
-# Copyright 2017 The Crashpad Authors. All rights reserved.
+# Copyright 2017 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/exception_snapshot.h b/extern/crashpad/crashpad/snapshot/exception_snapshot.h
index 11a941531b..da32d6c047 100644
--- a/extern/crashpad/crashpad/snapshot/exception_snapshot.h
+++ b/extern/crashpad/crashpad/snapshot/exception_snapshot.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/fuchsia/cpu_context_fuchsia.cc b/extern/crashpad/crashpad/snapshot/fuchsia/cpu_context_fuchsia.cc
index 226bfc6728..989bc463bd 100644
--- a/extern/crashpad/crashpad/snapshot/fuchsia/cpu_context_fuchsia.cc
+++ b/extern/crashpad/crashpad/snapshot/fuchsia/cpu_context_fuchsia.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,8 +21,9 @@ namespace internal {
 
 #if defined(ARCH_CPU_X86_64)
 
-void InitializeCPUContextX86_64_NoFloatingPoint(
+void InitializeCPUContextX86_64(
     const zx_thread_state_general_regs_t& thread_context,
+    const zx_thread_state_fp_regs_t& float_context,
     CPUContextX86_64* context) {
   memset(context, 0, sizeof(*context));
   context->rax = thread_context.rax;
@@ -43,6 +44,19 @@ void InitializeCPUContextX86_64_NoFloatingPoint(
   context->r15 = thread_context.r15;
   context->rip = thread_context.rip;
   context->rflags = thread_context.rflags;
+
+  context->fxsave.fcw = float_context.fcw;
+  context->fxsave.fsw = float_context.fsw;
+  context->fxsave.ftw = float_context.ftw;
+  context->fxsave.fop = float_context.fop;
+  context->fxsave.fpu_ip_64 = float_context.fip;
+  context->fxsave.fpu_dp_64 = float_context.fdp;
+
+  for (size_t i = 0; i < std::size(float_context.st); ++i) {
+    memcpy(&context->fxsave.st_mm[i],
+           &float_context.st[i],
+           sizeof(float_context.st[i]));
+  }
 }
 
 #elif defined(ARCH_CPU_ARM64)
@@ -89,6 +103,52 @@ void InitializeCPUContextARM64(
   memcpy(&context->fpsimd, &vector_context.v, sizeof(vector_context.v));
 }
 
+#elif defined(ARCH_CPU_RISCV64)
+
+void InitializeCPUContextRISCV64(
+    const zx_thread_state_general_regs_t& thread_context,
+    const zx_thread_state_fp_regs_t& float_context,
+    CPUContextRISCV64* context) {
+  context->pc = thread_context.pc;
+  context->regs[0] = thread_context.ra;
+  context->regs[1] = thread_context.sp;
+  context->regs[2] = thread_context.gp;
+  context->regs[3] = thread_context.tp;
+  context->regs[4] = thread_context.t0;
+  context->regs[5] = thread_context.t1;
+  context->regs[6] = thread_context.t2;
+  context->regs[7] = thread_context.s0;
+  context->regs[8] = thread_context.s1;
+  context->regs[9] = thread_context.a0;
+  context->regs[10] = thread_context.a1;
+  context->regs[11] = thread_context.a2;
+  context->regs[12] = thread_context.a3;
+  context->regs[13] = thread_context.a4;
+  context->regs[14] = thread_context.a5;
+  context->regs[15] = thread_context.a6;
+  context->regs[16] = thread_context.a7;
+  context->regs[17] = thread_context.s2;
+  context->regs[18] = thread_context.s3;
+  context->regs[19] = thread_context.s4;
+  context->regs[20] = thread_context.s5;
+  context->regs[21] = thread_context.s6;
+  context->regs[22] = thread_context.s7;
+  context->regs[23] = thread_context.s8;
+  context->regs[24] = thread_context.s9;
+  context->regs[25] = thread_context.s10;
+  context->regs[26] = thread_context.s11;
+  context->regs[27] = thread_context.t3;
+  context->regs[28] = thread_context.t4;
+  context->regs[29] = thread_context.t5;
+  context->regs[30] = thread_context.t6;
+
+  for (size_t i = 0; i < std::size(context->fpregs); ++i) {
+    context->fpregs[i] = float_context.q[i].low;
+  }
+
+  context->fcsr = float_context.fcsr;
+}
+
 #endif  // ARCH_CPU_X86_64
 
 }  // namespace internal
diff --git a/extern/crashpad/crashpad/snapshot/fuchsia/cpu_context_fuchsia.h b/extern/crashpad/crashpad/snapshot/fuchsia/cpu_context_fuchsia.h
index 9227bfc82d..5d4cd8e84b 100644
--- a/extern/crashpad/crashpad/snapshot/fuchsia/cpu_context_fuchsia.h
+++ b/extern/crashpad/crashpad/snapshot/fuchsia/cpu_context_fuchsia.h
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -29,13 +29,14 @@ namespace internal {
 //! \brief Initializes a CPUContextX86_64 structure from native context
 //!     structures on Fuchsia.
 //!
-//! Floating point registers are currently initialized to zero.
 //! Segment registers are currently initialized to zero.
 //!
 //! \param[in] thread_context The native thread context.
+//! \param[in] float_context The native floating point context.
 //! \param[out] context The CPUContextX86_64 structure to initialize.
-void InitializeCPUContextX86_64_NoFloatingPoint(
+void InitializeCPUContextX86_64(
     const zx_thread_state_general_regs_t& thread_context,
+    const zx_thread_state_fp_regs_t& float_context,
     CPUContextX86_64* context);
 
 #endif  // ARCH_CPU_X86_64 || DOXYGEN
@@ -56,6 +57,21 @@ void InitializeCPUContextARM64(
 
 #endif  // ARCH_CPU_ARM64 || DOXYGEN
 
+#if defined(ARCH_CPU_RISCV64) || DOXYGEN
+
+//! \brief Initializes a CPUContextRISCV64 structure from native context
+//!     structures on Fuchsia.
+//!
+//! \param[in] thread_context The native thread context.
+//! \param[in] float_context The native floating point context.
+//! \param[out] context The CPUContextRISCV64 structure to initialize.
+void InitializeCPUContextRISCV64(
+    const zx_thread_state_general_regs_t& thread_context,
+    const zx_thread_state_fp_regs_t& float_context,
+    CPUContextRISCV64* context);
+
+#endif  // ARCH_CPU_RISCV64 || DOXYGEN
+
 }  // namespace internal
 }  // namespace crashpad
 
diff --git a/extern/crashpad/crashpad/snapshot/fuchsia/exception_snapshot_fuchsia.cc b/extern/crashpad/crashpad/snapshot/fuchsia/exception_snapshot_fuchsia.cc
index 26077696d6..c595b92bde 100644
--- a/extern/crashpad/crashpad/snapshot/fuchsia/exception_snapshot_fuchsia.cc
+++ b/extern/crashpad/crashpad/snapshot/fuchsia/exception_snapshot_fuchsia.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -42,6 +42,8 @@ bool ExceptionSnapshotFuchsia::Initialize(
   exception_info_ = exception_report.context.arch.u.x86_64.err_code;
 #elif defined(ARCH_CPU_ARM64)
   exception_info_ = exception_report.context.arch.u.arm_64.esr;
+#elif defined(ARCH_CPU_RISCV64)
+  exception_info_ = exception_report.context.arch.u.riscv_64.cause;
 #endif
 
   codes_.push_back(exception_);
@@ -52,6 +54,8 @@ bool ExceptionSnapshotFuchsia::Initialize(
   codes_.push_back(exception_report.context.arch.u.x86_64.cr2);
 #elif defined(ARCH_CPU_ARM64)
   codes_.push_back(exception_report.context.arch.u.arm_64.far);
+#elif defined(ARCH_CPU_RISCV64)
+  codes_.push_back(exception_report.context.arch.u.riscv_64.tval);
 #endif
 
   const auto threads = process_reader->Threads();
@@ -70,14 +74,19 @@ bool ExceptionSnapshotFuchsia::Initialize(
 #if defined(ARCH_CPU_X86_64)
   context_.architecture = kCPUArchitectureX86_64;
   context_.x86_64 = &context_arch_;
-  // TODO(fxbug.dev/5496): Add float context once saved in |t|.
-  InitializeCPUContextX86_64_NoFloatingPoint(t->general_registers,
-                                             context_.x86_64);
+  // TODO(fxbug.dev/42132536): Add vector context.
+  InitializeCPUContextX86_64(
+      t->general_registers, t->fp_registers, context_.x86_64);
 #elif defined(ARCH_CPU_ARM64)
   context_.architecture = kCPUArchitectureARM64;
   context_.arm64 = &context_arch_;
   InitializeCPUContextARM64(
       t->general_registers, t->vector_registers, context_.arm64);
+#elif defined(ARCH_CPU_RISCV64)
+  context_.architecture = kCPUArchitectureRISCV64;
+  context_.riscv64 = &context_arch_;
+  InitializeCPUContextRISCV64(
+      t->general_registers, t->fp_registers, context_.riscv64);
 #else
 #error Port.
 #endif
@@ -92,6 +101,8 @@ bool ExceptionSnapshotFuchsia::Initialize(
     exception_address_ = exception_report.context.arch.u.x86_64.cr2;
 #elif defined(ARCH_CPU_ARM64)
     exception_address_ = exception_report.context.arch.u.arm_64.far;
+#elif defined(ARCH_CPU_RISCV64)
+    exception_address_ = exception_report.context.arch.u.riscv_64.tval;
 #else
 #error Port.
 #endif
diff --git a/extern/crashpad/crashpad/snapshot/fuchsia/exception_snapshot_fuchsia.h b/extern/crashpad/crashpad/snapshot/fuchsia/exception_snapshot_fuchsia.h
index 1b0a4e2396..2d9701f98d 100644
--- a/extern/crashpad/crashpad/snapshot/fuchsia/exception_snapshot_fuchsia.h
+++ b/extern/crashpad/crashpad/snapshot/fuchsia/exception_snapshot_fuchsia.h
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -69,6 +69,8 @@ class ExceptionSnapshotFuchsia final : public ExceptionSnapshot {
   CPUContextX86_64 context_arch_;
 #elif defined(ARCH_CPU_ARM64)
   CPUContextARM64 context_arch_;
+#elif defined(ARCH_CPU_RISCV64)
+  CPUContextRISCV64 context_arch_;
 #endif
   CPUContext context_;
   std::vector<uint64_t> codes_;
diff --git a/extern/crashpad/crashpad/snapshot/fuchsia/memory_map_fuchsia.cc b/extern/crashpad/crashpad/snapshot/fuchsia/memory_map_fuchsia.cc
index 1586792961..1f7fdedfc7 100644
--- a/extern/crashpad/crashpad/snapshot/fuchsia/memory_map_fuchsia.cc
+++ b/extern/crashpad/crashpad/snapshot/fuchsia/memory_map_fuchsia.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/fuchsia/memory_map_fuchsia.h b/extern/crashpad/crashpad/snapshot/fuchsia/memory_map_fuchsia.h
index 1c2736a712..5b48d51016 100644
--- a/extern/crashpad/crashpad/snapshot/fuchsia/memory_map_fuchsia.h
+++ b/extern/crashpad/crashpad/snapshot/fuchsia/memory_map_fuchsia.h
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/fuchsia/memory_map_region_snapshot_fuchsia.cc b/extern/crashpad/crashpad/snapshot/fuchsia/memory_map_region_snapshot_fuchsia.cc
index a5885b06c6..9c40ca9d63 100644
--- a/extern/crashpad/crashpad/snapshot/fuchsia/memory_map_region_snapshot_fuchsia.cc
+++ b/extern/crashpad/crashpad/snapshot/fuchsia/memory_map_region_snapshot_fuchsia.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,8 +14,9 @@
 
 #include "snapshot/fuchsia/memory_map_region_snapshot_fuchsia.h"
 
+#include <iterator>
+
 #include "base/check_op.h"
-#include "base/cxx17_backports.h"
 
 namespace crashpad {
 namespace internal {
@@ -50,7 +51,7 @@ uint32_t MmuFlagsToProtectFlags(zx_vm_option_t flags) {
 
   const uint32_t index =
       flags & (ZX_VM_PERM_READ | ZX_VM_PERM_WRITE | ZX_VM_PERM_EXECUTE);
-  DCHECK_LT(index, base::size(mapping));
+  DCHECK_LT(index, std::size(mapping));
 
   const uint32_t protect_flags = mapping[index];
   DCHECK_NE(protect_flags, 0u);
diff --git a/extern/crashpad/crashpad/snapshot/fuchsia/memory_map_region_snapshot_fuchsia.h b/extern/crashpad/crashpad/snapshot/fuchsia/memory_map_region_snapshot_fuchsia.h
index 37f7a1a777..e92a9a5038 100644
--- a/extern/crashpad/crashpad/snapshot/fuchsia/memory_map_region_snapshot_fuchsia.h
+++ b/extern/crashpad/crashpad/snapshot/fuchsia/memory_map_region_snapshot_fuchsia.h
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/fuchsia/process_reader_fuchsia.cc b/extern/crashpad/crashpad/snapshot/fuchsia/process_reader_fuchsia.cc
index 1c037d74bd..36aedb3aa5 100644
--- a/extern/crashpad/crashpad/snapshot/fuchsia/process_reader_fuchsia.cc
+++ b/extern/crashpad/crashpad/snapshot/fuchsia/process_reader_fuchsia.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,8 +16,10 @@
 
 #include <lib/zx/thread.h>
 #include <link.h>
+#include <zircon/status.h>
 #include <zircon/syscalls.h>
 
+#include "base/check_op.h"
 #include "base/fuchsia/fuchsia_logging.h"
 #include "base/logging.h"
 #include "util/fuchsia/koid_utilities.h"
@@ -40,18 +42,18 @@ void GetStackRegions(
   uint64_t sp;
 #if defined(ARCH_CPU_X86_64)
   sp = regs.rsp;
-#elif defined(ARCH_CPU_ARM64)
+#elif defined(ARCH_CPU_ARM64) || defined(ARCH_CPU_RISCV64)
   sp = regs.sp;
 #else
 #error Port
 #endif
 
-  // TODO(fxbug.dev/74897): make this work for stack overflows, e.g., by looking
-  // up using the initial stack pointer (sp) when the thread was created. Right
-  // now, it gets the stack by getting the mapping that contains the current sp.
-  // But in the case of stack overflows, the current sp is by definition outside
-  // of the stack so the mapping returned is not the stack and fails the type
-  // check, at least on arm64.
+  // TODO(fxbug.dev/42154629): make this work for stack overflows, e.g., by
+  // looking up using the initial stack pointer (sp) when the thread was
+  // created. Right now, it gets the stack by getting the mapping that contains
+  // the current sp. But in the case of stack overflows, the current sp is by
+  // definition outside of the stack so the mapping returned is not the stack
+  // and fails the type check, at least on arm64.
   zx_info_maps_t range_with_sp;
   if (!memory_map.FindMappingForAddress(sp, &range_with_sp)) {
     LOG(ERROR) << "stack pointer not found in mapping";
@@ -175,7 +177,8 @@ void ProcessReaderFuchsia::InitializeModules() {
   zx_status_t status = process_->get_property(
       ZX_PROP_PROCESS_DEBUG_ADDR, &debug_address, sizeof(debug_address));
   if (status != ZX_OK || debug_address == 0) {
-    LOG(ERROR) << "zx_object_get_property ZX_PROP_PROCESS_DEBUG_ADDR";
+    ZX_LOG(ERROR, status)
+        << "zx_object_get_property ZX_PROP_PROCESS_DEBUG_ADDR";
     return;
   }
 
@@ -234,8 +237,8 @@ void ProcessReaderFuchsia::InitializeModules() {
     // Crashpad needs to use the same module name at run time for symbol
     // resolution to work properly.
     //
-    // TODO(fuchsia/DX-1234): once Crashpad switches to elf-search, the
-    // following overwrites won't be necessary as only shared libraries will
+    // TODO: https://fxbug.dev/42138764 - once Crashpad switches to elf-search,
+    // the following overwrites won't be necessary as only shared libraries will
     // have a soname at runtime, just like at build time.
     //
     // * For shared libraries, the soname is used as module name at build time,
@@ -265,7 +268,6 @@ void ProcessReaderFuchsia::InitializeModules() {
     if (dsoname.empty()) {
       // This value must be kept in sync with what is used at build time to
       // index symbols for executables and loadable modules.
-      // See fuchsia/DX-1193 for more details.
       module.name = "<_>";
       module.type = ModuleSnapshot::kModuleTypeExecutable;
     } else {
@@ -346,6 +348,19 @@ void ProcessReaderFuchsia::InitializeThreads() {
         }
       }
 
+// Floating point registers are in the vector context for ARM.
+#if !defined(ARCH_CPU_ARM64)
+      zx_thread_state_fp_regs_t fp_regs;
+      status = thread_handles[i].read_state(
+          ZX_THREAD_STATE_FP_REGS, &fp_regs, sizeof(fp_regs));
+      if (status != ZX_OK) {
+        ZX_LOG(WARNING, status)
+            << "zx_thread_read_state(ZX_THREAD_STATE_FP_REGS)";
+      } else {
+        thread.fp_registers = fp_regs;
+      }
+#endif
+
       zx_thread_state_vector_regs_t vector_regs;
       status = thread_handles[i].read_state(
           ZX_THREAD_STATE_VECTOR_REGS, &vector_regs, sizeof(vector_regs));
diff --git a/extern/crashpad/crashpad/snapshot/fuchsia/process_reader_fuchsia.h b/extern/crashpad/crashpad/snapshot/fuchsia/process_reader_fuchsia.h
index b57f0b9efa..31e7886985 100644
--- a/extern/crashpad/crashpad/snapshot/fuchsia/process_reader_fuchsia.h
+++ b/extern/crashpad/crashpad/snapshot/fuchsia/process_reader_fuchsia.h
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -76,6 +76,10 @@ class ProcessReaderFuchsia {
     //!     returned by `zx_thread_read_state()`.
     zx_thread_state_general_regs_t general_registers = {};
 
+    //! \brief The raw architecture-specific `zx_thread_state_fp_regs_t` as
+    //!     returned by `zx_thread_read_state()`.
+    zx_thread_state_fp_regs_t fp_registers = {};
+
     //! \brief The raw architecture-specific `zx_thread_state_vector_regs_t` as
     //!     returned by `zx_thread_read_state()`.
     zx_thread_state_vector_regs_t vector_registers = {};
diff --git a/extern/crashpad/crashpad/snapshot/fuchsia/process_reader_fuchsia_test.cc b/extern/crashpad/crashpad/snapshot/fuchsia/process_reader_fuchsia_test.cc
index f5a8aea750..ed36019d4f 100644
--- a/extern/crashpad/crashpad/snapshot/fuchsia/process_reader_fuchsia_test.cc
+++ b/extern/crashpad/crashpad/snapshot/fuchsia/process_reader_fuchsia_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,9 +20,12 @@
 #include <zircon/syscalls/port.h>
 #include <zircon/types.h>
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+
+#include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 #include "test/multiprocess_exec.h"
+#include "test/scoped_set_thread_name.h"
 #include "test/test_paths.h"
 #include "util/fuchsia/scoped_task_suspend.h"
 
@@ -31,11 +34,13 @@ namespace test {
 namespace {
 
 TEST(ProcessReaderFuchsia, SelfBasic) {
+  const ScopedSetThreadName scoped_set_thread_name("SelfBasic");
+
   ProcessReaderFuchsia process_reader;
   ASSERT_TRUE(process_reader.Initialize(*zx::process::self()));
 
   static constexpr char kTestMemory[] = "Some test memory";
-  char buffer[base::size(kTestMemory)];
+  char buffer[std::size(kTestMemory)];
   ASSERT_TRUE(process_reader.Memory()->Read(
       reinterpret_cast<zx_vaddr_t>(kTestMemory), sizeof(kTestMemory), &buffer));
   EXPECT_STREQ(kTestMemory, buffer);
@@ -74,7 +79,7 @@ TEST(ProcessReaderFuchsia, SelfBasic) {
             ZX_OK);
   EXPECT_EQ(threads[0].id, info.koid);
   EXPECT_EQ(threads[0].state, ZX_THREAD_STATE_RUNNING);
-  EXPECT_EQ(threads[0].name, "initial-thread");
+  EXPECT_EQ(threads[0].name, "SelfBasic");
 }
 
 constexpr char kTestMemory[] = "Read me from another process";
@@ -117,27 +122,44 @@ TEST(ProcessReaderFuchsia, ChildBasic) {
   test.Run();
 }
 
+struct ThreadData {
+  zx_handle_t port;
+  std::string name;
+};
+
 void* SignalAndSleep(void* arg) {
+  const ThreadData* thread_data = reinterpret_cast<const ThreadData*>(arg);
+  const ScopedSetThreadName scoped_set_thread_name(thread_data->name);
   zx_port_packet_t packet = {};
   packet.type = ZX_PKT_TYPE_USER;
-  zx_port_queue(*reinterpret_cast<zx_handle_t*>(arg), &packet);
+  zx_port_queue(thread_data->port, &packet);
   zx_nanosleep(ZX_TIME_INFINITE);
   return nullptr;
 }
 
 CRASHPAD_CHILD_TEST_MAIN(ProcessReaderChildThreadsTestMain) {
+  const ScopedSetThreadName scoped_set_thread_name(
+      "ProcessReaderChildThreadsTest-Main");
+
   // Create 5 threads with stack sizes of 4096, 8192, ...
   zx_handle_t port;
   zx_status_t status = zx_port_create(0, &port);
   EXPECT_EQ(status, ZX_OK);
 
   constexpr size_t kNumThreads = 5;
+  struct ThreadData thread_data[kNumThreads] = {{0, ""}};
+
   for (size_t i = 0; i < kNumThreads; ++i) {
+    thread_data[i] = {
+        .port = port,
+        .name = base::StringPrintf("ProcessReaderChildThreadsTest-%zu", i + 1),
+    };
     pthread_attr_t attr;
     EXPECT_EQ(pthread_attr_init(&attr), 0);
     EXPECT_EQ(pthread_attr_setstacksize(&attr, (i + 1) * 4096), 0);
     pthread_t thread;
-    EXPECT_EQ(pthread_create(&thread, &attr, &SignalAndSleep, &port), 0);
+    EXPECT_EQ(pthread_create(&thread, &attr, &SignalAndSleep, &thread_data[i]),
+              0);
   }
 
   // Wait until all threads are ready.
@@ -178,10 +200,14 @@ class ThreadsChildTest : public MultiprocessExec {
     const auto& threads = process_reader.Threads();
     EXPECT_EQ(threads.size(), 6u);
 
+    EXPECT_EQ(threads[0].name, "ProcessReaderChildThreadsTest-main");
+
     for (size_t i = 1; i < 6; ++i) {
       ASSERT_GT(threads[i].stack_regions.size(), 0u);
       EXPECT_GT(threads[i].stack_regions[0].size(), 0u);
       EXPECT_LE(threads[i].stack_regions[0].size(), i * 4096u);
+      EXPECT_EQ(threads[i].name,
+                base::StringPrintf("ProcessReaderChildThreadsTest-%zu", i));
     }
   }
 };
diff --git a/extern/crashpad/crashpad/snapshot/fuchsia/process_snapshot_fuchsia.cc b/extern/crashpad/crashpad/snapshot/fuchsia/process_snapshot_fuchsia.cc
index d36335c5d5..bb144cba95 100644
--- a/extern/crashpad/crashpad/snapshot/fuchsia/process_snapshot_fuchsia.cc
+++ b/extern/crashpad/crashpad/snapshot/fuchsia/process_snapshot_fuchsia.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -36,6 +36,7 @@ bool ProcessSnapshotFuchsia::Initialize(const zx::process& process) {
     return false;
   }
 
+  client_id_.InitializeToZero();
   system_.Initialize(&snapshot_time_);
 
   InitializeThreads();
@@ -113,8 +114,8 @@ crashpad::ProcessID ProcessSnapshotFuchsia::ProcessID() const {
 
 crashpad::ProcessID ProcessSnapshotFuchsia::ParentProcessID() const {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
-  NOTREACHED();  // TODO(scottmg): https://crashpad.chromium.org/bug/196
-  return 0;
+  // TODO(scottmg): https://crashpad.chromium.org/bug/196
+  NOTREACHED();
 }
 
 void ProcessSnapshotFuchsia::SnapshotTime(timeval* snapshot_time) const {
diff --git a/extern/crashpad/crashpad/snapshot/fuchsia/process_snapshot_fuchsia.h b/extern/crashpad/crashpad/snapshot/fuchsia/process_snapshot_fuchsia.h
index 47efaa3412..2f77f9a1f4 100644
--- a/extern/crashpad/crashpad/snapshot/fuchsia/process_snapshot_fuchsia.h
+++ b/extern/crashpad/crashpad/snapshot/fuchsia/process_snapshot_fuchsia.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/fuchsia/process_snapshot_fuchsia_test.cc b/extern/crashpad/crashpad/snapshot/fuchsia/process_snapshot_fuchsia_test.cc
index 496d97a82d..af245d3ed9 100644
--- a/extern/crashpad/crashpad/snapshot/fuchsia/process_snapshot_fuchsia_test.cc
+++ b/extern/crashpad/crashpad/snapshot/fuchsia/process_snapshot_fuchsia_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,17 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "snapshot/fuchsia/memory_map_region_snapshot_fuchsia.h"
+#include "snapshot/fuchsia/process_snapshot_fuchsia.h"
 
 #include <dbghelp.h>
 #include <zircon/syscalls.h>
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+
 #include "base/fuchsia/fuchsia_logging.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
-#include "snapshot/fuchsia/process_snapshot_fuchsia.h"
+#include "snapshot/fuchsia/memory_map_region_snapshot_fuchsia.h"
 #include "test/multiprocess_exec.h"
 #include "util/fuchsia/koid_utilities.h"
 #include "util/fuchsia/scoped_task_suspend.h"
@@ -56,7 +57,7 @@ CRASHPAD_CHILD_TEST_MAIN(AddressSpaceChildTestMain) {
   // correctly.
   for (const auto& t : kTestMappingPermAndSizes) {
     zx_handle_t vmo = ZX_HANDLE_INVALID;
-    const size_t size = t.pages * PAGE_SIZE;
+    const size_t size = t.pages * zx_system_get_page_size();
     zx_status_t status = zx_vmo_create(size, 0, &vmo);
     ZX_CHECK(status == ZX_OK, status) << "zx_vmo_create";
     status = zx_vmo_replace_as_executable(vmo, ZX_HANDLE_INVALID, &vmo);
@@ -111,8 +112,8 @@ class AddressSpaceTest : public MultiprocessExec {
 
  private:
   void MultiprocessParent() override {
-    uintptr_t test_addresses[base::size(kTestMappingPermAndSizes)];
-    for (size_t i = 0; i < base::size(test_addresses); ++i) {
+    uintptr_t test_addresses[std::size(kTestMappingPermAndSizes)];
+    for (size_t i = 0; i < std::size(test_addresses); ++i) {
       ASSERT_TRUE(ReadFileExactly(
           ReadPipeHandle(), &test_addresses[i], sizeof(test_addresses[i])));
     }
@@ -122,11 +123,11 @@ class AddressSpaceTest : public MultiprocessExec {
     ProcessSnapshotFuchsia process_snapshot;
     ASSERT_TRUE(process_snapshot.Initialize(*ChildProcess()));
 
-    for (size_t i = 0; i < base::size(test_addresses); ++i) {
+    for (size_t i = 0; i < std::size(test_addresses); ++i) {
       const auto& t = kTestMappingPermAndSizes[i];
       EXPECT_TRUE(HasSingleMatchingMapping(process_snapshot.MemoryMap(),
                                            test_addresses[i],
-                                           t.pages * PAGE_SIZE,
+                                           t.pages * zx_system_get_page_size(),
                                            t.minidump_perm))
           << base::StringPrintf(
                  "index %zu, zircon_perm 0x%x, minidump_perm 0x%x",
@@ -199,7 +200,7 @@ class InvalidStackPointerTest : public MultiprocessExec {
     constexpr uint64_t kOffsetIntoMapping = 1024;
 #if defined(ARCH_CPU_X86_64)
     regs.rsp = address_of_large_mapping + kOffsetIntoMapping;
-#elif defined(ARCH_CPU_ARM64)
+#elif defined(ARCH_CPU_ARM64) || defined(ARCH_CPU_RISCV64)
     regs.sp = address_of_large_mapping + kOffsetIntoMapping;
 #else
 #error
diff --git a/extern/crashpad/crashpad/snapshot/fuchsia/system_snapshot_fuchsia.cc b/extern/crashpad/crashpad/snapshot/fuchsia/system_snapshot_fuchsia.cc
index 36a4e50fce..b95bf0d061 100644
--- a/extern/crashpad/crashpad/snapshot/fuchsia/system_snapshot_fuchsia.cc
+++ b/extern/crashpad/crashpad/snapshot/fuchsia/system_snapshot_fuchsia.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -45,6 +45,8 @@ void SystemSnapshotFuchsia::Initialize(const timeval* snapshot_time) {
   static constexpr const char kArch[] = "x86_64";
 #elif defined(ARCH_CPU_ARM64)
   static constexpr const char kArch[] = "aarch64";
+#elif defined(ARCH_CPU_RISCV64)
+  static constexpr const char kArch[] = "riscv64";
 #else
   static constexpr const char kArch[] = "unknown";
 #endif
@@ -61,6 +63,8 @@ CPUArchitecture SystemSnapshotFuchsia::GetCPUArchitecture() const {
   return kCPUArchitectureX86_64;
 #elif defined(ARCH_CPU_ARM64)
   return kCPUArchitectureARM64;
+#elif defined(ARCH_CPU_RISCV64)
+  return kCPUArchitectureRISCV64;
 #else
 #error Port
 #endif
@@ -71,7 +75,7 @@ uint32_t SystemSnapshotFuchsia::CPURevision() const {
 #if defined(ARCH_CPU_X86_64)
   return cpuid_.Revision();
 #else
-  // TODO(fuchsia/DX-712): Read actual revision.
+  // TODO: https://fxbug.dev/42133257 - Read actual revision.
   return 0;
 #endif
 }
@@ -86,7 +90,7 @@ std::string SystemSnapshotFuchsia::CPUVendor() const {
 #if defined(ARCH_CPU_X86_64)
   return cpuid_.Vendor();
 #else
-  // TODO(fuchsia/DX-712): Read actual vendor.
+  // TODO: https://fxbug.dev/42133257 - Read actual vendor.
   return std::string();
 #endif
 }
@@ -105,7 +109,6 @@ uint32_t SystemSnapshotFuchsia::CPUX86Signature() const {
   return cpuid_.Signature();
 #else
   NOTREACHED();
-  return 0;
 #endif
 }
 
@@ -115,7 +118,6 @@ uint64_t SystemSnapshotFuchsia::CPUX86Features() const {
   return cpuid_.Features();
 #else
   NOTREACHED();
-  return 0;
 #endif
 }
 
@@ -125,7 +127,6 @@ uint64_t SystemSnapshotFuchsia::CPUX86ExtendedFeatures() const {
   return cpuid_.ExtendedFeatures();
 #else
   NOTREACHED();
-  return 0;
 #endif
 }
 
@@ -134,7 +135,6 @@ uint32_t SystemSnapshotFuchsia::CPUX86Leaf7Features() const {
   return cpuid_.Leaf7Features();
 #else
   NOTREACHED();
-  return 0;
 #endif
 }
 
@@ -144,7 +144,6 @@ bool SystemSnapshotFuchsia::CPUX86SupportsDAZ() const {
   return cpuid_.SupportsDAZ();
 #else
   NOTREACHED();
-  return false;
 #endif
 }
 
@@ -189,7 +188,7 @@ bool SystemSnapshotFuchsia::NXEnabled() const {
 #if defined(ARCH_CPU_X86_64)
   return cpuid_.NXEnabled();
 #else
-  // TODO(fuchsia/DX-712): Read actual NX bit value.
+  // TODO: https://fxbug.dev/42133257 - Read actual NX bit value.
   return false;
 #endif
 }
diff --git a/extern/crashpad/crashpad/snapshot/fuchsia/system_snapshot_fuchsia.h b/extern/crashpad/crashpad/snapshot/fuchsia/system_snapshot_fuchsia.h
index aadffac912..3d545bb4b4 100644
--- a/extern/crashpad/crashpad/snapshot/fuchsia/system_snapshot_fuchsia.h
+++ b/extern/crashpad/crashpad/snapshot/fuchsia/system_snapshot_fuchsia.h
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -73,6 +73,8 @@ class SystemSnapshotFuchsia final : public SystemSnapshot {
                 int* daylight_offset_seconds,
                 std::string* standard_name,
                 std::string* daylight_name) const override;
+  uint64_t AddressMask() const override { return 0; }
+
  private:
   std::string os_version_full_;
   const timeval* snapshot_time_;  // weak
diff --git a/extern/crashpad/crashpad/snapshot/fuchsia/thread_snapshot_fuchsia.cc b/extern/crashpad/crashpad/snapshot/fuchsia/thread_snapshot_fuchsia.cc
index 369203ae3c..587e6a91f0 100644
--- a/extern/crashpad/crashpad/snapshot/fuchsia/thread_snapshot_fuchsia.cc
+++ b/extern/crashpad/crashpad/snapshot/fuchsia/thread_snapshot_fuchsia.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@ ThreadSnapshotFuchsia::ThreadSnapshotFuchsia()
       context_arch_(),
       context_(),
       stack_(),
+      thread_name_(),
       thread_id_(ZX_KOID_INVALID),
       thread_specific_data_address_(0),
       initialized_() {}
@@ -39,14 +40,19 @@ bool ThreadSnapshotFuchsia::Initialize(
 #if defined(ARCH_CPU_X86_64)
   context_.architecture = kCPUArchitectureX86_64;
   context_.x86_64 = &context_arch_;
-  // TODO(fuchsia/DX-642): Add float context once saved in |thread|.
-  InitializeCPUContextX86_64_NoFloatingPoint(thread.general_registers,
-                                             context_.x86_64);
+  // TODO(fxbug.dev/42132536): Add vector context.
+  InitializeCPUContextX86_64(
+      thread.general_registers, thread.fp_registers, context_.x86_64);
 #elif defined(ARCH_CPU_ARM64)
   context_.architecture = kCPUArchitectureARM64;
   context_.arm64 = &context_arch_;
   InitializeCPUContextARM64(
       thread.general_registers, thread.vector_registers, context_.arm64);
+#elif defined(ARCH_CPU_RISCV64)
+  context_.architecture = kCPUArchitectureRISCV64;
+  context_.riscv64 = &context_arch_;
+  InitializeCPUContextRISCV64(
+      thread.general_registers, thread.fp_registers, context_.riscv64);
 #else
 #error Port.
 #endif
@@ -60,6 +66,7 @@ bool ThreadSnapshotFuchsia::Initialize(
     // TODO(scottmg): Handle split stack by adding other parts to ExtraMemory().
   }
 
+  thread_name_ = thread.name;
   thread_id_ = thread.id;
 
   INITIALIZATION_STATE_SET_VALID(initialized_);
@@ -81,6 +88,11 @@ uint64_t ThreadSnapshotFuchsia::ThreadID() const {
   return thread_id_;
 }
 
+std::string ThreadSnapshotFuchsia::ThreadName() const {
+  INITIALIZATION_STATE_DCHECK_VALID(initialized_);
+  return thread_name_;
+}
+
 int ThreadSnapshotFuchsia::SuspendCount() const {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
   // There is not (currently) a suspend count for threads on Fuchsia.
diff --git a/extern/crashpad/crashpad/snapshot/fuchsia/thread_snapshot_fuchsia.h b/extern/crashpad/crashpad/snapshot/fuchsia/thread_snapshot_fuchsia.h
index b91a514d92..84cac3df6f 100644
--- a/extern/crashpad/crashpad/snapshot/fuchsia/thread_snapshot_fuchsia.h
+++ b/extern/crashpad/crashpad/snapshot/fuchsia/thread_snapshot_fuchsia.h
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,6 +18,8 @@
 #include <stdint.h>
 #include <zircon/types.h>
 
+#include <string>
+
 #include "build/build_config.h"
 #include "snapshot/cpu_context.h"
 #include "snapshot/fuchsia/process_reader_fuchsia.h"
@@ -56,6 +58,7 @@ class ThreadSnapshotFuchsia final : public ThreadSnapshot {
   const CPUContext* Context() const override;
   const MemorySnapshot* Stack() const override;
   uint64_t ThreadID() const override;
+  std::string ThreadName() const override;
   int SuspendCount() const override;
   int Priority() const override;
   uint64_t ThreadSpecificDataAddress() const override;
@@ -66,11 +69,14 @@ class ThreadSnapshotFuchsia final : public ThreadSnapshot {
   CPUContextX86_64 context_arch_;
 #elif defined(ARCH_CPU_ARM64)
   CPUContextARM64 context_arch_;
+#elif defined(ARCH_CPU_RISCV64)
+  CPUContextRISCV64 context_arch_;
 #else
 #error Port.
 #endif
   CPUContext context_;
   MemorySnapshotGeneric stack_;
+  std::string thread_name_;
   zx_koid_t thread_id_;
   zx_vaddr_t thread_specific_data_address_;
   InitializationStateDcheck initialized_;
diff --git a/extern/crashpad/crashpad/snapshot/handle_snapshot.cc b/extern/crashpad/crashpad/snapshot/handle_snapshot.cc
index 331b6b3560..36a075928e 100644
--- a/extern/crashpad/crashpad/snapshot/handle_snapshot.cc
+++ b/extern/crashpad/crashpad/snapshot/handle_snapshot.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/handle_snapshot.h b/extern/crashpad/crashpad/snapshot/handle_snapshot.h
index eee7e7e457..51ea99d9b0 100644
--- a/extern/crashpad/crashpad/snapshot/handle_snapshot.h
+++ b/extern/crashpad/crashpad/snapshot/handle_snapshot.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/hash_types_test.cc b/extern/crashpad/crashpad/snapshot/hash_types_test.cc
index 436323b207..ff94ebca8b 100644
--- a/extern/crashpad/crashpad/snapshot/hash_types_test.cc
+++ b/extern/crashpad/crashpad/snapshot/hash_types_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/ios/exception_snapshot_ios_intermediate_dump.cc b/extern/crashpad/crashpad/snapshot/ios/exception_snapshot_ios_intermediate_dump.cc
index cd6045100e..9f1852a61c 100644
--- a/extern/crashpad/crashpad/snapshot/ios/exception_snapshot_ios_intermediate_dump.cc
+++ b/extern/crashpad/crashpad/snapshot/ios/exception_snapshot_ios_intermediate_dump.cc
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,8 +14,9 @@
 
 #include "snapshot/ios/exception_snapshot_ios_intermediate_dump.h"
 
+#include "base/apple/mach_logging.h"
+#include "base/check_op.h"
 #include "base/logging.h"
-#include "base/mac/mach_logging.h"
 #include "snapshot/cpu_context.h"
 #include "snapshot/ios/intermediate_dump_reader_util.h"
 #include "snapshot/mac/cpu_context_mac.h"
@@ -66,6 +67,13 @@ using Key = IntermediateDumpKey;
 
 ExceptionSnapshotIOSIntermediateDump::ExceptionSnapshotIOSIntermediateDump()
     : ExceptionSnapshot(),
+#if defined(ARCH_CPU_X86_64)
+      context_x86_64_(),
+#elif defined(ARCH_CPU_ARM64)
+      context_arm64_(),
+#else
+#error Port to your CPU architecture
+#endif
       context_(),
       codes_(),
       thread_id_(0),
@@ -131,10 +139,43 @@ bool ExceptionSnapshotIOSIntermediateDump::InitializeFromSignal(
 #endif
   }
 
-  GetDataValueFromMap(exception_data, Key::kSignalNumber, &exception_);
-  GetDataValueFromMap(exception_data, Key::kSignalCode, &exception_info_);
+  exception_ = EXC_SOFT_SIGNAL;
+  GetDataValueFromMap(exception_data, Key::kSignalNumber, &exception_info_);
   GetDataValueFromMap(exception_data, Key::kSignalAddress, &exception_address_);
 
+  codes_.push_back(exception_);
+  codes_.push_back(exception_info_);
+  uint32_t code;
+  GetDataValueFromMap(exception_data, Key::kSignalCode, &code);
+  codes_.push_back(code);
+
+  const IOSIntermediateDumpList* thread_context_memory_regions =
+      GetListFromMap(exception_data, Key::kThreadContextMemoryRegions);
+  if (thread_context_memory_regions) {
+    for (auto& region : *thread_context_memory_regions) {
+      vm_address_t address;
+      const IOSIntermediateDumpData* region_data =
+          region->GetAsData(Key::kThreadContextMemoryRegionData);
+      if (!region_data)
+        continue;
+      if (GetDataValueFromMap(
+              region.get(), Key::kThreadContextMemoryRegionAddress, &address)) {
+        const std::vector<uint8_t>& bytes = region_data->bytes();
+        vm_size_t data_size = bytes.size();
+        if (data_size == 0)
+          continue;
+
+        const vm_address_t data =
+            reinterpret_cast<const vm_address_t>(bytes.data());
+
+        auto memory =
+            std::make_unique<internal::MemorySnapshotIOSIntermediateDump>();
+        memory->Initialize(address, data, data_size);
+        extra_memory_.push_back(std::move(memory));
+      }
+    }
+  }
+
   INITIALIZATION_STATE_SET_VALID(initialized_);
   return true;
 }
@@ -162,18 +203,21 @@ bool ExceptionSnapshotIOSIntermediateDump::InitializeFromMachException(
     const std::vector<uint8_t>& bytes = code_dump->bytes();
     const mach_exception_data_type_t* code =
         reinterpret_cast<const mach_exception_data_type_t*>(bytes.data());
-    if (bytes.size() == 0 || !code) {
+    if (bytes.size() == 0 ||
+        bytes.size() % sizeof(mach_exception_data_type_t) != 0 || !code) {
       LOG(ERROR) << "Invalid mach exception code.";
     } else {
-      // TODO: rationalize with the macOS implementation.
       mach_msg_type_number_t code_count =
           bytes.size() / sizeof(mach_exception_data_type_t);
       for (mach_msg_type_number_t code_index = 0; code_index < code_count;
            ++code_index) {
         codes_.push_back(code[code_index]);
       }
+      DCHECK_GE(code_count, 1u);
       exception_info_ = code[0];
-      exception_address_ = code[1];
+      if (code_count >= 2) {
+        exception_address_ = code[1];
+      }
     }
   }
 
@@ -200,8 +244,7 @@ bool ExceptionSnapshotIOSIntermediateDump::InitializeFromNSException(
   INITIALIZATION_STATE_SET_INITIALIZING(initialized_);
   DCHECK(exception_data);
 
-  exception_ = EXC_SOFTWARE;
-  exception_info_ = 0xDEADC0DE; /* uncaught NSException */
+  exception_ = kMachExceptionFromNSException;
 
   if (!GetDataValueFromMap(exception_data, Key::kThreadID, &thread_id_)) {
     LOG(ERROR) << "Exceptions require a thread id.";
@@ -265,8 +308,11 @@ const std::vector<uint64_t>& ExceptionSnapshotIOSIntermediateDump::Codes()
 
 std::vector<const MemorySnapshot*>
 ExceptionSnapshotIOSIntermediateDump::ExtraMemory() const {
-  INITIALIZATION_STATE_DCHECK_VALID(initialized_);
-  return std::vector<const MemorySnapshot*>();
+  std::vector<const MemorySnapshot*> extra_memory;
+  for (const auto& memory : extra_memory_) {
+    extra_memory.push_back(memory.get());
+  }
+  return extra_memory;
 }
 
 void ExceptionSnapshotIOSIntermediateDump::LoadContextFromThread(
@@ -294,36 +340,40 @@ void ExceptionSnapshotIOSIntermediateDump::LoadContextFromThread(
     const IOSIntermediateDumpData* state_dump =
         GetDataFromMap(exception_data, Key::kState);
     if (state_dump) {
-      const std::vector<uint8_t>& bytes = state_dump->bytes();
+      std::vector<uint8_t> bytes = state_dump->bytes();
       size_t actual_length = bytes.size();
       size_t expected_length = ThreadStateLengthForFlavor(flavor);
-      // TODO(justincohen): Consider zero-ing out bytes if actual_length is
-      // shorter than expected_length, and tolerating actual_length longer than
-      // expected_length.
-      if (expected_length == actual_length) {
-        const ConstThreadState state =
-            reinterpret_cast<const ConstThreadState>(bytes.data());
-        mach_msg_type_number_t state_count = bytes.size() / sizeof(uint32_t);
+      if (actual_length < expected_length) {
+        // Zero out bytes if actual_length is shorter than expected_length.
+        bytes.resize(expected_length, 0);
+        actual_length = bytes.size();
+        LOG(WARNING) << "Exception context length " << actual_length
+                     << " shorter than expected length " << expected_length;
+      }
+      const ConstThreadState state =
+          reinterpret_cast<const ConstThreadState>(bytes.data());
+      // Tolerating actual_length longer than expected_length by setting
+      // state_count based on expected_length, not bytes.size().
+      mach_msg_type_number_t state_count = expected_length / sizeof(uint32_t);
 #if defined(ARCH_CPU_X86_64)
-        InitializeCPUContextX86_64(&context_x86_64_,
-                                   flavor,
-                                   state,
-                                   state_count,
-                                   &thread_state,
-                                   &float_state,
-                                   &debug_state);
+      InitializeCPUContextX86_64(&context_x86_64_,
+                                 flavor,
+                                 state,
+                                 state_count,
+                                 &thread_state,
+                                 &float_state,
+                                 &debug_state);
 #elif defined(ARCH_CPU_ARM64)
-        InitializeCPUContextARM64(&context_arm64_,
-                                  flavor,
-                                  state,
-                                  state_count,
-                                  &thread_state,
-                                  &float_state,
-                                  &debug_state);
+      InitializeCPUContextARM64(&context_arm64_,
+                                flavor,
+                                state,
+                                state_count,
+                                &thread_state,
+                                &float_state,
+                                &debug_state);
 #else
 #error Port to your CPU architecture
 #endif
-      }
     }
   }
 
@@ -370,11 +420,9 @@ void ExceptionSnapshotIOSIntermediateDump::
   }
 
 #if defined(ARCH_CPU_X86_64)
-  context_x86_64_ = {};
   context_x86_64_.rip = frames[0];  // instruction pointer
   context_x86_64_.rsp = frames[1];
 #elif defined(ARCH_CPU_ARM64)
-  context_arm64_ = {};
   context_arm64_.sp = 0;
   context_arm64_.pc = frames[0];
   context_arm64_.regs[30] = frames[1];  // link register
diff --git a/extern/crashpad/crashpad/snapshot/ios/exception_snapshot_ios_intermediate_dump.h b/extern/crashpad/crashpad/snapshot/ios/exception_snapshot_ios_intermediate_dump.h
index 7e22330bc1..71ad9c471c 100644
--- a/extern/crashpad/crashpad/snapshot/ios/exception_snapshot_ios_intermediate_dump.h
+++ b/extern/crashpad/crashpad/snapshot/ios/exception_snapshot_ios_intermediate_dump.h
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -23,8 +23,8 @@
 #include "build/build_config.h"
 #include "snapshot/cpu_context.h"
 #include "snapshot/exception_snapshot.h"
+#include "snapshot/ios/memory_snapshot_ios_intermediate_dump.h"
 #include "util/ios/ios_intermediate_dump_map.h"
-#include "util/mach/mach_extensions.h"
 #include "util/misc/initialization_state_dcheck.h"
 
 namespace crashpad {
@@ -106,6 +106,8 @@ class ExceptionSnapshotIOSIntermediateDump final : public ExceptionSnapshot {
   uintptr_t exception_address_;
   uint32_t exception_;
   uint32_t exception_info_;
+  std::vector<std::unique_ptr<internal::MemorySnapshotIOSIntermediateDump>>
+      extra_memory_;
   InitializationStateDcheck initialized_;
 };
 
diff --git a/extern/crashpad/crashpad/snapshot/ios/intermediate_dump_reader_util.cc b/extern/crashpad/crashpad/snapshot/ios/intermediate_dump_reader_util.cc
index 74c0842ce4..a4ecfb85a9 100644
--- a/extern/crashpad/crashpad/snapshot/ios/intermediate_dump_reader_util.cc
+++ b/extern/crashpad/crashpad/snapshot/ios/intermediate_dump_reader_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2021 The Crashpad Authors. All rights reserved.
+// Copyright 2021 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,6 +14,7 @@
 
 #include "snapshot/ios/intermediate_dump_reader_util.h"
 
+#include "base/logging.h"
 #include "util/ios/ios_intermediate_dump_data.h"
 #include "util/ios/ios_intermediate_dump_map.h"
 #include "util/misc/metrics.h"
diff --git a/extern/crashpad/crashpad/snapshot/ios/intermediate_dump_reader_util.h b/extern/crashpad/crashpad/snapshot/ios/intermediate_dump_reader_util.h
index 4d33d965a4..c96c8e7bbb 100644
--- a/extern/crashpad/crashpad/snapshot/ios/intermediate_dump_reader_util.h
+++ b/extern/crashpad/crashpad/snapshot/ios/intermediate_dump_reader_util.h
@@ -1,4 +1,4 @@
-// Copyright 2021 The Crashpad Authors. All rights reserved.
+// Copyright 2021 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 
 #include <ostream>
 
-#include "base/logging.h"
 #include "util/ios/ios_intermediate_dump_data.h"
 #include "util/ios/ios_intermediate_dump_map.h"
 
@@ -73,9 +72,10 @@ const IOSIntermediateDumpList* GetListFromMap(const IOSIntermediateDumpMap* map,
 //!
 //! \param[in] map The map to load from.
 //! \param[in] key The key to load from \a map.
+//! \param[out] value The loaded string.
 //!
-//! \return Returns `true` if the string could be loaded, otherwise returns
-//!     `false` and logs an error.
+//! \return Returns `true` with \a value set accordingly if the string could be
+//!     loaded, otherwise returns `false` and logs an error.
 bool GetDataStringFromMap(const IOSIntermediateDumpMap* map,
                           const IntermediateDumpKey& key,
                           std::string* value);
diff --git a/extern/crashpad/crashpad/snapshot/ios/memory_snapshot_ios_intermediate_dump.cc b/extern/crashpad/crashpad/snapshot/ios/memory_snapshot_ios_intermediate_dump.cc
index 8e521d904f..b272eb65fd 100644
--- a/extern/crashpad/crashpad/snapshot/ios/memory_snapshot_ios_intermediate_dump.cc
+++ b/extern/crashpad/crashpad/snapshot/ios/memory_snapshot_ios_intermediate_dump.cc
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,6 +14,8 @@
 
 #include "snapshot/ios/memory_snapshot_ios_intermediate_dump.h"
 
+#include "base/check_op.h"
+
 namespace crashpad {
 namespace internal {
 
@@ -50,12 +52,37 @@ bool MemorySnapshotIOSIntermediateDump::Read(Delegate* delegate) const {
 
 const MemorySnapshot* MemorySnapshotIOSIntermediateDump::MergeWithOtherSnapshot(
     const MemorySnapshot* other) const {
+  INITIALIZATION_STATE_DCHECK_VALID(initialized_);
+  auto other_snapshot =
+      reinterpret_cast<const MemorySnapshotIOSIntermediateDump*>(other);
+
+  INITIALIZATION_STATE_DCHECK_VALID(other_snapshot->initialized_);
+  if (other_snapshot->address_ < address_) {
+    return other_snapshot->MergeWithOtherSnapshot(this);
+  }
+
   CheckedRange<uint64_t, size_t> merged(0, 0);
   if (!LoggingDetermineMergedRange(this, other, &merged))
     return nullptr;
 
   auto result = std::make_unique<MemorySnapshotIOSIntermediateDump>();
   result->Initialize(merged.base(), data_, merged.size());
+  if (size_ == merged.size()) {
+    return result.release();
+  }
+
+  const uint8_t* data = reinterpret_cast<const uint8_t*>(data_);
+  const uint8_t* other_data =
+      reinterpret_cast<const uint8_t*>(other_snapshot->data_);
+  vm_size_t overlap = merged.size() - other_snapshot->size_;
+  result->merged_data_.reserve(merged.size());
+  result->merged_data_.insert(result->merged_data_.end(), data, data + overlap);
+  result->merged_data_.insert(result->merged_data_.end(),
+                              other_data,
+                              other_data + other_snapshot->size_);
+  result->data_ =
+      reinterpret_cast<const vm_address_t>(result->merged_data_.data());
+  DCHECK_EQ(result->merged_data_.size(), merged.size());
   return result.release();
 }
 
diff --git a/extern/crashpad/crashpad/snapshot/ios/memory_snapshot_ios_intermediate_dump.h b/extern/crashpad/crashpad/snapshot/ios/memory_snapshot_ios_intermediate_dump.h
index a93200020c..a3fe81743f 100644
--- a/extern/crashpad/crashpad/snapshot/ios/memory_snapshot_ios_intermediate_dump.h
+++ b/extern/crashpad/crashpad/snapshot/ios/memory_snapshot_ios_intermediate_dump.h
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,8 +15,11 @@
 #ifndef CRASHPAD_SNAPSHOT_IOS_INTERMEDIATE_DUMP_MEMORY_SNAPSHOT_IOS_INTERMEDIATEDUMP_H_
 #define CRASHPAD_SNAPSHOT_IOS_INTERMEDIATE_DUMP_MEMORY_SNAPSHOT_IOS_INTERMEDIATEDUMP_H_
 
+#include <mach/mach.h>
+
+#include <vector>
+
 #include "snapshot/memory_snapshot.h"
-#include "util/misc/address_types.h"
 #include "util/misc/initialization_state_dcheck.h"
 
 namespace crashpad {
@@ -37,6 +40,7 @@ class MemorySnapshotIOSIntermediateDump final : public MemorySnapshot {
   //! \brief Initializes the object.
   //!
   //! \param[in] address The base address of the memory region to snapshot.
+  //! \param[in] data The destination address where the snapshot will be stored.
   //! \param[in] size The size of the memory region to snapshot.
   void Initialize(vm_address_t address, vm_address_t data, vm_size_t size);
 
@@ -55,6 +59,12 @@ class MemorySnapshotIOSIntermediateDump final : public MemorySnapshot {
 
   vm_address_t address_;
   vm_address_t data_;
+
+  // Because the iOS snapshot memory region is owned by the intermediate dump,
+  // it's necessary to copy the merged data into a vector owned by the memory
+  // snapshot itself.
+  std::vector<uint8_t> merged_data_;
+
   vm_size_t size_;
   InitializationStateDcheck initialized_;
 };
diff --git a/extern/crashpad/crashpad/snapshot/ios/memory_snapshot_ios_intermediate_dump_test.cc b/extern/crashpad/crashpad/snapshot/ios/memory_snapshot_ios_intermediate_dump_test.cc
new file mode 100644
index 0000000000..07848a2fa0
--- /dev/null
+++ b/extern/crashpad/crashpad/snapshot/ios/memory_snapshot_ios_intermediate_dump_test.cc
@@ -0,0 +1,161 @@
+// Copyright 2022 The Crashpad Authors
+//
+// 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.
+
+#include "snapshot/ios/memory_snapshot_ios_intermediate_dump.h"
+
+#include <string>
+#include <vector>
+
+#include "gtest/gtest.h"
+
+namespace crashpad {
+namespace test {
+namespace {
+
+using internal::MemorySnapshotIOSIntermediateDump;
+
+const vm_address_t kDefaultAddress = 0x1000;
+
+class ReadToString : public crashpad::MemorySnapshot::Delegate {
+ public:
+  const std::string& result() { return result_; }
+
+ private:
+  // MemorySnapshot::Delegate:
+  bool MemorySnapshotDelegateRead(void* data, size_t size) override {
+    result_ = std::string(reinterpret_cast<const char*>(data), size);
+    return true;
+  }
+
+  std::string result_;
+};
+
+std::unique_ptr<MemorySnapshotIOSIntermediateDump> CreateMemorySnapshot(
+    vm_address_t address,
+    std::vector<uint8_t>& data) {
+  auto memory = std::make_unique<MemorySnapshotIOSIntermediateDump>();
+  memory->Initialize(
+      address, reinterpret_cast<const vm_address_t>(data.data()), data.size());
+  return memory;
+}
+
+TEST(MemorySnapshotIOSIntermediateDumpTest, MergeSame) {
+  std::vector<uint8_t> data(10, 'a');
+  auto memory = CreateMemorySnapshot(kDefaultAddress, data);
+  std::unique_ptr<const MemorySnapshot> merged(
+      memory->MergeWithOtherSnapshot(memory.get()));
+  EXPECT_EQ(merged->Address(), kDefaultAddress);
+  EXPECT_EQ(merged->Size(), data.size());
+  ReadToString delegate;
+  merged->Read(&delegate);
+  EXPECT_EQ(delegate.result(), "aaaaaaaaaa");
+}
+
+TEST(MemorySnapshotIOSIntermediateDumpTest, MergeNoOverlap) {
+  std::vector<uint8_t> data1(10, 'a');
+  auto memory1 = CreateMemorySnapshot(kDefaultAddress, data1);
+
+  std::vector<uint8_t> data2(10, 'b');
+  auto memory2 = CreateMemorySnapshot(kDefaultAddress + 10, data2);
+
+  std::unique_ptr<const MemorySnapshot> merged(
+      memory1->MergeWithOtherSnapshot(memory2.get()));
+  EXPECT_EQ(merged->Address(), kDefaultAddress);
+  EXPECT_EQ(merged->Size(), 20u);
+  ReadToString delegate;
+  merged->Read(&delegate);
+  EXPECT_EQ(delegate.result(), "aaaaaaaaaabbbbbbbbbb");
+}
+
+TEST(MemorySnapshotIOSIntermediateDumpTest, MergePartial) {
+  std::vector<uint8_t> data1(10, 'a');
+  auto memory1 = CreateMemorySnapshot(kDefaultAddress, data1);
+
+  std::vector<uint8_t> data2(10, 'b');
+  auto memory2 = CreateMemorySnapshot(kDefaultAddress + 5, data2);
+
+  std::unique_ptr<const MemorySnapshot> merged(
+      memory1->MergeWithOtherSnapshot(memory2.get()));
+  EXPECT_EQ(merged->Address(), kDefaultAddress);
+  EXPECT_EQ(merged->Size(), 15u);
+  ReadToString delegate;
+  merged->Read(&delegate);
+  EXPECT_EQ(delegate.result(), "aaaaabbbbbbbbbb");
+}
+
+TEST(MemorySnapshotIOSIntermediateDumpTest, NoMerge) {
+  std::vector<uint8_t> data1(10, 'a');
+  auto memory1 = CreateMemorySnapshot(kDefaultAddress, data1);
+
+  std::vector<uint8_t> data2(10, 'b');
+  auto memory2 = CreateMemorySnapshot(kDefaultAddress + 20, data2);
+
+  std::unique_ptr<const MemorySnapshot> merged(
+      memory1->MergeWithOtherSnapshot(memory2.get()));
+  EXPECT_EQ(merged.get(), nullptr);
+}
+
+TEST(MemorySnapshotIOSIntermediateDumpTest, EnvelopeBiggerFirst) {
+  std::vector<uint8_t> data1(30, 'a');
+  auto memory1 = CreateMemorySnapshot(kDefaultAddress, data1);
+
+  std::vector<uint8_t> data2(10, 'b');
+  auto memory2 = CreateMemorySnapshot(kDefaultAddress + 15, data2);
+
+  std::unique_ptr<const MemorySnapshot> merged(
+      memory1->MergeWithOtherSnapshot(memory2.get()));
+  EXPECT_EQ(merged->Address(), kDefaultAddress);
+  EXPECT_EQ(merged->Size(), data1.size());
+
+  ReadToString delegate;
+  merged->Read(&delegate);
+  EXPECT_EQ(delegate.result(), "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
+}
+
+TEST(MemorySnapshotIOSIntermediateDumpTest, EnvelopeBiggerSecond) {
+  std::vector<uint8_t> data1(10, 'a');
+  auto memory1 = CreateMemorySnapshot(kDefaultAddress, data1);
+
+  std::vector<uint8_t> data2(20, 'b');
+  auto memory2 = CreateMemorySnapshot(kDefaultAddress, data2);
+
+  std::unique_ptr<const MemorySnapshot> merged(
+      memory1->MergeWithOtherSnapshot(memory2.get()));
+  EXPECT_EQ(merged->Address(), kDefaultAddress);
+  EXPECT_EQ(merged->Size(), data2.size());
+
+  ReadToString delegate;
+  merged->Read(&delegate);
+  EXPECT_EQ(delegate.result(), "bbbbbbbbbbbbbbbbbbbb");
+}
+
+TEST(MemorySnapshotIOSIntermediateDumpTest, SmallerAddressSecond) {
+  std::vector<uint8_t> data1(10, 'a');
+  auto memory1 = CreateMemorySnapshot(kDefaultAddress, data1);
+
+  std::vector<uint8_t> data2(20, 'b');
+  auto memory2 = CreateMemorySnapshot(kDefaultAddress - 10, data2);
+
+  std::unique_ptr<const MemorySnapshot> merged(
+      memory1->MergeWithOtherSnapshot(memory2.get()));
+  EXPECT_EQ(merged->Address(), kDefaultAddress - 10);
+  EXPECT_EQ(merged->Size(), data2.size());
+  ReadToString delegate;
+  merged->Read(&delegate);
+  EXPECT_EQ(delegate.result(), "bbbbbbbbbbbbbbbbbbbb");
+}
+
+}  // namespace
+}  // namespace test
+}  // namespace crashpad
diff --git a/extern/crashpad/crashpad/snapshot/ios/module_snapshot_ios_intermediate_dump.cc b/extern/crashpad/crashpad/snapshot/ios/module_snapshot_ios_intermediate_dump.cc
index cdef7697ce..16d2282c81 100644
--- a/extern/crashpad/crashpad/snapshot/ios/module_snapshot_ios_intermediate_dump.cc
+++ b/extern/crashpad/crashpad/snapshot/ios/module_snapshot_ios_intermediate_dump.cc
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,8 +17,9 @@
 #include <mach-o/loader.h>
 #include <mach/mach.h>
 
+#include "base/apple/mach_logging.h"
 #include "base/files/file_path.h"
-#include "base/mac/mach_logging.h"
+#include "client/annotation.h"
 #include "snapshot/ios/intermediate_dump_reader_util.h"
 #include "util/ios/ios_intermediate_dump_data.h"
 #include "util/ios/ios_intermediate_dump_list.h"
@@ -50,10 +51,13 @@ bool ModuleSnapshotIOSIntermediateDump::Initialize(
   GetDataStringFromMap(image_data, Key::kName, &name_);
   GetDataValueFromMap(image_data, Key::kAddress, &address_);
   GetDataValueFromMap(image_data, Key::kSize, &size_);
-  GetDataValueFromMap(image_data, Key::kSourceVersion, &source_version_);
   GetDataValueFromMap(image_data, Key::kFileType, &filetype_);
 
   // These keys are often missing.
+  GetDataValueFromMap(image_data,
+                      Key::kSourceVersion,
+                      &source_version_,
+                      LogMissingDataValueFromMap::kDontLogIfMissing);
   GetDataValueFromMap(image_data,
                       Key::kTimestamp,
                       &timestamp_,
@@ -81,8 +85,11 @@ bool ModuleSnapshotIOSIntermediateDump::Initialize(
       std::string name;
       if (!GetDataStringFromMap(
               annotation.get(), Key::kAnnotationName, &name) ||
-          name.empty() || name.length() > 64) {  // Annotation::kNameMaxLength
-        LOG(ERROR) << "Invalid annotation name length.";
+          name.empty() || name.length() > Annotation::kNameMaxLength) {
+        LOG(ERROR) << "Invalid annotation name (" << name
+                   << "), size=" << name.size()
+                   << ", max size=" << Annotation::kNameMaxLength
+                   << ", discarding annotation.";
         continue;
       }
 
@@ -94,8 +101,10 @@ bool ModuleSnapshotIOSIntermediateDump::Initialize(
       if (type_dump && value_dump && type_dump->GetValue<uint16_t>(&type)) {
         const std::vector<uint8_t>& bytes = value_dump->bytes();
         uint64_t length = bytes.size();
-        if (!bytes.data() || length > 20480) {  // Annotation::kValueMaxSize
-          LOG(ERROR) << "Invalid annotation value length.";
+        if (!bytes.data() || length > Annotation::kValueMaxSize) {
+          LOG(ERROR) << "Invalid annotation value, size=" << length
+                     << ", max size=" << Annotation::kValueMaxSize
+                     << ", discarding annotation.";
           continue;
         }
         annotation_objects_.push_back(AnnotationSnapshot(name, type, bytes));
@@ -118,6 +127,63 @@ bool ModuleSnapshotIOSIntermediateDump::Initialize(
     }
   }
 
+  const IOSIntermediateDumpList* extra_memory_regions_array =
+      image_data->GetAsList(IntermediateDumpKey::kModuleExtraMemoryRegions);
+  if (extra_memory_regions_array) {
+    for (auto& region : *extra_memory_regions_array) {
+      vm_address_t address;
+      const IOSIntermediateDumpData* region_data =
+          region->GetAsData(Key::kModuleExtraMemoryRegionData);
+      if (!region_data)
+        continue;
+      if (GetDataValueFromMap(
+              region.get(), Key::kModuleExtraMemoryRegionAddress, &address)) {
+        const std::vector<uint8_t>& bytes = region_data->bytes();
+        vm_size_t data_size = bytes.size();
+        if (data_size == 0)
+          continue;
+
+        const vm_address_t data =
+            reinterpret_cast<const vm_address_t>(bytes.data());
+
+        auto memory =
+            std::make_unique<internal::MemorySnapshotIOSIntermediateDump>();
+        memory->Initialize(address, data, data_size);
+        extra_memory_.push_back(std::move(memory));
+      }
+    }
+  }
+
+  const IOSIntermediateDumpList* intermediate_dump_extra_memory_regions_array =
+      image_data->GetAsList(
+          IntermediateDumpKey::kModuleIntermediateDumpExtraMemoryRegions);
+  if (intermediate_dump_extra_memory_regions_array) {
+    for (auto& region : *intermediate_dump_extra_memory_regions_array) {
+      vm_address_t address;
+      const IOSIntermediateDumpData* region_data =
+          region->GetAsData(Key::kModuleIntermediateDumpExtraMemoryRegionData);
+      if (!region_data)
+        continue;
+      if (GetDataValueFromMap(
+              region.get(),
+              Key::kModuleIntermediateDumpExtraMemoryRegionAddress,
+              &address)) {
+        const std::vector<uint8_t>& bytes = region_data->bytes();
+        vm_size_t data_size = bytes.size();
+        if (data_size == 0)
+          continue;
+
+        const vm_address_t data =
+            reinterpret_cast<const vm_address_t>(bytes.data());
+
+        auto memory =
+            std::make_unique<internal::MemorySnapshotIOSIntermediateDump>();
+        memory->Initialize(address, data, data_size);
+        intermediate_dump_extra_memory_.push_back(std::move(memory));
+      }
+    }
+  }
+
   const IOSIntermediateDumpMap* crash_info_dump =
       image_data->GetAsMap(IntermediateDumpKey::kAnnotationsCrashInfo);
   if (crash_info_dump) {
@@ -257,6 +323,24 @@ ModuleSnapshotIOSIntermediateDump::ExtraMemoryRanges() const {
   return std::set<CheckedRange<uint64_t>>();
 }
 
+std::vector<const MemorySnapshot*>
+ModuleSnapshotIOSIntermediateDump::ExtraMemory() const {
+  std::vector<const MemorySnapshot*> extra_memory;
+  for (const auto& memory : extra_memory_) {
+    extra_memory.push_back(memory.get());
+  }
+  return extra_memory;
+}
+
+std::vector<const MemorySnapshot*>
+ModuleSnapshotIOSIntermediateDump::IntermediateDumpExtraMemory() const {
+  std::vector<const MemorySnapshot*> intermediate_dump_extra_memory;
+  for (const auto& memory : intermediate_dump_extra_memory_) {
+    intermediate_dump_extra_memory.push_back(memory.get());
+  }
+  return intermediate_dump_extra_memory;
+}
+
 std::vector<const UserMinidumpStream*>
 ModuleSnapshotIOSIntermediateDump::CustomMinidumpStreams() const {
   return std::vector<const UserMinidumpStream*>();
diff --git a/extern/crashpad/crashpad/snapshot/ios/module_snapshot_ios_intermediate_dump.h b/extern/crashpad/crashpad/snapshot/ios/module_snapshot_ios_intermediate_dump.h
index 55b7ace880..ec7c9602a4 100644
--- a/extern/crashpad/crashpad/snapshot/ios/module_snapshot_ios_intermediate_dump.h
+++ b/extern/crashpad/crashpad/snapshot/ios/module_snapshot_ios_intermediate_dump.h
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 #include <string>
 #include <vector>
 
-#include "snapshot/crashpad_info_client_options.h"
+#include "snapshot/ios/memory_snapshot_ios_intermediate_dump.h"
 #include "snapshot/module_snapshot.h"
 #include "util/ios/ios_intermediate_dump_map.h"
 #include "util/misc/initialization_state_dcheck.h"
@@ -46,8 +46,8 @@ class ModuleSnapshotIOSIntermediateDump final : public ModuleSnapshot {
 
   //! \brief Initialize the snapshot
   //!
-  //! \param[in] exception_data The intermediate dump map used to initialize
-  //!     this object.
+  //! \param[in] image_data The intermediate dump map used to initialize this
+  //!     object.
   //!
   //! \return `true` if the snapshot could be created.
   bool Initialize(const IOSIntermediateDumpMap* image_data);
@@ -75,6 +75,10 @@ class ModuleSnapshotIOSIntermediateDump final : public ModuleSnapshot {
   std::set<CheckedRange<uint64_t>> ExtraMemoryRanges() const override;
   std::vector<const UserMinidumpStream*> CustomMinidumpStreams() const override;
 
+  // Used by ProcessSnapshot
+  std::vector<const MemorySnapshot*> ExtraMemory() const;
+  std::vector<const MemorySnapshot*> IntermediateDumpExtraMemory() const;
+
  private:
   std::string name_;
   uint64_t address_;
@@ -87,7 +91,10 @@ class ModuleSnapshotIOSIntermediateDump final : public ModuleSnapshot {
   std::vector<std::string> annotations_vector_;
   std::map<std::string, std::string> annotations_simple_map_;
   std::vector<AnnotationSnapshot> annotation_objects_;
-
+  std::vector<std::unique_ptr<internal::MemorySnapshotIOSIntermediateDump>>
+      extra_memory_;
+  std::vector<std::unique_ptr<internal::MemorySnapshotIOSIntermediateDump>>
+      intermediate_dump_extra_memory_;
   InitializationStateDcheck initialized_;
 };
 
diff --git a/extern/crashpad/crashpad/snapshot/ios/process_snapshot_ios_intermediate_dump.cc b/extern/crashpad/crashpad/snapshot/ios/process_snapshot_ios_intermediate_dump.cc
index 7f0220020d..de9caebe04 100644
--- a/extern/crashpad/crashpad/snapshot/ios/process_snapshot_ios_intermediate_dump.cc
+++ b/extern/crashpad/crashpad/snapshot/ios/process_snapshot_ios_intermediate_dump.cc
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -36,15 +36,30 @@ namespace internal {
 
 using Key = internal::IntermediateDumpKey;
 
-bool ProcessSnapshotIOSIntermediateDump::Initialize(
+bool ProcessSnapshotIOSIntermediateDump::InitializeWithFilePath(
     const base::FilePath& dump_path,
     const std::map<std::string, std::string>& annotations) {
+  IOSIntermediateDumpFilePath dump_interface;
+  if (!dump_interface.Initialize(dump_path))
+    return false;
+
+  return InitializeWithFileInterface(dump_interface, annotations);
+}
+
+bool ProcessSnapshotIOSIntermediateDump::InitializeWithFileInterface(
+    const IOSIntermediateDumpInterface& dump_interface,
+    const std::map<std::string, std::string>& annotations) {
   INITIALIZATION_STATE_SET_INITIALIZING(initialized_);
 
   annotations_simple_map_ = annotations;
+  client_id_.InitializeToZero();
 
-  if (!reader_.Initialize(dump_path)) {
+  IOSIntermediateDumpReaderInitializeResult result =
+      reader_.Initialize(dump_interface);
+  if (result == IOSIntermediateDumpReaderInitializeResult::kFailure) {
     return false;
+  } else if (result == IOSIntermediateDumpReaderInitializeResult::kIncomplete) {
+    annotations_simple_map_["crashpad_intermediate_dump_incomplete"] = "yes";
   }
 
   const IOSIntermediateDumpMap* root_map = reader_.RootMap();
@@ -77,13 +92,28 @@ bool ProcessSnapshotIOSIntermediateDump::Initialize(
   const IOSIntermediateDumpMap* thread_times =
       process_info->GetAsMap(Key::kTaskThreadTimes);
   if (thread_times) {
-    GetDataValueFromMap(basic_info, Key::kUserTime, &thread_times_user_time_);
+    GetDataValueFromMap(thread_times, Key::kUserTime, &thread_times_user_time_);
     GetDataValueFromMap(
-        basic_info, Key::kSystemTime, &thread_times_system_time_);
+        thread_times, Key::kSystemTime, &thread_times_system_time_);
   }
 
   GetDataValueFromMap(process_info, Key::kSnapshotTime, &snapshot_time_);
 
+  const IOSIntermediateDumpList* simple_map_dump =
+      process_info->GetAsList(IntermediateDumpKey::kAnnotationsSimpleMap);
+  if (simple_map_dump) {
+    for (auto& annotation : *simple_map_dump) {
+      const IOSIntermediateDumpData* name_dump =
+          annotation->GetAsData(IntermediateDumpKey::kAnnotationName);
+      const IOSIntermediateDumpData* value_dump =
+          annotation->GetAsData(IntermediateDumpKey::kAnnotationValue);
+      if (name_dump && value_dump) {
+        annotations_simple_map_.insert(
+            make_pair(name_dump->GetString(), value_dump->GetString()));
+      }
+    }
+  }
+
   const IOSIntermediateDumpMap* system_info =
       GetMapFromMap(root_map, Key::kSystemInfo);
   if (!system_info) {
@@ -92,6 +122,9 @@ bool ProcessSnapshotIOSIntermediateDump::Initialize(
   }
   system_.Initialize(system_info);
 
+  annotations_simple_map_["crashpad_uptime_ns"] =
+      std::to_string(system_.CrashpadUptime());
+
   // Threads
   const IOSIntermediateDumpList* thread_list =
       GetListFromMap(root_map, Key::kThreads);
@@ -150,6 +183,16 @@ bool ProcessSnapshotIOSIntermediateDump::Initialize(
   return true;
 }
 
+void ProcessSnapshotIOSIntermediateDump::SetClientID(const UUID& client_id) {
+  INITIALIZATION_STATE_DCHECK_VALID(initialized_);
+  client_id_ = client_id;
+}
+
+void ProcessSnapshotIOSIntermediateDump::SetReportID(const UUID& report_id) {
+  INITIALIZATION_STATE_DCHECK_VALID(initialized_);
+  report_id_ = report_id;
+}
+
 pid_t ProcessSnapshotIOSIntermediateDump::ProcessID() const {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
   return p_pid_;
@@ -261,7 +304,25 @@ std::vector<HandleSnapshot> ProcessSnapshotIOSIntermediateDump::Handles()
 std::vector<const MemorySnapshot*>
 ProcessSnapshotIOSIntermediateDump::ExtraMemory() const {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
-  return std::vector<const MemorySnapshot*>();
+  std::vector<const MemorySnapshot*> extra_memory;
+  for (const auto& module : modules_) {
+    for (const auto& memory : module->ExtraMemory()) {
+      extra_memory.push_back(memory);
+    }
+  }
+  return extra_memory;
+}
+
+std::vector<const MemorySnapshot*>
+ProcessSnapshotIOSIntermediateDump::IntermediateDumpExtraMemory() const {
+  INITIALIZATION_STATE_DCHECK_VALID(initialized_);
+  std::vector<const MemorySnapshot*> intermediate_dump_extra_memory;
+  for (const auto& module : modules_) {
+    for (const auto& memory : module->IntermediateDumpExtraMemory()) {
+      intermediate_dump_extra_memory.push_back(memory);
+    }
+  }
+  return intermediate_dump_extra_memory;
 }
 
 const ProcessMemory* ProcessSnapshotIOSIntermediateDump::Memory() const {
diff --git a/extern/crashpad/crashpad/snapshot/ios/process_snapshot_ios_intermediate_dump.h b/extern/crashpad/crashpad/snapshot/ios/process_snapshot_ios_intermediate_dump.h
index 61312f0741..1bdedcf10c 100644
--- a/extern/crashpad/crashpad/snapshot/ios/process_snapshot_ios_intermediate_dump.h
+++ b/extern/crashpad/crashpad/snapshot/ios/process_snapshot_ios_intermediate_dump.h
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -46,24 +46,38 @@ class ProcessSnapshotIOSIntermediateDump final : public ProcessSnapshot {
 
   //! \brief Initializes the object.
   //!
-  //! \param[in] dump_path A class containing various system data points.
+  //! \param[in] dump_path The intermediate dump to read.
+  //! \param[in] annotations Process annotations to set in each crash report.
   //!
   //! \return `true` if the snapshot could be created, `false` otherwise with
   //!     an appropriate message logged.
-  bool Initialize(const base::FilePath& dump_path,
-                  const std::map<std::string, std::string>& annotations);
+  bool InitializeWithFilePath(
+      const base::FilePath& dump_path,
+      const std::map<std::string, std::string>& annotations);
+
+  //! \brief Initializes the object.
+  //!
+  //! \param[in] dump_interface An interface corresponding to an intermediate
+  //!     dump file.
+  //! \param[in] annotations Process annotations to set in each crash report.
+  //!
+  //! \return `true` if the snapshot could be created, `false` otherwise with
+  //!     an appropriate message logged.
+  bool InitializeWithFileInterface(
+      const IOSIntermediateDumpInterface& dump_interface,
+      const std::map<std::string, std::string>& annotations);
 
   //! On iOS, the client ID is under the control of the snapshot producer,
   //! which may call this method to set the client ID. If this is not done,
   //! ClientID() will return an identifier consisting entirely of zeroes.
-  void SetClientID(const UUID& client_id) { client_id_ = client_id; }
+  void SetClientID(const UUID& client_id);
 
   //! \brief Sets the value to be returned by ReportID().
   //!
   //! On iOS, the crash report ID is under the control of the snapshot
   //! producer, which may call this method to set the report ID. If this is not
   //! done, ReportID() will return an identifier consisting entirely of zeroes.
-  void SetReportID(const UUID& report_id) { report_id_ = report_id; }
+  void SetReportID(const UUID& report_id);
 
   // ProcessSnapshot:
   pid_t ProcessID() const override;
@@ -85,6 +99,11 @@ class ProcessSnapshotIOSIntermediateDump final : public ProcessSnapshot {
   std::vector<const MemorySnapshot*> ExtraMemory() const override;
   const ProcessMemory* Memory() const override;
 
+  // Returns ModuleSnapshotIOSIntermediateDump::IntermediateDumpExtraMemory
+  // stored in the intermediate dump. This is used by UserExtensionStreams for
+  // processing the snapshot. This memory will not be written to a minidump
+  std::vector<const MemorySnapshot*> IntermediateDumpExtraMemory() const;
+
  private:
   // Retain the reader for the lifetime of the ProcessSnapshot so large chunks
   // of data do not need to be copied around (such as MemorySnapshot
@@ -107,6 +126,8 @@ class ProcessSnapshotIOSIntermediateDump final : public ProcessSnapshot {
   UUID client_id_;
   std::map<std::string, std::string> annotations_simple_map_;
   timeval snapshot_time_;
+  std::vector<std::unique_ptr<internal::MemorySnapshotIOSIntermediateDump>>
+      extra_memory_;
   InitializationStateDcheck initialized_;
 };
 
diff --git a/extern/crashpad/crashpad/snapshot/ios/process_snapshot_ios_intermediate_dump_test.cc b/extern/crashpad/crashpad/snapshot/ios/process_snapshot_ios_intermediate_dump_test.cc
index 0bc9247b33..69cb43ed6b 100644
--- a/extern/crashpad/crashpad/snapshot/ios/process_snapshot_ios_intermediate_dump_test.cc
+++ b/extern/crashpad/crashpad/snapshot/ios/process_snapshot_ios_intermediate_dump_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2021 The Crashpad Authors. All rights reserved.
+// Copyright 2021 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,7 +16,8 @@
 
 #include <mach-o/loader.h>
 
-#include "base/cxx17_backports.h"
+#include <algorithm>
+
 #include "base/files/scoped_file.h"
 #include "base/posix/eintr_wrapper.h"
 #include "build/build_config.h"
@@ -25,6 +26,7 @@
 #include "minidump/minidump_file_writer.h"
 #include "test/errors.h"
 #include "test/scoped_temp_dir.h"
+#include "test/test_paths.h"
 #include "util/file/file_io.h"
 #include "util/file/filesystem.h"
 #include "util/file/string_file.h"
@@ -50,7 +52,9 @@ class ReadToString : public crashpad::MemorySnapshot::Delegate {
 
 class ProcessSnapshotIOSIntermediateDumpTest : public testing::Test {
  protected:
-  // testing::Test:
+  ProcessSnapshotIOSIntermediateDumpTest()
+      : long_annotation_name_(Annotation::kNameMaxLength, 'a'),
+        long_annotation_value_(Annotation::kValueMaxSize, 'b') {}
 
   void SetUp() override {
     path_ = temp_dir_.path().Append("dump_file");
@@ -60,6 +64,7 @@ class ProcessSnapshotIOSIntermediateDumpTest : public testing::Test {
   }
 
   void TearDown() override {
+    CloseWriter();
     writer_.reset();
     EXPECT_FALSE(IsRegularFile(path_));
   }
@@ -155,11 +160,22 @@ class ProcessSnapshotIOSIntermediateDumpTest : public testing::Test {
       EXPECT_TRUE(writer->AddProperty(Key::kWired, &count));
       EXPECT_TRUE(writer->AddProperty(Key::kFree, &count));
     }
+
+    uint64_t crashpad_report_time_nanos = 1234567890;
+    EXPECT_TRUE(
+        writer->AddProperty(Key::kCrashpadUptime, &crashpad_report_time_nanos));
   }
 
-  void WriteAnnotations(IOSIntermediateDumpWriter* writer) {
-    constexpr char annotation_name[] = "annotation_name";
-    constexpr char annotation_value[] = "annotation_value";
+  void WriteAnnotations(IOSIntermediateDumpWriter* writer,
+                        bool use_long_annotations) {
+    constexpr char short_annotation_name[] = "annotation_name";
+    constexpr char short_annotation_value[] = "annotation_value";
+    const char* const annotation_name = use_long_annotations
+                                            ? long_annotation_name_.c_str()
+                                            : short_annotation_name;
+    const char* const annotation_value = use_long_annotations
+                                             ? long_annotation_value_.c_str()
+                                             : short_annotation_value;
     {
       IOSIntermediateDumpWriter::ScopedArray annotationObjectArray(
           writer, Key::kAnnotationObjects);
@@ -197,14 +213,18 @@ class ProcessSnapshotIOSIntermediateDumpTest : public testing::Test {
     }
   }
 
-  void WriteModules(IOSIntermediateDumpWriter* writer) {
+  void WriteModules(IOSIntermediateDumpWriter* writer,
+                    bool has_module_path,
+                    bool use_long_annotations) {
     IOSIntermediateDumpWriter::ScopedArray moduleArray(writer, Key::kModules);
     for (uint32_t image_index = 0; image_index < 2; ++image_index) {
       IOSIntermediateDumpWriter::ScopedArrayMap modules(writer);
 
-      constexpr char image_file[] = "/path/to/module";
-      EXPECT_TRUE(
-          writer->AddProperty(Key::kName, image_file, strlen(image_file)));
+      if (has_module_path) {
+        constexpr char image_file[] = "/path/to/module";
+        EXPECT_TRUE(
+            writer->AddProperty(Key::kName, image_file, strlen(image_file)));
+      }
 
       uint64_t address = 0;
       uint64_t vmsize = 1;
@@ -236,43 +256,66 @@ class ProcessSnapshotIOSIntermediateDumpTest : public testing::Test {
       EXPECT_TRUE(writer->AddProperty(Key::kSourceVersion, &source_version));
       EXPECT_TRUE(writer->AddProperty(Key::kUUID, &uuid));
       EXPECT_TRUE(writer->AddProperty(Key::kFileType, &filetype));
-      WriteAnnotations(writer);
+      WriteAnnotations(writer, use_long_annotations);
     }
   }
 
-  void ExpectModules(const std::vector<const ModuleSnapshot*>& modules) {
+  void ExpectModules(const std::vector<const ModuleSnapshot*>& modules,
+                     bool expect_module_path,
+                     bool expect_long_annotations) {
     for (auto module : modules) {
       EXPECT_EQ(module->GetModuleType(),
                 ModuleSnapshot::kModuleTypeSharedLibrary);
-      EXPECT_STREQ(module->Name().c_str(), "/path/to/module");
-      EXPECT_STREQ(module->DebugFileName().c_str(), "module");
+
+      if (expect_module_path) {
+        EXPECT_STREQ(module->Name().c_str(), "/path/to/module");
+        EXPECT_STREQ(module->DebugFileName().c_str(), "module");
+      }
       UUID uuid;
       uint32_t age;
       module->UUIDAndAge(&uuid, &age);
       EXPECT_EQ(uuid.ToString(), "00010203-0405-0607-0809-0a0b0c0d0e0f");
 
       for (auto annotation : module->AnnotationsVector()) {
-        EXPECT_STREQ(annotation.c_str(), "annotation_value");
+        if (expect_long_annotations) {
+          EXPECT_EQ(annotation, long_annotation_value_);
+        } else {
+          EXPECT_STREQ(annotation.c_str(), "annotation_value");
+        }
       }
 
       for (const auto& it : module->AnnotationsSimpleMap()) {
-        EXPECT_STREQ(it.first.c_str(), "annotation_name");
-        EXPECT_STREQ(it.second.c_str(), "annotation_value");
+        if (expect_long_annotations) {
+          EXPECT_EQ(it.first, long_annotation_name_);
+          EXPECT_EQ(it.second, long_annotation_value_);
+        } else {
+          EXPECT_STREQ(it.first.c_str(), "annotation_name");
+          EXPECT_STREQ(it.second.c_str(), "annotation_value");
+        }
       }
 
       for (auto annotation_object : module->AnnotationObjects()) {
-        EXPECT_STREQ(annotation_object.name.c_str(), "annotation_name");
         EXPECT_EQ(annotation_object.type, (short)Annotation::Type::kString);
-        EXPECT_STREQ(std::string(reinterpret_cast<const char*>(
-                                     annotation_object.value.data()),
-                                 annotation_object.value.size())
-                         .c_str(),
-                     "annotation_value");
+        if (expect_long_annotations) {
+          EXPECT_EQ(annotation_object.name, long_annotation_name_);
+          EXPECT_EQ(std::string(reinterpret_cast<const char*>(
+                                    annotation_object.value.data()),
+                                annotation_object.value.size()),
+                    long_annotation_value_);
+        } else {
+          EXPECT_STREQ(annotation_object.name.c_str(), "annotation_name");
+          EXPECT_STREQ(std::string(reinterpret_cast<const char*>(
+                                       annotation_object.value.data()),
+                                   annotation_object.value.size())
+                           .c_str(),
+                       "annotation_value");
+        }
       }
     }
   }
 
-  void WriteMachException(IOSIntermediateDumpWriter* writer) {
+  void WriteMachException(IOSIntermediateDumpWriter* writer,
+                          bool short_context = false) {
     IOSIntermediateDumpWriter::ScopedMap machExceptionMap(writer,
                                                           Key::kMachException);
     exception_type_t exception = 5;
@@ -297,6 +340,10 @@ class ProcessSnapshotIOSIntermediateDumpTest : public testing::Test {
     EXPECT_TRUE(writer->AddProperty(Key::kException, &exception));
     EXPECT_TRUE(writer->AddProperty(Key::kCodes, code, code_count));
     EXPECT_TRUE(writer->AddProperty(Key::kFlavor, &flavor));
+
+    if (short_context) {
+      state_length -= 10;
+    }
     EXPECT_TRUE(writer->AddPropertyBytes(
         Key::kState, reinterpret_cast<const void*>(&state), state_length));
     uint64_t thread_id = 1;
@@ -336,9 +383,8 @@ class ProcessSnapshotIOSIntermediateDumpTest : public testing::Test {
       stack_region_address += 10;
       EXPECT_TRUE(
           writer->AddProperty(Key::kStackRegionAddress, &stack_region_address));
-      constexpr char memory_region[] = "stack_data";
       EXPECT_TRUE(
-          writer->AddPropertyBytes(Key::kStackRegionData, memory_region, 10));
+          writer->AddPropertyBytes(Key::kStackRegionData, "stack_data", 10));
       {
         IOSIntermediateDumpWriter::ScopedArray memoryRegions(
             writer, Key::kThreadContextMemoryRegions);
@@ -347,11 +393,11 @@ class ProcessSnapshotIOSIntermediateDumpTest : public testing::Test {
           const vm_address_t memory_region_address = 0;
           EXPECT_TRUE(writer->AddProperty(
               Key::kThreadContextMemoryRegionAddress, &memory_region_address));
-          constexpr char memory_region[] = "string";
           EXPECT_TRUE(writer->AddPropertyBytes(
-              Key::kThreadContextMemoryRegionData, memory_region, 6));
+              Key::kThreadContextMemoryRegionData, "string", 6));
         }
       }
+      EXPECT_TRUE(writer->AddPropertyBytes(Key::kThreadName, "ariadne", 7));
     }
   }
 
@@ -371,6 +417,7 @@ class ProcessSnapshotIOSIntermediateDumpTest : public testing::Test {
     uint64_t thread_id = 1;
     for (auto thread : threads) {
       EXPECT_EQ(thread->ThreadID(), thread_id);
+      EXPECT_EQ(thread->ThreadName(), "ariadne");
       EXPECT_EQ(thread->SuspendCount(), 666);
       EXPECT_EQ(thread->Priority(), 5);
       EXPECT_EQ(thread->ThreadSpecificDataAddress(), thread_id++);
@@ -420,7 +467,9 @@ class ProcessSnapshotIOSIntermediateDumpTest : public testing::Test {
     EXPECT_STREQ(daylight_name.c_str(), "Daylight");
   }
 
-  void ExpectSnapshot(const ProcessSnapshot& snapshot) {
+  void ExpectSnapshot(const ProcessSnapshot& snapshot,
+                      bool expect_module_path,
+                      bool expect_long_annotations) {
     EXPECT_EQ(snapshot.ProcessID(), 2);
     EXPECT_EQ(snapshot.ParentProcessID(), 1);
 
@@ -443,28 +492,36 @@ class ProcessSnapshotIOSIntermediateDumpTest : public testing::Test {
 
     ExpectSystem(*snapshot.System());
     ExpectThreads(snapshot.Threads());
-    ExpectModules(snapshot.Modules());
+    ExpectModules(
+        snapshot.Modules(), expect_module_path, expect_long_annotations);
     ExpectMachException(*snapshot.Exception());
+
+    auto map = snapshot.AnnotationsSimpleMap();
+    EXPECT_EQ(map["crashpad_uptime_ns"], "1234567890");
   }
 
+  void CloseWriter() { EXPECT_TRUE(writer_->Close()); }
+
  private:
   std::unique_ptr<internal::IOSIntermediateDumpWriter> writer_;
   ScopedTempDir temp_dir_;
   base::FilePath path_;
   std::map<std::string, std::string> annotations_;
+  const std::string long_annotation_name_;
+  const std::string long_annotation_value_;
 };
 
 TEST_F(ProcessSnapshotIOSIntermediateDumpTest, InitializeNoFile) {
   const base::FilePath file;
   ProcessSnapshotIOSIntermediateDump process_snapshot;
-  EXPECT_FALSE(process_snapshot.Initialize(file, annotations()));
+  EXPECT_FALSE(process_snapshot.InitializeWithFilePath(file, annotations()));
   EXPECT_TRUE(LoggingRemoveFile(path()));
   EXPECT_FALSE(IsRegularFile(path()));
 }
 
 TEST_F(ProcessSnapshotIOSIntermediateDumpTest, InitializeEmpty) {
   ProcessSnapshotIOSIntermediateDump process_snapshot;
-  EXPECT_FALSE(process_snapshot.Initialize(path(), annotations()));
+  EXPECT_FALSE(process_snapshot.InitializeWithFilePath(path(), annotations()));
   EXPECT_FALSE(IsRegularFile(path()));
 }
 
@@ -476,8 +533,9 @@ TEST_F(ProcessSnapshotIOSIntermediateDumpTest, InitializeMinimumDump) {
     { IOSIntermediateDumpWriter::ScopedMap map(writer(), Key::kSystemInfo); }
     { IOSIntermediateDumpWriter::ScopedMap map(writer(), Key::kProcessInfo); }
   }
+  CloseWriter();
   ProcessSnapshotIOSIntermediateDump process_snapshot;
-  ASSERT_TRUE(process_snapshot.Initialize(path(), annotations()));
+  ASSERT_TRUE(process_snapshot.InitializeWithFilePath(path(), annotations()));
   EXPECT_FALSE(IsRegularFile(path()));
   EXPECT_TRUE(DumpSnapshot(process_snapshot));
 }
@@ -489,8 +547,9 @@ TEST_F(ProcessSnapshotIOSIntermediateDumpTest, MissingSystemDump) {
     EXPECT_TRUE(writer()->AddProperty(Key::kVersion, &version));
     { IOSIntermediateDumpWriter::ScopedMap map(writer(), Key::kProcessInfo); }
   }
+  CloseWriter();
   ProcessSnapshotIOSIntermediateDump process_snapshot;
-  ASSERT_FALSE(process_snapshot.Initialize(path(), annotations()));
+  ASSERT_FALSE(process_snapshot.InitializeWithFilePath(path(), annotations()));
   EXPECT_FALSE(IsRegularFile(path()));
 }
 
@@ -501,8 +560,9 @@ TEST_F(ProcessSnapshotIOSIntermediateDumpTest, MissingProcessDump) {
     EXPECT_TRUE(writer()->AddProperty(Key::kVersion, &version));
     { IOSIntermediateDumpWriter::ScopedMap map(writer(), Key::kSystemInfo); }
   }
+  CloseWriter();
   ProcessSnapshotIOSIntermediateDump process_snapshot;
-  ASSERT_FALSE(process_snapshot.Initialize(path(), annotations()));
+  ASSERT_FALSE(process_snapshot.InitializeWithFilePath(path(), annotations()));
   EXPECT_FALSE(IsRegularFile(path()));
 }
 
@@ -517,6 +577,18 @@ TEST_F(ProcessSnapshotIOSIntermediateDumpTest, EmptySignalDump) {
       IOSIntermediateDumpWriter::ScopedMap map(writer(), Key::kSignalException);
       uint64_t thread_id = 1;
       EXPECT_TRUE(writer()->AddProperty(Key::kThreadID, &thread_id));
+      {
+        IOSIntermediateDumpWriter::ScopedArray contextMemoryRegions(
+            writer(), Key::kThreadContextMemoryRegions);
+        IOSIntermediateDumpWriter::ScopedArrayMap memoryMap(writer());
+
+        std::string random_data("random_data");
+        EXPECT_TRUE(writer()->AddProperty(
+            Key::kThreadContextMemoryRegionAddress, &thread_id));
+        EXPECT_TRUE(writer()->AddProperty(Key::kThreadContextMemoryRegionData,
+                                          random_data.c_str(),
+                                          random_data.length()));
+      }
     }
     {
       IOSIntermediateDumpWriter::ScopedArray threadArray(writer(),
@@ -526,8 +598,15 @@ TEST_F(ProcessSnapshotIOSIntermediateDumpTest, EmptySignalDump) {
       writer()->AddProperty(Key::kThreadID, &thread_id);
     }
   }
+  CloseWriter();
   ProcessSnapshotIOSIntermediateDump process_snapshot;
-  ASSERT_TRUE(process_snapshot.Initialize(path(), annotations()));
+  ASSERT_TRUE(process_snapshot.InitializeWithFilePath(path(), annotations()));
+  EXPECT_EQ(process_snapshot.Exception()->ExtraMemory().size(), 1u);
+  ReadToString delegate;
+  for (auto memory : process_snapshot.Exception()->ExtraMemory()) {
+    memory->Read(&delegate);
+    EXPECT_STREQ(delegate.result.c_str(), "random_data");
+  }
   EXPECT_FALSE(IsRegularFile(path()));
   EXPECT_TRUE(DumpSnapshot(process_snapshot));
 }
@@ -552,8 +631,9 @@ TEST_F(ProcessSnapshotIOSIntermediateDumpTest, EmptyMachDump) {
       writer()->AddProperty(Key::kThreadID, &thread_id);
     }
   }
+  CloseWriter();
   ProcessSnapshotIOSIntermediateDump process_snapshot;
-  ASSERT_TRUE(process_snapshot.Initialize(path(), annotations()));
+  ASSERT_TRUE(process_snapshot.InitializeWithFilePath(path(), annotations()));
   EXPECT_FALSE(IsRegularFile(path()));
   EXPECT_TRUE(DumpSnapshot(process_snapshot));
 }
@@ -578,8 +658,9 @@ TEST_F(ProcessSnapshotIOSIntermediateDumpTest, EmptyExceptionDump) {
       writer()->AddProperty(Key::kThreadID, &thread_id);
     }
   }
+  CloseWriter();
   ProcessSnapshotIOSIntermediateDump process_snapshot;
-  ASSERT_TRUE(process_snapshot.Initialize(path(), annotations()));
+  ASSERT_TRUE(process_snapshot.InitializeWithFilePath(path(), annotations()));
   EXPECT_FALSE(IsRegularFile(path()));
   EXPECT_TRUE(DumpSnapshot(process_snapshot));
 }
@@ -608,12 +689,58 @@ TEST_F(ProcessSnapshotIOSIntermediateDumpTest, EmptyUncaughtNSExceptionDump) {
           Key::kThreadUncaughtNSExceptionFrames, frames, num_frames);
     }
   }
+  CloseWriter();
   ProcessSnapshotIOSIntermediateDump process_snapshot;
-  ASSERT_TRUE(process_snapshot.Initialize(path(), annotations()));
+  ASSERT_TRUE(process_snapshot.InitializeWithFilePath(path(), annotations()));
   EXPECT_FALSE(IsRegularFile(path()));
   EXPECT_TRUE(DumpSnapshot(process_snapshot));
 }
 
+TEST_F(ProcessSnapshotIOSIntermediateDumpTest, ShortContext) {
+  {
+    IOSIntermediateDumpWriter::ScopedRootMap rootMap(writer());
+    uint8_t version = 1;
+    EXPECT_TRUE(writer()->AddProperty(Key::kVersion, &version));
+    WriteSystemInfo(writer());
+    WriteProcessInfo(writer());
+    WriteThreads(writer());
+    WriteModules(
+        writer(), /*has_module_path=*/false, /*use_long_annotations=*/false);
+    WriteMachException(writer(), true /* short_context=true*/);
+  }
+  CloseWriter();
+
+  ProcessSnapshotIOSIntermediateDump process_snapshot;
+  ASSERT_TRUE(process_snapshot.InitializeWithFilePath(path(), annotations()));
+  EXPECT_FALSE(IsRegularFile(path()));
+  EXPECT_TRUE(DumpSnapshot(process_snapshot));
+  ExpectSnapshot(process_snapshot,
+                 /*expect_module_path=*/false,
+                 /*expect_long_annotations=*/false);
+}
+
+TEST_F(ProcessSnapshotIOSIntermediateDumpTest, LongAnnotations) {
+  {
+    IOSIntermediateDumpWriter::ScopedRootMap rootMap(writer());
+    uint8_t version = 1;
+    EXPECT_TRUE(writer()->AddProperty(Key::kVersion, &version));
+    WriteSystemInfo(writer());
+    WriteProcessInfo(writer());
+    WriteThreads(writer());
+    WriteModules(
+        writer(), /*has_module_path=*/false, /*use_long_annotations=*/true);
+    WriteMachException(writer());
+  }
+  CloseWriter();
+  ProcessSnapshotIOSIntermediateDump process_snapshot;
+  ASSERT_TRUE(process_snapshot.InitializeWithFilePath(path(), annotations()));
+  EXPECT_FALSE(IsRegularFile(path()));
+  EXPECT_TRUE(DumpSnapshot(process_snapshot));
+  ExpectSnapshot(process_snapshot,
+                 /*expect_module_path=*/false,
+                 /*expect_long_annotations=*/true);
+}
+
 TEST_F(ProcessSnapshotIOSIntermediateDumpTest, FullReport) {
   {
     IOSIntermediateDumpWriter::ScopedRootMap rootMap(writer());
@@ -622,14 +749,64 @@ TEST_F(ProcessSnapshotIOSIntermediateDumpTest, FullReport) {
     WriteSystemInfo(writer());
     WriteProcessInfo(writer());
     WriteThreads(writer());
-    WriteModules(writer());
+    WriteModules(
+        writer(), /*has_module_path=*/true, /*use_long_annotations=*/false);
+    WriteMachException(writer());
+  }
+  CloseWriter();
+  ProcessSnapshotIOSIntermediateDump process_snapshot;
+  ASSERT_TRUE(process_snapshot.InitializeWithFilePath(path(), annotations()));
+  EXPECT_FALSE(IsRegularFile(path()));
+  EXPECT_TRUE(DumpSnapshot(process_snapshot));
+  ExpectSnapshot(process_snapshot,
+                 /*expect_module_path=*/true,
+                 /*expect_long_annotations=*/false);
+}
+
+TEST_F(ProcessSnapshotIOSIntermediateDumpTest, FuzzTestCases) {
+  base::FilePath fuzz_path = TestPaths::TestDataRoot().Append(FILE_PATH_LITERAL(
+      "snapshot/ios/testdata/crash-1fa088dda0adb41459d063078a0f384a0bb8eefa"));
+  crashpad::internal::ProcessSnapshotIOSIntermediateDump process_snapshot;
+  EXPECT_TRUE(process_snapshot.InitializeWithFilePath(fuzz_path, {}));
+  EXPECT_TRUE(LoggingRemoveFile(path()));
+
+  auto map = process_snapshot.AnnotationsSimpleMap();
+  ASSERT_TRUE(map.find("crashpad_intermediate_dump_incomplete") != map.end());
+  EXPECT_EQ(map["crashpad_intermediate_dump_incomplete"], "yes");
+
+  fuzz_path = TestPaths::TestDataRoot().Append(
+      FILE_PATH_LITERAL("snapshot/ios/testdata/crash-5726011582644224"));
+  crashpad::internal::ProcessSnapshotIOSIntermediateDump process_snapshot2;
+  EXPECT_TRUE(process_snapshot2.InitializeWithFilePath(fuzz_path, {}));
+  map = process_snapshot2.AnnotationsSimpleMap();
+  ASSERT_TRUE(map.find("crashpad_intermediate_dump_incomplete") != map.end());
+  EXPECT_EQ(map["crashpad_intermediate_dump_incomplete"], "yes");
+
+  fuzz_path = TestPaths::TestDataRoot().Append(
+      FILE_PATH_LITERAL("snapshot/ios/testdata/crash-6605504629637120"));
+  crashpad::internal::ProcessSnapshotIOSIntermediateDump process_snapshot3;
+  EXPECT_FALSE(process_snapshot3.InitializeWithFilePath(fuzz_path, {}));
+
+  fuzz_path = TestPaths::TestDataRoot().Append(
+      FILE_PATH_LITERAL("snapshot/ios/testdata/crash-c44acfcbccd8c7a8"));
+  crashpad::internal::ProcessSnapshotIOSIntermediateDump process_snapshot4;
+  EXPECT_TRUE(process_snapshot4.InitializeWithFilePath(fuzz_path, {}));
+}
+
+TEST_F(ProcessSnapshotIOSIntermediateDumpTest, WriteNoThreads) {
+  {
+    IOSIntermediateDumpWriter::ScopedRootMap rootMap(writer());
+    uint8_t version = 1;
+    EXPECT_TRUE(writer()->AddProperty(Key::kVersion, &version));
+    WriteSystemInfo(writer());
+    WriteProcessInfo(writer());
     WriteMachException(writer());
   }
+  CloseWriter();
   ProcessSnapshotIOSIntermediateDump process_snapshot;
-  ASSERT_TRUE(process_snapshot.Initialize(path(), annotations()));
+  ASSERT_TRUE(process_snapshot.InitializeWithFilePath(path(), annotations()));
   EXPECT_FALSE(IsRegularFile(path()));
   EXPECT_TRUE(DumpSnapshot(process_snapshot));
-  ExpectSnapshot(process_snapshot);
 }
 
 }  // namespace
diff --git a/extern/crashpad/crashpad/snapshot/ios/system_snapshot_ios_intermediate_dump.cc b/extern/crashpad/crashpad/snapshot/ios/system_snapshot_ios_intermediate_dump.cc
index d10e9c0a06..7dae6772ea 100644
--- a/extern/crashpad/crashpad/snapshot/ios/system_snapshot_ios_intermediate_dump.cc
+++ b/extern/crashpad/crashpad/snapshot/ios/system_snapshot_ios_intermediate_dump.cc
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,23 +15,13 @@
 #include "snapshot/ios/system_snapshot_ios_intermediate_dump.h"
 
 #include <mach/mach.h>
-#include <stddef.h>
 #include <sys/sysctl.h>
 #include <sys/types.h>
 #include <sys/utsname.h>
 
-#include <algorithm>
-
-#include "base/logging.h"
-#include "base/mac/mach_logging.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
-#include "snapshot/cpu_context.h"
 #include "snapshot/ios/intermediate_dump_reader_util.h"
-#include "snapshot/posix/timezone.h"
-#include "util/ios/ios_intermediate_dump_data.h"
-#include "util/mac/mac_util.h"
-#include "util/numeric/in_range_cast.h"
 
 namespace crashpad {
 
@@ -57,6 +47,7 @@ SystemSnapshotIOSIntermediateDump::SystemSnapshotIOSIntermediateDump()
       daylight_offset_seconds_(0),
       standard_name_(),
       daylight_name_(),
+      address_mask_(0),
       initialized_() {}
 
 SystemSnapshotIOSIntermediateDump::~SystemSnapshotIOSIntermediateDump() {}
@@ -97,6 +88,8 @@ void SystemSnapshotIOSIntermediateDump::Initialize(
     dst_status_ = SystemSnapshot::kDoesNotObserveDaylightSavingTime;
   }
 
+  GetDataValueFromMap(system_data, Key::kAddressMask, &address_mask_);
+
   vm_size_t page_size;
   if (GetDataValueFromMap(system_data, Key::kPageSize, &page_size)) {
     const IOSIntermediateDumpMap* vm_stat =
@@ -116,6 +109,8 @@ void SystemSnapshotIOSIntermediateDump::Initialize(
     }
   }
 
+  GetDataValueFromMap(system_data, Key::kCrashpadUptime, &crashpad_uptime_ns_);
+
   INITIALIZATION_STATE_SET_VALID(initialized_);
 }
 
@@ -241,5 +236,15 @@ void SystemSnapshotIOSIntermediateDump::TimeZone(
   daylight_name->assign(daylight_name_);
 }
 
+uint64_t SystemSnapshotIOSIntermediateDump::AddressMask() const {
+  INITIALIZATION_STATE_DCHECK_VALID(initialized_);
+  return address_mask_;
+}
+
+uint64_t SystemSnapshotIOSIntermediateDump::CrashpadUptime() const {
+  INITIALIZATION_STATE_DCHECK_VALID(initialized_);
+  return crashpad_uptime_ns_;
+}
+
 }  // namespace internal
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/snapshot/ios/system_snapshot_ios_intermediate_dump.h b/extern/crashpad/crashpad/snapshot/ios/system_snapshot_ios_intermediate_dump.h
index 9708e7fd1a..80cc6ea386 100644
--- a/extern/crashpad/crashpad/snapshot/ios/system_snapshot_ios_intermediate_dump.h
+++ b/extern/crashpad/crashpad/snapshot/ios/system_snapshot_ios_intermediate_dump.h
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@
 
 #include "snapshot/system_snapshot.h"
 #include "util/ios/ios_intermediate_dump_map.h"
-#include "util/ios/ios_system_data_collector.h"
 #include "util/misc/initialization_state_dcheck.h"
 
 namespace crashpad {
@@ -44,7 +43,6 @@ class SystemSnapshotIOSIntermediateDump final : public SystemSnapshot {
   //!
   //! \param[in] system_data An intermediate dump map containing various system
   //!     data points.
-  //! \return `true` if the snapshot could be created.
   void Initialize(const IOSIntermediateDumpMap* system_data);
 
   // SystemSnapshot:
@@ -73,6 +71,11 @@ class SystemSnapshotIOSIntermediateDump final : public SystemSnapshot {
                 int* daylight_offset_seconds,
                 std::string* standard_name,
                 std::string* daylight_name) const override;
+  uint64_t AddressMask() const override;
+
+  //! \brief Returns the number of nanoseconds between Crashpad initialization
+  //!     and snapshot generation.
+  uint64_t CrashpadUptime() const;
 
  private:
   std::string os_version_build_;
@@ -91,6 +94,8 @@ class SystemSnapshotIOSIntermediateDump final : public SystemSnapshot {
   int daylight_offset_seconds_;
   std::string standard_name_;
   std::string daylight_name_;
+  uint64_t address_mask_;
+  uint64_t crashpad_uptime_ns_;
   InitializationStateDcheck initialized_;
 };
 
diff --git a/extern/crashpad/crashpad/snapshot/ios/testdata/crash-1fa088dda0adb41459d063078a0f384a0bb8eefa b/extern/crashpad/crashpad/snapshot/ios/testdata/crash-1fa088dda0adb41459d063078a0f384a0bb8eefa
new file mode 100644
index 0000000000..6f062a744b
Binary files /dev/null and b/extern/crashpad/crashpad/snapshot/ios/testdata/crash-1fa088dda0adb41459d063078a0f384a0bb8eefa differ
diff --git a/extern/crashpad/crashpad/snapshot/ios/testdata/crash-5726011582644224 b/extern/crashpad/crashpad/snapshot/ios/testdata/crash-5726011582644224
new file mode 100644
index 0000000000..c2ebe211bf
Binary files /dev/null and b/extern/crashpad/crashpad/snapshot/ios/testdata/crash-5726011582644224 differ
diff --git a/extern/crashpad/crashpad/snapshot/ios/testdata/crash-6605504629637120 b/extern/crashpad/crashpad/snapshot/ios/testdata/crash-6605504629637120
new file mode 100644
index 0000000000..1e041d9021
Binary files /dev/null and b/extern/crashpad/crashpad/snapshot/ios/testdata/crash-6605504629637120 differ
diff --git a/extern/crashpad/crashpad/snapshot/ios/testdata/crash-c44acfcbccd8c7a8 b/extern/crashpad/crashpad/snapshot/ios/testdata/crash-c44acfcbccd8c7a8
new file mode 100644
index 0000000000..5e7eb83f33
Binary files /dev/null and b/extern/crashpad/crashpad/snapshot/ios/testdata/crash-c44acfcbccd8c7a8 differ
diff --git a/extern/crashpad/crashpad/snapshot/ios/thread_snapshot_ios_intermediate_dump.cc b/extern/crashpad/crashpad/snapshot/ios/thread_snapshot_ios_intermediate_dump.cc
index 198b41a94a..af9dd2b872 100644
--- a/extern/crashpad/crashpad/snapshot/ios/thread_snapshot_ios_intermediate_dump.cc
+++ b/extern/crashpad/crashpad/snapshot/ios/thread_snapshot_ios_intermediate_dump.cc
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 
 #include "snapshot/ios/thread_snapshot_ios_intermediate_dump.h"
 
-#include "base/mac/mach_logging.h"
+#include "base/apple/mach_logging.h"
 #include "snapshot/ios/intermediate_dump_reader_util.h"
 #include "snapshot/mac/cpu_context_mac.h"
 #include "util/ios/ios_intermediate_dump_data.h"
@@ -68,8 +68,14 @@ using Key = IntermediateDumpKey;
 
 ThreadSnapshotIOSIntermediateDump::ThreadSnapshotIOSIntermediateDump()
     : ThreadSnapshot(),
+#if defined(ARCH_CPU_X86_64)
+      context_x86_64_(),
+#elif defined(ARCH_CPU_ARM64)
+      context_arm64_(),
+#endif
       context_(),
       stack_(),
+      thread_name_(),
       thread_id_(0),
       thread_specific_data_address_(0),
       suspend_count_(0),
@@ -95,6 +101,7 @@ bool ThreadSnapshotIOSIntermediateDump::Initialize(
   GetDataValueFromMap(thread_data, Key::kThreadID, &thread_id_);
   GetDataValueFromMap(
       thread_data, Key::kThreadDataAddress, &thread_specific_data_address_);
+  GetDataStringFromMap(thread_data, Key::kThreadName, &thread_name_);
 
 #if defined(ARCH_CPU_X86_64)
   typedef x86_thread_state64_t thread_state_type;
@@ -135,10 +142,11 @@ bool ThreadSnapshotIOSIntermediateDump::Initialize(
     size_t frame_count = bytes.size() / sizeof(uint64_t);
     exception_stack_memory_ =
         GenerateStackMemoryFromFrames(frames, frame_count);
-    stack_.Initialize(
-        0,
-        reinterpret_cast<vm_address_t>(&exception_stack_memory_[0]),
-        exception_stack_memory_.size());
+    vm_address_t stack_memory_addr =
+        !exception_stack_memory_.empty()
+            ? reinterpret_cast<vm_address_t>(&exception_stack_memory_[0])
+            : 0;
+    stack_.Initialize(0, stack_memory_addr, exception_stack_memory_.size());
   } else {
     stack_.Initialize(0, 0, 0);
   }
@@ -212,6 +220,11 @@ uint64_t ThreadSnapshotIOSIntermediateDump::ThreadID() const {
   return thread_id_;
 }
 
+std::string ThreadSnapshotIOSIntermediateDump::ThreadName() const {
+  INITIALIZATION_STATE_DCHECK_VALID(initialized_);
+  return thread_name_;
+}
+
 int ThreadSnapshotIOSIntermediateDump::SuspendCount() const {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
   return suspend_count_;
@@ -229,6 +242,7 @@ uint64_t ThreadSnapshotIOSIntermediateDump::ThreadSpecificDataAddress() const {
 
 std::vector<const MemorySnapshot*>
 ThreadSnapshotIOSIntermediateDump::ExtraMemory() const {
+  INITIALIZATION_STATE_DCHECK_VALID(initialized_);
   std::vector<const MemorySnapshot*> extra_memory;
   for (const auto& memory : extra_memory_) {
     extra_memory.push_back(memory.get());
diff --git a/extern/crashpad/crashpad/snapshot/ios/thread_snapshot_ios_intermediate_dump.h b/extern/crashpad/crashpad/snapshot/ios/thread_snapshot_ios_intermediate_dump.h
index cf9ccec023..e8b1578d74 100644
--- a/extern/crashpad/crashpad/snapshot/ios/thread_snapshot_ios_intermediate_dump.h
+++ b/extern/crashpad/crashpad/snapshot/ios/thread_snapshot_ios_intermediate_dump.h
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
 #ifndef CRASHPAD_SNAPSHOT_IOS_INTERMEDIATE_DUMP_THREAD_SNAPSHOT_IOS_INTERMEDIATEDUMP_H_
 #define CRASHPAD_SNAPSHOT_IOS_INTERMEDIATE_DUMP_THREAD_SNAPSHOT_IOS_INTERMEDIATEDUMP_H_
 
+#include <string>
+
 #include "build/build_config.h"
 #include "snapshot/cpu_context.h"
 #include "snapshot/ios/memory_snapshot_ios_intermediate_dump.h"
@@ -49,6 +51,7 @@ class ThreadSnapshotIOSIntermediateDump final : public ThreadSnapshot {
   const CPUContext* Context() const override;
   const MemorySnapshot* Stack() const override;
   uint64_t ThreadID() const override;
+  std::string ThreadName() const override;
   int SuspendCount() const override;
   int Priority() const override;
   uint64_t ThreadSpecificDataAddress() const override;
@@ -65,6 +68,7 @@ class ThreadSnapshotIOSIntermediateDump final : public ThreadSnapshot {
   CPUContext context_;
   std::vector<uint8_t> exception_stack_memory_;
   MemorySnapshotIOSIntermediateDump stack_;
+  std::string thread_name_;
   uint64_t thread_id_;
   uint64_t thread_specific_data_address_;
   int suspend_count_;
diff --git a/extern/crashpad/crashpad/snapshot/linux/capture_memory_delegate_linux.cc b/extern/crashpad/crashpad/snapshot/linux/capture_memory_delegate_linux.cc
new file mode 100644
index 0000000000..09b9c14dac
--- /dev/null
+++ b/extern/crashpad/crashpad/snapshot/linux/capture_memory_delegate_linux.cc
@@ -0,0 +1,75 @@
+// Copyright 2021 The Crashpad Authors
+//
+// 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.
+
+#include "snapshot/linux/capture_memory_delegate_linux.h"
+
+#include <utility>
+
+#include "base/numerics/safe_conversions.h"
+#include "snapshot/memory_snapshot_generic.h"
+
+namespace crashpad {
+namespace internal {
+
+CaptureMemoryDelegateLinux::CaptureMemoryDelegateLinux(
+    ProcessReaderLinux* process_reader,
+    const ProcessReaderLinux::Thread* thread_opt,
+    std::vector<std::unique_ptr<MemorySnapshotGeneric>>* snapshots,
+    uint32_t* budget_remaining)
+    : stack_(thread_opt ? thread_opt->stack_region_address : 0,
+             thread_opt ? thread_opt->stack_region_size : 0),
+      process_reader_(process_reader),
+      snapshots_(snapshots),
+      budget_remaining_(budget_remaining) {}
+
+bool CaptureMemoryDelegateLinux::Is64Bit() const {
+  return process_reader_->Is64Bit();
+}
+
+bool CaptureMemoryDelegateLinux::ReadMemory(uint64_t at,
+                                            uint64_t num_bytes,
+                                            void* into) const {
+  return process_reader_->Memory()->Read(
+      at, base::checked_cast<size_t>(num_bytes), into);
+}
+
+std::vector<CheckedRange<uint64_t>>
+CaptureMemoryDelegateLinux::GetReadableRanges(
+    const CheckedRange<uint64_t, uint64_t>& range) const {
+  return process_reader_->GetMemoryMap()->GetReadableRanges(range);
+}
+
+void CaptureMemoryDelegateLinux::AddNewMemorySnapshot(
+    const CheckedRange<uint64_t, uint64_t>& range) {
+  // Don't bother storing this memory if it points back into the stack.
+  if (stack_.ContainsRange(range))
+    return;
+  if (range.size() == 0)
+    return;
+  if (!budget_remaining_ || *budget_remaining_ == 0)
+    return;
+  snapshots_->push_back(std::make_unique<internal::MemorySnapshotGeneric>());
+  internal::MemorySnapshotGeneric* snapshot = snapshots_->back().get();
+  snapshot->Initialize(process_reader_->Memory(), range.base(), range.size());
+  if (!base::IsValueInRangeForNumericType<int64_t>(range.size())) {
+    *budget_remaining_ = 0;
+  } else {
+    int64_t temp = *budget_remaining_;
+    temp -= range.size();
+    *budget_remaining_ = base::saturated_cast<uint32_t>(temp);
+  }
+}
+
+}  // namespace internal
+}  // namespace crashpad
diff --git a/extern/crashpad/crashpad/snapshot/linux/capture_memory_delegate_linux.h b/extern/crashpad/crashpad/snapshot/linux/capture_memory_delegate_linux.h
new file mode 100644
index 0000000000..8a8adfe62e
--- /dev/null
+++ b/extern/crashpad/crashpad/snapshot/linux/capture_memory_delegate_linux.h
@@ -0,0 +1,70 @@
+// Copyright 2021 The Crashpad Authors
+//
+// 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.
+
+#ifndef CRASHPAD_SNAPSHOT_LINUX_CAPTURE_MEMORY_DELEGATE_LINUX_H_
+#define CRASHPAD_SNAPSHOT_LINUX_CAPTURE_MEMORY_DELEGATE_LINUX_H_
+
+#include "snapshot/capture_memory.h"
+
+#include <stdint.h>
+
+#include <memory>
+#include <vector>
+
+#include "snapshot/linux/process_reader_linux.h"
+#include "util/numeric/checked_range.h"
+
+namespace crashpad {
+namespace internal {
+
+class MemorySnapshotGeneric;
+
+class CaptureMemoryDelegateLinux : public CaptureMemory::Delegate {
+ public:
+  //! \brief A MemoryCaptureDelegate for Linux.
+  //!
+  //! \param[in] process_reader A ProcessReaderLinux for the target process.
+  //! \param[in] thread_opt The thread being inspected. Memory ranges
+  //!     overlapping this thread's stack will be ignored on the assumption
+  //!     that they're already captured elsewhere. May be nullptr.
+  //! \param[in] snapshots A vector of MemorySnapshotGeneric to which the
+  //!     captured memory will be added.
+  //! \param[in] budget_remaining If non-null, a pointer to the remaining number
+  //!     of bytes to capture. If this is `0`, no further memory will be
+  //!     captured.
+  CaptureMemoryDelegateLinux(
+      ProcessReaderLinux* process_reader,
+      const ProcessReaderLinux::Thread* thread_opt,
+      std::vector<std::unique_ptr<MemorySnapshotGeneric>>* snapshots,
+      uint32_t* budget_remaining);
+
+  // MemoryCaptureDelegate:
+  bool Is64Bit() const override;
+  bool ReadMemory(uint64_t at, uint64_t num_bytes, void* into) const override;
+  std::vector<CheckedRange<uint64_t>> GetReadableRanges(
+      const CheckedRange<uint64_t, uint64_t>& range) const override;
+  void AddNewMemorySnapshot(
+      const CheckedRange<uint64_t, uint64_t>& range) override;
+
+ private:
+  CheckedRange<uint64_t, uint64_t> stack_;
+  ProcessReaderLinux* process_reader_;  // weak
+  std::vector<std::unique_ptr<MemorySnapshotGeneric>>* snapshots_;  // weak
+  uint32_t* budget_remaining_;
+};
+
+}  // namespace internal
+}  // namespace crashpad
+
+#endif  // CRASHPAD_SNAPSHOT_LINUX_CAPTURE_MEMORY_DELEGATE_LINUX_H_
diff --git a/extern/crashpad/crashpad/snapshot/linux/cpu_context_linux.cc b/extern/crashpad/crashpad/snapshot/linux/cpu_context_linux.cc
index 8464a5a27b..6c4cb3ebce 100644
--- a/extern/crashpad/crashpad/snapshot/linux/cpu_context_linux.cc
+++ b/extern/crashpad/crashpad/snapshot/linux/cpu_context_linux.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -266,6 +266,21 @@ void InitializeCPUContextARM64_OnlyFPSIMD(
   context->fpcr = float_context.fpcr;
 }
 
+#elif defined(ARCH_CPU_RISCV64)
+
+void InitializeCPUContextRISCV64(const ThreadContext::t64_t& thread_context,
+                                 const FloatContext::f64_t& float_context,
+                                 CPUContextRISCV64* context) {
+  context->pc = thread_context.pc;
+
+  static_assert(sizeof(context->regs) == sizeof(thread_context.regs));
+  memcpy(context->regs, thread_context.regs, sizeof(context->regs));
+
+  static_assert(sizeof(context->fpregs) == sizeof(float_context.fpregs));
+  memcpy(context->fpregs, float_context.fpregs, sizeof(context->fpregs));
+  context->fcsr = float_context.fcsr;
+}
+
 #endif  // ARCH_CPU_X86_FAMILY
 
 }  // namespace internal
diff --git a/extern/crashpad/crashpad/snapshot/linux/cpu_context_linux.h b/extern/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
index 9f46a48977..507d1b44dd 100644
--- a/extern/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
+++ b/extern/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -174,6 +174,20 @@ void InitializeCPUContextMIPS(
 
 #endif  // ARCH_CPU_MIPS_FAMILY || DOXYGEN
 
+#if defined(ARCH_CPU_RISCV64) || DOXYGEN
+
+//! \brief Initializes a CPUContextRISCV64 structure from native context
+//!     structures on Linux.
+//!
+//! \param[in] thread_context The native thread context.
+//! \param[in] float_context The native float context.
+//! \param[out] context The CPUContextRISCV64 structure to initialize.
+void InitializeCPUContextRISCV64(const ThreadContext::t64_t& thread_context,
+                                 const FloatContext::f64_t& float_context,
+                                 CPUContextRISCV64* context);
+
+#endif  // ARCH_CPU_RISCV64 || DOXYGEN
+
 }  // namespace internal
 }  // namespace crashpad
 
diff --git a/extern/crashpad/crashpad/snapshot/linux/debug_rendezvous.cc b/extern/crashpad/crashpad/snapshot/linux/debug_rendezvous.cc
index 42384f7433..5a03bbd859 100644
--- a/extern/crashpad/crashpad/snapshot/linux/debug_rendezvous.cc
+++ b/extern/crashpad/crashpad/snapshot/linux/debug_rendezvous.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 #include "base/logging.h"
 #include "build/build_config.h"
 
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
 #include <android/api-level.h>
 #endif
 
@@ -142,7 +142,7 @@ bool DebugRendezvous::InitializeSpecific(const ProcessMemoryRange& memory,
     modules_.push_back(entry);
   }
 
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
   // Android P (API 28) mistakenly places the vdso in the first entry in the
   // link map.
   const int android_runtime_api = android_get_device_api_level();
@@ -151,7 +151,7 @@ bool DebugRendezvous::InitializeSpecific(const ProcessMemoryRange& memory,
     modules_[0] = executable_;
     executable_ = executable;
   }
-#endif  // OS_ANDROID
+#endif  // BUILDFLAG(IS_ANDROID)
 
   return true;
 }
diff --git a/extern/crashpad/crashpad/snapshot/linux/debug_rendezvous.h b/extern/crashpad/crashpad/snapshot/linux/debug_rendezvous.h
index f92051740f..db24c1b996 100644
--- a/extern/crashpad/crashpad/snapshot/linux/debug_rendezvous.h
+++ b/extern/crashpad/crashpad/snapshot/linux/debug_rendezvous.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc b/extern/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
index c77e86263a..2efa32befc 100644
--- a/extern/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
+++ b/extern/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@
 
 #include "base/format_macros.h"
 #include "base/strings/string_number_conversions.h"
-#include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"
@@ -41,7 +40,7 @@
 #include "util/process/process_memory_linux.h"
 #include "util/process/process_memory_range.h"
 
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
 #include <android/api-level.h>
 #endif
 
@@ -103,7 +102,7 @@ void TestAgainstTarget(PtraceConnection* connection) {
   DebugRendezvous debug;
   ASSERT_TRUE(debug.Initialize(range, debug_address));
 
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
   const int android_runtime_api = android_get_device_api_level();
   ASSERT_GE(android_runtime_api, 1);
 
@@ -125,7 +124,7 @@ void TestAgainstTarget(PtraceConnection* connection) {
   // glibc's loader does not set the name for the executable.
   EXPECT_TRUE(debug.Executable()->name.empty());
   EXPECT_EQ(debug.Executable()->dynamic_array, exe_dynamic_address);
-#endif  // OS_ANDROID
+#endif  // BUILDFLAG(IS_ANDROID)
 
   // Android's loader doesn't set the load bias until Android 4.3 (API 18).
   if (android_runtime_api >= 18) {
@@ -162,7 +161,9 @@ void TestAgainstTarget(PtraceConnection* connection) {
     ASSERT_GE(possible_mappings->Count(), 1u);
 
     std::unique_ptr<ElfImageReader> module_reader;
+#if !BUILDFLAG(IS_ANDROID)
     const MemoryMap::Mapping* module_mapping = nullptr;
+#endif
     const MemoryMap::Mapping* mapping = nullptr;
     while ((mapping = possible_mappings->Next())) {
       auto parsed_module = std::make_unique<ElfImageReader>();
@@ -172,13 +173,15 @@ void TestAgainstTarget(PtraceConnection* connection) {
           parsed_module->GetDynamicArrayAddress(&dynamic_address) &&
           dynamic_address == module.dynamic_array) {
         module_reader = std::move(parsed_module);
+#if !BUILDFLAG(IS_ANDROID)
         module_mapping = mapping;
+#endif
         break;
       }
     }
     ASSERT_TRUE(module_reader.get());
 
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
     EXPECT_FALSE(module.name.empty());
 #else
     // glibc's loader doesn't always set the name in the link map for the vdso.
@@ -202,7 +205,7 @@ void TestAgainstTarget(PtraceConnection* connection) {
         module_mapping->device,
         module_mapping->inode,
         module.name);
-#endif  // OS_ANDROID
+#endif  // BUILDFLAG(IS_ANDROID)
 
     // Android's loader stops setting its own load bias after Android 4.4.4
     // (API 20) until Android 6.0 (API 23).
diff --git a/extern/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc b/extern/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
index cd40b3b12d..677afdaa77 100644
--- a/extern/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
+++ b/extern/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,12 +17,14 @@
 #include <signal.h>
 
 #include "base/logging.h"
+#include "snapshot/linux/capture_memory_delegate_linux.h"
 #include "snapshot/linux/cpu_context_linux.h"
 #include "snapshot/linux/process_reader_linux.h"
 #include "snapshot/linux/signal_context.h"
 #include "util/linux/traits.h"
 #include "util/misc/reinterpret_bytes.h"
 #include "util/numeric/safe_assignment.h"
+#include "util/posix/signals.h"
 
 namespace crashpad {
 namespace internal {
@@ -323,15 +325,71 @@ bool ExceptionSnapshotLinux::ReadContext<ContextTraits64>(
       reader, context_address, context_.mips64);
 }
 
+#elif defined(ARCH_CPU_RISCV64)
+
+static bool ReadContext(ProcessReaderLinux* reader,
+                        LinuxVMAddress context_address,
+                        typename ContextTraits64::CPUContext* dest_context) {
+  const ProcessMemory* memory = reader->Memory();
+
+  LinuxVMAddress gregs_address = context_address +
+                                 offsetof(UContext<ContextTraits64>, mcontext) +
+                                 offsetof(MContext64, regs);
+
+  typename ContextTraits64::SignalThreadContext thread_context;
+  if (!memory->Read(gregs_address, sizeof(thread_context), &thread_context)) {
+    LOG(ERROR) << "Couldn't read gregs";
+    return false;
+  }
+
+  LinuxVMAddress fpregs_address =
+      context_address + offsetof(UContext<ContextTraits64>, mcontext) +
+      offsetof(MContext64, fpregs);
+
+  typename ContextTraits64::SignalFloatContext fp_context;
+  if (!memory->Read(fpregs_address, sizeof(fp_context), &fp_context)) {
+    LOG(ERROR) << "Couldn't read fpregs";
+    return false;
+  }
+
+  InitializeCPUContextRISCV64(thread_context, fp_context, dest_context);
+
+  return true;
+}
+
+template <>
+bool ExceptionSnapshotLinux::ReadContext<ContextTraits64>(
+    ProcessReaderLinux* reader,
+    LinuxVMAddress context_address) {
+  context_.architecture = kCPUArchitectureRISCV64;
+  context_.riscv64 = &context_union_.riscv64;
+
+  return internal::ReadContext(reader, context_address, context_.riscv64);
+}
+
 #endif  // ARCH_CPU_X86_FAMILY
 
-bool ExceptionSnapshotLinux::Initialize(ProcessReaderLinux* process_reader,
-                                        LinuxVMAddress siginfo_address,
-                                        LinuxVMAddress context_address,
-                                        pid_t thread_id) {
+bool ExceptionSnapshotLinux::Initialize(
+    ProcessReaderLinux* process_reader,
+    LinuxVMAddress siginfo_address,
+    LinuxVMAddress context_address,
+    pid_t thread_id,
+    uint32_t* gather_indirectly_referenced_memory_cap) {
   INITIALIZATION_STATE_SET_INITIALIZING(initialized_);
 
   thread_id_ = thread_id;
+  const ProcessReaderLinux::Thread* thread = nullptr;
+  for (const auto& loop_thread : process_reader->Threads()) {
+    if (thread_id == loop_thread.tid) {
+      thread = &loop_thread;
+      break;
+    }
+  }
+  if (!thread) {
+    // This is allowed until {ProcessReaderLinux::InitializeThreads()} is
+    // improved to support target threads in the same thread group.
+    LOG(WARNING) << "thread ID " << thread_id << " not found in process";
+  }
 
   if (process_reader->Is64Bit()) {
     if (!ReadContext<ContextTraits64>(process_reader, context_address) ||
@@ -339,12 +397,21 @@ bool ExceptionSnapshotLinux::Initialize(ProcessReaderLinux* process_reader,
       return false;
     }
   } else {
+#if !defined(ARCH_CPU_RISCV64)
     if (!ReadContext<ContextTraits32>(process_reader, context_address) ||
         !ReadSiginfo<Traits32>(process_reader, siginfo_address)) {
       return false;
     }
+#endif
   }
 
+  CaptureMemoryDelegateLinux capture_memory_delegate(
+      process_reader,
+      thread,
+      &extra_memory_,
+      gather_indirectly_referenced_memory_cap);
+  CaptureMemory::PointedToByContext(context_, &capture_memory_delegate);
+
   INITIALIZATION_STATE_SET_VALID(initialized_);
   return true;
 }
@@ -423,6 +490,9 @@ bool ExceptionSnapshotLinux::ReadSiginfo(ProcessReaderLinux* reader,
       PUSH_CODE(siginfo.sigval.sigval);
       break;
 
+    case Signals::kSimulatedSigno:
+      break;
+
     default:
       LOG(WARNING) << "Unhandled signal " << siginfo.signo;
   }
@@ -462,7 +532,12 @@ const std::vector<uint64_t>& ExceptionSnapshotLinux::Codes() const {
 
 std::vector<const MemorySnapshot*> ExceptionSnapshotLinux::ExtraMemory() const {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
-  return std::vector<const MemorySnapshot*>();
+  std::vector<const MemorySnapshot*> result;
+  result.reserve(extra_memory_.size());
+  for (const auto& em : extra_memory_) {
+    result.push_back(em.get());
+  }
+  return result;
 }
 
 }  // namespace internal
diff --git a/extern/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h b/extern/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
index c722ac77ad..e08fce59a1 100644
--- a/extern/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
+++ b/extern/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
 #include "snapshot/exception_snapshot.h"
 #include "snapshot/linux/process_reader_linux.h"
 #include "snapshot/memory_snapshot.h"
+#include "snapshot/memory_snapshot_generic.h"
 #include "util/linux/address_types.h"
 #include "util/misc/initialization_state_dcheck.h"
 
@@ -52,13 +53,17 @@ class ExceptionSnapshotLinux final : public ExceptionSnapshot {
   //! \param[in] context_address The address in the target process' address
   //!     space of the ucontext_t passed to the signal handler.
   //! \param[in] thread_id The thread ID of the thread that received the signal.
+  //! \param[inout] gather_indirectly_referenced_memory_cap The remaining budget
+  //!     for indirectly referenced memory, honored on entry and updated on
+  //!     return.
   //!
   //! \return `true` if the snapshot could be created, `false` otherwise with
   //!     an appropriate message logged.
   bool Initialize(ProcessReaderLinux* process_reader,
                   LinuxVMAddress siginfo_address,
                   LinuxVMAddress context_address,
-                  pid_t thread_id);
+                  pid_t thread_id,
+                  uint32_t* gather_indirectly_referenced_memory_cap);
 
   // ExceptionSnapshot:
 
@@ -87,10 +92,13 @@ class ExceptionSnapshotLinux final : public ExceptionSnapshot {
 #elif defined(ARCH_CPU_MIPS_FAMILY)
     CPUContextMIPS mipsel;
     CPUContextMIPS64 mips64;
+#elif defined(ARCH_CPU_RISCV64)
+    CPUContextRISCV64 riscv64;
 #endif
   } context_union_;
   CPUContext context_;
   std::vector<uint64_t> codes_;
+  std::vector<std::unique_ptr<internal::MemorySnapshotGeneric>> extra_memory_;
   uint64_t thread_id_;
   uint64_t exception_address_;
   uint32_t signal_number_;
diff --git a/extern/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc b/extern/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
index 51d3fd3808..b351ccaa7f 100644
--- a/extern/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
+++ b/extern/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,8 +21,9 @@
 #include <ucontext.h>
 #include <unistd.h>
 
+#include <iterator>
+
 #include "base/bit_cast.h"
-#include "base/cxx17_backports.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 #include "snapshot/cpu_architecture.h"
@@ -65,8 +66,9 @@ void InitializeContext(NativeCPUContext* context) {
 
 void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
   EXPECT_EQ(actual.architecture, kCPUArchitectureX86);
-  EXPECT_EQ(actual.x86->eax,
-            bit_cast<uint32_t>(expected.ucontext.uc_mcontext.gregs[REG_EAX]));
+  EXPECT_EQ(
+      actual.x86->eax,
+      base::bit_cast<uint32_t>(expected.ucontext.uc_mcontext.gregs[REG_EAX]));
   for (unsigned int byte_offset = 0; byte_offset < sizeof(actual.x86->fxsave);
        ++byte_offset) {
     SCOPED_TRACE(base::StringPrintf("byte offset = %u\n", byte_offset));
@@ -86,7 +88,7 @@ void InitializeContext(NativeCPUContext* context) {
 void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
   EXPECT_EQ(actual.architecture, kCPUArchitectureX86_64);
   EXPECT_EQ(actual.x86_64->rax,
-            bit_cast<uint64_t>(expected.uc_mcontext.gregs[REG_RAX]));
+            base::bit_cast<uint64_t>(expected.uc_mcontext.gregs[REG_RAX]));
   for (unsigned int byte_offset = 0;
        byte_offset < sizeof(actual.x86_64->fxsave);
        ++byte_offset) {
@@ -170,7 +172,7 @@ void InitializeContext(NativeCPUContext* context) {
   test_context->vfp.head.magic = VFP_MAGIC;
   test_context->vfp.head.size = sizeof(test_context->vfp);
   memset(&test_context->vfp.context, 'v', sizeof(test_context->vfp.context));
-  for (size_t reg = 0; reg < base::size(test_context->vfp.context.vfp.fpregs);
+  for (size_t reg = 0; reg < std::size(test_context->vfp.context.vfp.fpregs);
        ++reg) {
     test_context->vfp.context.vfp.fpregs[reg] = reg;
   }
@@ -218,7 +220,7 @@ struct TestCoprocessorContext {
 void InitializeContext(NativeCPUContext* context) {
   memset(context, 'x', sizeof(*context));
 
-  for (size_t index = 0; index < base::size(context->uc_mcontext.regs);
+  for (size_t index = 0; index < std::size(context->uc_mcontext.regs);
        ++index) {
     context->uc_mcontext.regs[index] = index;
   }
@@ -237,7 +239,7 @@ void InitializeContext(NativeCPUContext* context) {
   test_context->fpsimd.head.size = sizeof(test_context->fpsimd);
   test_context->fpsimd.fpsr = 1;
   test_context->fpsimd.fpcr = 2;
-  for (size_t reg = 0; reg < base::size(test_context->fpsimd.vregs); ++reg) {
+  for (size_t reg = 0; reg < std::size(test_context->fpsimd.vregs); ++reg) {
     test_context->fpsimd.vregs[reg] = reg;
   }
 
@@ -270,7 +272,7 @@ void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
 using NativeCPUContext = ucontext_t;
 
 void InitializeContext(NativeCPUContext* context) {
-  for (size_t reg = 0; reg < base::size(context->uc_mcontext.gregs); ++reg) {
+  for (size_t reg = 0; reg < std::size(context->uc_mcontext.gregs); ++reg) {
     context->uc_mcontext.gregs[reg] = reg;
   }
   memset(&context->uc_mcontext.fpregs, 44, sizeof(context->uc_mcontext.fpregs));
@@ -285,7 +287,7 @@ void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
 #define CPU_ARCH_NAME mips64
 #endif
 
-  for (size_t reg = 0; reg < base::size(expected.uc_mcontext.gregs); ++reg) {
+  for (size_t reg = 0; reg < std::size(expected.uc_mcontext.gregs); ++reg) {
     EXPECT_EQ(actual.CPU_ARCH_NAME->regs[reg], expected.uc_mcontext.gregs[reg]);
   }
 
@@ -296,6 +298,34 @@ void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
 #undef CPU_ARCH_NAME
 }
 
+#elif defined(ARCH_CPU_RISCV64)
+using NativeCPUContext = ucontext_t;
+
+void InitializeContext(NativeCPUContext* context) {
+  for (size_t reg = 0; reg < std::size(context->uc_mcontext.__gregs); ++reg) {
+    context->uc_mcontext.__gregs[reg] = reg;
+  }
+
+  memset(&context->uc_mcontext.__fpregs,
+         44,
+         sizeof(context->uc_mcontext.__fpregs));
+}
+
+void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
+  EXPECT_EQ(actual.architecture, kCPUArchitectureRISCV64);
+
+  EXPECT_EQ(actual.riscv64->pc, expected.uc_mcontext.__gregs[0]);
+
+  for (size_t reg = 0; reg < std::size(actual.riscv64->regs); ++reg) {
+    EXPECT_EQ(actual.riscv64->regs[reg], expected.uc_mcontext.__gregs[reg + 1]);
+  }
+
+  EXPECT_EQ(memcmp(&actual.riscv64->fpregs,
+                   &expected.uc_mcontext.__fpregs,
+                   sizeof(actual.riscv64->fpregs)),
+            0);
+}
+
 #else
 #error Port.
 #endif
@@ -320,7 +350,8 @@ TEST(ExceptionSnapshotLinux, SelfBasic) {
   ASSERT_TRUE(exception.Initialize(&process_reader,
                                    FromPointerCast<LinuxVMAddress>(&siginfo),
                                    FromPointerCast<LinuxVMAddress>(&context),
-                                   gettid()));
+                                   gettid(),
+                                   nullptr));
   EXPECT_EQ(exception.Exception(), static_cast<uint32_t>(siginfo.si_signo));
   EXPECT_EQ(exception.ExceptionInfo(), static_cast<uint32_t>(siginfo.si_code));
   EXPECT_EQ(exception.ExceptionAddress(),
@@ -393,7 +424,8 @@ class RaiseTest {
     ASSERT_TRUE(exception.Initialize(&process_reader,
                                      FromPointerCast<LinuxVMAddress>(siginfo),
                                      FromPointerCast<LinuxVMAddress>(context),
-                                     gettid()));
+                                     gettid(),
+                                     nullptr));
 
     EXPECT_EQ(exception.Exception(), static_cast<uint32_t>(kSigno));
 
@@ -464,7 +496,8 @@ class TimerTest {
     ASSERT_TRUE(exception.Initialize(&process_reader,
                                      FromPointerCast<LinuxVMAddress>(siginfo),
                                      FromPointerCast<LinuxVMAddress>(context),
-                                     gettid()));
+                                     gettid(),
+                                     nullptr));
 
     EXPECT_EQ(exception.Exception(), static_cast<uint32_t>(kSigno));
 
diff --git a/extern/crashpad/crashpad/snapshot/linux/process_reader_linux.cc b/extern/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
index ee246e8bcb..45713386d9 100644
--- a/extern/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
+++ b/extern/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -24,12 +24,13 @@
 #include <algorithm>
 
 #include "base/logging.h"
+#include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "snapshot/linux/debug_rendezvous.h"
 #include "util/linux/auxiliary_vector.h"
 #include "util/linux/proc_stat_reader.h"
 
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
 #include <android/api-level.h>
 #endif
 
@@ -52,6 +53,7 @@ ProcessReaderLinux::Thread::Thread()
     : thread_info(),
       stack_region_address(0),
       stack_region_size(0),
+      name(),
       tid(-1),
       static_priority(-1),
       nice_value(-1) {}
@@ -64,6 +66,23 @@ bool ProcessReaderLinux::Thread::InitializePtrace(
     return false;
   }
 
+  // From man proc(5):
+  //
+  // /proc/[pid]/comm (since Linux 2.6.33)
+  //
+  // Different threads in the same process may have different comm values,
+  // accessible via /proc/[pid]/task/[tid]/comm.
+  const std::string path = base::StringPrintf(
+      "/proc/%d/task/%d/comm", connection->GetProcessID(), tid);
+  if (connection->ReadFileContents(base::FilePath(path), &name)) {
+    if (!name.empty() && name.back() == '\n') {
+      // Remove the final newline character.
+      name.pop_back();
+    }
+  } else {
+    // Continue on without the thread name.
+  }
+
   // TODO(jperaza): Collect scheduling priorities via the broker when they can't
   // be collected directly.
   have_priorities = false;
@@ -108,6 +127,8 @@ void ProcessReaderLinux::Thread::InitializeStack(ProcessReaderLinux* reader) {
 #elif defined(ARCH_CPU_MIPS_FAMILY)
   stack_pointer = reader->Is64Bit() ? thread_info.thread_context.t64.regs[29]
                                     : thread_info.thread_context.t32.regs[29];
+#elif defined(ARCH_CPU_RISCV64)
+  stack_pointer = thread_info.thread_context.t64.regs[1];
 #else
 #error Port.
 #endif
@@ -125,7 +146,8 @@ void ProcessReaderLinux::Thread::InitializeStackFromSP(
     LOG(WARNING) << "no stack mapping";
     return;
   }
-  LinuxVMAddress stack_region_start = stack_pointer;
+  LinuxVMAddress stack_region_start =
+      reader->Memory()->PointerToAddress(stack_pointer);
 
   // We've hit what looks like a guard page; skip to the end and check for a
   // mapped stack region.
@@ -177,11 +199,11 @@ void ProcessReaderLinux::Thread::InitializeStackFromSP(
   // at the high-address end of the stack so we can try using that to shrink
   // the stack region.
   stack_region_size = stack_end - stack_region_address;
-  if (tid != reader->ProcessID() &&
-      thread_info.thread_specific_data_address > stack_region_address &&
-      thread_info.thread_specific_data_address < stack_end) {
-    stack_region_size =
-        thread_info.thread_specific_data_address - stack_region_address;
+  VMAddress tls_address = reader->Memory()->PointerToAddress(
+      thread_info.thread_specific_data_address);
+  if (tid != reader->ProcessID() && tls_address > stack_region_address &&
+      tls_address < stack_end) {
+    stack_region_size = tls_address - stack_region_address;
   }
 }
 
@@ -281,7 +303,7 @@ const std::vector<ProcessReaderLinux::Module>& ProcessReaderLinux::Modules() {
 }
 
 void ProcessReaderLinux::InitializeAbortMessage() {
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
   const MemoryMap::Mapping* mapping =
       memory_map_.FindMappingWithName("[anon:abort message]");
   if (!mapping) {
@@ -296,7 +318,7 @@ void ProcessReaderLinux::InitializeAbortMessage() {
 #endif
 }
 
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
 
 // These structure definitions and the magic numbers below were copied from
 // bionic/libc/bionic/android_set_abort_message.cpp
@@ -345,7 +367,7 @@ void ProcessReaderLinux::ReadAbortMessage(const MemoryMap::Mapping* mapping) {
   }
 }
 
-#endif  // OS_ANDROID
+#endif  // BUILDFLAG(IS_ANDROID)
 
 const std::string& ProcessReaderLinux::AbortMessage() {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
@@ -485,7 +507,7 @@ void ProcessReaderLinux::InitializeModules() {
         continue;
       }
 
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
       // Beginning at API 21, Bionic provides android_dlopen_ext() which allows
       // passing a file descriptor with an existing relro segment to the loader.
       // This means that the mapping attributes of dyn_mapping may be unrelated
diff --git a/extern/crashpad/crashpad/snapshot/linux/process_reader_linux.h b/extern/crashpad/crashpad/snapshot/linux/process_reader_linux.h
index 0eb1d40405..0a4c7e3080 100644
--- a/extern/crashpad/crashpad/snapshot/linux/process_reader_linux.h
+++ b/extern/crashpad/crashpad/snapshot/linux/process_reader_linux.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -60,6 +60,7 @@ class ProcessReaderLinux {
     ThreadInfo thread_info;
     LinuxVMAddress stack_region_address;
     LinuxVMSize stack_region_size;
+    std::string name;
     pid_t tid;
     int sched_policy;
     int static_priority;
@@ -123,7 +124,7 @@ class ProcessReaderLinux {
   pid_t ParentProcessID() const { return process_info_.ParentProcessID(); }
 
   //! \brief Return a memory reader for the target process.
-  const ProcessMemory* Memory() const { return connection_->Memory(); }
+  const ProcessMemoryLinux* Memory() const { return connection_->Memory(); }
 
   //! \brief Return a memory map of the target process.
   MemoryMap* GetMemoryMap() { return &memory_map_; }
diff --git a/extern/crashpad/crashpad/snapshot/linux/process_reader_linux_test.cc b/extern/crashpad/crashpad/snapshot/linux/process_reader_linux_test.cc
index 250f12dabb..9c008edc14 100644
--- a/extern/crashpad/crashpad/snapshot/linux/process_reader_linux_test.cc
+++ b/extern/crashpad/crashpad/snapshot/linux/process_reader_linux_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -26,12 +26,12 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
+#include <iterator>
 #include <map>
 #include <memory>
 #include <string>
 #include <utility>
 
-#include "base/cxx17_backports.h"
 #include "base/format_macros.h"
 #include "base/memory/free_deleter.h"
 #include "base/strings/stringprintf.h"
@@ -43,6 +43,7 @@
 #include "test/linux/get_tls.h"
 #include "test/multiprocess.h"
 #include "test/scoped_module_handle.h"
+#include "test/scoped_set_thread_name.h"
 #include "test/test_paths.h"
 #include "util/file/file_io.h"
 #include "util/file/file_writer.h"
@@ -51,9 +52,10 @@
 #include "util/misc/address_sanitizer.h"
 #include "util/misc/from_pointer_cast.h"
 #include "util/misc/memory_sanitizer.h"
+#include "util/posix/scoped_mmap.h"
 #include "util/synchronization/semaphore.h"
 
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
 #include <android/api-level.h>
 #include <android/set_abort_message.h>
 #include "dlfcn_internal.h"
@@ -88,7 +90,7 @@ TEST(ProcessReaderLinux, SelfBasic) {
   EXPECT_EQ(process_reader.ParentProcessID(), getppid());
 
   static constexpr char kTestMemory[] = "Some test memory";
-  char buffer[base::size(kTestMemory)];
+  char buffer[std::size(kTestMemory)];
   ASSERT_TRUE(process_reader.Memory()->Read(
       reinterpret_cast<LinuxVMAddress>(kTestMemory),
       sizeof(kTestMemory),
@@ -169,7 +171,9 @@ class TestThreadPool {
 
   void StartThreads(size_t thread_count, size_t stack_size = 0) {
     for (size_t thread_index = 0; thread_index < thread_count; ++thread_index) {
-      threads_.push_back(std::make_unique<Thread>());
+      const std::string thread_name =
+          base::StringPrintf("ThreadPool-%zu", thread_index);
+      threads_.push_back(std::make_unique<Thread>(thread_name));
       Thread* thread = threads_.back().get();
 
       pthread_attr_t attr;
@@ -177,14 +181,21 @@ class TestThreadPool {
           << ErrnoMessage("pthread_attr_init");
 
       if (stack_size > 0) {
-        void* stack_ptr;
-        errno = posix_memalign(&stack_ptr, getpagesize(), stack_size);
-        ASSERT_EQ(errno, 0) << ErrnoMessage("posix_memalign");
-
-        thread->stack.reset(reinterpret_cast<char*>(stack_ptr));
-
-        ASSERT_EQ(pthread_attr_setstack(&attr, thread->stack.get(), stack_size),
-                  0)
+        const size_t page_size = getpagesize();
+        DCHECK_EQ(stack_size % page_size, 0u);
+        size_t stack_alloc_size = 2 * page_size + stack_size;
+
+        ASSERT_TRUE(thread->stack.ResetMmap(nullptr,
+                                            stack_alloc_size,
+                                            PROT_NONE,
+                                            MAP_PRIVATE | MAP_ANONYMOUS,
+                                            -1,
+                                            0));
+        char* stack_ptr = thread->stack.addr_as<char*>() + page_size;
+        ASSERT_EQ(mprotect(stack_ptr, stack_size, PROT_READ | PROT_WRITE), 0)
+            << "mprotect";
+
+        ASSERT_EQ(pthread_attr_setstack(&attr, stack_ptr, stack_size), 0)
             << ErrnoMessage("pthread_attr_setstack");
         thread->expectation.max_stack_size = stack_size;
       }
@@ -211,34 +222,40 @@ class TestThreadPool {
   }
 
   pid_t GetThreadExpectation(size_t thread_index,
-                             ThreadExpectation* expectation) {
+                             ThreadExpectation* expectation,
+                             std::string* thread_name_expectation) {
     CHECK_LT(thread_index, threads_.size());
 
     const Thread* thread = threads_[thread_index].get();
     *expectation = thread->expectation;
+    *thread_name_expectation = thread->name;
     return thread->tid;
   }
 
  private:
   struct Thread {
-    Thread()
+    explicit Thread(const std::string& name)
         : pthread(),
           expectation(),
           ready_semaphore(0),
           exit_semaphore(0),
-          tid(-1) {}
+          tid(-1),
+          name(name) {
+    }
     ~Thread() {}
 
     pthread_t pthread;
     ThreadExpectation expectation;
-    std::unique_ptr<char[], base::FreeDeleter> stack;
+    ScopedMmap stack;
     Semaphore ready_semaphore;
     Semaphore exit_semaphore;
     pid_t tid;
+    const std::string name;
   };
 
   static void* ThreadMain(void* argument) {
     Thread* thread = static_cast<Thread*>(argument);
+    const ScopedSetThreadName scoped_set_thread_name(thread->name);
 
     CHECK_EQ(setpriority(PRIO_PROCESS, 0, thread->expectation.nice_value), 0)
         << ErrnoMessage("setpriority");
@@ -260,20 +277,24 @@ class TestThreadPool {
 };
 
 using ThreadMap = std::map<pid_t, TestThreadPool::ThreadExpectation>;
+using ThreadNameMap = std::map<pid_t, std::string>;
 
 void ExpectThreads(const ThreadMap& thread_map,
+                   const ThreadNameMap& thread_name_map,
                    const std::vector<ProcessReaderLinux::Thread>& threads,
                    PtraceConnection* connection) {
   ASSERT_EQ(threads.size(), thread_map.size());
+  ASSERT_EQ(threads.size(), thread_name_map.size());
 
   MemoryMap memory_map;
   ASSERT_TRUE(memory_map.Initialize(connection));
 
   for (const auto& thread : threads) {
     SCOPED_TRACE(
-        base::StringPrintf("Thread id %d, tls 0x%" PRIx64
+        base::StringPrintf("Thread id %d, name %s, tls 0x%" PRIx64
                            ", stack addr 0x%" PRIx64 ", stack size 0x%" PRIx64,
                            thread.tid,
+                           thread.name.c_str(),
                            thread.thread_info.thread_specific_data_address,
                            thread.stack_region_address,
                            thread.stack_region_size));
@@ -291,9 +312,12 @@ void ExpectThreads(const ThreadMap& thread_map,
 #if !defined(ADDRESS_SANITIZER)
     // AddressSanitizer causes stack variables to be stored separately from the
     // call stack.
-    EXPECT_LE(thread.stack_region_address, iterator->second.stack_address);
-    EXPECT_GE(thread.stack_region_address + thread.stack_region_size,
-              iterator->second.stack_address);
+    EXPECT_LE(
+        thread.stack_region_address,
+        connection->Memory()->PointerToAddress(iterator->second.stack_address));
+    EXPECT_GE(
+        thread.stack_region_address + thread.stack_region_size,
+        connection->Memory()->PointerToAddress(iterator->second.stack_address));
 #endif  // !defined(ADDRESS_SANITIZER)
 
     if (iterator->second.max_stack_size) {
@@ -303,6 +327,10 @@ void ExpectThreads(const ThreadMap& thread_map,
     EXPECT_EQ(thread.sched_policy, iterator->second.sched_policy);
     EXPECT_EQ(thread.static_priority, iterator->second.static_priority);
     EXPECT_EQ(thread.nice_value, iterator->second.nice_value);
+
+    const auto& thread_name_iterator = thread_name_map.find(thread.tid);
+    ASSERT_NE(thread_name_iterator, thread_name_map.end());
+    EXPECT_EQ(thread.name, thread_name_iterator->second);
   }
 }
 
@@ -319,6 +347,7 @@ class ChildThreadTest : public Multiprocess {
  private:
   void MultiprocessParent() override {
     ThreadMap thread_map;
+    ThreadNameMap thread_name_map;
     for (size_t thread_index = 0; thread_index < kThreadCount + 1;
          ++thread_index) {
       pid_t tid;
@@ -328,6 +357,14 @@ class ChildThreadTest : public Multiprocess {
       CheckedReadFileExactly(
           ReadPipeHandle(), &expectation, sizeof(expectation));
       thread_map[tid] = expectation;
+
+      std::string::size_type thread_name_length;
+      CheckedReadFileExactly(
+          ReadPipeHandle(), &thread_name_length, sizeof(thread_name_length));
+      std::string thread_name(thread_name_length, '\0');
+      CheckedReadFileExactly(
+          ReadPipeHandle(), thread_name.data(), thread_name_length);
+      thread_name_map[tid] = thread_name;
     }
 
     DirectPtraceConnection connection;
@@ -337,19 +374,22 @@ class ChildThreadTest : public Multiprocess {
     ASSERT_TRUE(process_reader.Initialize(&connection));
     const std::vector<ProcessReaderLinux::Thread>& threads =
         process_reader.Threads();
-    ExpectThreads(thread_map, threads, &connection);
+    ExpectThreads(thread_map, thread_name_map, threads, &connection);
   }
 
   void MultiprocessChild() override {
     TestThreadPool thread_pool;
     thread_pool.StartThreads(kThreadCount, stack_size_);
 
+    const std::string current_thread_name = "MultiprocChild";
+    const ScopedSetThreadName scoped_set_thread_name(current_thread_name);
+
     TestThreadPool::ThreadExpectation expectation;
 #if defined(MEMORY_SANITIZER)
     // memset() + re-initialization is required to zero padding bytes for MSan.
     memset(&expectation, 0, sizeof(expectation));
 #endif  // defined(MEMORY_SANITIZER)
-    expectation = {};
+    expectation = {0};
     expectation.tls = GetTLS();
     expectation.stack_address = reinterpret_cast<LinuxVMAddress>(&thread_pool);
 
@@ -370,11 +410,28 @@ class ChildThreadTest : public Multiprocess {
 
     CheckedWriteFile(WritePipeHandle(), &tid, sizeof(tid));
     CheckedWriteFile(WritePipeHandle(), &expectation, sizeof(expectation));
+    const std::string::size_type current_thread_name_length =
+        current_thread_name.length();
+    CheckedWriteFile(WritePipeHandle(),
+                     &current_thread_name_length,
+                     sizeof(current_thread_name_length));
+    CheckedWriteFile(WritePipeHandle(),
+                     current_thread_name.data(),
+                     current_thread_name_length);
 
     for (size_t thread_index = 0; thread_index < kThreadCount; ++thread_index) {
-      tid = thread_pool.GetThreadExpectation(thread_index, &expectation);
+      std::string thread_name_expectation;
+      tid = thread_pool.GetThreadExpectation(
+          thread_index, &expectation, &thread_name_expectation);
       CheckedWriteFile(WritePipeHandle(), &tid, sizeof(tid));
       CheckedWriteFile(WritePipeHandle(), &expectation, sizeof(expectation));
+      const std::string::size_type thread_name_length =
+          thread_name_expectation.length();
+      CheckedWriteFile(
+          WritePipeHandle(), &thread_name_length, sizeof(thread_name_length));
+      CheckedWriteFile(WritePipeHandle(),
+                       thread_name_expectation.data(),
+                       thread_name_length);
     }
 
     CheckedReadFileAtEOF(ReadPipeHandle());
@@ -489,7 +546,7 @@ TEST(ProcessReaderLinux, MAYBE_ChildWithSplitStack) {
 }
 
 // Android doesn't provide dl_iterate_phdr on ARM until API 21.
-#if !defined(OS_ANDROID) || !defined(ARCH_CPU_ARMEL) || __ANDROID_API__ >= 21
+#if !BUILDFLAG(IS_ANDROID) || !defined(ARCH_CPU_ARMEL) || __ANDROID_API__ >= 21
 int ExpectFindModule(dl_phdr_info* info, size_t size, void* data) {
   SCOPED_TRACE(
       base::StringPrintf("module %s at 0x%" PRIx64 " phdrs 0x%" PRIx64,
@@ -499,8 +556,7 @@ int ExpectFindModule(dl_phdr_info* info, size_t size, void* data) {
   auto modules =
       reinterpret_cast<const std::vector<ProcessReaderLinux::Module>*>(data);
 
-
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
   // Prior to API 27, Bionic includes a null entry for /system/bin/linker.
   if (!info->dlpi_name) {
     EXPECT_EQ(info->dlpi_addr, 0u);
@@ -529,7 +585,7 @@ int ExpectFindModule(dl_phdr_info* info, size_t size, void* data) {
   EXPECT_TRUE(found);
   return 0;
 }
-#endif  // !OS_ANDROID || !ARCH_CPU_ARMEL || __ANDROID_API__ >= 21
+#endif  // !BUILDFLAG(IS_ANDROID) || !ARCH_CPU_ARMEL || __ANDROID_API__ >= 21
 
 void ExpectModulesFromSelf(
     const std::vector<ProcessReaderLinux::Module>& modules) {
@@ -539,14 +595,14 @@ void ExpectModulesFromSelf(
   }
 
 // Android doesn't provide dl_iterate_phdr on ARM until API 21.
-#if !defined(OS_ANDROID) || !defined(ARCH_CPU_ARMEL) || __ANDROID_API__ >= 21
+#if !BUILDFLAG(IS_ANDROID) || !defined(ARCH_CPU_ARMEL) || __ANDROID_API__ >= 21
   EXPECT_EQ(
       dl_iterate_phdr(
           ExpectFindModule,
           reinterpret_cast<void*>(
               const_cast<std::vector<ProcessReaderLinux::Module>*>(&modules))),
       0);
-#endif  // !OS_ANDROID || !ARCH_CPU_ARMEL || __ANDROID_API__ >= 21
+#endif  // !BUILDFLAG(IS_ANDROID) || !ARCH_CPU_ARMEL || __ANDROID_API__ >= 21
 }
 
 #if !defined(ADDRESS_SANITIZER) && !defined(MEMORY_SANITIZER)
@@ -638,7 +694,7 @@ TEST(ProcessReaderLinux, ChildModules) {
   test.Run();
 }
 
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
 const char kTestAbortMessage[] = "test abort message";
 
 TEST(ProcessReaderLinux, AbortMessage) {
diff --git a/extern/crashpad/crashpad/snapshot/linux/process_snapshot_linux.cc b/extern/crashpad/crashpad/snapshot/linux/process_snapshot_linux.cc
index 35f870ec76..fdd2825f14 100644
--- a/extern/crashpad/crashpad/snapshot/linux/process_snapshot_linux.cc
+++ b/extern/crashpad/crashpad/snapshot/linux/process_snapshot_linux.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 #include <utility>
 
 #include "base/logging.h"
+#include "build/build_config.h"
 #include "util/linux/exception_information.h"
 
 namespace crashpad {
@@ -39,10 +40,12 @@ bool ProcessSnapshotLinux::Initialize(PtraceConnection* connection) {
     return false;
   }
 
+  client_id_.InitializeToZero();
   system_.Initialize(&process_reader_, &snapshot_time_);
 
-  InitializeThreads();
   InitializeModules();
+  GetCrashpadOptionsInternal((&options_));
+  InitializeThreads();
   InitializeAnnotations();
 
   INITIALIZATION_STATE_SET_VALID(initialized_);
@@ -80,11 +83,17 @@ bool ProcessSnapshotLinux::InitializeException(
     info.thread_id = exception_thread_id;
   }
 
+  uint32_t* budget_remaining_pointer =
+      options_.gather_indirectly_referenced_memory == TriState::kEnabled
+          ? &options_.indirectly_referenced_memory_cap
+          : nullptr;
+
   exception_.reset(new internal::ExceptionSnapshotLinux());
   if (!exception_->Initialize(&process_reader_,
                               info.siginfo_address,
                               info.context_address,
-                              info.thread_id)) {
+                              info.thread_id,
+                              budget_remaining_pointer)) {
     exception_.reset();
     return false;
   }
@@ -100,7 +109,7 @@ bool ProcessSnapshotLinux::InitializeException(
 
       auto exc_thread_snapshot =
           std::make_unique<internal::ThreadSnapshotLinux>();
-      if (!exc_thread_snapshot->Initialize(&process_reader_, thread)) {
+      if (!exc_thread_snapshot->Initialize(&process_reader_, thread, nullptr)) {
         return false;
       }
 
@@ -124,7 +133,11 @@ bool ProcessSnapshotLinux::InitializeException(
 void ProcessSnapshotLinux::GetCrashpadOptions(
     CrashpadInfoClientOptions* options) {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
+  *options = options_;
+}
 
+void ProcessSnapshotLinux::GetCrashpadOptionsInternal(
+    CrashpadInfoClientOptions* options) {
   CrashpadInfoClientOptions local_options;
 
   for (const auto& module : modules_) {
@@ -262,10 +275,17 @@ const ProcessMemory* ProcessSnapshotLinux::Memory() const {
 void ProcessSnapshotLinux::InitializeThreads() {
   const std::vector<ProcessReaderLinux::Thread>& process_reader_threads =
       process_reader_.Threads();
+  uint32_t* budget_remaining_pointer =
+      options_.gather_indirectly_referenced_memory == TriState::kEnabled
+          ? &options_.indirectly_referenced_memory_cap
+          : nullptr;
+
   for (const ProcessReaderLinux::Thread& process_reader_thread :
        process_reader_threads) {
     auto thread = std::make_unique<internal::ThreadSnapshotLinux>();
-    if (thread->Initialize(&process_reader_, process_reader_thread)) {
+    if (thread->Initialize(&process_reader_,
+                           process_reader_thread,
+                           budget_remaining_pointer)) {
       threads_.push_back(std::move(thread));
     }
   }
@@ -287,7 +307,7 @@ void ProcessSnapshotLinux::InitializeModules() {
 }
 
 void ProcessSnapshotLinux::InitializeAnnotations() {
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
   const std::string& abort_message = process_reader_.AbortMessage();
   if (!abort_message.empty()) {
     annotations_simple_map_["abort_message"] = abort_message;
diff --git a/extern/crashpad/crashpad/snapshot/linux/process_snapshot_linux.h b/extern/crashpad/crashpad/snapshot/linux/process_snapshot_linux.h
index 62517bbf5d..3bfc1b7f75 100644
--- a/extern/crashpad/crashpad/snapshot/linux/process_snapshot_linux.h
+++ b/extern/crashpad/crashpad/snapshot/linux/process_snapshot_linux.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -139,6 +139,9 @@ class ProcessSnapshotLinux final : public ProcessSnapshot {
   void InitializeModules();
   void InitializeAnnotations();
 
+  // Initializes options_ on behalf of Initialize().
+  void GetCrashpadOptionsInternal(CrashpadInfoClientOptions* options);
+
   std::map<std::string, std::string> annotations_simple_map_;
   timeval snapshot_time_;
   UUID report_id_;
@@ -149,6 +152,7 @@ class ProcessSnapshotLinux final : public ProcessSnapshot {
   internal::SystemSnapshotLinux system_;
   ProcessReaderLinux process_reader_;
   ProcessMemoryRange memory_range_;
+  CrashpadInfoClientOptions options_;
   InitializationStateDcheck initialized_;
 };
 
diff --git a/extern/crashpad/crashpad/snapshot/linux/signal_context.h b/extern/crashpad/crashpad/snapshot/linux/signal_context.h
index 110024680b..a76852e20e 100644
--- a/extern/crashpad/crashpad/snapshot/linux/signal_context.h
+++ b/extern/crashpad/crashpad/snapshot/linux/signal_context.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,11 +16,11 @@
 #define CRASHPAD_SNAPSHOT_LINUX_SNAPSHOT_SIGNAL_CONTEXT_H_
 
 #include <signal.h>
+#include <stddef.h>
 #include <stdint.h>
 #include <sys/types.h>
 #include <sys/ucontext.h>
 
-#include <cstddef>
 #include <type_traits>
 
 #include "build/build_config.h"
@@ -119,11 +119,11 @@ template <typename Traits>
 struct Sigset<
     Traits,
     typename std::enable_if<std::is_base_of<Traits64, Traits>::value>::type> {
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
   uint64_t val;
 #else
   typename Traits::ULong val[16];
-#endif  // OS_ANDROID
+#endif  // BUILDFLAG(IS_ANDROID)
 };
 
 #if defined(ARCH_CPU_X86_FAMILY)
@@ -422,6 +422,40 @@ static_assert(offsetof(UContext<ContextTraits64>, mcontext.fpregs) ==
               "context offset mismatch");
 #endif
 
+#elif defined(ARCH_CPU_RISCV64)
+
+struct ContextTraits64 : public Traits64 {
+  using SignalThreadContext = ThreadContext::t64_t;
+  using SignalFloatContext = FloatContext::f64_t;
+  using CPUContext = CPUContextRISCV64;
+};
+
+struct MContext64 {
+  ThreadContext::t64_t regs;
+  FloatContext::f64_t fpregs;
+};
+
+template <typename Traits>
+struct UContext {
+  typename Traits::ULong flags;
+  typename Traits::Address link;
+  SignalStack<Traits> stack;
+  Sigset<Traits> sigmask;
+  char alignment_padding_[8];
+  char padding[128 - sizeof(Sigset<Traits>)];
+  MContext64 mcontext;
+};
+
+static_assert(offsetof(UContext<ContextTraits64>, mcontext) ==
+                  offsetof(ucontext_t, uc_mcontext),
+              "context offset mismatch");
+static_assert(offsetof(UContext<ContextTraits64>, mcontext.regs) ==
+                  offsetof(ucontext_t, uc_mcontext.__gregs),
+              "context offset mismatch");
+static_assert(offsetof(UContext<ContextTraits64>, mcontext.fpregs) ==
+                  offsetof(ucontext_t, uc_mcontext.__fpregs),
+              "context offset mismatch");
+
 #else
 #error Port.
 #endif  // ARCH_CPU_X86_FAMILY
diff --git a/extern/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc b/extern/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
index a99da3e4b6..99c35b3aaf 100644
--- a/extern/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
+++ b/extern/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,20 +19,22 @@
 #include <sys/utsname.h>
 
 #include <algorithm>
+#include <string_view>
 
+#include "base/check_op.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/notreached.h"
 #include "base/strings/string_number_conversions.h"
-#include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
+#include "build/build_config.h"
 #include "snapshot/cpu_context.h"
 #include "snapshot/posix/timezone.h"
 #include "util/file/file_io.h"
 #include "util/numeric/in_range_cast.h"
 #include "util/string/split_string.h"
 
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
 #include <sys/system_properties.h>
 #endif
 
@@ -61,8 +63,8 @@ bool ReadCPUsOnline(uint32_t* first_cpu, uint8_t* cpu_count) {
     std::string left, right;
     if (SplitStringFirst(range, '-', &left, &right)) {
       unsigned int start, end;
-      if (!StringToUint(base::StringPiece(left), &start) ||
-          !StringToUint(base::StringPiece(right), &end) || end <= start) {
+      if (!base::StringToUint(left, &start) ||
+          !base::StringToUint(right, &end) || end <= start) {
         LOG(ERROR) << "format error: " << range;
         return false;
       }
@@ -77,7 +79,7 @@ bool ReadCPUsOnline(uint32_t* first_cpu, uint8_t* cpu_count) {
       }
     } else {
       unsigned int cpuno;
-      if (!StringToUint(base::StringPiece(range), &cpuno)) {
+      if (!base::StringToUint(range, &cpuno)) {
         LOG(ERROR) << "format error";
         return false;
       }
@@ -109,7 +111,7 @@ bool ReadFreqFile(const std::string& filename, uint64_t* hz) {
   contents.pop_back();
 
   uint64_t khz;
-  if (!base::StringToUint64(base::StringPiece(contents), &khz)) {
+  if (!base::StringToUint64(contents, &khz)) {
     LOG(ERROR) << "format error";
     return false;
   }
@@ -118,18 +120,39 @@ bool ReadFreqFile(const std::string& filename, uint64_t* hz) {
   return true;
 }
 
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
+struct ReadPropertyData {
+  std::string* value;
+  bool read = false;
+};
+
+void ReadPropertyCallback(void* cookie,
+                          const char* name,
+                          const char* value,
+                          uint32_t serial) {
+  auto* data = static_cast<ReadPropertyData*>(cookie);
+  data->value->assign(value);
+  data->read = true;
+}
+
 bool ReadProperty(const char* property, std::string* value) {
-  char value_buffer[PROP_VALUE_MAX];
-  int length = __system_property_get(property, value_buffer);
-  if (length <= 0) {
+  const prop_info* prop = __system_property_find(property);
+  if (!prop) {
+    LOG(ERROR) << "Couldn't read property " << property;
+    return false;
+  }
+
+  ReadPropertyData data;
+  data.value = value;
+  __system_property_read_callback(prop, ReadPropertyCallback, &data);
+
+  if (!data.read) {
     LOG(ERROR) << "Couldn't read property " << property;
     return false;
   }
-  *value = value_buffer;
   return true;
 }
-#endif  // OS_ANDROID
+#endif  // BUILDFLAG(IS_ANDROID)
 
 }  // namespace
 
@@ -158,13 +181,13 @@ void SystemSnapshotLinux::Initialize(ProcessReaderLinux* process_reader,
   process_reader_ = process_reader;
   snapshot_time_ = snapshot_time;
 
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
   std::string build_string;
   if (ReadProperty("ro.build.fingerprint", &build_string)) {
     os_version_build_ = build_string;
     os_version_full_ = build_string;
   }
-#endif  // OS_ANDROID
+#endif  // BUILDFLAG(IS_ANDROID)
 
   utsname uts;
   if (uname(&uts) != 0) {
@@ -204,6 +227,8 @@ CPUArchitecture SystemSnapshotLinux::GetCPUArchitecture() const {
 #elif defined(ARCH_CPU_MIPS_FAMILY)
   return process_reader_->Is64Bit() ? kCPUArchitectureMIPS64EL
                                     : kCPUArchitectureMIPSEL;
+#elif defined(ARCH_CPU_RISCV64)
+  return kCPUArchitectureRISCV64;
 #else
 #error port to your architecture
 #endif
@@ -219,6 +244,9 @@ uint32_t SystemSnapshotLinux::CPURevision() const {
 #elif defined(ARCH_CPU_MIPS_FAMILY)
   // Not implementable on MIPS
   return 0;
+#elif defined(ARCH_CPU_RISCV64)
+  // Not implemented
+  return 0;
 #else
 #error port to your architecture
 #endif
@@ -239,6 +267,9 @@ std::string SystemSnapshotLinux::CPUVendor() const {
 #elif defined(ARCH_CPU_MIPS_FAMILY)
   // Not implementable on MIPS
   return std::string();
+#elif defined(ARCH_CPU_RISCV64)
+  // Not implemented
+  return std::string();
 #else
 #error port to your architecture
 #endif
@@ -267,7 +298,6 @@ uint32_t SystemSnapshotLinux::CPUX86Signature() const {
   return cpuid_.Signature();
 #else
   NOTREACHED();
-  return 0;
 #endif
 }
 
@@ -277,7 +307,6 @@ uint64_t SystemSnapshotLinux::CPUX86Features() const {
   return cpuid_.Features();
 #else
   NOTREACHED();
-  return 0;
 #endif
 }
 
@@ -287,7 +316,6 @@ uint64_t SystemSnapshotLinux::CPUX86ExtendedFeatures() const {
   return cpuid_.ExtendedFeatures();
 #else
   NOTREACHED();
-  return 0;
 #endif
 }
 
@@ -297,7 +325,6 @@ uint32_t SystemSnapshotLinux::CPUX86Leaf7Features() const {
   return cpuid_.Leaf7Features();
 #else
   NOTREACHED();
-  return 0;
 #endif
 }
 
@@ -307,18 +334,17 @@ bool SystemSnapshotLinux::CPUX86SupportsDAZ() const {
   return cpuid_.SupportsDAZ();
 #else
   NOTREACHED();
-  return false;
 #endif  // ARCH_CPU_X86_FMAILY
 }
 
 SystemSnapshot::OperatingSystem SystemSnapshotLinux::GetOperatingSystem()
     const {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
   return kOperatingSystemAndroid;
 #else
   return kOperatingSystemLinux;
-#endif  // OS_ANDROID
+#endif  // BUILDFLAG(IS_ANDROID)
 }
 
 bool SystemSnapshotLinux::OSServer() const {
@@ -344,7 +370,7 @@ std::string SystemSnapshotLinux::OSVersionFull() const {
 
 std::string SystemSnapshotLinux::MachineDescription() const {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
   std::string description;
   std::string prop;
   if (ReadProperty("ro.product.model", &prop)) {
@@ -359,7 +385,7 @@ std::string SystemSnapshotLinux::MachineDescription() const {
   return description;
 #else
   return std::string();
-#endif  // OS_ANDROID
+#endif  // BUILDFLAG(IS_ANDROID)
 }
 
 bool SystemSnapshotLinux::NXEnabled() const {
@@ -372,6 +398,9 @@ bool SystemSnapshotLinux::NXEnabled() const {
 #elif defined(ARCH_CPU_MIPS_FAMILY)
   // Not implementable on MIPS
   return false;
+#elif defined(ARCH_CPU_RISCV64)
+  // Not implemented
+  return false;
 #else
 #error Port.
 #endif  // ARCH_CPU_X86_FAMILY
@@ -398,13 +427,13 @@ void SystemSnapshotLinux::ReadKernelVersion(const std::string& version_string) {
     return;
   }
 
-  if (!StringToInt(base::StringPiece(versions[0]), &os_version_major_)) {
+  if (!base::StringToInt(versions[0], &os_version_major_)) {
     LOG(WARNING) << "no kernel version";
     return;
   }
   DCHECK_GE(os_version_major_, 3);
 
-  if (!StringToInt(base::StringPiece(versions[1]), &os_version_minor_)) {
+  if (!base::StringToInt(versions[1], &os_version_minor_)) {
     LOG(WARNING) << "no major revision";
     return;
   }
@@ -414,8 +443,8 @@ void SystemSnapshotLinux::ReadKernelVersion(const std::string& version_string) {
   if (minor_rev_end == std::string::npos) {
     minor_rev_end = versions[2].size();
   }
-  if (!StringToInt(base::StringPiece(versions[2].c_str(), minor_rev_end),
-                   &os_version_bugfix_)) {
+  if (!base::StringToInt(std::string_view(versions[2].c_str(), minor_rev_end),
+                         &os_version_bugfix_)) {
     LOG(WARNING) << "no minor revision";
     return;
   }
diff --git a/extern/crashpad/crashpad/snapshot/linux/system_snapshot_linux.h b/extern/crashpad/crashpad/snapshot/linux/system_snapshot_linux.h
index e13c9dfb31..75dea39e0d 100644
--- a/extern/crashpad/crashpad/snapshot/linux/system_snapshot_linux.h
+++ b/extern/crashpad/crashpad/snapshot/linux/system_snapshot_linux.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -89,6 +89,7 @@ class SystemSnapshotLinux final : public SystemSnapshot {
                 int* daylight_offset_seconds,
                 std::string* standard_name,
                 std::string* daylight_name) const override;
+  uint64_t AddressMask() const override { return 0; }
 
  private:
   void ReadKernelVersion(const std::string& version_string);
diff --git a/extern/crashpad/crashpad/snapshot/linux/system_snapshot_linux_test.cc b/extern/crashpad/crashpad/snapshot/linux/system_snapshot_linux_test.cc
index f3013b54f6..1d2b50058b 100644
--- a/extern/crashpad/crashpad/snapshot/linux/system_snapshot_linux_test.cc
+++ b/extern/crashpad/crashpad/snapshot/linux/system_snapshot_linux_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -47,7 +47,9 @@ TEST(SystemSnapshotLinux, Basic) {
 
   uint64_t current_hz, max_hz;
   system.CPUFrequency(&current_hz, &max_hz);
-  EXPECT_GE(max_hz, current_hz);
+  // For short-term loads, modern CPUs can boost single-core frequency beyond
+  // the advertised base clock. Let's assume this is no more than a factor 2.
+  EXPECT_GE(max_hz * 2, current_hz);
 
   int major, minor, bugfix;
   std::string build;
@@ -63,11 +65,11 @@ TEST(SystemSnapshotLinux, Basic) {
   system.CPURevision();
   system.NXEnabled();
 
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
   EXPECT_FALSE(system.MachineDescription().empty());
 #else
   system.MachineDescription();
-#endif  // OS_ANDROID
+#endif  // BUILDFLAG(IS_ANDROID)
 
 #if defined(ARCH_CPU_X86_FAMILY)
   system.CPUX86Signature();
diff --git a/extern/crashpad/crashpad/snapshot/linux/test_modules.cc b/extern/crashpad/crashpad/snapshot/linux/test_modules.cc
index b2450c2067..c03cbaae56 100644
--- a/extern/crashpad/crashpad/snapshot/linux/test_modules.cc
+++ b/extern/crashpad/crashpad/snapshot/linux/test_modules.cc
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -110,6 +110,13 @@ bool WriteTestModule(const base::FilePath& module_path,
   module.ehdr.e_machine = EM_AARCH64;
 #elif defined(ARCH_CPU_MIPSEL) || defined(ARCH_CPU_MIPS64EL)
   module.ehdr.e_machine = EM_MIPS;
+#elif defined(ARCH_CPU_RISCV64)
+  module.ehdr.e_machine = EM_RISCV;
+#endif
+
+#if defined(ARCH_CPU_RISCV64)
+  // Crashpad supports RV64GC
+  module.ehdr.e_flags = EF_RISCV_RVC | EF_RISCV_FLOAT_ABI_DOUBLE;
 #endif
 
   module.ehdr.e_version = EV_CURRENT;
diff --git a/extern/crashpad/crashpad/snapshot/linux/test_modules.h b/extern/crashpad/crashpad/snapshot/linux/test_modules.h
index b791480a1d..ddb034ee55 100644
--- a/extern/crashpad/crashpad/snapshot/linux/test_modules.h
+++ b/extern/crashpad/crashpad/snapshot/linux/test_modules.h
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc b/extern/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
index e3e2bebddb..85882e8ee4 100644
--- a/extern/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
+++ b/extern/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 #include <sched.h>
 
 #include "base/logging.h"
+#include "snapshot/linux/capture_memory_delegate_linux.h"
 #include "snapshot/linux/cpu_context_linux.h"
 #include "util/misc/reinterpret_bytes.h"
 
@@ -132,14 +133,17 @@ ThreadSnapshotLinux::ThreadSnapshotLinux()
       context_(),
       stack_(),
       thread_specific_data_address_(0),
+      thread_name_(),
       thread_id_(-1),
       priority_(-1),
       initialized_() {}
 
 ThreadSnapshotLinux::~ThreadSnapshotLinux() {}
 
-bool ThreadSnapshotLinux::Initialize(ProcessReaderLinux* process_reader,
-                                     const ProcessReaderLinux::Thread& thread) {
+bool ThreadSnapshotLinux::Initialize(
+    ProcessReaderLinux* process_reader,
+    const ProcessReaderLinux::Thread& thread,
+    uint32_t* gather_indirectly_referenced_memory_bytes_remaining) {
   INITIALIZATION_STATE_SET_INITIALIZING(initialized_);
 
 #if defined(ARCH_CPU_X86_FAMILY)
@@ -186,6 +190,12 @@ bool ThreadSnapshotLinux::Initialize(ProcessReaderLinux* process_reader,
         thread.thread_info.float_context.f32,
         context_.mipsel);
   }
+#elif defined(ARCH_CPU_RISCV64)
+  context_.architecture = kCPUArchitectureRISCV64;
+  context_.riscv64 = &context_union_.riscv64;
+  InitializeCPUContextRISCV64(thread.thread_info.thread_context.t64,
+                              thread.thread_info.float_context.f64,
+                              context_.riscv64);
 #else
 #error Port.
 #endif
@@ -197,6 +207,7 @@ bool ThreadSnapshotLinux::Initialize(ProcessReaderLinux* process_reader,
   thread_specific_data_address_ =
       thread.thread_info.thread_specific_data_address;
 
+  thread_name_ = thread.name;
   thread_id_ = thread.tid;
 
   priority_ =
@@ -205,6 +216,13 @@ bool ThreadSnapshotLinux::Initialize(ProcessReaderLinux* process_reader,
                 thread.static_priority, thread.sched_policy, thread.nice_value)
           : -1;
 
+  CaptureMemoryDelegateLinux capture_memory_delegate(
+      process_reader,
+      &thread,
+      &pointed_to_memory_,
+      gather_indirectly_referenced_memory_bytes_remaining);
+  CaptureMemory::PointedToByContext(context_, &capture_memory_delegate);
+
   INITIALIZATION_STATE_SET_VALID(initialized_);
   return true;
 }
@@ -224,6 +242,11 @@ uint64_t ThreadSnapshotLinux::ThreadID() const {
   return thread_id_;
 }
 
+std::string ThreadSnapshotLinux::ThreadName() const {
+  INITIALIZATION_STATE_DCHECK_VALID(initialized_);
+  return thread_name_;
+}
+
 int ThreadSnapshotLinux::SuspendCount() const {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
   return 0;
@@ -240,7 +263,13 @@ uint64_t ThreadSnapshotLinux::ThreadSpecificDataAddress() const {
 }
 
 std::vector<const MemorySnapshot*> ThreadSnapshotLinux::ExtraMemory() const {
-  return std::vector<const MemorySnapshot*>();
+  INITIALIZATION_STATE_DCHECK_VALID(initialized_);
+  std::vector<const MemorySnapshot*> result;
+  result.reserve(pointed_to_memory_.size());
+  for (const auto& pointed_to_memory : pointed_to_memory_) {
+    result.push_back(pointed_to_memory.get());
+  }
+  return result;
 }
 
 }  // namespace internal
diff --git a/extern/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h b/extern/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
index 17a6668dad..66d8c3e1d0 100644
--- a/extern/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
+++ b/extern/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -44,17 +44,23 @@ class ThreadSnapshotLinux final : public ThreadSnapshot {
   //!     the thread.
   //! \param[in] thread The thread within the ProcessReaderLinux for
   //!     which the snapshot should be created.
+  //! \param[inout] gather_indirectly_referenced_memory_bytes_remaining The
+  //!     remaining budget for indirectly referenced memory, honored on entry
+  //!     and updated on return.
   //!
   //! \return `true` if the snapshot could be created, `false` otherwise with
   //!     a message logged.
-  bool Initialize(ProcessReaderLinux* process_reader,
-                  const ProcessReaderLinux::Thread& thread);
+  bool Initialize(
+      ProcessReaderLinux* process_reader,
+      const ProcessReaderLinux::Thread& thread,
+      uint32_t* gather_indirectly_referenced_memory_bytes_remaining);
 
   // ThreadSnapshot:
 
   const CPUContext* Context() const override;
   const MemorySnapshot* Stack() const override;
   uint64_t ThreadID() const override;
+  std::string ThreadName() const override;
   int SuspendCount() const override;
   int Priority() const override;
   uint64_t ThreadSpecificDataAddress() const override;
@@ -71,6 +77,8 @@ class ThreadSnapshotLinux final : public ThreadSnapshot {
 #elif defined(ARCH_CPU_MIPS_FAMILY)
     CPUContextMIPS mipsel;
     CPUContextMIPS64 mips64;
+#elif defined(ARCH_CPU_RISCV64)
+    CPUContextRISCV64 riscv64;
 #else
 #error Port.
 #endif  // ARCH_CPU_X86_FAMILY
@@ -78,9 +86,11 @@ class ThreadSnapshotLinux final : public ThreadSnapshot {
   CPUContext context_;
   MemorySnapshotGeneric stack_;
   LinuxVMAddress thread_specific_data_address_;
+  std::string thread_name_;
   pid_t thread_id_;
   int priority_;
   InitializationStateDcheck initialized_;
+  std::vector<std::unique_ptr<MemorySnapshotGeneric>> pointed_to_memory_;
 };
 
 }  // namespace internal
diff --git a/extern/crashpad/crashpad/snapshot/mac/cpu_context_mac.cc b/extern/crashpad/crashpad/snapshot/mac/cpu_context_mac.cc
index 0a30fde42b..c8db26e422 100644
--- a/extern/crashpad/crashpad/snapshot/mac/cpu_context_mac.cc
+++ b/extern/crashpad/crashpad/snapshot/mac/cpu_context_mac.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -197,7 +197,6 @@ thread_state_flavor_t InitializeCPUContextX86Flavor(
 
     default: {
       NOTREACHED();
-      return THREAD_STATE_NONE;
     }
   }
 }
@@ -378,7 +377,6 @@ thread_state_flavor_t InitializeCPUContextX86_64Flavor(
 
     default: {
       NOTREACHED();
-      return THREAD_STATE_NONE;
     }
   }
 }
@@ -554,7 +552,6 @@ thread_state_flavor_t InitializeCPUContextARM64Flavor(
 
     default: {
       NOTREACHED();
-      return THREAD_STATE_NONE;
     }
   }
 }
diff --git a/extern/crashpad/crashpad/snapshot/mac/cpu_context_mac.h b/extern/crashpad/crashpad/snapshot/mac/cpu_context_mac.h
index 154dccddb3..8a362fe38c 100644
--- a/extern/crashpad/crashpad/snapshot/mac/cpu_context_mac.h
+++ b/extern/crashpad/crashpad/snapshot/mac/cpu_context_mac.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/mac/cpu_context_mac_test.cc b/extern/crashpad/crashpad/snapshot/mac/cpu_context_mac_test.cc
index c7156da138..caacc19f15 100644
--- a/extern/crashpad/crashpad/snapshot/mac/cpu_context_mac_test.cc
+++ b/extern/crashpad/crashpad/snapshot/mac/cpu_context_mac_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/mac/exception_snapshot_mac.cc b/extern/crashpad/crashpad/snapshot/mac/exception_snapshot_mac.cc
index 39d8fb2451..aed0fc0557 100644
--- a/extern/crashpad/crashpad/snapshot/mac/exception_snapshot_mac.cc
+++ b/extern/crashpad/crashpad/snapshot/mac/exception_snapshot_mac.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/mac/exception_snapshot_mac.h b/extern/crashpad/crashpad/snapshot/mac/exception_snapshot_mac.h
index ea7150a931..ccb560783c 100644
--- a/extern/crashpad/crashpad/snapshot/mac/exception_snapshot_mac.h
+++ b/extern/crashpad/crashpad/snapshot/mac/exception_snapshot_mac.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader.cc b/extern/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader.cc
index eefd7f447c..eda96b5056 100644
--- a/extern/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader.cc
+++ b/extern/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -71,6 +71,13 @@ void MachOImageAnnotationsReader::ReadCrashReporterClientAnnotations(
   const process_types::section* crash_info_section =
       image_reader_->GetSectionByName(
           SEG_DATA, "__crash_info", &crash_info_address);
+
+  if (!crash_info_section) {
+    // On macOS 13, under some circumstances, `__crash_info` ends up in the
+    // `__DATA_DIRTY` segment. This is known to happen for `dyld`.
+    crash_info_section = image_reader_->GetSectionByName(
+        "__DATA_DIRTY", "__crash_info", &crash_info_address);
+  }
   if (!crash_info_section) {
     return;
   }
@@ -81,7 +88,8 @@ void MachOImageAnnotationsReader::ReadCrashReporterClientAnnotations(
     return;
   }
 
-  if (crash_info.version != 4 && crash_info.version != 5) {
+  if (crash_info.version != 4 && crash_info.version != 5 &&
+      crash_info.version != 7) {
     LOG(WARNING) << "unexpected crash info version " << crash_info.version
                  << " in " << name_;
     return;
@@ -97,9 +105,13 @@ void MachOImageAnnotationsReader::ReadCrashReporterClientAnnotations(
     return;
   }
 
-  // This number was totally made up out of nowhere, but it seems prudent to
-  // enforce some limit.
-  constexpr size_t kMaxMessageSize = 1024;
+  // It seems prudent to enforce some limit. Different users of
+  // CRSetCrashLogMessage and CRSetCrashLogMessage2, apparently the private
+  // <CrashReporterClient.h> functions used to set message and message2, use
+  // different buffer lengths. 15.0 dyld-1231.3 libdyld/dyld_process_info.cpp
+  // has `static char sCrashReporterInfo[4096]`, which seems like a reasonable
+  // limit.
+  constexpr size_t kMaxMessageSize = 4096;
   if (crash_info.message) {
     std::string message;
     if (process_reader_->Memory()->ReadCStringSizeLimited(
diff --git a/extern/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader.h b/extern/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader.h
index 7a1a0a1c07..c3c4f13e24 100644
--- a/extern/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader.h
+++ b/extern/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -40,10 +40,11 @@ class ProcessReaderMac;
 //!    used by Apple code. The `message` and `message2` fields can be recovered
 //!    from any module with a compatible data section, and are included in the
 //!    annotations returned by Vector().
-//!  - `dyld`’s `error_string`. This format is used exclusively by dyld,
-//!    typically for fatal errors. This string can be recovered from any
+//!  - dyld’s `error_string`. This format was previously used exclusively by
+//!    dyld, typically for fatal errors. This string can be recovered from any
 //!    `MH_DYLINKER`-type module with this symbol, and is included in the
-//!    annotations returned by Vector().
+//!    annotations returned by Vector(). Newer versions of dyld use
+//!    `crashreporter_annotations_t`.
 class MachOImageAnnotationsReader {
  public:
   //! \brief Constructs an object.
@@ -76,7 +77,7 @@ class MachOImageAnnotationsReader {
   std::vector<AnnotationSnapshot> AnnotationsList() const;
 
  private:
-  // Reades crashreporter_annotations_t::message and
+  // Reads crashreporter_annotations_t::message and
   // crashreporter_annotations_t::message2 on behalf of Vector().
   void ReadCrashReporterClientAnnotations(
       std::vector<std::string>* vector_annotations) const;
diff --git a/extern/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader_test.cc b/extern/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader_test.cc
index 74a21be670..2ffef3abdc 100644
--- a/extern/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader_test.cc
+++ b/extern/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -215,13 +215,21 @@ class TestMachOImageAnnotationsReader final
           case kCrashModuleInitialization:
             // This message is set by dyld-353.2.1/src/ImageLoaderMachO.cpp
             // ImageLoaderMachO::doInitialization().
-            expected_annotation = ModuleWithCrashyInitializer().value();
+            // dyld4 no longer sets this, so instead check for fork() without
+            // exec() like above.
+            expected_annotation =
+                macos_version_number < 12'00'00
+                    ? ModuleWithCrashyInitializer().value()
+                    : "crashed on child side of fork pre-exec";
             break;
 
           case kCrashDyld:
             // This is independent of dyld’s error_string, which is tested
-            // below.
-            expected_annotation = "dyld: launch, loading dependent libraries";
+            // below. dyld4 no longer sets this.
+            expected_annotation =
+                macos_version_number < 12'00'00
+                    ? "dyld: launch, loading dependent libraries"
+                    : "";
             break;
 
           default:
@@ -246,22 +254,24 @@ class TestMachOImageAnnotationsReader final
 
       // dyld exposes its error_string at least as far back as Mac OS X 10.4.
       if (test_type_ == kCrashDyld) {
-        static constexpr char kExpectedAnnotation[] =
-            "could not load inserted library";
-        size_t expected_annotation_length = strlen(kExpectedAnnotation);
+        std::string couldnt_load_annotation =
+            macos_version_number < 12'00'00
+                ? "could not load inserted library"
+                // dyld4 no longer writes an annotation for the primary error
+                // See https://crbug.com/1334418/#c26
+                : "tried: '/var/empty/NoDirectory/NoLibrary' (no such file)";
         bool found = false;
         for (const std::string& annotation : all_annotations_vector) {
-          // Look for the expectation as a leading substring, because the actual
-          // string will contain the library’s pathname and, on OS X 10.9 and
-          // later, a reason.
-          if (annotation.substr(0, expected_annotation_length) ==
-                  kExpectedAnnotation) {
+          // Look for the expectation as a substring, because the actual
+          // string will contain the library’s pathname and a reason, or on
+          // macOS 12, only the reason.
+          if (annotation.find(couldnt_load_annotation) != std::string::npos) {
             found = true;
             break;
           }
         }
 
-        EXPECT_TRUE(found) << kExpectedAnnotation;
+        EXPECT_TRUE(found) << couldnt_load_annotation;
       }
     }
 
@@ -460,13 +470,7 @@ TEST(MachOImageAnnotationsReader, CrashAbort) {
   test_mach_o_image_annotations_reader.Run();
 }
 
-#if defined(ADDRESS_SANITIZER)
-// https://crbug.com/844396
-#define MAYBE_CrashModuleInitialization DISABLED_CrashModuleInitialization
-#else
-#define MAYBE_CrashModuleInitialization CrashModuleInitialization
-#endif
-TEST(MachOImageAnnotationsReader, MAYBE_CrashModuleInitialization) {
+TEST(MachOImageAnnotationsReader, CrashModuleInitialization) {
   TestMachOImageAnnotationsReader test_mach_o_image_annotations_reader(
       TestMachOImageAnnotationsReader::kCrashModuleInitialization);
   test_mach_o_image_annotations_reader.Run();
diff --git a/extern/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader_test_module_crashy_initializer.cc b/extern/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader_test_module_crashy_initializer.cc
index 2ba9bee043..bb3a96d3dd 100644
--- a/extern/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader_test_module_crashy_initializer.cc
+++ b/extern/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader_test_module_crashy_initializer.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader_test_no_op.cc b/extern/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader_test_no_op.cc
index b8953207b4..5ee8336108 100644
--- a/extern/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader_test_no_op.cc
+++ b/extern/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader_test_no_op.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/mac/mach_o_image_reader.cc b/extern/crashpad/crashpad/snapshot/mac/mach_o_image_reader.cc
index 4e66f3db8c..b648f7f258 100644
--- a/extern/crashpad/crashpad/snapshot/mac/mach_o_image_reader.cc
+++ b/extern/crashpad/crashpad/snapshot/mac/mach_o_image_reader.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,10 +18,11 @@
 #include <mach-o/nlist.h>
 #include <string.h>
 
+#include <iterator>
 #include <limits>
 #include <utility>
 
-#include "base/cxx17_backports.h"
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "client/crashpad_info.h"
@@ -183,7 +184,7 @@ bool MachOImageReader::Initialize(ProcessReaderMac* process_reader,
   // This vector is parallel to the kLoadCommandReaders array, and tracks
   // whether a singleton load command matching the |command| field has been
   // found yet.
-  std::vector<uint32_t> singleton_indices(base::size(kLoadCommandReaders),
+  std::vector<uint32_t> singleton_indices(std::size(kLoadCommandReaders),
                                           kInvalidSegmentIndex);
 
   size_t offset = mach_header.Size();
@@ -236,8 +237,7 @@ bool MachOImageReader::Initialize(ProcessReaderMac* process_reader,
       return false;
     }
 
-    for (size_t reader_index = 0;
-         reader_index < base::size(kLoadCommandReaders);
+    for (size_t reader_index = 0; reader_index < std::size(kLoadCommandReaders);
          ++reader_index) {
       if (load_command.cmd != kLoadCommandReaders[reader_index].command) {
         continue;
diff --git a/extern/crashpad/crashpad/snapshot/mac/mach_o_image_reader.h b/extern/crashpad/crashpad/snapshot/mac/mach_o_image_reader.h
index 0c60bcad2a..1d29b5cee6 100644
--- a/extern/crashpad/crashpad/snapshot/mac/mach_o_image_reader.h
+++ b/extern/crashpad/crashpad/snapshot/mac/mach_o_image_reader.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/mac/mach_o_image_reader_test.cc b/extern/crashpad/crashpad/snapshot/mac/mach_o_image_reader_test.cc
index f1f3b1de8e..c91b53df3f 100644
--- a/extern/crashpad/crashpad/snapshot/mac/mach_o_image_reader_test.cc
+++ b/extern/crashpad/crashpad/snapshot/mac/mach_o_image_reader_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/mac/mach_o_image_segment_reader.cc b/extern/crashpad/crashpad/snapshot/mac/mach_o_image_segment_reader.cc
index 1d7d429f48..17b7bd3315 100644
--- a/extern/crashpad/crashpad/snapshot/mac/mach_o_image_segment_reader.cc
+++ b/extern/crashpad/crashpad/snapshot/mac/mach_o_image_segment_reader.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 
 #include <utility>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
@@ -39,38 +40,26 @@ std::string SizeLimitedCString(const char* c_string, size_t max_length) {
 }  // namespace
 
 bool IsMalformedCLKernelsModule(uint32_t mach_o_file_type,
-                                const std::string& module_name,
-                                bool* has_timestamp) {
+                                const std::string& module_name) {
 #if defined(ARCH_CPU_X86_FAMILY)
   if (mach_o_file_type != MH_BUNDLE) {
     return false;
   }
 
   if (module_name == "cl_kernels") {
-    if (__MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_10 ||
-        MacOSVersionNumber() >= 10'10'00) {
-      if (has_timestamp) {
-        *has_timestamp = false;
-      }
-      return true;
-    }
-    return false;
+    return __MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_10 ||
+        MacOSVersionNumber() >= 10'10'00;
   }
 
   static const char kCvmsObjectPathPrefix[] =
       "/private/var/db/CVMS/cvmsCodeSignObj";
-  if (module_name.compare(
-          0, strlen(kCvmsObjectPathPrefix), kCvmsObjectPathPrefix) == 0 &&
-      (__MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_14 ||
-       MacOSVersionNumber() >= 10'14'00)) {
-    if (has_timestamp) {
-      *has_timestamp = true;
-    }
-    return true;
-  }
-#endif  // ARCH_CPU_X86_FAMILY
-
+  return module_name.compare(
+             0, strlen(kCvmsObjectPathPrefix), kCvmsObjectPathPrefix) == 0 &&
+         (__MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_14 ||
+          MacOSVersionNumber() >= 10'14'00);
+#else
   return false;
+#endif  // ARCH_CPU_X86_FAMILY
 }
 
 MachOImageSegmentReader::MachOImageSegmentReader()
@@ -165,9 +154,8 @@ bool MachOImageSegmentReader::Initialize(ProcessReaderMac* process_reader,
     //
     // https://openradar.appspot.com/20239912
     if (section_segment_name != segment_name &&
-        !(IsMalformedCLKernelsModule(file_type, module_name, nullptr) &&
-          segment_name == SEG_TEXT &&
-          section_segment_name == "__LD" &&
+        !(IsMalformedCLKernelsModule(file_type, module_name) &&
+          segment_name == SEG_TEXT && section_segment_name == "__LD" &&
           section_name == "__compact_unwind" &&
           (section.flags & S_ATTR_DEBUG))) {
       LOG(WARNING) << "section.segname incorrect in segment " << segment_name
diff --git a/extern/crashpad/crashpad/snapshot/mac/mach_o_image_segment_reader.h b/extern/crashpad/crashpad/snapshot/mac/mach_o_image_segment_reader.h
index d639a5d3a4..a4f17274f3 100644
--- a/extern/crashpad/crashpad/snapshot/mac/mach_o_image_segment_reader.h
+++ b/extern/crashpad/crashpad/snapshot/mac/mach_o_image_segment_reader.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -53,18 +53,11 @@ namespace crashpad {
 //! \param[in] mach_o_file_type The Mach-O type of the module being examined.
 //! \param[in] module_name The pathname that `dyld` reported having loaded the
 //!     module from.
-//! \param[out] has_timestamp Optional, may be `nullptr`. If provided, and the
-//!     module is a maformed `cl_kernels` module, this will be set to `true` if
-//!     the module was loaded from the filesystem (as is the case when loaded
-//!     from the CVMS directory) and is expected to have a timestamp, and
-//!     `false` otherwise. Note that even when loaded from the filesystem, these
-//!     modules are unlinked from the filesystem after loading.
 //!
 //! \return `true` if the module appears to be a malformed `cl_kernels` module
 //!     based on the provided information, `false` otherwise.
 bool IsMalformedCLKernelsModule(uint32_t mach_o_file_type,
-                                const std::string& module_name,
-                                bool* has_timestamp);
+                                const std::string& module_name);
 
 //! \brief A reader for `LC_SEGMENT` or `LC_SEGMENT_64` load commands in Mach-O
 //!     images mapped into another process.
diff --git a/extern/crashpad/crashpad/snapshot/mac/mach_o_image_segment_reader_test.cc b/extern/crashpad/crashpad/snapshot/mac/mach_o_image_segment_reader_test.cc
index f89b475f50..854a029cd9 100644
--- a/extern/crashpad/crashpad/snapshot/mac/mach_o_image_segment_reader_test.cc
+++ b/extern/crashpad/crashpad/snapshot/mac/mach_o_image_segment_reader_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,7 +16,8 @@
 
 #include <mach-o/loader.h>
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 
@@ -63,7 +64,7 @@ TEST(MachOImageSegmentReader, SegmentNameString) {
       SEG_IMPORT,
   };
 
-  for (size_t index = 0; index < base::size(kSegmentTestData); ++index) {
+  for (size_t index = 0; index < std::size(kSegmentTestData); ++index) {
     EXPECT_EQ(
         MachOImageSegmentReader::SegmentNameString(kSegmentTestData[index]),
         kSegmentTestData[index])
@@ -106,7 +107,7 @@ TEST(MachOImageSegmentReader, SectionNameString) {
       SECT_ICON_TIFF,
   };
 
-  for (size_t index = 0; index < base::size(kSectionTestData); ++index) {
+  for (size_t index = 0; index < std::size(kSectionTestData); ++index) {
     EXPECT_EQ(
         MachOImageSegmentReader::SectionNameString(kSectionTestData[index]),
         kSectionTestData[index])
@@ -169,7 +170,7 @@ TEST(MachOImageSegmentReader, SegmentAndSectionNameString) {
       {SEG_IMPORT, "", "__IMPORT,"},
   };
 
-  for (size_t index = 0; index < base::size(kSegmentAndSectionTestData);
+  for (size_t index = 0; index < std::size(kSegmentAndSectionTestData);
        ++index) {
     const auto& test = kSegmentAndSectionTestData[index];
     EXPECT_EQ(MachOImageSegmentReader::SegmentAndSectionNameString(
diff --git a/extern/crashpad/crashpad/snapshot/mac/mach_o_image_symbol_table_reader.cc b/extern/crashpad/crashpad/snapshot/mac/mach_o_image_symbol_table_reader.cc
index ef5a598fad..8f660b4a45 100644
--- a/extern/crashpad/crashpad/snapshot/mac/mach_o_image_symbol_table_reader.cc
+++ b/extern/crashpad/crashpad/snapshot/mac/mach_o_image_symbol_table_reader.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/mac/mach_o_image_symbol_table_reader.h b/extern/crashpad/crashpad/snapshot/mac/mach_o_image_symbol_table_reader.h
index 2af485394b..d33bf0ef9a 100644
--- a/extern/crashpad/crashpad/snapshot/mac/mach_o_image_symbol_table_reader.h
+++ b/extern/crashpad/crashpad/snapshot/mac/mach_o_image_symbol_table_reader.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/mac/module_snapshot_mac.cc b/extern/crashpad/crashpad/snapshot/mac/module_snapshot_mac.cc
index 9064835839..bf0d942640 100644
--- a/extern/crashpad/crashpad/snapshot/mac/module_snapshot_mac.cc
+++ b/extern/crashpad/crashpad/snapshot/mac/module_snapshot_mac.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/mac/module_snapshot_mac.h b/extern/crashpad/crashpad/snapshot/mac/module_snapshot_mac.h
index ce1e19dabc..b97ece1bba 100644
--- a/extern/crashpad/crashpad/snapshot/mac/module_snapshot_mac.h
+++ b/extern/crashpad/crashpad/snapshot/mac/module_snapshot_mac.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/mac/process_reader_mac.cc b/extern/crashpad/crashpad/snapshot/mac/process_reader_mac.cc
index 9b2a235627..c77c0d39e6 100644
--- a/extern/crashpad/crashpad/snapshot/mac/process_reader_mac.cc
+++ b/extern/crashpad/crashpad/snapshot/mac/process_reader_mac.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,10 +21,11 @@
 #include <algorithm>
 #include <utility>
 
+#include "base/apple/mach_logging.h"
+#include "base/apple/scoped_mach_port.h"
+#include "base/apple/scoped_mach_vm.h"
+#include "base/check_op.h"
 #include "base/logging.h"
-#include "base/mac/mach_logging.h"
-#include "base/mac/scoped_mach_port.h"
-#include "base/mac/scoped_mach_vm.h"
 #include "base/strings/stringprintf.h"
 #include "snapshot/mac/mach_o_image_reader.h"
 #include "snapshot/mac/process_types.h"
@@ -75,6 +76,7 @@ ProcessReaderMac::Thread::Thread()
     : thread_context(),
       float_context(),
       debug_context(),
+      name(),
       id(0),
       stack_region_address(0),
       stack_region_size(0),
@@ -264,7 +266,7 @@ void ProcessReaderMac::InitializeThreads() {
   // loop below will leak thread port send rights.
   ScopedForbidReturn threads_need_owners;
 
-  base::mac::ScopedMachVM threads_vm(
+  base::apple::ScopedMachVM threads_vm(
       reinterpret_cast<vm_address_t>(threads),
       mach_vm_round_page(thread_count * sizeof(*threads)));
 
@@ -365,6 +367,20 @@ void ProcessReaderMac::InitializeThreads() {
       thread.thread_specific_data_address = identifier_info.thread_handle;
     }
 
+    thread_extended_info extended_info;
+    count = THREAD_EXTENDED_INFO_COUNT;
+    kr = thread_info(thread.port,
+                     THREAD_EXTENDED_INFO,
+                     reinterpret_cast<thread_info_t>(&extended_info),
+                     &count);
+    if (kr != KERN_SUCCESS) {
+      MACH_LOG(WARNING, kr) << "thread_info(THREAD_EXTENDED_INFO)";
+    } else {
+      thread.name.assign(
+          extended_info.pth_name,
+          strnlen(extended_info.pth_name, sizeof(extended_info.pth_name)));
+    }
+
     thread_precedence_policy precedence;
     count = THREAD_PRECEDENCE_POLICY_COUNT;
     boolean_t get_default = FALSE;
@@ -494,26 +510,27 @@ void ProcessReaderMac::InitializeModules() {
     }
 
     if (file_type == MH_EXECUTE) {
-      // On Mac OS X 10.6, the main executable does not normally show up at
-      // index 0. This is because of how 10.6.8 dyld-132.13/src/dyld.cpp
-      // notifyGDB(), the function resposible for causing
-      // dyld_all_image_infos::infoArray to be updated, is called. It is
-      // registered to be called when all dependents of an image have been
-      // mapped (dyld_image_state_dependents_mapped), meaning that the main
-      // executable won’t be added to the list until all of the libraries it
-      // depends on are, even though dyld begins looking at the main executable
-      // first. This changed in later versions of dyld, including those present
-      // in 10.7. 10.9.4 dyld-239.4/src/dyld.cpp updateAllImages() (renamed from
-      // notifyGDB()) is registered to be called when an image itself has been
-      // mapped (dyld_image_state_mapped), regardless of the libraries that it
-      // depends on.
+      // On macOS 14, the main executable does not normally show up at
+      // index 0. In previous versions of dyld, each loaded image was
+      // appended to the all image info vector as it was loaded.
+      // (For example, see RuntimeState::notifyDebuggerLoad in dyld-1066.8).
+      // Starting from dyld-1122.1, notifyDebuggerLoad calls
+      // ExternallyViewableState::addImages for all but the main executable
+      // (which has already been added). ExternallyViewableState::addImages
+      // inserts all new image infos at the front of the vector, leaving the
+      // main executable as the last item.
       //
       // The interface requires that the main executable be first in the list,
       // so swap it into the right position.
       size_t index = modules_.size() - 1;
-      if (main_executable_count == 0) {
-        std::swap(modules_[0], modules_[index]);
-      } else {
+      if (index > 0) {
+        CHECK_EQ(index, image_info_vector.size() - 1);
+        if (main_executable_count == 0) {
+          std::rotate(
+              modules_.rbegin(), modules_.rbegin() + 1, modules_.rend());
+        }
+      }
+      if (main_executable_count > 0) {
         LOG(WARNING) << base::StringPrintf(
             "multiple MH_EXECUTE modules (%s, %s)",
             modules_[0].name.c_str(),
diff --git a/extern/crashpad/crashpad/snapshot/mac/process_reader_mac.h b/extern/crashpad/crashpad/snapshot/mac/process_reader_mac.h
index 85cfe7c988..657256be23 100644
--- a/extern/crashpad/crashpad/snapshot/mac/process_reader_mac.h
+++ b/extern/crashpad/crashpad/snapshot/mac/process_reader_mac.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -75,6 +75,7 @@ class ProcessReaderMac {
     ThreadContext thread_context;
     FloatContext float_context;
     DebugContext debug_context;
+    std::string name;
     uint64_t id;
     mach_vm_address_t stack_region_address;
     mach_vm_size_t stack_region_size;
diff --git a/extern/crashpad/crashpad/snapshot/mac/process_reader_mac_test.cc b/extern/crashpad/crashpad/snapshot/mac/process_reader_mac_test.cc
index 2f3775847f..fbc810dbe2 100644
--- a/extern/crashpad/crashpad/snapshot/mac/process_reader_mac_test.cc
+++ b/extern/crashpad/crashpad/snapshot/mac/process_reader_mac_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,18 +20,22 @@
 #include <errno.h>
 #include <mach-o/dyld.h>
 #include <mach-o/dyld_images.h>
+#include <mach-o/loader.h>
 #include <mach/mach.h>
+#include <pthread.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include <iterator>
 #include <map>
+#include <unordered_set>
 #include <utility>
 
+#include "base/apple/mach_logging.h"
 #include "base/check_op.h"
-#include "base/cxx17_backports.h"
+#include "base/files/file_path.h"
 #include "base/logging.h"
-#include "base/mac/mach_logging.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
@@ -42,6 +46,7 @@
 #include "test/mac/dyld.h"
 #include "test/mac/mach_errors.h"
 #include "test/mac/mach_multiprocess.h"
+#include "test/scoped_set_thread_name.h"
 #include "util/file/file_io.h"
 #include "util/mac/mac_util.h"
 #include "util/mach/mach_extensions.h"
@@ -52,6 +57,21 @@ namespace crashpad {
 namespace test {
 namespace {
 
+#if !defined(ARCH_CPU_64_BITS)
+using MachHeader = mach_header;
+#else
+using MachHeader = mach_header_64;
+#endif
+
+using ModulePathAndAddress = std::pair<std::string, mach_vm_address_t>;
+struct PathAndAddressHash {
+  std::size_t operator()(const ModulePathAndAddress& pair) const {
+    return std::hash<std::string>()(pair.first) ^
+           std::hash<mach_vm_address_t>()(pair.second);
+  }
+};
+using ModuleSet = std::unordered_set<ModulePathAndAddress, PathAndAddressHash>;
+
 constexpr char kDyldPath[] = "/usr/lib/dyld";
 
 TEST(ProcessReaderMac, SelfBasic) {
@@ -68,7 +88,7 @@ TEST(ProcessReaderMac, SelfBasic) {
   EXPECT_EQ(process_reader.ParentProcessID(), getppid());
 
   static constexpr char kTestMemory[] = "Some test memory";
-  char buffer[base::size(kTestMemory)];
+  char buffer[std::size(kTestMemory)];
   ASSERT_TRUE(process_reader.Memory()->Read(
       FromPointerCast<mach_vm_address_t>(kTestMemory),
       sizeof(kTestMemory),
@@ -139,6 +159,9 @@ uint64_t PthreadToThreadID(pthread_t pthread) {
 }
 
 TEST(ProcessReaderMac, SelfOneThread) {
+  const ScopedSetThreadName scoped_set_thread_name(
+      "ProcessReaderMac/SelfOneThread");
+
   ProcessReaderMac process_reader;
   ASSERT_TRUE(process_reader.Initialize(mach_task_self()));
 
@@ -151,6 +174,7 @@ TEST(ProcessReaderMac, SelfOneThread) {
   ASSERT_GE(threads.size(), 1u);
 
   EXPECT_EQ(threads[0].id, PthreadToThreadID(pthread_self()));
+  EXPECT_EQ(threads[0].name, "ProcessReaderMac/SelfOneThread");
 
   thread_t thread_self = MachThreadSelf();
   EXPECT_EQ(threads[0].port, thread_self);
@@ -161,11 +185,18 @@ TEST(ProcessReaderMac, SelfOneThread) {
 class TestThreadPool {
  public:
   struct ThreadExpectation {
-    mach_vm_address_t stack_address;
+    // The stack's base (highest) address.
+    mach_vm_address_t stack_base;
+
+    // The stack's maximum size.
+    mach_vm_size_t stack_size;
+
     int suspend_count;
+    std::string thread_name;
   };
 
-  TestThreadPool() : thread_infos_() {}
+  TestThreadPool(const std::string& thread_name_prefix)
+      : thread_infos_(), thread_name_prefix_(thread_name_prefix) {}
 
   TestThreadPool(const TestThreadPool&) = delete;
   TestThreadPool& operator=(const TestThreadPool&) = delete;
@@ -199,7 +230,10 @@ class TestThreadPool {
     ASSERT_TRUE(thread_infos_.empty());
 
     for (size_t thread_index = 0; thread_index < thread_count; ++thread_index) {
-      thread_infos_.push_back(std::make_unique<ThreadInfo>());
+      std::string thread_name = base::StringPrintf(
+          "%s-%zu", thread_name_prefix_.c_str(), thread_index);
+      thread_infos_.push_back(
+          std::make_unique<ThreadInfo>(std::move(thread_name)));
       ThreadInfo* thread_info = thread_infos_.back().get();
 
       int rv = pthread_create(
@@ -233,29 +267,36 @@ class TestThreadPool {
     CHECK_LT(thread_index, thread_infos_.size());
 
     const auto& thread_info = thread_infos_[thread_index];
-    expectation->stack_address = thread_info->stack_address;
+    expectation->stack_base = thread_info->stack_base;
+    expectation->stack_size = thread_info->stack_size;
     expectation->suspend_count = thread_info->suspend_count;
+    expectation->thread_name = thread_info->thread_name;
 
     return PthreadToThreadID(thread_info->pthread);
   }
 
  private:
   struct ThreadInfo {
-    ThreadInfo()
+    ThreadInfo(const std::string& thread_name)
         : pthread(nullptr),
-          stack_address(0),
+          stack_base(0),
+          stack_size(0),
           ready_semaphore(0),
           exit_semaphore(0),
-          suspend_count(0) {}
+          suspend_count(0),
+          thread_name(thread_name) {}
 
     ~ThreadInfo() {}
 
     // The thread’s ID, set at the time the thread is created.
     pthread_t pthread;
 
-    // An address somewhere within the thread’s stack. The thread sets this in
+    // The base address of thread’s stack. The thread sets this in
     // its ThreadMain().
-    mach_vm_address_t stack_address;
+    mach_vm_address_t stack_base;
+
+    // The stack's maximum size. The thread sets this in its ThreadMain().
+    mach_vm_size_t stack_size;
 
     // The worker thread signals ready_semaphore to indicate that it’s done
     // setting up its ThreadInfo structure. The main thread waits on this
@@ -270,13 +311,19 @@ class TestThreadPool {
 
     // The thread’s suspend count.
     int suspend_count;
+
+    // The thread's name.
+    const std::string thread_name;
   };
 
   static void* ThreadMain(void* argument) {
     ThreadInfo* thread_info = static_cast<ThreadInfo*>(argument);
+    const ScopedSetThreadName scoped_set_thread_name(thread_info->thread_name);
 
-    thread_info->stack_address =
-        FromPointerCast<mach_vm_address_t>(&thread_info);
+    pthread_t thread = pthread_self();
+    thread_info->stack_base =
+        FromPointerCast<mach_vm_address_t>(pthread_get_stackaddr_np(thread));
+    thread_info->stack_size = pthread_get_stacksize_np(thread);
 
     thread_info->ready_semaphore.Signal();
     thread_info->exit_semaphore.Wait();
@@ -293,6 +340,9 @@ class TestThreadPool {
   // This is a vector of pointers because the address of a ThreadInfo object is
   // passed to each thread’s ThreadMain(), so they cannot move around in memory.
   std::vector<std::unique_ptr<ThreadInfo>> thread_infos_;
+
+  // Prefix to use for each thread's name, suffixed with "-$threadindex".
+  const std::string thread_name_prefix_;
 };
 
 using ThreadMap = std::map<uint64_t, TestThreadPool::ThreadExpectation>;
@@ -324,10 +374,25 @@ void ExpectSeveralThreads(ThreadMap* thread_map,
     }
 
     if (iterator != thread_map->end()) {
-      EXPECT_GE(iterator->second.stack_address, thread.stack_region_address);
-      EXPECT_LT(iterator->second.stack_address, thread_stack_region_end);
+      mach_vm_address_t expected_stack_region_end = iterator->second.stack_base;
+      if (thread_index > 0) {
+        // Non-main threads use the stack region to store thread data. See
+        // macOS 12 libpthread-486.100.11 src/pthread.c _pthread_allocate().
+#if defined(ARCH_CPU_ARM64)
+        // arm64 has an additional offset for alignment. See macOS 12
+        // libpthread-486.100.11 src/pthread.c _pthread_allocate() and
+        // PTHREAD_T_OFFSET (defined in src/types_internal.h).
+        expected_stack_region_end += sizeof(_opaque_pthread_t) + 0x3000;
+#else
+        expected_stack_region_end += sizeof(_opaque_pthread_t);
+#endif
+      }
+      EXPECT_LT(iterator->second.stack_base - iterator->second.stack_size,
+                thread.stack_region_address);
+      EXPECT_EQ(expected_stack_region_end, thread_stack_region_end);
 
       EXPECT_EQ(thread.suspend_count, iterator->second.suspend_count);
+      EXPECT_EQ(thread.name, iterator->second.thread_name);
 
       // Remove the thread from the expectation map since it’s already been
       // found. This makes it easy to check for duplicate thread IDs, and makes
@@ -374,7 +439,7 @@ TEST(ProcessReaderMac, SelfSeveralThreads) {
   ProcessReaderMac process_reader;
   ASSERT_TRUE(process_reader.Initialize(mach_task_self()));
 
-  TestThreadPool thread_pool;
+  TestThreadPool thread_pool("SelfSeveralThreads");
   constexpr size_t kChildThreads = 16;
   ASSERT_NO_FATAL_FAILURE(thread_pool.StartThreads(kChildThreads));
 
@@ -383,7 +448,9 @@ TEST(ProcessReaderMac, SelfSeveralThreads) {
   ThreadMap thread_map;
   const uint64_t self_thread_id = PthreadToThreadID(pthread_self());
   TestThreadPool::ThreadExpectation expectation;
-  expectation.stack_address = FromPointerCast<mach_vm_address_t>(&thread_map);
+  expectation.stack_base = FromPointerCast<mach_vm_address_t>(
+      pthread_get_stackaddr_np(pthread_self()));
+  expectation.stack_size = pthread_get_stacksize_np(pthread_self());
   expectation.suspend_count = 0;
   thread_map[self_thread_id] = expectation;
   for (size_t thread_index = 0; thread_index < kChildThreads; ++thread_index) {
@@ -392,6 +459,8 @@ TEST(ProcessReaderMac, SelfSeveralThreads) {
     // There can’t be any duplicate thread IDs.
     EXPECT_EQ(thread_map.count(thread_id), 0u);
 
+    expectation.thread_name =
+        base::StringPrintf("SelfSeveralThreads-%zu", thread_index);
     thread_map[thread_id] = expectation;
   }
 
@@ -431,8 +500,11 @@ uint64_t GetThreadID() {
 
 class ProcessReaderThreadedChild final : public MachMultiprocess {
  public:
-  explicit ProcessReaderThreadedChild(size_t thread_count)
-      : MachMultiprocess(), thread_count_(thread_count) {}
+  explicit ProcessReaderThreadedChild(const std::string thread_name_prefix,
+                                      size_t thread_count)
+      : MachMultiprocess(),
+        thread_name_prefix_(thread_name_prefix),
+        thread_count_(thread_count) {}
 
   ProcessReaderThreadedChild(const ProcessReaderThreadedChild&) = delete;
   ProcessReaderThreadedChild& operator=(const ProcessReaderThreadedChild&) =
@@ -457,12 +529,22 @@ class ProcessReaderThreadedChild final : public MachMultiprocess {
       CheckedReadFileExactly(read_handle, &thread_id, sizeof(thread_id));
 
       TestThreadPool::ThreadExpectation expectation;
-      CheckedReadFileExactly(read_handle,
-                             &expectation.stack_address,
-                             sizeof(expectation.stack_address));
+      CheckedReadFileExactly(
+          read_handle, &expectation.stack_base, sizeof(expectation.stack_base));
+      CheckedReadFileExactly(
+          read_handle, &expectation.stack_size, sizeof(expectation.stack_size));
       CheckedReadFileExactly(read_handle,
                              &expectation.suspend_count,
                              sizeof(expectation.suspend_count));
+      std::string::size_type expected_thread_name_length;
+      CheckedReadFileExactly(read_handle,
+                             &expected_thread_name_length,
+                             sizeof(expected_thread_name_length));
+      std::string expected_thread_name(expected_thread_name_length, '\0');
+      CheckedReadFileExactly(read_handle,
+                             expected_thread_name.data(),
+                             expected_thread_name_length);
+      expectation.thread_name = expected_thread_name;
 
       // There can’t be any duplicate thread IDs.
       EXPECT_EQ(thread_map.count(thread_id), 0u);
@@ -479,9 +561,13 @@ class ProcessReaderThreadedChild final : public MachMultiprocess {
   }
 
   void MachMultiprocessChild() override {
-    TestThreadPool thread_pool;
+    TestThreadPool thread_pool(thread_name_prefix_);
     ASSERT_NO_FATAL_FAILURE(thread_pool.StartThreads(thread_count_));
 
+    const std::string current_thread_name(base::StringPrintf(
+        "%s-MachMultiprocessChild", thread_name_prefix_.c_str()));
+    const ScopedSetThreadName scoped_set_thread_name(current_thread_name);
+
     FileHandle write_handle = WritePipeHandle();
 
     // This thread isn’t part of the thread pool, but the parent will be able
@@ -491,29 +577,52 @@ class ProcessReaderThreadedChild final : public MachMultiprocess {
     CheckedWriteFile(write_handle, &thread_id, sizeof(thread_id));
 
     TestThreadPool::ThreadExpectation expectation;
-    expectation.stack_address = FromPointerCast<mach_vm_address_t>(&thread_id);
+    pthread_t thread = pthread_self();
+    expectation.stack_base =
+        FromPointerCast<mach_vm_address_t>(pthread_get_stackaddr_np(thread));
+    expectation.stack_size = pthread_get_stacksize_np(thread);
     expectation.suspend_count = 0;
 
-    CheckedWriteFile(write_handle,
-                     &expectation.stack_address,
-                     sizeof(expectation.stack_address));
+    CheckedWriteFile(
+        write_handle, &expectation.stack_base, sizeof(expectation.stack_base));
+    CheckedWriteFile(
+        write_handle, &expectation.stack_size, sizeof(expectation.stack_size));
     CheckedWriteFile(write_handle,
                      &expectation.suspend_count,
                      sizeof(expectation.suspend_count));
+    const std::string::size_type current_thread_name_length =
+        current_thread_name.length();
+    CheckedWriteFile(write_handle,
+                     &current_thread_name_length,
+                     sizeof(current_thread_name_length));
+    CheckedWriteFile(
+        write_handle, current_thread_name.data(), current_thread_name_length);
 
     // Write an entry for everything in the thread pool.
     for (size_t thread_index = 0; thread_index < thread_count_;
          ++thread_index) {
-      uint64_t thread_id =
-          thread_pool.GetThreadInfo(thread_index, &expectation);
+      thread_id = thread_pool.GetThreadInfo(thread_index, &expectation);
 
       CheckedWriteFile(write_handle, &thread_id, sizeof(thread_id));
       CheckedWriteFile(write_handle,
-                       &expectation.stack_address,
-                       sizeof(expectation.stack_address));
+                       &expectation.stack_base,
+                       sizeof(expectation.stack_base));
+      CheckedWriteFile(write_handle,
+                       &expectation.stack_size,
+                       sizeof(expectation.stack_size));
       CheckedWriteFile(write_handle,
                        &expectation.suspend_count,
                        sizeof(expectation.suspend_count));
+      const std::string thread_pool_thread_name = base::StringPrintf(
+          "%s-%zu", thread_name_prefix_.c_str(), thread_index);
+      const std::string::size_type thread_pool_thread_name_length =
+          thread_pool_thread_name.length();
+      CheckedWriteFile(write_handle,
+                       &thread_pool_thread_name_length,
+                       sizeof(thread_pool_thread_name_length));
+      CheckedWriteFile(write_handle,
+                       thread_pool_thread_name.data(),
+                       thread_pool_thread_name_length);
     }
 
     // Wait for the parent to signal that it’s OK to exit by closing its end of
@@ -521,19 +630,22 @@ class ProcessReaderThreadedChild final : public MachMultiprocess {
     CheckedReadFileAtEOF(ReadPipeHandle());
   }
 
+  const std::string thread_name_prefix_;
   size_t thread_count_;
 };
 
 TEST(ProcessReaderMac, ChildOneThread) {
   // The main thread plus zero child threads equals one thread.
   constexpr size_t kChildThreads = 0;
-  ProcessReaderThreadedChild process_reader_threaded_child(kChildThreads);
+  ProcessReaderThreadedChild process_reader_threaded_child("ChildOneThread",
+                                                           kChildThreads);
   process_reader_threaded_child.Run();
 }
 
 TEST(ProcessReaderMac, ChildSeveralThreads) {
   constexpr size_t kChildThreads = 64;
-  ProcessReaderThreadedChild process_reader_threaded_child(kChildThreads);
+  ProcessReaderThreadedChild process_reader_threaded_child(
+      "ChildSeveralThreads", kChildThreads);
   process_reader_threaded_child.Run();
 }
 
@@ -560,9 +672,8 @@ T GetDyldFunction(const char* symbol) {
   return reinterpret_cast<T>(dlsym(dl_handle, symbol));
 }
 
-void VerifyImageExistenceAndTimestamp(const char* path, time_t timestamp) {
+void VerifyImageExistence(const char* path) {
   const char* stat_path;
-  bool timestamp_may_be_0;
 
 #if __MAC_OS_X_VERSION_MAX_ALLOWED < __MAC_10_16
   static auto _dyld_shared_cache_contains_path =
@@ -572,7 +683,7 @@ void VerifyImageExistenceAndTimestamp(const char* path, time_t timestamp) {
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunguarded-availability"
-  if (_dyld_shared_cache_contains_path &&
+  if (&_dyld_shared_cache_contains_path &&
       _dyld_shared_cache_contains_path(path)) {
 #pragma clang diagnostic pop
     // The timestamp will either match the timestamp of the dyld_shared_cache
@@ -592,18 +703,13 @@ void VerifyImageExistenceAndTimestamp(const char* path, time_t timestamp) {
     }();
 
     stat_path = dyld_shared_cache_file_path;
-    timestamp_may_be_0 = true;
   } else {
     stat_path = path;
-    timestamp_may_be_0 = false;
   }
 
   struct stat stat_buf;
   int rv = stat(stat_path, &stat_buf);
   EXPECT_EQ(rv, 0) << ErrnoMessage("stat");
-  if (rv == 0 && (!timestamp_may_be_0 || timestamp != 0)) {
-    EXPECT_EQ(timestamp, stat_buf.st_mtime);
-  }
 }
 
 // cl_kernels images (OpenCL kernels) are weird. They’re not ld output and don’t
@@ -703,11 +809,11 @@ class ScopedOpenCLNoOpKernel {
     const size_t source_lengths[] = {
         strlen(sources[0]),
     };
-    static_assert(base::size(sources) == base::size(source_lengths),
+    static_assert(std::size(sources) == std::size(source_lengths),
                   "arrays must be parallel");
 
     program_ = clCreateProgramWithSource(
-        context_, base::size(sources), sources, source_lengths, &rv);
+        context_, std::size(sources), sources, source_lengths, &rv);
     ASSERT_EQ(rv, CL_SUCCESS) << "clCreateProgramWithSource";
 
     rv = clBuildProgram(
@@ -737,6 +843,19 @@ bool ExpectCLKernels() {
          MacOSVersionNumber() >= 10'07'00;
 }
 
+// Starting in dyld-1284.13 (macOS 15.4), _dyld_get_image_name (in
+// dyld4::PrebuiltLoader::path) returns an absolute path for a main executable,
+// even when the image was not loaded from an absolute path. This can break test
+// expectations when the test executable is not invoked from an absolute path.
+// As a workaround, just use the main executable’s basename for comparison
+// purposes.
+std::string ComparableModuleName(const std::string& module_name,
+                                 uint32_t file_type) {
+  return file_type == MH_EXECUTE
+             ? base::FilePath(module_name).BaseName().value()
+             : module_name;
+}
+
 TEST(ProcessReaderMac, SelfModules) {
   ScopedOpenCLNoOpKernel ensure_cl_kernels;
   ASSERT_NO_FATAL_FAILURE(ensure_cl_kernels.SetUp());
@@ -745,67 +864,62 @@ TEST(ProcessReaderMac, SelfModules) {
   ASSERT_TRUE(process_reader.Initialize(mach_task_self()));
 
   uint32_t dyld_image_count = _dyld_image_count();
-  const std::vector<ProcessReaderMac::Module>& modules =
-      process_reader.Modules();
-
-  // There needs to be at least an entry for the main executable, for a dylib,
-  // and for dyld.
-  ASSERT_GE(modules.size(), 3u);
-
-  // dyld_image_count doesn’t include an entry for dyld itself, but |modules|
-  // does.
-  ASSERT_EQ(modules.size(), dyld_image_count + 1);
-
-  bool found_cl_kernels = false;
-  for (uint32_t index = 0; index < dyld_image_count; ++index) {
-    SCOPED_TRACE(base::StringPrintf(
-        "index %u, name %s", index, modules[index].name.c_str()));
 
-    const char* dyld_image_name = _dyld_get_image_name(index);
-    EXPECT_EQ(modules[index].name, dyld_image_name);
-    ASSERT_TRUE(modules[index].reader);
-    EXPECT_EQ(
-        modules[index].reader->Address(),
-        FromPointerCast<mach_vm_address_t>(_dyld_get_image_header(index)));
-
-    bool expect_timestamp;
-    if (index == 0) {
-      // dyld didn’t load the main executable, so it couldn’t record its
-      // timestamp, and it is reported as 0.
-      EXPECT_EQ(modules[index].timestamp, 0);
-    } else if (IsMalformedCLKernelsModule(modules[index].reader->FileType(),
-                                          modules[index].name,
-                                          &expect_timestamp)) {
-      // cl_kernels doesn’t exist as a file, but may still have a timestamp.
-      if (!expect_timestamp) {
-        EXPECT_EQ(modules[index].timestamp, 0);
-      } else {
-        EXPECT_NE(modules[index].timestamp, 0);
+  std::set<std::string> cl_kernel_names;
+  auto modules = process_reader.Modules();
+  ModuleSet actual_modules;
+  for (size_t i = 0; i < modules.size(); ++i) {
+    auto& module = modules[i];
+    ASSERT_TRUE(module.reader);
+    if (i == modules.size() - 1) {
+      EXPECT_EQ(module.name, kDyldPath);
+      const dyld_all_image_infos* dyld_image_infos = DyldGetAllImageInfos();
+      if (dyld_image_infos->version >= 2) {
+        EXPECT_EQ(module.reader->Address(),
+                  FromPointerCast<mach_vm_address_t>(
+                      dyld_image_infos->dyldImageLoadAddress));
       }
-      found_cl_kernels = true;
+      // Don't include dyld, since dyld image APIs will not have an entry for
+      // dyld itself.
+      continue;
+    }
+    // Ensure executable is first, and that there's only one.
+    uint32_t file_type = module.reader->FileType();
+    if (i == 0) {
+      EXPECT_EQ(file_type, static_cast<uint32_t>(MH_EXECUTE));
     } else {
-      // Hope that the module didn’t change on disk.
-      VerifyImageExistenceAndTimestamp(dyld_image_name,
-                                       modules[index].timestamp);
+      EXPECT_NE(file_type, static_cast<uint32_t>(MH_EXECUTE));
+      EXPECT_NE(file_type, static_cast<uint32_t>(MH_DYLINKER));
+    }
+    if (IsMalformedCLKernelsModule(module.reader->FileType(), module.name)) {
+      cl_kernel_names.insert(module.name);
     }
+    actual_modules.insert(
+        std::make_pair(ComparableModuleName(module.name, file_type),
+                       module.reader->Address()));
   }
+  EXPECT_EQ(cl_kernel_names.size() > 0,
+            ExpectCLKernels() && ensure_cl_kernels.success());
 
-  EXPECT_EQ(found_cl_kernels, ExpectCLKernels() && ensure_cl_kernels.success());
+  // There needs to be at least an entry for the main executable and a dylib.
+  ASSERT_GE(actual_modules.size(), 2u);
+  ASSERT_EQ(actual_modules.size(), dyld_image_count);
 
-  size_t index = modules.size() - 1;
-  EXPECT_EQ(modules[index].name, kDyldPath);
-
-  // dyld didn’t load itself either, so it couldn’t record its timestamp, and it
-  // is also reported as 0.
-  EXPECT_EQ(modules[index].timestamp, 0);
-
-  const dyld_all_image_infos* dyld_image_infos = DyldGetAllImageInfos();
-  if (dyld_image_infos->version >= 2) {
-    ASSERT_TRUE(modules[index].reader);
-    EXPECT_EQ(modules[index].reader->Address(),
-              FromPointerCast<mach_vm_address_t>(
-                  dyld_image_infos->dyldImageLoadAddress));
+  ModuleSet expect_modules;
+  for (uint32_t index = 0; index < dyld_image_count; ++index) {
+    const char* dyld_image_name = _dyld_get_image_name(index);
+    mach_vm_address_t dyld_image_address =
+        FromPointerCast<mach_vm_address_t>(_dyld_get_image_header(index));
+    const MachHeader* image_header =
+        reinterpret_cast<const MachHeader*>(dyld_image_address);
+    expect_modules.insert(std::make_pair(
+        ComparableModuleName(dyld_image_name, image_header->filetype),
+        dyld_image_address));
+    if (cl_kernel_names.find(dyld_image_name) == cl_kernel_names.end()) {
+      VerifyImageExistence(dyld_image_name);
+    }
   }
+  EXPECT_EQ(actual_modules, expect_modules);
 }
 
 class ProcessReaderModulesChild final : public MachMultiprocess {
@@ -824,27 +938,45 @@ class ProcessReaderModulesChild final : public MachMultiprocess {
   void MachMultiprocessParent() override {
     ProcessReaderMac process_reader;
     ASSERT_TRUE(process_reader.Initialize(ChildTask()));
-
     const std::vector<ProcessReaderMac::Module>& modules =
         process_reader.Modules();
 
+    ModuleSet actual_modules;
+    std::set<std::string> cl_kernel_names;
+    for (size_t i = 0; i < modules.size(); ++i) {
+      auto& module = modules[i];
+      ASSERT_TRUE(module.reader);
+      uint32_t file_type = module.reader->FileType();
+      if (i == 0) {
+        EXPECT_EQ(file_type, static_cast<uint32_t>(MH_EXECUTE));
+      } else if (i == modules.size() - 1) {
+        EXPECT_EQ(file_type, static_cast<uint32_t>(MH_DYLINKER));
+      } else {
+        EXPECT_NE(file_type, static_cast<uint32_t>(MH_EXECUTE));
+        EXPECT_NE(file_type, static_cast<uint32_t>(MH_DYLINKER));
+      }
+      if (IsMalformedCLKernelsModule(module.reader->FileType(), module.name)) {
+        cl_kernel_names.insert(module.name);
+      }
+      actual_modules.insert(
+          std::make_pair(ComparableModuleName(module.name, file_type),
+                         module.reader->Address()));
+    }
+
     // There needs to be at least an entry for the main executable, for a dylib,
     // and for dyld.
-    ASSERT_GE(modules.size(), 3u);
+    ASSERT_GE(actual_modules.size(), 3u);
 
     FileHandle read_handle = ReadPipeHandle();
 
-    uint32_t expect_modules;
+    uint32_t expect_modules_size;
     CheckedReadFileExactly(
-        read_handle, &expect_modules, sizeof(expect_modules));
-
-    ASSERT_EQ(modules.size(), expect_modules);
+        read_handle, &expect_modules_size, sizeof(expect_modules_size));
 
-    bool found_cl_kernels = false;
-    for (size_t index = 0; index < modules.size(); ++index) {
-      SCOPED_TRACE(base::StringPrintf(
-          "index %zu, name %s", index, modules[index].name.c_str()));
+    ASSERT_EQ(actual_modules.size(), expect_modules_size);
+    ModuleSet expect_modules;
 
+    for (size_t index = 0; index < expect_modules_size; ++index) {
       uint32_t expect_name_length;
       CheckedReadFileExactly(
           read_handle, &expect_name_length, sizeof(expect_name_length));
@@ -852,38 +984,24 @@ class ProcessReaderModulesChild final : public MachMultiprocess {
       // The NUL terminator is not read.
       std::string expect_name(expect_name_length, '\0');
       CheckedReadFileExactly(read_handle, &expect_name[0], expect_name_length);
-      EXPECT_EQ(modules[index].name, expect_name);
 
       mach_vm_address_t expect_address;
       CheckedReadFileExactly(
           read_handle, &expect_address, sizeof(expect_address));
-      ASSERT_TRUE(modules[index].reader);
-      EXPECT_EQ(modules[index].reader->Address(), expect_address);
-
-      bool expect_timestamp;
-      if (index == 0 || index == modules.size() - 1) {
-        // dyld didn’t load the main executable or itself, so it couldn’t record
-        // these timestamps, and they are reported as 0.
-        EXPECT_EQ(modules[index].timestamp, 0);
-      } else if (IsMalformedCLKernelsModule(modules[index].reader->FileType(),
-                                            modules[index].name,
-                                            &expect_timestamp)) {
-        // cl_kernels doesn’t exist as a file, but may still have a timestamp.
-        if (!expect_timestamp) {
-          EXPECT_EQ(modules[index].timestamp, 0);
-        } else {
-          EXPECT_NE(modules[index].timestamp, 0);
-        }
-        found_cl_kernels = true;
-      } else {
-        // Hope that the module didn’t change on disk.
-        VerifyImageExistenceAndTimestamp(expect_name.c_str(),
-                                         modules[index].timestamp);
+
+      uint32_t file_type;
+      CheckedReadFileExactly(read_handle, &file_type, sizeof(file_type));
+
+      if (cl_kernel_names.find(expect_name) == cl_kernel_names.end()) {
+        VerifyImageExistence(expect_name.c_str());
       }
-    }
 
-    EXPECT_EQ(found_cl_kernels,
+      expect_modules.insert(std::make_pair(
+          ComparableModuleName(expect_name, file_type), expect_address));
+    }
+    EXPECT_EQ(cl_kernel_names.size() > 0,
               ExpectCLKernels() && ensure_cl_kernels_success_);
+    EXPECT_EQ(expect_modules, actual_modules);
   }
 
   void MachMultiprocessChild() override {
@@ -916,6 +1034,10 @@ class ProcessReaderModulesChild final : public MachMultiprocess {
             dyld_image_infos->dyldImageLoadAddress);
       }
 
+      const MachHeader* image_header =
+          reinterpret_cast<const MachHeader*>(dyld_image_address);
+      uint32_t file_type = image_header->filetype;
+
       uint32_t dyld_image_name_length = strlen(dyld_image_name);
       CheckedWriteFile(write_handle,
                        &dyld_image_name_length,
@@ -926,6 +1048,7 @@ class ProcessReaderModulesChild final : public MachMultiprocess {
 
       CheckedWriteFile(
           write_handle, &dyld_image_address, sizeof(dyld_image_address));
+      CheckedWriteFile(write_handle, &file_type, sizeof(file_type));
     }
 
     // Wait for the parent to signal that it’s OK to exit by closing its end of
diff --git a/extern/crashpad/crashpad/snapshot/mac/process_snapshot_mac.cc b/extern/crashpad/crashpad/snapshot/mac/process_snapshot_mac.cc
index 528e92133b..073efb4ce6 100644
--- a/extern/crashpad/crashpad/snapshot/mac/process_snapshot_mac.cc
+++ b/extern/crashpad/crashpad/snapshot/mac/process_snapshot_mac.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -50,6 +50,7 @@ bool ProcessSnapshotMac::Initialize(task_t task) {
     return false;
   }
 
+  client_id_.InitializeToZero();
   system_.Initialize(&process_reader_, &snapshot_time_);
 
   InitializeThreads();
diff --git a/extern/crashpad/crashpad/snapshot/mac/process_snapshot_mac.h b/extern/crashpad/crashpad/snapshot/mac/process_snapshot_mac.h
index 59239102c6..0ac9137420 100644
--- a/extern/crashpad/crashpad/snapshot/mac/process_snapshot_mac.h
+++ b/extern/crashpad/crashpad/snapshot/mac/process_snapshot_mac.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/mac/process_types.cc b/extern/crashpad/crashpad/snapshot/mac/process_types.cc
index 3d4e059020..b977b78f36 100644
--- a/extern/crashpad/crashpad/snapshot/mac/process_types.cc
+++ b/extern/crashpad/crashpad/snapshot/mac/process_types.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,9 +18,9 @@
 #include <string.h>
 #include <uuid/uuid.h>
 
-#include <memory>
+#include <iterator>
 
-#include "base/cxx17_backports.h"
+#include "base/containers/heap_array.h"
 #include "snapshot/mac/process_types/internal.h"
 #include "util/process/process_memory_mac.h"
 
@@ -74,7 +74,7 @@ using UInt64Array4 = uint64_t[4];
 template <>
 inline void Assign<UInt64Array4, UInt32Array4>(UInt64Array4* destination,
                                                const UInt32Array4& source) {
-  for (size_t index = 0; index < base::size(source); ++index) {
+  for (size_t index = 0; index < std::size(source); ++index) {
     (*destination)[index] = source[index];
   }
 }
@@ -245,8 +245,9 @@ inline void Assign<UInt64Array4, UInt32Array4>(UInt64Array4* destination,
                                           mach_vm_address_t address,           \
                                           size_t count,                        \
                                           struct_name* generic) {              \
-    std::unique_ptr<T[]> specific(new T[count]);                               \
-    if (!T::ReadArrayInto(process_reader, address, count, &specific[0])) {     \
+    auto specific = base::HeapArray<T>::Uninit(count);                         \
+    if (!T::ReadArrayInto(                                                     \
+            process_reader, address, specific.size(), specific.data())) {      \
       return false;                                                            \
     }                                                                          \
     for (size_t index = 0; index < count; ++index) {                           \
diff --git a/extern/crashpad/crashpad/snapshot/mac/process_types.h b/extern/crashpad/crashpad/snapshot/mac/process_types.h
index 6a5f9c1ced..3135422947 100644
--- a/extern/crashpad/crashpad/snapshot/mac/process_types.h
+++ b/extern/crashpad/crashpad/snapshot/mac/process_types.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/mac/process_types/all.proctype b/extern/crashpad/crashpad/snapshot/mac/process_types/all.proctype
index d84b41d14b..16f7076772 100644
--- a/extern/crashpad/crashpad/snapshot/mac/process_types/all.proctype
+++ b/extern/crashpad/crashpad/snapshot/mac/process_types/all.proctype
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/mac/process_types/annotation.proctype b/extern/crashpad/crashpad/snapshot/mac/process_types/annotation.proctype
index 5d34fdabd3..eb71bd559d 100644
--- a/extern/crashpad/crashpad/snapshot/mac/process_types/annotation.proctype
+++ b/extern/crashpad/crashpad/snapshot/mac/process_types/annotation.proctype
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/mac/process_types/crashpad_info.proctype b/extern/crashpad/crashpad/snapshot/mac/process_types/crashpad_info.proctype
index 7c077ca7a7..1dc36dbceb 100644
--- a/extern/crashpad/crashpad/snapshot/mac/process_types/crashpad_info.proctype
+++ b/extern/crashpad/crashpad/snapshot/mac/process_types/crashpad_info.proctype
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/mac/process_types/crashreporterclient.proctype b/extern/crashpad/crashpad/snapshot/mac/process_types/crashreporterclient.proctype
index 226eaa2567..6b69c64ea7 100644
--- a/extern/crashpad/crashpad/snapshot/mac/process_types/crashreporterclient.proctype
+++ b/extern/crashpad/crashpad/snapshot/mac/process_types/crashreporterclient.proctype
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// The name of this file was chosen based on
-// https://llvm.org/svn/llvm-project/llvm/trunk/lib/Support/PrettyStackTrace.cpp.
+// The name of this file was chosen based on an #include in
+// https://github.com/llvm/llvm-project/blob/main/llvm/lib/Support/PrettyStackTrace.cpp.
 // The name of the structure it describes was chosen based on that file as well
-// as 10.9.2 cups-372.2/cups/backend/usb-darwin.c. That file also provided the
-// names and types of the fields in the structure.
+// as 10.9
+// https://github.com/apple-oss-distributions/cups/blame/cups-372/cups/backend/usb-darwin.c.
 //
 // This file is intended to be included multiple times in the same translation
 // unit, so #include guards are intentionally absent.
@@ -26,8 +26,8 @@
 // accessors. This file is also used by the iOS in process handler to read both
 // messages in client/ios_handler/in_process_intermediate_dump_handler.cc.
 
-// Client Mach-O images will contain a __DATA,__crash_info section formatted
-// according to this structure.
+// Client Mach-O images will contain a __DATA,__crash_info or
+// __DATA_DIRTY,__crash_info section formatted according to this structure.
 //
 // crashreporter_annotations_t is variable-length. Its length dictated by its
 // |version| field which is always present. A custom implementation of the
@@ -45,6 +45,9 @@ PROCESS_TYPE_STRUCT_BEGIN(crashreporter_annotations_t)
   PROCESS_TYPE_STRUCT_VERSIONED(crashreporter_annotations_t, version)
 
   // Version 4 (OS X 10.7)
+  //
+  // From 10.9
+  // https://github.com/apple-oss-distributions/cups/blame/cups-372/cups/backend/usb-darwin.c.
   PROCESS_TYPE_STRUCT_MEMBER(uint64_t, message)  // char*
   PROCESS_TYPE_STRUCT_MEMBER(uint64_t, signature_string)  // char*
   PROCESS_TYPE_STRUCT_MEMBER(uint64_t, backtrace)  // char*
@@ -53,7 +56,27 @@ PROCESS_TYPE_STRUCT_BEGIN(crashreporter_annotations_t)
   PROCESS_TYPE_STRUCT_MEMBER(uint64_t, dialog_mode)  // unsigned int
 
   // Version 5 (OS X 10.11)
-  PROCESS_TYPE_STRUCT_MEMBER(uint64_t, unknown_0)
+  //
+  // Empirically, this is 8 bytes longer than a version 4 structure. It being a
+  // single field named abort_cause is gleaned from
+  // https://github.com/llvm/llvm-project/commit/8c345dcb9b1d3a5b0f8b6a81c7c8531b435ff3e2.
+  PROCESS_TYPE_STRUCT_MEMBER(uint64_t, abort_cause)
+
+  // Version 7 (macOS 26)
+  //
+  // Empirically, the version 7 structure is 328 bytes long. The exact meaning
+  // of the extended structure is unknown.
+  //
+  // TODO: Look to a future version of llvm’s
+  // llvm/lib/Support/PrettyStackTrace.cpp or
+  // https://github.com/WebKit/WebKit/blob/main/Source/WTF/wtf/spi/cocoa/CrashReporterClientSPI.h
+  // to aid in understanding. However, this may not be fruitful:
+  // https://github.com/llvm/llvm-project/commit/0b7cbd23a043ea4c14bd13ccd737049d38f64b5d
+  // (https://github.com/llvm/llvm-project/pull/123978) indicates that
+  // `CRASHREPORTER_ANNOTATIONS_INITIALIZER` may be used as the initializer,
+  // which would provide no additional information about the arrangement of
+  // structure members without <CrashReporterClient.h>.
+  PROCESS_TYPE_STRUCT_MEMBER(uint64_t, unknown_0, [33])
 PROCESS_TYPE_STRUCT_END(crashreporter_annotations_t)
 
 #endif  // ! PROCESS_TYPE_STRUCT_IMPLEMENT_INTERNAL_READ_INTO &&
diff --git a/extern/crashpad/crashpad/snapshot/mac/process_types/custom.cc b/extern/crashpad/crashpad/snapshot/mac/process_types/custom.cc
index d80a984bf9..b0adada9de 100644
--- a/extern/crashpad/crashpad/snapshot/mac/process_types/custom.cc
+++ b/extern/crashpad/crashpad/snapshot/mac/process_types/custom.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,21 +12,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "snapshot/mac/process_types.h"
-
 #include <stddef.h>
 #include <string.h>
 #include <sys/types.h>
 
 #include <algorithm>
+#include <iterator>
 #include <limits>
 #include <type_traits>
 
 #include "base/check_op.h"
-#include "base/cxx17_backports.h"
 #include "base/logging.h"
 #include "base/numerics/safe_math.h"
 #include "base/strings/stringprintf.h"
+#include "snapshot/mac/process_types.h"
 #include "snapshot/mac/process_types/internal.h"
 #include "util/mac/mac_util.h"
 #include "util/process/process_memory_mac.h"
@@ -147,10 +146,11 @@ size_t dyld_all_image_infos<Traits>::ExpectedSizeForVersion(
       std::numeric_limits<size_t>::max(),  // 15, see below
       offsetof(dyld_all_image_infos<Traits>, end_v16),  // 16
       sizeof(dyld_all_image_infos<Traits>),  // 17
+      sizeof(dyld_all_image_infos<Traits>),  // 18
   };
 
-  if (version >= base::size(kSizeForVersion)) {
-    return kSizeForVersion[base::size(kSizeForVersion) - 1];
+  if (version >= std::size(kSizeForVersion)) {
+    return kSizeForVersion[std::size(kSizeForVersion) - 1];
   }
 
   static_assert(std::is_unsigned<decltype(version)>::value,
@@ -191,12 +191,15 @@ bool dyld_all_image_infos<Traits>::ReadInto(
 template <typename Traits>
 size_t crashreporter_annotations_t<Traits>::ExpectedSizeForVersion(
     decltype(crashreporter_annotations_t<Traits>::version) version) {
-  if (version >= 5) {
+  if (version >= 7) {
     return sizeof(crashreporter_annotations_t<Traits>);
   }
-  if (version >= 4) {
+  if (version >= 5) {
     return offsetof(crashreporter_annotations_t<Traits>, unknown_0);
   }
+  if (version >= 4) {
+    return offsetof(crashreporter_annotations_t<Traits>, abort_cause);
+  }
   return offsetof(crashreporter_annotations_t<Traits>, message);
 }
 
diff --git a/extern/crashpad/crashpad/snapshot/mac/process_types/dyld_images.proctype b/extern/crashpad/crashpad/snapshot/mac/process_types/dyld_images.proctype
index 589ad097a0..3c802c3311 100644
--- a/extern/crashpad/crashpad/snapshot/mac/process_types/dyld_images.proctype
+++ b/extern/crashpad/crashpad/snapshot/mac/process_types/dyld_images.proctype
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -127,12 +127,16 @@ PROCESS_TYPE_STRUCT_BEGIN(dyld_all_image_infos)
   // preceding the padding in the 32-bit structure that would natively be
   // addressed at index 4 of |reserved|. Treat reserved_4_32 as only available
   // in version 16 of the structure.
+  // In the 12.0 SDK, 2 of the trailing UIntPtrs on 64-bit and
+  // 4 of them on 32-bit were replaced by two uint64_ts. On 32-bit, that
+  // awkwardly straddles end_v14. Since macOS 12.0 is 64-bit only, the proctype
+  // version of this struct only has these uint64_ts in the 64-bit version.
   PROCESS_TYPE_STRUCT_MEMBER(UIntPtr, reserved, [4])
   PROCESS_TYPE_STRUCT_MEMBER(Reserved64_64Only, reserved_4_64)
   PROCESS_TYPE_STRUCT_MEMBER(Reserved64_64Only, reserved_5)
   PROCESS_TYPE_STRUCT_MEMBER(Reserved64_64Only, reserved_6)
-  PROCESS_TYPE_STRUCT_MEMBER(Reserved64_64Only, reserved_7)
-  PROCESS_TYPE_STRUCT_MEMBER(Reserved64_64Only, reserved_8)
+  PROCESS_TYPE_STRUCT_MEMBER(Reserved64_64Only, shared_cache_fs_id)
+  PROCESS_TYPE_STRUCT_MEMBER(Reserved64_64Only, shared_cache_fs_obj_id)
   PROCESS_TYPE_STRUCT_MEMBER(Nothing, end_v14)
   PROCESS_TYPE_STRUCT_MEMBER(Reserved32_32Only, reserved_4_32)
 
diff --git a/extern/crashpad/crashpad/snapshot/mac/process_types/flavors.h b/extern/crashpad/crashpad/snapshot/mac/process_types/flavors.h
index 01ab2bd7cb..abb2dd36ac 100644
--- a/extern/crashpad/crashpad/snapshot/mac/process_types/flavors.h
+++ b/extern/crashpad/crashpad/snapshot/mac/process_types/flavors.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/mac/process_types/internal.h b/extern/crashpad/crashpad/snapshot/mac/process_types/internal.h
index fd956574d2..bee67e534d 100644
--- a/extern/crashpad/crashpad/snapshot/mac/process_types/internal.h
+++ b/extern/crashpad/crashpad/snapshot/mac/process_types/internal.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/mac/process_types/loader.proctype b/extern/crashpad/crashpad/snapshot/mac/process_types/loader.proctype
index 43a9a7f13a..abd5fbc80e 100644
--- a/extern/crashpad/crashpad/snapshot/mac/process_types/loader.proctype
+++ b/extern/crashpad/crashpad/snapshot/mac/process_types/loader.proctype
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/mac/process_types/nlist.proctype b/extern/crashpad/crashpad/snapshot/mac/process_types/nlist.proctype
index c898913954..2ca531cbf2 100644
--- a/extern/crashpad/crashpad/snapshot/mac/process_types/nlist.proctype
+++ b/extern/crashpad/crashpad/snapshot/mac/process_types/nlist.proctype
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/mac/process_types/traits.h b/extern/crashpad/crashpad/snapshot/mac/process_types/traits.h
index 613f4f5755..d101e60cf8 100644
--- a/extern/crashpad/crashpad/snapshot/mac/process_types/traits.h
+++ b/extern/crashpad/crashpad/snapshot/mac/process_types/traits.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/mac/process_types_test.cc b/extern/crashpad/crashpad/snapshot/mac/process_types_test.cc
index e0c3c9cb37..ffa04a702f 100644
--- a/extern/crashpad/crashpad/snapshot/mac/process_types_test.cc
+++ b/extern/crashpad/crashpad/snapshot/mac/process_types_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,10 +18,10 @@
 #include <mach/mach.h>
 #include <string.h>
 
+#include <iterator>
 #include <limits>
 #include <vector>
 
-#include "base/cxx17_backports.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"
@@ -172,7 +172,7 @@ TEST(ProcessTypes, DyldImagesSelf) {
       {16, kUnsupported, 328},
       {17, kUnsupported, 368},
   };
-  for (size_t index = 0; index < base::size(kVersionsAndSizes); ++index) {
+  for (size_t index = 0; index < std::size(kVersionsAndSizes); ++index) {
     uint32_t version = kVersionsAndSizes[index].version;
     SCOPED_TRACE(base::StringPrintf("index %zu, version %u", index, version));
 
@@ -325,7 +325,7 @@ TEST(ProcessTypes, DyldImagesSelf) {
               self_image_infos->sharedCacheBaseAddress);
     EXPECT_EQ(proctype_image_infos.dyldPath,
               reinterpret_cast<uint64_t>(self_image_infos->dyldPath));
-    for (size_t index = 0; index < base::size(self_image_infos->notifyPorts);
+    for (size_t index = 0; index < std::size(self_image_infos->notifyPorts);
          ++index) {
       EXPECT_EQ(proctype_image_infos.notifyPorts[index],
                 self_image_infos->notifyPorts[index])
@@ -345,7 +345,7 @@ TEST(ProcessTypes, DyldImagesSelf) {
   // process_types version. It’s difficult to compare the reserved fields in
   // these older SDKs, so only do it where the declarations match.
   if (proctype_image_infos.version >= 14) {
-    for (size_t index = 0; index < base::size(proctype_image_infos.reserved);
+    for (size_t index = 0; index < std::size(proctype_image_infos.reserved);
          ++index) {
       EXPECT_EQ(proctype_image_infos.reserved[index],
                 implicit_cast<uint64_t>(self_image_infos->reserved[index]))
@@ -356,8 +356,16 @@ TEST(ProcessTypes, DyldImagesSelf) {
               self_image_infos->reserved[4]);
     EXPECT_EQ(proctype_image_infos.reserved_5, self_image_infos->reserved[5]);
     EXPECT_EQ(proctype_image_infos.reserved_6, self_image_infos->reserved[6]);
-    EXPECT_EQ(proctype_image_infos.reserved_7, self_image_infos->reserved[7]);
-    EXPECT_EQ(proctype_image_infos.reserved_8, self_image_infos->reserved[8]);
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= __MAC_12_0
+    uint64_t shared_cache_fs_id = self_image_infos->sharedCacheFSID;
+    uint64_t shared_cache_fs_obj_id = self_image_infos->sharedCacheFSObjID;
+#else
+    uint64_t shared_cache_fs_id = self_image_infos->reserved[7];
+    uint64_t shared_cache_fs_obj_id = self_image_infos->reserved[8];
+#endif
+    EXPECT_EQ(proctype_image_infos.shared_cache_fs_id, shared_cache_fs_id);
+    EXPECT_EQ(proctype_image_infos.shared_cache_fs_obj_id,
+              shared_cache_fs_obj_id);
 #endif
   }
 #endif
diff --git a/extern/crashpad/crashpad/snapshot/mac/system_snapshot_mac.cc b/extern/crashpad/crashpad/snapshot/mac/system_snapshot_mac.cc
index 7a12e749c3..0242440ef0 100644
--- a/extern/crashpad/crashpad/snapshot/mac/system_snapshot_mac.cc
+++ b/extern/crashpad/crashpad/snapshot/mac/system_snapshot_mac.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -86,7 +86,6 @@ SystemSnapshotMac::SystemSnapshotMac()
       os_version_major_(0),
       os_version_minor_(0),
       os_version_bugfix_(0),
-      os_server_(false),
       initialized_() {
 }
 
@@ -107,7 +106,6 @@ void SystemSnapshotMac::Initialize(ProcessReaderMac* process_reader,
                          &os_version_minor_,
                          &os_version_bugfix_,
                          &os_version_build_,
-                         &os_server_,
                          &os_version_string);
 
   std::string uname_string;
@@ -207,7 +205,6 @@ uint32_t SystemSnapshotMac::CPUX86Signature() const {
   return ReadIntSysctlByName<uint32_t>("machdep.cpu.signature", 0);
 #else
   NOTREACHED();
-  return 0;
 #endif
 }
 
@@ -218,7 +215,6 @@ uint64_t SystemSnapshotMac::CPUX86Features() const {
   return ReadIntSysctlByName<uint64_t>("machdep.cpu.feature_bits", 0);
 #else
   NOTREACHED();
-  return 0;
 #endif
 }
 
@@ -229,7 +225,6 @@ uint64_t SystemSnapshotMac::CPUX86ExtendedFeatures() const {
   return ReadIntSysctlByName<uint64_t>("machdep.cpu.extfeature_bits", 0);
 #else
   NOTREACHED();
-  return 0;
 #endif
 }
 
@@ -254,7 +249,6 @@ uint32_t SystemSnapshotMac::CPUX86Leaf7Features() const {
   return ebx;
 #else
   NOTREACHED();
-  return 0;
 #endif
 }
 
@@ -293,7 +287,6 @@ bool SystemSnapshotMac::CPUX86SupportsDAZ() const {
   return fxsave.mxcsr_mask & (1 << 6);
 #else
   NOTREACHED();
-  return false;
 #endif
 }
 
@@ -304,7 +297,7 @@ SystemSnapshot::OperatingSystem SystemSnapshotMac::GetOperatingSystem() const {
 
 bool SystemSnapshotMac::OSServer() const {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
-  return os_server_;
+  return false;
 }
 
 void SystemSnapshotMac::OSVersion(int* major,
@@ -390,5 +383,19 @@ void SystemSnapshotMac::TimeZone(DaylightSavingTimeStatus* dst_status,
                      daylight_name);
 }
 
+uint64_t SystemSnapshotMac::AddressMask() const {
+  uint64_t mask = 0;
+#if defined(ARCH_CPU_ARM64)
+  // `machdep.virtual_address_size` is the number of addressable bits in
+  // userspace virtual addresses
+  uint8_t addressable_bits =
+      CastIntSysctlByName<uint8_t>("machdep.virtual_address_size", 0);
+  if (addressable_bits) {
+    mask = ~((1UL << addressable_bits) - 1);
+  }
+#endif
+  return mask;
+}
+
 }  // namespace internal
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/snapshot/mac/system_snapshot_mac.h b/extern/crashpad/crashpad/snapshot/mac/system_snapshot_mac.h
index cca6be2532..275ae5fec1 100644
--- a/extern/crashpad/crashpad/snapshot/mac/system_snapshot_mac.h
+++ b/extern/crashpad/crashpad/snapshot/mac/system_snapshot_mac.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -83,6 +83,7 @@ class SystemSnapshotMac final : public SystemSnapshot {
                 int* daylight_offset_seconds,
                 std::string* standard_name,
                 std::string* daylight_name) const override;
+  uint64_t AddressMask() const override;
 
  private:
   std::string os_version_full_;
@@ -92,7 +93,6 @@ class SystemSnapshotMac final : public SystemSnapshot {
   int os_version_major_;
   int os_version_minor_;
   int os_version_bugfix_;
-  bool os_server_;
   InitializationStateDcheck initialized_;
 };
 
diff --git a/extern/crashpad/crashpad/snapshot/mac/system_snapshot_mac_test.cc b/extern/crashpad/crashpad/snapshot/mac/system_snapshot_mac_test.cc
index 6bf32b1fae..ce94a28015 100644
--- a/extern/crashpad/crashpad/snapshot/mac/system_snapshot_mac_test.cc
+++ b/extern/crashpad/crashpad/snapshot/mac/system_snapshot_mac_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/mac/thread_snapshot_mac.cc b/extern/crashpad/crashpad/snapshot/mac/thread_snapshot_mac.cc
index d261f194ad..c68712c6b7 100644
--- a/extern/crashpad/crashpad/snapshot/mac/thread_snapshot_mac.cc
+++ b/extern/crashpad/crashpad/snapshot/mac/thread_snapshot_mac.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -26,13 +26,13 @@ ThreadSnapshotMac::ThreadSnapshotMac()
       context_union_(),
       context_(),
       stack_(),
+      thread_name_(),
       thread_id_(0),
       thread_specific_data_address_(0),
       thread_(MACH_PORT_NULL),
       suspend_count_(0),
       priority_(0),
-      initialized_() {
-}
+      initialized_() {}
 
 ThreadSnapshotMac::~ThreadSnapshotMac() {
 }
@@ -44,6 +44,7 @@ bool ThreadSnapshotMac::Initialize(
 
   thread_ = process_reader_thread.port;
   thread_id_ = process_reader_thread.id;
+  thread_name_ = process_reader_thread.name;
   suspend_count_ = process_reader_thread.suspend_count;
   priority_ = process_reader_thread.priority;
   thread_specific_data_address_ =
@@ -108,6 +109,11 @@ uint64_t ThreadSnapshotMac::ThreadID() const {
   return thread_id_;
 }
 
+std::string ThreadSnapshotMac::ThreadName() const {
+  INITIALIZATION_STATE_DCHECK_VALID(initialized_);
+  return thread_name_;
+}
+
 int ThreadSnapshotMac::SuspendCount() const {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
   return suspend_count_;
diff --git a/extern/crashpad/crashpad/snapshot/mac/thread_snapshot_mac.h b/extern/crashpad/crashpad/snapshot/mac/thread_snapshot_mac.h
index 4d9cb3167f..22c75d5a69 100644
--- a/extern/crashpad/crashpad/snapshot/mac/thread_snapshot_mac.h
+++ b/extern/crashpad/crashpad/snapshot/mac/thread_snapshot_mac.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,6 +18,8 @@
 #include <mach/mach.h>
 #include <stdint.h>
 
+#include <string>
+
 #include "build/build_config.h"
 #include "snapshot/cpu_context.h"
 #include "snapshot/mac/process_reader_mac.h"
@@ -60,6 +62,7 @@ class ThreadSnapshotMac final : public ThreadSnapshot {
   const CPUContext* Context() const override;
   const MemorySnapshot* Stack() const override;
   uint64_t ThreadID() const override;
+  std::string ThreadName() const override;
   int SuspendCount() const override;
   int Priority() const override;
   uint64_t ThreadSpecificDataAddress() const override;
@@ -78,6 +81,7 @@ class ThreadSnapshotMac final : public ThreadSnapshot {
   } context_union_;
   CPUContext context_;
   MemorySnapshotGeneric stack_;
+  std::string thread_name_;
   uint64_t thread_id_;
   uint64_t thread_specific_data_address_;
   thread_t thread_;
diff --git a/extern/crashpad/crashpad/snapshot/memory_map_region_snapshot.h b/extern/crashpad/crashpad/snapshot/memory_map_region_snapshot.h
index 4d271f7ab1..b43bc01645 100644
--- a/extern/crashpad/crashpad/snapshot/memory_map_region_snapshot.h
+++ b/extern/crashpad/crashpad/snapshot/memory_map_region_snapshot.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/memory_snapshot.cc b/extern/crashpad/crashpad/snapshot/memory_snapshot.cc
index c86fa48d1b..6af740c1cc 100644
--- a/extern/crashpad/crashpad/snapshot/memory_snapshot.cc
+++ b/extern/crashpad/crashpad/snapshot/memory_snapshot.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/memory_snapshot.h b/extern/crashpad/crashpad/snapshot/memory_snapshot.h
index 5dbac5ad2a..12dffa9997 100644
--- a/extern/crashpad/crashpad/snapshot/memory_snapshot.h
+++ b/extern/crashpad/crashpad/snapshot/memory_snapshot.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/memory_snapshot_generic.h b/extern/crashpad/crashpad/snapshot/memory_snapshot_generic.h
index b09e7a9607..dd03bdbb89 100644
--- a/extern/crashpad/crashpad/snapshot/memory_snapshot_generic.h
+++ b/extern/crashpad/crashpad/snapshot/memory_snapshot_generic.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 #include <stdint.h>
 #include <sys/types.h>
 
+#include "base/containers/heap_array.h"
 #include "base/logging.h"
 #include "base/numerics/safe_math.h"
 #include "snapshot/memory_snapshot.h"
@@ -79,11 +80,11 @@ class MemorySnapshotGeneric final : public MemorySnapshot {
       return delegate->MemorySnapshotDelegateRead(nullptr, size_);
     }
 
-    std::unique_ptr<uint8_t[]> buffer(new uint8_t[size_]);
-    if (!process_memory_->Read(address_, size_, buffer.get())) {
+    auto buffer = base::HeapArray<uint8_t>::Uninit(size_);
+    if (!process_memory_->Read(address_, buffer.size(), buffer.data())) {
       return false;
     }
-    return delegate->MemorySnapshotDelegateRead(buffer.get(), size_);
+    return delegate->MemorySnapshotDelegateRead(buffer.data(), buffer.size());
   }
 
   const MemorySnapshot* MergeWithOtherSnapshot(
diff --git a/extern/crashpad/crashpad/snapshot/memory_snapshot_test.cc b/extern/crashpad/crashpad/snapshot/memory_snapshot_test.cc
index 14ba78ee94..94e6e0ab24 100644
--- a/extern/crashpad/crashpad/snapshot/memory_snapshot_test.cc
+++ b/extern/crashpad/crashpad/snapshot/memory_snapshot_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/minidump/exception_snapshot_minidump.cc b/extern/crashpad/crashpad/snapshot/minidump/exception_snapshot_minidump.cc
index afd3282872..a12611d233 100644
--- a/extern/crashpad/crashpad/snapshot/minidump/exception_snapshot_minidump.cc
+++ b/extern/crashpad/crashpad/snapshot/minidump/exception_snapshot_minidump.cc
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/minidump/exception_snapshot_minidump.h b/extern/crashpad/crashpad/snapshot/minidump/exception_snapshot_minidump.h
index 917c237f1d..b793649f6c 100644
--- a/extern/crashpad/crashpad/snapshot/minidump/exception_snapshot_minidump.h
+++ b/extern/crashpad/crashpad/snapshot/minidump/exception_snapshot_minidump.h
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/minidump/memory_snapshot_minidump.cc b/extern/crashpad/crashpad/snapshot/minidump/memory_snapshot_minidump.cc
index 2c6c899a47..fc21562a62 100644
--- a/extern/crashpad/crashpad/snapshot/minidump/memory_snapshot_minidump.cc
+++ b/extern/crashpad/crashpad/snapshot/minidump/memory_snapshot_minidump.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/minidump/memory_snapshot_minidump.h b/extern/crashpad/crashpad/snapshot/minidump/memory_snapshot_minidump.h
index 0ab05b2ca5..ba1f4e6ecf 100644
--- a/extern/crashpad/crashpad/snapshot/minidump/memory_snapshot_minidump.h
+++ b/extern/crashpad/crashpad/snapshot/minidump/memory_snapshot_minidump.h
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/minidump/minidump_annotation_reader.cc b/extern/crashpad/crashpad/snapshot/minidump/minidump_annotation_reader.cc
index b1e4f9852d..54d7db1e77 100644
--- a/extern/crashpad/crashpad/snapshot/minidump/minidump_annotation_reader.cc
+++ b/extern/crashpad/crashpad/snapshot/minidump/minidump_annotation_reader.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/minidump/minidump_annotation_reader.h b/extern/crashpad/crashpad/snapshot/minidump/minidump_annotation_reader.h
index a5bafb5bff..79cf379662 100644
--- a/extern/crashpad/crashpad/snapshot/minidump/minidump_annotation_reader.h
+++ b/extern/crashpad/crashpad/snapshot/minidump/minidump_annotation_reader.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/minidump/minidump_context_converter.cc b/extern/crashpad/crashpad/snapshot/minidump/minidump_context_converter.cc
index 981f34c974..ec02dff126 100644
--- a/extern/crashpad/crashpad/snapshot/minidump/minidump_context_converter.cc
+++ b/extern/crashpad/crashpad/snapshot/minidump/minidump_context_converter.cc
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,7 +16,8 @@
 
 #include <string.h>
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+
 #include "base/logging.h"
 #include "minidump/minidump_context.h"
 
@@ -147,7 +148,7 @@ bool MinidumpContextConverter::Initialize(
       return false;
     }
 
-    for (size_t i = 0; i < base::size(src->regs); i++) {
+    for (size_t i = 0; i < std::size(src->regs); i++) {
       context_.arm->regs[i] = src->regs[i];
     }
 
@@ -159,7 +160,7 @@ bool MinidumpContextConverter::Initialize(
     context_.arm->cpsr = src->cpsr;
     context_.arm->vfp_regs.fpscr = src->fpscr;
 
-    for (size_t i = 0; i < base::size(src->vfp); i++) {
+    for (size_t i = 0; i < std::size(src->vfp); i++) {
       context_.arm->vfp_regs.vfp[i] = src->vfp[i];
     }
 
@@ -179,14 +180,14 @@ bool MinidumpContextConverter::Initialize(
       return false;
     }
 
-    for (size_t i = 0; i < base::size(src->regs); i++) {
+    for (size_t i = 0; i < std::size(src->regs); i++) {
       context_.arm64->regs[i] = src->regs[i];
     }
 
     context_.arm64->regs[29] = src->fp;
     context_.arm64->regs[30] = src->lr;
 
-    for (size_t i = 0; i < base::size(src->fpsimd); i++) {
+    for (size_t i = 0; i < std::size(src->fpsimd); i++) {
       context_.arm64->fpsimd[i] = src->fpsimd[i];
     }
 
@@ -208,7 +209,7 @@ bool MinidumpContextConverter::Initialize(
       return false;
     }
 
-    for (size_t i = 0; i < base::size(src->regs); i++) {
+    for (size_t i = 0; i < std::size(src->regs); i++) {
       context_.mipsel->regs[i] = src->regs[i];
     }
 
@@ -216,7 +217,7 @@ bool MinidumpContextConverter::Initialize(
     context_.mipsel->mdlo = static_cast<uint32_t>(src->mdlo);
     context_.mipsel->dsp_control = src->dsp_control;
 
-    for (size_t i = 0; i < base::size(src->hi); i++) {
+    for (size_t i = 0; i < std::size(src->hi); i++) {
       context_.mipsel->hi[i] = src->hi[i];
       context_.mipsel->lo[i] = src->lo[i];
     }
@@ -244,7 +245,7 @@ bool MinidumpContextConverter::Initialize(
       return false;
     }
 
-    for (size_t i = 0; i < base::size(src->regs); i++) {
+    for (size_t i = 0; i < std::size(src->regs); i++) {
       context_.mips64->regs[i] = src->regs[i];
     }
 
@@ -252,7 +253,7 @@ bool MinidumpContextConverter::Initialize(
     context_.mips64->mdlo = src->mdlo;
     context_.mips64->dsp_control = src->dsp_control;
 
-    for (size_t i = 0; i < base::size(src->hi); i++) {
+    for (size_t i = 0; i < std::size(src->hi); i++) {
       context_.mips64->hi[i] = src->hi[i];
       context_.mips64->lo[i] = src->lo[i];
     }
@@ -265,6 +266,33 @@ bool MinidumpContextConverter::Initialize(
     context_.mips64->fir = src->fir;
 
     memcpy(&context_.mips64->fpregs, &src->fpregs, sizeof(src->fpregs));
+  } else if (context_.architecture ==
+             CPUArchitecture::kCPUArchitectureRISCV64) {
+    context_memory_.resize(sizeof(CPUContextRISCV64));
+    context_.riscv64 =
+        reinterpret_cast<CPUContextRISCV64*>(context_memory_.data());
+    const MinidumpContextRISCV64* src =
+        reinterpret_cast<const MinidumpContextRISCV64*>(
+            minidump_context.data());
+    if (minidump_context.size() < sizeof(MinidumpContextRISCV64)) {
+      return false;
+    }
+
+    if (!(src->context_flags & kMinidumpContextRISCV64)) {
+      return false;
+    }
+
+    context_.riscv64->pc = src->pc;
+
+    static_assert(sizeof(context_.riscv64->regs) == sizeof(src->regs),
+                  "GPR size mismatch");
+    memcpy(&context_.riscv64->regs, &src->regs, sizeof(src->regs));
+
+    static_assert(sizeof(context_.riscv64->fpregs) == sizeof(src->fpregs),
+                  "FPR size mismatch");
+    memcpy(&context_.riscv64->fpregs, &src->fpregs, sizeof(src->fpregs));
+
+    context_.riscv64->fcsr = src->fcsr;
   } else {
     // Architecture is listed as "unknown".
     DLOG(ERROR) << "Unknown architecture";
diff --git a/extern/crashpad/crashpad/snapshot/minidump/minidump_context_converter.h b/extern/crashpad/crashpad/snapshot/minidump/minidump_context_converter.h
index 48e36c1f0d..4340f9874a 100644
--- a/extern/crashpad/crashpad/snapshot/minidump/minidump_context_converter.h
+++ b/extern/crashpad/crashpad/snapshot/minidump/minidump_context_converter.h
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/minidump/minidump_simple_string_dictionary_reader.cc b/extern/crashpad/crashpad/snapshot/minidump/minidump_simple_string_dictionary_reader.cc
index 7e263f9e87..610d0742ca 100644
--- a/extern/crashpad/crashpad/snapshot/minidump/minidump_simple_string_dictionary_reader.cc
+++ b/extern/crashpad/crashpad/snapshot/minidump/minidump_simple_string_dictionary_reader.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/minidump/minidump_simple_string_dictionary_reader.h b/extern/crashpad/crashpad/snapshot/minidump/minidump_simple_string_dictionary_reader.h
index 633ea0f131..f48bdf1287 100644
--- a/extern/crashpad/crashpad/snapshot/minidump/minidump_simple_string_dictionary_reader.h
+++ b/extern/crashpad/crashpad/snapshot/minidump/minidump_simple_string_dictionary_reader.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/minidump/minidump_stream.h b/extern/crashpad/crashpad/snapshot/minidump/minidump_stream.h
index 20f1dda4e5..8bca440a41 100644
--- a/extern/crashpad/crashpad/snapshot/minidump/minidump_stream.h
+++ b/extern/crashpad/crashpad/snapshot/minidump/minidump_stream.h
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/minidump/minidump_string_list_reader.cc b/extern/crashpad/crashpad/snapshot/minidump/minidump_string_list_reader.cc
index 3b9bd6b5a8..bc9664cbad 100644
--- a/extern/crashpad/crashpad/snapshot/minidump/minidump_string_list_reader.cc
+++ b/extern/crashpad/crashpad/snapshot/minidump/minidump_string_list_reader.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/minidump/minidump_string_list_reader.h b/extern/crashpad/crashpad/snapshot/minidump/minidump_string_list_reader.h
index 2521605a1c..ada3502af3 100644
--- a/extern/crashpad/crashpad/snapshot/minidump/minidump_string_list_reader.h
+++ b/extern/crashpad/crashpad/snapshot/minidump/minidump_string_list_reader.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/minidump/minidump_string_reader.cc b/extern/crashpad/crashpad/snapshot/minidump/minidump_string_reader.cc
index 0e9527c200..a8ff102a78 100644
--- a/extern/crashpad/crashpad/snapshot/minidump/minidump_string_reader.cc
+++ b/extern/crashpad/crashpad/snapshot/minidump/minidump_string_reader.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -24,10 +24,10 @@ namespace internal {
 
 namespace {
 
-template<typename StringType>
+template<typename StringType, typename RVAType>
 bool ReadMinidumpString(FileReaderInterface* file_reader,
-                            RVA rva,
-                            StringType* string) {
+                        RVAType rva,
+                        StringType* string) {
   if (rva == 0) {
     string->clear();
     return true;
@@ -59,12 +59,24 @@ bool ReadMinidumpUTF8String(FileReaderInterface* file_reader,
   return ReadMinidumpString(file_reader, rva, string);
 }
 
+bool ReadMinidumpUTF8String(FileReaderInterface* file_reader,
+                            RVA64 rva,
+                            std::string* string) {
+  return ReadMinidumpString(file_reader, rva, string);
+}
+
 bool ReadMinidumpUTF16String(FileReaderInterface* file_reader,
                              RVA rva,
                              std::u16string* string) {
   return ReadMinidumpString(file_reader, rva, string);
 }
 
+bool ReadMinidumpUTF16String(FileReaderInterface* file_reader,
+                             RVA64 rva,
+                             std::u16string* string) {
+  return ReadMinidumpString(file_reader, rva, string);
+}
+
 bool ReadMinidumpUTF16String(FileReaderInterface* file_reader,
                             RVA rva,
                             std::string* string) {
@@ -79,5 +91,19 @@ bool ReadMinidumpUTF16String(FileReaderInterface* file_reader,
   return true;
 }
 
+bool ReadMinidumpUTF16String(FileReaderInterface* file_reader,
+                             RVA64 rva,
+                             std::string* string) {
+  std::u16string string_raw;
+
+  if (!ReadMinidumpString(file_reader, rva, &string_raw)) {
+    return false;
+  }
+
+  base::UTF16ToUTF8(string_raw.data(), string_raw.size(), string);
+
+  return true;
+}
+
 }  // namespace internal
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/snapshot/minidump/minidump_string_reader.h b/extern/crashpad/crashpad/snapshot/minidump/minidump_string_reader.h
index 370fa8c194..1d9b28180e 100644
--- a/extern/crashpad/crashpad/snapshot/minidump/minidump_string_reader.h
+++ b/extern/crashpad/crashpad/snapshot/minidump/minidump_string_reader.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,6 +20,8 @@
 
 #include <string>
 
+#include "base/strings/utf_string_conversions.h"
+#include "minidump/minidump_extensions.h"
 #include "util/file/file_reader.h"
 
 namespace crashpad {
@@ -34,6 +36,11 @@ bool ReadMinidumpUTF8String(FileReaderInterface* file_reader,
                             RVA rva,
                             std::string* string);
 
+//! \brief 64-bit specialization of ReadMinidumpUTF8String.
+bool ReadMinidumpUTF8String(FileReaderInterface* file_reader,
+                            RVA64 rva,
+                            std::string* string);
+
 //! \brief Reads a MinidumpUTF16String from a minidump file at offset \a rva in
 //!     \a file_reader, and returns it in \a string.
 //!
@@ -43,6 +50,11 @@ bool ReadMinidumpUTF16String(FileReaderInterface* file_reader,
                              RVA rva,
                              std::u16string* string);
 
+//! \brief 64-bit specialization of ReadMinidumpUTF16String.
+bool ReadMinidumpUTF16String(FileReaderInterface* file_reader,
+                             RVA64 rva,
+                             std::u16string* string);
+
 //! \brief Reads a MinidumpUTF16String from a minidump file at offset \a rva in
 //!     \a file_reader, and returns it in \a string.
 //!
@@ -52,6 +64,11 @@ bool ReadMinidumpUTF16String(FileReaderInterface* file_reader,
                              RVA rva,
                              std::string* string);
 
+//! \brief 64-bit specialization of ReadMinidumpUTF16String.
+bool ReadMinidumpUTF16String(FileReaderInterface* file_reader,
+                             RVA64 rva,
+                             std::string* string);
+
 }  // namespace internal
 }  // namespace crashpad
 
diff --git a/extern/crashpad/crashpad/snapshot/minidump/module_snapshot_minidump.cc b/extern/crashpad/crashpad/snapshot/minidump/module_snapshot_minidump.cc
index 698f535741..36b005213a 100644
--- a/extern/crashpad/crashpad/snapshot/minidump/module_snapshot_minidump.cc
+++ b/extern/crashpad/crashpad/snapshot/minidump/module_snapshot_minidump.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,6 +17,9 @@
 #include <stddef.h>
 #include <string.h>
 
+#include <iterator>
+
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/notreached.h"
 #include "minidump/minidump_extensions.h"
@@ -100,7 +103,7 @@ bool ModuleSnapshotMinidump::InitializeModuleCodeView(
   signature = *reinterpret_cast<uint32_t*>(cv_record.data());
 
   if (signature == CodeViewRecordPDB70::kSignature) {
-    if (cv_record.size() < offsetof(CodeViewRecordPDB70, pdb_name)) {
+    if (cv_record.size() < offsetof(CodeViewRecordPDB70, pdb_name) + 1) {
       LOG(ERROR) << "CodeView record in module marked as PDB70 but too small";
       return false;
     }
@@ -111,8 +114,14 @@ bool ModuleSnapshotMinidump::InitializeModuleCodeView(
     age_ = cv_record_pdb70->age;
     uuid_ = cv_record_pdb70->uuid;
 
+    if (cv_record.back() != '\0') {
+      LOG(ERROR) << "CodeView record marked as PDB70 missing NUL-terminator in "
+                    "pdb_name";
+      return false;
+    }
+
     std::copy(cv_record.begin() + offsetof(CodeViewRecordPDB70, pdb_name),
-              cv_record.end(),
+              cv_record.end() - 1,
               std::back_inserter(debug_file_name_));
     return true;
   }
@@ -222,14 +231,12 @@ std::set<CheckedRange<uint64_t>> ModuleSnapshotMinidump::ExtraMemoryRanges()
     const {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
   NOTREACHED();  // https://crashpad.chromium.org/bug/10
-  return std::set<CheckedRange<uint64_t>>();
 }
 
 std::vector<const UserMinidumpStream*>
 ModuleSnapshotMinidump::CustomMinidumpStreams() const {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
   NOTREACHED();  // https://crashpad.chromium.org/bug/10
-  return std::vector<const UserMinidumpStream*>();
 }
 
 bool ModuleSnapshotMinidump::InitializeModuleCrashpadInfo(
diff --git a/extern/crashpad/crashpad/snapshot/minidump/module_snapshot_minidump.h b/extern/crashpad/crashpad/snapshot/minidump/module_snapshot_minidump.h
index f00e566b8b..5210deb271 100644
--- a/extern/crashpad/crashpad/snapshot/minidump/module_snapshot_minidump.h
+++ b/extern/crashpad/crashpad/snapshot/minidump/module_snapshot_minidump.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/minidump/process_snapshot_minidump.cc b/extern/crashpad/crashpad/snapshot/minidump/process_snapshot_minidump.cc
index 4f85b77cfd..6ec51a0354 100644
--- a/extern/crashpad/crashpad/snapshot/minidump/process_snapshot_minidump.cc
+++ b/extern/crashpad/crashpad/snapshot/minidump/process_snapshot_minidump.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 #include "minidump/minidump_extensions.h"
 #include "snapshot/memory_map_region_snapshot.h"
 #include "snapshot/minidump/minidump_simple_string_dictionary_reader.h"
+#include "snapshot/minidump/minidump_string_reader.h"
 #include "util/file/file_io.h"
 
 namespace crashpad {
@@ -117,8 +118,9 @@ bool ProcessSnapshotMinidump::Initialize(FileReaderInterface* file_reader) {
 
   if (!InitializeCrashpadInfo() || !InitializeMiscInfo() ||
       !InitializeModules() || !InitializeSystemSnapshot() ||
-      !InitializeMemoryInfo() || !InitializeThreads() ||
-      !InitializeCustomMinidumpStreams() || !InitializeExceptionSnapshot()) {
+      !InitializeMemoryInfo() || !InitializeExtraMemory() ||
+      !InitializeThreads() || !InitializeCustomMinidumpStreams() ||
+      !InitializeExceptionSnapshot()) {
     return false;
   }
 
@@ -134,7 +136,6 @@ crashpad::ProcessID ProcessSnapshotMinidump::ProcessID() const {
 crashpad::ProcessID ProcessSnapshotMinidump::ParentProcessID() const {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
   NOTREACHED();  // https://crashpad.chromium.org/bug/10
-  return 0;
 }
 
 void ProcessSnapshotMinidump::SnapshotTime(timeval* snapshot_time) const {
@@ -207,7 +208,6 @@ std::vector<UnloadedModuleSnapshot> ProcessSnapshotMinidump::UnloadedModules()
     const {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
   NOTREACHED();  // https://crashpad.chromium.org/bug/10
-  return unloaded_modules_;
 }
 
 const ExceptionSnapshot* ProcessSnapshotMinidump::Exception() const {
@@ -228,14 +228,16 @@ std::vector<const MemoryMapRegionSnapshot*> ProcessSnapshotMinidump::MemoryMap()
 std::vector<HandleSnapshot> ProcessSnapshotMinidump::Handles() const {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
   NOTREACHED();  // https://crashpad.chromium.org/bug/10
-  return std::vector<HandleSnapshot>();
 }
 
 std::vector<const MemorySnapshot*> ProcessSnapshotMinidump::ExtraMemory()
     const {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
-  NOTREACHED();  // https://crashpad.chromium.org/bug/10
-  return std::vector<const MemorySnapshot*>();
+  std::vector<const MemorySnapshot*> chunks;
+  for (const auto& chunk : extra_memory_) {
+    chunks.push_back(chunk.get());
+  }
+  return chunks;
 }
 
 const ProcessMemory* ProcessSnapshotMinidump::Memory() const {
@@ -261,7 +263,10 @@ bool ProcessSnapshotMinidump::InitializeCrashpadInfo() {
     return true;
   }
 
-  if (stream_it->second->DataSize < sizeof(crashpad_info_)) {
+  constexpr size_t crashpad_info_min_size =
+      offsetof(decltype(crashpad_info_), reserved);
+  size_t remaining_data_size = stream_it->second->DataSize;
+  if (remaining_data_size < crashpad_info_min_size) {
     LOG(ERROR) << "crashpad_info size mismatch";
     return false;
   }
@@ -270,9 +275,34 @@ bool ProcessSnapshotMinidump::InitializeCrashpadInfo() {
     return false;
   }
 
-  if (!file_reader_->ReadExactly(&crashpad_info_, sizeof(crashpad_info_))) {
+  if (!file_reader_->ReadExactly(&crashpad_info_, crashpad_info_min_size)) {
     return false;
   }
+  remaining_data_size -= crashpad_info_min_size;
+
+  // Read `reserved` if available.
+  size_t crashpad_reserved_size = sizeof(crashpad_info_.reserved);
+  if (remaining_data_size >= crashpad_reserved_size) {
+    if (!file_reader_->ReadExactly(&crashpad_info_.reserved,
+                                   crashpad_reserved_size)) {
+      return false;
+    }
+    remaining_data_size -= crashpad_reserved_size;
+  } else {
+    crashpad_info_.reserved = 0;
+  }
+
+  // Read `address_mask` if available.
+  size_t crashpad_address_mask_size = sizeof(crashpad_info_.address_mask);
+  if (remaining_data_size >= crashpad_address_mask_size) {
+    if (!file_reader_->ReadExactly(&crashpad_info_.address_mask,
+                                   crashpad_address_mask_size)) {
+      return false;
+    }
+    remaining_data_size -= crashpad_address_mask_size;
+  } else {
+    crashpad_info_.address_mask = 0;
+  }
 
   if (crashpad_info_.version != MinidumpCrashpadInfo::kVersion) {
     LOG(ERROR) << "crashpad_info version mismatch";
@@ -313,13 +343,13 @@ bool ProcessSnapshotMinidump::InitializeMiscInfo() {
   switch (stream_it->second->DataSize) {
     case sizeof(MINIDUMP_MISC_INFO_5):
     case sizeof(MINIDUMP_MISC_INFO_4):
-#if defined(WCHAR_T_IS_UTF16)
+#if defined(WCHAR_T_IS_16_BIT)
       full_version_ = base::WideToUTF8(info.BuildString);
 #else
       full_version_ = base::UTF16ToUTF8(info.BuildString);
 #endif
       full_version_ = full_version_.substr(0, full_version_.find(';'));
-      FALLTHROUGH;
+      [[fallthrough]];
     case sizeof(MINIDUMP_MISC_INFO_3):
     case sizeof(MINIDUMP_MISC_INFO_2):
     case sizeof(MINIDUMP_MISC_INFO):
@@ -502,6 +532,50 @@ bool ProcessSnapshotMinidump::InitializeMemoryInfo() {
   return true;
 }
 
+bool ProcessSnapshotMinidump::InitializeExtraMemory() {
+  const auto& stream_it = stream_map_.find(kMinidumpStreamTypeMemoryList);
+  if (stream_it == stream_map_.end()) {
+    return true;
+  }
+
+  if (stream_it->second->DataSize < sizeof(MINIDUMP_MEMORY_LIST)) {
+    LOG(ERROR) << "memory_list size mismatch";
+    return false;
+  }
+
+  if (!file_reader_->SeekSet(stream_it->second->Rva)) {
+    return false;
+  }
+
+  // MSVC won't let us stack-allocate a MINIDUMP_MEMORY_LIST because of its
+  // trailing zero-element array. Luckily we're only interested in its other
+  // field anyway: a uint32_t indicating the number of memory descriptors that
+  // follow.
+  static_assert(
+      sizeof(MINIDUMP_MEMORY_LIST) == 4,
+      "MINIDUMP_MEMORY_LIST's only actual field should be an uint32_t");
+  uint32_t num_ranges;
+  if (!file_reader_->ReadExactly(&num_ranges, sizeof(num_ranges))) {
+    return false;
+  }
+
+  // We have to manually keep track of the locations of the entries in the
+  // contiguous list of MINIDUMP_MEMORY_DESCRIPTORs, because the Initialize()
+  // function jumps around the file to find the contents of each snapshot.
+  FileOffset location = file_reader_->SeekGet();
+  for (uint32_t i = 0; i < num_ranges; i++) {
+    extra_memory_.emplace_back(
+        std::make_unique<internal::MemorySnapshotMinidump>());
+    if (!extra_memory_.back()->Initialize(file_reader_,
+                                          static_cast<RVA>(location))) {
+      return false;
+    }
+    location += sizeof(MINIDUMP_MEMORY_DESCRIPTOR);
+  }
+
+  return true;
+}
+
 bool ProcessSnapshotMinidump::InitializeThreads() {
   const auto& stream_it = stream_map_.find(kMinidumpStreamTypeThreadList);
   if (stream_it == stream_map_.end()) {
@@ -528,12 +602,16 @@ bool ProcessSnapshotMinidump::InitializeThreads() {
     return false;
   }
 
+  if (!InitializeThreadNames()) {
+    return false;
+  }
+
   for (uint32_t thread_index = 0; thread_index < thread_count; ++thread_index) {
     const RVA thread_rva = stream_it->second->Rva + sizeof(thread_count) +
                            thread_index * sizeof(MINIDUMP_THREAD);
 
     auto thread = std::make_unique<internal::ThreadSnapshotMinidump>();
-    if (!thread->Initialize(file_reader_, thread_rva, arch_)) {
+    if (!thread->Initialize(file_reader_, thread_rva, arch_, thread_names_)) {
       return false;
     }
 
@@ -543,6 +621,61 @@ bool ProcessSnapshotMinidump::InitializeThreads() {
   return true;
 }
 
+bool ProcessSnapshotMinidump::InitializeThreadNames() {
+  const auto& stream_it = stream_map_.find(kMinidumpStreamTypeThreadNameList);
+  if (stream_it == stream_map_.end()) {
+    return true;
+  }
+
+  if (stream_it->second->DataSize < sizeof(MINIDUMP_THREAD_NAME_LIST)) {
+    LOG(ERROR) << "thread_name_list size mismatch";
+    return false;
+  }
+
+  if (!file_reader_->SeekSet(stream_it->second->Rva)) {
+    return false;
+  }
+
+  uint32_t thread_name_count;
+  if (!file_reader_->ReadExactly(&thread_name_count,
+                                 sizeof(thread_name_count))) {
+    return false;
+  }
+
+  if (sizeof(MINIDUMP_THREAD_NAME_LIST) +
+          thread_name_count * sizeof(MINIDUMP_THREAD_NAME) !=
+      stream_it->second->DataSize) {
+    LOG(ERROR) << "thread_name_list size mismatch";
+    return false;
+  }
+
+  for (uint32_t thread_name_index = 0; thread_name_index < thread_name_count;
+       ++thread_name_index) {
+    const RVA thread_name_rva =
+        stream_it->second->Rva + sizeof(thread_name_count) +
+        thread_name_index * sizeof(MINIDUMP_THREAD_NAME);
+    if (!file_reader_->SeekSet(thread_name_rva)) {
+      return false;
+    }
+    MINIDUMP_THREAD_NAME minidump_thread_name;
+    if (!file_reader_->ReadExactly(&minidump_thread_name,
+                                   sizeof(minidump_thread_name))) {
+      return false;
+    }
+    std::string name;
+    if (!internal::ReadMinidumpUTF16String(
+            file_reader_, minidump_thread_name.RvaOfThreadName, &name)) {
+      return false;
+    }
+
+    // See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=36566
+    const uint32_t thread_id = minidump_thread_name.ThreadId;
+    thread_names_.emplace(thread_id, std::move(name));
+  }
+
+  return true;
+}
+
 bool ProcessSnapshotMinidump::InitializeSystemSnapshot() {
   const auto& stream_it = stream_map_.find(kMinidumpStreamTypeSystemInfo);
   if (stream_it == stream_map_.end()) {
diff --git a/extern/crashpad/crashpad/snapshot/minidump/process_snapshot_minidump.h b/extern/crashpad/crashpad/snapshot/minidump/process_snapshot_minidump.h
index f76956d219..f85c617f3b 100644
--- a/extern/crashpad/crashpad/snapshot/minidump/process_snapshot_minidump.h
+++ b/extern/crashpad/crashpad/snapshot/minidump/process_snapshot_minidump.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -112,10 +112,18 @@ class ProcessSnapshotMinidump final : public ProcessSnapshot {
   // Initialize().
   bool InitializeThreads();
 
+  // Initializes data carried in a MINIDUMP_THREAD_NAME_LIST stream on behalf of
+  // Initialize().
+  bool InitializeThreadNames();
+
   // Initializes data carried in a MINIDUMP_MEMORY_INFO_LIST stream on behalf of
   // Initialize().
   bool InitializeMemoryInfo();
 
+  // Initializes data carried in a MINIDUMP_MEMORY_LIST stream on behalf of
+  // Initialize().
+  bool InitializeExtraMemory();
+
   // Initializes data carried in a MINIDUMP_SYSTEM_INFO stream on behalf of
   // Initialize().
   bool InitializeSystemSnapshot();
@@ -143,10 +151,12 @@ class ProcessSnapshotMinidump final : public ProcessSnapshot {
   std::map<MinidumpStreamType, const MINIDUMP_LOCATION_DESCRIPTOR*> stream_map_;
   std::vector<std::unique_ptr<internal::ModuleSnapshotMinidump>> modules_;
   std::vector<std::unique_ptr<internal::ThreadSnapshotMinidump>> threads_;
+  std::map<uint32_t, std::string> thread_names_;
   std::vector<UnloadedModuleSnapshot> unloaded_modules_;
   std::vector<std::unique_ptr<internal::MemoryMapRegionSnapshotMinidump>>
       mem_regions_;
   std::vector<const MemoryMapRegionSnapshot*> mem_regions_exposed_;
+  std::vector<std::unique_ptr<internal::MemorySnapshotMinidump>> extra_memory_;
   std::vector<std::unique_ptr<MinidumpStream>> custom_streams_;
   MinidumpCrashpadInfo crashpad_info_;
   internal::SystemSnapshotMinidump system_snapshot_;
diff --git a/extern/crashpad/crashpad/snapshot/minidump/process_snapshot_minidump_test.cc b/extern/crashpad/crashpad/snapshot/minidump/process_snapshot_minidump_test.cc
index b9fa23d73c..31e304c2bd 100644
--- a/extern/crashpad/crashpad/snapshot/minidump/process_snapshot_minidump_test.cc
+++ b/extern/crashpad/crashpad/snapshot/minidump/process_snapshot_minidump_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,9 +19,9 @@
 #include <string.h>
 
 #include <algorithm>
+#include <iterator>
 #include <memory>
 
-#include "base/cxx17_backports.h"
 #include "base/numerics/safe_math.h"
 #include "base/strings/utf_string_conversions.h"
 #include "gtest/gtest.h"
@@ -270,6 +270,47 @@ TEST(ProcessSnapshotMinidump, ClientID) {
   EXPECT_TRUE(process_snapshot.AnnotationsSimpleMap().empty());
 }
 
+TEST(ProcessSnapshotMinidump, ReadOldCrashpadInfo) {
+  StringFile string_file;
+
+  MINIDUMP_HEADER header = {};
+  EXPECT_TRUE(string_file.Write(&header, sizeof(header)));
+
+  UUID client_id;
+  ASSERT_TRUE(
+      client_id.InitializeFromString("0001f4a9-d00d-5155-0a55-c0ffeec0ffee"));
+
+  MinidumpCrashpadInfo crashpad_info = {};
+  crashpad_info.version = MinidumpCrashpadInfo::kVersion;
+  crashpad_info.client_id = client_id;
+
+  MINIDUMP_DIRECTORY crashpad_info_directory = {};
+  crashpad_info_directory.StreamType = kMinidumpStreamTypeCrashpadInfo;
+  crashpad_info_directory.Location.Rva =
+      static_cast<RVA>(string_file.SeekGet());
+  EXPECT_TRUE(string_file.Write(&crashpad_info, sizeof(crashpad_info) - 8));
+  crashpad_info_directory.Location.DataSize = sizeof(crashpad_info) - 8;
+
+  header.StreamDirectoryRva = static_cast<RVA>(string_file.SeekGet());
+  EXPECT_TRUE(string_file.Write(&crashpad_info_directory,
+                                sizeof(crashpad_info_directory)));
+
+  header.Signature = MINIDUMP_SIGNATURE;
+  header.Version = MINIDUMP_VERSION;
+  header.NumberOfStreams = 1;
+  EXPECT_TRUE(string_file.SeekSet(0));
+  EXPECT_TRUE(string_file.Write(&header, sizeof(header)));
+
+  ProcessSnapshotMinidump process_snapshot;
+  EXPECT_TRUE(process_snapshot.Initialize(&string_file));
+
+  UUID actual_client_id;
+  process_snapshot.ClientID(&actual_client_id);
+  EXPECT_EQ(actual_client_id, client_id);
+
+  EXPECT_TRUE(process_snapshot.AnnotationsSimpleMap().empty());
+}
+
 TEST(ProcessSnapshotMinidump, AnnotationsSimpleMap) {
   StringFile string_file;
 
@@ -350,6 +391,7 @@ TEST(ProcessSnapshotMinidump, Modules) {
       "libgeorgism",
       "librealistutopia",
   };
+  constexpr char debug_name[] = "debugme.pdb";
 
   minidump_module.BaseOfImage = 0xbadf00d;
   minidump_module.SizeOfImage = 9001;
@@ -373,12 +415,15 @@ TEST(ProcessSnapshotMinidump, Modules) {
   pdb70_cv.signature = CodeViewRecordPDB70::kSignature;
   pdb70_cv.age = 7;
   pdb70_cv.uuid.InitializeFromString("00112233-4455-6677-8899-aabbccddeeff");
-  pdb70_cv.pdb_name[0] = '\0';
 
   auto pdb70_loc = static_cast<RVA>(string_file.SeekGet());
-  auto pdb70_size = sizeof(pdb70_cv);
+  auto pdb70_size = offsetof(CodeViewRecordPDB70, pdb_name);
+
+  EXPECT_TRUE(string_file.Write(&pdb70_cv, pdb70_size));
 
-  EXPECT_TRUE(string_file.Write(&pdb70_cv, sizeof(pdb70_cv)));
+  size_t nul_terminated_length = strlen(debug_name) + 1;
+  EXPECT_TRUE(string_file.Write(debug_name, nul_terminated_length));
+  pdb70_size += nul_terminated_length;
 
   CodeViewRecordBuildID build_id_cv;
   build_id_cv.signature = CodeViewRecordBuildID::kSignature;
@@ -545,6 +590,7 @@ TEST(ProcessSnapshotMinidump, Modules) {
 
       EXPECT_EQ(uuid.ToString(), "00112233-4455-6677-8899-aabbccddeeff");
       EXPECT_EQ(age, 7U);
+      EXPECT_EQ(modules[i]->DebugFileName(), debug_name);
     } else {
       auto build_id = modules[i]->BuildID();
       std::string build_id_text(build_id.data(),
@@ -723,9 +769,108 @@ TEST(ProcessSnapshotMinidump, Threads) {
   }
 }
 
+TEST(ProcessSnapshotMinidump, ThreadsWithNames) {
+  StringFile string_file;
+
+  MINIDUMP_HEADER header = {};
+  EXPECT_TRUE(string_file.Write(&header, sizeof(header)));
+
+  constexpr uint32_t kMinidumpThreadCount = 4;
+  constexpr uint32_t kBaseThreadId = 42;
+
+  const std::string thread_names[kMinidumpThreadCount] = {
+      "ariadne",
+      "theseus",
+      "pasiphae",
+      "minos",
+  };
+
+  RVA64 thread_name_rva64s[kMinidumpThreadCount];
+  for (uint32_t i = 0; i < kMinidumpThreadCount; i++) {
+    thread_name_rva64s[i] = static_cast<RVA64>(string_file.SeekGet());
+    auto name16 = base::UTF8ToUTF16(thread_names[i]);
+    uint32_t size =
+        base::checked_cast<uint32_t>(sizeof(name16[0]) * name16.size());
+    EXPECT_TRUE(string_file.Write(&size, sizeof(size)));
+    EXPECT_TRUE(string_file.Write(&name16[0], size));
+  }
+
+  MINIDUMP_DIRECTORY minidump_thread_list_directory = {};
+  minidump_thread_list_directory.StreamType = kMinidumpStreamTypeThreadList;
+  minidump_thread_list_directory.Location.DataSize =
+      sizeof(MINIDUMP_THREAD_LIST) +
+      kMinidumpThreadCount * sizeof(MINIDUMP_THREAD);
+  minidump_thread_list_directory.Location.Rva =
+      static_cast<RVA>(string_file.SeekGet());
+
+  // Fields in MINIDUMP_THREAD_LIST.
+  EXPECT_TRUE(
+      string_file.Write(&kMinidumpThreadCount, sizeof(kMinidumpThreadCount)));
+  for (uint32_t minidump_thread_index = 0;
+       minidump_thread_index < kMinidumpThreadCount;
+       ++minidump_thread_index) {
+    MINIDUMP_THREAD minidump_thread = {};
+    minidump_thread.ThreadId = kBaseThreadId + minidump_thread_index;
+    EXPECT_TRUE(string_file.Write(&minidump_thread, sizeof(minidump_thread)));
+  }
+
+  header.StreamDirectoryRva = static_cast<RVA>(string_file.SeekGet());
+  EXPECT_TRUE(string_file.Write(&minidump_thread_list_directory,
+                                sizeof(minidump_thread_list_directory)));
+
+  MINIDUMP_DIRECTORY minidump_thread_name_list_directory = {};
+  minidump_thread_name_list_directory.StreamType =
+      kMinidumpStreamTypeThreadNameList;
+  minidump_thread_name_list_directory.Location.DataSize =
+      sizeof(MINIDUMP_THREAD_NAME_LIST) +
+      kMinidumpThreadCount * sizeof(MINIDUMP_THREAD_NAME);
+  minidump_thread_name_list_directory.Location.Rva =
+      static_cast<RVA>(string_file.SeekGet());
+
+  // Fields in MINIDUMP_THREAD_NAME_LIST.
+  EXPECT_TRUE(
+      string_file.Write(&kMinidumpThreadCount, sizeof(kMinidumpThreadCount)));
+  for (uint32_t minidump_thread_index = 0;
+       minidump_thread_index < kMinidumpThreadCount;
+       ++minidump_thread_index) {
+    MINIDUMP_THREAD_NAME minidump_thread_name = {0, 0};
+    minidump_thread_name.ThreadId = kBaseThreadId + minidump_thread_index;
+    minidump_thread_name.RvaOfThreadName =
+        thread_name_rva64s[minidump_thread_index];
+    EXPECT_TRUE(
+        string_file.Write(&minidump_thread_name, sizeof(minidump_thread_name)));
+  }
+
+  header.StreamDirectoryRva = static_cast<RVA>(string_file.SeekGet());
+  ASSERT_TRUE(string_file.Write(&minidump_thread_list_directory,
+                                sizeof(minidump_thread_list_directory)));
+  ASSERT_TRUE(string_file.Write(&minidump_thread_name_list_directory,
+                                sizeof(minidump_thread_name_list_directory)));
+
+  header.Signature = MINIDUMP_SIGNATURE;
+  header.Version = MINIDUMP_VERSION;
+  header.NumberOfStreams = 2;
+  EXPECT_TRUE(string_file.SeekSet(0));
+  EXPECT_TRUE(string_file.Write(&header, sizeof(header)));
+
+  ProcessSnapshotMinidump process_snapshot;
+  EXPECT_TRUE(process_snapshot.Initialize(&string_file));
+
+  std::vector<const ThreadSnapshot*> threads = process_snapshot.Threads();
+  ASSERT_EQ(threads.size(), kMinidumpThreadCount);
+
+  size_t idx = 0;
+  for (const auto& thread : threads) {
+    EXPECT_EQ(thread->ThreadID(), kBaseThreadId + idx);
+    EXPECT_EQ(thread->ThreadName(), thread_names[idx]);
+    idx++;
+  }
+}
+
 TEST(ProcessSnapshotMinidump, System) {
-  const char* cpu_info = "GenuineIntel";
-  const uint32_t* cpu_info_bytes = reinterpret_cast<const uint32_t*>(cpu_info);
+  const char cpu_info[] = "GenuineIntel";
+  uint32_t cpu_info_bytes[3];
+  memcpy(cpu_info_bytes, cpu_info, sizeof(cpu_info_bytes));
   StringFile string_file;
 
   MINIDUMP_HEADER header = {};
@@ -975,27 +1120,27 @@ TEST(ProcessSnapshotMinidump, ThreadContextX86_64) {
   minidump_context.fxsave.fpu_ip_64 = 42;
   minidump_context.fxsave.fpu_dp_64 = 43;
 
-  for (size_t i = 0; i < base::size(minidump_context.vector_register); i++) {
+  for (size_t i = 0; i < std::size(minidump_context.vector_register); i++) {
     minidump_context.vector_register[i].lo = i * 2 + 44;
     minidump_context.vector_register[i].hi = i * 2 + 45;
   }
 
-  for (uint8_t i = 0; i < base::size(minidump_context.fxsave.reserved_4); i++) {
+  for (uint8_t i = 0; i < std::size(minidump_context.fxsave.reserved_4); i++) {
     minidump_context.fxsave.reserved_4[i] = i * 2 + 115;
     minidump_context.fxsave.available[i] = i * 2 + 116;
   }
 
-  for (size_t i = 0; i < base::size(minidump_context.fxsave.st_mm); i++) {
+  for (size_t i = 0; i < std::size(minidump_context.fxsave.st_mm); i++) {
     for (uint8_t j = 0;
-         j < base::size(minidump_context.fxsave.st_mm[0].mm_value);
+         j < std::size(minidump_context.fxsave.st_mm[0].mm_value);
          j++) {
       minidump_context.fxsave.st_mm[i].mm_value[j] = j + 1;
       minidump_context.fxsave.st_mm[i].mm_reserved[j] = j + 1;
     }
   }
 
-  for (size_t i = 0; i < base::size(minidump_context.fxsave.xmm); i++) {
-    for (uint8_t j = 0; j < base::size(minidump_context.fxsave.xmm[0]); j++) {
+  for (size_t i = 0; i < std::size(minidump_context.fxsave.xmm); i++) {
+    for (uint8_t j = 0; j < std::size(minidump_context.fxsave.xmm[0]); j++) {
       minidump_context.fxsave.xmm[i][j] = j + 1;
     }
   }
@@ -1078,20 +1223,20 @@ TEST(ProcessSnapshotMinidump, ThreadContextX86_64) {
   EXPECT_EQ(ctx->fxsave.fpu_ip_64, 42U);
   EXPECT_EQ(ctx->fxsave.fpu_dp_64, 43U);
 
-  for (uint8_t i = 0; i < base::size(ctx->fxsave.reserved_4); i++) {
+  for (uint8_t i = 0; i < std::size(ctx->fxsave.reserved_4); i++) {
     EXPECT_EQ(ctx->fxsave.reserved_4[i], i * 2 + 115);
     EXPECT_EQ(ctx->fxsave.available[i], i * 2 + 116);
   }
 
-  for (size_t i = 0; i < base::size(ctx->fxsave.st_mm); i++) {
-    for (uint8_t j = 0; j < base::size(ctx->fxsave.st_mm[0].mm_value); j++) {
+  for (size_t i = 0; i < std::size(ctx->fxsave.st_mm); i++) {
+    for (uint8_t j = 0; j < std::size(ctx->fxsave.st_mm[0].mm_value); j++) {
       EXPECT_EQ(ctx->fxsave.st_mm[i].mm_value[j], j + 1);
       EXPECT_EQ(ctx->fxsave.st_mm[i].mm_reserved[j], j + 1);
     }
   }
 
-  for (size_t i = 0; i < base::size(ctx->fxsave.xmm); i++) {
-    for (uint8_t j = 0; j < base::size(ctx->fxsave.xmm[0]); j++) {
+  for (size_t i = 0; i < std::size(ctx->fxsave.xmm); i++) {
+    for (uint8_t j = 0; j < std::size(ctx->fxsave.xmm[0]); j++) {
       EXPECT_EQ(ctx->fxsave.xmm[i][j], j + 1);
     }
   }
diff --git a/extern/crashpad/crashpad/snapshot/minidump/system_snapshot_minidump.cc b/extern/crashpad/crashpad/snapshot/minidump/system_snapshot_minidump.cc
index e4b1b032d1..b7c7bfd0a8 100644
--- a/extern/crashpad/crashpad/snapshot/minidump/system_snapshot_minidump.cc
+++ b/extern/crashpad/crashpad/snapshot/minidump/system_snapshot_minidump.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -68,6 +68,8 @@ CPUArchitecture SystemSnapshotMinidump::GetCPUArchitecture() const {
     case kMinidumpCPUArchitectureMIPS:
       return kCPUArchitectureMIPSEL;
     // No word on how MIPS64 is signalled
+    case kMinidumpCPUArchitectureRISCV64Breakpad:
+      return kCPUArchitectureRISCV64;
 
     default:
       return CPUArchitecture::kCPUArchitectureUnknown;
@@ -104,31 +106,26 @@ void SystemSnapshotMinidump::CPUFrequency(uint64_t* current_hz,
 uint32_t SystemSnapshotMinidump::CPUX86Signature() const {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
   NOTREACHED();  // https://crashpad.chromium.org/bug/10
-  return 0;
 }
 
 uint64_t SystemSnapshotMinidump::CPUX86Features() const {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
   NOTREACHED();  // https://crashpad.chromium.org/bug/10
-  return 0;
 }
 
 uint64_t SystemSnapshotMinidump::CPUX86ExtendedFeatures() const {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
   NOTREACHED();  // https://crashpad.chromium.org/bug/10
-  return 0;
 }
 
 uint32_t SystemSnapshotMinidump::CPUX86Leaf7Features() const {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
   NOTREACHED();  // https://crashpad.chromium.org/bug/10
-  return 0;
 }
 
 bool SystemSnapshotMinidump::CPUX86SupportsDAZ() const {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
   NOTREACHED();  // https://crashpad.chromium.org/bug/10
-  return false;
 }
 
 SystemSnapshot::OperatingSystem SystemSnapshotMinidump::GetOperatingSystem()
@@ -177,13 +174,11 @@ std::string SystemSnapshotMinidump::OSVersionFull() const {
 std::string SystemSnapshotMinidump::MachineDescription() const {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
   NOTREACHED();  // https://crashpad.chromium.org/bug/10
-  return std::string();
 }
 
 bool SystemSnapshotMinidump::NXEnabled() const {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
   NOTREACHED();  // https://crashpad.chromium.org/bug/10
-  return false;
 }
 
 void SystemSnapshotMinidump::TimeZone(DaylightSavingTimeStatus* dst_status,
@@ -195,5 +190,10 @@ void SystemSnapshotMinidump::TimeZone(DaylightSavingTimeStatus* dst_status,
   NOTREACHED();  // https://crashpad.chromium.org/bug/10
 }
 
+uint64_t SystemSnapshotMinidump::AddressMask() const {
+  INITIALIZATION_STATE_DCHECK_VALID(initialized_);
+  NOTREACHED();  // https://crashpad.chromium.org/bug/10
+}
+
 }  // namespace internal
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/snapshot/minidump/system_snapshot_minidump.h b/extern/crashpad/crashpad/snapshot/minidump/system_snapshot_minidump.h
index 8a7ad1f1f2..aff425821c 100644
--- a/extern/crashpad/crashpad/snapshot/minidump/system_snapshot_minidump.h
+++ b/extern/crashpad/crashpad/snapshot/minidump/system_snapshot_minidump.h
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -74,6 +74,7 @@ class SystemSnapshotMinidump : public SystemSnapshot {
                 int* daylight_offset_seconds,
                 std::string* standard_name,
                 std::string* daylight_name) const override;
+  uint64_t AddressMask() const override;
 
  private:
   MINIDUMP_SYSTEM_INFO minidump_system_info_;
diff --git a/extern/crashpad/crashpad/snapshot/minidump/thread_snapshot_minidump.cc b/extern/crashpad/crashpad/snapshot/minidump/thread_snapshot_minidump.cc
index f8f3673f4c..10e8f485af 100644
--- a/extern/crashpad/crashpad/snapshot/minidump/thread_snapshot_minidump.cc
+++ b/extern/crashpad/crashpad/snapshot/minidump/thread_snapshot_minidump.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,7 +17,8 @@
 #include <stddef.h>
 #include <string.h>
 
-#include "base/cxx17_backports.h"
+#include <algorithm>
+
 #include "minidump/minidump_context.h"
 
 namespace crashpad {
@@ -26,15 +27,18 @@ namespace internal {
 ThreadSnapshotMinidump::ThreadSnapshotMinidump()
     : ThreadSnapshot(),
       minidump_thread_(),
+      thread_name_(),
       context_(),
       stack_(),
       initialized_() {}
 
 ThreadSnapshotMinidump::~ThreadSnapshotMinidump() {}
 
-bool ThreadSnapshotMinidump::Initialize(FileReaderInterface* file_reader,
-                                        RVA minidump_thread_rva,
-                                        CPUArchitecture arch) {
+bool ThreadSnapshotMinidump::Initialize(
+    FileReaderInterface* file_reader,
+    RVA minidump_thread_rva,
+    CPUArchitecture arch,
+    const std::map<uint32_t, std::string>& thread_names) {
   INITIALIZATION_STATE_SET_INITIALIZING(initialized_);
   std::vector<unsigned char> minidump_context;
 
@@ -67,6 +71,10 @@ bool ThreadSnapshotMinidump::Initialize(FileReaderInterface* file_reader,
   if (!stack_.Initialize(file_reader, stack_info_location)) {
     return false;
   }
+  const auto thread_name_iter = thread_names.find(minidump_thread_.ThreadId);
+  if (thread_name_iter != thread_names.end()) {
+    thread_name_ = thread_name_iter->second;
+  }
 
   INITIALIZATION_STATE_SET_VALID(initialized_);
   return true;
@@ -77,6 +85,11 @@ uint64_t ThreadSnapshotMinidump::ThreadID() const {
   return minidump_thread_.ThreadId;
 }
 
+std::string ThreadSnapshotMinidump::ThreadName() const {
+  INITIALIZATION_STATE_DCHECK_VALID(initialized_);
+  return thread_name_;
+}
+
 int ThreadSnapshotMinidump::SuspendCount() const {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
   return minidump_thread_.SuspendCount;
diff --git a/extern/crashpad/crashpad/snapshot/minidump/thread_snapshot_minidump.h b/extern/crashpad/crashpad/snapshot/minidump/thread_snapshot_minidump.h
index 7efb18d71c..99c930b378 100644
--- a/extern/crashpad/crashpad/snapshot/minidump/thread_snapshot_minidump.h
+++ b/extern/crashpad/crashpad/snapshot/minidump/thread_snapshot_minidump.h
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,6 +17,8 @@
 
 #include <windows.h>
 
+#include <map>
+
 #include "minidump/minidump_extensions.h"
 #include "snapshot/cpu_context.h"
 #include "snapshot/minidump/memory_snapshot_minidump.h"
@@ -46,16 +48,20 @@ class ThreadSnapshotMinidump : public ThreadSnapshot {
   //!     the thread’s MINIDUMP_THREAD structure is located.
   //! \param[in] arch The architecture of the system this thread is running on.
   //!     Used to decode CPU Context.
+  //! \param[in] thread_names Map from thread ID to thread name previously read
+  //!     from the minidump's MINIDUMP_THREAD_NAME_LIST.
   //!
   //! \return `true` if the snapshot could be created, `false` otherwise with
   //!     an appropriate message logged.
   bool Initialize(FileReaderInterface* file_reader,
                   RVA minidump_thread_rva,
-                  CPUArchitecture arch);
+                  CPUArchitecture arch,
+                  const std::map<uint32_t, std::string>& thread_names);
 
   const CPUContext* Context() const override;
   const MemorySnapshot* Stack() const override;
   uint64_t ThreadID() const override;
+  std::string ThreadName() const override;
   int SuspendCount() const override;
   int Priority() const override;
   uint64_t ThreadSpecificDataAddress() const override;
@@ -71,6 +77,7 @@ class ThreadSnapshotMinidump : public ThreadSnapshot {
   bool InitializeContext(const std::vector<unsigned char>& minidump_context);
 
   MINIDUMP_THREAD minidump_thread_;
+  std::string thread_name_;
   MinidumpContextConverter context_;
   MemorySnapshotMinidump stack_;
   InitializationStateDcheck initialized_;
diff --git a/extern/crashpad/crashpad/snapshot/module_snapshot.h b/extern/crashpad/crashpad/snapshot/module_snapshot.h
index 5f205cee70..29f88e5a13 100644
--- a/extern/crashpad/crashpad/snapshot/module_snapshot.h
+++ b/extern/crashpad/crashpad/snapshot/module_snapshot.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/posix/timezone.cc b/extern/crashpad/crashpad/snapshot/posix/timezone.cc
index c413d7080f..574952fa4b 100644
--- a/extern/crashpad/crashpad/snapshot/posix/timezone.cc
+++ b/extern/crashpad/crashpad/snapshot/posix/timezone.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,8 +17,9 @@
 #include <stddef.h>
 #include <time.h>
 
+#include <iterator>
+
 #include "base/check.h"
-#include "base/cxx17_backports.h"
 #include "base/logging.h"
 #include "build/build_config.h"
 
@@ -40,7 +41,7 @@ void TimeZone(const timeval& snapshot_time,
 
   bool found_transition = false;
   long probe_gmtoff = local.tm_gmtoff;
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
   // Some versions of the timezone database on Android have incorrect
   // information (e.g. Asia/Kolkata and Pacific/Honolulu). These timezones set
   // daylight to a non-zero value and return incorrect, >= 0 values for tm_isdst
@@ -61,8 +62,7 @@ void TimeZone(const timeval& snapshot_time,
     static constexpr int kMonthDeltas[] =
         {0, 1, -1, 2, -2, 3, -3, 4, -4, 5, -5, 6, -6,
          7, -7, 8, -8, 9, -9, 10, -10, 11, -11, 12, -12};
-    for (size_t index = 0;
-         index < base::size(kMonthDeltas) && !found_transition;
+    for (size_t index = 0; index < std::size(kMonthDeltas) && !found_transition;
          ++index) {
       // Look at a day of each month at local noon. Set tm_isdst to -1 to avoid
       // giving mktime() any hints about whether to consider daylight saving
@@ -105,14 +105,14 @@ void TimeZone(const timeval& snapshot_time,
   } else {
     *daylight_name = tzname[0];
     *dst_status = SystemSnapshot::kDoesNotObserveDaylightSavingTime;
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
     // timezone is more reliably set correctly on Android.
     *standard_offset_seconds = -timezone;
     *daylight_offset_seconds = -timezone;
 #else
     *standard_offset_seconds = local.tm_gmtoff;
     *daylight_offset_seconds = local.tm_gmtoff;
-#endif  // OS_ANDROID
+#endif  // BUILDFLAG(IS_ANDROID)
   }
 }
 
diff --git a/extern/crashpad/crashpad/snapshot/posix/timezone.h b/extern/crashpad/crashpad/snapshot/posix/timezone.h
index bd404a354a..c1eb5ba4ac 100644
--- a/extern/crashpad/crashpad/snapshot/posix/timezone.h
+++ b/extern/crashpad/crashpad/snapshot/posix/timezone.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/posix/timezone_test.cc b/extern/crashpad/crashpad/snapshot/posix/timezone_test.cc
index 6a343767e3..368cd3a410 100644
--- a/extern/crashpad/crashpad/snapshot/posix/timezone_test.cc
+++ b/extern/crashpad/crashpad/snapshot/posix/timezone_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,9 +18,9 @@
 #include <sys/time.h>
 #include <time.h>
 
+#include <iterator>
 #include <string>
 
-#include "base/cxx17_backports.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 #include "test/errors.h"
@@ -154,7 +154,7 @@ TEST(TimeZone, Basic) {
       {"UTC", false, 0, 0, "UTC", "UTC"},
   };
 
-  for (size_t index = 0; index < base::size(kTestTimeZones); ++index) {
+  for (size_t index = 0; index < std::size(kTestTimeZones); ++index) {
     const auto& test_time_zone = kTestTimeZones[index];
     const char* tz = test_time_zone.tz;
     SCOPED_TRACE(base::StringPrintf("index %zu, tz %s", index, tz));
diff --git a/extern/crashpad/crashpad/snapshot/process_snapshot.h b/extern/crashpad/crashpad/snapshot/process_snapshot.h
index 08d9f2bc0c..e13bac28df 100644
--- a/extern/crashpad/crashpad/snapshot/process_snapshot.h
+++ b/extern/crashpad/crashpad/snapshot/process_snapshot.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/sanitized/memory_snapshot_sanitized.cc b/extern/crashpad/crashpad/snapshot/sanitized/memory_snapshot_sanitized.cc
index a25349180e..58bcdde422 100644
--- a/extern/crashpad/crashpad/snapshot/sanitized/memory_snapshot_sanitized.cc
+++ b/extern/crashpad/crashpad/snapshot/sanitized/memory_snapshot_sanitized.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 
 #include <string.h>
 
+#include "util/linux/pac_helper.h"
+
 namespace crashpad {
 namespace internal {
 
@@ -62,8 +64,9 @@ class MemorySanitizer : public MemorySnapshot::Delegate {
     auto words =
         reinterpret_cast<Pointer*>(static_cast<char*>(data) + aligned_offset);
     for (size_t index = 0; index < word_count; ++index) {
-      if (words[index] > MemorySnapshotSanitized::kSmallWordMax &&
-          !ranges_->Contains(words[index])) {
+      auto word = StripPACBits(words[index]);
+      if (word > MemorySnapshotSanitized::kSmallWordMax &&
+          !ranges_->Contains(word)) {
         words[index] = defaced;
       }
     }
diff --git a/extern/crashpad/crashpad/snapshot/sanitized/memory_snapshot_sanitized.h b/extern/crashpad/crashpad/snapshot/sanitized/memory_snapshot_sanitized.h
index 30885f5f82..dea0d18133 100644
--- a/extern/crashpad/crashpad/snapshot/sanitized/memory_snapshot_sanitized.h
+++ b/extern/crashpad/crashpad/snapshot/sanitized/memory_snapshot_sanitized.h
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/sanitized/module_snapshot_sanitized.cc b/extern/crashpad/crashpad/snapshot/sanitized/module_snapshot_sanitized.cc
index 1789fa2785..c76722683d 100644
--- a/extern/crashpad/crashpad/snapshot/sanitized/module_snapshot_sanitized.cc
+++ b/extern/crashpad/crashpad/snapshot/sanitized/module_snapshot_sanitized.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,6 +14,8 @@
 
 #include "snapshot/sanitized/module_snapshot_sanitized.h"
 
+#include "base/strings/pattern.h"
+
 namespace crashpad {
 namespace internal {
 
@@ -22,7 +24,7 @@ namespace {
 bool KeyIsAllowed(const std::string& name,
                   const std::vector<std::string>& allowed_keys) {
   for (const auto& key : allowed_keys) {
-    if (name == key) {
+    if (base::MatchPattern(name, key)) {
       return true;
     }
   }
@@ -97,9 +99,11 @@ ModuleSnapshotSanitized::AnnotationsSimpleMap() const {
   std::map<std::string, std::string> annotations =
       snapshot_->AnnotationsSimpleMap();
   if (allowed_annotations_) {
-    for (auto kv = annotations.begin(); kv != annotations.end(); ++kv) {
-      if (!KeyIsAllowed(kv->first, *allowed_annotations_)) {
-        annotations.erase(kv);
+    for (auto kv = annotations.begin(); kv != annotations.end();) {
+      if (KeyIsAllowed(kv->first, *allowed_annotations_)) {
+        ++kv;
+      } else {
+        kv = annotations.erase(kv);
       }
     }
   }
diff --git a/extern/crashpad/crashpad/snapshot/sanitized/module_snapshot_sanitized.h b/extern/crashpad/crashpad/snapshot/sanitized/module_snapshot_sanitized.h
index f8937f3730..290cbf9d62 100644
--- a/extern/crashpad/crashpad/snapshot/sanitized/module_snapshot_sanitized.h
+++ b/extern/crashpad/crashpad/snapshot/sanitized/module_snapshot_sanitized.h
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/sanitized/process_snapshot_sanitized.cc b/extern/crashpad/crashpad/snapshot/sanitized/process_snapshot_sanitized.cc
index 21cf5a628c..afa1c9f849 100644
--- a/extern/crashpad/crashpad/snapshot/sanitized/process_snapshot_sanitized.cc
+++ b/extern/crashpad/crashpad/snapshot/sanitized/process_snapshot_sanitized.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 #include <stdint.h>
 
 #include "snapshot/cpu_context.h"
+#include "util/linux/pac_helper.h"
 #include "util/numeric/safe_assignment.h"
 
 namespace crashpad {
@@ -61,7 +62,8 @@ class StackReferencesAddressRange : public MemorySnapshot::Delegate {
                                             aligned_sp_offset);
     size_t word_count = (size - aligned_sp_offset) / sizeof(Pointer);
     for (size_t index = 0; index < word_count; ++index) {
-      if (words[index] >= low_ && words[index] < high_) {
+      auto word = StripPACBits(words[index]);
+      if (word >= low_ && word < high_) {
         return true;
       }
     }
diff --git a/extern/crashpad/crashpad/snapshot/sanitized/process_snapshot_sanitized.h b/extern/crashpad/crashpad/snapshot/sanitized/process_snapshot_sanitized.h
index 86c7c4e4ec..af65fb6801 100644
--- a/extern/crashpad/crashpad/snapshot/sanitized/process_snapshot_sanitized.h
+++ b/extern/crashpad/crashpad/snapshot/sanitized/process_snapshot_sanitized.h
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -53,6 +53,7 @@ class ProcessSnapshotSanitized final : public ProcessSnapshot {
   //! \param[in] allowed_annotations A list of annotations names to allow to
   //!     be returned by AnnotationsSimpleMap() or from this object's module
   //!     snapshots. If `nullptr`, all annotations will be returned.
+  //      These annotation names support pattern matching, eg: "switch-*"
   //! \param[in] allowed_memory_ranges A list of memory ranges to allow to be
   //!     accessible via Memory(), or `nullptr` to allow all ranges.
   //! \param[in] target_module_address An address in the target process'
diff --git a/extern/crashpad/crashpad/snapshot/sanitized/process_snapshot_sanitized_test.cc b/extern/crashpad/crashpad/snapshot/sanitized/process_snapshot_sanitized_test.cc
index 0bdea432b0..772eadc60b 100644
--- a/extern/crashpad/crashpad/snapshot/sanitized/process_snapshot_sanitized_test.cc
+++ b/extern/crashpad/crashpad/snapshot/sanitized/process_snapshot_sanitized_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,7 +16,8 @@
 
 #include <string.h>
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+
 #include "base/notreached.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"
@@ -25,7 +26,7 @@
 #include "util/misc/address_sanitizer.h"
 #include "util/numeric/safe_assignment.h"
 
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
 #include <sys/syscall.h>
 
 #include "snapshot/linux/process_snapshot_linux.h"
@@ -78,6 +79,8 @@ class ExceptionGenerator {
 };
 
 constexpr char kAllowedAnnotationName[] = "name_of_allowed_anno";
+constexpr char kAllowedAnnotationNamePattern[] = "name_of_another_*";
+constexpr char kAllowedAnnotationNamePatternActual[] = "name_of_another_anno";
 constexpr char kAllowedAnnotationValue[] = "some_value";
 constexpr char kNonAllowedAnnotationName[] = "non_allowed_anno";
 constexpr char kNonAllowedAnnotationValue[] = "private_annotation";
@@ -98,10 +101,14 @@ void ChildTestFunction() {
   static StringAnnotation<32> allowed_annotation(kAllowedAnnotationName);
   allowed_annotation.Set(kAllowedAnnotationValue);
 
+  static StringAnnotation<32> allowed_matched_annotation(
+      kAllowedAnnotationNamePatternActual);
+  allowed_matched_annotation.Set(kAllowedAnnotationValue);
+
   static StringAnnotation<32> non_allowed_annotation(kNonAllowedAnnotationName);
   non_allowed_annotation.Set(kNonAllowedAnnotationValue);
 
-  char string_data[base::size(kSensitiveStackData)];
+  char string_data[std::size(kSensitiveStackData)];
   strcpy(string_data, kSensitiveStackData);
 
   void (*code_pointer)(void) = ChildTestFunction;
@@ -122,17 +129,22 @@ void ChildTestFunction() {
 
 CRASHPAD_CHILD_TEST_MAIN(ChildToBeSanitized) {
   ChildTestFunction();
+
+  // This isn't reachable unless assertions inside ChildTestFunction fail.
   NOTREACHED();
-  return EXIT_SUCCESS;
 }
 
 void ExpectAnnotations(ProcessSnapshot* snapshot, bool sanitized) {
   bool found_allowed = false;
+  bool found_matched_allowed = false;
   bool found_non_allowed = false;
   for (auto module : snapshot->Modules()) {
     for (const auto& anno : module->AnnotationObjects()) {
       if (anno.name == kAllowedAnnotationName) {
         found_allowed = true;
+      }
+      if (anno.name == kAllowedAnnotationNamePatternActual) {
+        found_matched_allowed = true;
       } else if (anno.name == kNonAllowedAnnotationName) {
         found_non_allowed = true;
       }
@@ -140,6 +152,7 @@ void ExpectAnnotations(ProcessSnapshot* snapshot, bool sanitized) {
   }
 
   EXPECT_TRUE(found_allowed);
+  EXPECT_TRUE(found_matched_allowed);
   if (sanitized) {
     EXPECT_FALSE(found_non_allowed);
   } else {
@@ -278,6 +291,7 @@ class SanitizeTest : public MultiprocessExec {
 
     auto allowed_annotations = std::make_unique<std::vector<std::string>>();
     allowed_annotations->push_back(kAllowedAnnotationName);
+    allowed_annotations->push_back(kAllowedAnnotationNamePattern);
 
     auto allowed_memory_ranges =
         std::make_unique<std::vector<std::pair<VMAddress, VMAddress>>>();
diff --git a/extern/crashpad/crashpad/snapshot/sanitized/sanitization_information.cc b/extern/crashpad/crashpad/snapshot/sanitized/sanitization_information.cc
index 1b2b853932..6544bbacbf 100644
--- a/extern/crashpad/crashpad/snapshot/sanitized/sanitization_information.cc
+++ b/extern/crashpad/crashpad/snapshot/sanitized/sanitization_information.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/sanitized/sanitization_information.h b/extern/crashpad/crashpad/snapshot/sanitized/sanitization_information.h
index d5afe0d576..e31afd3927 100644
--- a/extern/crashpad/crashpad/snapshot/sanitized/sanitization_information.h
+++ b/extern/crashpad/crashpad/snapshot/sanitized/sanitization_information.h
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/sanitized/sanitization_information_test.cc b/extern/crashpad/crashpad/snapshot/sanitized/sanitization_information_test.cc
index 425ec7528d..51fe2d4da9 100644
--- a/extern/crashpad/crashpad/snapshot/sanitized/sanitization_information_test.cc
+++ b/extern/crashpad/crashpad/snapshot/sanitized/sanitization_information_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,13 +14,14 @@
 
 #include "snapshot/sanitized/sanitization_information.h"
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+
 #include "build/build_config.h"
 #include "gtest/gtest.h"
 #include "util/misc/from_pointer_cast.h"
 #include "util/process/process_memory_linux.h"
 
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 #include "test/linux/fake_ptrace_connection.h"
 #endif
 
@@ -66,7 +67,7 @@ const char* const kNonEmptyAllowedAnnotations[] = {"string1",
 TEST_F(AllowedAnnotationsTest, NonEmptyAllowedAnnotations) {
   ASSERT_TRUE(DoReadAllowedAnnotations(kNonEmptyAllowedAnnotations));
   ASSERT_EQ(allowed_annotations_.size(),
-            base::size(kNonEmptyAllowedAnnotations) - 1);
+            std::size(kNonEmptyAllowedAnnotations) - 1);
   for (size_t index = 0; index < allowed_annotations_.size(); ++index) {
     EXPECT_EQ(allowed_annotations_[index], kNonEmptyAllowedAnnotations[index]);
   }
diff --git a/extern/crashpad/crashpad/snapshot/sanitized/thread_snapshot_sanitized.cc b/extern/crashpad/crashpad/snapshot/sanitized/thread_snapshot_sanitized.cc
index 186776eae0..35b82b28bc 100644
--- a/extern/crashpad/crashpad/snapshot/sanitized/thread_snapshot_sanitized.cc
+++ b/extern/crashpad/crashpad/snapshot/sanitized/thread_snapshot_sanitized.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -39,6 +39,10 @@ uint64_t ThreadSnapshotSanitized::ThreadID() const {
   return snapshot_->ThreadID();
 }
 
+std::string ThreadSnapshotSanitized::ThreadName() const {
+  return snapshot_->ThreadName();
+}
+
 int ThreadSnapshotSanitized::SuspendCount() const {
   return snapshot_->SuspendCount();
 }
diff --git a/extern/crashpad/crashpad/snapshot/sanitized/thread_snapshot_sanitized.h b/extern/crashpad/crashpad/snapshot/sanitized/thread_snapshot_sanitized.h
index dca0a0e917..e7ab098094 100644
--- a/extern/crashpad/crashpad/snapshot/sanitized/thread_snapshot_sanitized.h
+++ b/extern/crashpad/crashpad/snapshot/sanitized/thread_snapshot_sanitized.h
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,6 +17,8 @@
 
 #include "snapshot/thread_snapshot.h"
 
+#include <string>
+
 #include "snapshot/sanitized/memory_snapshot_sanitized.h"
 #include "util/misc/range_set.h"
 
@@ -44,6 +46,7 @@ class ThreadSnapshotSanitized final : public ThreadSnapshot {
   const CPUContext* Context() const override;
   const MemorySnapshot* Stack() const override;
   uint64_t ThreadID() const override;
+  std::string ThreadName() const override;
   int SuspendCount() const override;
   int Priority() const override;
   uint64_t ThreadSpecificDataAddress() const override;
diff --git a/extern/crashpad/crashpad/snapshot/snapshot_constants.h b/extern/crashpad/crashpad/snapshot/snapshot_constants.h
index 2bbddda38d..2006e7b5c6 100644
--- a/extern/crashpad/crashpad/snapshot/snapshot_constants.h
+++ b/extern/crashpad/crashpad/snapshot/snapshot_constants.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ namespace crashpad {
 //!     a client process.
 //!
 //! \note This maximum was chosen arbitrarily and may change in the future.
-constexpr size_t kMaxNumberOfAnnotations = 200;
+constexpr size_t kMaxNumberOfAnnotations = 400;
 
 }  // namespace crashpad
 
diff --git a/extern/crashpad/crashpad/snapshot/system_snapshot.h b/extern/crashpad/crashpad/snapshot/system_snapshot.h
index d78cc235e1..a1186edb4f 100644
--- a/extern/crashpad/crashpad/snapshot/system_snapshot.h
+++ b/extern/crashpad/crashpad/snapshot/system_snapshot.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -275,6 +275,20 @@ class SystemSnapshot {
                         int* daylight_offset_seconds,
                         std::string* standard_name,
                         std::string* daylight_name) const = 0;
+
+  //! \brief Returns a mask indicating the range of valid addresses for a
+  //!     pointer.
+  //!
+  //! ARM64 supports storing pointer authentication codes in the upper bits of
+  //! a pointer. This mask is generated based on the number of bits in a pointer
+  //! reserved for the authentication codes. To recover an address from pointer
+  //! with an authentication code, `AND` this mask with the pointer. If the pac
+  //! sign extension bit is set, instead `~` and `OR` this mask with the
+  //! pointer.
+  //!
+  //! If the platform does not support pointer authentication, or the range of
+  //! valid addressees for a pointer was inaccessible, this field will be 0.
+  virtual uint64_t AddressMask() const = 0;
 };
 
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/snapshot/test/test_cpu_context.cc b/extern/crashpad/crashpad/snapshot/test/test_cpu_context.cc
index 4923d4c4f9..9982294663 100644
--- a/extern/crashpad/crashpad/snapshot/test/test_cpu_context.cc
+++ b/extern/crashpad/crashpad/snapshot/test/test_cpu_context.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "base/cxx17_backports.h"
+#include <iterator>
 
 namespace crashpad {
 namespace test {
@@ -44,28 +44,28 @@ void InitializeCPUContextFxsave(FxsaveType* fxsave, uint32_t* seed) {
   fxsave->reserved_3 = static_cast<uint16_t>(value++);
   fxsave->mxcsr = value++;
   fxsave->mxcsr_mask = value++;
-  for (size_t st_mm_index = 0; st_mm_index < base::size(fxsave->st_mm);
+  for (size_t st_mm_index = 0; st_mm_index < std::size(fxsave->st_mm);
        ++st_mm_index) {
-    for (size_t byte = 0; byte < base::size(fxsave->st_mm[st_mm_index].st);
+    for (size_t byte = 0; byte < std::size(fxsave->st_mm[st_mm_index].st);
          ++byte) {
       fxsave->st_mm[st_mm_index].st[byte] = static_cast<uint8_t>(value++);
     }
     for (size_t byte = 0;
-         byte < base::size(fxsave->st_mm[st_mm_index].st_reserved);
+         byte < std::size(fxsave->st_mm[st_mm_index].st_reserved);
          ++byte) {
       fxsave->st_mm[st_mm_index].st_reserved[byte] =
           static_cast<uint8_t>(value);
     }
   }
-  for (size_t xmm_index = 0; xmm_index < base::size(fxsave->xmm); ++xmm_index) {
-    for (size_t byte = 0; byte < base::size(fxsave->xmm[xmm_index]); ++byte) {
+  for (size_t xmm_index = 0; xmm_index < std::size(fxsave->xmm); ++xmm_index) {
+    for (size_t byte = 0; byte < std::size(fxsave->xmm[xmm_index]); ++byte) {
       fxsave->xmm[xmm_index][byte] = static_cast<uint8_t>(value++);
     }
   }
-  for (size_t byte = 0; byte < base::size(fxsave->reserved_4); ++byte) {
+  for (size_t byte = 0; byte < std::size(fxsave->reserved_4); ++byte) {
     fxsave->reserved_4[byte] = static_cast<uint8_t>(value++);
   }
-  for (size_t byte = 0; byte < base::size(fxsave->available); ++byte) {
+  for (size_t byte = 0; byte < std::size(fxsave->available); ++byte) {
     fxsave->available[byte] = static_cast<uint8_t>(value++);
   }
 
@@ -161,6 +161,9 @@ void InitializeCPUContextX86_64(CPUContext* context, uint32_t seed) {
   context->x86_64->dr5 = value++;
   context->x86_64->dr6 = value++;
   context->x86_64->dr7 = value++;
+
+  // Make sure this is sensible. When supplied the size/state come from the OS.
+  memset(&context->x86_64->xstate, 0, sizeof(context->x86_64->xstate));
 }
 
 void InitializeCPUContextARM(CPUContext* context, uint32_t seed) {
@@ -174,7 +177,7 @@ void InitializeCPUContextARM(CPUContext* context, uint32_t seed) {
 
   uint32_t value = seed;
 
-  for (size_t index = 0; index < base::size(arm->regs); ++index) {
+  for (size_t index = 0; index < std::size(arm->regs); ++index) {
     arm->regs[index] = value++;
   }
   arm->fp = value++;
@@ -185,7 +188,7 @@ void InitializeCPUContextARM(CPUContext* context, uint32_t seed) {
   arm->pc = value++;
   arm->cpsr = value++;
 
-  for (size_t index = 0; index < base::size(arm->vfp_regs.vfp); ++index) {
+  for (size_t index = 0; index < std::size(arm->vfp_regs.vfp); ++index) {
     arm->vfp_regs.vfp[index] = value++;
   }
   arm->vfp_regs.fpscr = value++;
@@ -205,14 +208,14 @@ void InitializeCPUContextARM64(CPUContext* context, uint32_t seed) {
 
   uint32_t value = seed;
 
-  for (size_t index = 0; index < base::size(arm64->regs); ++index) {
+  for (size_t index = 0; index < std::size(arm64->regs); ++index) {
     arm64->regs[index] = value++;
   }
   arm64->sp = value++;
   arm64->pc = value++;
   arm64->spsr = value++;
 
-  for (size_t index = 0; index < base::size(arm64->fpsimd); ++index) {
+  for (size_t index = 0; index < std::size(arm64->fpsimd); ++index) {
     arm64->fpsimd[index].lo = value++;
     arm64->fpsimd[index].hi = value++;
   }
@@ -231,7 +234,7 @@ void InitializeCPUContextMIPS(CPUContext* context, uint32_t seed) {
 
   uint32_t value = seed;
 
-  for (size_t index = 0; index < base::size(mipsel->regs); ++index) {
+  for (size_t index = 0; index < std::size(mipsel->regs); ++index) {
     mipsel->regs[index] = value++;
   }
 
@@ -242,7 +245,7 @@ void InitializeCPUContextMIPS(CPUContext* context, uint32_t seed) {
   mipsel->cp0_status = value++;
   mipsel->cp0_cause = value++;
 
-  for (size_t index = 0; index < base::size(mipsel->fpregs.fregs); ++index) {
+  for (size_t index = 0; index < std::size(mipsel->fpregs.fregs); ++index) {
     mipsel->fpregs.fregs[index]._fp_fregs = static_cast<float>(value++);
   }
 
@@ -267,7 +270,7 @@ void InitializeCPUContextMIPS64(CPUContext* context, uint32_t seed) {
 
   uint64_t value = seed;
 
-  for (size_t index = 0; index < base::size(mips64->regs); ++index) {
+  for (size_t index = 0; index < std::size(mips64->regs); ++index) {
     mips64->regs[index] = value++;
   }
 
@@ -278,7 +281,7 @@ void InitializeCPUContextMIPS64(CPUContext* context, uint32_t seed) {
   mips64->cp0_status = value++;
   mips64->cp0_cause = value++;
 
-  for (size_t index = 0; index < base::size(mips64->fpregs.dregs); ++index) {
+  for (size_t index = 0; index < std::size(mips64->fpregs.dregs); ++index) {
     mips64->fpregs.dregs[index] = static_cast<double>(value++);
   }
 
@@ -292,5 +295,27 @@ void InitializeCPUContextMIPS64(CPUContext* context, uint32_t seed) {
   mips64->dsp_control = value++;
 }
 
+void InitializeCPUContextRISCV64(CPUContext* context, uint32_t seed) {
+  context->architecture = kCPUArchitectureRISCV64;
+  CPUContextRISCV64* riscv64 = context->riscv64;
+
+  if (seed == 0) {
+    memset(riscv64, 0, sizeof(*riscv64));
+    return;
+  }
+
+  uint32_t value = seed;
+
+  riscv64->pc = value++;
+  for (size_t index = 0; index < std::size(riscv64->regs); ++index) {
+    riscv64->regs[index] = value++;
+  }
+
+  for (size_t index = 0; index < std::size(riscv64->fpregs); ++index) {
+    riscv64->fpregs[index] = value++;
+  }
+  riscv64->fcsr = value++;
+}
+
 }  // namespace test
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/snapshot/test/test_cpu_context.h b/extern/crashpad/crashpad/snapshot/test/test_cpu_context.h
index ca1b6b7b2a..053dec28bc 100644
--- a/extern/crashpad/crashpad/snapshot/test/test_cpu_context.h
+++ b/extern/crashpad/crashpad/snapshot/test/test_cpu_context.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -63,6 +63,7 @@ void InitializeCPUContextARM(CPUContext* context, uint32_t seed);
 void InitializeCPUContextARM64(CPUContext* context, uint32_t seed);
 void InitializeCPUContextMIPS(CPUContext* context, uint32_t seed);
 void InitializeCPUContextMIPS64(CPUContext* context, uint32_t seed);
+void InitializeCPUContextRISCV64(CPUContext* context, uint32_t seed);
 //! \}
 
 }  // namespace test
diff --git a/extern/crashpad/crashpad/snapshot/test/test_exception_snapshot.cc b/extern/crashpad/crashpad/snapshot/test/test_exception_snapshot.cc
index 84340671a0..ebf878b9c9 100644
--- a/extern/crashpad/crashpad/snapshot/test/test_exception_snapshot.cc
+++ b/extern/crashpad/crashpad/snapshot/test/test_exception_snapshot.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/test/test_exception_snapshot.h b/extern/crashpad/crashpad/snapshot/test/test_exception_snapshot.h
index 0f6b7c0727..1e059510b6 100644
--- a/extern/crashpad/crashpad/snapshot/test/test_exception_snapshot.h
+++ b/extern/crashpad/crashpad/snapshot/test/test_exception_snapshot.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/test/test_memory_map_region_snapshot.cc b/extern/crashpad/crashpad/snapshot/test/test_memory_map_region_snapshot.cc
index 53500c6476..7d983a3399 100644
--- a/extern/crashpad/crashpad/snapshot/test/test_memory_map_region_snapshot.cc
+++ b/extern/crashpad/crashpad/snapshot/test/test_memory_map_region_snapshot.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/test/test_memory_map_region_snapshot.h b/extern/crashpad/crashpad/snapshot/test/test_memory_map_region_snapshot.h
index c4e1ca7528..9df66efddf 100644
--- a/extern/crashpad/crashpad/snapshot/test/test_memory_map_region_snapshot.h
+++ b/extern/crashpad/crashpad/snapshot/test/test_memory_map_region_snapshot.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/test/test_memory_snapshot.cc b/extern/crashpad/crashpad/snapshot/test/test_memory_snapshot.cc
index 95aba4066d..5cd169e8c2 100644
--- a/extern/crashpad/crashpad/snapshot/test/test_memory_snapshot.cc
+++ b/extern/crashpad/crashpad/snapshot/test/test_memory_snapshot.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/test/test_memory_snapshot.h b/extern/crashpad/crashpad/snapshot/test/test_memory_snapshot.h
index a9e8fb1a2c..6178dc087c 100644
--- a/extern/crashpad/crashpad/snapshot/test/test_memory_snapshot.h
+++ b/extern/crashpad/crashpad/snapshot/test/test_memory_snapshot.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/test/test_module_snapshot.cc b/extern/crashpad/crashpad/snapshot/test/test_module_snapshot.cc
index ad0c2dec11..e6441c7a0f 100644
--- a/extern/crashpad/crashpad/snapshot/test/test_module_snapshot.cc
+++ b/extern/crashpad/crashpad/snapshot/test/test_module_snapshot.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/test/test_module_snapshot.h b/extern/crashpad/crashpad/snapshot/test/test_module_snapshot.h
index 19e1299004..289d3ada16 100644
--- a/extern/crashpad/crashpad/snapshot/test/test_module_snapshot.h
+++ b/extern/crashpad/crashpad/snapshot/test/test_module_snapshot.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/test/test_process_snapshot.cc b/extern/crashpad/crashpad/snapshot/test/test_process_snapshot.cc
index 42a049a5cc..db4cb7f31f 100644
--- a/extern/crashpad/crashpad/snapshot/test/test_process_snapshot.cc
+++ b/extern/crashpad/crashpad/snapshot/test/test_process_snapshot.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/test/test_process_snapshot.h b/extern/crashpad/crashpad/snapshot/test/test_process_snapshot.h
index 16873fee15..db4370c98b 100644
--- a/extern/crashpad/crashpad/snapshot/test/test_process_snapshot.h
+++ b/extern/crashpad/crashpad/snapshot/test/test_process_snapshot.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/test/test_system_snapshot.cc b/extern/crashpad/crashpad/snapshot/test/test_system_snapshot.cc
index 0f3605cf0c..a46bce12c3 100644
--- a/extern/crashpad/crashpad/snapshot/test/test_system_snapshot.cc
+++ b/extern/crashpad/crashpad/snapshot/test/test_system_snapshot.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -36,14 +36,14 @@ TestSystemSnapshot::TestSystemSnapshot()
       os_version_bugfix_(0),
       os_version_build_(),
       os_version_full_(),
+      address_mask_(0),
       nx_enabled_(false),
       machine_description_(),
       time_zone_dst_status_(kDoesNotObserveDaylightSavingTime),
       time_zone_standard_offset_seconds_(0),
       time_zone_daylight_offset_seconds_(0),
       time_zone_standard_name_(),
-      time_zone_daylight_name_() {
-}
+      time_zone_daylight_name_() {}
 
 TestSystemSnapshot::~TestSystemSnapshot() {
 }
@@ -130,5 +130,9 @@ void TestSystemSnapshot::TimeZone(DaylightSavingTimeStatus* dst_status,
   *daylight_name = time_zone_daylight_name_;
 }
 
+uint64_t TestSystemSnapshot::AddressMask() const {
+  return address_mask_;
+}
+
 }  // namespace test
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/snapshot/test/test_system_snapshot.h b/extern/crashpad/crashpad/snapshot/test/test_system_snapshot.h
index 6126265667..89cd8413fa 100644
--- a/extern/crashpad/crashpad/snapshot/test/test_system_snapshot.h
+++ b/extern/crashpad/crashpad/snapshot/test/test_system_snapshot.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -90,6 +90,8 @@ class TestSystemSnapshot final : public SystemSnapshot {
     time_zone_daylight_name_ = daylight_name;
   }
 
+  void SetAddressMask(uint64_t mask) { address_mask_ = mask; }
+
   // SystemSnapshot:
 
   CPUArchitecture GetCPUArchitecture() const override;
@@ -114,6 +116,7 @@ class TestSystemSnapshot final : public SystemSnapshot {
                 int* daylight_offset_seconds,
                 std::string* standard_name,
                 std::string* daylight_name) const override;
+  uint64_t AddressMask() const override;
 
  private:
   CPUArchitecture cpu_architecture_;
@@ -134,6 +137,7 @@ class TestSystemSnapshot final : public SystemSnapshot {
   int os_version_bugfix_;
   std::string os_version_build_;
   std::string os_version_full_;
+  uint64_t address_mask_;
   bool nx_enabled_;
   std::string machine_description_;
   DaylightSavingTimeStatus time_zone_dst_status_;
diff --git a/extern/crashpad/crashpad/snapshot/test/test_thread_snapshot.cc b/extern/crashpad/crashpad/snapshot/test/test_thread_snapshot.cc
index ed6d9fdab2..9d3eadeec1 100644
--- a/extern/crashpad/crashpad/snapshot/test/test_thread_snapshot.cc
+++ b/extern/crashpad/crashpad/snapshot/test/test_thread_snapshot.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -43,6 +43,10 @@ uint64_t TestThreadSnapshot::ThreadID() const {
   return thread_id_;
 }
 
+std::string TestThreadSnapshot::ThreadName() const {
+  return thread_name_;
+}
+
 int TestThreadSnapshot::SuspendCount() const {
   return suspend_count_;
 }
diff --git a/extern/crashpad/crashpad/snapshot/test/test_thread_snapshot.h b/extern/crashpad/crashpad/snapshot/test/test_thread_snapshot.h
index f865bdfea7..d8c510f9d1 100644
--- a/extern/crashpad/crashpad/snapshot/test/test_thread_snapshot.h
+++ b/extern/crashpad/crashpad/snapshot/test/test_thread_snapshot.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 #include <stdint.h>
 
 #include <memory>
+#include <string>
 #include <utility>
 #include <vector>
 
@@ -63,6 +64,9 @@ class TestThreadSnapshot final : public ThreadSnapshot {
   }
 
   void SetThreadID(uint64_t thread_id) { thread_id_ = thread_id; }
+  void SetThreadName(const std::string& thread_name) {
+    thread_name_ = thread_name;
+  }
   void SetSuspendCount(int suspend_count) { suspend_count_ = suspend_count; }
   void SetPriority(int priority) { priority_ = priority; }
   void SetThreadSpecificDataAddress(uint64_t thread_specific_data_address) {
@@ -83,6 +87,7 @@ class TestThreadSnapshot final : public ThreadSnapshot {
   const CPUContext* Context() const override;
   const MemorySnapshot* Stack() const override;
   uint64_t ThreadID() const override;
+  std::string ThreadName() const override;
   int SuspendCount() const override;
   int Priority() const override;
   uint64_t ThreadSpecificDataAddress() const override;
@@ -96,6 +101,7 @@ class TestThreadSnapshot final : public ThreadSnapshot {
   CPUContext context_;
   std::unique_ptr<MemorySnapshot> stack_;
   uint64_t thread_id_;
+  std::string thread_name_;
   int suspend_count_;
   int priority_;
   uint64_t thread_specific_data_address_;
diff --git a/extern/crashpad/crashpad/snapshot/thread_snapshot.h b/extern/crashpad/crashpad/snapshot/thread_snapshot.h
index 4d732578e5..75b9d68e0b 100644
--- a/extern/crashpad/crashpad/snapshot/thread_snapshot.h
+++ b/extern/crashpad/crashpad/snapshot/thread_snapshot.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 
 #include <stdint.h>
 
+#include <string>
 #include <vector>
 
 namespace crashpad {
@@ -51,6 +52,9 @@ class ThreadSnapshot {
   //! unique system-wide.
   virtual uint64_t ThreadID() const = 0;
 
+  //! \brief Returns the thread's name.
+  virtual std::string ThreadName() const = 0;
+
   //! \brief Returns the thread’s suspend count.
   //!
   //! A suspend count of `0` denotes a schedulable (not suspended) thread.
diff --git a/extern/crashpad/crashpad/snapshot/unloaded_module_snapshot.cc b/extern/crashpad/crashpad/snapshot/unloaded_module_snapshot.cc
index 45f606a68e..a06f0e2441 100644
--- a/extern/crashpad/crashpad/snapshot/unloaded_module_snapshot.cc
+++ b/extern/crashpad/crashpad/snapshot/unloaded_module_snapshot.cc
@@ -1,4 +1,4 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
+// Copyright 2016 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/unloaded_module_snapshot.h b/extern/crashpad/crashpad/snapshot/unloaded_module_snapshot.h
index 03e100e1d2..25b157e3ff 100644
--- a/extern/crashpad/crashpad/snapshot/unloaded_module_snapshot.h
+++ b/extern/crashpad/crashpad/snapshot/unloaded_module_snapshot.h
@@ -1,4 +1,4 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
+// Copyright 2016 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/win/capture_memory_delegate_win.cc b/extern/crashpad/crashpad/snapshot/win/capture_memory_delegate_win.cc
index ee5e5d644b..6ec15c655c 100644
--- a/extern/crashpad/crashpad/snapshot/win/capture_memory_delegate_win.cc
+++ b/extern/crashpad/crashpad/snapshot/win/capture_memory_delegate_win.cc
@@ -1,4 +1,4 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
+// Copyright 2016 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -55,19 +55,17 @@ void CaptureMemoryDelegateWin::AddNewMemorySnapshot(
     return;
   if (range.size() == 0)
     return;
-  if (budget_remaining_ && *budget_remaining_ == 0)
+  if (!budget_remaining_ || *budget_remaining_ == 0)
     return;
   snapshots_->push_back(std::make_unique<internal::MemorySnapshotGeneric>());
   internal::MemorySnapshotGeneric* snapshot = snapshots_->back().get();
   snapshot->Initialize(process_reader_->Memory(), range.base(), range.size());
-  if (budget_remaining_) {
-    if (!base::IsValueInRangeForNumericType<int64_t>(range.size())) {
-      *budget_remaining_ = 0;
-    } else {
-      int64_t temp = *budget_remaining_;
-      temp -= range.size();
-      *budget_remaining_ = base::saturated_cast<uint32_t>(temp);
-    }
+  if (!base::IsValueInRangeForNumericType<int64_t>(range.size())) {
+    *budget_remaining_ = 0;
+  } else {
+    int64_t temp = *budget_remaining_;
+    temp -= range.size();
+    *budget_remaining_ = base::saturated_cast<uint32_t>(temp);
   }
 }
 
diff --git a/extern/crashpad/crashpad/snapshot/win/capture_memory_delegate_win.h b/extern/crashpad/crashpad/snapshot/win/capture_memory_delegate_win.h
index 85c3db97aa..140f99e243 100644
--- a/extern/crashpad/crashpad/snapshot/win/capture_memory_delegate_win.h
+++ b/extern/crashpad/crashpad/snapshot/win/capture_memory_delegate_win.h
@@ -1,4 +1,4 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
+// Copyright 2016 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/win/cpu_context_win.cc b/extern/crashpad/crashpad/snapshot/win/cpu_context_win.cc
index db2e80362c..903d4a9e11 100644
--- a/extern/crashpad/crashpad/snapshot/win/cpu_context_win.cc
+++ b/extern/crashpad/crashpad/snapshot/win/cpu_context_win.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -36,12 +36,12 @@ static_assert(sizeof(CPUContextX86::Fsave) ==
 #endif  // ARCH_CPU_X86
 
 template <typename T>
-bool HasContextPart(const T& context, uint32_t bits) {
-  return (context.ContextFlags & bits) == bits;
+bool HasContextPart(const T* context, uint32_t bits) {
+  return (context->ContextFlags & bits) == bits;
 }
 
 template <class T>
-void CommonInitializeX86Context(const T& context, CPUContextX86* out) {
+void CommonInitializeX86Context(const T* context, CPUContextX86* out) {
   // This function assumes that the WOW64_CONTEXT_* and x86 CONTEXT_* values
   // for ContextFlags are identical. This can be tested when targeting 32-bit
   // x86.
@@ -72,157 +72,187 @@ void CommonInitializeX86Context(const T& context, CPUContextX86* out) {
       << "non-x86 context";
 
   if (HasContextPart(context, WOW64_CONTEXT_CONTROL)) {
-    out->ebp = context.Ebp;
-    out->eip = context.Eip;
-    out->cs = static_cast<uint16_t>(context.SegCs);
-    out->eflags = context.EFlags;
-    out->esp = context.Esp;
-    out->ss = static_cast<uint16_t>(context.SegSs);
+    out->ebp = context->Ebp;
+    out->eip = context->Eip;
+    out->cs = static_cast<uint16_t>(context->SegCs);
+    out->eflags = context->EFlags;
+    out->esp = context->Esp;
+    out->ss = static_cast<uint16_t>(context->SegSs);
   }
 
   if (HasContextPart(context, WOW64_CONTEXT_INTEGER)) {
-    out->eax = context.Eax;
-    out->ebx = context.Ebx;
-    out->ecx = context.Ecx;
-    out->edx = context.Edx;
-    out->edi = context.Edi;
-    out->esi = context.Esi;
+    out->eax = context->Eax;
+    out->ebx = context->Ebx;
+    out->ecx = context->Ecx;
+    out->edx = context->Edx;
+    out->edi = context->Edi;
+    out->esi = context->Esi;
   }
 
   if (HasContextPart(context, WOW64_CONTEXT_SEGMENTS)) {
-    out->ds = static_cast<uint16_t>(context.SegDs);
-    out->es = static_cast<uint16_t>(context.SegEs);
-    out->fs = static_cast<uint16_t>(context.SegFs);
-    out->gs = static_cast<uint16_t>(context.SegGs);
+    out->ds = static_cast<uint16_t>(context->SegDs);
+    out->es = static_cast<uint16_t>(context->SegEs);
+    out->fs = static_cast<uint16_t>(context->SegFs);
+    out->gs = static_cast<uint16_t>(context->SegGs);
   }
 
   if (HasContextPart(context, WOW64_CONTEXT_DEBUG_REGISTERS)) {
-    out->dr0 = context.Dr0;
-    out->dr1 = context.Dr1;
-    out->dr2 = context.Dr2;
-    out->dr3 = context.Dr3;
+    out->dr0 = context->Dr0;
+    out->dr1 = context->Dr1;
+    out->dr2 = context->Dr2;
+    out->dr3 = context->Dr3;
 
     // DR4 and DR5 are obsolete synonyms for DR6 and DR7, see
     // https://en.wikipedia.org/wiki/X86_debug_register.
-    out->dr4 = context.Dr6;
-    out->dr5 = context.Dr7;
+    out->dr4 = context->Dr6;
+    out->dr5 = context->Dr7;
 
-    out->dr6 = context.Dr6;
-    out->dr7 = context.Dr7;
+    out->dr6 = context->Dr6;
+    out->dr7 = context->Dr7;
   }
 
   if (HasContextPart(context, WOW64_CONTEXT_EXTENDED_REGISTERS)) {
-    static_assert(sizeof(out->fxsave) == sizeof(context.ExtendedRegisters),
+    static_assert(sizeof(out->fxsave) == sizeof(context->ExtendedRegisters),
                   "fxsave types must be equivalent");
-    memcpy(&out->fxsave, &context.ExtendedRegisters, sizeof(out->fxsave));
+    memcpy(&out->fxsave, &context->ExtendedRegisters, sizeof(out->fxsave));
   } else if (HasContextPart(context, WOW64_CONTEXT_FLOATING_POINT)) {
     // The static_assert that validates this cast can’t be here because it
     // relies on field names that vary based on the template parameter.
     CPUContextX86::FsaveToFxsave(
-        *reinterpret_cast<const CPUContextX86::Fsave*>(&context.FloatSave),
+        *reinterpret_cast<const CPUContextX86::Fsave*>(&context->FloatSave),
         &out->fxsave);
   }
 }
 
+#if defined(ARCH_CPU_X86_64)
+DWORD64 CallGetEnabledXStateFeatures() {
+  // GetEnabledXStateFeatures needs Windows 7 SP1.
+  HINSTANCE kernel32 = GetModuleHandle(L"Kernel32.dll");
+  decltype(GetEnabledXStateFeatures)* get_enabled_xstate_features =
+      reinterpret_cast<decltype(GetEnabledXStateFeatures)*>(
+          GetProcAddress(kernel32, "GetEnabledXStateFeatures"));
+  if (!get_enabled_xstate_features)
+    return 0;
+  return get_enabled_xstate_features();
+}
+#endif  // defined(ARCH_CPU_X64)
+
 }  // namespace
 
 #if defined(ARCH_CPU_X86)
 
-void InitializeX86Context(const CONTEXT& context, CPUContextX86* out) {
+void InitializeX86Context(const CONTEXT* context, CPUContextX86* out) {
   CommonInitializeX86Context(context, out);
 }
 
 #elif defined(ARCH_CPU_X86_64)
 
-void InitializeX86Context(const WOW64_CONTEXT& context, CPUContextX86* out) {
+void InitializeX86Context(const WOW64_CONTEXT* context, CPUContextX86* out) {
   CommonInitializeX86Context(context, out);
 }
 
-void InitializeX64Context(const CONTEXT& context, CPUContextX86_64* out) {
+void InitializeX64Context(const CONTEXT* context, CPUContextX86_64* out) {
   memset(out, 0, sizeof(*out));
 
   LOG_IF(ERROR, !HasContextPart(context, CONTEXT_AMD64)) << "non-x64 context";
 
   if (HasContextPart(context, CONTEXT_CONTROL)) {
-    out->cs = context.SegCs;
-    out->rflags = context.EFlags;
-    out->rip = context.Rip;
-    out->rsp = context.Rsp;
+    out->cs = context->SegCs;
+    out->rflags = context->EFlags;
+    out->rip = context->Rip;
+    out->rsp = context->Rsp;
     // SegSs ignored.
   }
 
   if (HasContextPart(context, CONTEXT_INTEGER)) {
-    out->rax = context.Rax;
-    out->rbx = context.Rbx;
-    out->rcx = context.Rcx;
-    out->rdx = context.Rdx;
-    out->rdi = context.Rdi;
-    out->rsi = context.Rsi;
-    out->rbp = context.Rbp;
-    out->r8 = context.R8;
-    out->r9 = context.R9;
-    out->r10 = context.R10;
-    out->r11 = context.R11;
-    out->r12 = context.R12;
-    out->r13 = context.R13;
-    out->r14 = context.R14;
-    out->r15 = context.R15;
+    out->rax = context->Rax;
+    out->rbx = context->Rbx;
+    out->rcx = context->Rcx;
+    out->rdx = context->Rdx;
+    out->rdi = context->Rdi;
+    out->rsi = context->Rsi;
+    out->rbp = context->Rbp;
+    out->r8 = context->R8;
+    out->r9 = context->R9;
+    out->r10 = context->R10;
+    out->r11 = context->R11;
+    out->r12 = context->R12;
+    out->r13 = context->R13;
+    out->r14 = context->R14;
+    out->r15 = context->R15;
   }
 
   if (HasContextPart(context, CONTEXT_SEGMENTS)) {
-    out->fs = context.SegFs;
-    out->gs = context.SegGs;
+    out->fs = context->SegFs;
+    out->gs = context->SegGs;
     // SegDs ignored.
     // SegEs ignored.
   }
 
   if (HasContextPart(context, CONTEXT_DEBUG_REGISTERS)) {
-    out->dr0 = context.Dr0;
-    out->dr1 = context.Dr1;
-    out->dr2 = context.Dr2;
-    out->dr3 = context.Dr3;
+    out->dr0 = context->Dr0;
+    out->dr1 = context->Dr1;
+    out->dr2 = context->Dr2;
+    out->dr3 = context->Dr3;
 
     // DR4 and DR5 are obsolete synonyms for DR6 and DR7, see
     // https://en.wikipedia.org/wiki/X86_debug_register.
-    out->dr4 = context.Dr6;
-    out->dr5 = context.Dr7;
+    out->dr4 = context->Dr6;
+    out->dr5 = context->Dr7;
 
-    out->dr6 = context.Dr6;
-    out->dr7 = context.Dr7;
+    out->dr6 = context->Dr6;
+    out->dr7 = context->Dr7;
   }
 
   if (HasContextPart(context, CONTEXT_FLOATING_POINT)) {
-    static_assert(sizeof(out->fxsave) == sizeof(context.FltSave),
+    static_assert(sizeof(out->fxsave) == sizeof(context->FltSave),
                   "types must be equivalent");
-    memcpy(&out->fxsave, &context.FltSave, sizeof(out->fxsave));
+    memcpy(&out->fxsave, &context->FltSave, sizeof(out->fxsave));
   }
 }
 
+void InitializeX64XStateCet(const CONTEXT* context,
+                            XSAVE_CET_U_FORMAT* cet_u,
+                            CPUContextX86_64* out) {
+  if (HasContextPart(context, CONTEXT_XSTATE)) {
+    if (cet_u) {
+      out->xstate.enabled_features |= XSTATE_MASK_CET_U;
+      out->xstate.cet_u.cetmsr = cet_u->Ia32CetUMsr;
+      out->xstate.cet_u.ssp = cet_u->Ia32Pl3SspMsr;
+    }
+  }
+}
+
+bool IsXStateFeatureEnabled(DWORD64 features) {
+  static DWORD64 flags = CallGetEnabledXStateFeatures();
+  return (flags & features) == features;
+}
+
 #elif defined(ARCH_CPU_ARM64)
 
-void InitializeARM64Context(const CONTEXT& context, CPUContextARM64* out) {
+void InitializeARM64Context(const CONTEXT* context, CPUContextARM64* out) {
   memset(out, 0, sizeof(*out));
 
   LOG_IF(ERROR, !HasContextPart(context, CONTEXT_ARM64)) << "non-arm64 context";
 
   if (HasContextPart(context, CONTEXT_CONTROL)) {
-    out->spsr = context.Cpsr;
-    out->pc = context.Pc;
-    out->regs[30] = context.Lr;
-    out->sp = context.Sp;
-    out->regs[29] = context.Fp;
+    out->spsr = context->Cpsr;
+    out->pc = context->Pc;
+    out->regs[30] = context->Lr;
+    out->sp = context->Sp;
+    out->regs[29] = context->Fp;
   }
 
   if (HasContextPart(context, CONTEXT_INTEGER)) {
-    memcpy(&out->regs[0], &context.X0, 18 * sizeof(context.X0));
+    memcpy(&out->regs[0], &context->X0, 18 * sizeof(context->X0));
     // Don't copy x18 which is reserved as platform register.
-    memcpy(&out->regs[19], &context.X19, 10 * sizeof(context.X0));
+    memcpy(&out->regs[19], &context->X19, 10 * sizeof(context->X0));
   }
 
   if (HasContextPart(context, CONTEXT_FLOATING_POINT)) {
-    static_assert(sizeof(out->fpsimd) == sizeof(context.V),
+    static_assert(sizeof(out->fpsimd) == sizeof(context->V),
                   "types must be equivalent");
-    memcpy(&out->fpsimd, &context.V, sizeof(out->fpsimd));
+    memcpy(&out->fpsimd, &context->V, sizeof(out->fpsimd));
   }
 }
 
diff --git a/extern/crashpad/crashpad/snapshot/win/cpu_context_win.h b/extern/crashpad/crashpad/snapshot/win/cpu_context_win.h
index 9718f49cb0..c3cae9bba4 100644
--- a/extern/crashpad/crashpad/snapshot/win/cpu_context_win.h
+++ b/extern/crashpad/crashpad/snapshot/win/cpu_context_win.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@ struct CPUContextARM64;
 
 //! \brief Initializes a CPUContextX86 structure from a native context structure
 //!     on Windows.
-void InitializeX86Context(const CONTEXT& context, CPUContextX86* out);
+void InitializeX86Context(const CONTEXT* context, CPUContextX86* out);
 
 #endif  // ARCH_CPU_X86
 
@@ -37,11 +37,22 @@ void InitializeX86Context(const CONTEXT& context, CPUContextX86* out);
 
 //! \brief Initializes a CPUContextX86 structure from a native context structure
 //!     on Windows.
-void InitializeX86Context(const WOW64_CONTEXT& context, CPUContextX86* out);
+void InitializeX86Context(const WOW64_CONTEXT* context, CPUContextX86* out);
 
 //! \brief Initializes a CPUContextX86_64 structure from a native context
 //!     structure on Windows.
-void InitializeX64Context(const CONTEXT& context, CPUContextX86_64* out);
+//! Only reads a max of sizeof(CONTEXT) so will not initialize extended values.
+void InitializeX64Context(const CONTEXT* context, CPUContextX86_64* out);
+
+//! \brief Initializes CET fields of a CPUContextX86_64 structure from
+//!     an xsave location if |context| flags support cet_u values.
+void InitializeX64XStateCet(const CONTEXT* context,
+                            XSAVE_CET_U_FORMAT* cet_u,
+                            CPUContextX86_64* out);
+
+//! \brief Wraps GetXStateEnabledFeatures(), returns true if the specified set
+//!     of flags are all supported.
+bool IsXStateFeatureEnabled(DWORD64 feature);
 
 #endif  // ARCH_CPU_X86_64
 
@@ -49,7 +60,7 @@ void InitializeX64Context(const CONTEXT& context, CPUContextX86_64* out);
 
 //! \brief Initializes a CPUContextARM64 structure from a native context
 //!     structure on Windows.
-void InitializeARM64Context(const CONTEXT& context, CPUContextARM64* out);
+void InitializeARM64Context(const CONTEXT* context, CPUContextARM64* out);
 
 #endif  // ARCH_CPU_ARM64
 
diff --git a/extern/crashpad/crashpad/snapshot/win/cpu_context_win_test.cc b/extern/crashpad/crashpad/snapshot/win/cpu_context_win_test.cc
index 15f766777b..dc79ea771b 100644
--- a/extern/crashpad/crashpad/snapshot/win/cpu_context_win_test.cc
+++ b/extern/crashpad/crashpad/snapshot/win/cpu_context_win_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,7 +16,8 @@
 
 #include <windows.h>
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+
 #include "build/build_config.h"
 #include "gtest/gtest.h"
 #include "snapshot/cpu_context.h"
@@ -40,7 +41,7 @@ void TestInitializeX86Context() {
   // directly from the supplied thread, float, and debug state parameters.
   {
     CPUContextX86 cpu_context_x86 = {};
-    InitializeX86Context(context, &cpu_context_x86);
+    InitializeX86Context(&context, &cpu_context_x86);
     EXPECT_EQ(cpu_context_x86.eax, 1u);
     EXPECT_EQ(cpu_context_x86.fxsave.ftw, 2u);
     EXPECT_EQ(cpu_context_x86.dr0, 3u);
@@ -72,7 +73,7 @@ void TestInitializeX86Context_FsaveWithoutFxsave() {
 
   {
     CPUContextX86 cpu_context_x86 = {};
-    InitializeX86Context(context, &cpu_context_x86);
+    InitializeX86Context(&context, &cpu_context_x86);
 
     EXPECT_EQ(cpu_context_x86.eax, 1u);
 
@@ -87,13 +88,13 @@ void TestInitializeX86Context_FsaveWithoutFxsave() {
     for (size_t st_mm = 0; st_mm < 7; ++st_mm) {
       EXPECT_EQ(
           BytesToHexString(cpu_context_x86.fxsave.st_mm[st_mm].st,
-                           base::size(cpu_context_x86.fxsave.st_mm[st_mm].st)),
-          std::string(base::size(cpu_context_x86.fxsave.st_mm[st_mm].st) * 2,
+                           std::size(cpu_context_x86.fxsave.st_mm[st_mm].st)),
+          std::string(std::size(cpu_context_x86.fxsave.st_mm[st_mm].st) * 2,
                       '0'))
           << "st_mm " << st_mm;
     }
     EXPECT_EQ(BytesToHexString(cpu_context_x86.fxsave.st_mm[7].st,
-                               base::size(cpu_context_x86.fxsave.st_mm[7].st)),
+                               std::size(cpu_context_x86.fxsave.st_mm[7].st)),
               "0000000000000080ff7f");
 
     EXPECT_EQ(cpu_context_x86.dr0, 3u);
@@ -116,7 +117,7 @@ TEST(CPUContextWin, InitializeX64Context) {
   // set directly from the supplied thread, float, and debug state parameters.
   {
     CPUContextX86_64 cpu_context_x86_64 = {};
-    InitializeX64Context(context, &cpu_context_x86_64);
+    InitializeX64Context(&context, &cpu_context_x86_64);
     EXPECT_EQ(cpu_context_x86_64.rax, 10u);
     EXPECT_EQ(cpu_context_x86_64.fxsave.ftw, 11u);
     EXPECT_EQ(cpu_context_x86_64.dr0, 12u);
diff --git a/extern/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_annotations.cc b/extern/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_annotations.cc
index d46c3d7255..4adb5648df 100644
--- a/extern/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_annotations.cc
+++ b/extern/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_annotations.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_crashing_child.cc b/extern/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_crashing_child.cc
index 724bd57246..2f11275b7c 100644
--- a/extern/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_crashing_child.cc
+++ b/extern/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_crashing_child.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_dump_without_crashing.cc b/extern/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_dump_without_crashing.cc
index eeeddf53fa..14e7ffc444 100644
--- a/extern/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_dump_without_crashing.cc
+++ b/extern/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_dump_without_crashing.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_extra_memory_ranges.cc b/extern/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_extra_memory_ranges.cc
index 6a18410352..7892b5528a 100644
--- a/extern/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_extra_memory_ranges.cc
+++ b/extern/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_extra_memory_ranges.cc
@@ -1,4 +1,4 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
+// Copyright 2016 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_image_reader.cc b/extern/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_image_reader.cc
index 94d0e47d84..d835d05d73 100644
--- a/extern/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_image_reader.cc
+++ b/extern/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_image_reader.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,8 @@
 
 #include <windows.h>
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+
 #include "base/logging.h"
 #include "client/crashpad_info.h"
 #include "util/file/file_io.h"
@@ -29,7 +30,7 @@ DWORD WINAPI LotsOfReferencesThreadProc(void* param) {
 
   // Allocate a bunch of pointers to things on the stack.
   int* pointers[1000];
-  for (size_t i = 0; i < base::size(pointers); ++i) {
+  for (size_t i = 0; i < std::size(pointers); ++i) {
     pointers[i] = new int[2048];
   }
 
@@ -53,7 +54,7 @@ int wmain(int argc, wchar_t* argv[]) {
   // verify the cap on pointed-to memory.
   crashpad::Semaphore semaphore(0);
   crashpad::ScopedKernelHANDLE threads[100];
-  for (size_t i = 0; i < base::size(threads); ++i) {
+  for (size_t i = 0; i < std::size(threads); ++i) {
     threads[i].reset(CreateThread(nullptr,
                                   0,
                                   &LotsOfReferencesThreadProc,
@@ -66,7 +67,7 @@ int wmain(int argc, wchar_t* argv[]) {
     }
   }
 
-  for (size_t i = 0; i < base::size(threads); ++i) {
+  for (size_t i = 0; i < std::size(threads); ++i) {
     semaphore.Wait();
   }
 
diff --git a/extern/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_image_reader_module.cc b/extern/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_image_reader_module.cc
index 6e81de9574..7ec1933fa2 100644
--- a/extern/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_image_reader_module.cc
+++ b/extern/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_image_reader_module.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/win/end_to_end_test.py b/extern/crashpad/crashpad/snapshot/win/end_to_end_test.py
index b1919adef4..b00b3e54be 100755
--- a/extern/crashpad/crashpad/snapshot/win/end_to_end_test.py
+++ b/extern/crashpad/crashpad/snapshot/win/end_to_end_test.py
@@ -1,6 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
-# Copyright 2015 The Crashpad Authors. All rights reserved.
+# Copyright 2015 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,13 +14,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import print_function
-
 import os
 import platform
 import pywintypes
 import random
 import re
+import struct
 import subprocess
 import sys
 import tempfile
@@ -88,6 +87,15 @@ def GetCdbPath():
     return None
 
 
+def Win32_20H1():
+    (major, _, build) = platform.win32_ver()[1].split('.')
+    if int(major) < 10:
+        return False
+    if int(build) >= 19041:
+        return True
+    return False
+
+
 def NamedPipeExistsAndReady(pipe_name):
     """Returns False if pipe_name does not exist. If pipe_name does exist,
     blocks until the pipe is ready to service clients, and then returns True.
@@ -104,7 +112,7 @@ def NamedPipeExistsAndReady(pipe_name):
     try:
         win32pipe.WaitNamedPipe(pipe_name, win32pipe.NMPWAIT_WAIT_FOREVER)
     except pywintypes.error as e:
-        if e[0] == winerror.ERROR_FILE_NOT_FOUND:
+        if e.winerror == winerror.ERROR_FILE_NOT_FOUND:
             return False
         raise
     return True
@@ -152,6 +160,14 @@ def GetDumpFromProgram(out_dir, pipe_name, executable_name, expect_exit_code,
             ] + list(args))
         print('Running %s' % os.path.basename(command[0]))
         exit_code = subprocess.call(command)
+
+        # Some win32con codes are negative signed integers, whereas all exit
+        # codes are unsigned integers. Convert from signed to unsigned.
+        if expect_exit_code < 0:
+            expect_exit_code = struct.unpack('I',
+                                             struct.pack('i',
+                                                         expect_exit_code))[0]
+
         if exit_code != expect_exit_code:
             raise subprocess.CalledProcessError(exit_code, executable_name)
 
@@ -160,7 +176,8 @@ def GetDumpFromProgram(out_dir, pipe_name, executable_name, expect_exit_code,
             '--database=' + test_database,
             '--show-pending-reports',
             '--show-all-report-info',
-        ])
+        ],
+                                      text=True)
         for line in out.splitlines():
             if line.strip().startswith('Path:'):
                 return line.partition(':')[2].strip()
@@ -195,6 +212,18 @@ def GetDumpFromZ7Program(out_dir, pipe_name):
                               win32con.EXCEPTION_ACCESS_VIOLATION)
 
 
+def GetDumpFromHeapCorruptingProgram(out_dir, pipe_name):
+    STATUS_HEAP_CORRUPTION = 0xC0000374
+    return GetDumpFromProgram(out_dir, pipe_name, 'heap_corrupting_program.exe',
+                              STATUS_HEAP_CORRUPTION)
+
+
+def GetDumpFromFastFailProgram(out_dir, pipe_name, *args):
+    STATUS_STACK_BUFFER_OVERRUN = 0xc0000409
+    return GetDumpFromProgram(out_dir, pipe_name, 'fastfail_program.exe',
+                              STATUS_STACK_BUFFER_OVERRUN, *args)
+
+
 class CdbRun(object):
     """Run cdb.exe passing it a cdb command and capturing the output.
     `Check()` searches for regex patterns in sequence allowing verification of
@@ -205,20 +234,27 @@ def __init__(self, cdb_path, dump_path, command):
         # Run a command line that loads the dump, runs the specified cdb
         # command, and then quits, and capturing stdout.
         self.out = subprocess.check_output(
-            [cdb_path, '-z', dump_path, '-c', command + ';q'])
+            [cdb_path, '-z', dump_path, '-c', command + ';q'], text=True)
 
-    def Check(self, pattern, message, re_flags=0):
-        match_obj = re.search(pattern, self.out, re_flags)
-        if match_obj:
+    def Check(self, pattern, message, re_flags=0, must_not_match=False):
+        match_obj = re.search(pattern, self.out, flags=re_flags)
+        if match_obj and not must_not_match:
             # Matched. Consume up to end of match.
             self.out = self.out[match_obj.end(0):]
             print('ok - %s' % message)
             sys.stdout.flush()
+        elif must_not_match and not match_obj:
+            # Did not match and did not want to match.
+            print('ok - %s' % message)
+            sys.stdout.flush()
         else:
             print('-' * 80, file=sys.stderr)
             print('FAILED - %s' % message, file=sys.stderr)
             print('-' * 80, file=sys.stderr)
-            print('did not match:\n  %s' % pattern, file=sys.stderr)
+            if must_not_match:
+                print('unexpected match:\n  %s' % pattern, file=sys.stderr)
+            else:
+                print('did not match:\n  %s' % pattern, file=sys.stderr)
             print('-' * 80, file=sys.stderr)
             print('remaining output was:\n  %s' % self.out, file=sys.stderr)
             print('-' * 80, file=sys.stderr)
@@ -227,7 +263,7 @@ def Check(self, pattern, message, re_flags=0):
             g_had_failures = True
 
     def Find(self, pattern, re_flags=0):
-        match_obj = re.search(pattern, self.out, re_flags)
+        match_obj = re.search(pattern, self.out, flags=re_flags)
         if match_obj:
             # Matched. Consume up to end of match.
             self.out = self.out[match_obj.end(0):]
@@ -236,8 +272,7 @@ def Find(self, pattern, re_flags=0):
 
 
 def RunTests(cdb_path, dump_path, start_handler_dump_path, destroyed_dump_path,
-             z7_dump_path, other_program_path, other_program_no_exception_path,
-             sigabrt_main_path, sigabrt_background_path, pipe_name):
+             pipe_name):
     """Runs various tests in sequence. Runs a new cdb instance on the dump for
     each block of tests to reduce the chances that output from one command is
     confused for output from another.
@@ -365,17 +400,22 @@ def RunTests(cdb_path, dump_path, start_handler_dump_path, destroyed_dump_path,
     out.Check(r'type \?\?\? \(333333\), size 00001000', 'first user stream')
     out.Check(r'type \?\?\? \(222222\), size 00000080', 'second user stream')
 
-    if z7_dump_path:
-        out = CdbRun(cdb_path, z7_dump_path, '.ecxr;lm')
-        out.Check('This dump file has an exception of interest stored in it',
-                  'captured exception in z7 module')
-        # Older versions of cdb display relative to exports for /Z7 modules,
-        # newer ones just display the offset.
-        out.Check(r'z7_test(!CrashMe\+0xe|\+0x100e):',
-                  'exception in z7 at correct location')
-        out.Check(r'z7_test  C \(codeview symbols\)     z7_test\.dll',
-                  'expected non-pdb symbol format')
 
+def Run7zDumpTest(cdb_path, z7_dump_path):
+    """Validate output when non-pdb symbols are in a module."""
+    out = CdbRun(cdb_path, z7_dump_path, '.ecxr;lm')
+    out.Check('This dump file has an exception of interest stored in it',
+              'captured exception in z7 module')
+    # Older versions of cdb display relative to exports for /Z7 modules,
+    # newer ones just display the offset.
+    out.Check(r'z7_test(!CrashMe\+0xe|\+0x100e):',
+              'exception in z7 at correct location')
+    out.Check(r'z7_test  C \(codeview symbols\)     z7_test\.dll',
+              'expected non-pdb symbol format')
+
+
+def RunOtherProgramTests(cdb_path, other_program_path,
+                         other_program_no_exception_path):
     out = CdbRun(cdb_path, other_program_path, '.ecxr;k;~')
     out.Check('Unknown exception - code deadbea7',
               'other program dump exception code')
@@ -399,6 +439,9 @@ def RunTests(cdb_path, dump_path, start_handler_dump_path, destroyed_dump_path,
               'other program with no exception given')
     out.Check('!RaiseException', 'other program in RaiseException()')
 
+
+def RunSigAbrtTest(cdb_path, sigabrt_main_path, sigabrt_background_path):
+    """Validate that abort signals are collected."""
     out = CdbRun(cdb_path, sigabrt_main_path, '.ecxr')
     out.Check('code 40000015', 'got sigabrt signal')
     out.Check('::HandleAbortSignal', '  stack in expected location')
@@ -407,6 +450,40 @@ def RunTests(cdb_path, dump_path, start_handler_dump_path, destroyed_dump_path,
     out.Check('code 40000015', 'got sigabrt signal from background thread')
 
 
+def RunHeapCorruptionTest(cdb_path, heap_path):
+    """Runs tests on heap corruption caught using the vectored handler."""
+    out = CdbRun(cdb_path, heap_path, '.ecxr;k')
+    out.Check('code c0000374', 'captured exception from heap corruption crash')
+    out.Check('::HeapCorruptionCrash', 'See expected throwing function')
+    out = CdbRun(cdb_path, heap_path, '.ecxr;k')
+
+
+def RunFastFailDumpTest(cdb_path, fastfail_path):
+    """Runs tests on __fastfail() caught using the runtime exception helper."""
+    out = CdbRun(cdb_path, fastfail_path, '.ecxr;k')
+    out.Check('This dump file has an exception of interest stored in it',
+              'captured exception from __fastfail() crash()')
+    out.Check(r'Subcode: 0x4d \(unknown subcode\)', 'See expected subcode.')
+    out.Check('FastFailCrash', 'See expected throwing function.')
+    out = CdbRun(cdb_path, fastfail_path, '.ecxr;k')
+
+
+def RunCfgDumpTest(cdb_path, cfg_path):
+    """Runs tests on a cfg crash caught using the runtime exception helper."""
+    out = CdbRun(cdb_path, cfg_path, '.ecxr;k')
+    out.Check('This dump file has an exception of interest stored in it',
+              'captured exception from cfg crash()')
+    out.Check('Subcode: 0xa FAST_FAIL_GUARD_ICALL_CHECK_FAILURE',
+              'See expected cfg error code.')
+    out.Check('RtlFailFast',
+              'See expected Windows exception throwing function.')
+    out.Check('::CfgCrash', 'expected crashy function is on the stack.')
+    out = CdbRun(cdb_path, cfg_path, '.ecxr;k')
+    out.Check(r'CallRffeManyTimes',
+              'Do not see the function we fiddled the pointer for.',
+              must_not_match=True)
+
+
 def main(args):
     try:
         if len(args) != 1:
@@ -429,6 +506,7 @@ def main(args):
         pipe_name = r'\\.\pipe\end-to-end_%s_%s' % (os.getpid(),
                                                     str(random.getrandbits(64)))
 
+        # Basic tests.
         crashy_dump_path = GetDumpFromCrashyProgram(args[0], pipe_name)
         if not crashy_dump_path:
             return 1
@@ -442,12 +520,10 @@ def main(args):
         if not destroyed_dump_path:
             return 1
 
-        z7_dump_path = None
-        if not args[0].endswith('_x64'):
-            z7_dump_path = GetDumpFromZ7Program(args[0], pipe_name)
-            if not z7_dump_path:
-                return 1
+        RunTests(cdb_path, crashy_dump_path, start_handler_dump_path,
+                 destroyed_dump_path, pipe_name)
 
+        # Other program dumps.
         other_program_path = GetDumpFromOtherProgram(args[0], pipe_name)
         if not other_program_path:
             return 1
@@ -457,6 +533,10 @@ def main(args):
         if not other_program_no_exception_path:
             return 1
 
+        RunOtherProgramTests(cdb_path, other_program_path,
+                             other_program_no_exception_path)
+
+        # SIGABRT.
         sigabrt_main_path = GetDumpFromSignal(args[0], pipe_name, 'main')
         if not sigabrt_main_path:
             return 1
@@ -466,10 +546,31 @@ def main(args):
         if not sigabrt_background_path:
             return 1
 
-        RunTests(cdb_path, crashy_dump_path, start_handler_dump_path,
-                 destroyed_dump_path, z7_dump_path, other_program_path,
-                 other_program_no_exception_path, sigabrt_main_path,
-                 sigabrt_background_path, pipe_name)
+        RunSigAbrtTest(cdb_path, sigabrt_main_path, sigabrt_background_path)
+
+        # Can only build the z7 program on x86.
+        if not args[0].endswith('_x64'):
+            z7_dump_path = GetDumpFromZ7Program(args[0], pipe_name)
+            if not z7_dump_path:
+                return 1
+            Run7zDumpTest(cdb_path, z7_dump_path)
+
+        heap_path = GetDumpFromHeapCorruptingProgram(args[0], pipe_name)
+        if not heap_path:
+            return 1
+        RunHeapCorruptionTest(cdb_path, heap_path)
+
+        # __fastfail() & CFG crash caught by WerRuntimeExceptionHelperModule.
+        # TODO(crashpad:458) These are not working when launched from python.
+        if (False and Win32_20H1()):
+            cfg_path = GetDumpFromFastFailProgram(args[0], pipe_name, "cf")
+            if not cfg_path:
+                return 1
+            RunCfgDumpTest(cdb_path, cfg_path)
+            fastfail_path = GetDumpFromFastFailProgram(args[0], pipe_name, "ff")
+            if not fastfail_path:
+                return 1
+            RunFastFailDumpTest(cdb_path, fastfail_path)
 
         return 1 if g_had_failures else 0
     finally:
diff --git a/extern/crashpad/crashpad/snapshot/win/exception_snapshot_win.cc b/extern/crashpad/crashpad/snapshot/win/exception_snapshot_win.cc
index 5759652d45..b8931444ac 100644
--- a/extern/crashpad/crashpad/snapshot/win/exception_snapshot_win.cc
+++ b/extern/crashpad/crashpad/snapshot/win/exception_snapshot_win.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,14 +14,16 @@
 
 #include "snapshot/win/exception_snapshot_win.h"
 
+#include <algorithm>
+
 #include "base/logging.h"
-#include "client/crashpad_client.h"
 #include "snapshot/capture_memory.h"
 #include "snapshot/memory_snapshot.h"
 #include "snapshot/memory_snapshot_generic.h"
 #include "snapshot/win/capture_memory_delegate_win.h"
 #include "snapshot/win/cpu_context_win.h"
 #include "snapshot/win/process_reader_win.h"
+#include "util/win/exception_codes.h"
 #include "util/win/nt_internals.h"
 
 namespace crashpad {
@@ -36,7 +38,7 @@ using Context32 = CONTEXT;
 using Context32 = WOW64_CONTEXT;
 #endif
 
-void NativeContextToCPUContext32(const Context32& context_record,
+void NativeContextToCPUContext32(const Context32* context_record,
                                  CPUContext* context,
                                  CPUContextUnion* context_union) {
   context->architecture = kCPUArchitectureX86;
@@ -46,13 +48,25 @@ void NativeContextToCPUContext32(const Context32& context_record,
 #endif  // ARCH_CPU_X86_FAMILY
 
 #if defined(ARCH_CPU_64_BITS)
-void NativeContextToCPUContext64(const CONTEXT& context_record,
+void NativeContextToCPUContext64(const CONTEXT* context_record,
                                  CPUContext* context,
                                  CPUContextUnion* context_union) {
 #if defined(ARCH_CPU_X86_64)
   context->architecture = kCPUArchitectureX86_64;
   context->x86_64 = &context_union->x86_64;
+  // Note that the context here is not extended, even if the flags suggest so,
+  // as we only copied in sizeof(CONTEXT).
   InitializeX64Context(context_record, context->x86_64);
+  // TODO(1250098) plumb through ssp via message from crashed process. For now
+  // we zero this if CET is available in the capturing process as otherwise
+  // WinDBG will show the relevant thread's ssp for the exception which will
+  // likely be more confusing than showing a zero value.
+  if (IsXStateFeatureEnabled(XSTATE_MASK_CET_U)) {
+    XSAVE_CET_U_FORMAT cet_u_fake;
+    cet_u_fake.Ia32CetUMsr = 0;
+    cet_u_fake.Ia32Pl3SspMsr = 0;
+    InitializeX64XStateCet(context_record, &cet_u_fake, context->x86_64);
+  }
 #elif defined(ARCH_CPU_ARM64)
   context->architecture = kCPUArchitectureARM64;
   context->arm64 = &context_union->arm64;
@@ -84,7 +98,8 @@ ExceptionSnapshotWin::~ExceptionSnapshotWin() {
 bool ExceptionSnapshotWin::Initialize(
     ProcessReaderWin* process_reader,
     DWORD thread_id,
-    WinVMAddress exception_pointers_address) {
+    WinVMAddress exception_pointers_address,
+    uint32_t* gather_indirectly_referenced_memory_cap) {
   INITIALIZATION_STATE_SET_INITIALIZING(initialized_);
 
   const ProcessReaderWin::Thread* thread = nullptr;
@@ -132,7 +147,10 @@ bool ExceptionSnapshotWin::Initialize(
 #endif
 
   CaptureMemoryDelegateWin capture_memory_delegate(
-      process_reader, *thread, &extra_memory_, nullptr);
+      process_reader,
+      *thread,
+      &extra_memory_,
+      gather_indirectly_referenced_memory_cap);
   CaptureMemory::PointedToByContext(context_, &capture_memory_delegate);
 
   INITIALIZATION_STATE_SET_VALID(initialized_);
@@ -186,7 +204,7 @@ bool ExceptionSnapshotWin::InitializeFromExceptionPointers(
     ProcessReaderWin* process_reader,
     WinVMAddress exception_pointers_address,
     DWORD exception_thread_id,
-    void (*native_to_cpu_context)(const ContextType& context_record,
+    void (*native_to_cpu_context)(const ContextType* context_record,
                                   CPUContext* context,
                                   CPUContextUnion* context_union)) {
   ExceptionPointersType exception_pointers;
@@ -211,7 +229,7 @@ bool ExceptionSnapshotWin::InitializeFromExceptionPointers(
   }
 
   const bool triggered_by_client =
-      first_record.ExceptionCode == CrashpadClient::kTriggeredExceptionCode &&
+      first_record.ExceptionCode == ExceptionCodes::kTriggeredExceptionCode &&
       first_record.NumberParameters == 2;
   if (triggered_by_client)
     process_reader->DecrementThreadSuspendCounts(exception_thread_id);
@@ -228,10 +246,9 @@ bool ExceptionSnapshotWin::InitializeFromExceptionPointers(
     for (const auto& thread : process_reader->Threads()) {
       if (thread.id == blame_thread_id) {
         thread_id_ = blame_thread_id;
-        native_to_cpu_context(
-            *reinterpret_cast<const ContextType*>(&thread.context),
-            &context_,
-            &context_union_);
+        native_to_cpu_context(thread.context.context<const ContextType>(),
+                              &context_,
+                              &context_union_);
         exception_address_ = context_.InstructionPointer();
         break;
       }
@@ -246,8 +263,12 @@ bool ExceptionSnapshotWin::InitializeFromExceptionPointers(
     exception_code_ = first_record.ExceptionCode;
     exception_flags_ = first_record.ExceptionFlags;
     exception_address_ = first_record.ExceptionAddress;
-    for (DWORD i = 0; i < first_record.NumberParameters; ++i)
+
+    const DWORD number_parameters = std::min<DWORD>(
+        first_record.NumberParameters, EXCEPTION_MAXIMUM_PARAMETERS);
+    for (DWORD i = 0; i < number_parameters; ++i) {
       codes_.push_back(first_record.ExceptionInformation[i]);
+    }
     if (first_record.ExceptionRecord) {
       // https://crashpad.chromium.org/bug/43
       LOG(WARNING) << "dropping chained ExceptionRecord";
@@ -262,7 +283,7 @@ bool ExceptionSnapshotWin::InitializeFromExceptionPointers(
       return false;
     }
 
-    native_to_cpu_context(context_record, &context_, &context_union_);
+    native_to_cpu_context(&context_record, &context_, &context_union_);
   }
 
   return true;
diff --git a/extern/crashpad/crashpad/snapshot/win/exception_snapshot_win.h b/extern/crashpad/crashpad/snapshot/win/exception_snapshot_win.h
index 9167a9ef63..686e771a73 100644
--- a/extern/crashpad/crashpad/snapshot/win/exception_snapshot_win.h
+++ b/extern/crashpad/crashpad/snapshot/win/exception_snapshot_win.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 #define CRASHPAD_SNAPSHOT_WIN_EXCEPTION_SNAPSHOT_WIN_H_
 
 #include <windows.h>
+
 #include <stdint.h>
 
 #include <memory>
@@ -63,6 +64,9 @@ class ExceptionSnapshotWin final : public ExceptionSnapshot {
   //! \param[in] exception_pointers The address of an `EXCEPTION_POINTERS`
   //!     record in the target process, passed through from the exception
   //!     handler.
+  //! \param[inout] gather_indirectly_referenced_memory_cap The remaining budget
+  //!     for indirectly referenced memory, honored on entry and updated on
+  //!     return.
   //!
   //! \note If the exception was triggered by
   //!     CrashpadClient::DumpAndCrashTargetProcess(), this has the side-effect
@@ -72,7 +76,8 @@ class ExceptionSnapshotWin final : public ExceptionSnapshot {
   //!     an appropriate message logged.
   bool Initialize(ProcessReaderWin* process_reader,
                   DWORD thread_id,
-                  WinVMAddress exception_pointers);
+                  WinVMAddress exception_pointers,
+                  uint32_t* gather_indirectly_referenced_memory_cap);
 
   // ExceptionSnapshot:
 
@@ -92,7 +97,7 @@ class ExceptionSnapshotWin final : public ExceptionSnapshot {
       ProcessReaderWin* process_reader,
       WinVMAddress exception_pointers_address,
       DWORD exception_thread_id,
-      void (*native_to_cpu_context)(const ContextType& context_record,
+      void (*native_to_cpu_context)(const ContextType* context_record,
                                     CPUContext* context,
                                     CPUContextUnion* context_union));
 
diff --git a/extern/crashpad/crashpad/snapshot/win/exception_snapshot_win_test.cc b/extern/crashpad/crashpad/snapshot/win/exception_snapshot_win_test.cc
index dbf9cfc059..aa78e55793 100644
--- a/extern/crashpad/crashpad/snapshot/win/exception_snapshot_win_test.cc
+++ b/extern/crashpad/crashpad/snapshot/win/exception_snapshot_win_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,12 +14,14 @@
 
 #include "snapshot/win/exception_snapshot_win.h"
 
+#include <windows.h>
+
 #include <string>
 
 #include "base/files/file_path.h"
 #include "base/strings/utf_string_conversions.h"
-#include "client/crashpad_client.h"
 #include "gtest/gtest.h"
+#include "snapshot/win/exception_snapshot_win.h"
 #include "snapshot/win/process_snapshot_win.h"
 #include "test/errors.h"
 #include "test/test_paths.h"
@@ -316,6 +318,48 @@ TEST(SimulateCrash, ChildDumpWithoutCrashingWOW64) {
 }
 #endif  // ARCH_CPU_64_BITS
 
+TEST(ExceptionSnapshot, TooManyExceptionParameters) {
+  ProcessReaderWin process_reader;
+  ASSERT_TRUE(process_reader.Initialize(GetCurrentProcess(),
+                                        ProcessSuspensionState::kRunning));
+
+  // Construct a fake exception record and CPU context.
+  auto exception_record = std::make_unique<EXCEPTION_RECORD>();
+  exception_record->ExceptionCode = STATUS_FATAL_APP_EXIT;
+  exception_record->ExceptionFlags = EXCEPTION_NONCONTINUABLE;
+  exception_record->ExceptionAddress = reinterpret_cast<PVOID>(0xFA15E);
+  // One more than is permitted in the struct.
+  exception_record->NumberParameters = EXCEPTION_MAXIMUM_PARAMETERS + 1;
+  for (int i = 0; i < EXCEPTION_MAXIMUM_PARAMETERS; ++i) {
+    exception_record->ExceptionInformation[i] = 1000 + i;
+  }
+
+  auto cpu_context = std::make_unique<internal::CPUContextUnion>();
+
+  auto exception_pointers = std::make_unique<EXCEPTION_POINTERS>();
+  exception_pointers->ExceptionRecord =
+      reinterpret_cast<PEXCEPTION_RECORD>(exception_record.get());
+  exception_pointers->ContextRecord =
+      reinterpret_cast<PCONTEXT>(cpu_context.get());
+
+  internal::ExceptionSnapshotWin snapshot;
+  ASSERT_TRUE(snapshot.Initialize(
+      &process_reader,
+      GetCurrentThreadId(),
+      reinterpret_cast<WinVMAddress>(exception_pointers.get()),
+      nullptr));
+
+  EXPECT_EQ(STATUS_FATAL_APP_EXIT, snapshot.Exception());
+  EXPECT_EQ(static_cast<uint32_t>(EXCEPTION_NONCONTINUABLE),
+            snapshot.ExceptionInfo());
+  EXPECT_EQ(0xFA15Eu, snapshot.ExceptionAddress());
+  EXPECT_EQ(static_cast<size_t>(EXCEPTION_MAXIMUM_PARAMETERS),
+            snapshot.Codes().size());
+  for (size_t i = 0; i < EXCEPTION_MAXIMUM_PARAMETERS; ++i) {
+    EXPECT_EQ(1000 + i, snapshot.Codes()[i]);
+  }
+}
+
 }  // namespace
 }  // namespace test
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/snapshot/win/extra_memory_ranges_test.cc b/extern/crashpad/crashpad/snapshot/win/extra_memory_ranges_test.cc
index e0c17a209a..ec9719814e 100644
--- a/extern/crashpad/crashpad/snapshot/win/extra_memory_ranges_test.cc
+++ b/extern/crashpad/crashpad/snapshot/win/extra_memory_ranges_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
+// Copyright 2016 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/win/memory_map_region_snapshot_win.cc b/extern/crashpad/crashpad/snapshot/win/memory_map_region_snapshot_win.cc
index c64254c680..79d17504b3 100644
--- a/extern/crashpad/crashpad/snapshot/win/memory_map_region_snapshot_win.cc
+++ b/extern/crashpad/crashpad/snapshot/win/memory_map_region_snapshot_win.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/win/memory_map_region_snapshot_win.h b/extern/crashpad/crashpad/snapshot/win/memory_map_region_snapshot_win.h
index 725c12565e..003b69a180 100644
--- a/extern/crashpad/crashpad/snapshot/win/memory_map_region_snapshot_win.h
+++ b/extern/crashpad/crashpad/snapshot/win/memory_map_region_snapshot_win.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/win/module_snapshot_win.cc b/extern/crashpad/crashpad/snapshot/win/module_snapshot_win.cc
index fe16bb91d2..1d901c0cfe 100644
--- a/extern/crashpad/crashpad/snapshot/win/module_snapshot_win.cc
+++ b/extern/crashpad/crashpad/snapshot/win/module_snapshot_win.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/win/module_snapshot_win.h b/extern/crashpad/crashpad/snapshot/win/module_snapshot_win.h
index 5b375f431e..fb54add74c 100644
--- a/extern/crashpad/crashpad/snapshot/win/module_snapshot_win.h
+++ b/extern/crashpad/crashpad/snapshot/win/module_snapshot_win.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/win/module_snapshot_win_test.cc b/extern/crashpad/crashpad/snapshot/win/module_snapshot_win_test.cc
index d9786cfd1c..5de926ab35 100644
--- a/extern/crashpad/crashpad/snapshot/win/module_snapshot_win_test.cc
+++ b/extern/crashpad/crashpad/snapshot/win/module_snapshot_win_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/win/pe_image_annotations_reader.cc b/extern/crashpad/crashpad/snapshot/win/pe_image_annotations_reader.cc
index 494b339804..28149c7246 100644
--- a/extern/crashpad/crashpad/snapshot/win/pe_image_annotations_reader.cc
+++ b/extern/crashpad/crashpad/snapshot/win/pe_image_annotations_reader.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,7 +17,8 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "client/annotation.h"
@@ -157,8 +158,7 @@ void PEImageAnnotationsReader::ReadCrashpadAnnotationsList(
     snapshot.type = current.type;
 
     char name[Annotation::kNameMaxLength];
-    if (!process_reader_->Memory()->Read(
-            current.name, base::size(name), name)) {
+    if (!process_reader_->Memory()->Read(current.name, std::size(name), name)) {
       LOG(WARNING) << "could not read annotation name at index " << index
                    << " in " << base::WideToUTF8(name_);
       continue;
diff --git a/extern/crashpad/crashpad/snapshot/win/pe_image_annotations_reader.h b/extern/crashpad/crashpad/snapshot/win/pe_image_annotations_reader.h
index 97b1e8feab..0868391fde 100644
--- a/extern/crashpad/crashpad/snapshot/win/pe_image_annotations_reader.h
+++ b/extern/crashpad/crashpad/snapshot/win/pe_image_annotations_reader.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/win/pe_image_reader.cc b/extern/crashpad/crashpad/snapshot/win/pe_image_reader.cc
index bc4511b376..5ca53f2f24 100644
--- a/extern/crashpad/crashpad/snapshot/win/pe_image_reader.cc
+++ b/extern/crashpad/crashpad/snapshot/win/pe_image_reader.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,9 +18,9 @@
 #include <string.h>
 
 #include <algorithm>
-#include <memory>
+#include <iterator>
 
-#include "base/cxx17_backports.h"
+#include "base/containers/heap_array.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "client/crashpad_info.h"
@@ -183,17 +183,17 @@ bool PEImageReader::DebugDirectoryInformation(UUID* uuid,
         continue;
       }
 
-      std::unique_ptr<char[]> data(new char[debug_directory.SizeOfData]);
+      auto data = base::HeapArray<char>::Uninit(debug_directory.SizeOfData);
       if (!module_subrange_reader_.ReadMemory(
               Address() + debug_directory.AddressOfRawData,
-              debug_directory.SizeOfData,
-              data.get())) {
+              data.size(),
+              data.data())) {
         LOG(WARNING) << "could not read debug directory from "
                      << module_subrange_reader_.name();
         return false;
       }
 
-      if (*reinterpret_cast<DWORD*>(data.get()) !=
+      if (*reinterpret_cast<DWORD*>(data.data()) !=
           CodeViewRecordPDB70::kSignature) {
         LOG(WARNING) << "encountered non-7.0 CodeView debug record in "
                      << module_subrange_reader_.name();
@@ -201,7 +201,7 @@ bool PEImageReader::DebugDirectoryInformation(UUID* uuid,
       }
 
       CodeViewRecordPDB70* codeview =
-          reinterpret_cast<CodeViewRecordPDB70*>(data.get());
+          reinterpret_cast<CodeViewRecordPDB70*>(data.data());
       *uuid = codeview->uuid;
       *age = codeview->age;
       // This is a NUL-terminated string encoded in the codepage of the system
@@ -288,7 +288,7 @@ bool PEImageReader::VSFixedFileInfo(
       version_info.wType != 0 ||
       wcsncmp(version_info.szKey,
               L"VS_VERSION_INFO",
-              base::size(version_info.szKey)) != 0) {
+              std::size(version_info.szKey)) != 0) {
     LOG(WARNING) << "unexpected VS_VERSIONINFO in "
                  << module_subrange_reader_.name();
     return false;
diff --git a/extern/crashpad/crashpad/snapshot/win/pe_image_reader.h b/extern/crashpad/crashpad/snapshot/win/pe_image_reader.h
index a2bd28ecc1..70198638c3 100644
--- a/extern/crashpad/crashpad/snapshot/win/pe_image_reader.h
+++ b/extern/crashpad/crashpad/snapshot/win/pe_image_reader.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/win/pe_image_reader_test.cc b/extern/crashpad/crashpad/snapshot/win/pe_image_reader_test.cc
index e364ed732c..7d67029569 100644
--- a/extern/crashpad/crashpad/snapshot/win/pe_image_reader_test.cc
+++ b/extern/crashpad/crashpad/snapshot/win/pe_image_reader_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/win/pe_image_resource_reader.cc b/extern/crashpad/crashpad/snapshot/win/pe_image_resource_reader.cc
index f373945235..c0b21be1c3 100644
--- a/extern/crashpad/crashpad/snapshot/win/pe_image_resource_reader.cc
+++ b/extern/crashpad/crashpad/snapshot/win/pe_image_resource_reader.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/win/pe_image_resource_reader.h b/extern/crashpad/crashpad/snapshot/win/pe_image_resource_reader.h
index a8468db7ca..fe5a9740f2 100644
--- a/extern/crashpad/crashpad/snapshot/win/pe_image_resource_reader.h
+++ b/extern/crashpad/crashpad/snapshot/win/pe_image_resource_reader.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/win/process_reader_win.cc b/extern/crashpad/crashpad/snapshot/win/process_reader_win.cc
index e3784caefc..469d789c28 100644
--- a/extern/crashpad/crashpad/snapshot/win/process_reader_win.cc
+++ b/extern/crashpad/crashpad/snapshot/win/process_reader_win.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,13 +19,19 @@
 
 #include <memory>
 
+#include "base/check_op.h"
+#include "base/notreached.h"
 #include "base/numerics/safe_conversions.h"
+#include "base/strings/utf_string_conversions.h"
+#include "snapshot/win/cpu_context_win.h"
 #include "util/misc/capture_context.h"
 #include "util/misc/time.h"
+#include "util/win/get_function.h"
 #include "util/win/nt_internals.h"
 #include "util/win/ntstatus_logging.h"
 #include "util/win/process_structs.h"
 #include "util/win/scoped_handle.h"
+#include "util/win/scoped_local_alloc.h"
 
 namespace crashpad {
 
@@ -143,7 +149,7 @@ bool FillThreadContextAndSuspendCount(HANDLE thread_handle,
     DCHECK(suspension_state == ProcessSuspensionState::kRunning);
     thread->suspend_count = 0;
     DCHECK(!is_64_reading_32);
-    CaptureContext(&thread->context.native);
+    thread->context.InitializeFromCurrentThread();
   } else {
     DWORD previous_suspend_count = SuspendThread(thread_handle);
     if (previous_suspend_count == static_cast<DWORD>(-1)) {
@@ -162,26 +168,25 @@ bool FillThreadContextAndSuspendCount(HANDLE thread_handle,
           (suspension_state == ProcessSuspensionState::kSuspended ? 1 : 0);
     }
 
-    memset(&thread->context, 0, sizeof(thread->context));
 #if defined(ARCH_CPU_32_BITS)
-    const bool is_native = true;
-#elif defined(ARCH_CPU_64_BITS)
-    const bool is_native = !is_64_reading_32;
+    if (!thread->context.InitializeNative(thread_handle))
+      return false;
+#endif  // ARCH_CPU_32_BITS
+
+#if defined(ARCH_CPU_64_BITS)
     if (is_64_reading_32) {
-      thread->context.wow64.ContextFlags = CONTEXT_ALL;
-      if (!Wow64GetThreadContext(thread_handle, &thread->context.wow64)) {
-        PLOG(ERROR) << "Wow64GetThreadContext";
+      if (!thread->context.InitializeWow64(thread_handle))
         return false;
-      }
-    }
-#endif
-    if (is_native) {
-      thread->context.native.ContextFlags = CONTEXT_ALL;
-      if (!GetThreadContext(thread_handle, &thread->context.native)) {
-        PLOG(ERROR) << "GetThreadContext";
+#if defined(ARCH_CPU_X86_64)
+    } else if (IsXStateFeatureEnabled(XSTATE_MASK_CET_U)) {
+      if (!thread->context.InitializeXState(thread_handle, XSTATE_MASK_CET_U))
+        return false;
+#endif  // ARCH_CPU_X86_64
+    } else {
+      if (!thread->context.InitializeNative(thread_handle))
         return false;
-      }
     }
+#endif  // ARCH_CPU_64_BITS
 
     if (!ResumeThread(thread_handle)) {
       PLOG(ERROR) << "ResumeThread";
@@ -194,8 +199,85 @@ bool FillThreadContextAndSuspendCount(HANDLE thread_handle,
 
 }  // namespace
 
+ProcessReaderWin::ThreadContext::ThreadContext()
+    : offset_(0), initialized_(false), data_() {}
+
+void ProcessReaderWin::ThreadContext::InitializeFromCurrentThread() {
+  data_.resize(sizeof(CONTEXT));
+  initialized_ = true;
+  CaptureContext(context<CONTEXT>());
+}
+
+bool ProcessReaderWin::ThreadContext::InitializeNative(HANDLE thread_handle) {
+  data_.resize(sizeof(CONTEXT));
+  initialized_ = true;
+  context<CONTEXT>()->ContextFlags = CONTEXT_ALL;
+  if (!GetThreadContext(thread_handle, context<CONTEXT>())) {
+    PLOG(ERROR) << "GetThreadContext";
+    return false;
+  }
+  return true;
+}
+
+#if defined(ARCH_CPU_64_BITS)
+bool ProcessReaderWin::ThreadContext::InitializeWow64(HANDLE thread_handle) {
+  data_.resize(sizeof(WOW64_CONTEXT));
+  initialized_ = true;
+  context<WOW64_CONTEXT>()->ContextFlags = CONTEXT_ALL;
+  if (!Wow64GetThreadContext(thread_handle, context<WOW64_CONTEXT>())) {
+    PLOG(ERROR) << "Wow64GetThreadContext";
+    return false;
+  }
+  return true;
+}
+#endif
+
+#if defined(ARCH_CPU_X86_64)
+bool ProcessReaderWin::ThreadContext::InitializeXState(
+    HANDLE thread_handle,
+    ULONG64 XStateCompactionMask) {
+  // InitializeContext2 needs Windows 10 build 20348.
+  static const auto initialize_context_2 =
+      GET_FUNCTION(L"kernel32.dll", ::InitializeContext2);
+  if (!initialize_context_2)
+    return false;
+  // We want CET_U xstate to get the ssp, only possible when supported.
+  PCONTEXT ret_context = nullptr;
+  DWORD context_size = 0;
+  if (!initialize_context_2(nullptr,
+                            CONTEXT_ALL | CONTEXT_XSTATE,
+                            &ret_context,
+                            &context_size,
+                            XStateCompactionMask) &&
+      GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
+    PLOG(ERROR) << "InitializeContext2 - getting required size";
+    return false;
+  }
+  // NB: ret_context may not be data.begin().
+  data_.resize(context_size);
+  if (!initialize_context_2(data_.data(),
+                            CONTEXT_ALL | CONTEXT_XSTATE,
+                            &ret_context,
+                            &context_size,
+                            XStateCompactionMask)) {
+    PLOG(ERROR) << "InitializeContext2 - initializing";
+    return false;
+  }
+  offset_ = reinterpret_cast<unsigned char*>(ret_context) - data_.data();
+  initialized_ = true;
+
+  if (!GetThreadContext(thread_handle, ret_context)) {
+    PLOG(ERROR) << "GetThreadContext";
+    return false;
+  }
+
+  return true;
+}
+#endif  // defined(ARCH_CPU_X86_64)
+
 ProcessReaderWin::Thread::Thread()
     : context(),
+      name(),
       id(0),
       teb_address(0),
       teb_size(0),
@@ -203,8 +285,7 @@ ProcessReaderWin::Thread::Thread()
       stack_region_size(0),
       suspend_count(0),
       priority_class(0),
-      priority(0) {
-}
+      priority(0) {}
 
 ProcessReaderWin::ProcessReaderWin()
     : process_(INVALID_HANDLE_VALUE),
@@ -381,6 +462,21 @@ void ProcessReaderWin::ReadThreadData(bool is_64_reading_32) {
         thread.stack_region_size = base - limit;
       }
     }
+    // On Windows 10 build 1607 and later, read the thread name.
+    static const auto get_thread_description =
+        GET_FUNCTION(L"kernel32.dll", ::GetThreadDescription);
+    if (get_thread_description) {
+      wchar_t* thread_description;
+      HRESULT hr =
+          get_thread_description(thread_handle.get(), &thread_description);
+      if (SUCCEEDED(hr)) {
+        ScopedLocalAlloc thread_description_owner(thread_description);
+        thread.name = base::WideToUTF8(thread_description);
+      } else {
+        LOG(WARNING) << "GetThreadDescription: "
+                     << logging::SystemErrorCodeToString(hr);
+      }
+    }
     threads_.push_back(thread);
   }
 }
diff --git a/extern/crashpad/crashpad/snapshot/win/process_reader_win.h b/extern/crashpad/crashpad/snapshot/win/process_reader_win.h
index 7875de0412..4cfff5a968 100644
--- a/extern/crashpad/crashpad/snapshot/win/process_reader_win.h
+++ b/extern/crashpad/crashpad/snapshot/win/process_reader_win.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 #include <windows.h>
 #include <sys/time.h>
 
+#include <string>
 #include <vector>
 
 #include "build/build_config.h"
@@ -40,17 +41,44 @@ enum class ProcessSuspensionState : bool {
 //! \brief Accesses information about another process, identified by a `HANDLE`.
 class ProcessReaderWin {
  public:
+  //! \brief Helper to make the context copyable and resizable.
+  class ThreadContext {
+   public:
+    ThreadContext();
+    ~ThreadContext() {}
+
+    template <typename T>
+    T* context() const {
+      DCHECK(initialized_);
+      return reinterpret_cast<T*>(
+          const_cast<unsigned char*>(data_.data() + offset_));
+    }
+#if defined(ARCH_CPU_64_BITS)
+    bool InitializeWow64(HANDLE thread_handle);
+#endif  // ARCH_CPU_64_BITS
+#if defined(ARCH_CPU_X86_64)
+    // Initializes internal structures for extended compacted contexts.
+    bool InitializeXState(HANDLE thread_handle, ULONG64 XStateCompactionMask);
+#endif  // ARCH_CPU_X86_64
+    void InitializeFromCurrentThread();
+    bool InitializeNative(HANDLE thread_handle);
+
+   private:
+    // This is usually 0 but Windows might cause it to be positive when
+    // fetching the extended context. This needs to be adjusted after
+    // calls to InitializeContext2().
+    size_t offset_;
+    bool initialized_;
+    std::vector<unsigned char> data_;
+  };
+
   //! \brief Contains information about a thread that belongs to a process.
   struct Thread {
     Thread();
     ~Thread() {}
 
-    union {
-      CONTEXT native;
-#if defined(ARCH_CPU_64_BITS)
-      WOW64_CONTEXT wow64;
-#endif
-    } context;
+    ThreadContext context;
+    std::string name;
     uint64_t id;
     WinVMAddress teb_address;
     WinVMSize teb_size;
diff --git a/extern/crashpad/crashpad/snapshot/win/process_reader_win_test.cc b/extern/crashpad/crashpad/snapshot/win/process_reader_win_test.cc
index 68933bbe63..412cf1205b 100644
--- a/extern/crashpad/crashpad/snapshot/win/process_reader_win_test.cc
+++ b/extern/crashpad/crashpad/snapshot/win/process_reader_win_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,8 +17,18 @@
 #include <windows.h>
 #include <string.h>
 
-#include "base/cxx17_backports.h"
+#include <algorithm>
+#include <array>
+#include <iterator>
+#include <set>
+#include <string>
+
+#include "base/strings/stringprintf.h"
+#include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
+#include "gmock/gmock.h"
 #include "gtest/gtest.h"
+#include "test/scoped_set_thread_name.h"
 #include "test/win/win_multiprocess.h"
 #include "util/misc/from_pointer_cast.h"
 #include "util/synchronization/semaphore.h"
@@ -30,6 +40,8 @@ namespace crashpad {
 namespace test {
 namespace {
 
+using ::testing::IsSupersetOf;
+
 TEST(ProcessReaderWin, SelfBasic) {
   ProcessReaderWin process_reader;
   ASSERT_TRUE(process_reader.Initialize(GetCurrentProcess(),
@@ -44,7 +56,7 @@ TEST(ProcessReaderWin, SelfBasic) {
   EXPECT_EQ(process_reader.GetProcessInfo().ProcessID(), GetCurrentProcessId());
 
   static constexpr char kTestMemory[] = "Some test memory";
-  char buffer[base::size(kTestMemory)];
+  char buffer[std::size(kTestMemory)];
   ASSERT_TRUE(process_reader.Memory()->Read(
       reinterpret_cast<uintptr_t>(kTestMemory), sizeof(kTestMemory), &buffer));
   EXPECT_STREQ(kTestMemory, buffer);
@@ -97,6 +109,7 @@ TEST(ProcessReaderWin, ChildBasic) {
 }
 
 TEST(ProcessReaderWin, SelfOneThread) {
+  const ScopedSetThreadName scoped_set_thread_name("SelfBasic");
   ProcessReaderWin process_reader;
   ASSERT_TRUE(process_reader.Initialize(GetCurrentProcess(),
                                         ProcessSuspensionState::kRunning));
@@ -110,7 +123,11 @@ TEST(ProcessReaderWin, SelfOneThread) {
   ASSERT_GE(threads.size(), 1u);
 
   EXPECT_EQ(threads[0].id, GetCurrentThreadId());
-  EXPECT_NE(ProgramCounterFromCONTEXT(&threads[0].context.native), nullptr);
+  if (ScopedSetThreadName::IsSupported()) {
+    EXPECT_EQ(threads[0].name, "SelfBasic");
+  }
+  EXPECT_NE(ProgramCounterFromCONTEXT(threads[0].context.context<CONTEXT>()),
+            nullptr);
   EXPECT_EQ(threads[0].suspend_count, 0u);
 }
 
@@ -130,18 +147,21 @@ class ProcessReaderChildThreadSuspendCount final : public WinMultiprocess {
 
   class SleepingThread : public Thread {
    public:
-    SleepingThread() : done_(nullptr) {}
+    explicit SleepingThread(const std::string& thread_name)
+        : done_(nullptr), thread_name_(thread_name) {}
 
     void SetHandle(Semaphore* done) {
       done_= done;
     }
 
     void ThreadMain() override {
+      const ScopedSetThreadName scoped_set_thread_name(thread_name_);
       done_->Wait();
     }
 
    private:
     Semaphore* done_;
+    const std::string thread_name_;
   };
 
   void WinMultiprocessParent() override {
@@ -156,8 +176,31 @@ class ProcessReaderChildThreadSuspendCount final : public WinMultiprocess {
 
       const auto& threads = process_reader.Threads();
       ASSERT_GE(threads.size(), kCreatedThreads + 1);
-      for (const auto& thread : threads)
+
+      for (const auto& thread : threads) {
         EXPECT_EQ(thread.suspend_count, 0u);
+      }
+
+      if (ScopedSetThreadName::IsSupported()) {
+        EXPECT_EQ(threads[0].name, "WinMultiprocessChild-Main");
+
+        const std::set<std::string> expected_thread_names = {
+            "WinMultiprocessChild-1",
+            "WinMultiprocessChild-2",
+            "WinMultiprocessChild-3",
+        };
+        // Windows can create threads besides the ones created in
+        // WinMultiprocessChild(), so keep track of the (non-main) thread names
+        // and make sure all the expected names are present.
+        std::set<std::string> thread_names;
+        for (size_t i = 1; i < threads.size(); i++) {
+          if (!threads[i].name.empty()) {
+            thread_names.emplace(threads[i].name);
+          }
+        }
+
+        EXPECT_THAT(thread_names, IsSupersetOf(expected_thread_names));
+      }
     }
 
     {
@@ -171,15 +214,23 @@ class ProcessReaderChildThreadSuspendCount final : public WinMultiprocess {
       // suspended.
       const auto& threads = process_reader.Threads();
       ASSERT_GE(threads.size(), kCreatedThreads + 1);
-      for (const auto& thread : threads)
+      for (const auto& thread : threads) {
         EXPECT_EQ(thread.suspend_count, 0u);
+      }
     }
   }
 
   void WinMultiprocessChild() override {
+    const ScopedSetThreadName scoped_set_thread_name(
+        "WinMultiprocessChild-Main");
+
     // Create three dummy threads so we can confirm we read successfully read
     // more than just the main thread.
-    SleepingThread threads[kCreatedThreads];
+    std::array<SleepingThread, kCreatedThreads> threads = {
+        SleepingThread(std::string("WinMultiprocessChild-1")),
+        SleepingThread(std::string("WinMultiprocessChild-2")),
+        SleepingThread(std::string("WinMultiprocessChild-3")),
+    };
     Semaphore done(0);
     for (auto& thread : threads)
       thread.SetHandle(&done);
@@ -193,7 +244,7 @@ class ProcessReaderChildThreadSuspendCount final : public WinMultiprocess {
     // the pipe.
     CheckedReadFileAtEOF(ReadPipeHandle());
 
-    for (size_t i = 0; i < base::size(threads); ++i)
+    for (size_t i = 0; i < std::size(threads); ++i)
       done.Signal();
     for (auto& thread : threads)
       thread.Join();
diff --git a/extern/crashpad/crashpad/snapshot/win/process_snapshot_win.cc b/extern/crashpad/crashpad/snapshot/win/process_snapshot_win.cc
index 21df191a5d..6c06165f68 100644
--- a/extern/crashpad/crashpad/snapshot/win/process_snapshot_win.cc
+++ b/extern/crashpad/crashpad/snapshot/win/process_snapshot_win.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,9 +18,10 @@
 #include <wchar.h>
 
 #include <algorithm>
+#include <iterator>
+#include <string_view>
 #include <utility>
 
-#include "base/cxx17_backports.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ -45,8 +46,7 @@ ProcessSnapshotWin::ProcessSnapshotWin()
       annotations_simple_map_(),
       snapshot_time_(),
       options_(),
-      initialized_() {
-}
+      initialized_() {}
 
 ProcessSnapshotWin::~ProcessSnapshotWin() {
 }
@@ -63,6 +63,26 @@ bool ProcessSnapshotWin::Initialize(
   if (!process_reader_.Initialize(process, suspension_state))
     return false;
 
+  client_id_.InitializeToZero();
+  system_.Initialize(&process_reader_);
+
+  if (process_reader_.Is64Bit()) {
+    InitializePebData<process_types::internal::Traits64>(
+        debug_critical_section_address);
+  } else {
+    InitializePebData<process_types::internal::Traits32>(
+        debug_critical_section_address);
+  }
+
+  InitializeModules();
+  InitializeUnloadedModules();
+
+  GetCrashpadOptionsInternal(&options_);
+  uint32_t* budget_remaining_pointer =
+      options_.gather_indirectly_referenced_memory == TriState::kEnabled
+          ? &options_.indirectly_referenced_memory_cap
+          : nullptr;
+
   if (exception_information_address != 0) {
     ExceptionInformation exception_information = {};
     if (!process_reader_.Memory()->Read(exception_information_address,
@@ -75,31 +95,14 @@ bool ProcessSnapshotWin::Initialize(
     exception_.reset(new internal::ExceptionSnapshotWin());
     if (!exception_->Initialize(&process_reader_,
                                 exception_information.thread_id,
-                                exception_information.exception_pointers)) {
+                                exception_information.exception_pointers,
+                                budget_remaining_pointer)) {
       exception_.reset();
       return false;
     }
   }
 
-
-  system_.Initialize(&process_reader_);
-
-  if (process_reader_.Is64Bit()) {
-    InitializePebData<process_types::internal::Traits64>(
-        debug_critical_section_address);
-  } else {
-    InitializePebData<process_types::internal::Traits32>(
-        debug_critical_section_address);
-  }
-
-  InitializeModules();
-  InitializeUnloadedModules();
-
-  GetCrashpadOptionsInternal(&options_);
-
-  InitializeThreads(
-      options_.gather_indirectly_referenced_memory == TriState::kEnabled,
-      options_.indirectly_referenced_memory_cap);
+  InitializeThreads(budget_remaining_pointer);
 
   for (const MEMORY_BASIC_INFORMATION64& mbi :
        process_reader_.GetProcessInfo().MemoryInfo()) {
@@ -239,15 +242,9 @@ const ProcessMemory* ProcessSnapshotWin::Memory() const {
   return process_reader_.Memory();
 }
 
-void ProcessSnapshotWin::InitializeThreads(
-    bool gather_indirectly_referenced_memory,
-    uint32_t indirectly_referenced_memory_cap) {
+void ProcessSnapshotWin::InitializeThreads(uint32_t* budget_remaining_pointer) {
   const std::vector<ProcessReaderWin::Thread>& process_reader_threads =
       process_reader_.Threads();
-  uint32_t* budget_remaining_pointer = nullptr;
-  uint32_t budget_remaining = indirectly_referenced_memory_cap;
-  if (gather_indirectly_referenced_memory)
-    budget_remaining_pointer = &budget_remaining;
   for (const ProcessReaderWin::Thread& process_reader_thread :
        process_reader_threads) {
     auto thread = std::make_unique<internal::ThreadSnapshotWin>();
@@ -333,9 +330,9 @@ void ProcessSnapshotWin::InitializeUnloadedModules() {
           uet.SizeOfImage,
           uet.CheckSum,
           uet.TimeDateStamp,
-          base::WideToUTF8(base::WStringPiece(
+          base::WideToUTF8(std::wstring_view(
               uet.ImageName,
-              wcsnlen(uet.ImageName, base::size(uet.ImageName))))));
+              wcsnlen(uet.ImageName, std::size(uet.ImageName))))));
     }
   }
 }
@@ -535,9 +532,9 @@ WinVMSize ProcessSnapshotWin::DetermineSizeOfEnvironmentBlock(
   env_block.resize(
       static_cast<unsigned int>(bytes_read / sizeof(env_block[0])));
   static constexpr wchar_t terminator[] = {0, 0};
-  size_t at = env_block.find(std::wstring(terminator, base::size(terminator)));
+  size_t at = env_block.find(std::wstring(terminator, std::size(terminator)));
   if (at != std::wstring::npos)
-    env_block.resize(at + base::size(terminator));
+    env_block.resize(at + std::size(terminator));
 
   return env_block.size() * sizeof(env_block[0]);
 }
diff --git a/extern/crashpad/crashpad/snapshot/win/process_snapshot_win.h b/extern/crashpad/crashpad/snapshot/win/process_snapshot_win.h
index 7a8ae2fd3f..35c13610de 100644
--- a/extern/crashpad/crashpad/snapshot/win/process_snapshot_win.h
+++ b/extern/crashpad/crashpad/snapshot/win/process_snapshot_win.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -137,8 +137,7 @@ class ProcessSnapshotWin final : public ProcessSnapshot {
 
  private:
   // Initializes threads_ on behalf of Initialize().
-  void InitializeThreads(bool gather_indirectly_referenced_memory,
-                         uint32_t indirectly_referenced_memory_cap);
+  void InitializeThreads(uint32_t* indirectly_referenced_memory_cap);
 
   // Initializes modules_ on behalf of Initialize().
   void InitializeModules();
diff --git a/extern/crashpad/crashpad/snapshot/win/process_snapshot_win_test.cc b/extern/crashpad/crashpad/snapshot/win/process_snapshot_win_test.cc
index e1bfebbee0..1bc56ed373 100644
--- a/extern/crashpad/crashpad/snapshot/win/process_snapshot_win_test.cc
+++ b/extern/crashpad/crashpad/snapshot/win/process_snapshot_win_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -100,10 +100,10 @@ void TestImageReaderChild(const TestPaths::Architecture architecture) {
       }
     }
 
-    // Confirm that less than 1M of extra data was gathered. The cap is set to
+    // Confirm that less than 1.2M of extra data was gathered. The cap is set to
     // only 100K, but there are other "extra memory" regions that aren't
     // included in the cap. (Completely uncapped it would be > 10M.)
-    EXPECT_LT(extra_memory_total, 1000000u);
+    EXPECT_LT(extra_memory_total, 1200000u);
   }
 
   // Tell the child it can terminate.
diff --git a/extern/crashpad/crashpad/snapshot/win/process_subrange_reader.cc b/extern/crashpad/crashpad/snapshot/win/process_subrange_reader.cc
index 124c5d023b..4651a66ef9 100644
--- a/extern/crashpad/crashpad/snapshot/win/process_subrange_reader.cc
+++ b/extern/crashpad/crashpad/snapshot/win/process_subrange_reader.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/win/process_subrange_reader.h b/extern/crashpad/crashpad/snapshot/win/process_subrange_reader.h
index bcdff5e21f..515368ea06 100644
--- a/extern/crashpad/crashpad/snapshot/win/process_subrange_reader.h
+++ b/extern/crashpad/crashpad/snapshot/win/process_subrange_reader.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/win/system_snapshot_win.cc b/extern/crashpad/crashpad/snapshot/win/system_snapshot_win.cc
index 905976d8b2..160c41d801 100644
--- a/extern/crashpad/crashpad/snapshot/win/system_snapshot_win.cc
+++ b/extern/crashpad/crashpad/snapshot/win/system_snapshot_win.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,11 +14,14 @@
 
 #include "snapshot/win/system_snapshot_win.h"
 
-#include <windows.h>
 #include <intrin.h>
 #include <powrprof.h>
+#include <windows.h>
 #include <winnt.h>
 
+// Must be after windows.h.
+#include <versionhelpers.h>
+
 #include <algorithm>
 #include <utility>
 #include <vector>
@@ -30,6 +33,7 @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
+#include "util/stdlib/string_number_conversion.h"
 #include "util/win/module_version.h"
 #include "util/win/scoped_registry_key.h"
 
@@ -67,6 +71,50 @@ std::string GetStringForFileOS(uint32_t file_os) {
     return "Unknown";
 }
 
+//! \brief Reads a DWORD from the registry and returns it as an int.
+bool ReadRegistryDWORD(HKEY key, const wchar_t* name, int* out_value) {
+  DWORD type;
+  DWORD local_value;
+  DWORD size = sizeof(local_value);
+  if (RegQueryValueExW(key,
+                       name,
+                       nullptr,
+                       &type,
+                       reinterpret_cast<BYTE*>(&local_value),
+                       &size) == ERROR_SUCCESS &&
+      type == REG_DWORD) {
+    *out_value = static_cast<int>(local_value);
+    return true;
+  }
+  return false;
+}
+
+//! \brief Reads a string from the registry and returns it as an int.
+bool ReadRegistryDWORDFromSZ(HKEY key, const char* name, int* out_value) {
+  char string_value[11];
+  DWORD type;
+  // Leave space for a terminating zero.
+  DWORD size = sizeof(string_value) - sizeof(string_value[0]);
+  // Use the 'A' version of this function so that we can use
+  // StringToNumber.
+  if (RegQueryValueExA(key,
+                       name,
+                       nullptr,
+                       &type,
+                       reinterpret_cast<BYTE*>(&string_value),
+                       &size) == ERROR_SUCCESS &&
+      type == REG_SZ) {
+    // Make sure the string is null-terminated.
+    string_value[size / sizeof(string_value[0])] = '\0';
+    unsigned local_value;
+    if (StringToNumber(string_value, &local_value)) {
+      *out_value = local_value;
+      return true;
+    }
+  }
+  return false;
+}
+
 }  // namespace
 
 namespace internal {
@@ -89,16 +137,50 @@ void SystemSnapshotWin::Initialize(ProcessReaderWin* process_reader) {
 
   process_reader_ = process_reader;
 
-  // We use both GetVersionEx() and GetModuleVersionAndType() (which uses
-  // VerQueryValue() internally). GetVersionEx() is not trustworthy after
-  // Windows 8 (depending on the application manifest) so its data is used only
-  // to fill the os_server_ field, and the rest comes from the version
-  // information stamped on kernel32.dll.
-  OSVERSIONINFOEX version_info = {sizeof(version_info)};
-  if (!GetVersionEx(reinterpret_cast<OSVERSIONINFO*>(&version_info))) {
-    PLOG(WARNING) << "GetVersionEx";
-  } else {
-    os_server_ = version_info.wProductType != VER_NT_WORKSTATION;
+  // We use both IsWindowsServer() (which uses VerifyVersionInfo() internally)
+  // and GetModuleVersionAndType() (which uses VerQueryValue() internally).
+  // VerifyVersionInfo() is not trustworthy after Windows 8 (depending on the
+  // application manifest) so its data is used only to fill the os_server_
+  // field, and the rest comes from the version information stamped on
+  // kernel32.dll and from the registry.
+  os_server_ = IsWindowsServer();
+
+  // kernel32.dll used to be a good way to get a non-lying version number, but
+  // kernel32.dll has been refactored into multiple DLLs so it sometimes does
+  // not get updated when a new version of Windows ships, especially on
+  // Windows 11. Additionally, pairs of releases such as 19041/19042
+  // (20H1/20H2) actually have identical code and have their differences
+  // enabled by a configuration setting. Therefore the recommended way to get
+  // OS version information on recent versions of Windows is to read it from the
+  // registry. If any of the version-number components are missing from the
+  // registry (on Windows 7, for instance) then kernel32.dll is used as a
+  // fallback.
+  bool version_data_found = false;
+  int os_version_build = 0;
+  HKEY key;
+  if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,
+                    L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion",
+                    0,
+                    KEY_QUERY_VALUE,
+                    &key) == ERROR_SUCCESS) {
+    ScopedRegistryKey scoped_key(key);
+
+    // Read the four components of the version from the registry.
+    // UBR apparently stands for Update Build Revision and it goes up every
+    // month when patches are installed. The full version is stored in the
+    // registry as:
+    // CurrentMajorVersionNumber.CurrentMinorVersionNumber.CurrentBuildNumber.UBR
+    if (ReadRegistryDWORD(
+            key, L"CurrentMajorVersionNumber", &os_version_major_) &&
+        ReadRegistryDWORD(
+            key, L"CurrentMinorVersionNumber", &os_version_minor_) &&
+        ReadRegistryDWORDFromSZ(
+            key, "CurrentBuildNumber", &os_version_bugfix_) &&
+        ReadRegistryDWORD(key, L"UBR", &os_version_build)) {
+      // Since we found all four components in the registry we don't need
+      // to read them from kernel32.dll.
+      version_data_found = true;
+    }
   }
 
   static constexpr wchar_t kSystemDll[] = L"kernel32.dll";
@@ -106,10 +188,15 @@ void SystemSnapshotWin::Initialize(ProcessReaderWin* process_reader) {
   if (GetModuleVersionAndType(base::FilePath(kSystemDll), &ffi)) {
     std::string flags_string = GetStringForFileFlags(ffi.dwFileFlags);
     std::string os_name = GetStringForFileOS(ffi.dwFileOS);
-    os_version_major_ = ffi.dwFileVersionMS >> 16;
-    os_version_minor_ = ffi.dwFileVersionMS & 0xffff;
-    os_version_bugfix_ = ffi.dwFileVersionLS >> 16;
-    os_version_build_ = base::StringPrintf("%lu", ffi.dwFileVersionLS & 0xffff);
+    if (!version_data_found) {
+      os_version_major_ = ffi.dwFileVersionMS >> 16;
+      os_version_minor_ = ffi.dwFileVersionMS & 0xffff;
+      os_version_bugfix_ = ffi.dwFileVersionLS >> 16;
+      os_version_build = static_cast<int>(ffi.dwFileVersionLS & 0xffff);
+    }
+
+    os_version_build_ = base::StringPrintf("%u", os_version_build);
+
     os_version_full_ = base::StringPrintf(
         "%s %u.%u.%u.%s%s",
         os_name.c_str(),
@@ -195,11 +282,11 @@ std::string SystemSnapshotWin::CPUVendor() const {
 #elif defined(ARCH_CPU_ARM64)
   HKEY key;
 
-  if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,
-                   L"HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0",
-                   0,
-                   KEY_QUERY_VALUE,
-                   &key) != ERROR_SUCCESS) {
+  if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,
+                    L"HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0",
+                    0,
+                    KEY_QUERY_VALUE,
+                    &key) != ERROR_SUCCESS) {
     return std::string();
   }
 
@@ -274,7 +361,6 @@ uint32_t SystemSnapshotWin::CPUX86Signature() const {
   return cpu_info[0];
 #else
   NOTREACHED();
-  return 0;
 #endif
 }
 
@@ -289,7 +375,6 @@ uint64_t SystemSnapshotWin::CPUX86Features() const {
          static_cast<uint64_t>(cpu_info[3]);
 #else
   NOTREACHED();
-  return 0;
 #endif
 }
 
@@ -305,7 +390,6 @@ uint64_t SystemSnapshotWin::CPUX86ExtendedFeatures() const {
          static_cast<uint64_t>(cpu_info[3]);
 #else
   NOTREACHED();
-  return 0;
 #endif
 }
 
@@ -324,7 +408,6 @@ uint32_t SystemSnapshotWin::CPUX86Leaf7Features() const {
   return cpu_info[1];
 #else
   NOTREACHED();
-  return 0;
 #endif
 }
 
@@ -355,7 +438,6 @@ bool SystemSnapshotWin::CPUX86SupportsDAZ() const {
   return (mxcsr_mask & (1 << 6)) != 0;
 #else
   NOTREACHED();
-  return 0;
 #endif
 }
 
diff --git a/extern/crashpad/crashpad/snapshot/win/system_snapshot_win.h b/extern/crashpad/crashpad/snapshot/win/system_snapshot_win.h
index d10c25f230..fbe2faec2f 100644
--- a/extern/crashpad/crashpad/snapshot/win/system_snapshot_win.h
+++ b/extern/crashpad/crashpad/snapshot/win/system_snapshot_win.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -79,6 +79,7 @@ class SystemSnapshotWin final : public SystemSnapshot {
                 int* daylight_offset_seconds,
                 std::string* standard_name,
                 std::string* daylight_name) const override;
+  uint64_t AddressMask() const override { return 0; }
 
  private:
   std::string os_version_full_;
diff --git a/extern/crashpad/crashpad/snapshot/win/system_snapshot_win_test.cc b/extern/crashpad/crashpad/snapshot/win/system_snapshot_win_test.cc
index c8716b33da..439f526fea 100644
--- a/extern/crashpad/crashpad/snapshot/win/system_snapshot_win_test.cc
+++ b/extern/crashpad/crashpad/snapshot/win/system_snapshot_win_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/snapshot/win/thread_snapshot_win.cc b/extern/crashpad/crashpad/snapshot/win/thread_snapshot_win.cc
index c3894a78b1..576d86355d 100644
--- a/extern/crashpad/crashpad/snapshot/win/thread_snapshot_win.cc
+++ b/extern/crashpad/crashpad/snapshot/win/thread_snapshot_win.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,6 +18,8 @@
 #include <vector>
 
 #include "base/check_op.h"
+#include "base/memory/page_size.h"
+#include "base/numerics/safe_conversions.h"
 #include "snapshot/capture_memory.h"
 #include "snapshot/win/capture_memory_delegate_win.h"
 #include "snapshot/win/cpu_context_win.h"
@@ -26,6 +28,26 @@
 namespace crashpad {
 namespace internal {
 
+namespace {
+#if defined(ARCH_CPU_X86_64)
+
+XSAVE_CET_U_FORMAT* LocateXStateCetU(CONTEXT* context) {
+  // GetEnabledXStateFeatures needs Windows 7 SP1.
+  static auto locate_xstate_feature = []() {
+    HINSTANCE kernel32 = GetModuleHandle(L"Kernel32.dll");
+    return reinterpret_cast<decltype(LocateXStateFeature)*>(
+        GetProcAddress(kernel32, "LocateXStateFeature"));
+  }();
+  if (!locate_xstate_feature)
+    return nullptr;
+
+  DWORD cet_u_size = 0;
+  return reinterpret_cast<XSAVE_CET_U_FORMAT*>(
+      locate_xstate_feature(context, XSTATE_CET_U, &cet_u_size));
+}
+#endif  // defined(ARCH_CPU_X86_64)
+}  // namespace
+
 ThreadSnapshotWin::ThreadSnapshotWin()
     : ThreadSnapshot(),
       context_(),
@@ -67,25 +89,53 @@ bool ThreadSnapshotWin::Initialize(
 #if defined(ARCH_CPU_X86)
   context_.architecture = kCPUArchitectureX86;
   context_.x86 = &context_union_.x86;
-  InitializeX86Context(process_reader_thread.context.native, context_.x86);
+  InitializeX86Context(process_reader_thread.context.context<CONTEXT>(),
+                       context_.x86);
 #elif defined(ARCH_CPU_X86_64)
   if (process_reader->Is64Bit()) {
     context_.architecture = kCPUArchitectureX86_64;
     context_.x86_64 = &context_union_.x86_64;
-    InitializeX64Context(process_reader_thread.context.native, context_.x86_64);
+    CONTEXT* context = process_reader_thread.context.context<CONTEXT>();
+    InitializeX64Context(context, context_.x86_64);
+    // Capturing process must have CET enabled. If captured process does not,
+    // then this will not set any state in the context snapshot.
+    if (IsXStateFeatureEnabled(XSTATE_MASK_CET_U)) {
+      XSAVE_CET_U_FORMAT* cet_u = LocateXStateCetU(context);
+      if (cet_u && cet_u->Ia32CetUMsr && cet_u->Ia32Pl3SspMsr) {
+        InitializeX64XStateCet(context, cet_u, context_.x86_64);
+      }
+    }
   } else {
     context_.architecture = kCPUArchitectureX86;
     context_.x86 = &context_union_.x86;
-    InitializeX86Context(process_reader_thread.context.wow64, context_.x86);
+    InitializeX86Context(process_reader_thread.context.context<WOW64_CONTEXT>(),
+                         context_.x86);
   }
 #elif defined(ARCH_CPU_ARM64)
   context_.architecture = kCPUArchitectureARM64;
   context_.arm64 = &context_union_.arm64;
-  InitializeARM64Context(process_reader_thread.context.native, context_.arm64);
+  InitializeARM64Context(process_reader_thread.context.context<CONTEXT>(),
+                         context_.arm64);
 #else
 #error Unsupported Windows Arch
 #endif  // ARCH_CPU_X86
 
+#if defined(ARCH_CPU_X86_64)
+  // Unconditionally store page around ssp if it is present.
+  if (process_reader->Is64Bit() && context_.x86_64->xstate.cet_u.ssp) {
+    WinVMAddress page_size =
+        base::checked_cast<WinVMAddress>(base::GetPageSize());
+    WinVMAddress page_mask = ~(page_size - 1);
+    WinVMAddress ssp_base = context_.x86_64->xstate.cet_u.ssp & page_mask;
+    if (process_reader->GetProcessInfo().LoggingRangeIsFullyReadable(
+            CheckedRange<WinVMAddress, WinVMSize>(ssp_base, page_size))) {
+      auto region = std::make_unique<MemorySnapshotGeneric>();
+      region->Initialize(process_reader->Memory(), ssp_base, page_size);
+      pointed_to_memory_.push_back(std::move(region));
+    }
+  }
+#endif  // ARCH_CPU_X86_64
+
   CaptureMemoryDelegateWin capture_memory_delegate(
       process_reader,
       thread_,
@@ -115,6 +165,11 @@ uint64_t ThreadSnapshotWin::ThreadID() const {
   return thread_.id;
 }
 
+std::string ThreadSnapshotWin::ThreadName() const {
+  INITIALIZATION_STATE_DCHECK_VALID(initialized_);
+  return thread_.name;
+}
+
 int ThreadSnapshotWin::SuspendCount() const {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
   return thread_.suspend_count;
diff --git a/extern/crashpad/crashpad/snapshot/win/thread_snapshot_win.h b/extern/crashpad/crashpad/snapshot/win/thread_snapshot_win.h
index b9fafaa23c..efc16e73eb 100644
--- a/extern/crashpad/crashpad/snapshot/win/thread_snapshot_win.h
+++ b/extern/crashpad/crashpad/snapshot/win/thread_snapshot_win.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -68,6 +68,7 @@ class ThreadSnapshotWin final : public ThreadSnapshot {
   const CPUContext* Context() const override;
   const MemorySnapshot* Stack() const override;
   uint64_t ThreadID() const override;
+  std::string ThreadName() const override;
   int SuspendCount() const override;
   int Priority() const override;
   uint64_t ThreadSpecificDataAddress() const override;
diff --git a/extern/crashpad/crashpad/snapshot/x86/cpuid_reader.cc b/extern/crashpad/crashpad/snapshot/x86/cpuid_reader.cc
index 583405844f..abfa9af7f4 100644
--- a/extern/crashpad/crashpad/snapshot/x86/cpuid_reader.cc
+++ b/extern/crashpad/crashpad/snapshot/x86/cpuid_reader.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,12 +16,13 @@
 
 #include <stddef.h>
 
+#include "build/build_config.h"
 #include "snapshot/cpu_context.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include <immintrin.h>
 #include <intrin.h>
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
 
 #if defined(ARCH_CPU_X86_FAMILY)
 
@@ -101,7 +102,7 @@ bool CpuidReader::SupportsDAZ() const {
   using Fxsave = CPUContextX86_64::Fxsave;
 #endif
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   __declspec(align(16)) Fxsave fxsave = {};
 #else
   Fxsave fxsave __attribute__((aligned(16))) = {};
@@ -111,7 +112,7 @@ bool CpuidReader::SupportsDAZ() const {
   static_assert(offsetof(decltype(fxsave), mxcsr_mask) == 28,
                 "mxcsr_mask offset");
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   _fxsave(&fxsave);
 #else
   asm("fxsave %0" : "=m"(fxsave));
@@ -122,13 +123,13 @@ bool CpuidReader::SupportsDAZ() const {
 }
 
 void CpuidReader::Cpuid(uint32_t cpuinfo[4], uint32_t leaf) const {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   __cpuid(reinterpret_cast<int*>(cpuinfo), leaf);
 #else
   asm("cpuid"
       : "=a"(cpuinfo[0]), "=b"(cpuinfo[1]), "=c"(cpuinfo[2]), "=d"(cpuinfo[3])
       : "a"(leaf), "b"(0), "c"(0), "d"(0));
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
 }
 
 }  // namespace internal
diff --git a/extern/crashpad/crashpad/snapshot/x86/cpuid_reader.h b/extern/crashpad/crashpad/snapshot/x86/cpuid_reader.h
index 39a1ca8435..044ff60394 100644
--- a/extern/crashpad/crashpad/snapshot/x86/cpuid_reader.h
+++ b/extern/crashpad/crashpad/snapshot/x86/cpuid_reader.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/test/BUILD.gn b/extern/crashpad/crashpad/test/BUILD.gn
index dfc84d162f..58ddc50016 100644
--- a/extern/crashpad/crashpad/test/BUILD.gn
+++ b/extern/crashpad/crashpad/test/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2017 The Crashpad Authors. All rights reserved.
+# Copyright 2017 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -37,6 +37,7 @@ static_library("test") {
     "scoped_guarded_page.h",
     "scoped_module_handle.cc",
     "scoped_module_handle.h",
+    "scoped_set_thread_name.h",
     "scoped_temp_dir.cc",
     "scoped_temp_dir.h",
     "test_paths.cc",
@@ -57,7 +58,13 @@ static_library("test") {
     }
   }
 
-  if (crashpad_is_mac || crashpad_is_ios) {
+  # TODO(crbug.com/812974): Remove !crashpad_is_fuchsia when Fuchsia is no
+  # longer treated as a posix platform.
+  if (crashpad_is_posix && !crashpad_is_fuchsia) {
+    sources += [ "scoped_set_thread_name_posix.cc" ]
+  }
+
+  if (crashpad_is_apple) {
     sources += [
       "mac/mach_errors.cc",
       "mac/mach_errors.h",
@@ -96,6 +103,7 @@ static_library("test") {
     sources += [
       "multiprocess_exec_win.cc",
       "scoped_guarded_page_win.cc",
+      "scoped_set_thread_name_win.cc",
       "scoped_temp_dir_win.cc",
       "win/child_launcher.cc",
       "win/child_launcher.h",
@@ -109,7 +117,10 @@ static_library("test") {
   }
 
   if (crashpad_is_fuchsia) {
-    sources += [ "multiprocess_exec_fuchsia.cc" ]
+    sources += [
+      "multiprocess_exec_fuchsia.cc",
+      "scoped_set_thread_name_fuchsia.cc",
+    ]
   }
 
   public_configs = [ "..:crashpad_config" ]
@@ -122,9 +133,9 @@ static_library("test") {
   data = [ "test_paths_test_data_root.txt" ]
 
   deps = [
-    "../compat",
-    "../third_party/googletest:googletest",
     "$mini_chromium_source_parent:base",
+    "../compat",
+    "../third_party/googletest",
     "../util",
   ]
 
@@ -201,10 +212,10 @@ source_set("test_test") {
 
   deps = [
     ":test",
+    "$mini_chromium_source_parent:base",
     "../compat",
+    "../third_party/googletest",
     "../third_party/googletest:googlemock",
-    "../third_party/googletest:googletest",
-    "$mini_chromium_source_parent:base",
     "../util",
   ]
 
@@ -230,10 +241,10 @@ static_library("googlemock_main") {
   defines = [ "CRASHPAD_TEST_LAUNCHER_GOOGLEMOCK" ]
   deps = [
     ":test",
-    "../third_party/googletest:googlemock",
-    "../third_party/googletest:googletest",
     "$mini_chromium_source_parent:base",
     "$mini_chromium_source_parent:base_test_support",
+    "../third_party/googletest",
+    "../third_party/googletest:googlemock",
   ]
   if (crashpad_is_android) {
     deps += [ "../util" ]
@@ -250,9 +261,9 @@ static_library("googletest_main") {
   defines = [ "CRASHPAD_TEST_LAUNCHER_GOOGLETEST" ]
   deps = [
     ":test",
-    "../third_party/googletest:googletest",
     "$mini_chromium_source_parent:base",
     "$mini_chromium_source_parent:base_test_support",
+    "../third_party/googletest",
   ]
   if (crashpad_is_android) {
     deps += [ "../util" ]
diff --git a/extern/crashpad/crashpad/test/errors.cc b/extern/crashpad/crashpad/test/errors.cc
index 1484506256..920c6de6f4 100644
--- a/extern/crashpad/crashpad/test/errors.cc
+++ b/extern/crashpad/crashpad/test/errors.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,9 +20,9 @@
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 #include "base/posix/safe_strerror.h"
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 #include <string.h>
 #include <windows.h>
 #endif
@@ -31,10 +31,10 @@ namespace crashpad {
 namespace test {
 
 std::string ErrnoMessage(int err, const std::string& base) {
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
   std::string err_as_string = base::safe_strerror(errno);
   const char* err_string = err_as_string.c_str();
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   char err_string[256];
   strerror_s(err_string, errno);
 #endif
@@ -49,7 +49,7 @@ std::string ErrnoMessage(const std::string& base) {
   return ErrnoMessage(errno, base);
 }
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 std::string ErrorMessage(const std::string& base) {
   return base::StringPrintf(
       "%s%s%s",
diff --git a/extern/crashpad/crashpad/test/errors.h b/extern/crashpad/crashpad/test/errors.h
index 471fbb5f7b..627f753b14 100644
--- a/extern/crashpad/crashpad/test/errors.h
+++ b/extern/crashpad/crashpad/test/errors.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -67,7 +67,7 @@ std::string ErrnoMessage(int err, const std::string& base = std::string());
 //!     a colon.
 std::string ErrnoMessage(const std::string& base = std::string());
 
-#if defined(OS_WIN) || DOXYGEN
+#if BUILDFLAG(IS_WIN) || DOXYGEN
 //! \brief Formats an error message using `GetLastError()`.
 //!
 //! The returned string will combine the \a base string, if supplied, with a
diff --git a/extern/crashpad/crashpad/test/file.cc b/extern/crashpad/crashpad/test/file.cc
index 04b4625f16..c7b0068593 100644
--- a/extern/crashpad/crashpad/test/file.cc
+++ b/extern/crashpad/crashpad/test/file.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,19 +17,25 @@
 #include <errno.h>
 #include <sys/stat.h>
 
+#include "base/logging.h"
+#include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"
 #include "test/errors.h"
 
+#if BUILDFLAG(IS_WIN)
+#include <windows.h>
+#endif
+
 namespace crashpad {
 namespace test {
 
 bool FileExists(const base::FilePath& path) {
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
   struct stat st;
   int rv = lstat(path.value().c_str(), &st);
   static constexpr char stat_function[] = "lstat";
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   struct _stat st;
   int rv = _wstat(path.value().c_str(), &st);
   static constexpr char stat_function[] = "_wstat";
@@ -44,12 +50,30 @@ bool FileExists(const base::FilePath& path) {
   return true;
 }
 
+bool RemoveFileIfExists(const base::FilePath& path) {
+#if BUILDFLAG(IS_POSIX)
+  if (unlink(path.value().c_str()) != 0 && errno != ENOENT) {
+    PLOG(ERROR) << "unlink " << path.value();
+    return false;
+  }
+#elif BUILDFLAG(IS_WIN)
+  if (!DeleteFile(path.value().c_str()) &&
+      GetLastError() != ERROR_FILE_NOT_FOUND) {
+    PLOG(ERROR) << "DeleteFile " << base::WideToUTF8(path.value());
+    return false;
+  }
+#else
+#error "Not implemented"
+#endif
+  return true;
+}
+
 FileOffset FileSize(const base::FilePath& path) {
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
   struct stat st;
   int rv = lstat(path.value().c_str(), &st);
   static constexpr char stat_function[] = "lstat";
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   struct _stati64 st;
   int rv = _wstati64(path.value().c_str(), &st);
   static constexpr char stat_function[] = "_wstati64";
diff --git a/extern/crashpad/crashpad/test/file.h b/extern/crashpad/crashpad/test/file.h
index 918cc3915b..13c25ee0e1 100644
--- a/extern/crashpad/crashpad/test/file.h
+++ b/extern/crashpad/crashpad/test/file.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -30,6 +30,12 @@ namespace test {
 //!     `false` with a Google Test failure added.
 bool FileExists(const base::FilePath& path);
 
+//! \brief Removes a file if it exists, logging a message on failure.
+//!
+//! \param[in] path The path to the file to remove.
+//! \return `true` on success. `false` on failure with a message logged.
+bool RemoveFileIfExists(const base::FilePath& path);
+
 //! \brief Determines the size of a file.
 //!
 //! \param[in] path The path of the file to check. The file must exist.
diff --git a/extern/crashpad/crashpad/test/filesystem.cc b/extern/crashpad/crashpad/test/filesystem.cc
index 39b864819b..8d55ce18bb 100644
--- a/extern/crashpad/crashpad/test/filesystem.cc
+++ b/extern/crashpad/crashpad/test/filesystem.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "gtest/gtest.h"
 #include "test/errors.h"
 #include "test/scoped_temp_dir.h"
@@ -29,11 +30,11 @@
 #include "util/file/filesystem.h"
 #include "util/misc/time.h"
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 #include <unistd.h>
 
 #include "base/posix/eintr_wrapper.h"
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 #include <windows.h>
 #endif
 
@@ -42,7 +43,7 @@ namespace test {
 
 namespace {
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 
 // Detects the flags necessary to create symbolic links and stores them in
 // |flags| if non-nullptr, and returns true on success. If symbolic links can’t
@@ -89,7 +90,7 @@ bool SymbolicLinkFlags(DWORD* flags) {
   return true;
 }
 
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
 
 }  // namespace
 
@@ -101,14 +102,14 @@ bool CreateFile(const base::FilePath& file) {
 }
 
 bool PathExists(const base::FilePath& path) {
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
   struct stat st;
   if (lstat(path.value().c_str(), &st) != 0) {
     EXPECT_EQ(errno, ENOENT) << ErrnoMessage("lstat ") << path.value();
     return false;
   }
   return true;
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   if (GetFileAttributes(path.value().c_str()) == INVALID_FILE_ATTRIBUTES) {
     EXPECT_EQ(GetLastError(), static_cast<DWORD>(ERROR_FILE_NOT_FOUND))
         << ErrorMessage("GetFileAttributes ") << base::WideToUTF8(path.value());
@@ -120,7 +121,7 @@ bool PathExists(const base::FilePath& path) {
 
 bool SetFileModificationTime(const base::FilePath& path,
                              const timespec& mtime) {
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
   // utimensat() isn't available on macOS until 10.13, so lutimes() is used
   // instead.
   struct stat st;
@@ -136,7 +137,7 @@ bool SetFileModificationTime(const base::FilePath& path,
     return false;
   }
   return true;
-#elif defined(OS_POSIX)
+#elif BUILDFLAG(IS_POSIX)
   timespec times[2];
   times[0].tv_sec = 0;
   times[0].tv_nsec = UTIME_OMIT;
@@ -147,7 +148,7 @@ bool SetFileModificationTime(const base::FilePath& path,
     return false;
   }
   return true;
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   DWORD flags = FILE_FLAG_OPEN_REPARSE_POINT;
   if (IsDirectory(path, true)) {
     // required for directory handles
@@ -172,22 +173,22 @@ bool SetFileModificationTime(const base::FilePath& path,
     return false;
   }
   return true;
-#endif  // OS_APPLE
+#endif  // BUILDFLAG(IS_APPLE)
 }
 
-#if !defined(OS_FUCHSIA)
+#if !BUILDFLAG(IS_FUCHSIA)
 
 bool CanCreateSymbolicLinks() {
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
   return true;
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   return SymbolicLinkFlags(nullptr);
-#endif  // OS_POSIX
+#endif  // BUILDFLAG(IS_POSIX)
 }
 
 bool CreateSymbolicLink(const base::FilePath& target_path,
                         const base::FilePath& symlink_path) {
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
   int rv = HANDLE_EINTR(
       symlink(target_path.value().c_str(), symlink_path.value().c_str()));
   if (rv != 0) {
@@ -195,7 +196,7 @@ bool CreateSymbolicLink(const base::FilePath& target_path,
     return false;
   }
   return true;
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   DWORD symbolic_link_flags = 0;
   SymbolicLinkFlags(&symbolic_link_flags);
   if (!::CreateSymbolicLink(
@@ -208,10 +209,10 @@ bool CreateSymbolicLink(const base::FilePath& target_path,
     return false;
   }
   return true;
-#endif  // OS_POSIX
+#endif  // BUILDFLAG(IS_POSIX)
 }
 
-#endif  // !OS_FUCHSIA
+#endif  // !BUILDFLAG(IS_FUCHSIA)
 
 }  // namespace test
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/test/filesystem.h b/extern/crashpad/crashpad/test/filesystem.h
index 516335bb7c..1a7b52f379 100644
--- a/extern/crashpad/crashpad/test/filesystem.h
+++ b/extern/crashpad/crashpad/test/filesystem.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ bool PathExists(const base::FilePath& path);
 //! \return `true` on success. Otherwise `false` with a message logged.
 bool SetFileModificationTime(const base::FilePath& path, const timespec& mtime);
 
-#if !defined(OS_FUCHSIA) || DOXYGEN
+#if !BUILDFLAG(IS_FUCHSIA) || DOXYGEN
 // There are no symbolic links on Fuchsia. Don’t bother declaring or defining
 // symbolic link-related functions at all, because it’s an error to even pretend
 // that symbolic links might be available on Fuchsia.
@@ -67,7 +67,7 @@ bool CanCreateSymbolicLinks();
 bool CreateSymbolicLink(const base::FilePath& target_path,
                         const base::FilePath& symlink_path);
 
-#endif  // !OS_FUCHSIA || DOXYGEN
+#endif  // !BUILDFLAG(IS_FUCHSIA) || DOXYGEN
 
 }  // namespace test
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/test/fuchsia_crashpad_tests.cml b/extern/crashpad/crashpad/test/fuchsia_crashpad_tests.cml
new file mode 100644
index 0000000000..bfcedb30f2
--- /dev/null
+++ b/extern/crashpad/crashpad/test/fuchsia_crashpad_tests.cml
@@ -0,0 +1,86 @@
+// Copyright 2022 The Crashpad Authors
+//
+// 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.
+
+{
+    include: [
+        "//src/sys/test_runners/elf/ambient_exec.shard.cml",
+        "inspect/offer.shard.cml",
+        "syslog/client.shard.cml",
+    ],
+    program: {
+        binary: "bin/crashpad_tests",
+
+        // For ProcessSnapshotFuchsiaTest.AddressSpaceMapping.
+        job_policy_ambient_mark_vmo_exec: "true",
+    },
+    children: [
+        {
+            name: "dns_resolver",
+            url: "#meta/dns_resolver.cm",
+        },
+        {
+            name: "netstack",
+            url: "#meta/netstack.cm",
+        },
+        {
+            name: "crashpad_test",
+            url: "#meta/crashpad_test.cm",
+        },
+    ],
+    use: [
+        {
+            protocol: [ "fuchsia.net.name.Lookup" ],
+            from: "#dns_resolver",
+        },
+        {
+            protocol: [ "fuchsia.posix.socket.Provider" ],
+            from: "#netstack",
+        },
+        {
+            protocol: [ "fuchsia.process.Launcher" ],
+        },
+        {
+            storage: "tmp",
+            path: "/tmp",
+        },
+    ],
+    offer: [
+        {
+            protocol: "fuchsia.net.name.Lookup",
+            from: "#dns_resolver",
+            to: "#crashpad_test",
+        },
+        {
+            protocol: "fuchsia.net.routes.State",
+            from: "#netstack",
+            to: "#dns_resolver",
+        },
+        {
+            protocol: "fuchsia.posix.socket.Provider",
+            from: "#netstack",
+            to: "#crashpad_test",
+        },
+        {
+            storage: "cache",
+            from: "parent",
+            to: [ "#netstack" ],
+        },
+        {
+            storage: "tmp",
+            from: "parent",
+            to: "#crashpad_test",
+            rights: [ "rw*" ],
+        },
+    ],
+}
diff --git a/extern/crashpad/crashpad/test/fuchsia_crashpad_tests.cmx b/extern/crashpad/crashpad/test/fuchsia_crashpad_tests.cmx
deleted file mode 100644
index 48faf38397..0000000000
--- a/extern/crashpad/crashpad/test/fuchsia_crashpad_tests.cmx
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "facets": {
-        "fuchsia.test": {
-            "injected-services": {
-                "fuchsia.net.name.Lookup": "fuchsia-pkg://fuchsia.com/dns-resolver#meta/dns-resolver.cmx",
-                "fuchsia.posix.socket.Provider": "fuchsia-pkg://fuchsia.com/netstack#meta/netstack.cmx"
-            }
-        }
-    },
-    "include": [
-        "syslog/client.shard.cmx"
-    ],
-    "program": {
-        "binary": "bin/crashpad_tests"
-    },
-    "sandbox": {
-        "features": [
-            "deprecated-ambient-replace-as-executable",
-            "isolated-temp"
-        ],
-        "services": [
-            "fuchsia.net.name.Lookup",
-            "fuchsia.posix.socket.Provider",
-            "fuchsia.process.Launcher"
-        ]
-    }
-}
diff --git a/extern/crashpad/crashpad/test/gtest_death.h b/extern/crashpad/crashpad/test/gtest_death.h
index c67d334521..e2982ae8ea 100644
--- a/extern/crashpad/crashpad/test/gtest_death.h
+++ b/extern/crashpad/crashpad/test/gtest_death.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,13 +19,13 @@
 #include "build/build_config.h"
 #include "gtest/gtest.h"
 
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
 #include "test/mac/exception_swallower.h"
 #endif
 
 //! \file
 
-#if defined(OS_MAC) || DOXYGEN
+#if BUILDFLAG(IS_MAC) || DOXYGEN
 
 //! \brief Wraps the Google Test `ASSERT_DEATH_IF_SUPPORTED()` macro to make
 //!     assertions about death caused by crashes.
@@ -73,14 +73,14 @@
                  regex);                                                  \
   } while (false)
 
-#else  // OS_MAC
+#else  // BUILDFLAG(IS_MAC)
 
 #define ASSERT_DEATH_CRASH(statement, regex) \
   ASSERT_DEATH_IF_SUPPORTED(statement, regex)
 #define EXPECT_DEATH_CRASH(statement, regex) \
   EXPECT_DEATH_IF_SUPPORTED(statement, regex)
 
-#endif  // OS_MAC
+#endif  // BUILDFLAG(IS_MAC)
 
 #if !(!defined(MINI_CHROMIUM_BASE_LOGGING_H_) && \
       defined(OFFICIAL_BUILD) &&                 \
diff --git a/extern/crashpad/crashpad/test/gtest_main.cc b/extern/crashpad/crashpad/test/gtest_main.cc
index c67b8e24bb..63f13c547d 100644
--- a/extern/crashpad/crashpad/test/gtest_main.cc
+++ b/extern/crashpad/crashpad/test/gtest_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,27 +22,27 @@
 #include "gmock/gmock.h"
 #endif  // CRASHPAD_TEST_LAUNCHER_GOOGLEMOCK
 
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
 #include "util/linux/initial_signal_dispositions.h"
-#endif  // OS_ANDROID
+#endif  // BUILDFLAG(IS_ANDROID)
 
-#if defined(OS_IOS)
+#if BUILDFLAG(IS_IOS)
 #include "test/ios/google_test_setup.h"
 #endif
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include "test/win/win_child_process.h"
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
 
 #if defined(CRASHPAD_IS_IN_CHROMIUM)
-#include "base/bind.h"
+#include "base/functional/bind.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
 #endif  // CRASHPAD_IS_IN_CHROMIUM
 
 namespace {
 
-#if !defined(OS_IOS)
+#if !BUILDFLAG(IS_IOS)
 bool GetChildTestFunctionName(std::string* child_func_name) {
   constexpr size_t arg_length =
       sizeof(crashpad::test::internal::kChildTestFunction) - 1;
@@ -55,38 +55,38 @@ bool GetChildTestFunctionName(std::string* child_func_name) {
   }
   return false;
 }
-#endif  // !OS_IOS
+#endif  // !BUILDFLAG(IS_IOS)
 
 }  // namespace
 
 int main(int argc, char* argv[]) {
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
   crashpad::InitializeSignalDispositions();
-#endif  // OS_ANDROID
+#endif  // BUILDFLAG(IS_ANDROID)
 
   crashpad::test::InitializeMainArguments(argc, argv);
 
-#if !defined(OS_IOS)
+#if !BUILDFLAG(IS_IOS)
   std::string child_func_name;
   if (GetChildTestFunctionName(&child_func_name)) {
     return crashpad::test::internal::CheckedInvokeMultiprocessChild(
         child_func_name);
   }
-#endif  // !OS_IOS
+#endif  // !BUILDFLAG(IS_IOS)
 
 #if defined(CRASHPAD_IS_IN_CHROMIUM)
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   // Chromium’s test launcher interferes with WinMultiprocess-based tests. Allow
   // their child processes to be launched by the standard Google Test-based test
   // runner.
   const bool use_chromium_test_launcher =
       !crashpad::test::WinChildProcess::IsChildProcess();
-#elif defined(OS_ANDROID)
+#elif BUILDFLAG(IS_ANDROID)
   constexpr bool use_chromium_test_launcher = false;
-#else  // OS_WIN
+#else  // BUILDFLAG(IS_WIN)
   constexpr bool use_chromium_test_launcher = true;
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
 
   if (use_chromium_test_launcher) {
     // This supports --test-launcher-summary-output, which writes a JSON file
@@ -115,7 +115,7 @@ int main(int argc, char* argv[]) {
     CRASHPAD_TEST_LAUNCHER_GOOGLEMOCK
 #endif  // CRASHPAD_TEST_LAUNCHER_GOOGLEMOCK
 
-#if defined(OS_IOS)
+#if BUILDFLAG(IS_IOS)
   // iOS needs to run tests within the context of an app, so call a helper that
   // invokes UIApplicationMain().  The application delegate will call
   // RUN_ALL_TESTS() and exit before returning control to this function.
diff --git a/extern/crashpad/crashpad/test/hex_string.cc b/extern/crashpad/crashpad/test/hex_string.cc
index bb9b5f3a89..c9bf549a55 100644
--- a/extern/crashpad/crashpad/test/hex_string.cc
+++ b/extern/crashpad/crashpad/test/hex_string.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/test/hex_string.h b/extern/crashpad/crashpad/test/hex_string.h
index b0d445319e..0d9dee3e4f 100644
--- a/extern/crashpad/crashpad/test/hex_string.h
+++ b/extern/crashpad/crashpad/test/hex_string.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -29,8 +29,8 @@ namespace test {
 //!   uint8_t expected[10];
 //!   uint8_t observed[10];
 //!   // …
-//!   EXPECT_EQ(BytesToHexString(observed, base::size(observed)),
-//!             BytesToHexString(expected, base::size(expected)));
+//!   EXPECT_EQ(BytesToHexString(observed, std::size(observed)),
+//!             BytesToHexString(expected, std::size(expected)));
 //! \endcode
 std::string BytesToHexString(const void* bytes, size_t length);
 
diff --git a/extern/crashpad/crashpad/test/hex_string_test.cc b/extern/crashpad/crashpad/test/hex_string_test.cc
index ac6343bf58..752a5da63e 100644
--- a/extern/crashpad/crashpad/test/hex_string_test.cc
+++ b/extern/crashpad/crashpad/test/hex_string_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,8 @@
 
 #include "test/hex_string.h"
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+
 #include "gtest/gtest.h"
 
 namespace crashpad {
@@ -25,7 +26,7 @@ TEST(HexString, HexString) {
   EXPECT_EQ(BytesToHexString(nullptr, 0), "");
 
   static constexpr char kBytes[] = "Abc123xyz \x0a\x7f\xf0\x9f\x92\xa9_";
-  EXPECT_EQ(BytesToHexString(kBytes, base::size(kBytes)),
+  EXPECT_EQ(BytesToHexString(kBytes, std::size(kBytes)),
             "41626331323378797a200a7ff09f92a95f00");
 }
 
diff --git a/extern/crashpad/crashpad/test/ios/BUILD.gn b/extern/crashpad/crashpad/test/ios/BUILD.gn
index 4ba4ec4f75..ba4c527118 100644
--- a/extern/crashpad/crashpad/test/ios/BUILD.gn
+++ b/extern/crashpad/crashpad/test/ios/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2020 The Crashpad Authors. All rights reserved.
+# Copyright 2020 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
 import("../../build/crashpad_buildconfig.gni")
 
 if (crashpad_is_in_chromium) {
+  import("//build/config/ios/ios_test_runner_xcuitest.gni")
   import("//build/config/ios/rules.gni")
 } else if (crashpad_is_standalone) {
   import("//third_party/mini_chromium/mini_chromium/build/ios/rules.gni")
@@ -38,10 +39,10 @@ source_set("google_test_runner") {
   sources = [ "cptest_google_test_runner.mm" ]
   configs += [ "../..:crashpad_config" ]
   deps = [
-    "../../build:ios_enable_arc",
+    "../$mini_chromium_source_parent:base",
+    "../../build:apple_enable_arc",
     "../../build:ios_xctest",
     "../../test/ios:google_test_runner_shared_headers",
-    "../$mini_chromium_source_parent:base",
   ]
   frameworks = [ "UIKit.framework" ]
 }
@@ -55,9 +56,9 @@ source_set("google_test_setup") {
   configs += [ "../..:crashpad_config" ]
   deps = [
     ":google_test_runner_shared_headers",
-    "../../build:ios_enable_arc",
-    "../../third_party/googletest:googletest",
     "../$mini_chromium_source_parent:base",
+    "../../build:apple_enable_arc",
+    "../../third_party/googletest",
   ]
   frameworks = [ "UIKit.framework" ]
 }
@@ -65,16 +66,23 @@ source_set("google_test_setup") {
 source_set("xcuitests") {
   testonly = true
   sources = [ "crash_type_xctest.mm" ]
-  configs += [ "../..:crashpad_config" ]
+  configs += [
+    "../..:crashpad_config",
+    "../../build:crashpad_is_in_chromium",
+  ]
+
   deps = [
-    "../../build:ios_enable_arc",
+    "../../build:apple_enable_arc",
     "../../build:ios_xctest",
+    "../../client:common",
     "../../test/ios/host:app_shared_sources",
     "../../third_party/edo",
+    "../../util",
   ]
 }
 
-ios_xcuitest_test("ios_crash_xcuitests_module") {
+ios_test_runner_xcuitest("ios_crash_xcuitests_module") {
   xcode_test_application_name = "ios_crash_xcuitests"
   deps = [ ":xcuitests" ]
+  data_deps = [ "host:ios_crash_xcuitests" ]
 }
diff --git a/extern/crashpad/crashpad/test/ios/cptest_google_test_runner.mm b/extern/crashpad/crashpad/test/ios/cptest_google_test_runner.mm
index 9ba795e5e9..3958f8c1aa 100644
--- a/extern/crashpad/crashpad/test/ios/cptest_google_test_runner.mm
+++ b/extern/crashpad/crashpad/test/ios/cptest_google_test_runner.mm
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,10 +18,6 @@
 #include "base/check.h"
 #import "test/ios/cptest_google_test_runner_delegate.h"
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 @interface CPTestGoogleTestRunner : XCTestCase
 @end
 
diff --git a/extern/crashpad/crashpad/test/ios/cptest_google_test_runner_delegate.h b/extern/crashpad/crashpad/test/ios/cptest_google_test_runner_delegate.h
index 8be183db88..822c77c18a 100644
--- a/extern/crashpad/crashpad/test/ios/cptest_google_test_runner_delegate.h
+++ b/extern/crashpad/crashpad/test/ios/cptest_google_test_runner_delegate.h
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/test/ios/crash_type_xctest.mm b/extern/crashpad/crashpad/test/ios/crash_type_xctest.mm
index 00d89e7c90..8518e322d8 100644
--- a/extern/crashpad/crashpad/test/ios/crash_type_xctest.mm
+++ b/extern/crashpad/crashpad/test/ios/crash_type_xctest.mm
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,229 +13,566 @@
 // limitations under the License.
 
 #import <XCTest/XCTest.h>
-
 #include <objc/runtime.h>
+#include <sys/sysctl.h>
+
+#include <vector>
+
 #import "Service/Sources/EDOClientService.h"
+#include "build/build_config.h"
+#include "client/length_delimited_ring_buffer.h"
 #import "test/ios/host/cptest_shared_object.h"
-
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
+#include "util/mac/sysctl.h"
+#include "util/mach/exception_types.h"
+#include "util/mach/mach_extensions.h"
+
+namespace crashpad {
+namespace {
+
+#if TARGET_OS_SIMULATOR
+// macOS 14.0 is 23A344, macOS 13.6.5 is 22G621, so if the first two characters
+// in the kern.osversion are > 22, this build will reproduce the simulator bug
+// in crbug.com/328282286
+// macOS 14.0 is 23A344, macOS 13.6.5 is 22G621, so if the first two
+// characters in the kern.osversion are > 22, this build will reproduce the
+// simulator bug in crbug.com/328282286
+// This now reproduces on macOS 15.4 24E248 as well for iOS17 simulators.
+bool HasMacOSBrokeDYLDTaskInfo() {
+  if (__builtin_available(iOS 18, *)) {
+    return false;
+  }
+  std::string build = crashpad::ReadStringSysctlByName("kern.osversion", false);
+  if (std::stoi(build.substr(0, 2)) >= 24) {
+    return true;
+  }
+  if (__builtin_available(iOS 17, *)) {
+    return false;
+  }
+  return std::stoi(build.substr(0, 2)) > 22;
+}
 #endif
 
+}  // namespace
+}  // namespace crashpad
+
 @interface CPTestTestCase : XCTestCase {
-  XCUIApplication* _app;
+  XCUIApplication* app_;
+  CPTestSharedObject* rootObject_;
 }
-
 @end
 
 @implementation CPTestTestCase
 
-- (void)handleCrashUnderSymbol:(id)arg1 {
-  // For now, do nothing.  In the future this can be something testable.
++ (void)setUp {
+  [CPTestTestCase swizzleHandleCrashUnderSymbol];
+  [CPTestTestCase swizleMayTerminateOutOfBandWithoutCrashReport];
+
+  // Override EDO default error handler.  Without this, the default EDO error
+  // handler will throw an error and fail the test.
+  EDOSetClientErrorHandler(^(NSError* error){
+      // Do nothing.
+  });
 }
 
-+ (void)setUp {
-  // Swizzle away the handleCrashUnderSymbol callback.  Without this, any time
-  // the host app is intentionally crashed, the test is immediately failed.
+// Swizzle away the -[XCUIApplicationImpl handleCrashUnderSymbol:] callback.
+// Without this, any time the host app is intentionally crashed, the test is
+// immediately failed.
++ (void)swizzleHandleCrashUnderSymbol {
   SEL originalSelector = NSSelectorFromString(@"handleCrashUnderSymbol:");
   SEL swizzledSelector = @selector(handleCrashUnderSymbol:);
-
   Method originalMethod = class_getInstanceMethod(
       objc_getClass("XCUIApplicationImpl"), originalSelector);
   Method swizzledMethod =
       class_getInstanceMethod([self class], swizzledSelector);
+  method_exchangeImplementations(originalMethod, swizzledMethod);
+}
 
+// Swizzle away the time consuming 'Checking for crash reports corresponding to'
+// from -[XCUIApplicationProcess swizleMayTerminateOutOfBandWithoutCrashReport]
+// that is unnecessary for these tests.
++ (void)swizleMayTerminateOutOfBandWithoutCrashReport {
+  SEL originalSelector =
+      NSSelectorFromString(@"mayTerminateOutOfBandWithoutCrashReport");
+  SEL swizzledSelector = @selector(mayTerminateOutOfBandWithoutCrashReport);
+  Method originalMethod = class_getInstanceMethod(
+      objc_getClass("XCUIApplicationProcess"), originalSelector);
+  Method swizzledMethod =
+      class_getInstanceMethod([self class], swizzledSelector);
   method_exchangeImplementations(originalMethod, swizzledMethod);
+}
 
-  // Override EDO default error handler.  Without this, the default EDO error
-  // handler will throw an error and fail the test.
-  EDOSetClientErrorHandler(^(NSError* error){
-      // Do nothing.
-  });
+// This gets called after tearDown, so there's no straightforward way to
+// test that this is called. However, not swizzling this out will cause every
+// crashing test to fail.
+- (void)handleCrashUnderSymbol:(id)arg1 {
+}
+
+- (BOOL)mayTerminateOutOfBandWithoutCrashReport {
+  return YES;
 }
 
 - (void)setUp {
-  _app = [[XCUIApplication alloc] init];
-  [_app launch];
+  app_ = [[XCUIApplication alloc] init];
+  if ([self.name isEqualToString:@"-[CPTestTestCase testExtensionStreams]"]) {
+    app_.launchArguments = @[ @"--test-extension-streams" ];
+  } else if ([self.name isEqualToString:
+                            @"-[CPTestTestCase testCrashWithExtraMemory]"]) {
+    app_.launchArguments = @[ @"--test-extra_memory" ];
+  }
+  [app_ launch];
+  rootObject_ = [EDOClientService rootObjectWithPort:12345];
+  [rootObject_ clearPendingReports];
+  XCTAssertEqual([rootObject_ pendingReportCount], 0);
+  XCTAssertTrue(app_.state == XCUIApplicationStateRunningForeground);
+}
+
+- (void)verifyCrashReportException:(uint32_t)exception {
+  // Confirm the app is not running.
+  XCTAssertTrue([app_ waitForState:XCUIApplicationStateNotRunning timeout:15]);
+  XCTAssertTrue(app_.state == XCUIApplicationStateNotRunning);
+
+  // Restart app to get the report signal.
+  [app_ launch];
+  XCTAssertTrue(app_.state == XCUIApplicationStateRunningForeground);
+  rootObject_ = [EDOClientService rootObjectWithPort:12345];
+  XCTAssertEqual([rootObject_ pendingReportCount], 1);
+  NSNumber* report_exception;
+  XCTAssertTrue([rootObject_ pendingReportException:&report_exception]);
+  XCTAssertEqual(report_exception.unsignedIntValue, exception);
+
+  NSString* rawLogContents = [rootObject_ rawLogContents];
+  XCTAssertFalse([rawLogContents containsString:@"allocator used in handler."]);
 }
 
 - (void)testEDO {
-  CPTestSharedObject* rootObject = [EDOClientService rootObjectWithPort:12345];
-  NSString* result = [rootObject testEDO];
+  NSString* result = [rootObject_ testEDO];
   XCTAssertEqualObjects(result, @"crashpad");
 }
 
-- (void)testSegv {
-  XCTAssertTrue(_app.state == XCUIApplicationStateRunningForeground);
-
-  // Crash the app.
-  CPTestSharedObject* rootObject = [EDOClientService rootObjectWithPort:12345];
-  [rootObject crashSegv];
-
-  // Confirm the app is not running.
-  XCTAssertTrue([_app waitForState:XCUIApplicationStateNotRunning timeout:15]);
-  XCTAssertTrue(_app.state == XCUIApplicationStateNotRunning);
+- (void)testKillAbort {
+  [rootObject_ crashKillAbort];
+  [self verifyCrashReportException:EXC_SOFT_SIGNAL];
+  NSNumber* report_exception;
+  XCTAssertTrue([rootObject_ pendingReportExceptionInfo:&report_exception]);
+  XCTAssertEqual(report_exception.intValue, SIGABRT);
+}
 
-  // TODO: Query the app for crash data
-  [_app launch];
-  XCTAssertTrue(_app.state == XCUIApplicationStateRunningForeground);
+- (void)testTrap {
+  [rootObject_ crashTrap];
+#if !BUILDFLAG(IS_IOS_TVOS)
+#if defined(ARCH_CPU_X86_64)
+  [self verifyCrashReportException:EXC_BAD_INSTRUCTION];
+#elif defined(ARCH_CPU_ARM64)
+  [self verifyCrashReportException:EXC_BREAKPOINT];
+#else
+#error Port to your CPU architecture
+#endif
+#else  // !BUILDFLAG(IS_IOS_TVOS)
+  [self verifyCrashReportException:EXC_SOFT_SIGNAL];
+  NSNumber* report_exception;
+  XCTAssertTrue([rootObject_ pendingReportExceptionInfo:&report_exception]);
+  XCTAssertEqual(report_exception.intValue, SIGTRAP);
+#endif
 }
 
-- (void)testKillAbort {
-  XCTAssertTrue(_app.state == XCUIApplicationStateRunningForeground);
+- (void)testAbort {
+  [rootObject_ crashAbort];
+  [self verifyCrashReportException:EXC_SOFT_SIGNAL];
+  NSNumber* report_exception;
+  XCTAssertTrue([rootObject_ pendingReportExceptionInfo:&report_exception]);
+  XCTAssertEqual(report_exception.intValue, SIGABRT);
+}
 
-  // Crash the app.
-  CPTestSharedObject* rootObject = [EDOClientService rootObjectWithPort:12345];
-  [rootObject crashKillAbort];
+- (void)testBadAccess {
+  [rootObject_ crashBadAccess];
+#if !BUILDFLAG(IS_IOS_TVOS)
+  [self verifyCrashReportException:EXC_BAD_ACCESS];
+#else
+  [self verifyCrashReportException:EXC_SOFT_SIGNAL];
+  NSNumber* report_exception;
+  XCTAssertTrue([rootObject_ pendingReportExceptionInfo:&report_exception]);
+  XCTAssertEqual(report_exception.intValue, SIGSEGV);
+#endif
+}
 
-  // Confirm the app is not running.
-  XCTAssertTrue([_app waitForState:XCUIApplicationStateNotRunning timeout:15]);
-  XCTAssertTrue(_app.state == XCUIApplicationStateNotRunning);
+- (void)testException {
+  [rootObject_ crashException];
+  // After https://reviews.llvm.org/D141222 exceptions call
+  // __libcpp_verbose_abort, which Chromium sets to `brk 0` in release.
+  // After https://crrev.com/c/5375084, Chromium does not set `brk 0` for local
+  // release builds and official DCHECK builds.
+#if defined(CRASHPAD_IS_IN_CHROMIUM) && defined(NDEBUG) && \
+    defined(OFFICIAL_BUILD) && !defined(DCHECK_ALWAYS_ON)
+  [self verifyCrashReportException:SIGABRT];
+#else
+  [self verifyCrashReportException:EXC_SOFT_SIGNAL];
+  NSNumber* report_exception;
+  XCTAssertTrue([rootObject_ pendingReportExceptionInfo:&report_exception]);
+  XCTAssertEqual(report_exception.intValue, SIGABRT);
+#endif
+}
 
-  // TODO: Query the app for crash data
-  [_app launch];
-  XCTAssertTrue(_app.state == XCUIApplicationStateRunningForeground);
+// TODO(crbug.com/478240087): Fails on intel. Investigate and re-enable.
+#if defined(__x86_64__)
+#define MAYBE_testNSException DISABLED_testNSException
+#else
+#define MAYBE_testNSException testNSException
+#endif
+- (void)MAYBE_testNSException {
+  [rootObject_ crashNSException];
+  [self verifyCrashReportException:crashpad::kMachExceptionFromNSException];
+  NSDictionary* dict = [rootObject_ getAnnotations];
+  NSString* userInfo =
+      [dict[@"objects"][0] valueForKeyPath:@"exceptionUserInfo"];
+  XCTAssertTrue([userInfo containsString:@"Error Object=<CPTestSharedObject"]);
+  XCTAssertTrue([[dict[@"objects"][1] valueForKeyPath:@"exceptionReason"]
+      isEqualToString:@"Intentionally throwing error."]);
+  XCTAssertTrue([[dict[@"objects"][2] valueForKeyPath:@"exceptionName"]
+      isEqualToString:@"NSInternalInconsistencyException"]);
 }
 
-- (void)testTrap {
-  XCTAssertTrue(_app.state == XCUIApplicationStateRunningForeground);
+// TODO(crbug.com/478240087): Fails on intel. Investigate and re-enable.
+#if defined(__x86_64__)
+#define MAYBE_testNotAnNSException DISABLED_testNotAnNSException
+#else
+#define MAYBE_testNotAnNSException testNotAnNSException
+#endif
+- (void)MAYBE_testNotAnNSException {
+  [rootObject_ crashNotAnNSException];
+  // When @throwing something other than an NSException the
+  // UncaughtExceptionHandler is not called, so the application SIGABRTs.
+  [self verifyCrashReportException:EXC_SOFT_SIGNAL];
+  NSNumber* report_exception;
+  XCTAssertTrue([rootObject_ pendingReportExceptionInfo:&report_exception]);
+  XCTAssertEqual(report_exception.intValue, SIGABRT);
+}
 
-  // Crash the app.
-  CPTestSharedObject* rootObject = [EDOClientService rootObjectWithPort:12345];
-  [rootObject crashTrap];
+- (void)testUnhandledNSException {
+  [rootObject_ crashUnhandledNSException];
+  [self verifyCrashReportException:crashpad::kMachExceptionFromNSException];
+  NSDictionary* dict = [rootObject_ getAnnotations];
+  NSString* uncaught_flag =
+      [dict[@"objects"][0] valueForKeyPath:@"UncaughtNSException"];
+  XCTAssertTrue([uncaught_flag containsString:@"true"]);
+  NSString* userInfo =
+      [dict[@"objects"][1] valueForKeyPath:@"exceptionUserInfo"];
+  XCTAssertTrue([userInfo containsString:@"Error Object=<CPTestSharedObject"]);
+  XCTAssertTrue([[dict[@"objects"][2] valueForKeyPath:@"exceptionReason"]
+      isEqualToString:@"Intentionally throwing error."]);
+  XCTAssertTrue([[dict[@"objects"][3] valueForKeyPath:@"exceptionName"]
+      isEqualToString:@"NSInternalInconsistencyException"]);
+}
 
-  // Confirm the app is not running.
-  XCTAssertTrue([_app waitForState:XCUIApplicationStateNotRunning timeout:15]);
-  XCTAssertTrue(_app.state == XCUIApplicationStateNotRunning);
+- (void)testcrashUnrecognizedSelectorAfterDelay {
+  [rootObject_ crashUnrecognizedSelectorAfterDelay];
+  [self verifyCrashReportException:crashpad::kMachExceptionFromNSException];
+  NSDictionary* dict = [rootObject_ getAnnotations];
+  XCTAssertTrue([[dict[@"objects"][0] valueForKeyPath:@"exceptionReason"]
+      containsString:
+          @"CPTestSharedObject does_not_exist]: unrecognized selector"]);
+  XCTAssertTrue([[dict[@"objects"][1] valueForKeyPath:@"exceptionName"]
+      isEqualToString:@"NSInvalidArgumentException"]);
+}
 
-  // TODO: Query the app for crash data
-  [_app launch];
-  XCTAssertTrue(_app.state == XCUIApplicationStateRunningForeground);
+- (void)testCatchUIGestureEnvironmentNSException {
+  // Tap the button with the string UIGestureEnvironmentException.
+#if !BUILDFLAG(IS_IOS_TVOS)
+  [app_.buttons[@"UIGestureEnvironmentException"] tap];
+#else
+  // tvOS does not have [XCUIElement tap]. This version assumes there is just
+  // one big button with "UIGestureEnvironmentException" as title, so we can
+  // just press Select on the remote to activate it.
+  [XCUIRemote.sharedRemote pressButton:XCUIRemoteButtonSelect];
+#endif
+  [self verifyCrashReportException:crashpad::kMachExceptionFromNSException];
+  NSDictionary* dict = [rootObject_ getAnnotations];
+  XCTAssertTrue([[dict[@"objects"][0] valueForKeyPath:@"exceptionReason"]
+      containsString:@"NSArray0 objectAtIndex:]: index 42 beyond bounds"]);
+  XCTAssertTrue([[dict[@"objects"][1] valueForKeyPath:@"exceptionName"]
+      isEqualToString:@"NSRangeException"]);
 }
 
-- (void)testAbort {
-  XCTAssertTrue(_app.state == XCUIApplicationStateRunningForeground);
+- (void)testCatchNSException {
+  [rootObject_ catchNSException];
 
-  // Crash the app.
-  CPTestSharedObject* rootObject = [EDOClientService rootObjectWithPort:12345];
-  [rootObject crashAbort];
+  // The app should not crash
+  XCTAssertTrue(app_.state == XCUIApplicationStateRunningForeground);
 
-  // Confirm the app is not running.
-  XCTAssertTrue([_app waitForState:XCUIApplicationStateNotRunning timeout:15]);
-  XCTAssertTrue(_app.state == XCUIApplicationStateNotRunning);
+  // No report should be generated.
+  [rootObject_ processIntermediateDumps];
+  XCTAssertEqual([rootObject_ pendingReportCount], 0);
+}
 
-  // TODO: Query the app for crash data
-  [_app launch];
-  XCTAssertTrue(_app.state == XCUIApplicationStateRunningForeground);
+// TODO(crbug.com/478240087): Fails on intel. Investigate and re-enable.
+#if defined(__x86_64__)
+#define MAYBE_testCrashCoreAutoLayoutSinkhole \
+  DISABLED_testCrashCoreAutoLayoutSinkhole
+#else
+#define MAYBE_testCrashCoreAutoLayoutSinkhole testCrashCoreAutoLayoutSinkhole
+#endif
+- (void)MAYBE_testCrashCoreAutoLayoutSinkhole {
+  [rootObject_ crashCoreAutoLayoutSinkhole];
+  [self verifyCrashReportException:crashpad::kMachExceptionFromNSException];
+  NSDictionary* dict = [rootObject_ getAnnotations];
+  XCTAssertTrue([[dict[@"objects"][0] valueForKeyPath:@"exceptionReason"]
+      containsString:@"Unable to activate constraint with anchors"]);
+  XCTAssertTrue([[dict[@"objects"][1] valueForKeyPath:@"exceptionName"]
+      isEqualToString:@"NSGenericException"]);
 }
 
-- (void)testBadAccess {
-  XCTAssertTrue(_app.state == XCUIApplicationStateRunningForeground);
+// This test cannot run correctly on tvOS: it is impossible to catch this stack
+// overflow as a Mach exception (like we do on iOS), and sigaltstack() is also
+// forbidden so we cannot detect it with POSIX signals either.
+// Per xnu-11215.81.4/bsd/uxkern/ux_exception.c's handle_ux_exception(), when a
+// stack overflow is detected but no alternate stack is specified, the kernel
+// will reset SIGSEGV to SIG_DFL before delivering the signal, so we are never
+// able to capture this crash. Even if we do pass SA_ONSTACK to sigaction(), we
+// will just crash a bit later, as we are still using the same stack that has
+// already overflown.
+#if !BUILDFLAG(IS_IOS_TVOS)
+- (void)testRecursion {
+  [rootObject_ crashRecursion];
+  [self verifyCrashReportException:EXC_BAD_ACCESS];
+}
+#endif
 
-  // Crash the app.
-  CPTestSharedObject* rootObject = [EDOClientService rootObjectWithPort:12345];
-  [rootObject crashBadAccess];
+- (void)testClientAnnotations {
+  [rootObject_ crashKillAbort];
+
+  // Set app launch args to trigger different client annotations.
+  NSArray<NSString*>* old_args = app_.launchArguments;
+  app_.launchArguments = @[ @"--alternate-client-annotations" ];
+  [self verifyCrashReportException:EXC_SOFT_SIGNAL];
+  NSNumber* report_exception;
+  XCTAssertTrue([rootObject_ pendingReportExceptionInfo:&report_exception]);
+  XCTAssertEqual(report_exception.intValue, SIGABRT);
+
+  app_.launchArguments = old_args;
+
+  // Confirm the initial crash took the standard annotations.
+  NSDictionary* dict = [rootObject_ getProcessAnnotations];
+  XCTAssertTrue([dict[@"crashpad"] isEqualToString:@"yes"]);
+  XCTAssertTrue([dict[@"plat"] isEqualToString:@"iOS"]);
+  XCTAssertTrue([dict[@"prod"] isEqualToString:@"xcuitest"]);
+  XCTAssertTrue([dict[@"ver"] isEqualToString:@"1"]);
+
+  // Confirm passing alternate client annotation args works.
+  [rootObject_ clearPendingReports];
+  [rootObject_ crashKillAbort];
+  [self verifyCrashReportException:EXC_SOFT_SIGNAL];
+  XCTAssertTrue([rootObject_ pendingReportExceptionInfo:&report_exception]);
+  XCTAssertEqual(report_exception.intValue, SIGABRT);
+
+  dict = [rootObject_ getProcessAnnotations];
+  XCTAssertTrue([dict[@"crashpad"] isEqualToString:@"no"]);
+  XCTAssertTrue([dict[@"plat"] isEqualToString:@"macOS"]);
+  XCTAssertTrue([dict[@"prod"] isEqualToString:@"some_app"]);
+  XCTAssertTrue([dict[@"ver"] isEqualToString:@"42"]);
+}
 
-  // Confirm the app is not running.
-  XCTAssertTrue([_app waitForState:XCUIApplicationStateNotRunning timeout:15]);
-  XCTAssertTrue(_app.state == XCUIApplicationStateNotRunning);
+#if TARGET_OS_SIMULATOR
+- (void)testCrashWithCrashInfoMessage {
+  if (@available(iOS 15.0, *)) {
+    // Figure out how to test this on iOS15.
+    return;
+  }
+  [rootObject_ crashWithCrashInfoMessage];
+  [self verifyCrashReportException:EXC_BAD_ACCESS];
+  NSDictionary* dict = [rootObject_ getAnnotations];
+  NSString* dyldMessage = dict[@"vector"][0];
+  XCTAssertTrue([dyldMessage isEqualToString:@"dyld: in dlsym()"]);
+}
+#endif
 
-  // TODO: Query the app for crash data
-  [_app launch];
-  XCTAssertTrue(_app.state == XCUIApplicationStateRunningForeground);
+// TODO(justincohen): Codesign crashy_initializer.so so it can run on devices.
+#if TARGET_OS_SIMULATOR
+- (void)testCrashWithDyldErrorString {
+  if (@available(iOS 15.0, *)) {
+    // iOS 15 uses dyld4, which doesn't use CRSetCrashLogMessage2
+    return;
+  }
+  [rootObject_ crashWithDyldErrorString];
+#if defined(ARCH_CPU_X86_64)
+  [self verifyCrashReportException:EXC_BAD_INSTRUCTION];
+#elif defined(ARCH_CPU_ARM64)
+  [self verifyCrashReportException:EXC_BREAKPOINT];
+#else
+#error Port to your CPU architecture
+#endif
+  NSArray* vector = [rootObject_ getAnnotations][@"vector"];
+  // This message is set by dyld-353.2.1/src/ImageLoaderMachO.cpp
+  // ImageLoaderMachO::doInitialization().
+  NSString* module = @"crashpad_snapshot_test_module_crashy_initializer.so";
+  XCTAssertTrue([vector[0] hasSuffix:module]);
 }
+#endif
 
-- (void)testException {
-  XCTAssertTrue(_app.state == XCUIApplicationStateRunningForeground);
+- (void)testCrashWithAnnotations {
+#if TARGET_OS_SIMULATOR
+  // This test will fail on <iOS17 simulators when running on macOS >=14.3 or
+  // <iOS18 simulators when running on macOS >=15.4 due to a bug in Simulator.
+  // crbug.com/328282286
+  if (crashpad::HasMacOSBrokeDYLDTaskInfo()) {
+    return;
+  }
+#endif
 
-  // Crash the app.
-  CPTestSharedObject* rootObject = [EDOClientService rootObjectWithPort:12345];
-  [rootObject crashException];
+  [rootObject_ crashWithAnnotations];
+  [self verifyCrashReportException:EXC_SOFT_SIGNAL];
+  NSNumber* report_exception;
+  XCTAssertTrue([rootObject_ pendingReportExceptionInfo:&report_exception]);
+  XCTAssertEqual(report_exception.intValue, SIGABRT);
+
+  NSDictionary* dict = [rootObject_ getAnnotations];
+  NSDictionary* simpleMap = dict[@"simplemap"];
+  XCTAssertTrue([simpleMap[@"#TEST# empty_value"] isEqualToString:@""]);
+  XCTAssertTrue([simpleMap[@"#TEST# key"] isEqualToString:@"value"]);
+  XCTAssertTrue([simpleMap[@"#TEST# longer"] isEqualToString:@"shorter"]);
+  XCTAssertTrue([simpleMap[@"#TEST# pad"] isEqualToString:@"crash"]);
+  XCTAssertTrue([simpleMap[@"#TEST# x"] isEqualToString:@"y"]);
+
+  XCTAssertTrue([[dict[@"objects"][0] valueForKeyPath:@"#TEST# same-name"]
+      isEqualToString:@"same-name 4"]);
+  XCTAssertTrue([[dict[@"objects"][1] valueForKeyPath:@"#TEST# same-name"]
+      isEqualToString:@"same-name 3"]);
+  XCTAssertTrue([[dict[@"objects"][2] valueForKeyPath:@"#TEST# one"]
+      isEqualToString:@"moocow"]);
+  // Ensure `ring_buffer` is present but not `busy_ring_buffer`.
+  XCTAssertEqual(1u, [dict[@"ringbuffers"] count]);
+  NSData* ringBufferNSData =
+      [dict[@"ringbuffers"][0] valueForKeyPath:@"#TEST# ring_buffer"];
+  crashpad::RingBufferData ringBufferData;
+  XCTAssertTrue(ringBufferData.DeserializeFromBuffer(ringBufferNSData.bytes,
+                                                     ringBufferNSData.length));
+  crashpad::LengthDelimitedRingBufferReader reader(ringBufferData);
+
+  std::vector<uint8_t> ringBufferEntry;
+  XCTAssertTrue(reader.Pop(ringBufferEntry));
+  NSString* firstEntry = [[NSString alloc] initWithBytes:ringBufferEntry.data()
+                                                  length:ringBufferEntry.size()
+                                                encoding:NSUTF8StringEncoding];
+  XCTAssertEqualObjects(firstEntry, @"hello");
+  ringBufferEntry.clear();
+
+  XCTAssertTrue(reader.Pop(ringBufferEntry));
+  NSString* secondEntry = [[NSString alloc] initWithBytes:ringBufferEntry.data()
+                                                   length:ringBufferEntry.size()
+                                                 encoding:NSUTF8StringEncoding];
+  XCTAssertEqualObjects(secondEntry, @"goodbye");
+  ringBufferEntry.clear();
+
+  XCTAssertFalse(reader.Pop(ringBufferEntry));
+}
 
-  // Confirm the app is not running.
-  XCTAssertTrue([_app waitForState:XCUIApplicationStateNotRunning timeout:15]);
-  XCTAssertTrue(_app.state == XCUIApplicationStateNotRunning);
+- (void)testCrashWithExtraMemory {
+#if TARGET_OS_SIMULATOR
+  // This test will fail on <iOS17 simulators when running on macOS >=14.3 or
+  // <iOS18 simulators when running on macOS >=15.4 due to a bug in Simulator.
+  // crbug.com/328282286
+  if (crashpad::HasMacOSBrokeDYLDTaskInfo()) {
+    return;
+  }
+#endif
 
-  // TODO: Query the app for crash data
-  [_app launch];
-  XCTAssertTrue(_app.state == XCUIApplicationStateRunningForeground);
+  [rootObject_ crashKillAbort];
+  [self verifyCrashReportException:EXC_SOFT_SIGNAL];
+
+  NSDictionary* dict = [rootObject_ getExtraMemory];
+  BOOL found = NO;
+  for (NSString* key in dict) {
+    if ([dict[key] isEqualToString:@"hello world"]) {
+      found = YES;
+      break;
+    }
+  }
+  XCTAssertTrue(found);
 }
 
-- (void)testNSException {
-  XCTAssertTrue(_app.state == XCUIApplicationStateRunningForeground);
+- (void)testExtensionStreams {
+#if TARGET_OS_SIMULATOR
+  // This test will fail on <iOS17 simulators when running on macOS >=14.3 or
+  // <iOS18 simulators when running on macOS >=15.4 due to a bug in Simulator.
+  // crbug.com/328282286
+  if (crashpad::HasMacOSBrokeDYLDTaskInfo()) {
+    return;
+  }
+#endif
+  [rootObject_ crashKillAbort];
+  [self verifyCrashReportException:EXC_SOFT_SIGNAL];
+  XCTAssertTrue([rootObject_ hasExtensionStream]);
+}
+
+- (void)testDumpWithoutCrash {
+  [rootObject_ generateDumpWithoutCrash:10 threads:3];
+
+  // The app should not crash
+  XCTAssertTrue(app_.state == XCUIApplicationStateRunningForeground);
+  XCTAssertEqual([rootObject_ pendingReportCount], 30);
+}
 
-  // Crash the app.
-  CPTestSharedObject* rootObject = [EDOClientService rootObjectWithPort:12345];
-  [rootObject crashNSException];
+- (void)testSimultaneousCrash {
+  [rootObject_ crashConcurrentSignalAndMach];
 
   // Confirm the app is not running.
-  XCTAssertTrue([_app waitForState:XCUIApplicationStateNotRunning timeout:15]);
-  XCTAssertTrue(_app.state == XCUIApplicationStateNotRunning);
+  XCTAssertTrue([app_ waitForState:XCUIApplicationStateNotRunning timeout:15]);
+  XCTAssertTrue(app_.state == XCUIApplicationStateNotRunning);
 
-  // TODO: Query the app for crash data
-  [_app launch];
-  XCTAssertTrue(_app.state == XCUIApplicationStateRunningForeground);
+  [app_ launch];
+  XCTAssertTrue(app_.state == XCUIApplicationStateRunningForeground);
+  rootObject_ = [EDOClientService rootObjectWithPort:12345];
+  XCTAssertEqual([rootObject_ pendingReportCount], 1);
 }
 
-- (void)testCrashUnreocgnizedSelectorAfterDelay {
-  XCTAssertTrue(_app.state == XCUIApplicationStateRunningForeground);
-
-  // Crash the app.
-  CPTestSharedObject* rootObject = [EDOClientService rootObjectWithPort:12345];
-  [rootObject crashUnreocgnizedSelectorAfterDelay];
+- (void)testSimultaneousNSException {
+  [rootObject_ catchConcurrentNSException];
 
-  // Confirm the app is not running.
-  XCTAssertTrue([_app waitForState:XCUIApplicationStateNotRunning timeout:15]);
-  XCTAssertTrue(_app.state == XCUIApplicationStateNotRunning);
+  // The app should not crash
+  XCTAssertTrue(app_.state == XCUIApplicationStateRunningForeground);
 
-  // TODO: Query the app for crash data
-  [_app launch];
-  XCTAssertTrue(_app.state == XCUIApplicationStateRunningForeground);
+  // No report should be generated.
+  [rootObject_ processIntermediateDumps];
+  XCTAssertEqual([rootObject_ pendingReportCount], 0);
 }
 
-- (void)testCatchUIGestureEnvironmentNSException {
-  XCTAssertTrue(_app.state == XCUIApplicationStateRunningForeground);
+- (void)testCrashInHandlerReentrant {
+  XCTAssertTrue(app_.state == XCUIApplicationStateRunningForeground);
+  rootObject_ = [EDOClientService rootObjectWithPort:12345];
 
-  // Tap the button with the string UIGestureEnvironmentException.
-  [_app.buttons[@"UIGestureEnvironmentException"] tap];
+  [rootObject_ crashInHandlerReentrant];
 
   // Confirm the app is not running.
-  XCTAssertTrue([_app waitForState:XCUIApplicationStateNotRunning timeout:15]);
-  XCTAssertTrue(_app.state == XCUIApplicationStateNotRunning);
-
-  // TODO: Query the app for crash data
-  [_app launch];
-  XCTAssertTrue(_app.state == XCUIApplicationStateRunningForeground);
-}
+  XCTAssertTrue([app_ waitForState:XCUIApplicationStateNotRunning timeout:15]);
+  XCTAssertTrue(app_.state == XCUIApplicationStateNotRunning);
 
-- (void)testCatchNSException {
-  XCTAssertTrue(_app.state == XCUIApplicationStateRunningForeground);
+  [app_ launch];
+  XCTAssertTrue(app_.state == XCUIApplicationStateRunningForeground);
+  rootObject_ = [EDOClientService rootObjectWithPort:12345];
 
-  // The app should not crash
-  CPTestSharedObject* rootObject = [EDOClientService rootObjectWithPort:12345];
-  [rootObject catchNSException];
+  XCTAssertEqual([rootObject_ pendingReportCount], 0);
 
-  XCTAssertTrue(_app.state == XCUIApplicationStateRunningForeground);
+  NSString* rawLogContents = [rootObject_ rawLogContents];
+  NSString* errmsg = @"Cannot DumpExceptionFromSignal without writer";
+  XCTAssertTrue([rawLogContents containsString:errmsg]);
 }
 
-- (void)testRecursion {
-  // TODO(justincohen): Crashpad iOS does not currently support stack type
-  // crashes.
-  return;
-
-  XCTAssertTrue(_app.state == XCUIApplicationStateRunningForeground);
+- (void)testFailureWhenHandlerAllocates {
+  XCTAssertTrue(app_.state == XCUIApplicationStateRunningForeground);
+  rootObject_ = [EDOClientService rootObjectWithPort:12345];
 
-  // Crash the app.
-  CPTestSharedObject* rootObject = [EDOClientService rootObjectWithPort:12345];
-  [rootObject crashRecursion];
+  [rootObject_ allocateWithForbiddenAllocators];
 
   // Confirm the app is not running.
-  XCTAssertTrue([_app waitForState:XCUIApplicationStateNotRunning timeout:15]);
-  XCTAssertTrue(_app.state == XCUIApplicationStateNotRunning);
+  XCTAssertTrue([app_ waitForState:XCUIApplicationStateNotRunning timeout:15]);
+  XCTAssertTrue(app_.state == XCUIApplicationStateNotRunning);
+
+  [app_ launch];
+  XCTAssertTrue(app_.state == XCUIApplicationStateRunningForeground);
+  rootObject_ = [EDOClientService rootObjectWithPort:12345];
+
+  XCTAssertEqual([rootObject_ pendingReportCount], 0);
 
-  // TODO: Query the app for crash data
-  [_app launch];
-  XCTAssertTrue(_app.state == XCUIApplicationStateRunningForeground);
+  NSString* rawLogContents = [rootObject_ rawLogContents];
+  XCTAssertTrue([rawLogContents containsString:@"allocator used in handler."]);
 }
 
 @end
diff --git a/extern/crashpad/crashpad/test/ios/google_test_setup.h b/extern/crashpad/crashpad/test/ios/google_test_setup.h
index 98bb942736..ca0572a895 100644
--- a/extern/crashpad/crashpad/test/ios/google_test_setup.h
+++ b/extern/crashpad/crashpad/test/ios/google_test_setup.h
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/test/ios/google_test_setup.mm b/extern/crashpad/crashpad/test/ios/google_test_setup.mm
index f49597e1ef..e68f4d011d 100644
--- a/extern/crashpad/crashpad/test/ios/google_test_setup.mm
+++ b/extern/crashpad/crashpad/test/ios/google_test_setup.mm
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,10 +20,6 @@
 #include "gtest/gtest.h"
 #include "test/ios/cptest_google_test_runner_delegate.h"
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 @interface UIApplication (Testing)
 - (void)_terminateWithStatus:(int)status;
 @end
diff --git a/extern/crashpad/crashpad/test/ios/host/BUILD.gn b/extern/crashpad/crashpad/test/ios/host/BUILD.gn
index 20f25003bc..1ae7fbacd3 100644
--- a/extern/crashpad/crashpad/test/ios/host/BUILD.gn
+++ b/extern/crashpad/crashpad/test/ios/host/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2020 The Crashpad Authors. All rights reserved.
+# Copyright 2020 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ source_set("app_shared_sources") {
   testonly = true
   sources = [ "cptest_shared_object.h" ]
   configs += [ "../../..:crashpad_config" ]
-  deps = [ "../../../build:ios_enable_arc" ]
+  deps = [ "../../../build:apple_enable_arc" ]
   frameworks = [ "UIKit.framework" ]
 }
 
@@ -35,13 +35,18 @@ static_library("app_host_sources") {
     "cptest_application_delegate.mm",
     "cptest_crash_view_controller.h",
     "cptest_crash_view_controller.mm",
+    "handler_forbidden_allocators.cc",
+    "handler_forbidden_allocators.h",
     "main.mm",
   ]
   configs += [ "../../..:crashpad_config" ]
   deps = [
     ":app_shared_sources",
-    "../../../build:ios_enable_arc",
+    "../../../build:apple_enable_arc",
     "../../../client",
+    "../../../minidump:test_support",
+    "../../../snapshot",
+    "../../../test",
     "../../../third_party/edo",
   ]
   frameworks = [
@@ -50,8 +55,24 @@ static_library("app_host_sources") {
   ]
 }
 
+# TODO(justincohen): Codesign crashy_initializer.so so it can run on devices.
+bundle_data("crashy_module_bundle") {
+  testonly = true
+  sources =
+      [ "$root_out_dir/crashpad_snapshot_test_module_crashy_initializer.so" ]
+  outputs = [ "{{bundle_contents_dir}}/crashpad_snapshot_test_module_crashy_initializer.so" ]
+  public_deps =
+      [ "../../../snapshot:crashpad_snapshot_test_module_crashy_initializer" ]
+}
+
 ios_app_bundle("ios_crash_xcuitests") {
-  info_plist = "Info.plist"
   testonly = true
-  deps = [ ":app_host_sources" ]
+  info_plist = "Info.plist"
+  if (crashpad_is_in_chromium) {
+    bundle_identifier = shared_bundle_id_for_test_apps
+  }
+  deps = [
+    ":app_host_sources",
+    ":crashy_module_bundle",
+  ]
 }
diff --git a/extern/crashpad/crashpad/test/ios/host/Info.plist b/extern/crashpad/crashpad/test/ios/host/Info.plist
index 4c62e96952..16716116f3 100644
--- a/extern/crashpad/crashpad/test/ios/host/Info.plist
+++ b/extern/crashpad/crashpad/test/ios/host/Info.plist
@@ -9,7 +9,7 @@
   <key>CFBundleExecutable</key>
   <string>${EXECUTABLE_NAME}</string>
   <key>CFBundleIdentifier</key>
-  <string>${IOS_BUNDLE_ID_PREFIX}.googletest.${EXECUTABLE_NAME:rfc1034identifier}</string>
+  <string>${BUNDLE_IDENTIFIER}</string>
   <key>CFBundleInfoDictionaryVersion</key>
   <string>6.0</string>
   <key>CFBundleName</key>
diff --git a/extern/crashpad/crashpad/test/ios/host/cptest_application_delegate.h b/extern/crashpad/crashpad/test/ios/host/cptest_application_delegate.h
index ca835f12a5..38a9b2fa03 100644
--- a/extern/crashpad/crashpad/test/ios/host/cptest_application_delegate.h
+++ b/extern/crashpad/crashpad/test/ios/host/cptest_application_delegate.h
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/test/ios/host/cptest_application_delegate.mm b/extern/crashpad/crashpad/test/ios/host/cptest_application_delegate.mm
index a9adea747b..118f0b4ac3 100644
--- a/extern/crashpad/crashpad/test/ios/host/cptest_application_delegate.mm
+++ b/extern/crashpad/crashpad/test/ios/host/cptest_application_delegate.mm
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,34 +13,214 @@
 // limitations under the License.
 
 #import "test/ios/host/cptest_application_delegate.h"
-
 #include <dispatch/dispatch.h>
+#include <dlfcn.h>
+#include <mach-o/dyld.h>
+#include <mach-o/dyld_images.h>
+#include <mach-o/nlist.h>
+#include <objc/objc-exception.h>
 #include <signal.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
+#include <thread>
+#include <utility>
 #include <vector>
 
 #import "Service/Sources/EDOHostNamingService.h"
 #import "Service/Sources/EDOHostService.h"
+#import "Service/Sources/NSObject+EDOValueObject.h"
+#include "base/logging.h"
+#include "base/strings/sys_string_conversions.h"
+#include "client/annotation.h"
+#include "client/annotation_list.h"
+#include "client/crash_report_database.h"
 #include "client/crashpad_client.h"
+#include "client/crashpad_info.h"
+#include "client/ring_buffer_annotation.h"
+#include "client/simple_string_dictionary.h"
+#include "client/simulate_crash.h"
+#include "minidump/test/minidump_user_extension_stream_util.h"
+#include "snapshot/minidump/process_snapshot_minidump.h"
+#include "test/file.h"
 #import "test/ios/host/cptest_crash_view_controller.h"
 #import "test/ios/host/cptest_shared_object.h"
+#import "test/ios/host/handler_forbidden_allocators.h"
+#include "util/file/filesystem.h"
+#include "util/ios/raw_logging.h"
+#include "util/thread/thread.h"
+
+using OperationStatus = crashpad::CrashReportDatabase::OperationStatus;
+using Report = crashpad::CrashReportDatabase::Report;
+
+namespace {
+
+class ReadToString : public crashpad::MemorySnapshot::Delegate {
+ public:
+  std::string result;
+
+  bool MemorySnapshotDelegateRead(void* data, size_t size) override {
+    result = std::string(reinterpret_cast<const char*>(data), size);
+    return true;
+  }
+};
+
+static constexpr char kExpectedStreamData[] = "Injected extension stream!";
+
+class TestUserStreamDataSource : public crashpad::UserStreamDataSource {
+ public:
+  TestUserStreamDataSource() {}
+
+  TestUserStreamDataSource(const TestUserStreamDataSource&) = delete;
+  TestUserStreamDataSource& operator=(const TestUserStreamDataSource&) = delete;
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
+  std::unique_ptr<crashpad::MinidumpUserExtensionStreamDataSource>
+  ProduceStreamData(crashpad::ProcessSnapshot* process_snapshot) override;
+};
+
+std::unique_ptr<crashpad::MinidumpUserExtensionStreamDataSource>
+TestUserStreamDataSource::ProduceStreamData(
+    crashpad::ProcessSnapshot* process_snapshot) {
+  return std::make_unique<crashpad::test::BufferExtensionStreamDataSource>(
+      0xCAFEBABE, kExpectedStreamData, sizeof(kExpectedStreamData));
+}
+
+constexpr crashpad::Annotation::Type kRingBufferType =
+    crashpad::Annotation::UserDefinedType(42);
+
+base::FilePath GetDatabaseDir() {
+  base::FilePath database_dir([NSFileManager.defaultManager
+                                  URLsForDirectory:NSDocumentDirectory
+                                         inDomains:NSUserDomainMask]
+                                  .lastObject.path.UTF8String);
+  return database_dir.Append("crashpad");
+}
+
+base::FilePath GetRawLogOutputFile() {
+  base::FilePath document_directory([NSFileManager.defaultManager
+                                        URLsForDirectory:NSDocumentDirectory
+                                               inDomains:NSUserDomainMask]
+                                        .lastObject.path.UTF8String);
+  return document_directory.Append("raw_log_output.txt");
+}
+
+std::unique_ptr<crashpad::CrashReportDatabase> GetDatabase() {
+  base::FilePath database_dir = GetDatabaseDir();
+  std::unique_ptr<crashpad::CrashReportDatabase> database =
+      crashpad::CrashReportDatabase::Initialize(database_dir);
+  return database;
+}
+
+OperationStatus GetPendingReports(std::vector<Report>* pending_reports) {
+  std::unique_ptr<crashpad::CrashReportDatabase> database(GetDatabase());
+  return database->GetPendingReports(pending_reports);
+}
+
+std::unique_ptr<crashpad::ProcessSnapshotMinidump>
+GetProcessSnapshotMinidumpFromSinglePending() {
+  std::vector<Report> pending_reports;
+  OperationStatus status = GetPendingReports(&pending_reports);
+  if (status != crashpad::CrashReportDatabase::kNoError ||
+      pending_reports.size() != 1) {
+    return nullptr;
+  }
+
+  auto reader = std::make_unique<crashpad::FileReader>();
+  auto process_snapshot = std::make_unique<crashpad::ProcessSnapshotMinidump>();
+  if (!reader->Open(pending_reports[0].file_path) ||
+      !process_snapshot->Initialize(reader.get())) {
+    return nullptr;
+  }
+  return process_snapshot;
+}
+
+UIWindow* GetAnyWindow() {
+#if defined(__IPHONE_15_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_15_0
+  UIWindowScene* scene = reinterpret_cast<UIWindowScene*>(
+      [UIApplication sharedApplication].connectedScenes.anyObject);
+  if (@available(iOS 15.0, tvOS 15.0, *)) {
+    return scene.keyWindow;
+  } else {
+    return [scene.windows firstObject];
+  }
+
+#else
+  return [UIApplication sharedApplication].windows[0];
 #endif
+}
+
+[[clang::optnone]] void recurse(int counter) {
+  // Fill up the stack faster.
+  int arr[1024];
+  arr[0] = counter;
+  if (counter > INT_MAX)
+    return;
+  recurse(++counter);
+}
 
-@implementation CPTestApplicationDelegate
+}  // namespace
+
+@interface CPTestApplicationDelegate ()
+- (void)processIntermediateDumps;
+@property(copy, nonatomic) NSString* raw_log_output;
+@end
+
+@implementation CPTestApplicationDelegate {
+  crashpad::CrashpadClient client_;
+  crashpad::ScopedFileHandle raw_logging_file_;
+  crashpad::SimpleAddressRangeBag extra_ranges_;
+  std::unique_ptr<std::string> extra_memory_string_;
+}
 
 @synthesize window = _window;
 
 - (BOOL)application:(UIApplication*)application
     didFinishLaunchingWithOptions:(NSDictionary*)launchOptions {
+  base::FilePath raw_log_file_path = GetRawLogOutputFile();
+  NSString* path =
+      [NSString stringWithUTF8String:raw_log_file_path.value().c_str()];
+  self.raw_log_output =
+      [[NSString alloc] initWithContentsOfFile:path
+                                      encoding:NSUTF8StringEncoding
+                                         error:NULL];
+  raw_logging_file_.reset(
+      LoggingOpenFileForWrite(raw_log_file_path,
+                              crashpad::FileWriteMode::kTruncateOrCreate,
+                              crashpad::FilePermissions::kOwnerOnly));
+  crashpad::internal::SetFileHandleForTesting(raw_logging_file_.get());
+
   // Start up crashpad.
-  crashpad::CrashpadClient client;
-  client.StartCrashpadInProcessHandler(base::FilePath(), "", {});
+  std::map<std::string, std::string> annotations = {
+      {"prod", "xcuitest"}, {"ver", "1"}, {"plat", "iOS"}, {"crashpad", "yes"}};
+  NSArray<NSString*>* arguments = [[NSProcessInfo processInfo] arguments];
+  if ([arguments containsObject:@"--alternate-client-annotations"]) {
+    annotations = {{"prod", "some_app"},
+                   {"ver", "42"},
+                   {"plat", "macOS"},
+                   {"crashpad", "no"}};
+  }
+  if (client_.StartCrashpadInProcessHandler(
+          GetDatabaseDir(),
+          "",
+          annotations,
+          crashpad::CrashpadClient::
+              ProcessPendingReportsObservationCallback())) {
+    crashpad::UserStreamDataSources user_stream_data_sources;
+    if ([arguments containsObject:@"--test-extension-streams"]) {
+      user_stream_data_sources.push_back(
+          std::make_unique<TestUserStreamDataSource>());
+    }
+    client_.ProcessIntermediateDumps({}, &user_stream_data_sources);
+  }
+
+  if ([arguments containsObject:@"--test-extra_memory"]) {
+    crashpad::CrashpadInfo::GetCrashpadInfo()->set_extra_memory_ranges(
+        &extra_ranges_);
+    extra_memory_string_ = std::make_unique<std::string>("hello world");
+    extra_ranges_.Insert((void*)extra_memory_string_->c_str(), 11);
+  }
 
   self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
   [self.window makeKeyAndVisible];
@@ -54,9 +234,14 @@ - (BOOL)application:(UIApplication*)application
   [EDOHostService serviceWithPort:12345
                        rootObject:[[CPTestSharedObject alloc] init]
                             queue:dispatch_get_main_queue()];
+
   return YES;
 }
 
+- (void)processIntermediateDumps {
+  client_.ProcessIntermediateDumps();
+}
+
 @end
 
 @implementation CPTestSharedObject
@@ -65,40 +250,208 @@ - (NSString*)testEDO {
   return @"crashpad";
 }
 
-- (void)crashBadAccess {
+- (void)processIntermediateDumps {
+  CPTestApplicationDelegate* delegate =
+      (CPTestApplicationDelegate*)UIApplication.sharedApplication.delegate;
+  [delegate processIntermediateDumps];
+}
+
+- (void)clearPendingReports {
+  std::unique_ptr<crashpad::CrashReportDatabase> database(GetDatabase());
+  std::vector<crashpad::CrashReportDatabase::Report> pending_reports;
+  database->GetPendingReports(&pending_reports);
+  for (auto report : pending_reports) {
+    database->DeleteReport(report.uuid);
+  }
+}
+
+- (int)pendingReportCount {
+  std::vector<Report> pending_reports;
+  OperationStatus status = GetPendingReports(&pending_reports);
+  if (status != crashpad::CrashReportDatabase::kNoError) {
+    return -1;
+  }
+  return pending_reports.size();
+}
+
+- (bool)pendingReportException:(NSNumber**)exception {
+  auto process_snapshot = GetProcessSnapshotMinidumpFromSinglePending();
+  if (!process_snapshot || !process_snapshot->Exception()->Exception())
+    return false;
+  *exception = [NSNumber
+      numberWithUnsignedInt:process_snapshot->Exception()->Exception()];
+  return true;
+}
+
+- (bool)pendingReportExceptionInfo:(NSNumber**)exception_info {
+  auto process_snapshot = GetProcessSnapshotMinidumpFromSinglePending();
+  if (!process_snapshot || !process_snapshot->Exception()->ExceptionInfo())
+    return false;
+
+  *exception_info = [NSNumber
+      numberWithUnsignedInt:process_snapshot->Exception()->ExceptionInfo()];
+  return true;
+}
+
+- (NSDictionary*)getAnnotations {
+  auto process_snapshot = GetProcessSnapshotMinidumpFromSinglePending();
+  if (!process_snapshot)
+    return @{};
+
+  NSDictionary* dict = @{
+    @"simplemap" : [@{} mutableCopy],
+    @"vector" : [@[] mutableCopy],
+    @"objects" : [@[] mutableCopy],
+    @"ringbuffers" : [@[] mutableCopy],
+  };
+  for (const auto* module : process_snapshot->Modules()) {
+    for (const auto& kv : module->AnnotationsSimpleMap()) {
+      [dict[@"simplemap"] setValue:@(kv.second.c_str())
+                            forKey:@(kv.first.c_str())];
+    }
+    for (const std::string& annotation : module->AnnotationsVector()) {
+      [dict[@"vector"] addObject:@(annotation.c_str())];
+    }
+    for (const auto& annotation : module->AnnotationObjects()) {
+      if (annotation.type ==
+          static_cast<uint16_t>(crashpad::Annotation::Type::kString)) {
+        std::string value(
+            reinterpret_cast<const char*>(annotation.value.data()),
+            annotation.value.size());
+        [dict[@"objects"]
+            addObject:@{@(annotation.name.c_str()) : @(value.c_str())}];
+      } else if (annotation.type == static_cast<uint16_t>(kRingBufferType)) {
+        NSData* data = [NSData dataWithBytes:annotation.value.data()
+                                      length:annotation.value.size()];
+        [dict[@"ringbuffers"] addObject:@{@(annotation.name.c_str()) : data}];
+      }
+    }
+  }
+  return [dict passByValue];
+}
+
+- (NSDictionary*)getExtraMemory {
+  auto process_snapshot = GetProcessSnapshotMinidumpFromSinglePending();
+  if (!process_snapshot)
+    return @{};
+
+  NSDictionary* dict = [@{} mutableCopy];
+
+  for (auto memory : process_snapshot->ExtraMemory()) {
+    ReadToString delegate;
+    if (memory->Size() > 0 && memory->Read(&delegate) &&
+        !delegate.result.empty()) {
+      NSString* key = [@(memory->Address()) stringValue];
+      NSString* value = @(delegate.result.c_str());
+      if (value.length) {
+        [dict setValue:value forKey:key];
+      }
+    }
+  }
+  return [dict passByValue];
+}
+
+- (BOOL)hasExtensionStream {
+  auto process_snapshot = GetProcessSnapshotMinidumpFromSinglePending();
+  if (!process_snapshot)
+    return NO;
+
+  auto streams = process_snapshot->CustomMinidumpStreams();
+  for (const auto& stream : streams) {
+    if (stream->stream_type() == 0xCAFEBABE) {
+      return memcmp(kExpectedStreamData,
+                    stream->data().data(),
+                    sizeof(kExpectedStreamData)) == 0;
+    }
+  }
+  return NO;
+}
+
+- (NSDictionary*)getProcessAnnotations {
+  auto process_snapshot = GetProcessSnapshotMinidumpFromSinglePending();
+  if (!process_snapshot)
+    return @{};
+
+  NSDictionary* dict = [@{} mutableCopy];
+  for (const auto& kv : process_snapshot->AnnotationsSimpleMap()) {
+    [dict setValue:@(kv.second.c_str()) forKey:@(kv.first.c_str())];
+  }
+
+  return [dict passByValue];
+}
+
+// Use [[clang::optnone]] here to get consistent exception codes, otherwise the
+// exception can change depending on optimization level.
+- (void)crashBadAccess [[clang::optnone]] {
   strcpy(nullptr, "bla");
 }
 
 - (void)crashKillAbort {
+  crashpad::test::ReplaceAllocatorsWithHandlerForbidden();
   kill(getpid(), SIGABRT);
 }
 
-- (void)crashSegv {
-  long* zero = nullptr;
-  *zero = 0xc045004d;
-}
-
 - (void)crashTrap {
+  crashpad::test::ReplaceAllocatorsWithHandlerForbidden();
   __builtin_trap();
 }
 
 - (void)crashAbort {
+  crashpad::test::ReplaceAllocatorsWithHandlerForbidden();
   abort();
 }
 
 - (void)crashException {
   std::vector<int> empty_vector = {};
-  empty_vector.at(42);
+  std::ignore = empty_vector.at(42);
 }
 
 - (void)crashNSException {
-  // EDO has its own sinkhole.
+  // EDO has its own sinkhole which will suppress this attempt at an NSException
+  // crash, so dispatch this out of the sinkhole.
   dispatch_async(dispatch_get_main_queue(), ^{
-    NSArray* empty_array = @[];
-    [empty_array objectAtIndex:42];
+    NSError* error = [NSError errorWithDomain:@"com.crashpad.xcuitests"
+                                         code:200
+                                     userInfo:@{@"Error Object" : self}];
+
+    [[NSException exceptionWithName:NSInternalInconsistencyException
+                             reason:@"Intentionally throwing error."
+                           userInfo:@{NSUnderlyingErrorKey : error}] raise];
   });
 }
 
+- (void)crashNotAnNSException {
+  @throw @"Boom";
+}
+
+- (void)crashUnhandledNSException {
+  std::thread t([self]() {
+    @autoreleasepool {
+      @try {
+        NSError* error = [NSError errorWithDomain:@"com.crashpad.xcuitests"
+                                             code:200
+                                         userInfo:@{@"Error Object" : self}];
+
+        [[NSException exceptionWithName:NSInternalInconsistencyException
+                                 reason:@"Intentionally throwing error."
+                               userInfo:@{NSUnderlyingErrorKey : error}] raise];
+      } @catch (id reason_exception) {
+        // Intentionally use throw here to intentionally make a sinkhole that
+        // will be missed by ObjcPreprocessor.
+        objc_exception_throw(reason_exception);
+      }
+    }
+  });
+  t.join();
+}
+
+- (void)crashUnrecognizedSelectorAfterDelay {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wundeclared-selector"
+  [self performSelector:@selector(does_not_exist) withObject:nil afterDelay:1];
+#pragma clang diagnostic pop
+}
+
 - (void)catchNSException {
   @try {
     NSArray* empty_array = @[];
@@ -108,19 +461,177 @@ - (void)catchNSException {
   }
 }
 
-- (void)crashUnreocgnizedSelectorAfterDelay {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wundeclared-selector"
-  [self performSelector:@selector(does_not_exist) withObject:nil afterDelay:1];
-#pragma clang diagnostic pop
+- (void)crashCoreAutoLayoutSinkhole {
+  // EDO has its own sinkhole which will suppress this attempt at an NSException
+  // crash, so dispatch this out of the sinkhole.
+  dispatch_async(dispatch_get_main_queue(), ^{
+    UIView* unattachedView = [[UIView alloc] init];
+    UIWindow* window = GetAnyWindow();
+    [NSLayoutConstraint activateConstraints:@[
+      [window.rootViewController.view.bottomAnchor
+          constraintEqualToAnchor:unattachedView.bottomAnchor],
+    ]];
+  });
 }
 
-- (void)recurse {
-  [self recurse];
+- (void)crashRecursion {
+  recurse(0);
 }
 
-- (void)crashRecursion {
-  [self recurse];
+- (void)crashWithCrashInfoMessage {
+  dlsym(nullptr, nullptr);
+}
+
+- (void)crashWithDyldErrorString {
+  std::string crashy_initializer =
+      base::SysNSStringToUTF8([[NSBundle mainBundle]
+          pathForResource:@"crashpad_snapshot_test_module_crashy_initializer"
+                   ofType:@"so"]);
+  dlopen(crashy_initializer.c_str(), RTLD_LAZY | RTLD_LOCAL);
+}
+
+- (void)crashWithAnnotations {
+  // This is “leaked” to crashpad_info.
+  crashpad::SimpleStringDictionary* simple_annotations =
+      new crashpad::SimpleStringDictionary();
+  simple_annotations->SetKeyValue("#TEST# pad", "break");
+  simple_annotations->SetKeyValue("#TEST# key", "value");
+  simple_annotations->SetKeyValue("#TEST# pad", "crash");
+  simple_annotations->SetKeyValue("#TEST# x", "y");
+  simple_annotations->SetKeyValue("#TEST# longer", "shorter");
+  simple_annotations->SetKeyValue("#TEST# empty_value", "");
+
+  crashpad::CrashpadInfo* crashpad_info =
+      crashpad::CrashpadInfo::GetCrashpadInfo();
+
+  crashpad_info->set_simple_annotations(simple_annotations);
+
+  crashpad::AnnotationList::Register();  // This is “leaked” to crashpad_info.
+
+  static crashpad::StringAnnotation<32> test_annotation_one{"#TEST# one"};
+  static crashpad::StringAnnotation<32> test_annotation_two{"#TEST# two"};
+  static crashpad::StringAnnotation<32> test_annotation_three{
+      "#TEST# same-name"};
+  static crashpad::StringAnnotation<32> test_annotation_four{
+      "#TEST# same-name"};
+  static crashpad::RingBufferAnnotation<32> test_ring_buffer_annotation(
+      kRingBufferType, "#TEST# ring_buffer");
+  static crashpad::RingBufferAnnotation<32> test_busy_ring_buffer_annotation(
+      kRingBufferType, "#TEST# busy_ring_buffer");
+
+  test_annotation_one.Set("moocow");
+  test_annotation_two.Set("this will be cleared");
+  test_annotation_three.Set("same-name 3");
+  test_annotation_four.Set("same-name 4");
+  test_annotation_two.Clear();
+  test_ring_buffer_annotation.Push("hello", 5);
+  test_ring_buffer_annotation.Push("goodbye", 7);
+  test_busy_ring_buffer_annotation.Push("busy", 4);
+  // Take the scoped spin guard on `test_busy_ring_buffer_annotation` to mimic
+  // an in-flight `Push()` so its contents are not included in the dump.
+  auto guard = test_busy_ring_buffer_annotation.TryCreateScopedSpinGuard(
+      /*timeout_nanos=*/0);
+  abort();
+}
+
+class RaceThread : public crashpad::Thread {
+ public:
+  explicit RaceThread() : Thread() {}
+
+  void SetCount(int count) { count_ = count; }
+
+ private:
+  void ThreadMain() override {
+    for (int i = 0; i < count_; ++i) {
+      CRASHPAD_SIMULATE_CRASH();
+    }
+  }
+
+  int count_;
+};
+
+- (void)generateDumpWithoutCrash:(int)dump_count threads:(int)threads {
+  std::vector<RaceThread> race_threads(threads);
+  for (RaceThread& race_thread : race_threads) {
+    race_thread.SetCount(dump_count);
+    race_thread.Start();
+  }
+
+  for (RaceThread& race_thread : race_threads) {
+    race_thread.Join();
+  }
+}
+
+class CrashThread : public crashpad::Thread {
+ public:
+  explicit CrashThread(bool signal) : Thread(), signal_(signal) {}
+
+ private:
+  void ThreadMain() override {
+    sleep(1);
+    if (signal_) {
+      abort();
+    } else {
+      __builtin_trap();
+    }
+  }
+  bool signal_;
+};
+
+- (void)crashConcurrentSignalAndMach {
+  CrashThread signal_thread(true);
+  CrashThread mach_thread(false);
+  signal_thread.Start();
+  mach_thread.Start();
+  signal_thread.Join();
+  mach_thread.Join();
+}
+
+class ThrowNSExceptionThread : public crashpad::Thread {
+ public:
+  explicit ThrowNSExceptionThread() : Thread() {}
+
+ private:
+  void ThreadMain() override {
+    for (int i = 0; i < 300; ++i) {
+      @try {
+        NSArray* empty_array = @[];
+        [empty_array objectAtIndex:42];
+      } @catch (NSException* exception) {
+      } @finally {
+      }
+    }
+  }
+};
+
+- (void)catchConcurrentNSException {
+  std::vector<ThrowNSExceptionThread> race_threads(30);
+  for (ThrowNSExceptionThread& race_thread : race_threads) {
+    race_thread.Start();
+  }
+
+  for (ThrowNSExceptionThread& race_thread : race_threads) {
+    race_thread.Join();
+  }
+}
+
+- (void)crashInHandlerReentrant {
+  crashpad::CrashpadClient client_;
+  client_.SetExceptionCallbackForTesting(abort);
+
+  // Trigger an exception.
+  [self crashTrap];
+}
+
+- (void)allocateWithForbiddenAllocators {
+  crashpad::test::ReplaceAllocatorsWithHandlerForbidden();
+  (void)malloc(10);
+}
+
+- (NSString*)rawLogContents {
+  CPTestApplicationDelegate* delegate =
+      (CPTestApplicationDelegate*)UIApplication.sharedApplication.delegate;
+  return delegate.raw_log_output;
 }
 
 @end
diff --git a/extern/crashpad/crashpad/test/ios/host/cptest_crash_view_controller.h b/extern/crashpad/crashpad/test/ios/host/cptest_crash_view_controller.h
index 2a41e129e6..8f15d286f2 100644
--- a/extern/crashpad/crashpad/test/ios/host/cptest_crash_view_controller.h
+++ b/extern/crashpad/crashpad/test/ios/host/cptest_crash_view_controller.h
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/test/ios/host/cptest_crash_view_controller.mm b/extern/crashpad/crashpad/test/ios/host/cptest_crash_view_controller.mm
index c467722907..c866388c15 100644
--- a/extern/crashpad/crashpad/test/ios/host/cptest_crash_view_controller.mm
+++ b/extern/crashpad/crashpad/test/ios/host/cptest_crash_view_controller.mm
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,10 +14,6 @@
 
 #import "test/ios/host/cptest_crash_view_controller.h"
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 @implementation CPTestCrashViewController
 
 - (void)loadView {
@@ -58,7 +54,6 @@ - (void)throwUIGestureEnvironmentException {
 
 - (void)viewDidLoad {
   [super viewDidLoad];
-
   self.view.backgroundColor = UIColor.redColor;
 }
 
diff --git a/extern/crashpad/crashpad/test/ios/host/cptest_shared_object.h b/extern/crashpad/crashpad/test/ios/host/cptest_shared_object.h
index 70c814b07a..985bd46ab4 100644
--- a/extern/crashpad/crashpad/test/ios/host/cptest_shared_object.h
+++ b/extern/crashpad/crashpad/test/ios/host/cptest_shared_object.h
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,22 +18,61 @@
 #import <UIKit/UIKit.h>
 
 @interface CPTestSharedObject : NSObject
+
 // Returns the string "crashpad" for testing EDO.
 - (NSString*)testEDO;
 
+// Tell Crashpad to process intermediate dumps.
+- (void)processIntermediateDumps;
+
+// Clear pending reports from Crashpad database.
+- (void)clearPendingReports;
+
+// Returns the number of pending reports, or -1 if there's an error getting
+// report.
+- (int)pendingReportCount;
+
+// Returns true if there's a single pending report and sets the exception code
+// in the out |exception| parameter. Returns false if there's a different number
+// of pending reports.
+- (bool)pendingReportException:(NSNumber**)exception;
+
+// Returns true if there's a single pending report and sets the second-level
+// exception code in the out |exception_info| parameter. Returns false if
+// there's a different number of pending reports.
+- (bool)pendingReportExceptionInfo:(NSNumber**)exception_info;
+
+// Return an NSDictionary with a dictionary named "simplemap", an array named
+// "vector" an array named "objects", and an array named "ringbuffers",
+// representing the combination of all modules AnnotationsSimpleMap,
+// AnnotationsVector and AnnotationObjects (String and RingBuffer type)
+// respectively.
+- (NSDictionary*)getAnnotations;
+
+// Return an NSDictionary with a dictionary representing all key value pairs of
+// ExtraMemory MemorySnapshots where the data can be converted to an NSString.
+- (NSDictionary*)getExtraMemory;
+
+// Returns YES if a minidump contains the expected custom stream data.
+- (BOOL)hasExtensionStream;
+
+// Return an NSDictionary representing the ProcessSnapshotMinidump
+// AnnotationsSimpleMap.
+- (NSDictionary*)getProcessAnnotations;
+
 // Triggers an EXC_BAD_ACCESS exception and crash.
 - (void)crashBadAccess;
 
-// Triggers a crash with a call to kill(SIGABRT).
+// Triggers a crash with a call to kill(SIGABRT). This crash runs with
+// ReplaceAllocatorsWithHandlerForbidden.
 - (void)crashKillAbort;
 
-// Triggers a segfault crash.
-- (void)crashSegv;
-
-// Trigger a crash with a __builtin_trap.
+// Trigger a crash with a __builtin_trap. This crash runs with
+// ReplaceAllocatorsWithHandlerForbidden.
 - (void)crashTrap;
 
-// Trigger a crash with an abort().
+// Trigger a crash with an abort(). This crash runs with
+// ReplaceAllocatorsWithHandlerForbidden.
 - (void)crashAbort;
 
 // Trigger a crash with an uncaught exception.
@@ -42,14 +81,54 @@
 // Trigger a crash with an uncaught NSException.
 - (void)crashNSException;
 
+// Trigger a crash throwing something that isn't an NSException (an NSString).
+- (void)crashNotAnNSException;
+
+// Trigger a crash with an uncaught and unhandled NSException.
+- (void)crashUnhandledNSException;
+
 // Trigger an unrecognized selector after delay.
-- (void)crashUnreocgnizedSelectorAfterDelay;
+- (void)crashUnrecognizedSelectorAfterDelay;
 
-// Trigger a caught NSxception.
+// Trigger a caught NSException, this will not crash
 - (void)catchNSException;
 
+// Trigger an NSException with sinkholes in CoreAutoLayout.
+- (void)crashCoreAutoLayoutSinkhole;
+
 // Trigger a crash with an infinite recursion.
 - (void)crashRecursion;
+
+// Trigger a crash dlsym that contains a crash_info message.
+- (void)crashWithCrashInfoMessage;
+
+// Trigger an error that will to the dyld error string `_error_string`
+- (void)crashWithDyldErrorString;
+
+// Trigger a crash after writing various annotations.
+- (void)crashWithAnnotations;
+
+// Triggers a DumpWithoutCrash |dump_count| times in each of |threads| threads.
+- (void)generateDumpWithoutCrash:(int)dump_count threads:(int)threads;
+
+// Triggers a simulataneous Mach exception and signal in different threads.
+- (void)crashConcurrentSignalAndMach;
+
+// Triggers simultaneous caught NSExceptions
+- (void)catchConcurrentNSException;
+
+// Triggers a SIGABRT signal while handling an NSException to test reentrant
+// exceptions.
+- (void)crashInHandlerReentrant;
+
+// Runs with ReplaceAllocatorsWithHandlerForbidden and allocates memory, testing
+// that the handler forbidden allocator works.
+- (void)allocateWithForbiddenAllocators;
+
+// Return the contents of the RawLog output from the previous run of the host
+// application.
+- (NSString*)rawLogContents;
+
 @end
 
 #endif  // CRASHPAD_TEST_IOS_HOST_SHARED_OBJECT_H_
diff --git a/extern/crashpad/crashpad/test/ios/host/handler_forbidden_allocators.cc b/extern/crashpad/crashpad/test/ios/host/handler_forbidden_allocators.cc
new file mode 100644
index 0000000000..65e0a136b0
--- /dev/null
+++ b/extern/crashpad/crashpad/test/ios/host/handler_forbidden_allocators.cc
@@ -0,0 +1,394 @@
+// Copyright 2022 The Crashpad Authors
+//
+// 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.
+
+#import "test/ios/host/handler_forbidden_allocators.h"
+
+#include <CoreFoundation/CoreFoundation.h>
+#include <malloc/malloc.h>
+#include <pthread.h>
+
+#include <limits>
+
+#include "base/apple/mach_logging.h"
+#include "base/check_op.h"
+#include "client/crashpad_client.h"
+#include "util/ios/raw_logging.h"
+
+namespace crashpad {
+namespace test {
+
+namespace {
+
+uint64_t g_main_thread = 0;
+uint64_t g_mach_exception_thread = 0;
+
+// Somewhat simplified logic copied from Chromium's
+// base/allocator/partition_allocator/shim/malloc_zone_functions_apple.h. The
+// arrays g_original_zones and g_original_zones_ptr stores all information about
+// malloc zones before they are shimmed. This information needs to be accessed
+// during dispatch back into the zone.
+constexpr int kMaxZoneCount = 30;
+malloc_zone_t g_original_zones[kMaxZoneCount];
+malloc_zone_t* g_original_zones_ptr[kMaxZoneCount];
+unsigned int g_zone_count = 0;
+
+struct _malloc_zone_t original_zone_for_zone(struct _malloc_zone_t* zone) {
+  for (unsigned int i = 0; i < g_zone_count; ++i) {
+    if (g_original_zones_ptr[i] == zone) {
+      return g_original_zones[i];
+    }
+  }
+  return g_original_zones[0];
+}
+
+bool is_handler_thread() {
+  uint64_t thread_self;
+  pthread_threadid_np(pthread_self(), &thread_self);
+  return (thread_self == g_main_thread ||
+          thread_self == g_mach_exception_thread);
+}
+
+void* handler_forbidden_malloc(struct _malloc_zone_t* zone, size_t size) {
+  if (is_handler_thread()) {
+    CRASHPAD_RAW_LOG("handler_forbidden_malloc allocator used in handler.");
+    exit(EXIT_FAILURE);
+  }
+  return original_zone_for_zone(zone).malloc(zone, size);
+}
+
+void* handler_forbidden_calloc(struct _malloc_zone_t* zone,
+                               size_t num_items,
+                               size_t size) {
+  if (is_handler_thread()) {
+    CRASHPAD_RAW_LOG("handler_forbidden_calloc allocator used in handler.");
+    exit(EXIT_FAILURE);
+  }
+  return original_zone_for_zone(zone).calloc(zone, num_items, size);
+}
+
+void* handler_forbidden_valloc(struct _malloc_zone_t* zone, size_t size) {
+  if (is_handler_thread()) {
+    CRASHPAD_RAW_LOG("handler_forbidden_valloc allocator used in handler.");
+    exit(EXIT_FAILURE);
+  }
+  return original_zone_for_zone(zone).valloc(zone, size);
+}
+
+void handler_forbidden_free(struct _malloc_zone_t* zone, void* ptr) {
+  if (is_handler_thread()) {
+    CRASHPAD_RAW_LOG("handler_forbidden_free allocator used in handler.");
+    exit(EXIT_FAILURE);
+  }
+  original_zone_for_zone(zone).free(zone, ptr);
+}
+
+void* handler_forbidden_realloc(struct _malloc_zone_t* zone,
+                                void* ptr,
+                                size_t size) {
+  if (is_handler_thread()) {
+    CRASHPAD_RAW_LOG("handler_forbidden_realloc allocator used in handler.");
+    exit(EXIT_FAILURE);
+  }
+  return original_zone_for_zone(zone).realloc(zone, ptr, size);
+}
+
+void handler_forbidden_destroy(struct _malloc_zone_t* zone) {
+  if (is_handler_thread()) {
+    CRASHPAD_RAW_LOG("handler_forbidden_destroy allocator used in handler.");
+    exit(EXIT_FAILURE);
+  }
+  original_zone_for_zone(zone).destroy(zone);
+}
+
+void* handler_forbidden_memalign(struct _malloc_zone_t* zone,
+                                 size_t alignment,
+                                 size_t size) {
+  if (is_handler_thread()) {
+    CRASHPAD_RAW_LOG("handler_forbidden_memalign allocator used in handler.");
+    exit(EXIT_FAILURE);
+  }
+  return original_zone_for_zone(zone).memalign(zone, alignment, size);
+}
+
+unsigned handler_forbidden_batch_malloc(struct _malloc_zone_t* zone,
+                                        size_t size,
+                                        void** results,
+                                        unsigned num_requested) {
+  if (is_handler_thread()) {
+    CRASHPAD_RAW_LOG(
+        "handler_forbidden_batch_malloc allocator used in handler.");
+    exit(EXIT_FAILURE);
+  }
+  return original_zone_for_zone(zone).batch_malloc(
+      zone, size, results, num_requested);
+}
+
+void handler_forbidden_batch_free(struct _malloc_zone_t* zone,
+                                  void** to_be_freed,
+                                  unsigned num_to_be_freed) {
+  if (is_handler_thread()) {
+    CRASHPAD_RAW_LOG("handler_forbidden_batch_free allocator used in handler.");
+    exit(EXIT_FAILURE);
+  }
+  original_zone_for_zone(zone).batch_free(zone, to_be_freed, num_to_be_freed);
+}
+
+void handler_forbidden_free_definite_size(struct _malloc_zone_t* zone,
+                                          void* ptr,
+                                          size_t size) {
+  if (is_handler_thread()) {
+    CRASHPAD_RAW_LOG(
+        "handler_forbidden_free_definite_size allocator used in handler.");
+    exit(EXIT_FAILURE);
+  }
+  original_zone_for_zone(zone).free_definite_size(zone, ptr, size);
+}
+
+size_t handler_forbidden_pressure_relief(struct _malloc_zone_t* zone,
+                                         size_t goal) {
+  if (is_handler_thread()) {
+    CRASHPAD_RAW_LOG(
+        "handler_forbidden_pressure_relief allocator used in handler.");
+    exit(EXIT_FAILURE);
+  }
+  return original_zone_for_zone(zone).pressure_relief(zone, goal);
+}
+
+boolean_t handler_forbidden_claimed_address(struct _malloc_zone_t* zone,
+                                            void* ptr) {
+  if (is_handler_thread()) {
+    CRASHPAD_RAW_LOG(
+        "handler_forbidden_claimed_address allocator used in handler.");
+    exit(EXIT_FAILURE);
+  }
+
+  if (original_zone_for_zone(zone).claimed_address) {
+    return original_zone_for_zone(zone).claimed_address(zone, ptr);
+  }
+
+  // If the fast API 'claimed_address' is not implemented in the specified zone,
+  // fall back to 'size' function, which also tells whether the given address
+  // belongs to the zone or not although it'd be slow.
+  return original_zone_for_zone(zone).size(zone, ptr);
+}
+
+#if defined(__IPHONE_16_1) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_16_1
+// The fallback function to be called when try_free_default_function receives a
+// pointer which doesn't belong to the allocator.
+void TryFreeDefaultFallbackToFindZoneAndFree(void* ptr) {
+  unsigned int zone_count = 0;
+  vm_address_t* zones = nullptr;
+  kern_return_t result =
+      malloc_get_all_zones(mach_task_self(), nullptr, &zones, &zone_count);
+  MACH_CHECK(result == KERN_SUCCESS, result) << "malloc_get_all_zones";
+
+  // "find_zone_and_free" expected by try_free_default.
+  //
+  // libmalloc's zones call find_registered_zone() in case the default one
+  // doesn't handle the allocation. We can't, so we try to emulate it. See the
+  // implementation in libmalloc/src/malloc.c for details.
+  // https://github.com/apple-oss-distributions/libmalloc/blob/main/src/malloc.c
+  for (unsigned int i = 0; i < zone_count; ++i) {
+    malloc_zone_t* zone = reinterpret_cast<malloc_zone_t*>(zones[i]);
+    if (size_t size = zone->size(zone, ptr)) {
+      if (zone->version >= 6 && zone->free_definite_size) {
+        zone->free_definite_size(zone, ptr, size);
+      } else {
+        zone->free(zone, ptr);
+      }
+      return;
+    }
+  }
+}
+
+void handler_forbidden_try_free_default(struct _malloc_zone_t* zone,
+                                        void* ptr) {
+  if (is_handler_thread()) {
+    CRASHPAD_RAW_LOG(
+        "handler_forbidden_try_free_default allocator used in handler.");
+    exit(EXIT_FAILURE);
+  }
+
+  if (original_zone_for_zone(zone).try_free_default) {
+    return original_zone_for_zone(zone).try_free_default(zone, ptr);
+  }
+  TryFreeDefaultFallbackToFindZoneAndFree(ptr);
+}
+#endif
+
+size_t handler_forbidden_size(struct _malloc_zone_t* zone, const void* ptr) {
+  if (is_handler_thread()) {
+    CRASHPAD_RAW_LOG("handler_forbidden_size allocator used in handler.");
+    exit(EXIT_FAILURE);
+  }
+  return original_zone_for_zone(zone).size(zone, ptr);
+}
+
+bool DeprotectMallocZone(malloc_zone_t* default_zone,
+                         vm_address_t* reprotection_start,
+                         vm_size_t* reprotection_length,
+                         vm_prot_t* reprotection_value) {
+  mach_port_t unused;
+  *reprotection_start = reinterpret_cast<vm_address_t>(default_zone);
+  struct vm_region_basic_info_64 info;
+  mach_msg_type_number_t count = VM_REGION_BASIC_INFO_COUNT_64;
+  kern_return_t result = vm_region_64(mach_task_self(),
+                                      reprotection_start,
+                                      reprotection_length,
+                                      VM_REGION_BASIC_INFO_64,
+                                      reinterpret_cast<vm_region_info_t>(&info),
+                                      &count,
+                                      &unused);
+  if (result != KERN_SUCCESS) {
+    MACH_LOG(ERROR, result) << "vm_region_64";
+    return false;
+  }
+
+  // The kernel always returns a null object for VM_REGION_BASIC_INFO_64, but
+  // balance it with a deallocate in case this ever changes. See
+  // the VM_REGION_BASIC_INFO_64 case in vm_map_region() in 10.15's
+  // https://opensource.apple.com/source/xnu/xnu-6153.11.26/osfmk/vm/vm_map.c .
+  mach_port_deallocate(mach_task_self(), unused);
+
+  if (!(info.max_protection & VM_PROT_WRITE)) {
+    LOG(ERROR) << "Invalid max_protection " << info.max_protection;
+    return false;
+  }
+
+  // Does the region fully enclose the zone pointers? Possibly unwarranted
+  // simplification used: using the size of a full version 10 malloc zone rather
+  // than the actual smaller size if the passed-in zone is not version 10.
+  DCHECK_LE(*reprotection_start, reinterpret_cast<vm_address_t>(default_zone));
+  vm_size_t zone_offset = reinterpret_cast<vm_address_t>(default_zone) -
+                          reinterpret_cast<vm_address_t>(*reprotection_start);
+  DCHECK_LE(zone_offset + sizeof(malloc_zone_t), *reprotection_length);
+
+  if (info.protection & VM_PROT_WRITE) {
+    // No change needed; the zone is already writable.
+    *reprotection_start = 0;
+    *reprotection_length = 0;
+    *reprotection_value = VM_PROT_NONE;
+  } else {
+    *reprotection_value = info.protection;
+    result = vm_protect(mach_task_self(),
+                        *reprotection_start,
+                        *reprotection_length,
+                        false,
+                        info.protection | VM_PROT_WRITE);
+    if (result != KERN_SUCCESS) {
+      MACH_LOG(ERROR, result) << "vm_protect";
+      return false;
+    }
+  }
+  return true;
+}
+
+void ReplaceZoneFunctions(malloc_zone_t* zone, const malloc_zone_t* functions) {
+  // Remove protection.
+  vm_address_t reprotection_start = 0;
+  vm_size_t reprotection_length = 0;
+  vm_prot_t reprotection_value = VM_PROT_NONE;
+  bool success = DeprotectMallocZone(
+      zone, &reprotection_start, &reprotection_length, &reprotection_value);
+  if (!success) {
+    return;
+  }
+
+  zone->size = functions->size;
+  zone->malloc = functions->malloc;
+  zone->calloc = functions->calloc;
+  zone->valloc = functions->valloc;
+  zone->free = functions->free;
+  zone->realloc = functions->realloc;
+  zone->destroy = functions->destroy;
+  zone->batch_malloc = functions->batch_malloc;
+  zone->batch_free = functions->batch_free;
+  zone->memalign = functions->memalign;
+  zone->free_definite_size = functions->free_definite_size;
+  zone->pressure_relief = functions->pressure_relief;
+  zone->claimed_address = functions->claimed_address;
+#if defined(__IPHONE_16_1) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_16_1
+  if (zone->version >= 13 && functions->try_free_default) {
+    zone->try_free_default = functions->try_free_default;
+  }
+#endif
+
+  // Restore protection if it was active.
+  if (reprotection_start) {
+    kern_return_t result = vm_protect(mach_task_self(),
+                                      reprotection_start,
+                                      reprotection_length,
+                                      false,
+                                      reprotection_value);
+    if (result != KERN_SUCCESS) {
+      MACH_LOG(ERROR, result) << "vm_protect";
+      return;
+    }
+  }
+}
+
+}  // namespace
+
+void ReplaceAllocatorsWithHandlerForbidden() {
+  pthread_threadid_np(pthread_self(), &g_main_thread);
+
+  CrashpadClient crashpad_client;
+  g_mach_exception_thread = crashpad_client.GetThreadIdForTesting();
+
+  malloc_zone_t new_functions = {};
+  new_functions.size = handler_forbidden_size;
+  new_functions.malloc = handler_forbidden_malloc;
+  new_functions.calloc = handler_forbidden_calloc;
+  new_functions.valloc = handler_forbidden_valloc;
+  new_functions.free = handler_forbidden_free;
+  new_functions.realloc = handler_forbidden_realloc;
+  new_functions.destroy = handler_forbidden_destroy;
+  new_functions.batch_malloc = handler_forbidden_batch_malloc;
+  new_functions.batch_free = handler_forbidden_batch_free;
+  new_functions.memalign = handler_forbidden_memalign;
+  new_functions.free_definite_size = handler_forbidden_free_definite_size;
+  new_functions.pressure_relief = handler_forbidden_pressure_relief;
+  new_functions.claimed_address = handler_forbidden_claimed_address;
+#if defined(__IPHONE_16_1) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_16_1
+  new_functions.try_free_default = handler_forbidden_try_free_default;
+#endif
+  malloc_zone_t* default_zone = malloc_default_zone();
+  g_original_zones_ptr[g_zone_count] = default_zone;
+  ReplaceZoneFunctions(&g_original_zones[g_zone_count++], default_zone);
+  ReplaceZoneFunctions(default_zone, &new_functions);
+
+  malloc_zone_t* purgeable_zone = malloc_default_purgeable_zone();
+  g_original_zones_ptr[g_zone_count] = purgeable_zone;
+  ReplaceZoneFunctions(&g_original_zones[g_zone_count++], purgeable_zone);
+  ReplaceZoneFunctions(purgeable_zone, &new_functions);
+
+  vm_address_t* zones;
+  unsigned int count;
+  kern_return_t kr =
+      malloc_get_all_zones(mach_task_self(), nullptr, &zones, &count);
+  if (kr != KERN_SUCCESS)
+    return;
+  for (unsigned int i = 0; i < count; ++i) {
+    malloc_zone_t* zone = reinterpret_cast<malloc_zone_t*>(zones[i]);
+    g_original_zones_ptr[g_zone_count] = zone;
+    ReplaceZoneFunctions(&g_original_zones[g_zone_count++], zone);
+    ReplaceZoneFunctions(zone, &new_functions);
+
+    if (g_zone_count >= kMaxZoneCount)
+      break;
+  }
+}
+
+}  // namespace test
+}  // namespace crashpad
diff --git a/extern/crashpad/crashpad/test/ios/host/handler_forbidden_allocators.h b/extern/crashpad/crashpad/test/ios/host/handler_forbidden_allocators.h
new file mode 100644
index 0000000000..caefe51776
--- /dev/null
+++ b/extern/crashpad/crashpad/test/ios/host/handler_forbidden_allocators.h
@@ -0,0 +1,31 @@
+// Copyright 2022 The Crashpad Authors
+//
+// 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.
+
+#ifndef CRASHPAD_TEST_IOS_HANDLER_FORBIDDEN_ALLOCATIONS_H_
+#define CRASHPAD_TEST_IOS_HANDLER_FORBIDDEN_ALLOCATIONS_H_
+
+namespace crashpad {
+namespace test {
+
+// Override malloc_default_zone and malloc_default_purgeable_zone with functions
+// that immediately exit if called from the same thread that this helper is
+// called from or from the Crashpad Mach exception handler thread indicated by
+// GetThreadIdForTesting. This is used to ensure the allocator is not used by
+// the Crashpad InProcessHandler.
+void ReplaceAllocatorsWithHandlerForbidden();
+
+}  // namespace test
+}  // namespace crashpad
+
+#endif  // CRASHPAD_TEST_IOS_HANDLER_FORBIDDEN_ALLOCATIONS_H_
diff --git a/extern/crashpad/crashpad/test/ios/host/main.mm b/extern/crashpad/crashpad/test/ios/host/main.mm
index a0ae5c4699..cf06f30db5 100644
--- a/extern/crashpad/crashpad/test/ios/host/main.mm
+++ b/extern/crashpad/crashpad/test/ios/host/main.mm
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,10 +16,6 @@
 
 #import "test/ios/host/cptest_application_delegate.h"
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 int main(int argc, char* argv[]) {
   NSString* appDelegateClassName;
   @autoreleasepool {
diff --git a/extern/crashpad/crashpad/test/linux/fake_ptrace_connection.cc b/extern/crashpad/crashpad/test/linux/fake_ptrace_connection.cc
index 774a340a4d..0f8551e48a 100644
--- a/extern/crashpad/crashpad/test/linux/fake_ptrace_connection.cc
+++ b/extern/crashpad/crashpad/test/linux/fake_ptrace_connection.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -80,7 +80,7 @@ bool FakePtraceConnection::ReadFileContents(const base::FilePath& path,
   return LoggingReadEntireFile(path, contents);
 }
 
-ProcessMemory* FakePtraceConnection::Memory() {
+ProcessMemoryLinux* FakePtraceConnection::Memory() {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
   if (!memory_) {
     memory_ = std::make_unique<ProcessMemoryLinux>(this);
@@ -91,14 +91,12 @@ ProcessMemory* FakePtraceConnection::Memory() {
 bool FakePtraceConnection::Threads(std::vector<pid_t>* threads) {
   // TODO(jperaza): Implement this if/when it's needed.
   NOTREACHED();
-  return false;
 }
 
 ssize_t FakePtraceConnection::ReadUpTo(VMAddress address,
                                        size_t size,
                                        void* buffer) {
   NOTREACHED();
-  return false;
 }
 
 }  // namespace test
diff --git a/extern/crashpad/crashpad/test/linux/fake_ptrace_connection.h b/extern/crashpad/crashpad/test/linux/fake_ptrace_connection.h
index bf09d95db9..959a709dc9 100644
--- a/extern/crashpad/crashpad/test/linux/fake_ptrace_connection.h
+++ b/extern/crashpad/crashpad/test/linux/fake_ptrace_connection.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -63,7 +63,7 @@ class FakePtraceConnection : public PtraceConnection {
 
   //! \brief Attempts to create a ProcessMemory when called, calling
   //!     ADD_FAILURE() and returning `nullptr` on failure.
-  ProcessMemory* Memory() override;
+  ProcessMemoryLinux* Memory() override;
 
   //! \todo Not yet implemented.
   bool Threads(std::vector<pid_t>* threads) override;
diff --git a/extern/crashpad/crashpad/test/linux/get_tls.cc b/extern/crashpad/crashpad/test/linux/get_tls.cc
index 452724deae..405976eaa9 100644
--- a/extern/crashpad/crashpad/test/linux/get_tls.cc
+++ b/extern/crashpad/crashpad/test/linux/get_tls.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -49,6 +49,8 @@ LinuxVMAddress GetTLS() {
       : "=r"(tls)
       :
       : "$3");
+#elif defined(ARCH_CPU_RISCV64)
+  asm("mv %0, tp" : "=r"(tls));
 #else
 #error Port.
 #endif  // ARCH_CPU_ARMEL
diff --git a/extern/crashpad/crashpad/test/linux/get_tls.h b/extern/crashpad/crashpad/test/linux/get_tls.h
index 5d59144e0f..fe0d3772e3 100644
--- a/extern/crashpad/crashpad/test/linux/get_tls.h
+++ b/extern/crashpad/crashpad/test/linux/get_tls.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/test/mac/dyld.cc b/extern/crashpad/crashpad/test/mac/dyld.cc
index ba1cb56f5c..8552cdc26b 100644
--- a/extern/crashpad/crashpad/test/mac/dyld.cc
+++ b/extern/crashpad/crashpad/test/mac/dyld.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/test/mac/dyld.h b/extern/crashpad/crashpad/test/mac/dyld.h
index 0a688f3e1b..46efc0804d 100644
--- a/extern/crashpad/crashpad/test/mac/dyld.h
+++ b/extern/crashpad/crashpad/test/mac/dyld.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/test/mac/exception_swallower.cc b/extern/crashpad/crashpad/test/mac/exception_swallower.cc
index 3098643bd9..132fb428ab 100644
--- a/extern/crashpad/crashpad/test/mac/exception_swallower.cc
+++ b/extern/crashpad/crashpad/test/mac/exception_swallower.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@
 
 #include <string>
 
+#include "base/apple/scoped_mach_port.h"
 #include "base/check_op.h"
-#include "base/mac/scoped_mach_port.h"
 #include "base/strings/stringprintf.h"
 #include "handler/mac/exception_handler_server.h"
 #include "util/mach/bootstrap.h"
@@ -58,7 +58,7 @@ class ExceptionSwallower::ExceptionSwallowerThread
       public UniversalMachExcServer::Interface {
  public:
   explicit ExceptionSwallowerThread(
-      base::mac::ScopedMachReceiveRight receive_right)
+      base::apple::ScopedMachReceiveRight receive_right)
       : Thread(),
         UniversalMachExcServer::Interface(),
         exception_handler_server_(std::move(receive_right), true),
@@ -129,7 +129,7 @@ ExceptionSwallower::ExceptionSwallower() : exception_swallower_thread_() {
       base::StringPrintf("org.chromium.crashpad.test.exception_swallower.%d.%s",
                          getpid(),
                          RandomString().c_str());
-  base::mac::ScopedMachReceiveRight receive_right(
+  base::apple::ScopedMachReceiveRight receive_right(
       BootstrapCheckIn(service_name));
   CHECK(receive_right.is_valid());
 
@@ -164,7 +164,7 @@ void ExceptionSwallower::SwallowExceptions() {
   const char* service_name = CheckedGetenv(kServiceEnvironmentVariable);
   CHECK(service_name);
 
-  base::mac::ScopedMachSendRight exception_swallower_port(
+  base::apple::ScopedMachSendRight exception_swallower_port(
       BootstrapLookUp(service_name));
   CHECK(exception_swallower_port.is_valid());
 
diff --git a/extern/crashpad/crashpad/test/mac/exception_swallower.h b/extern/crashpad/crashpad/test/mac/exception_swallower.h
index ac14562078..f8bdf7e52b 100644
--- a/extern/crashpad/crashpad/test/mac/exception_swallower.h
+++ b/extern/crashpad/crashpad/test/mac/exception_swallower.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/test/mac/mach_errors.cc b/extern/crashpad/crashpad/test/mac/mach_errors.cc
index db8ed66611..1b06755dfd 100644
--- a/extern/crashpad/crashpad/test/mac/mach_errors.cc
+++ b/extern/crashpad/crashpad/test/mac/mach_errors.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/test/mac/mach_errors.h b/extern/crashpad/crashpad/test/mac/mach_errors.h
index 19217d114f..862d717cbd 100644
--- a/extern/crashpad/crashpad/test/mac/mach_errors.h
+++ b/extern/crashpad/crashpad/test/mac/mach_errors.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -23,8 +23,9 @@ namespace crashpad {
 namespace test {
 
 // This function formats messages in a similar way to the Mach error logging
-// macros in base/mac/mach_logging.h. It exists to interoperate with Google Test
-// assertions, which don’t interoperate with logging but can be streamed to.
+// macros in base/apple/mach_logging.h. It exists to interoperate with Google
+// Test assertions, which don’t interoperate with logging but can be streamed
+// to.
 //
 // Where non-test code could do:
 //   MACH_CHECK(kr == KERN_SUCCESS, kr) << "vm_deallocate";
diff --git a/extern/crashpad/crashpad/test/mac/mach_multiprocess.cc b/extern/crashpad/crashpad/test/mac/mach_multiprocess.cc
index 35df0611ab..d317055f06 100644
--- a/extern/crashpad/crashpad/test/mac/mach_multiprocess.cc
+++ b/extern/crashpad/crashpad/test/mac/mach_multiprocess.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,10 +19,10 @@
 
 #include <memory>
 #include <string>
+#include <tuple>
 
+#include "base/apple/scoped_mach_port.h"
 #include "base/auto_reset.h"
-#include "base/mac/scoped_mach_port.h"
-#include "base/macros.h"
 #include "gtest/gtest.h"
 #include "test/errors.h"
 #include "test/mac/mach_errors.h"
@@ -64,9 +64,9 @@ struct MachMultiprocessInfo {
   }
 
   std::string service_name;
-  base::mac::ScopedMachReceiveRight local_port;
-  base::mac::ScopedMachSendRight remote_port;
-  base::mac::ScopedMachSendRight child_task;  // valid only in parent
+  base::apple::ScopedMachReceiveRight local_port;
+  base::apple::ScopedMachSendRight remote_port;
+  base::apple::ScopedMachSendRight child_task;  // valid only in parent
 };
 
 }  // namespace internal
@@ -212,7 +212,7 @@ void MachMultiprocess::MultiprocessChild() {
   ScopedForbidReturn forbid_return;
 
   // local_port is not valid in the forked child process.
-  ignore_result(info_->local_port.release());
+  std::ignore = info_->local_port.release();
 
   info_->local_port.reset(NewMachPort(MACH_PORT_RIGHT_RECEIVE));
   ASSERT_NE(info_->local_port, kMachPortNull);
diff --git a/extern/crashpad/crashpad/test/mac/mach_multiprocess.h b/extern/crashpad/crashpad/test/mac/mach_multiprocess.h
index b3b0bb1b6b..78a5191bcc 100644
--- a/extern/crashpad/crashpad/test/mac/mach_multiprocess.h
+++ b/extern/crashpad/crashpad/test/mac/mach_multiprocess.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/test/mac/mach_multiprocess_test.cc b/extern/crashpad/crashpad/test/mac/mach_multiprocess_test.cc
index 455249bdec..b38f2fe7a6 100644
--- a/extern/crashpad/crashpad/test/mac/mach_multiprocess_test.cc
+++ b/extern/crashpad/crashpad/test/mac/mach_multiprocess_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/test/main_arguments.cc b/extern/crashpad/crashpad/test/main_arguments.cc
index 95221b2e86..bd531a5ff3 100644
--- a/extern/crashpad/crashpad/test/main_arguments.cc
+++ b/extern/crashpad/crashpad/test/main_arguments.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/test/main_arguments.h b/extern/crashpad/crashpad/test/main_arguments.h
index d6c4d5c825..6408ef3fa0 100644
--- a/extern/crashpad/crashpad/test/main_arguments.h
+++ b/extern/crashpad/crashpad/test/main_arguments.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/test/main_arguments_test.cc b/extern/crashpad/crashpad/test/main_arguments_test.cc
index 85d15984d0..f70e39c2b4 100644
--- a/extern/crashpad/crashpad/test/main_arguments_test.cc
+++ b/extern/crashpad/crashpad/test/main_arguments_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/test/multiprocess.h b/extern/crashpad/crashpad/test/multiprocess.h
index ca48ce80af..b24666531d 100644
--- a/extern/crashpad/crashpad/test/multiprocess.h
+++ b/extern/crashpad/crashpad/test/multiprocess.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ namespace internal {
 struct MultiprocessInfo;
 }  // namespace internal
 
-#if defined(OS_FUCHSIA)
+#if BUILDFLAG(IS_FUCHSIA)
 using ReturnCodeType = int64_t;
 #else
 using ReturnCodeType = int;
@@ -55,13 +55,13 @@ class Multiprocess {
     //! that call `exit()` or `_exit()`.
     kTerminationNormal = false,
 
-#if !defined(OS_FUCHSIA)  // There are no signals on Fuchsia.
+#if !BUILDFLAG(IS_FUCHSIA)  // There are no signals on Fuchsia.
     //! \brief The child terminated by signal.
     //!
     //! Signal termination happens as a result of a crash, a call to `abort()`,
     //! assertion failure (including Google Test assertions), etc.
     kTerminationSignal,
-#endif  // !defined(OS_FUCHSIA)
+#endif  // !BUILDFLAG(IS_FUCHSIA)
   };
 
   Multiprocess();
@@ -104,11 +104,11 @@ class Multiprocess {
   void SetExpectedChildTermination(TerminationReason reason,
                                    ReturnCodeType code);
 
-#if !defined(OS_WIN)
+#if !BUILDFLAG(IS_WIN)
   //! \brief Sets termination reason and code appropriately for a child that
   //!     terminates via `__builtin_trap()`.
   void SetExpectedChildTerminationBuiltinTrap();
-#endif  // !OS_WIN
+#endif  // !BUILDFLAG(IS_WIN)
 
  protected:
   ~Multiprocess();
@@ -131,17 +131,17 @@ class Multiprocess {
   //! Subclass implementations may signal failure by raising their own fatal
   //! Google Test assertions.
   virtual void PreFork()
-#if defined(OS_WIN) || defined(OS_FUCHSIA)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
       = 0
-#endif  // OS_WIN || OS_FUCHSIA
+#endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
       ;
 
-#if !defined(OS_WIN) && !defined(OS_FUCHSIA)
+#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_FUCHSIA)
   //! \brief Returns the child process’ process ID.
   //!
   //! This method may only be called by the parent process.
   pid_t ChildPID() const;
-#endif  // !OS_WIN && !OS_FUCHSIA
+#endif  // !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_FUCHSIA)
 
   //! \brief Returns the read pipe’s file handle.
   //!
diff --git a/extern/crashpad/crashpad/test/multiprocess_exec.cc b/extern/crashpad/crashpad/test/multiprocess_exec.cc
index cd9a32c0bb..8955930b75 100644
--- a/extern/crashpad/crashpad/test/multiprocess_exec.cc
+++ b/extern/crashpad/crashpad/test/multiprocess_exec.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 
 #include "base/check.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "test/main_arguments.h"
 #include "test/test_paths.h"
 #include "util/stdlib/map_insert.h"
@@ -59,7 +60,7 @@ void MultiprocessExec::SetChildTestMainFunction(
                                 GetMainArguments().end());
   rest.push_back(internal::kChildTestFunction + function_name);
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   // Instead of using argv[0] on Windows, use the actual binary name. This is
   // necessary because if originally the test isn't run with ".exe" on the
   // command line, then argv[0] also won't include ".exe". This argument is used
diff --git a/extern/crashpad/crashpad/test/multiprocess_exec.h b/extern/crashpad/crashpad/test/multiprocess_exec.h
index a03f8c1ade..e1e05e3c14 100644
--- a/extern/crashpad/crashpad/test/multiprocess_exec.h
+++ b/extern/crashpad/crashpad/test/multiprocess_exec.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -141,11 +141,11 @@ class MultiprocessExec : public Multiprocess {
 
   base::FilePath command_;
   std::vector<std::string> arguments_;
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
   std::vector<const char*> argv_;
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   std::wstring command_line_;
-#endif  // OS_POSIX
+#endif  // BUILDFLAG(IS_POSIX)
 };
 
 }  // namespace test
diff --git a/extern/crashpad/crashpad/test/multiprocess_exec_fuchsia.cc b/extern/crashpad/crashpad/test/multiprocess_exec_fuchsia.cc
index a1e2acf500..1b6ccc1562 100644
--- a/extern/crashpad/crashpad/test/multiprocess_exec_fuchsia.cc
+++ b/extern/crashpad/crashpad/test/multiprocess_exec_fuchsia.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/test/multiprocess_exec_posix.cc b/extern/crashpad/crashpad/test/multiprocess_exec_posix.cc
index e14a3b88ad..6166a4c2b3 100644
--- a/extern/crashpad/crashpad/test/multiprocess_exec_posix.cc
+++ b/extern/crashpad/crashpad/test/multiprocess_exec_posix.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -26,11 +26,11 @@
 #include "util/misc/scoped_forbid_return.h"
 #include "util/posix/close_multiple.h"
 
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 #include <stdio_ext.h>
 #endif
 
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
 #include "util/mach/task_for_pid.h"
 #endif
 
@@ -90,7 +90,7 @@ void MultiprocessExec::MultiprocessChild() {
 
   int rv;
 
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
   __fpurge(stdin);
 #else
   rv = fpurge(stdin);
@@ -154,7 +154,7 @@ void MultiprocessExec::MultiprocessChild() {
 }
 
 ProcessType MultiprocessExec::ChildProcess() {
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
   return TaskForPID(ChildPID());
 #else
   return ChildPID();
diff --git a/extern/crashpad/crashpad/test/multiprocess_exec_test.cc b/extern/crashpad/crashpad/test/multiprocess_exec_test.cc
index fb77d642fb..069c7b814b 100644
--- a/extern/crashpad/crashpad/test/multiprocess_exec_test.cc
+++ b/extern/crashpad/crashpad/test/multiprocess_exec_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -101,7 +101,7 @@ TEST(MultiprocessExec, MultiprocessExecSimpleChildReturnsNonZero) {
   exec.Run();
 }
 
-#if !defined(OS_WIN)
+#if !BUILDFLAG(IS_WIN)
 
 CRASHPAD_CHILD_TEST_MAIN(BuiltinTrapChild) {
   __builtin_trap();
@@ -130,7 +130,7 @@ TEST(MultiprocessExec, BuiltinTrapTermination) {
   test.Run();
 }
 
-#endif  // !OS_WIN
+#endif  // !BUILDFLAG(IS_WIN)
 
 }  // namespace
 }  // namespace test
diff --git a/extern/crashpad/crashpad/test/multiprocess_exec_test_child.cc b/extern/crashpad/crashpad/test/multiprocess_exec_test_child.cc
index 8c77015c1b..e239e8d341 100644
--- a/extern/crashpad/crashpad/test/multiprocess_exec_test_child.cc
+++ b/extern/crashpad/crashpad/test/multiprocess_exec_test_child.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,19 +22,19 @@
 #include "base/logging.h"
 #include "build/build_config.h"
 
-#if defined(OS_POSIX)
-#if !defined(OS_FUCHSIA)
+#if BUILDFLAG(IS_POSIX)
+#if !BUILDFLAG(IS_FUCHSIA)
 #include <sys/resource.h>
-#endif  // !OS_FUCHSIA
+#endif  // !BUILDFLAG(IS_FUCHSIA)
 #include <unistd.h>
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 #include <windows.h>
 #endif
 
 int main(int argc, char* argv[]) {
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 
-#if defined(OS_FUCHSIA)
+#if BUILDFLAG(IS_FUCHSIA)
   // getrlimit() is not implemented on Fuchsia. By construction, the child only
   // receieves specific fds that it's given, but check low values as mild
   // verification.
@@ -45,7 +45,7 @@ int main(int argc, char* argv[]) {
     LOG(FATAL) << "getrlimit";
   }
   int last_fd = static_cast<int>(rlimit_nofile.rlim_cur);
-#endif  // OS_FUCHSIA
+#endif  // BUILDFLAG(IS_FUCHSIA)
 
   // Make sure that there’s nothing open at any FD higher than 3. All FDs other
   // than stdin, stdout, and stderr should have been closed prior to or at
@@ -69,7 +69,7 @@ int main(int argc, char* argv[]) {
   if (rv != 1) {
     LOG(FATAL) << "write";
   }
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   // TODO(scottmg): Verify that only the handles we expect to be open, are.
 
   // Read a byte from stdin, expecting it to be a specific value.
@@ -89,7 +89,7 @@ int main(int argc, char* argv[]) {
       bytes_written != 1) {
     LOG(FATAL) << "WriteFile";
   }
-#endif  // OS_POSIX
+#endif  // BUILDFLAG(IS_POSIX)
 
   return 0;
 }
diff --git a/extern/crashpad/crashpad/test/multiprocess_exec_win.cc b/extern/crashpad/crashpad/test/multiprocess_exec_win.cc
index 08c4c17a1b..735d048b72 100644
--- a/extern/crashpad/crashpad/test/multiprocess_exec_win.cc
+++ b/extern/crashpad/crashpad/test/multiprocess_exec_win.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/test/multiprocess_posix.cc b/extern/crashpad/crashpad/test/multiprocess_posix.cc
index c16aa08f7b..eb7cf9cd15 100644
--- a/extern/crashpad/crashpad/test/multiprocess_posix.cc
+++ b/extern/crashpad/crashpad/test/multiprocess_posix.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@
 #include "util/misc/scoped_forbid_return.h"
 #include "util/posix/signals.h"
 
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
 #include "test/mac/exception_swallower.h"
 #endif
 
@@ -73,7 +73,7 @@ void Multiprocess::Run() {
 
   ASSERT_NO_FATAL_FAILURE(PreFork());
 
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
   // If the child is expected to crash, set up an exception swallower to swallow
   // the exception instead of allowing it to be seen by the system’s crash
   // reporter.
@@ -81,7 +81,7 @@ void Multiprocess::Run() {
   if (reason_ == kTerminationSignal && Signals::IsCrashSignal(code_)) {
     exception_swallower.reset(new ExceptionSwallower());
   }
-#endif  // OS_APPLE
+#endif  // BUILDFLAG(IS_APPLE)
 
   pid_t pid = fork();
   ASSERT_GE(pid, 0) << ErrnoMessage("fork");
@@ -139,15 +139,15 @@ void Multiprocess::Run() {
       ADD_FAILURE() << message;
     }
   } else {
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
     if (exception_swallower.get()) {
       ExceptionSwallower::SwallowExceptions();
     }
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
     if (reason_ == kTerminationSignal && Signals::IsCrashSignal(code_)) {
       Signals::InstallDefaultHandler(code_);
     }
-#endif  // OS_APPLE
+#endif  // BUILDFLAG(IS_APPLE)
 
     RunChild();
   }
diff --git a/extern/crashpad/crashpad/test/multiprocess_posix_test.cc b/extern/crashpad/crashpad/test/multiprocess_posix_test.cc
index dd5f63f791..02bdb7b29b 100644
--- a/extern/crashpad/crashpad/test/multiprocess_posix_test.cc
+++ b/extern/crashpad/crashpad/test/multiprocess_posix_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -157,7 +157,7 @@ class TestMultiprocessClosePipe final : public Multiprocess {
         who_closes_(who_closes),
         what_closes_(what_closes) {
     // Fails under "threadsafe" mode on macOS 10.11.
-    testing::GTEST_FLAG(death_test_style) = "fast";
+    GTEST_FLAG_SET(death_test_style, "fast");
   }
 
   TestMultiprocessClosePipe(const TestMultiprocessClosePipe&) = delete;
diff --git a/extern/crashpad/crashpad/test/process_type.cc b/extern/crashpad/crashpad/test/process_type.cc
index f6eec36ab1..fa2d8f35a3 100644
--- a/extern/crashpad/crashpad/test/process_type.cc
+++ b/extern/crashpad/crashpad/test/process_type.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,9 +14,11 @@
 
 #include "test/process_type.h"
 
-#if defined(OS_FUCHSIA)
+#include "build/build_config.h"
+
+#if BUILDFLAG(IS_FUCHSIA)
 #include <lib/zx/process.h>
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
 #include <unistd.h>
 #endif
 
@@ -24,13 +26,13 @@ namespace crashpad {
 namespace test {
 
 ProcessType GetSelfProcess() {
-#if defined(OS_FUCHSIA)
+#if BUILDFLAG(IS_FUCHSIA)
   return zx::process::self();
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
   return getpid();
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   return GetCurrentProcess();
-#elif defined(OS_APPLE)
+#elif BUILDFLAG(IS_APPLE)
   return mach_task_self();
 #endif
 }
diff --git a/extern/crashpad/crashpad/test/process_type.h b/extern/crashpad/crashpad/test/process_type.h
index cacac04fb0..f27d8601e9 100644
--- a/extern/crashpad/crashpad/test/process_type.h
+++ b/extern/crashpad/crashpad/test/process_type.h
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,28 +17,28 @@
 
 #include "build/build_config.h"
 
-#if defined(OS_FUCHSIA)
+#if BUILDFLAG(IS_FUCHSIA)
 #include <lib/zx/process.h>
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
 #include <sys/types.h>
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 #include <windows.h>
-#elif defined(OS_APPLE)
+#elif BUILDFLAG(IS_APPLE)
 #include <mach/mach.h>
 #endif
 
 namespace crashpad {
 namespace test {
 
-#if defined(OS_FUCHSIA)
+#if BUILDFLAG(IS_FUCHSIA)
 using ProcessType = zx::unowned_process;
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \
-    DOXYGEN
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+    BUILDFLAG(IS_ANDROID) || DOXYGEN
 //! \brief Alias for platform-specific type to represent a process.
 using ProcessType = pid_t;
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 using ProcessType = HANDLE;
-#elif defined(OS_APPLE)
+#elif BUILDFLAG(IS_APPLE)
 using ProcessType = task_t;
 #else
 #error Port.
diff --git a/extern/crashpad/crashpad/test/scoped_guarded_page.h b/extern/crashpad/crashpad/test/scoped_guarded_page.h
index f7513d4f74..01c429cd85 100644
--- a/extern/crashpad/crashpad/test/scoped_guarded_page.h
+++ b/extern/crashpad/crashpad/test/scoped_guarded_page.h
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/test/scoped_guarded_page_posix.cc b/extern/crashpad/crashpad/test/scoped_guarded_page_posix.cc
index bb191d78e1..50b682a065 100644
--- a/extern/crashpad/crashpad/test/scoped_guarded_page_posix.cc
+++ b/extern/crashpad/crashpad/test/scoped_guarded_page_posix.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/test/scoped_guarded_page_test.cc b/extern/crashpad/crashpad/test/scoped_guarded_page_test.cc
index 291a12b4b2..d8fc6749d1 100644
--- a/extern/crashpad/crashpad/test/scoped_guarded_page_test.cc
+++ b/extern/crashpad/crashpad/test/scoped_guarded_page_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ namespace test {
 namespace {
 
 TEST(ScopedGuardedPage, BasicFunctionality) {
-  ::testing::FLAGS_gtest_death_test_style = "threadsafe";
+  GTEST_FLAG_SET(death_test_style, "threadsafe");
 
   ScopedGuardedPage page;
   char* address = (char*)page.Pointer();
diff --git a/extern/crashpad/crashpad/test/scoped_guarded_page_win.cc b/extern/crashpad/crashpad/test/scoped_guarded_page_win.cc
index a87691e976..c4cdef2d05 100644
--- a/extern/crashpad/crashpad/test/scoped_guarded_page_win.cc
+++ b/extern/crashpad/crashpad/test/scoped_guarded_page_win.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/test/scoped_module_handle.cc b/extern/crashpad/crashpad/test/scoped_module_handle.cc
index df246fcf4c..85553c3ca9 100644
--- a/extern/crashpad/crashpad/test/scoped_module_handle.cc
+++ b/extern/crashpad/crashpad/test/scoped_module_handle.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,17 +15,18 @@
 #include "test/scoped_module_handle.h"
 
 #include "base/logging.h"
+#include "build/build_config.h"
 
 namespace crashpad {
 namespace test {
 
 // static
 void ScopedModuleHandle::Impl::Close(ModuleHandle handle) {
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
   if (dlclose(handle) != 0) {
     LOG(ERROR) << "dlclose: " << dlerror();
   }
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   if (!FreeLibrary(handle)) {
     PLOG(ERROR) << "FreeLibrary";
   }
diff --git a/extern/crashpad/crashpad/test/scoped_module_handle.h b/extern/crashpad/crashpad/test/scoped_module_handle.h
index 0e96c9510b..b95379d4df 100644
--- a/extern/crashpad/crashpad/test/scoped_module_handle.h
+++ b/extern/crashpad/crashpad/test/scoped_module_handle.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,9 +17,9 @@
 
 #include "build/build_config.h"
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 #include <dlfcn.h>
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 #include <windows.h>
 #endif
 
@@ -36,13 +36,13 @@ class ScopedModuleHandle {
     Impl(const Impl&) = delete;
     Impl& operator=(const Impl&) = delete;
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
     using ModuleHandle = void*;
 
     static void* LookUpSymbol(ModuleHandle handle, const char* symbol_name) {
       return dlsym(handle, symbol_name);
     }
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
     using ModuleHandle = HMODULE;
 
     static void* LookUpSymbol(ModuleHandle handle, const char* symbol_name) {
diff --git a/extern/crashpad/crashpad/test/scoped_set_thread_name.h b/extern/crashpad/crashpad/test/scoped_set_thread_name.h
new file mode 100644
index 0000000000..eb093a0486
--- /dev/null
+++ b/extern/crashpad/crashpad/test/scoped_set_thread_name.h
@@ -0,0 +1,51 @@
+// Copyright 2022 The Crashpad Authors
+//
+// 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.
+
+#ifndef CRASHPAD_TEST_SCOPED_SET_THREAD_NAME_H_
+#define CRASHPAD_TEST_SCOPED_SET_THREAD_NAME_H_
+
+#include <string>
+
+#include "build/build_config.h"
+
+namespace crashpad {
+namespace test {
+
+//! Sets the name of the current thread for the lifetime of this object.
+class ScopedSetThreadName final {
+ public:
+  explicit ScopedSetThreadName(const std::string& new_thread_name);
+
+  ScopedSetThreadName(const ScopedSetThreadName&) = delete;
+  ScopedSetThreadName& operator=(const ScopedSetThreadName&) = delete;
+
+  ~ScopedSetThreadName();
+
+#if BUILDFLAG(IS_WIN) || DOXYGEN
+  //! \brief Returns `true` if Windows supports setting and getting thread name.
+  static bool IsSupported();
+#endif
+
+ private:
+#if BUILDFLAG(IS_WIN)
+  std::wstring original_name_;
+#else
+  const std::string original_name_;
+#endif
+};
+
+}  // namespace test
+}  // namespace crashpad
+
+#endif  // CRASHPAD_TEST_SCOPED_SET_THREAD_NAME_H_
diff --git a/extern/crashpad/crashpad/test/scoped_set_thread_name_fuchsia.cc b/extern/crashpad/crashpad/test/scoped_set_thread_name_fuchsia.cc
new file mode 100644
index 0000000000..8430690598
--- /dev/null
+++ b/extern/crashpad/crashpad/test/scoped_set_thread_name_fuchsia.cc
@@ -0,0 +1,61 @@
+// Copyright 2022 The Crashpad Authors
+//
+// 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.
+
+#include "test/scoped_set_thread_name.h"
+
+#include <string>
+
+#include <lib/zx/thread.h>
+#include <zircon/syscalls/object.h>
+#include <zircon/types.h>
+
+#include "base/check_op.h"
+#include "base/fuchsia/fuchsia_logging.h"
+
+namespace crashpad {
+namespace test {
+
+namespace {
+
+std::string GetCurrentThreadName() {
+  std::string result(ZX_MAX_NAME_LEN, '\0');
+  const zx_status_t status = zx::thread::self()->get_property(
+      ZX_PROP_NAME, result.data(), result.length());
+  ZX_CHECK(status == ZX_OK, status) << "get_property(ZX_PROP_NAME)";
+  const auto result_nul_idx = result.find('\0');
+  CHECK_NE(result_nul_idx, std::string::npos)
+      << "get_property() did not NUL terminate";
+  result.resize(result_nul_idx);
+  return result;
+}
+
+}  // namespace
+
+ScopedSetThreadName::ScopedSetThreadName(const std::string& new_thread_name)
+    : original_name_(GetCurrentThreadName()) {
+  // Fuchsia silently truncates the thread name if it's too long.
+  CHECK_LT(new_thread_name.length(), ZX_MAX_NAME_LEN);
+  const zx_status_t status = zx::thread::self()->set_property(
+      ZX_PROP_NAME, new_thread_name.c_str(), new_thread_name.length());
+  ZX_CHECK(status == ZX_OK, status) << "set_property(ZX_PROP_NAME)";
+}
+
+ScopedSetThreadName::~ScopedSetThreadName() {
+  const zx_status_t status = zx::thread::self()->set_property(
+      ZX_PROP_NAME, original_name_.c_str(), original_name_.length());
+  ZX_CHECK(status == ZX_OK, status) << "set_property(ZX_PROP_NAME)";
+}
+
+}  // namespace test
+}  // namespace crashpad
diff --git a/extern/crashpad/crashpad/test/scoped_set_thread_name_posix.cc b/extern/crashpad/crashpad/test/scoped_set_thread_name_posix.cc
new file mode 100644
index 0000000000..9314b5f39e
--- /dev/null
+++ b/extern/crashpad/crashpad/test/scoped_set_thread_name_posix.cc
@@ -0,0 +1,92 @@
+// Copyright 2022 The Crashpad Authors
+//
+// 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.
+
+#include "test/scoped_set_thread_name.h"
+
+#include <errno.h>
+#include <pthread.h>
+
+#include <ostream>
+#include <string>
+
+#include "base/check.h"
+#include "base/check_op.h"
+#include "build/build_config.h"
+
+#if BUILDFLAG(IS_APPLE)
+#include <mach/thread_info.h>
+#elif BUILDFLAG(IS_ANDROID)
+#include <sys/prctl.h>
+#endif
+
+namespace crashpad {
+namespace test {
+
+namespace {
+
+#if BUILDFLAG(IS_APPLE)
+constexpr size_t kPthreadNameMaxLen = MAXTHREADNAMESIZE;
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS)
+// The kernel headers define this in linux/sched.h as TASK_COMM_LEN, but the
+// userspace copy of that header does not define it.
+constexpr size_t kPthreadNameMaxLen = 16;
+#else
+#error Port to your platform
+#endif
+
+void SetCurrentThreadName(const std::string& thread_name) {
+#if BUILDFLAG(IS_APPLE)
+  // Apple's pthread_setname_np() sets errno instead of returning it.
+  PCHECK(pthread_setname_np(thread_name.c_str()) == 0) << "pthread_setname_np";
+#elif BUILDFLAG(IS_ANDROID) && __ANDROID_API__ < 24
+  // pthread_setname_np() requires Android API 24 or later.
+  CHECK_LT(thread_name.length(), kPthreadNameMaxLen);
+  PCHECK(prctl(PR_SET_NAME, thread_name.c_str()) == 0) << "prctl(PR_SET_NAME)";
+#else
+  PCHECK((errno = pthread_setname_np(pthread_self(), thread_name.c_str())) == 0)
+      << "pthread_setname_np";
+#endif
+}
+
+std::string GetCurrentThreadName() {
+  std::string result(kPthreadNameMaxLen, '\0');
+#if BUILDFLAG(IS_ANDROID) && __ANDROID_API__ < 24
+  static constexpr char kGetThreadNameFunctionName[] = "prctl";
+  PCHECK(prctl(PR_GET_NAME, result.data()) == 0) << "prctl(PR_GET_NAME)";
+#else
+  static constexpr char kGetThreadNameFunctionName[] = "pthread_getname_np";
+  PCHECK((errno = pthread_getname_np(
+              pthread_self(), result.data(), result.length())) == 0)
+      << "pthread_getname_np";
+#endif
+  const auto result_nul_idx = result.find('\0');
+  CHECK(result_nul_idx != std::string::npos)
+      << kGetThreadNameFunctionName << " did not NUL terminate";
+  result.resize(result_nul_idx);
+  return result;
+}
+
+}  // namespace
+
+ScopedSetThreadName::ScopedSetThreadName(const std::string& new_thread_name)
+    : original_name_(GetCurrentThreadName()) {
+  SetCurrentThreadName(new_thread_name);
+}
+
+ScopedSetThreadName::~ScopedSetThreadName() {
+  SetCurrentThreadName(original_name_);
+}
+
+}  // namespace test
+}  // namespace crashpad
diff --git a/extern/crashpad/crashpad/test/scoped_set_thread_name_win.cc b/extern/crashpad/crashpad/test/scoped_set_thread_name_win.cc
new file mode 100644
index 0000000000..c38e8380cd
--- /dev/null
+++ b/extern/crashpad/crashpad/test/scoped_set_thread_name_win.cc
@@ -0,0 +1,84 @@
+// Copyright 2022 The Crashpad Authors
+//
+// 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.
+
+#include "test/scoped_set_thread_name.h"
+
+#include <windows.h>
+
+#include "base/check.h"
+#include "base/logging.h"
+#include "base/strings/utf_string_conversions.h"
+#include "util/win/get_function.h"
+#include "util/win/scoped_local_alloc.h"
+
+namespace crashpad {
+namespace test {
+
+namespace {
+
+auto GetThreadDescriptionFuncPtr() {
+  static const auto get_thread_description =
+      GET_FUNCTION(L"kernel32.dll", ::GetThreadDescription);
+  return get_thread_description;
+}
+
+auto SetThreadDescriptionFuncPtr() {
+  static const auto set_thread_description =
+      GET_FUNCTION(L"kernel32.dll", ::SetThreadDescription);
+  return set_thread_description;
+}
+
+std::wstring GetCurrentThreadName() {
+  wchar_t* thread_description;
+  const auto get_thread_description = GetThreadDescriptionFuncPtr();
+  DCHECK(get_thread_description);
+  HRESULT hr = get_thread_description(GetCurrentThread(), &thread_description);
+  CHECK(SUCCEEDED(hr)) << "GetThreadDescription: "
+                       << logging::SystemErrorCodeToString(hr);
+  ScopedLocalAlloc thread_description_owner(thread_description);
+  return std::wstring(thread_description);
+}
+
+void SetCurrentThreadName(const std::wstring& new_thread_name) {
+  const auto set_thread_description = SetThreadDescriptionFuncPtr();
+  DCHECK(set_thread_description);
+  HRESULT hr =
+      set_thread_description(GetCurrentThread(), new_thread_name.c_str());
+  CHECK(SUCCEEDED(hr)) << "SetThreadDescription: "
+                       << logging::SystemErrorCodeToString(hr);
+}
+
+}  // namespace
+
+ScopedSetThreadName::ScopedSetThreadName(const std::string& new_thread_name)
+    : original_name_() {
+  if (IsSupported()) {
+    original_name_.assign(GetCurrentThreadName());
+    SetCurrentThreadName(base::UTF8ToWide(new_thread_name));
+  }
+}
+
+ScopedSetThreadName::~ScopedSetThreadName() {
+  if (IsSupported()) {
+    SetCurrentThreadName(original_name_);
+  }
+}
+
+// static
+bool ScopedSetThreadName::IsSupported() {
+  return GetThreadDescriptionFuncPtr() && SetThreadDescriptionFuncPtr();
+}
+
+}  // namespace test
+}  // namespace crashpad
diff --git a/extern/crashpad/crashpad/test/scoped_temp_dir.cc b/extern/crashpad/crashpad/test/scoped_temp_dir.cc
index 7bc870316a..715ebeee33 100644
--- a/extern/crashpad/crashpad/test/scoped_temp_dir.cc
+++ b/extern/crashpad/crashpad/test/scoped_temp_dir.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/test/scoped_temp_dir.h b/extern/crashpad/crashpad/test/scoped_temp_dir.h
index a133190254..a349259c92 100644
--- a/extern/crashpad/crashpad/test/scoped_temp_dir.h
+++ b/extern/crashpad/crashpad/test/scoped_temp_dir.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/test/scoped_temp_dir_posix.cc b/extern/crashpad/crashpad/test/scoped_temp_dir_posix.cc
index 38aa4fb84f..386fa0c828 100644
--- a/extern/crashpad/crashpad/test/scoped_temp_dir_posix.cc
+++ b/extern/crashpad/crashpad/test/scoped_temp_dir_posix.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ base::FilePath ScopedTempDir::CreateTemporaryDirectory() {
   if (tmpdir && tmpdir[0] != '\0') {
     dir.assign(tmpdir);
   } else {
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
     dir.assign("/data/local/tmp");
 #else
     dir.assign("/tmp");
diff --git a/extern/crashpad/crashpad/test/scoped_temp_dir_test.cc b/extern/crashpad/crashpad/test/scoped_temp_dir_test.cc
index 9ad801f7f0..483eed8c41 100644
--- a/extern/crashpad/crashpad/test/scoped_temp_dir_test.cc
+++ b/extern/crashpad/crashpad/test/scoped_temp_dir_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -23,26 +23,26 @@
 #include "test/errors.h"
 #include "test/file.h"
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 #include <unistd.h>
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 #include <direct.h>
 #include <io.h>
-#endif  // OS_POSIX
+#endif  // BUILDFLAG(IS_POSIX)
 
 namespace crashpad {
 namespace test {
 namespace {
 
 void CreateFile(const base::FilePath& path) {
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
   int fd = HANDLE_EINTR(creat(path.value().c_str(), 0644));
   ASSERT_GE(fd, 0) << ErrnoMessage("creat") << " " << path.value();
 
   // gcc refuses to compile ASSERT_EQ(IGNORE_EINTR(close(fd)), 0).
   int close_rv = IGNORE_EINTR(close(fd));
   ASSERT_EQ(close_rv, 0) << ErrnoMessage("close") << " " << path.value();
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   int fd = _wcreat(path.value().c_str(), _S_IREAD | _S_IWRITE);
   ASSERT_GE(fd, 0) << ErrnoMessage("_wcreat") << " " << path.value();
   ASSERT_EQ(_close(fd), 0) << ErrnoMessage("_close") << " " << path.value();
@@ -53,10 +53,10 @@ void CreateFile(const base::FilePath& path) {
 }
 
 void CreateDirectory(const base::FilePath& path) {
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
   ASSERT_EQ(mkdir(path.value().c_str(), 0755), 0) << ErrnoMessage("mkdir")
                                                   << " " << path.value();
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   ASSERT_EQ(_wmkdir(path.value().c_str()), 0) << ErrnoMessage("_wmkdir") << " "
                                               << path.value();
 #else
diff --git a/extern/crashpad/crashpad/test/scoped_temp_dir_win.cc b/extern/crashpad/crashpad/test/scoped_temp_dir_win.cc
index 10063dc7e5..6d23f88aca 100644
--- a/extern/crashpad/crashpad/test/scoped_temp_dir_win.cc
+++ b/extern/crashpad/crashpad/test/scoped_temp_dir_win.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 #include <string>
 
 #include "base/check.h"
+#include "base/notreached.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "gtest/gtest.h"
@@ -56,7 +57,7 @@ void ScopedTempDir::Rename() {
     }
   }
 
-  CHECK(false) << "Couldn't move to a new unique temp dir";
+  NOTREACHED() << "Couldn't move to a new unique temp dir";
 }
 
 // static
@@ -70,8 +71,7 @@ base::FilePath ScopedTempDir::CreateTemporaryDirectory() {
       return path_to_create;
   }
 
-  CHECK(false) << "Couldn't create a new unique temp dir";
-  return base::FilePath();
+  NOTREACHED() << "Couldn't create a new unique temp dir";
 }
 
 }  // namespace test
diff --git a/extern/crashpad/crashpad/test/test_paths.cc b/extern/crashpad/crashpad/test/test_paths.cc
index 475e2b0193..75399ac82d 100644
--- a/extern/crashpad/crashpad/test/test_paths.cc
+++ b/extern/crashpad/crashpad/test/test_paths.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 
+#include "base/check.h"
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "util/misc/paths.h"
@@ -31,7 +32,7 @@ bool IsTestDataRoot(const base::FilePath& candidate) {
       candidate.Append(FILE_PATH_LITERAL("test"))
           .Append(FILE_PATH_LITERAL("test_paths_test_data_root.txt"));
 
-#if !defined(OS_WIN)
+#if !BUILDFLAG(IS_WIN)
   struct stat stat_buf;
   int rv = stat(marker_path.value().c_str(), &stat_buf);
 #else
@@ -43,16 +44,16 @@ bool IsTestDataRoot(const base::FilePath& candidate) {
 }
 
 base::FilePath TestDataRootInternal() {
-#if defined(OS_FUCHSIA)
+#if BUILDFLAG(IS_FUCHSIA)
   base::FilePath asset_path("/pkg/data");
   if (!IsTestDataRoot(asset_path)) {
     LOG(WARNING) << "test data root seems invalid, continuing anyway";
   }
   return asset_path;
-#else  // defined(OS_FUCHSIA)
-#if !defined(OS_WIN)
+#else  // BUILDFLAG(IS_FUCHSIA)
+#if !BUILDFLAG(IS_WIN)
   const char* environment_value = getenv("CRASHPAD_TEST_DATA_ROOT");
-#else  // defined(OS_WIN)
+#else  // BUILDFLAG(IS_WIN)
   const wchar_t* environment_value = _wgetenv(L"CRASHPAD_TEST_DATA_ROOT");
 #endif
 
@@ -67,21 +68,21 @@ base::FilePath TestDataRootInternal() {
 
   base::FilePath executable_path;
   if (Paths::Executable(&executable_path)) {
-#if defined(OS_IOS) || defined(OS_ANDROID)
+#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_ANDROID)
     // On Android and iOS, test data is in a crashpad_test_data directory
     // adjacent to the main executable. On iOS, this refers to the main
     // executable file inside the .app bundle, so crashpad_test_data is also
     // inside the bundle.
     base::FilePath candidate = executable_path.DirName()
                                .Append("crashpad_test_data");
-#else  // OS_IOS || OS_ANDRID
+#else  // BUILDFLAG(IS_IOS) || BUILDFLAG(IS_ANDRID)
     // In a standalone build, the test executable is usually at
     // out/{Debug,Release} relative to the Crashpad root.
     base::FilePath candidate =
         base::FilePath(executable_path.DirName()
                            .Append(base::FilePath::kParentDirectory)
                            .Append(base::FilePath::kParentDirectory));
-#endif  // OS_IOS || OS_ANDROID
+#endif  // BUILDFLAG(IS_IOS) || BUILDFLAG(IS_ANDROID)
     if (IsTestDataRoot(candidate)) {
       return candidate;
     }
@@ -104,10 +105,10 @@ base::FilePath TestDataRootInternal() {
   }
 
   return base::FilePath(base::FilePath::kCurrentDirectory);
-#endif  // defined(OS_FUCHSIA)
+#endif  // BUILDFLAG(IS_FUCHSIA)
 }
 
-#if defined(OS_WIN) && defined(ARCH_CPU_64_BITS)
+#if BUILDFLAG(IS_WIN) && defined(ARCH_CPU_64_BITS)
 
 // Returns the pathname of a directory containing 32-bit test build output.
 //
@@ -122,7 +123,7 @@ base::FilePath Output32BitDirectory() {
   return base::FilePath(environment_value);
 }
 
-#endif  // defined(OS_WIN) && defined(ARCH_CPU_64_BITS)
+#endif  // BUILDFLAG(IS_WIN) && defined(ARCH_CPU_64_BITS)
 
 }  // namespace
 
@@ -139,10 +140,10 @@ base::FilePath TestPaths::Executable() {
 // static
 base::FilePath TestPaths::ExpectedExecutableBasename(
     const base::FilePath::StringType& name) {
-#if defined(OS_FUCHSIA)
+#if BUILDFLAG(IS_FUCHSIA)
   // Apps in Fuchsia packages are always named "app".
   return base::FilePath("app");
-#else  // OS_FUCHSIA
+#else  // BUILDFLAG(IS_FUCHSIA)
 #if defined(CRASHPAD_IS_IN_CHROMIUM)
   base::FilePath::StringType executable_name(
       FILE_PATH_LITERAL("crashpad_tests"));
@@ -150,12 +151,12 @@ base::FilePath TestPaths::ExpectedExecutableBasename(
   base::FilePath::StringType executable_name(name);
 #endif  // CRASHPAD_IS_IN_CHROMIUM
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   executable_name += FILE_PATH_LITERAL(".exe");
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
 
   return base::FilePath(executable_name);
-#endif  // OS_FUCHSIA
+#endif  // BUILDFLAG(IS_FUCHSIA)
 }
 
 // static
@@ -177,17 +178,17 @@ base::FilePath TestPaths::BuildArtifact(
       directory = Executable().DirName();
       break;
 
-#if defined(OS_WIN) && defined(ARCH_CPU_64_BITS)
+#if BUILDFLAG(IS_WIN) && defined(ARCH_CPU_64_BITS)
     case Architecture::k32Bit:
       directory = Output32BitDirectory();
       CHECK(!directory.empty());
       break;
-#endif  // OS_WIN && ARCH_CPU_64_BITS
+#endif  // BUILDFLAG(IS_WIN) && ARCH_CPU_64_BITS
   }
 
   base::FilePath::StringType test_name =
       FILE_PATH_LITERAL("crashpad_") + module + FILE_PATH_LITERAL("_test");
-#if !defined(CRASHPAD_IS_IN_CHROMIUM) && !defined(OS_FUCHSIA)
+#if !defined(CRASHPAD_IS_IN_CHROMIUM) && !BUILDFLAG(IS_FUCHSIA)
   CHECK(Executable().BaseName().RemoveFinalExtension().value() == test_name);
 #endif  // !CRASHPAD_IS_IN_CHROMIUM
 
@@ -197,21 +198,21 @@ base::FilePath TestPaths::BuildArtifact(
       break;
 
     case FileType::kExecutable:
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
       extension = FILE_PATH_LITERAL(".exe");
-#elif defined(OS_FUCHSIA)
+#elif BUILDFLAG(IS_FUCHSIA)
       directory = base::FilePath(FILE_PATH_LITERAL("/pkg/bin"));
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
       break;
 
     case FileType::kLoadableModule:
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
       extension = FILE_PATH_LITERAL(".dll");
-#else  // OS_WIN
+#else  // BUILDFLAG(IS_WIN)
       extension = FILE_PATH_LITERAL(".so");
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
 
-#if defined(OS_FUCHSIA)
+#if BUILDFLAG(IS_FUCHSIA)
       // TODO(scottmg): .so files are currently deployed into /boot/lib, where
       // they'll be found (without a path) by the loader. Application packaging
       // infrastructure is in progress, so this will likely change again in the
@@ -232,14 +233,14 @@ base::FilePath TestPaths::BuildArtifact(
                           extension);
 }
 
-#if defined(OS_WIN) && defined(ARCH_CPU_64_BITS)
+#if BUILDFLAG(IS_WIN) && defined(ARCH_CPU_64_BITS)
 
 // static
 bool TestPaths::Has32BitBuildArtifacts() {
   return !Output32BitDirectory().empty();
 }
 
-#endif  // defined(OS_WIN) && defined(ARCH_CPU_64_BITS)
+#endif  // BUILDFLAG(IS_WIN) && defined(ARCH_CPU_64_BITS)
 
 }  // namespace test
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/test/test_paths.h b/extern/crashpad/crashpad/test/test_paths.h
index 72bb155392..e8d61e30f3 100644
--- a/extern/crashpad/crashpad/test/test_paths.h
+++ b/extern/crashpad/crashpad/test/test_paths.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -49,14 +49,14 @@ class TestPaths {
     //!     architecture as the running process.
     kDefault = 0,
 
-#if (defined(OS_WIN) && defined(ARCH_CPU_64_BITS)) || DOXYGEN
+#if (BUILDFLAG(IS_WIN) && defined(ARCH_CPU_64_BITS)) || DOXYGEN
     //! \brief The 32-bit variant is requested.
     //!
     //! On Windows, when running 64-bit code, the 32-bit variant can be
     //! requested. Before doing so, Has32BitBuildArtifacts() must be called and
     //! must return `true`. Otherwise, execution will be aborted.
     k32Bit,
-#endif  // OS_WIN && ARCH_CPU_64_BITS
+#endif  // BUILDFLAG(IS_WIN) && ARCH_CPU_64_BITS
   };
 
   TestPaths() = delete;
@@ -128,7 +128,7 @@ class TestPaths {
       FileType file_type,
       Architecture architecture = Architecture::kDefault);
 
-#if (defined(OS_WIN) && defined(ARCH_CPU_64_BITS)) || DOXYGEN
+#if (BUILDFLAG(IS_WIN) && defined(ARCH_CPU_64_BITS)) || DOXYGEN
   //! \return `true` if 32-bit build artifacts are available.
   //!
   //! Tests that require the use of 32-bit build output should call this
@@ -142,7 +142,7 @@ class TestPaths {
   //! can be found its own directory, and located by calling BuildArtifact()
   //! with Architecture::kDefault.
   static bool Has32BitBuildArtifacts();
-#endif  // OS_WIN && ARCH_CPU_64_BITS
+#endif  // BUILDFLAG(IS_WIN) && ARCH_CPU_64_BITS
 };
 
 }  // namespace test
diff --git a/extern/crashpad/crashpad/test/test_paths_test.cc b/extern/crashpad/crashpad/test/test_paths_test.cc
index 9d43b594f5..bfa042c5c9 100644
--- a/extern/crashpad/crashpad/test/test_paths_test.cc
+++ b/extern/crashpad/crashpad/test/test_paths_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/test/test_paths_test_data_root.txt b/extern/crashpad/crashpad/test/test_paths_test_data_root.txt
index 6ac07806bc..ef64e908e5 100644
--- a/extern/crashpad/crashpad/test/test_paths_test_data_root.txt
+++ b/extern/crashpad/crashpad/test/test_paths_test_data_root.txt
@@ -1,4 +1,4 @@
-# Copyright 2015 The Crashpad Authors. All rights reserved.
+# Copyright 2015 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/test/win/child_launcher.cc b/extern/crashpad/crashpad/test/win/child_launcher.cc
index abd2e3d948..1822c32db6 100644
--- a/extern/crashpad/crashpad/test/win/child_launcher.cc
+++ b/extern/crashpad/crashpad/test/win/child_launcher.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/test/win/child_launcher.h b/extern/crashpad/crashpad/test/win/child_launcher.h
index 273933e067..8c52432887 100644
--- a/extern/crashpad/crashpad/test/win/child_launcher.h
+++ b/extern/crashpad/crashpad/test/win/child_launcher.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/test/win/win_child_process.cc b/extern/crashpad/crashpad/test/win/win_child_process.cc
index a203d9d40e..e31a977d09 100644
--- a/extern/crashpad/crashpad/test/win/win_child_process.cc
+++ b/extern/crashpad/crashpad/test/win/win_child_process.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 #include <string>
 #include <utility>
 
+#include "base/check.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ -43,7 +44,6 @@ bool GetSwitch(const char* switch_name, std::string* value) {
   ScopedLocalAlloc scoped_args(args);  // Take ownership.
   if (!args) {
     PLOG(FATAL) << "CommandLineToArgvW";
-    return false;
   }
 
   std::string switch_name_with_equals(switch_name);
@@ -191,7 +191,7 @@ std::unique_ptr<WinChildProcess::Handles> WinChildProcess::Launch() {
       TestPaths::Executable().value() +
       base::UTF8ToWide(base::StringPrintf(
           " --gtest_filter=%s.%s %s=0x%x|0x%x --gtest_also_run_disabled_tests",
-          test_info->test_case_name(),
+          test_info->test_suite_name(),
           test_info->name(),
           kIsMultiprocessChild,
           HandleToInt(write_for_child.get()),
diff --git a/extern/crashpad/crashpad/test/win/win_child_process.h b/extern/crashpad/crashpad/test/win/win_child_process.h
index a93f3ca82b..12f18acf87 100644
--- a/extern/crashpad/crashpad/test/win/win_child_process.h
+++ b/extern/crashpad/crashpad/test/win/win_child_process.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/test/win/win_child_process_test.cc b/extern/crashpad/crashpad/test/win/win_child_process_test.cc
index 45b2dce5b1..e872fa824d 100644
--- a/extern/crashpad/crashpad/test/win/win_child_process_test.cc
+++ b/extern/crashpad/crashpad/test/win/win_child_process_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/test/win/win_multiprocess.cc b/extern/crashpad/crashpad/test/win/win_multiprocess.cc
index 645effc01e..626bd047fa 100644
--- a/extern/crashpad/crashpad/test/win/win_multiprocess.cc
+++ b/extern/crashpad/crashpad/test/win/win_multiprocess.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/test/win/win_multiprocess.h b/extern/crashpad/crashpad/test/win/win_multiprocess.h
index 91bee7e2cc..7adf225647 100644
--- a/extern/crashpad/crashpad/test/win/win_multiprocess.h
+++ b/extern/crashpad/crashpad/test/win/win_multiprocess.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/test/win/win_multiprocess_test.cc b/extern/crashpad/crashpad/test/win/win_multiprocess_test.cc
index 60eb9d8d02..e7675e4f2d 100644
--- a/extern/crashpad/crashpad/test/win/win_multiprocess_test.cc
+++ b/extern/crashpad/crashpad/test/win/win_multiprocess_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/test/win/win_multiprocess_with_temp_dir.cc b/extern/crashpad/crashpad/test/win/win_multiprocess_with_temp_dir.cc
index 1dfc1b13f7..22d3beb980 100644
--- a/extern/crashpad/crashpad/test/win/win_multiprocess_with_temp_dir.cc
+++ b/extern/crashpad/crashpad/test/win/win_multiprocess_with_temp_dir.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/test/win/win_multiprocess_with_temp_dir.h b/extern/crashpad/crashpad/test/win/win_multiprocess_with_temp_dir.h
index 5e47c22a06..4710ec32de 100644
--- a/extern/crashpad/crashpad/test/win/win_multiprocess_with_temp_dir.h
+++ b/extern/crashpad/crashpad/test/win/win_multiprocess_with_temp_dir.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE b/extern/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE
deleted file mode 100644
index 71fe6fd79c..0000000000
--- a/extern/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE
+++ /dev/null
@@ -1,335 +0,0 @@
-APPLE PUBLIC SOURCE LICENSE
-Version 2.0 -  August 6, 2003
-
-Please read this License carefully before downloading this software.  By
-downloading or using this software, you are agreeing to be bound by the terms
-of this License.  If you do not or cannot agree to the terms of this License,
-please do not download or use the software.
-
-Apple Note:  In January 2007, Apple changed its corporate name from "Apple
-Computer, Inc." to "Apple Inc."  This change has been reflected below and
-copyright years updated, but no other changes have been made to the APSL 2.0.
-
-1.	General; Definitions.  This License applies to any program or other
-work which Apple Inc. ("Apple") makes publicly available and which contains a
-notice placed by Apple identifying such program or work as "Original Code" and
-stating that it is subject to the terms of this Apple Public Source License
-version 2.0 ("License").  As used in this License:
-
-1.1	 "Applicable Patent Rights" mean:  (a) in the case where Apple is the
-grantor of rights, (i) claims of patents that are now or hereafter acquired,
-owned by or assigned to Apple and (ii) that cover subject matter contained in
-the Original Code, but only to the extent necessary to use, reproduce and/or
-distribute the Original Code without infringement; and (b) in the case where
-You are the grantor of rights, (i) claims of patents that are now or hereafter
-acquired, owned by or assigned to You and (ii) that cover subject matter in
-Your Modifications, taken alone or in combination with Original Code.
-
-1.2	"Contributor" means any person or entity that creates or contributes to
-the creation of Modifications.
-
-1.3	 "Covered Code" means the Original Code, Modifications, the combination
-of Original Code and any Modifications, and/or any respective portions thereof.
-
-1.4	"Externally Deploy" means: (a) to sublicense, distribute or otherwise
-make Covered Code available, directly or indirectly, to anyone other than You;
-and/or (b) to use Covered Code, alone or as part of a Larger Work, in any way
-to provide a service, including but not limited to delivery of content, through
-electronic communication with a client other than You.
-
-1.5	"Larger Work" means a work which combines Covered Code or portions
-thereof with code not governed by the terms of this License.
-
-1.6	"Modifications" mean any addition to, deletion from, and/or change to,
-the substance and/or structure of the Original Code, any previous
-Modifications, the combination of Original Code and any previous Modifications,
-and/or any respective portions thereof.  When code is released as a series of
-files, a Modification is:  (a) any addition to or deletion from the contents of
-a file containing Covered Code; and/or (b) any new file or other representation
-of computer program statements that contains any part of Covered Code. 
-
-1.7	"Original Code" means (a) the Source Code of a program or other work as
-originally made available by Apple under this License, including the Source
-Code of any updates or upgrades to such programs or works made available by
-Apple under this License, and that has been expressly identified by Apple as
-such in the header file(s) of such work; and (b) the object code compiled from
-such Source Code and originally made available by Apple under this License
-
-1.8	"Source Code" means the human readable form of a program or other work
-that is suitable for making modifications to it, including all modules it
-contains, plus any associated interface definition files, scripts used to
-control compilation and installation of an executable (object code).
-
-1.9	"You" or "Your" means an individual or a legal entity exercising rights
-under this License.  For legal entities, "You" or "Your" includes any entity
-which controls, is controlled by, or is under common control with, You, where
-"control" means (a) the power, direct or indirect, to cause the direction or
-management of such entity, whether by contract or otherwise, or (b) ownership
-of fifty percent (50%) or more of the outstanding shares or beneficial
-ownership of such entity.
-
-2.	Permitted Uses; Conditions & Restrictions.   Subject to the terms and
-conditions of this License, Apple hereby grants You, effective on the date You
-accept this License and download the Original Code, a world-wide, royalty-free,
-non-exclusive license, to the extent of Apple's Applicable Patent Rights and
-copyrights covering the Original Code, to do the following:
-
-2.1	Unmodified Code.  You may use, reproduce, display, perform, internally
-distribute within Your organization, and Externally Deploy verbatim, unmodified
-copies of the Original Code, for commercial or non-commercial purposes,
-provided that in each instance:
-
-(a)	You must retain and reproduce in all copies of Original Code the
-copyright and other proprietary notices and disclaimers of Apple as they appear
-in the Original Code, and keep intact all notices in the Original Code that
-refer to this License; and
-
-(b) 	You must include a copy of this License with every copy of Source Code
-of Covered Code and documentation You distribute or Externally Deploy, and You
-may not offer or impose any terms on such Source Code that alter or restrict
-this License or the recipients' rights hereunder, except as permitted under
-Section 6.
-
-2.2	Modified Code.  You may modify Covered Code and use, reproduce,
-display, perform, internally distribute within Your organization, and
-Externally Deploy Your Modifications and Covered Code, for commercial or
-non-commercial purposes, provided that in each instance You also meet all of
-these conditions:
-
-(a)	You must satisfy all the conditions of Section 2.1 with respect to the
-Source Code of the Covered Code; 
-
-(b)	You must duplicate, to the extent it does not already exist, the notice
-in Exhibit A in each file of the Source Code of all Your Modifications, and
-cause the modified files to carry prominent notices stating that You changed
-the files and the date of any change; and
-
-(c)	If You Externally Deploy Your Modifications, You must make Source Code
-of all Your Externally Deployed Modifications either available to those to whom
-You have Externally Deployed Your Modifications, or publicly available.  Source
-Code of Your Externally Deployed Modifications must be released under the terms
-set forth in this License, including the license grants set forth in Section 3
-below, for as long as you Externally Deploy the Covered Code or twelve (12)
-months from the date of initial External Deployment, whichever is longer. You
-should preferably distribute the Source Code of Your Externally Deployed
-Modifications electronically (e.g. download from a web site).
-
-2.3	Distribution of Executable Versions.  In addition, if You Externally
-Deploy Covered Code (Original Code and/or Modifications) in object code,
-executable form only, You must include a prominent notice, in the code itself
-as well as in related documentation, stating that Source Code of the Covered
-Code is available under the terms of this License with information on how and
-where to obtain such Source Code.  
-
-2.4	Third Party Rights.  You expressly acknowledge and agree that although
-Apple and each Contributor grants the licenses to their respective portions of
-the Covered Code set forth herein, no assurances are provided by Apple or any
-Contributor that the Covered Code does not infringe the patent or other
-intellectual property rights of any other entity. Apple and each Contributor
-disclaim any liability to You for claims brought by any other entity based on
-infringement of intellectual property rights or otherwise. As a condition to
-exercising the rights and licenses granted hereunder, You hereby assume sole
-responsibility to secure any other intellectual property rights needed, if any.
-For example, if a third party patent license is required to allow You to
-distribute the Covered Code, it is Your responsibility to acquire that license
-before distributing the Covered Code.
-
-3.	Your Grants.  In consideration of, and as a condition to, the licenses
-granted to You under this License, You hereby grant to any person or entity
-receiving or distributing Covered Code under this License a non-exclusive,
-royalty-free, perpetual, irrevocable license, under Your Applicable Patent
-Rights and other intellectual property rights (other than patent) owned or
-controlled by You, to use, reproduce, display, perform, modify, sublicense,
-distribute and Externally Deploy Your Modifications of the same scope and
-extent as Apple's licenses under Sections 2.1 and 2.2 above.  
-
-4.	Larger Works.  You may create a Larger Work by combining Covered Code
-with other code not governed by the terms of this License and distribute the
-Larger Work as a single product.  In each such instance, You must make sure the
-requirements of this License are fulfilled for the Covered Code or any portion
-thereof. 
-
-5.	Limitations on Patent License.   Except as expressly stated in Section
-2, no other patent rights, express or implied, are granted by Apple herein.
-Modifications and/or Larger Works may require additional patent licenses from
-Apple which Apple may grant in its sole discretion.  
-
-6.	Additional Terms.  You may choose to offer, and to charge a fee for,
-warranty, support, indemnity or liability obligations and/or other rights
-consistent with the scope of the license granted herein ("Additional Terms") to
-one or more recipients of Covered Code. However, You may do so only on Your own
-behalf and as Your sole responsibility, and not on behalf of Apple or any
-Contributor. You must obtain the recipient's agreement that any such Additional
-Terms are offered by You alone, and You hereby agree to indemnify, defend and
-hold Apple and every Contributor harmless for any liability incurred by or
-claims asserted against Apple or such Contributor by reason of any such
-Additional Terms. 
-
-7.	Versions of the License.  Apple may publish revised and/or new versions
-of this License from time to time.  Each version will be given a distinguishing
-version number.  Once Original Code has been published under a particular
-version of this License, You may continue to use it under the terms of that
-version. You may also choose to use such Original Code under the terms of any
-subsequent version of this License published by Apple.  No one other than Apple
-has the right to modify the terms applicable to Covered Code created under this
-License.  
-
-8.	NO WARRANTY OR SUPPORT.  The Covered Code may contain in whole or in
-part pre-release, untested, or not fully tested works.  The Covered Code may
-contain errors that could cause failures or loss of data, and may be incomplete
-or contain inaccuracies.  You expressly acknowledge and agree that use of the
-Covered Code, or any portion thereof, is at Your sole and entire risk.  THE
-COVERED CODE IS PROVIDED "AS IS" AND WITHOUT WARRANTY, UPGRADES OR SUPPORT OF
-ANY KIND AND APPLE AND APPLE'S LICENSOR(S) (COLLECTIVELY REFERRED TO AS "APPLE"
-FOR THE PURPOSES OF SECTIONS 8 AND 9) AND ALL CONTRIBUTORS EXPRESSLY DISCLAIM
-ALL WARRANTIES AND/OR CONDITIONS, EXPRESS OR IMPLIED, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES AND/OR CONDITIONS OF MERCHANTABILITY, OF
-SATISFACTORY QUALITY, OF FITNESS FOR A PARTICULAR PURPOSE, OF ACCURACY, OF
-QUIET ENJOYMENT, AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  APPLE AND EACH
-CONTRIBUTOR DOES NOT WARRANT AGAINST INTERFERENCE WITH YOUR ENJOYMENT OF THE
-COVERED CODE, THAT THE FUNCTIONS CONTAINED IN THE COVERED CODE WILL MEET YOUR
-REQUIREMENTS, THAT THE OPERATION OF THE COVERED CODE WILL BE UNINTERRUPTED OR
-ERROR-FREE, OR THAT DEFECTS IN THE COVERED CODE WILL BE CORRECTED.  NO ORAL OR
-WRITTEN INFORMATION OR ADVICE GIVEN BY APPLE, AN APPLE AUTHORIZED
-REPRESENTATIVE OR ANY CONTRIBUTOR SHALL CREATE A WARRANTY.  You acknowledge
-that the Covered Code is not intended for use in the operation of nuclear
-facilities, aircraft navigation, communication systems, or air traffic control
-machines in which case the failure of the Covered Code could lead to death,
-personal injury, or severe physical or environmental damage.
-
-9.	LIMITATION OF LIABILITY. TO THE EXTENT NOT PROHIBITED BY LAW, IN NO
-EVENT SHALL APPLE OR ANY CONTRIBUTOR BE LIABLE FOR ANY INCIDENTAL, SPECIAL,
-INDIRECT OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO THIS LICENSE OR
-YOUR USE OR INABILITY TO USE THE COVERED CODE, OR ANY PORTION THEREOF, WHETHER
-UNDER A THEORY OF CONTRACT, WARRANTY, TORT (INCLUDING NEGLIGENCE), PRODUCTS
-LIABILITY OR OTHERWISE, EVEN IF APPLE OR SUCH CONTRIBUTOR HAS BEEN ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES AND NOTWITHSTANDING THE FAILURE OF ESSENTIAL
-PURPOSE OF ANY REMEDY. SOME JURISDICTIONS DO NOT ALLOW THE LIMITATION OF
-LIABILITY OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS LIMITATION MAY NOT
-APPLY TO YOU. In no event shall Apple's total liability to You for all damages
-(other than as may be required by applicable law) under this License exceed the
-amount of fifty dollars ($50.00).
-
-10.	Trademarks.  This License does not grant any rights to use the
-trademarks or trade names  "Apple", "Mac", "Mac OS", "QuickTime", "QuickTime
-Streaming Server" or any other trademarks, service marks, logos or trade names
-belonging to Apple (collectively "Apple Marks") or to any trademark, service
-mark, logo or trade name belonging to any Contributor.  You agree not to use
-any Apple Marks in or as part of the name of products derived from the Original
-Code or to endorse or promote products derived from the Original Code other
-than as expressly permitted by and in strict compliance at all times with
-Apple's third party trademark usage guidelines which are posted at
-http://www.apple.com/legal/guidelinesfor3rdparties.html.  
-
-11.	Ownership. Subject to the licenses granted under this License, each
-Contributor retains all rights, title and interest in and to any Modifications
-made by such Contributor.  Apple retains all rights, title and interest in and
-to the Original Code and any Modifications made by or on behalf of Apple
-("Apple Modifications"), and such Apple Modifications will not be automatically
-subject to this License.  Apple may, at its sole discretion, choose to license
-such Apple Modifications under this License, or on different terms from those
-contained in this License or may choose not to license them at all.  
-
-12.	Termination.  
-
-12.1	Termination.  This License and the rights granted hereunder will
-terminate:
-
-(a)	automatically without notice from Apple if You fail to comply with any
-term(s) of this License and fail to cure such breach within 30 days of becoming
-aware of such breach;
-(b)	immediately in the event of the circumstances described in Section
-13.5(b); or
-(c)	automatically without notice from Apple if You, at any time during the
-term of this License, commence an action for patent infringement against Apple;
-provided that Apple did not first commence an action for patent infringement
-against You in that instance.
-
-12.2	Effect of Termination.  Upon termination, You agree to immediately stop
-any further use, reproduction, modification, sublicensing and distribution of
-the Covered Code.  All sublicenses to the Covered Code which have been properly
-granted prior to termination shall survive any termination of this License.
-Provisions which, by their nature, should remain in effect beyond the
-termination of this License shall survive, including but not limited to
-Sections 3, 5, 8, 9, 10, 11, 12.2 and 13.  No party will be liable to any other
-for compensation, indemnity or damages of any sort solely as a result of
-terminating this License in accordance with its terms, and termination of this
-License will be without prejudice to any other right or remedy of any party.
-
-13. 	Miscellaneous.
-
-13.1	Government End Users.   The Covered Code is a "commercial item" as
-defined in FAR 2.101.  Government software and technical data rights in the
-Covered Code include only those rights customarily provided to the public as
-defined in this License. This customary commercial license in technical data
-and software is provided in accordance with FAR 12.211 (Technical Data) and
-12.212 (Computer Software) and, for Department of Defense purchases, DFAR
-252.227-7015 (Technical Data -- Commercial Items) and 227.7202-3 (Rights in
-Commercial Computer Software or Computer Software Documentation).  Accordingly,
-all U.S. Government End Users acquire Covered Code with only those rights set
-forth herein.
-
-13.2	Relationship of Parties.  This License will not be construed as
-creating an agency, partnership, joint venture or any other form of legal
-association between or among You, Apple or any Contributor, and You will not
-represent to the contrary, whether expressly, by implication, appearance or
-otherwise.
-
-13.3	Independent Development.   Nothing in this License will impair Apple's
-right to acquire, license, develop, have others develop for it, market and/or
-distribute technology or products that perform the same or similar functions
-as, or otherwise compete with, Modifications, Larger Works, technology or
-products that You may develop, produce, market or distribute.
-
-13.4	Waiver; Construction.  Failure by Apple or any Contributor to enforce
-any provision of this License will not be deemed a waiver of future enforcement
-of that or any other provision.  Any law or regulation which provides that the
-language of a contract shall be construed against the drafter will not apply to
-this License.
-
-13.5	Severability.  (a) If for any reason a court of competent jurisdiction
-finds any provision of this License, or portion thereof, to be unenforceable,
-that provision of the License will be enforced to the maximum extent
-permissible so as to effect the economic benefits and intent of the parties,
-and the remainder of this License will continue in full force and effect.  (b)
-Notwithstanding the foregoing, if applicable law prohibits or restricts You
-from fully and/or specifically complying with Sections 2 and/or 3 or prevents
-the enforceability of either of those Sections, this License will immediately
-terminate and You must immediately discontinue any use of the Covered Code and
-destroy all copies of it that are in your possession or control.
-
-13.6	Dispute Resolution.  Any litigation or other dispute resolution between
-You and Apple relating to this License shall take place in the Northern
-District of California, and You and Apple hereby consent to the personal
-jurisdiction of, and venue in, the state and federal courts within that
-District with respect to this License. The application of the United Nations
-Convention on Contracts for the International Sale of Goods is expressly
-excluded.
-
-13.7	Entire Agreement; Governing Law.  This License constitutes the entire
-agreement between the parties with respect to the subject matter hereof.  This
-License shall be governed by the laws of the United States and the State of
-California, except that body of California law concerning conflicts of law. 
-
-Where You are located in the province of Quebec, Canada, the following clause
-applies:  The parties hereby confirm that they have requested that this License
-and all related documents be drafted in English. Les parties ont exigé que le
-présent contrat et tous les documents connexes soient rédigés en anglais. 
-
-EXHIBIT A. 
-
-"Portions Copyright (c) 1999-2007 Apple Inc.  All Rights Reserved.
-
-This file contains Original Code and/or Modifications of Original Code as
-defined in and that are subject to the Apple Public Source License Version 2.0
-(the 'License').  You may not use this file except in compliance with the
-License.  Please obtain a copy of the License at
-http://www.opensource.apple.com/apsl/ and read it before using this file.
-
-The Original Code and all software distributed under the License are
-distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS
-OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, INCLUDING WITHOUT
-LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.  Please see the License for the
-specific language governing rights and limitations under the License." 
-
diff --git a/extern/crashpad/crashpad/third_party/apple_cf/BUILD.gn b/extern/crashpad/crashpad/third_party/apple_cf/BUILD.gn
deleted file mode 100644
index 9e37354d63..0000000000
--- a/extern/crashpad/crashpad/third_party/apple_cf/BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2019 The Crashpad Authors. All rights reserved.
-#
-# 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.
-
-source_set("apple_cf") {
-  sources = [ "CFStreamAbstract.h" ]
-}
diff --git a/extern/crashpad/crashpad/third_party/apple_cf/CFStreamAbstract.h b/extern/crashpad/crashpad/third_party/apple_cf/CFStreamAbstract.h
deleted file mode 100644
index ac26664f18..0000000000
--- a/extern/crashpad/crashpad/third_party/apple_cf/CFStreamAbstract.h
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Copyright (c) 2015 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- *
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*	CFStreamAbstract.h
-	Copyright (c) 2000-2014, Apple Inc. All rights reserved.
-*/
-
-#if !defined(__COREFOUNDATION_CFSTREAMABSTRACT__)
-#define __COREFOUNDATION_CFSTREAMABSTRACT__ 1
-
-#include <CoreFoundation/CFStream.h>
-
-CF_EXTERN_C_BEGIN
-
-/*  During a stream's lifetime, the open callback will be called once, followed by any number of openCompleted calls (until openCompleted returns TRUE).  Then any number of read/canRead or write/canWrite calls, then a single close call.  copyProperty can be called at any time.  prepareAsynch will be called exactly once when the stream's client is first configured.
-
-    Expected semantics:
-    - open reserves any system resources that are needed.  The stream may start the process of opening, returning TRUE immediately and setting openComplete to FALSE.  When the open completes, _CFStreamSignalEvent should be called passing kCFStreamOpenCompletedEvent.  openComplete should be set to TRUE only if the open operation completed in its entirety.
-    - openCompleted will only be called after open has been called, but before any kCFStreamOpenCompletedEvent has been received.  Return TRUE, setting error.code to 0, if the open operation has completed.  Return TRUE, setting error to the correct error code and domain if the open operation completed, but failed.  Return FALSE if the open operation is still in-progress.  If your open ever fails to complete (i.e. sets openComplete to FALSE), you must be implement the openCompleted callback.
-    - read should read into the given buffer, returning the number of bytes successfully read.  read must block until at least one byte is available, but should not block until the entire buffer is filled; zero should only be returned if end-of-stream is encountered. atEOF should be set to true if the EOF is encountered, false otherwise.  error.code should be set to zero if no error occurs; otherwise, error should be set to the appropriate values.
-    - getBuffer is an optimization to return an internal buffer of bytes read from the stream, and may return NULL.  getBuffer itself may be NULL if the concrete implementation does not wish to provide an internal buffer.  If implemented, it should set numBytesRead to the number of bytes available in the internal buffer (but should not exceed maxBytesToRead) and return a pointer to the base of the bytes.
-    - canRead will only be called once openCompleted reports that the stream has been successfully opened (or the initial open call succeeded).  It should return whether there are bytes that can be read without blocking.
-    - write should write the bytes in the given buffer to the device, returning the number of bytes successfully written.  write must block until at least one byte is written.  error.code should be set to zero if no error occurs; otherwise, error should be set to the appropriate values.
-    - close should close the device, releasing any reserved system resources.  close cannot fail (it may be called to abort the stream), and may be called at any time after open has been called.  It will only be called once.
-    - copyProperty should return the value for the given property, or NULL if none exists.  Composite streams (streams built on top of other streams) should take care to call CFStreamCopyProperty on the base stream if they do not recognize the property given, to give the underlying stream a chance to respond.
-
-    In all cases, errors returned by reference will be initialized to NULL by the caller, and if they are set to non-NULL, will
-    be released by the caller 
-*/
-   
-typedef struct {
-    CFIndex version; /* == 2 */
-
-    void *(*create)(CFReadStreamRef stream, void *info);
-    void (*finalize)(CFReadStreamRef stream, void *info);
-    CFStringRef (*copyDescription)(CFReadStreamRef stream, void *info);
-
-    Boolean (*open)(CFReadStreamRef stream, CFErrorRef *error, Boolean *openComplete, void *info);
-    Boolean (*openCompleted)(CFReadStreamRef stream, CFErrorRef *error, void *info);
-    CFIndex (*read)(CFReadStreamRef stream, UInt8 *buffer, CFIndex bufferLength, CFErrorRef *error, Boolean *atEOF, void *info);
-    const UInt8 *(*getBuffer)(CFReadStreamRef stream, CFIndex maxBytesToRead, CFIndex *numBytesRead, CFErrorRef *error, Boolean *atEOF, void *info);
-    Boolean (*canRead)(CFReadStreamRef stream, CFErrorRef *error, void *info);
-    void (*close)(CFReadStreamRef stream, void *info);
-
-    CFTypeRef (*copyProperty)(CFReadStreamRef stream, CFStringRef propertyName, void *info);
-    Boolean (*setProperty)(CFReadStreamRef stream, CFStringRef propertyName, CFTypeRef propertyValue, void *info);
-
-    void (*requestEvents)(CFReadStreamRef stream, CFOptionFlags streamEvents, void *info);
-    void (*schedule)(CFReadStreamRef stream, CFRunLoopRef runLoop, CFStringRef runLoopMode, void *info);
-    void (*unschedule)(CFReadStreamRef stream, CFRunLoopRef runLoop, CFStringRef runLoopMode, void *info);
-} CFReadStreamCallBacks;
-
-typedef struct {
-    CFIndex version; /* == 2 */
-
-    void *(*create)(CFWriteStreamRef stream, void *info);
-    void (*finalize)(CFWriteStreamRef stream, void *info);
-    CFStringRef (*copyDescription)(CFWriteStreamRef stream, void *info);
-
-    Boolean (*open)(CFWriteStreamRef stream, CFErrorRef *error, Boolean *openComplete, void *info);
-    Boolean (*openCompleted)(CFWriteStreamRef stream, CFErrorRef *error, void *info);
-    CFIndex (*write)(CFWriteStreamRef stream, const UInt8 *buffer, CFIndex bufferLength, CFErrorRef *error, void *info);
-    Boolean (*canWrite)(CFWriteStreamRef stream, CFErrorRef *error, void *info); 
-    void (*close)(CFWriteStreamRef stream, void *info);
-
-    CFTypeRef (*copyProperty)(CFWriteStreamRef stream, CFStringRef propertyName, void *info);
-    Boolean (*setProperty)(CFWriteStreamRef stream, CFStringRef propertyName, CFTypeRef propertyValue, void *info);
-
-    void (*requestEvents)(CFWriteStreamRef stream, CFOptionFlags streamEvents, void *info);
-    void (*schedule)(CFWriteStreamRef stream, CFRunLoopRef runLoop, CFStringRef runLoopMode, void *info);
-    void (*unschedule)(CFWriteStreamRef stream, CFRunLoopRef runLoop, CFStringRef runLoopMode, void *info);
-} CFWriteStreamCallBacks;
-
-// Primitive creation mechanisms.
-CF_EXPORT
-CFReadStreamRef CFReadStreamCreate(CFAllocatorRef alloc, const CFReadStreamCallBacks *callbacks, void *info);
-CF_EXPORT
-CFWriteStreamRef CFWriteStreamCreate(CFAllocatorRef alloc, const CFWriteStreamCallBacks *callbacks, void *info);
-
-/* All the functions below can only be called when you are sure the stream in question was created via
-   CFReadStreamCreate() or CFWriteStreamCreate(), above.  They are NOT safe for toll-free bridged objects, 
-   so the caller must be sure the argument passed is not such an object. */
-
-// To be called by the concrete stream implementation (the callbacks) when an event occurs. error may be NULL if event != kCFStreamEventErrorOccurred
-// error should be a CFErrorRef if the callbacks are version 2 or later; otherwise it should be a (CFStreamError *).
-CF_EXPORT
-void CFReadStreamSignalEvent(CFReadStreamRef stream, CFStreamEventType event, const void *error);
-CF_EXPORT
-void CFWriteStreamSignalEvent(CFWriteStreamRef stream, CFStreamEventType event, const void *error);
-
-// These require that the stream allow the run loop to run once before delivering the event to its client.  
-// See the comment above CFRead/WriteStreamSignalEvent for interpretation of the error argument.
-CF_EXPORT
-void _CFReadStreamSignalEventDelayed(CFReadStreamRef stream, CFStreamEventType event, const void *error);
-CF_EXPORT
-void _CFWriteStreamSignalEventDelayed(CFWriteStreamRef stream, CFStreamEventType event, const void *error);
-
-CF_EXPORT
-void _CFReadStreamClearEvent(CFReadStreamRef stream, CFStreamEventType event);
-// Write variant not currently needed
-//CF_EXPORT
-//void _CFWriteStreamClearEvent(CFWriteStreamRef stream, CFStreamEventType event);
-
-// Convenience for concrete implementations to extract the info pointer given the stream.
-CF_EXPORT
-void *CFReadStreamGetInfoPointer(CFReadStreamRef stream);
-CF_EXPORT
-void *CFWriteStreamGetInfoPointer(CFWriteStreamRef stream);
-
-// Returns the client info pointer currently set on the stream.  These should probably be made public one day.
-CF_EXPORT
-void *_CFReadStreamGetClient(CFReadStreamRef readStream);
-CF_EXPORT
-void *_CFWriteStreamGetClient(CFWriteStreamRef writeStream);
-
-// Returns an array of the runloops and modes on which the stream is currently scheduled
-// Note that these are unretained mutable arrays - use the copy variant instead.
-CF_EXPORT
-CFArrayRef _CFReadStreamGetRunLoopsAndModes(CFReadStreamRef readStream);
-CF_EXPORT
-CFArrayRef _CFWriteStreamGetRunLoopsAndModes(CFWriteStreamRef writeStream);
-
-// Returns an array of the runloops and modes on which the stream is currently scheduled
-CF_EXPORT
-CFArrayRef _CFReadStreamCopyRunLoopsAndModes(CFReadStreamRef readStream);
-CF_EXPORT
-CFArrayRef _CFWriteStreamCopyRunLoopsAndModes(CFWriteStreamRef writeStream);
-
-/* Deprecated versions; here for backwards compatibility. */
-typedef struct {
-    CFIndex version; /* == 1 */
-    void *(*create)(CFReadStreamRef stream, void *info);
-    void (*finalize)(CFReadStreamRef stream, void *info);
-    CFStringRef (*copyDescription)(CFReadStreamRef stream, void *info);
-    Boolean (*open)(CFReadStreamRef stream, CFStreamError *error, Boolean *openComplete, void *info);
-    Boolean (*openCompleted)(CFReadStreamRef stream, CFStreamError *error, void *info);
-    CFIndex (*read)(CFReadStreamRef stream, UInt8 *buffer, CFIndex bufferLength, CFStreamError *error, Boolean *atEOF, void *info);
-    const UInt8 *(*getBuffer)(CFReadStreamRef stream, CFIndex maxBytesToRead, CFIndex *numBytesRead, CFStreamError *error, Boolean *atEOF, void *info);
-    Boolean (*canRead)(CFReadStreamRef stream, void *info);
-    void (*close)(CFReadStreamRef stream, void *info);
-    CFTypeRef (*copyProperty)(CFReadStreamRef stream, CFStringRef propertyName, void *info);
-    Boolean (*setProperty)(CFReadStreamRef stream, CFStringRef propertyName, CFTypeRef propertyValue, void *info);
-    void (*requestEvents)(CFReadStreamRef stream, CFOptionFlags streamEvents, void *info);
-    void (*schedule)(CFReadStreamRef stream, CFRunLoopRef runLoop, CFStringRef runLoopMode, void *info);
-    void (*unschedule)(CFReadStreamRef stream, CFRunLoopRef runLoop, CFStringRef runLoopMode, void *info);
-} CFReadStreamCallBacksV1;
-
-typedef struct {
-    CFIndex version; /* == 1 */
-    void *(*create)(CFWriteStreamRef stream, void *info);
-    void (*finalize)(CFWriteStreamRef stream, void *info);
-    CFStringRef (*copyDescription)(CFWriteStreamRef stream, void *info);
-    Boolean (*open)(CFWriteStreamRef stream, CFStreamError *error, Boolean *openComplete, void *info);
-    Boolean (*openCompleted)(CFWriteStreamRef stream, CFStreamError *error, void *info);
-    CFIndex (*write)(CFWriteStreamRef stream, const UInt8 *buffer, CFIndex bufferLength, CFStreamError *error, void *info);
-    Boolean (*canWrite)(CFWriteStreamRef stream, void *info); 
-    void (*close)(CFWriteStreamRef stream, void *info);
-    CFTypeRef (*copyProperty)(CFWriteStreamRef stream, CFStringRef propertyName, void *info);
-    Boolean (*setProperty)(CFWriteStreamRef stream, CFStringRef propertyName, CFTypeRef propertyValue, void *info);
-    void (*requestEvents)(CFWriteStreamRef stream, CFOptionFlags streamEvents, void *info);
-    void (*schedule)(CFWriteStreamRef stream, CFRunLoopRef runLoop, CFStringRef runLoopMode, void *info);
-    void (*unschedule)(CFWriteStreamRef stream, CFRunLoopRef runLoop, CFStringRef runLoopMode, void *info);
-} CFWriteStreamCallBacksV1;
-
-typedef struct {
-    CFIndex version; /* == 0 */
-    Boolean (*open)(CFReadStreamRef stream, CFStreamError *error, Boolean *openComplete, void *info);
-    Boolean (*openCompleted)(CFReadStreamRef stream, CFStreamError *error, void *info);
-    CFIndex (*read)(CFReadStreamRef stream, UInt8 *buffer, CFIndex bufferLength, CFStreamError *error, Boolean *atEOF, void *info);
-    const UInt8 *(*getBuffer)(CFReadStreamRef stream, CFIndex maxBytesToRead, CFIndex *numBytesRead, CFStreamError *error, Boolean *atEOF, void *info);
-    Boolean (*canRead)(CFReadStreamRef stream, void *info);
-    void (*close)(CFReadStreamRef stream, void *info);
-    CFTypeRef (*copyProperty)(CFReadStreamRef stream, CFStringRef propertyName, void *info);
-    void (*schedule)(CFReadStreamRef stream, CFRunLoopRef runLoop, CFStringRef runLoopMode, void *info);
-    void (*unschedule)(CFReadStreamRef stream, CFRunLoopRef runLoop, CFStringRef runLoopMode, void *info);
-} CFReadStreamCallBacksV0;
-
-typedef struct {
-    CFIndex version; /* == 0 */
-    Boolean (*open)(CFWriteStreamRef stream, CFStreamError *error, Boolean *openComplete, void *info);
-    Boolean (*openCompleted)(CFWriteStreamRef stream, CFStreamError *error, void *info);
-    CFIndex (*write)(CFWriteStreamRef stream, const UInt8 *buffer, CFIndex bufferLength, CFStreamError *error, void *info);
-    Boolean (*canWrite)(CFWriteStreamRef stream, void *info); 
-    void (*close)(CFWriteStreamRef stream, void *info);
-    CFTypeRef (*copyProperty)(CFWriteStreamRef stream, CFStringRef propertyName, void *info);
-    void (*schedule)(CFWriteStreamRef stream, CFRunLoopRef runLoop, CFStringRef runLoopMode, void *info);
-    void (*unschedule)(CFWriteStreamRef stream, CFRunLoopRef runLoop, CFStringRef runLoopMode, void *info);
-} CFWriteStreamCallBacksV0;
-
-CF_EXTERN_C_END
-
-#endif /* ! __COREFOUNDATION_CFSTREAMABSTRACT__ */
diff --git a/extern/crashpad/crashpad/third_party/apple_cf/README.crashpad b/extern/crashpad/crashpad/third_party/apple_cf/README.crashpad
deleted file mode 100644
index 20066484df..0000000000
--- a/extern/crashpad/crashpad/third_party/apple_cf/README.crashpad
+++ /dev/null
@@ -1,15 +0,0 @@
-Name: Apple CF-Lite
-Short Name: CF
-URL: https://opensource.apple.com/source/CF/
-URL: https://opensource.apple.com/tarballs/CF/
-Version: 1153.18 (from OS X 10.10.3)
-License: APSL 2.0
-License File: APPLE_LICENSE
-Security Critical: no
-
-Description:
-CF-Lite is an open-source version of the CoreFoundation framework. This
-contains non-public but stable header files.
-
-Local Modifications:
- - Only CFStreamAbstract.h is included.
diff --git a/extern/crashpad/crashpad/third_party/cpp-httplib/BUILD.gn b/extern/crashpad/crashpad/third_party/cpp-httplib/BUILD.gn
index 8db916acfd..b1bde55eed 100644
--- a/extern/crashpad/crashpad/third_party/cpp-httplib/BUILD.gn
+++ b/extern/crashpad/crashpad/third_party/cpp-httplib/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2018 The Crashpad Authors. All rights reserved.
+# Copyright 2018 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/third_party/cpp-httplib/README.crashpad b/extern/crashpad/crashpad/third_party/cpp-httplib/README.crashpad
index cfb476e0af..fb67dabe84 100644
--- a/extern/crashpad/crashpad/third_party/cpp-httplib/README.crashpad
+++ b/extern/crashpad/crashpad/third_party/cpp-httplib/README.crashpad
@@ -1,15 +1,28 @@
 Name: cpp-httplib
 Short Name: cpp-httplib
 URL: https://github.com/yhirose/cpp-httplib
-Revision: 5b3187e2f9e77c672063d49a1167bbb563da023e
+Version: 0.27.0
+Revision: eacc1ca98e5fef25184c7d417e8417225e05e65d
 License: MIT
 License File: cpp-httplib/LICENSE
 Security Critical: no (test only)
+Shipped: no
 
 Description:
-A C++11 header-only HTTP library.
+A C++11 single-file header-only cross-platform HTTP/HTTPS library.
 
 Local Modifications:
-- Exclude test/ and example/ subdirs.
-- Patch httplib.h to use #include "third_party/zlib/zlib_crashpad.h" instead of
-  <zlib.h>.
+ - Exclude all subdirectories and build-related files.
+ - Patch httplib.h to use #include "third_party/zlib/zlib_crashpad.h" instead of
+   <zlib.h>.
+ - #define CPPHTTPLIB_NO_EXCEPTIONS 1.
+ - Revert upstream patches that drop support for 32-bit Windows:
+    - 52163ed9823c Fix #2148 (#2173)
+    - 9dbaed75efff Fix #2175 (#2177)
+    - 1f110b54d8b3 Chang #error to #warning for the 32-bit environment check
+                   except 32-bit Windows
+    - 0b3758ec36be Fix problem with Windows version check
+    - fbee136dca54 Fix #2193. Allow _WIN32
+    - dffce89514c2 Fix 32-bit MSVC compiler error due to unknown command
+                   #warning (#2202)
+ - Fix sign compare error with sk_X509_OBJECT_num from BoringSSL.
diff --git a/extern/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/README.md b/extern/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/README.md
index 84685b4a93..a69f7be791 100644
--- a/extern/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/README.md
+++ b/extern/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/README.md
@@ -1,93 +1,689 @@
 cpp-httplib
 ===========
 
-A C++11 header-only HTTP library.
+[![](https://github.com/yhirose/cpp-httplib/workflows/test/badge.svg)](https://github.com/yhirose/cpp-httplib/actions)
 
-It's extremely easy to setup. Just include **httplib.h** file in your code!
+A C++11 single-file header-only cross platform HTTP/HTTPS library.
 
-Inspired by [Sinatra](http://www.sinatrarb.com/) and [express](https://github.com/visionmedia/express).
+It's extremely easy to set up. Just include the **httplib.h** file in your code!
 
-Server Example
---------------
+> [!IMPORTANT]
+> This library uses 'blocking' socket I/O. If you are looking for a library with 'non-blocking' socket I/O, this is not the one that you want.
+
+Simple examples
+---------------
+
+#### Server (Multi-threaded)
+
+```c++
+#define CPPHTTPLIB_OPENSSL_SUPPORT
+#include "path/to/httplib.h"
+
+// HTTP
+httplib::Server svr;
+
+// HTTPS
+httplib::SSLServer svr;
+
+svr.Get("/hi", [](const httplib::Request &, httplib::Response &res) {
+  res.set_content("Hello World!", "text/plain");
+});
+
+svr.listen("0.0.0.0", 8080);
+```
+
+#### Client
+
+```c++
+#define CPPHTTPLIB_OPENSSL_SUPPORT
+#include "path/to/httplib.h"
+
+// HTTP
+httplib::Client cli("http://yhirose.github.io");
+
+// HTTPS
+httplib::Client cli("https://yhirose.github.io");
+
+auto res = cli.Get("/hi");
+res->status;
+res->body;
+```
+
+SSL Support
+-----------
+
+SSL support is available with `CPPHTTPLIB_OPENSSL_SUPPORT`. `libssl` and `libcrypto` should be linked.
+
+> [!NOTE]
+> cpp-httplib currently supports only version 3.0 or later. Please see [this page](https://www.openssl.org/policies/releasestrat.html) to get more information.
+
+> [!TIP]
+> For macOS: cpp-httplib now can use system certs with `CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN`. `CoreFoundation` and `Security` should be linked with `-framework`.
+
+```c++
+#define CPPHTTPLIB_OPENSSL_SUPPORT
+#include "path/to/httplib.h"
+
+// Server
+httplib::SSLServer svr("./cert.pem", "./key.pem");
+
+// Client
+httplib::Client cli("https://localhost:1234"); // scheme + host
+httplib::SSLClient cli("localhost:1234"); // host
+httplib::SSLClient cli("localhost", 1234); // host, port
+
+// Use your CA bundle
+cli.set_ca_cert_path("./ca-bundle.crt");
+
+// Disable cert verification
+cli.enable_server_certificate_verification(false);
+
+// Disable host verification
+cli.enable_server_hostname_verification(false);
+```
+
+> [!NOTE]
+> When using SSL, it seems impossible to avoid SIGPIPE in all cases, since on some operating systems, SIGPIPE can only be suppressed on a per-message basis, but there is no way to make the OpenSSL library do so for its internal communications. If your program needs to avoid being terminated on SIGPIPE, the only fully general way might be to set up a signal handler for SIGPIPE to handle or ignore it yourself.
+
+### SSL Error Handling
+
+When SSL operations fail, cpp-httplib provides detailed error information through two separate error fields:
+
+```c++
+#define CPPHTTPLIB_OPENSSL_SUPPORT
+#include "path/to/httplib.h"
+
+httplib::Client cli("https://example.com");
+
+auto res = cli.Get("/");
+if (!res) {
+  // Check the error type
+  const auto err = res.error();
+
+  switch (err) {
+    case httplib::Error::SSLConnection:
+      std::cout << "SSL connection failed, SSL error: "
+                << res.ssl_error() << std::endl;
+      break;
+
+    case httplib::Error::SSLLoadingCerts:
+      std::cout << "SSL cert loading failed, OpenSSL error: "
+                << std::hex << res.ssl_openssl_error() << std::endl;
+      break;
+
+    case httplib::Error::SSLServerVerification:
+      std::cout << "SSL verification failed, X509 error: "
+                << res.ssl_openssl_error() << std::endl;
+      break;
+
+    case httplib::Error::SSLServerHostnameVerification:
+      std::cout << "SSL hostname verification failed, X509 error: "
+                << res.ssl_openssl_error() << std::endl;
+      break;
+
+    default:
+      std::cout << "HTTP error: " << httplib::to_string(err) << std::endl;
+  }
+}
+```
+
+Server
+------
 
 ```c++
 #include <httplib.h>
 
 int main(void)
 {
-    using namespace httplib;
+  using namespace httplib;
 
-    Server svr;
+  Server svr;
 
-    svr.Get("/hi", [](const Request& req, Response& res) {
-        res.set_content("Hello World!", "text/plain");
-    });
+  svr.Get("/hi", [](const Request& req, Response& res) {
+    res.set_content("Hello World!", "text/plain");
+  });
 
-    svr.Get(R"(/numbers/(\d+))", [&](const Request& req, Response& res) {
-        auto numbers = req.matches[1];
-        res.set_content(numbers, "text/plain");
-    });
+  // Match the request path against a regular expression
+  // and extract its captures
+  svr.Get(R"(/numbers/(\d+))", [&](const Request& req, Response& res) {
+    auto numbers = req.matches[1];
+    res.set_content(numbers, "text/plain");
+  });
+
+  // Capture the second segment of the request path as "id" path param
+  svr.Get("/users/:id", [&](const Request& req, Response& res) {
+    auto user_id = req.path_params.at("id");
+    res.set_content(user_id, "text/plain");
+  });
+
+  // Extract values from HTTP headers and URL query params
+  svr.Get("/body-header-param", [](const Request& req, Response& res) {
+    if (req.has_header("Content-Length")) {
+      auto val = req.get_header_value("Content-Length");
+    }
+    if (req.has_param("key")) {
+      auto val = req.get_param_value("key");
+    }
+    res.set_content(req.body, "text/plain");
+  });
+
+  // If the handler takes time to finish, you can also poll the connection state
+  svr.Get("/task", [&](const Request& req, Response& res) {
+    const char * result = nullptr;
+    process.run(); // for example, starting an external process
+    while (result == nullptr) {
+      sleep(1);
+      if (req.is_connection_closed()) {
+        process.kill(); // kill the process
+        return;
+      }
+      result = process.stdout(); // != nullptr if the process finishes
+    }
+    res.set_content(result, "text/plain");
+  });
 
-    svr.listen("localhost", 1234);
+  svr.Get("/stop", [&](const Request& req, Response& res) {
+    svr.stop();
+  });
+
+  svr.listen("localhost", 1234);
 }
 ```
 
 `Post`, `Put`, `Delete` and `Options` methods are also supported.
 
-### Method Chain
+### Bind a socket to multiple interfaces and any available port
 
 ```cpp
-svr.Get("/get", [](const auto& req, auto& res) {
-        res.set_content("get", "text/plain");
-    })
-    .Post("/post", [](const auto& req, auto& res) {
-        res.set_content(req.body(), "text/plain");
-    })
-    .listen("localhost", 1234);
+int port = svr.bind_to_any_port("0.0.0.0");
+svr.listen_after_bind();
 ```
 
 ### Static File Server
 
 ```cpp
-svr.set_base_dir("./www");
+// Mount / to ./www directory
+auto ret = svr.set_mount_point("/", "./www");
+if (!ret) {
+  // The specified base directory doesn't exist...
+}
+
+// Mount /public to ./www directory
+ret = svr.set_mount_point("/public", "./www");
+
+// Mount /public to ./www1 and ./www2 directories
+ret = svr.set_mount_point("/public", "./www1"); // 1st order to search
+ret = svr.set_mount_point("/public", "./www2"); // 2nd order to search
+
+// Remove mount /
+ret = svr.remove_mount_point("/");
+
+// Remove mount /public
+ret = svr.remove_mount_point("/public");
+```
+
+```cpp
+// User defined file extension and MIME type mappings
+svr.set_file_extension_and_mimetype_mapping("cc", "text/x-c");
+svr.set_file_extension_and_mimetype_mapping("cpp", "text/x-c");
+svr.set_file_extension_and_mimetype_mapping("hh", "text/x-h");
+```
+
+The following are built-in mappings:
+
+| Extension  |          MIME Type          | Extension  |          MIME Type          |
+| :--------- | :-------------------------- | :--------- | :-------------------------- |
+| css        | text/css                    | mpga       | audio/mpeg                  |
+| csv        | text/csv                    | weba       | audio/webm                  |
+| txt        | text/plain                  | wav        | audio/wave                  |
+| vtt        | text/vtt                    | otf        | font/otf                    |
+| html, htm  | text/html                   | ttf        | font/ttf                    |
+| apng       | image/apng                  | woff       | font/woff                   |
+| avif       | image/avif                  | woff2      | font/woff2                  |
+| bmp        | image/bmp                   | 7z         | application/x-7z-compressed |
+| gif        | image/gif                   | atom       | application/atom+xml        |
+| png        | image/png                   | pdf        | application/pdf             |
+| svg        | image/svg+xml               | mjs, js    | text/javascript             |
+| webp       | image/webp                  | json       | application/json            |
+| ico        | image/x-icon                | rss        | application/rss+xml         |
+| tif        | image/tiff                  | tar        | application/x-tar           |
+| tiff       | image/tiff                  | xhtml, xht | application/xhtml+xml       |
+| jpeg, jpg  | image/jpeg                  | xslt       | application/xslt+xml        |
+| mp4        | video/mp4                   | xml        | application/xml             |
+| mpeg       | video/mpeg                  | gz         | application/gzip            |
+| webm       | video/webm                  | zip        | application/zip             |
+| mp3        | audio/mp3                   | wasm       | application/wasm            |
+
+> [!WARNING]
+> These static file server methods are not thread-safe.
+
+### File request handler
+
+```cpp
+// The handler is called right before the response is sent to a client
+svr.set_file_request_handler([](const Request &req, Response &res) {
+  ...
+});
 ```
 
 ### Logging
 
+cpp-httplib provides separate logging capabilities for access logs and error logs, similar to web servers like Nginx and Apache.
+
+#### Access Logging
+
+Access loggers capture successful HTTP requests and responses:
+
 ```cpp
-svr.set_logger([](const auto& req, const auto& res) {
-    your_logger(req, res);
+svr.set_logger([](const httplib::Request& req, const httplib::Response& res) {
+  std::cout << req.method << " " << req.path << " -> " << res.status << std::endl;
 });
 ```
 
-### Error Handler
+#### Pre-compression Logging
+
+You can also set a pre-compression logger to capture request/response data before compression is applied:
+
+```cpp
+svr.set_pre_compression_logger([](const httplib::Request& req, const httplib::Response& res) {
+  // Log before compression - res.body contains uncompressed content
+  // Content-Encoding header is not yet set
+  your_pre_compression_logger(req, res);
+});
+```
+
+The pre-compression logger is only called when compression would be applied. For responses without compression, only the access logger is called.
+
+#### Error Logging
+
+Error loggers capture failed requests and connection issues. Unlike access loggers, error loggers only receive the Error and Request information, as errors typically occur before a meaningful Response can be generated.
+
+```cpp
+svr.set_error_logger([](const httplib::Error& err, const httplib::Request* req) {
+  std::cerr << httplib::to_string(err) << " while processing request";
+  if (req) {
+    std::cerr << ", client: " << req->get_header_value("X-Forwarded-For")
+              << ", request: '" << req->method << " " << req->path << " " << req->version << "'"
+              << ", host: " << req->get_header_value("Host");
+  }
+  std::cerr << std::endl;
+});
+```
+
+### Error handler
 
 ```cpp
 svr.set_error_handler([](const auto& req, auto& res) {
-    const char* fmt = "<p>Error Status: <span style='color:red;'>%d</span></p>";
-    char buf[BUFSIZ];
-    snprintf(buf, sizeof(buf), fmt, res.status);
-    res.set_content(buf, "text/html");
+  auto fmt = "<p>Error Status: <span style='color:red;'>%d</span></p>";
+  char buf[BUFSIZ];
+  snprintf(buf, sizeof(buf), fmt, res.status);
+  res.set_content(buf, "text/html");
+});
+```
+
+### Exception handler
+The exception handler gets called if a user routing handler throws an error.
+
+```cpp
+svr.set_exception_handler([](const auto& req, auto& res, std::exception_ptr ep) {
+  auto fmt = "<h1>Error 500</h1><p>%s</p>";
+  char buf[BUFSIZ];
+  try {
+    std::rethrow_exception(ep);
+  } catch (std::exception &e) {
+    snprintf(buf, sizeof(buf), fmt, e.what());
+  } catch (...) { // See the following NOTE
+    snprintf(buf, sizeof(buf), fmt, "Unknown Exception");
+  }
+  res.set_content(buf, "text/html");
+  res.status = StatusCode::InternalServerError_500;
+});
+```
+
+> [!CAUTION]
+> if you don't provide the `catch (...)` block for a rethrown exception pointer, an uncaught exception will end up causing the server crash. Be careful!
+
+### Pre routing handler
+
+```cpp
+svr.set_pre_routing_handler([](const auto& req, auto& res) {
+  if (req.path == "/hello") {
+    res.set_content("world", "text/html");
+    return Server::HandlerResponse::Handled;
+  }
+  return Server::HandlerResponse::Unhandled;
 });
 ```
 
-### 'multipart/form-data' POST data
+### Post routing handler
+
+```cpp
+svr.set_post_routing_handler([](const auto& req, auto& res) {
+  res.set_header("ADDITIONAL_HEADER", "value");
+});
+```
+
+### Pre request handler
+
+```cpp
+svr.set_pre_request_handler([](const auto& req, auto& res) {
+  if (req.matched_route == "/user/:user") {
+    auto user = req.path_params.at("user");
+    if (user != "john") {
+      res.status = StatusCode::Forbidden_403;
+      res.set_content("error", "text/html");
+      return Server::HandlerResponse::Handled;
+    }
+  }
+  return Server::HandlerResponse::Unhandled;
+});
+```
+
+### Form data handling
+
+#### URL-encoded form data ('application/x-www-form-urlencoded')
 
 ```cpp
-svr.Post("/multipart", [&](const auto& req, auto& res) {
-    auto size = req.files.size();
-    auto ret = req.has_file("name1"));
-    const auto& file = req.get_file_value("name1");
-    // file.filename;
-    // file.content_type;
-    auto body = req.body.substr(file.offset, file.length));
-})
+svr.Post("/form", [&](const auto& req, auto& res) {
+  // URL query parameters and form-encoded data are accessible via req.params
+  std::string username = req.get_param_value("username");
+  std::string password = req.get_param_value("password");
+
+  // Handle multiple values with same name
+  auto interests = req.get_param_values("interests");
+
+  // Check existence
+  if (req.has_param("newsletter")) {
+    // Handle newsletter subscription
+  }
+});
 ```
 
-Client Example
---------------
+#### 'multipart/form-data' POST data
+
+```cpp
+svr.Post("/multipart", [&](const Request& req, Response& res) {
+  // Access text fields (from form inputs without files)
+  std::string username = req.form.get_field("username");
+  std::string bio = req.form.get_field("bio");
+
+  // Access uploaded files
+  if (req.form.has_file("avatar")) {
+    const auto& file = req.form.get_file("avatar");
+    std::cout << "Uploaded file: " << file.filename
+              << " (" << file.content_type << ") - "
+              << file.content.size() << " bytes" << std::endl;
+
+    // Access additional headers if needed
+    for (const auto& header : file.headers) {
+      std::cout << "Header: " << header.first << " = " << header.second << std::endl;
+    }
+
+    // Save to disk
+    std::ofstream ofs(file.filename, std::ios::binary);
+    ofs << file.content;
+  }
+
+  // Handle multiple values with same name
+  auto tags = req.form.get_fields("tags");  // e.g., multiple checkboxes
+  for (const auto& tag : tags) {
+    std::cout << "Tag: " << tag << std::endl;
+  }
+
+  auto documents = req.form.get_files("documents");  // multiple file upload
+  for (const auto& doc : documents) {
+    std::cout << "Document: " << doc.filename
+              << " (" << doc.content.size() << " bytes)" << std::endl;
+  }
+
+  // Check existence before accessing
+  if (req.form.has_field("newsletter")) {
+    std::cout << "Newsletter subscription: " << req.form.get_field("newsletter") << std::endl;
+  }
+
+  // Get counts for validation
+  if (req.form.get_field_count("tags") > 5) {
+    res.status = StatusCode::BadRequest_400;
+    res.set_content("Too many tags", "text/plain");
+    return;
+  }
 
-### GET
+  // Summary
+  std::cout << "Received " << req.form.fields.size() << " text fields and "
+            << req.form.files.size() << " files" << std::endl;
+
+  res.set_content("Upload successful", "text/plain");
+});
+```
+
+### Receive content with a content receiver
+
+```cpp
+svr.Post("/content_receiver",
+  [&](const Request &req, Response &res, const ContentReader &content_reader) {
+    if (req.is_multipart_form_data()) {
+      // NOTE: `content_reader` is blocking until every form data field is read
+      // This approach allows streaming processing of large files
+      std::vector<FormData> items;
+      content_reader(
+        [&](const FormData &item) {
+          items.push_back(item);
+          return true;
+        },
+        [&](const char *data, size_t data_length) {
+          items.back().content.append(data, data_length);
+          return true;
+        });
+
+      // Process the received items
+      for (const auto& item : items) {
+        if (item.filename.empty()) {
+          // Text field
+          std::cout << "Field: " << item.name << " = " << item.content << std::endl;
+        } else {
+          // File
+          std::cout << "File: " << item.name << " (" << item.filename << ") - "
+                    << item.content.size() << " bytes" << std::endl;
+        }
+      }
+    } else {
+      std::string body;
+      content_reader([&](const char *data, size_t data_length) {
+        body.append(data, data_length);
+        return true;
+      });
+    }
+  });
+```
+
+### Send content with the content provider
+
+```cpp
+const size_t DATA_CHUNK_SIZE = 4;
+
+svr.Get("/stream", [&](const Request &req, Response &res) {
+  auto data = new std::string("abcdefg");
+
+  res.set_content_provider(
+    data->size(), // Content length
+    "text/plain", // Content type
+    [&, data](size_t offset, size_t length, DataSink &sink) {
+      const auto &d = *data;
+      sink.write(&d[offset], std::min(length, DATA_CHUNK_SIZE));
+      return true; // return 'false' if you want to cancel the process.
+    },
+    [data](bool success) { delete data; });
+});
+```
+
+Without content length:
+
+```cpp
+svr.Get("/stream", [&](const Request &req, Response &res) {
+  res.set_content_provider(
+    "text/plain", // Content type
+    [&](size_t offset, DataSink &sink) {
+      if (/* there is still data */) {
+        std::vector<char> data;
+        // prepare data...
+        sink.write(data.data(), data.size());
+      } else {
+        sink.done(); // No more data
+      }
+      return true; // return 'false' if you want to cancel the process.
+    });
+});
+```
+
+### Chunked transfer encoding
+
+```cpp
+svr.Get("/chunked", [&](const Request& req, Response& res) {
+  res.set_chunked_content_provider(
+    "text/plain",
+    [](size_t offset, DataSink &sink) {
+      sink.write("123", 3);
+      sink.write("345", 3);
+      sink.write("789", 3);
+      sink.done(); // No more data
+      return true; // return 'false' if you want to cancel the process.
+    }
+  );
+});
+```
+
+With trailer:
+
+```cpp
+svr.Get("/chunked", [&](const Request& req, Response& res) {
+  res.set_header("Trailer", "Dummy1, Dummy2");
+  res.set_chunked_content_provider(
+    "text/plain",
+    [](size_t offset, DataSink &sink) {
+      sink.write("123", 3);
+      sink.write("345", 3);
+      sink.write("789", 3);
+      sink.done_with_trailer({
+        {"Dummy1", "DummyVal1"},
+        {"Dummy2", "DummyVal2"}
+      });
+      return true;
+    }
+  );
+});
+```
+
+### Send file content
+
+```cpp
+svr.Get("/content", [&](const Request &req, Response &res) {
+  res.set_file_content("./path/to/content.html");
+});
+
+svr.Get("/content", [&](const Request &req, Response &res) {
+  res.set_file_content("./path/to/content", "text/html");
+});
+```
+
+### 'Expect: 100-continue' handler
+
+By default, the server sends a `100 Continue` response for an `Expect: 100-continue` header.
+
+```cpp
+// Send a '417 Expectation Failed' response.
+svr.set_expect_100_continue_handler([](const Request &req, Response &res) {
+  return StatusCode::ExpectationFailed_417;
+});
+```
+
+```cpp
+// Send a final status without reading the message body.
+svr.set_expect_100_continue_handler([](const Request &req, Response &res) {
+  return res.status = StatusCode::Unauthorized_401;
+});
+```
+
+### Keep-Alive connection
+
+```cpp
+svr.set_keep_alive_max_count(2); // Default is 100
+svr.set_keep_alive_timeout(10);  // Default is 5
+```
+
+### Timeout
+
+```c++
+svr.set_read_timeout(5, 0); // 5 seconds
+svr.set_write_timeout(5, 0); // 5 seconds
+svr.set_idle_interval(0, 100000); // 100 milliseconds
+```
+
+### Set maximum payload length for reading a request body
+
+```c++
+svr.set_payload_max_length(1024 * 1024 * 512); // 512MB
+```
+
+> [!NOTE]
+> When the request body content type is 'www-form-urlencoded', the actual payload length shouldn't exceed `CPPHTTPLIB_FORM_URL_ENCODED_PAYLOAD_MAX_LENGTH`.
+
+### Server-Sent Events
+
+Please see [Server example](https://github.com/yhirose/cpp-httplib/blob/master/example/ssesvr.cc) and [Client example](https://github.com/yhirose/cpp-httplib/blob/master/example/ssecli.cc).
+
+### Default thread pool support
+
+`ThreadPool` is used as the **default** task queue, with a default thread count of 8 or `std::thread::hardware_concurrency() - 1`, whichever is greater. You can change it with `CPPHTTPLIB_THREAD_POOL_COUNT`.
+
+If you want to set the thread count at runtime, there is no convenient way... But here is how.
+
+```cpp
+svr.new_task_queue = [] { return new ThreadPool(12); };
+```
+
+You can also provide an optional parameter to limit the maximum number
+of pending requests, i.e. requests `accept()`ed by the listener but
+still waiting to be serviced by worker threads.
+
+```cpp
+svr.new_task_queue = [] { return new ThreadPool(/*num_threads=*/12, /*max_queued_requests=*/18); };
+```
+
+Default limit is 0 (unlimited). Once the limit is reached, the listener
+will shutdown the client connection.
+
+### Override the default thread pool with yours
+
+You can supply your own thread pool implementation according to your need.
+
+```cpp
+class YourThreadPoolTaskQueue : public TaskQueue {
+public:
+  YourThreadPoolTaskQueue(size_t n) {
+    pool_.start_with_thread_count(n);
+  }
+
+  virtual bool enqueue(std::function<void()> fn) override {
+    /* Return true if the task was actually enqueued, or false
+     * if the caller must drop the corresponding connection. */
+    return pool_.enqueue(fn);
+  }
+
+  virtual void shutdown() override {
+    pool_.shutdown_gracefully();
+  }
+
+private:
+  YourThreadPool pool_;
+};
+
+svr.new_task_queue = [] {
+  return new YourThreadPoolTaskQueue(12);
+};
+```
+
+Client
+------
 
 ```c++
 #include <httplib.h>
@@ -95,15 +691,121 @@ Client Example
 
 int main(void)
 {
-    httplib::Client cli("localhost", 1234);
+  httplib::Client cli("localhost", 1234);
 
-    auto res = cli.Get("/hi");
-    if (res && res->status == 200) {
-        std::cout << res->body << std::endl;
+  if (auto res = cli.Get("/hi")) {
+    if (res->status == StatusCode::OK_200) {
+      std::cout << res->body << std::endl;
     }
+  } else {
+    auto err = res.error();
+    std::cout << "HTTP error: " << httplib::to_string(err) << std::endl;
+  }
 }
 ```
 
+> [!TIP]
+> Constructor with scheme-host-port string is now supported!
+
+```c++
+httplib::Client cli("localhost");
+httplib::Client cli("localhost:8080");
+httplib::Client cli("http://localhost");
+httplib::Client cli("http://localhost:8080");
+httplib::Client cli("https://localhost");
+httplib::SSLClient cli("localhost");
+```
+
+### Error code
+
+Here is the list of errors from `Result::error()`.
+
+```c++
+enum Error {
+  Success = 0,
+  Unknown,
+  Connection,
+  BindIPAddress,
+  Read,
+  Write,
+  ExceedRedirectCount,
+  Canceled,
+  SSLConnection,
+  SSLLoadingCerts,
+  SSLServerVerification,
+  SSLServerHostnameVerification,
+  UnsupportedMultipartBoundaryChars,
+  Compression,
+  ConnectionTimeout,
+  ProxyConnection,
+};
+```
+
+### Client Logging
+
+#### Access Logging
+
+```cpp
+cli.set_logger([](const httplib::Request& req, const httplib::Response& res) {
+  auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(
+    std::chrono::steady_clock::now() - start_time).count();
+  std::cout << "✓ " << req.method << " " << req.path
+            << " -> " << res.status << " (" << res.body.size() << " bytes, "
+            << duration << "ms)" << std::endl;
+});
+```
+
+#### Error Logging
+
+```cpp
+cli.set_error_logger([](const httplib::Error& err, const httplib::Request* req) {
+  std::cerr << "✗ ";
+  if (req) {
+    std::cerr << req->method << " " << req->path << " ";
+  }
+  std::cerr << "failed: " << httplib::to_string(err);
+
+  // Add specific guidance based on error type
+  switch (err) {
+    case httplib::Error::Connection:
+      std::cerr << " (verify server is running and reachable)";
+      break;
+    case httplib::Error::SSLConnection:
+      std::cerr << " (check SSL certificate and TLS configuration)";
+      break;
+    case httplib::Error::ConnectionTimeout:
+      std::cerr << " (increase timeout or check network latency)";
+      break;
+    case httplib::Error::Read:
+      std::cerr << " (server may have closed connection prematurely)";
+      break;
+    default:
+      break;
+  }
+  std::cerr << std::endl;
+});
+```
+
+### GET with HTTP headers
+
+```c++
+httplib::Headers headers = {
+  { "Hello", "World!" }
+};
+auto res = cli.Get("/hi", headers);
+```
+or
+```c++
+auto res = cli.Get("/hi", {{"Hello", "World!"}});
+```
+or
+```c++
+cli.set_default_headers({
+  { "Hello", "World!" }
+});
+auto res = cli.Get("/hi");
+```
+
 ### POST
 
 ```c++
@@ -115,11 +817,36 @@ res = cli.Post("/person", "name=john1&note=coder", "application/x-www-form-urlen
 
 ```c++
 httplib::Params params;
-params["name"] = "john";
-params["note"] = "coder";
+params.emplace("name", "john");
+params.emplace("note", "coder");
+
+auto res = cli.Post("/post", params);
+```
+ or
+
+```c++
+httplib::Params params{
+  { "name", "john" },
+  { "note", "coder" }
+};
+
 auto res = cli.Post("/post", params);
 ```
 
+### POST with Multipart Form Data
+
+```c++
+httplib::UploadFormDataItems items = {
+  { "text1", "text default", "", "" },
+  { "text2", "aωb", "", "" },
+  { "file1", "h\ne\n\nl\nl\no\n", "hello.txt", "text/plain" },
+  { "file2", "{\n  \"world\", true\n}\n", "world.json", "application/json" },
+  { "file3", "", "", "application/octet-stream" },
+};
+
+auto res = cli.Post("/multipart", items);
+```
+
 ### PUT
 
 ```c++
@@ -139,71 +866,419 @@ res = cli.Options("*");
 res = cli.Options("/resource/foo");
 ```
 
-### Connection Timeout
+### Timeout
 
 ```c++
-httplib::Client cli("localhost", 8080, 5); // timeouts in 5 seconds
+cli.set_connection_timeout(0, 300000); // 300 milliseconds
+cli.set_read_timeout(5, 0); // 5 seconds
+cli.set_write_timeout(5, 0); // 5 seconds
+
+// This method works the same as curl's `--max-time` option
+cli.set_max_timeout(5000); // 5 seconds
 ```
+
+### Receive content with a content receiver
+
+```c++
+std::string body;
+
+auto res = cli.Get("/large-data",
+  [&](const char *data, size_t data_length) {
+    body.append(data, data_length);
+    return true;
+  });
+```
+
+```cpp
+std::string body;
+
+auto res = cli.Get(
+  "/stream", Headers(),
+  [&](const Response &response) {
+    EXPECT_EQ(StatusCode::OK_200, response.status);
+    return true; // return 'false' if you want to cancel the request.
+  },
+  [&](const char *data, size_t data_length) {
+    body.append(data, data_length);
+    return true; // return 'false' if you want to cancel the request.
+  });
+```
+
+### Send content with a content provider
+
+```cpp
+std::string body = ...;
+
+auto res = cli.Post(
+  "/stream", body.size(),
+  [](size_t offset, size_t length, DataSink &sink) {
+    sink.write(body.data() + offset, length);
+    return true; // return 'false' if you want to cancel the request.
+  },
+  "text/plain");
+```
+
+### Chunked transfer encoding
+
+```cpp
+auto res = cli.Post(
+  "/stream",
+  [](size_t offset, DataSink &sink) {
+    sink.os << "chunked data 1";
+    sink.os << "chunked data 2";
+    sink.os << "chunked data 3";
+    sink.done();
+    return true; // return 'false' if you want to cancel the request.
+  },
+  "text/plain");
+```
+
 ### With Progress Callback
 
 ```cpp
-httplib::Client client(url, port);
+httplib::Client cli(url, port);
 
 // prints: 0 / 000 bytes => 50% complete
-std::shared_ptr<httplib::Response> res =
-    cli.Get("/", [](uint64_t len, uint64_t total) {
-        printf("%lld / %lld bytes => %d%% complete\n",
-            len, total,
-            (int)((len/total)*100));
-    }
+auto res = cli.Get("/", [](size_t len, size_t total) {
+  printf("%lld / %lld bytes => %d%% complete\n",
+    len, total,
+    (int)(len*100/total));
+  return true; // return 'false' if you want to cancel the request.
+}
 );
 ```
 
 ![progress](https://user-images.githubusercontent.com/236374/33138910-495c4ecc-cf86-11e7-8693-2fc6d09615c4.gif)
 
-This feature was contributed by [underscorediscovery](https://github.com/yhirose/cpp-httplib/pull/23).
+### Authentication
 
-### Range
+```cpp
+// Basic Authentication
+cli.set_basic_auth("user", "pass");
+
+// Digest Authentication
+cli.set_digest_auth("user", "pass");
+
+// Bearer Token Authentication
+cli.set_bearer_token_auth("token");
+```
+
+> [!NOTE]
+> OpenSSL is required for Digest Authentication.
+
+### Proxy server support
 
 ```cpp
-httplib::Client cli("httpbin.org", 80);
+cli.set_proxy("host", port);
+
+// Basic Authentication
+cli.set_proxy_basic_auth("user", "pass");
 
-// 'Range: bytes=1-10'
-httplib::Headers headers = { httplib::make_range_header(1, 10) };
+// Digest Authentication
+cli.set_proxy_digest_auth("user", "pass");
 
-auto res = cli.Get("/range/32", headers);
+// Bearer Token Authentication
+cli.set_proxy_bearer_token_auth("pass");
+```
+
+> [!NOTE]
+> OpenSSL is required for Digest Authentication.
+
+### Range
+
+```cpp
+httplib::Client cli("httpbin.org");
+
+auto res = cli.Get("/range/32", {
+  httplib::make_range_header({{1, 10}}) // 'Range: bytes=1-10'
+});
 // res->status should be 206.
 // res->body should be "bcdefghijk".
 ```
 
-OpenSSL Support
----------------
+```cpp
+httplib::make_range_header({{1, 10}, {20, -1}})      // 'Range: bytes=1-10, 20-'
+httplib::make_range_header({{100, 199}, {500, 599}}) // 'Range: bytes=100-199, 500-599'
+httplib::make_range_header({{0, 0}, {-1, 1}})        // 'Range: bytes=0-0, -1'
+```
 
-SSL support is available with `CPPHTTPLIB_OPENSSL_SUPPORT`. `libssl` and `libcrypto` should be linked.
+### Keep-Alive connection
 
-```c++
-#define CPPHTTPLIB_OPENSSL_SUPPORT
+```cpp
+httplib::Client cli("localhost", 1234);
 
-SSLServer svr("./cert.pem", "./key.pem");
+cli.Get("/hello");         // with "Connection: close"
 
-SSLClient cli("localhost", 8080);
+cli.set_keep_alive(true);
+cli.Get("/world");
+
+cli.set_keep_alive(false);
+cli.Get("/last-request");  // with "Connection: close"
 ```
 
-Zlib Support
-------------
+### Redirect
 
-'gzip' compression is available with `CPPHTTPLIB_ZLIB_SUPPORT`.
+```cpp
+httplib::Client cli("yahoo.com");
 
-The server applies gzip compression to the following MIME type contents:
+auto res = cli.Get("/");
+res->status; // 301
 
-  * all text types
+cli.set_follow_location(true);
+res = cli.Get("/");
+res->status; // 200
+```
+
+### Use a specific network interface
+
+> [!NOTE]
+> This feature is not available on Windows, yet.
+
+```cpp
+cli.set_interface("eth0"); // Interface name, IP address or host name
+```
+
+### Automatic Path Encoding
+
+The client automatically encodes special characters in URL paths by default:
+
+```cpp
+httplib::Client cli("https://example.com");
+
+// Automatic path encoding (default behavior)
+cli.set_path_encode(true);
+auto res = cli.Get("/path with spaces/file.txt"); // Automatically encodes spaces
+
+// Disable automatic path encoding
+cli.set_path_encode(false);
+auto res = cli.Get("/already%20encoded/path"); // Use pre-encoded paths
+```
+
+- `set_path_encode(bool on)` - Controls automatic encoding of special characters in URL paths
+  - `true` (default): Automatically encodes spaces, plus signs, newlines, and other special characters
+  - `false`: Sends paths as-is without encoding (useful for pre-encoded URLs)
+
+### Performance Note for Local Connections
+
+> [!WARNING]
+> On Windows systems with improperly configured IPv6 settings, using "localhost" as the hostname may cause significant connection delays (up to 2 seconds per request) due to DNS resolution issues. This affects both client and server operations. For better performance when connecting to local services, use "127.0.0.1" instead of "localhost".
+> 
+> See: https://github.com/yhirose/cpp-httplib/issues/366#issuecomment-593004264
+
+```cpp
+// May be slower on Windows due to DNS resolution delays
+httplib::Client cli("localhost", 8080);
+httplib::Server svr;
+svr.listen("localhost", 8080);
+
+// Faster alternative for local connections
+httplib::Client cli("127.0.0.1", 8080);
+httplib::Server svr;
+svr.listen("127.0.0.1", 8080);
+```
+
+Compression
+-----------
+
+The server can apply compression to the following MIME type contents:
+
+  * all text types except text/event-stream
   * image/svg+xml
   * application/javascript
   * application/json
   * application/xml
+  * application/protobuf
   * application/xhtml+xml
 
+### Zlib Support
+
+'gzip' compression is available with `CPPHTTPLIB_ZLIB_SUPPORT`. `libz` should be linked.
+
+### Brotli Support
+
+Brotli compression is available with `CPPHTTPLIB_BROTLI_SUPPORT`. Necessary libraries should be linked.
+Please see https://github.com/google/brotli for more detail.
+
+### Zstd Support
+
+Zstd compression is available with `CPPHTTPLIB_ZSTD_SUPPORT`. Necessary libraries should be linked.
+Please see https://github.com/facebook/zstd for more detail.
+
+### Default `Accept-Encoding` value
+
+The default `Accept-Encoding` value contains all possible compression types. So, the following two examples are same.
+
+```c++
+res = cli.Get("/resource/foo");
+res = cli.Get("/resource/foo", {{"Accept-Encoding", "br, gzip, deflate, zstd"}});
+```
+
+If we don't want a response without compression, we have to set `Accept-Encoding` to an empty string. This behavior is similar to curl.
+
+```c++
+res = cli.Get("/resource/foo", {{"Accept-Encoding", ""}});
+```
+
+### Compress request body on client
+
+```c++
+cli.set_compress(true);
+res = cli.Post("/resource/foo", "...", "text/plain");
+```
+
+### Compress response body on client
+
+```c++
+cli.set_decompress(false);
+res = cli.Get("/resource/foo");
+res->body; // Compressed data
+
+```
+
+Unix Domain Socket Support
+--------------------------
+
+Unix Domain Socket support is available on Linux and macOS.
+
+```c++
+// Server
+httplib::Server svr;
+svr.set_address_family(AF_UNIX).listen("./my-socket.sock", 80);
+
+// Client
+httplib::Client cli("./my-socket.sock");
+cli.set_address_family(AF_UNIX);
+```
+
+"my-socket.sock" can be a relative path or an absolute path. Your application must have the appropriate permissions for the path. You can also use an abstract socket address on Linux. To use an abstract socket address, prepend a null byte ('\x00') to the path.
+
+This library automatically sets the Host header to "localhost" for Unix socket connections, similar to curl's behavior:
+
+
+URI Encoding/Decoding Utilities
+-------------------------------
+
+cpp-httplib provides utility functions for URI encoding and decoding:
+
+```cpp
+#include <httplib.h>
+
+std::string url = "https://example.com/search?q=hello world";
+std::string encoded = httplib::encode_uri(url);
+std::string decoded = httplib::decode_uri(encoded);
+
+std::string param = "hello world";
+std::string encoded_component = httplib::encode_uri_component(param);
+std::string decoded_component = httplib::decode_uri_component(encoded_component);
+```
+
+### Functions
+
+- `encode_uri(const std::string &value)` - Encodes a full URI, preserving reserved characters like `://`, `?`, `&`, `=`
+- `decode_uri(const std::string &value)` - Decodes a URI-encoded string
+- `encode_uri_component(const std::string &value)` - Encodes a URI component (query parameter, path segment), encoding all reserved characters
+- `decode_uri_component(const std::string &value)` - Decodes a URI component
+
+Use `encode_uri()` for full URLs and `encode_uri_component()` for individual query parameters or path segments.
+
+
+Split httplib.h into .h and .cc
+-------------------------------
+
+```console
+$ ./split.py -h
+usage: split.py [-h] [-e EXTENSION] [-o OUT]
+
+This script splits httplib.h into .h and .cc parts.
+
+optional arguments:
+  -h, --help            show this help message and exit
+  -e EXTENSION, --extension EXTENSION
+                        extension of the implementation file (default: cc)
+  -o OUT, --out OUT     where to write the files (default: out)
+
+$ ./split.py
+Wrote out/httplib.h and out/httplib.cc
+```
+
+Dockerfile for Static HTTP Server
+---------------------------------
+
+Dockerfile for static HTTP server is available. Port number of this HTTP server is 80, and it serves static files from `/html` directory in the container.
+
+```bash
+> docker build -t cpp-httplib-server .
+...
+
+> docker run --rm -it -p 8080:80 -v ./docker/html:/html cpp-httplib-server
+Serving HTTP on 0.0.0.0 port 80 ...
+192.168.65.1 - - [31/Aug/2024:21:33:56 +0000] "GET / HTTP/1.1" 200 599 "-" "curl/8.7.1"
+192.168.65.1 - - [31/Aug/2024:21:34:26 +0000] "GET / HTTP/1.1" 200 599 "-" "Mozilla/5.0 ..."
+192.168.65.1 - - [31/Aug/2024:21:34:26 +0000] "GET /favicon.ico HTTP/1.1" 404 152 "-" "Mozilla/5.0 ..."
+```
+
+From Docker Hub
+
+```bash
+> docker run --rm -it -p 8080:80 -v ./docker/html:/html yhirose4dockerhub/cpp-httplib-server
+Serving HTTP on 0.0.0.0 port 80 ...
+192.168.65.1 - - [31/Aug/2024:21:33:56 +0000] "GET / HTTP/1.1" 200 599 "-" "curl/8.7.1"
+192.168.65.1 - - [31/Aug/2024:21:34:26 +0000] "GET / HTTP/1.1" 200 599 "-" "Mozilla/5.0 ..."
+192.168.65.1 - - [31/Aug/2024:21:34:26 +0000] "GET /favicon.ico HTTP/1.1" 404 152 "-" "Mozilla/5.0 ..."
+```
+
+NOTE
+----
+
+### Regular Expression Stack Overflow
+
+> [!CAUTION]
+> When using complex regex patterns in route handlers, be aware that certain patterns may cause stack overflow during pattern matching. This is a known issue with `std::regex` implementations and affects the `dispatch_request()` method.
+> 
+> ```cpp
+> // This pattern can cause stack overflow with large input
+> svr.Get(".*", handler);
+> ```
+> 
+> Consider using simpler patterns or path parameters to avoid this issue:
+> 
+> ```cpp
+> // Safer alternatives
+> svr.Get("/users/:id", handler);           // Path parameters
+> svr.Get(R"(/api/v\d+/.*)", handler);     // More specific patterns
+> ```
+
+### g++
+
+g++ 4.8 and below cannot build this library since `<regex>` in the versions are [broken](https://stackoverflow.com/questions/12530406/is-gcc-4-8-or-earlier-buggy-about-regular-expressions).
+
+### Windows
+
+Include `httplib.h` before `Windows.h` or include `Windows.h` by defining `WIN32_LEAN_AND_MEAN` beforehand.
+
+```cpp
+#include <httplib.h>
+#include <Windows.h>
+```
+
+```cpp
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+#include <httplib.h>
+```
+
+> [!NOTE]
+> cpp-httplib officially supports only the latest Visual Studio. It might work with former versions of Visual Studio, but I can no longer verify it. Pull requests are always welcome for the older versions of Visual Studio unless they break the C++11 conformance.
+
+> [!NOTE]
+> Windows 8 or lower, Visual Studio 2015 or lower, and Cygwin and MSYS2 including MinGW are neither supported nor tested.
+
 License
 -------
 
-MIT license (© 2018 Yuji Hirose)
+MIT license (© 2025 Yuji Hirose)
+
+Special Thanks To
+-----------------
+
+[These folks](https://github.com/yhirose/cpp-httplib/graphs/contributors) made great contributions to polish this library to totally another level from a simple toy!
diff --git a/extern/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/httplib.h b/extern/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/httplib.h
index dadab1d8e8..8aae8e1d91 100644
--- a/extern/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/httplib.h
+++ b/extern/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/httplib.h
@@ -1,2335 +1,12058 @@
 //
 //  httplib.h
 //
-//  Copyright (c) 2017 Yuji Hirose. All rights reserved.
+//  Copyright (c) 2025 Yuji Hirose. All rights reserved.
 //  MIT License
 //
 
-#ifndef _CPPHTTPLIB_HTTPLIB_H_
-#define _CPPHTTPLIB_HTTPLIB_H_
+#ifndef CPPHTTPLIB_HTTPLIB_H
+#define CPPHTTPLIB_HTTPLIB_H
+
+#define CPPHTTPLIB_VERSION "0.27.0"
+#define CPPHTTPLIB_VERSION_NUM "0x001B00"
+
+/*
+ * Configuration
+ */
+
+#ifndef CPPHTTPLIB_KEEPALIVE_TIMEOUT_SECOND
+#define CPPHTTPLIB_KEEPALIVE_TIMEOUT_SECOND 5
+#endif
+
+#ifndef CPPHTTPLIB_KEEPALIVE_TIMEOUT_CHECK_INTERVAL_USECOND
+#define CPPHTTPLIB_KEEPALIVE_TIMEOUT_CHECK_INTERVAL_USECOND 10000
+#endif
+
+#ifndef CPPHTTPLIB_KEEPALIVE_MAX_COUNT
+#define CPPHTTPLIB_KEEPALIVE_MAX_COUNT 100
+#endif
+
+#ifndef CPPHTTPLIB_CONNECTION_TIMEOUT_SECOND
+#define CPPHTTPLIB_CONNECTION_TIMEOUT_SECOND 300
+#endif
+
+#ifndef CPPHTTPLIB_CONNECTION_TIMEOUT_USECOND
+#define CPPHTTPLIB_CONNECTION_TIMEOUT_USECOND 0
+#endif
+
+#ifndef CPPHTTPLIB_SERVER_READ_TIMEOUT_SECOND
+#define CPPHTTPLIB_SERVER_READ_TIMEOUT_SECOND 5
+#endif
+
+#ifndef CPPHTTPLIB_SERVER_READ_TIMEOUT_USECOND
+#define CPPHTTPLIB_SERVER_READ_TIMEOUT_USECOND 0
+#endif
+
+#ifndef CPPHTTPLIB_SERVER_WRITE_TIMEOUT_SECOND
+#define CPPHTTPLIB_SERVER_WRITE_TIMEOUT_SECOND 5
+#endif
+
+#ifndef CPPHTTPLIB_SERVER_WRITE_TIMEOUT_USECOND
+#define CPPHTTPLIB_SERVER_WRITE_TIMEOUT_USECOND 0
+#endif
+
+#ifndef CPPHTTPLIB_CLIENT_READ_TIMEOUT_SECOND
+#define CPPHTTPLIB_CLIENT_READ_TIMEOUT_SECOND 300
+#endif
+
+#ifndef CPPHTTPLIB_CLIENT_READ_TIMEOUT_USECOND
+#define CPPHTTPLIB_CLIENT_READ_TIMEOUT_USECOND 0
+#endif
+
+#ifndef CPPHTTPLIB_CLIENT_WRITE_TIMEOUT_SECOND
+#define CPPHTTPLIB_CLIENT_WRITE_TIMEOUT_SECOND 5
+#endif
+
+#ifndef CPPHTTPLIB_CLIENT_WRITE_TIMEOUT_USECOND
+#define CPPHTTPLIB_CLIENT_WRITE_TIMEOUT_USECOND 0
+#endif
+
+#ifndef CPPHTTPLIB_CLIENT_MAX_TIMEOUT_MSECOND
+#define CPPHTTPLIB_CLIENT_MAX_TIMEOUT_MSECOND 0
+#endif
+
+#ifndef CPPHTTPLIB_IDLE_INTERVAL_SECOND
+#define CPPHTTPLIB_IDLE_INTERVAL_SECOND 0
+#endif
+
+#ifndef CPPHTTPLIB_IDLE_INTERVAL_USECOND
+#ifdef _WIN32
+#define CPPHTTPLIB_IDLE_INTERVAL_USECOND 1000
+#else
+#define CPPHTTPLIB_IDLE_INTERVAL_USECOND 0
+#endif
+#endif
+
+#ifndef CPPHTTPLIB_REQUEST_URI_MAX_LENGTH
+#define CPPHTTPLIB_REQUEST_URI_MAX_LENGTH 8192
+#endif
+
+#ifndef CPPHTTPLIB_HEADER_MAX_LENGTH
+#define CPPHTTPLIB_HEADER_MAX_LENGTH 8192
+#endif
+
+#ifndef CPPHTTPLIB_HEADER_MAX_COUNT
+#define CPPHTTPLIB_HEADER_MAX_COUNT 100
+#endif
+
+#ifndef CPPHTTPLIB_REDIRECT_MAX_COUNT
+#define CPPHTTPLIB_REDIRECT_MAX_COUNT 20
+#endif
+
+#ifndef CPPHTTPLIB_MULTIPART_FORM_DATA_FILE_MAX_COUNT
+#define CPPHTTPLIB_MULTIPART_FORM_DATA_FILE_MAX_COUNT 1024
+#endif
+
+#ifndef CPPHTTPLIB_PAYLOAD_MAX_LENGTH
+#define CPPHTTPLIB_PAYLOAD_MAX_LENGTH ((std::numeric_limits<size_t>::max)())
+#endif
+
+#ifndef CPPHTTPLIB_FORM_URL_ENCODED_PAYLOAD_MAX_LENGTH
+#define CPPHTTPLIB_FORM_URL_ENCODED_PAYLOAD_MAX_LENGTH 8192
+#endif
+
+#ifndef CPPHTTPLIB_RANGE_MAX_COUNT
+#define CPPHTTPLIB_RANGE_MAX_COUNT 1024
+#endif
+
+#ifndef CPPHTTPLIB_TCP_NODELAY
+#define CPPHTTPLIB_TCP_NODELAY false
+#endif
+
+#ifndef CPPHTTPLIB_IPV6_V6ONLY
+#define CPPHTTPLIB_IPV6_V6ONLY false
+#endif
+
+#ifndef CPPHTTPLIB_RECV_BUFSIZ
+#define CPPHTTPLIB_RECV_BUFSIZ size_t(16384u)
+#endif
+
+#ifndef CPPHTTPLIB_SEND_BUFSIZ
+#define CPPHTTPLIB_SEND_BUFSIZ size_t(16384u)
+#endif
+
+#ifndef CPPHTTPLIB_COMPRESSION_BUFSIZ
+#define CPPHTTPLIB_COMPRESSION_BUFSIZ size_t(16384u)
+#endif
+
+#ifndef CPPHTTPLIB_THREAD_POOL_COUNT
+#define CPPHTTPLIB_THREAD_POOL_COUNT                                           \
+  ((std::max)(8u, std::thread::hardware_concurrency() > 0                      \
+                      ? std::thread::hardware_concurrency() - 1                \
+                      : 0))
+#endif
+
+#ifndef CPPHTTPLIB_RECV_FLAGS
+#define CPPHTTPLIB_RECV_FLAGS 0
+#endif
+
+#ifndef CPPHTTPLIB_SEND_FLAGS
+#define CPPHTTPLIB_SEND_FLAGS 0
+#endif
+
+#ifndef CPPHTTPLIB_LISTEN_BACKLOG
+#define CPPHTTPLIB_LISTEN_BACKLOG 5
+#endif
+
+#ifndef CPPHTTPLIB_MAX_LINE_LENGTH
+#define CPPHTTPLIB_MAX_LINE_LENGTH 32768
+#endif
+
+#define CPPHTTPLIB_NO_EXCEPTIONS 1
+
+/*
+ * Headers
+ */
 
 #ifdef _WIN32
 #ifndef _CRT_SECURE_NO_WARNINGS
 #define _CRT_SECURE_NO_WARNINGS
-#endif
+#endif //_CRT_SECURE_NO_WARNINGS
+
 #ifndef _CRT_NONSTDC_NO_DEPRECATE
 #define _CRT_NONSTDC_NO_DEPRECATE
+#endif //_CRT_NONSTDC_NO_DEPRECATE
+
+#if defined(_MSC_VER)
+#if _MSC_VER < 1900
+#error Sorry, Visual Studio versions prior to 2015 are not supported
 #endif
 
-#if defined(_MSC_VER) && _MSC_VER < 1900
-#define snprintf _snprintf_s
+#pragma comment(lib, "ws2_32.lib")
+
+#ifdef _WIN64
+using ssize_t = __int64;
+#else
+using ssize_t = long;
 #endif
+#endif // _MSC_VER
 
 #ifndef S_ISREG
-#define S_ISREG(m)  (((m)&S_IFREG)==S_IFREG)
-#endif
+#define S_ISREG(m) (((m) & S_IFREG) == S_IFREG)
+#endif // S_ISREG
+
 #ifndef S_ISDIR
-#define S_ISDIR(m)  (((m)&S_IFDIR)==S_IFDIR)
-#endif
+#define S_ISDIR(m) (((m) & S_IFDIR) == S_IFDIR)
+#endif // S_ISDIR
+
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif // NOMINMAX
 
 #include <io.h>
 #include <winsock2.h>
 #include <ws2tcpip.h>
 
-#undef min
-#undef max
+#if defined(__has_include)
+#if __has_include(<afunix.h>)
+// afunix.h uses types declared in winsock2.h, so has to be included after it.
+#include <afunix.h>
+#define CPPHTTPLIB_HAVE_AFUNIX_H 1
+#endif
+#endif
 
-#ifndef strcasecmp
-#define strcasecmp _stricmp
+#ifndef WSA_FLAG_NO_HANDLE_INHERIT
+#define WSA_FLAG_NO_HANDLE_INHERIT 0x80
 #endif
 
-typedef SOCKET socket_t;
-#else
-#include <pthread.h>
-#include <unistd.h>
+using nfds_t = unsigned long;
+using socket_t = SOCKET;
+using socklen_t = int;
+
+#else // not _WIN32
+
+#include <arpa/inet.h>
+#if !defined(_AIX) && !defined(__MVS__)
+#include <ifaddrs.h>
+#endif
+#ifdef __MVS__
+#include <strings.h>
+#ifndef NI_MAXHOST
+#define NI_MAXHOST 1025
+#endif
+#endif
+#include <net/if.h>
 #include <netdb.h>
-#include <cstring>
 #include <netinet/in.h>
-#include <arpa/inet.h>
-#include <signal.h>
+#ifdef __linux__
+#include <resolv.h>
+#endif
+#include <csignal>
+#include <netinet/tcp.h>
+#include <poll.h>
+#include <pthread.h>
+#include <sys/mman.h>
 #include <sys/socket.h>
-#include <sys/select.h>
+#include <sys/un.h>
+#include <unistd.h>
 
-typedef int socket_t;
+using socket_t = int;
+#ifndef INVALID_SOCKET
 #define INVALID_SOCKET (-1)
 #endif
+#endif //_WIN32
+
+#if defined(__APPLE__)
+#include <TargetConditionals.h>
+#endif
 
-#include <fstream>
+#include <algorithm>
+#include <array>
+#include <atomic>
+#include <cassert>
+#include <cctype>
+#include <climits>
+#include <condition_variable>
+#include <cstring>
+#include <errno.h>
+#include <exception>
+#include <fcntl.h>
 #include <functional>
+#include <iomanip>
+#include <iostream>
+#include <list>
 #include <map>
 #include <memory>
 #include <mutex>
+#include <random>
 #include <regex>
+#include <set>
+#include <sstream>
 #include <string>
-#include <thread>
 #include <sys/stat.h>
-#include <fcntl.h>
-#include <assert.h>
+#include <thread>
+#include <unordered_map>
+#include <unordered_set>
+#include <utility>
+
+#if defined(CPPHTTPLIB_USE_NON_BLOCKING_GETADDRINFO) ||                        \
+    defined(CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN)
+#if TARGET_OS_MAC
+#include <CFNetwork/CFHost.h>
+#include <CoreFoundation/CoreFoundation.h>
+#endif
+#endif // CPPHTTPLIB_USE_NON_BLOCKING_GETADDRINFO or
+       // CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN
 
 #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+#ifdef _WIN32
+#include <wincrypt.h>
+
+// these are defined in wincrypt.h and it breaks compilation if BoringSSL is
+// used
+#undef X509_NAME
+#undef X509_CERT_PAIR
+#undef X509_EXTENSIONS
+#undef PKCS7_SIGNER_INFO
+
+#ifdef _MSC_VER
+#pragma comment(lib, "crypt32.lib")
+#endif
+#endif // _WIN32
+
+#if defined(CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN)
+#if TARGET_OS_MAC
+#include <Security/Security.h>
+#endif
+#endif // CPPHTTPLIB_USE_NON_BLOCKING_GETADDRINFO
+
+#include <openssl/err.h>
+#include <openssl/evp.h>
 #include <openssl/ssl.h>
+#include <openssl/x509v3.h>
+
+#if defined(_WIN32) && defined(OPENSSL_USE_APPLINK)
+#include <openssl/applink.c>
+#endif
+
+#include <iostream>
+#include <sstream>
+
+#if defined(OPENSSL_IS_BORINGSSL) || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x1010107f
+#error Please use OpenSSL or a current version of BoringSSL
+#endif
+#define SSL_get1_peer_certificate SSL_get_peer_certificate
+#elif OPENSSL_VERSION_NUMBER < 0x30000000L
+#error Sorry, OpenSSL versions prior to 3.0.0 are not supported
 #endif
 
+#endif // CPPHTTPLIB_OPENSSL_SUPPORT
+
 #ifdef CPPHTTPLIB_ZLIB_SUPPORT
 #include "third_party/zlib/zlib_crashpad.h"
 #endif
 
+#ifdef CPPHTTPLIB_BROTLI_SUPPORT
+#include <brotli/decode.h>
+#include <brotli/encode.h>
+#endif
+
+#ifdef CPPHTTPLIB_ZSTD_SUPPORT
+#include <zstd.h>
+#endif
+
 /*
- * Configuration
+ * Declaration
  */
-#define CPPHTTPLIB_KEEPALIVE_TIMEOUT_SECOND 5
-#define CPPHTTPLIB_KEEPALIVE_TIMEOUT_USECOND 0
-
-namespace httplib
-{
+namespace httplib {
 
 namespace detail {
 
-struct ci {
-    bool operator() (const std::string & s1, const std::string & s2) const {
-        return std::lexicographical_compare(
-            s1.begin(), s1.end(),
-            s2.begin(), s2.end(),
-            [](char c1, char c2) {
-                return ::tolower(c1) < ::tolower(c2);
-            });
-    }
-};
-
-} // namespace detail
+/*
+ * Backport std::make_unique from C++14.
+ *
+ * NOTE: This code came up with the following stackoverflow post:
+ * https://stackoverflow.com/questions/10149840/c-arrays-and-make-unique
+ *
+ */
 
-enum class HttpVersion { v1_0 = 0, v1_1 };
+template <class T, class... Args>
+typename std::enable_if<!std::is_array<T>::value, std::unique_ptr<T>>::type
+make_unique(Args &&...args) {
+  return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
+}
 
-typedef std::multimap<std::string, std::string, detail::ci>  Headers;
+template <class T>
+typename std::enable_if<std::is_array<T>::value, std::unique_ptr<T>>::type
+make_unique(std::size_t n) {
+  typedef typename std::remove_extent<T>::type RT;
+  return std::unique_ptr<T>(new RT[n]);
+}
 
-template<typename uint64_t, typename... Args>
-std::pair<std::string, std::string> make_range_header(uint64_t value, Args... args);
+namespace case_ignore {
+
+inline unsigned char to_lower(int c) {
+  const static unsigned char table[256] = {
+      0,   1,   2,   3,   4,   5,   6,   7,   8,   9,   10,  11,  12,  13,  14,
+      15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,
+      30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,
+      45,  46,  47,  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,
+      60,  61,  62,  63,  64,  97,  98,  99,  100, 101, 102, 103, 104, 105, 106,
+      107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
+      122, 91,  92,  93,  94,  95,  96,  97,  98,  99,  100, 101, 102, 103, 104,
+      105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+      120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+      135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+      150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
+      165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+      180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 224, 225, 226,
+      227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241,
+      242, 243, 244, 245, 246, 215, 248, 249, 250, 251, 252, 253, 254, 223, 224,
+      225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+      240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
+      255,
+  };
+  return table[(unsigned char)(char)c];
+}
 
-typedef std::multimap<std::string, std::string>                Params;
-typedef std::smatch                                            Match;
-typedef std::function<void (uint64_t current, uint64_t total)> Progress;
+inline bool equal(const std::string &a, const std::string &b) {
+  return a.size() == b.size() &&
+         std::equal(a.begin(), a.end(), b.begin(), [](char ca, char cb) {
+           return to_lower(ca) == to_lower(cb);
+         });
+}
 
-struct MultipartFile {
-    std::string filename;
-    std::string content_type;
-    size_t offset = 0;
-    size_t length = 0;
+struct equal_to {
+  bool operator()(const std::string &a, const std::string &b) const {
+    return equal(a, b);
+  }
 };
-typedef std::multimap<std::string, MultipartFile> MultipartFiles;
 
-struct Request {
-    std::string    version;
-    std::string    method;
-    std::string    target;
-    std::string    path;
-    Headers        headers;
-    std::string    body;
-    Params         params;
-    MultipartFiles files;
-    Match          matches;
-
-    Progress       progress;
-
-    bool has_header(const char* key) const;
-    std::string get_header_value(const char* key) const;
-    void set_header(const char* key, const char* val);
-
-    bool has_param(const char* key) const;
-    std::string get_param_value(const char* key) const;
-
-    bool has_file(const char* key) const;
-    MultipartFile get_file_value(const char* key) const;
+struct hash {
+  size_t operator()(const std::string &key) const {
+    return hash_core(key.data(), key.size(), 0);
+  }
+
+  size_t hash_core(const char *s, size_t l, size_t h) const {
+    return (l == 0) ? h
+                    : hash_core(s + 1, l - 1,
+                                // Unsets the 6 high bits of h, therefore no
+                                // overflow happens
+                                (((std::numeric_limits<size_t>::max)() >> 6) &
+                                 h * 33) ^
+                                    static_cast<unsigned char>(to_lower(*s)));
+  }
 };
 
-struct Response {
-    std::string version;
-    int         status;
-    Headers     headers;
-    std::string body;
+template <typename T>
+using unordered_set = std::unordered_set<T, detail::case_ignore::hash,
+                                         detail::case_ignore::equal_to>;
 
-    bool has_header(const char* key) const;
-    std::string get_header_value(const char* key) const;
-    void set_header(const char* key, const char* val);
+} // namespace case_ignore
 
-    void set_redirect(const char* uri);
-    void set_content(const char* s, size_t n, const char* content_type);
-    void set_content(const std::string& s, const char* content_type);
+// This is based on
+// "http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4189".
 
-    Response() : status(-1) {}
-};
+struct scope_exit {
+  explicit scope_exit(std::function<void(void)> &&f)
+      : exit_function(std::move(f)), execute_on_destruction{true} {}
 
-class Stream {
-public:
-    virtual ~Stream() {}
-    virtual int read(char* ptr, size_t size) = 0;
-    virtual int write(const char* ptr, size_t size1) = 0;
-    virtual int write(const char* ptr) = 0;
-    virtual std::string get_remote_addr() = 0;
-
-    template <typename ...Args>
-    void write_format(const char* fmt, const Args& ...args);
-};
+  scope_exit(scope_exit &&rhs) noexcept
+      : exit_function(std::move(rhs.exit_function)),
+        execute_on_destruction{rhs.execute_on_destruction} {
+    rhs.release();
+  }
 
-class SocketStream : public Stream {
-public:
-    SocketStream(socket_t sock);
-    virtual ~SocketStream();
+  ~scope_exit() {
+    if (execute_on_destruction) { this->exit_function(); }
+  }
 
-    virtual int read(char* ptr, size_t size);
-    virtual int write(const char* ptr, size_t size);
-    virtual int write(const char* ptr);
-    virtual std::string get_remote_addr();
+  void release() { this->execute_on_destruction = false; }
 
 private:
-    socket_t sock_;
-};
+  scope_exit(const scope_exit &) = delete;
+  void operator=(const scope_exit &) = delete;
+  scope_exit &operator=(scope_exit &&) = delete;
 
-class Server {
-public:
-    typedef std::function<void (const Request&, Response&)> Handler;
-    typedef std::function<void (const Request&, const Response&)> Logger;
+  std::function<void(void)> exit_function;
+  bool execute_on_destruction;
+};
 
-    Server();
+} // namespace detail
 
-    virtual ~Server();
+enum SSLVerifierResponse {
+  // no decision has been made, use the built-in certificate verifier
+  NoDecisionMade,
+  // connection certificate is verified and accepted
+  CertificateAccepted,
+  // connection certificate was processed but is rejected
+  CertificateRejected
+};
 
-    virtual bool is_valid() const;
+enum StatusCode {
+  // Information responses
+  Continue_100 = 100,
+  SwitchingProtocol_101 = 101,
+  Processing_102 = 102,
+  EarlyHints_103 = 103,
+
+  // Successful responses
+  OK_200 = 200,
+  Created_201 = 201,
+  Accepted_202 = 202,
+  NonAuthoritativeInformation_203 = 203,
+  NoContent_204 = 204,
+  ResetContent_205 = 205,
+  PartialContent_206 = 206,
+  MultiStatus_207 = 207,
+  AlreadyReported_208 = 208,
+  IMUsed_226 = 226,
+
+  // Redirection messages
+  MultipleChoices_300 = 300,
+  MovedPermanently_301 = 301,
+  Found_302 = 302,
+  SeeOther_303 = 303,
+  NotModified_304 = 304,
+  UseProxy_305 = 305,
+  unused_306 = 306,
+  TemporaryRedirect_307 = 307,
+  PermanentRedirect_308 = 308,
+
+  // Client error responses
+  BadRequest_400 = 400,
+  Unauthorized_401 = 401,
+  PaymentRequired_402 = 402,
+  Forbidden_403 = 403,
+  NotFound_404 = 404,
+  MethodNotAllowed_405 = 405,
+  NotAcceptable_406 = 406,
+  ProxyAuthenticationRequired_407 = 407,
+  RequestTimeout_408 = 408,
+  Conflict_409 = 409,
+  Gone_410 = 410,
+  LengthRequired_411 = 411,
+  PreconditionFailed_412 = 412,
+  PayloadTooLarge_413 = 413,
+  UriTooLong_414 = 414,
+  UnsupportedMediaType_415 = 415,
+  RangeNotSatisfiable_416 = 416,
+  ExpectationFailed_417 = 417,
+  ImATeapot_418 = 418,
+  MisdirectedRequest_421 = 421,
+  UnprocessableContent_422 = 422,
+  Locked_423 = 423,
+  FailedDependency_424 = 424,
+  TooEarly_425 = 425,
+  UpgradeRequired_426 = 426,
+  PreconditionRequired_428 = 428,
+  TooManyRequests_429 = 429,
+  RequestHeaderFieldsTooLarge_431 = 431,
+  UnavailableForLegalReasons_451 = 451,
+
+  // Server error responses
+  InternalServerError_500 = 500,
+  NotImplemented_501 = 501,
+  BadGateway_502 = 502,
+  ServiceUnavailable_503 = 503,
+  GatewayTimeout_504 = 504,
+  HttpVersionNotSupported_505 = 505,
+  VariantAlsoNegotiates_506 = 506,
+  InsufficientStorage_507 = 507,
+  LoopDetected_508 = 508,
+  NotExtended_510 = 510,
+  NetworkAuthenticationRequired_511 = 511,
+};
 
-    Server& Get(const char* pattern, Handler handler);
-    Server& Post(const char* pattern, Handler handler);
+using Headers =
+    std::unordered_multimap<std::string, std::string, detail::case_ignore::hash,
+                            detail::case_ignore::equal_to>;
 
-    Server& Put(const char* pattern, Handler handler);
-    Server& Delete(const char* pattern, Handler handler);
-    Server& Options(const char* pattern, Handler handler);
+using Params = std::multimap<std::string, std::string>;
+using Match = std::smatch;
 
-    bool set_base_dir(const char* path);
+using DownloadProgress = std::function<bool(size_t current, size_t total)>;
+using UploadProgress = std::function<bool(size_t current, size_t total)>;
 
-    void set_error_handler(Handler handler);
-    void set_logger(Logger logger);
+struct Response;
+using ResponseHandler = std::function<bool(const Response &response)>;
 
-    void set_keep_alive_max_count(size_t count);
+struct FormData {
+  std::string name;
+  std::string content;
+  std::string filename;
+  std::string content_type;
+  Headers headers;
+};
 
-    int bind_to_any_port(const char* host, int socket_flags = 0);
-    bool listen_after_bind();
+struct FormField {
+  std::string name;
+  std::string content;
+  Headers headers;
+};
+using FormFields = std::multimap<std::string, FormField>;
 
-    bool listen(const char* host, int port, int socket_flags = 0);
+using FormFiles = std::multimap<std::string, FormData>;
 
-    bool is_running() const;
-    void stop();
+struct MultipartFormData {
+  FormFields fields; // Text fields from multipart
+  FormFiles files;   // Files from multipart
 
-protected:
-    bool process_request(Stream& strm, bool last_connection, bool& connection_close);
+  // Text field access
+  std::string get_field(const std::string &key, size_t id = 0) const;
+  std::vector<std::string> get_fields(const std::string &key) const;
+  bool has_field(const std::string &key) const;
+  size_t get_field_count(const std::string &key) const;
 
-    size_t keep_alive_max_count_;
+  // File access
+  FormData get_file(const std::string &key, size_t id = 0) const;
+  std::vector<FormData> get_files(const std::string &key) const;
+  bool has_file(const std::string &key) const;
+  size_t get_file_count(const std::string &key) const;
+};
 
-private:
-    typedef std::vector<std::pair<std::regex, Handler>> Handlers;
-
-    socket_t create_server_socket(const char* host, int port, int socket_flags) const;
-    int bind_internal(const char* host, int port, int socket_flags);
-    bool listen_internal();
-
-    bool routing(Request& req, Response& res);
-    bool handle_file_request(Request& req, Response& res);
-    bool dispatch_request(Request& req, Response& res, Handlers& handlers);
-
-    bool parse_request_line(const char* s, Request& req);
-    void write_response(Stream& strm, bool last_connection, const Request& req, Response& res);
-
-    virtual bool read_and_close_socket(socket_t sock);
-
-    bool        is_running_;
-    socket_t    svr_sock_;
-    std::string base_dir_;
-    Handlers    get_handlers_;
-    Handlers    post_handlers_;
-    Handlers    put_handlers_;
-    Handlers    delete_handlers_;
-    Handlers    options_handlers_;
-    Handler     error_handler_;
-    Logger      logger_;
-
-    // TODO: Use thread pool...
-    std::mutex  running_threads_mutex_;
-    int         running_threads_;
+struct UploadFormData {
+  std::string name;
+  std::string content;
+  std::string filename;
+  std::string content_type;
 };
+using UploadFormDataItems = std::vector<UploadFormData>;
 
-class Client {
+class DataSink {
 public:
-    Client(
-        const char* host,
-        int port = 80,
-        size_t timeout_sec = 300);
+  DataSink() : os(&sb_), sb_(*this) {}
+
+  DataSink(const DataSink &) = delete;
+  DataSink &operator=(const DataSink &) = delete;
+  DataSink(DataSink &&) = delete;
+  DataSink &operator=(DataSink &&) = delete;
+
+  std::function<bool(const char *data, size_t data_len)> write;
+  std::function<bool()> is_writable;
+  std::function<void()> done;
+  std::function<void(const Headers &trailer)> done_with_trailer;
+  std::ostream os;
 
-    virtual ~Client();
+private:
+  class data_sink_streambuf final : public std::streambuf {
+  public:
+    explicit data_sink_streambuf(DataSink &sink) : sink_(sink) {}
+
+  protected:
+    std::streamsize xsputn(const char *s, std::streamsize n) override {
+      sink_.write(s, static_cast<size_t>(n));
+      return n;
+    }
 
-    virtual bool is_valid() const;
+  private:
+    DataSink &sink_;
+  };
+
+  data_sink_streambuf sb_;
+};
 
-    std::shared_ptr<Response> Get(const char* path, Progress progress = nullptr);
-    std::shared_ptr<Response> Get(const char* path, const Headers& headers, Progress progress = nullptr);
+using ContentProvider =
+    std::function<bool(size_t offset, size_t length, DataSink &sink)>;
 
-    std::shared_ptr<Response> Head(const char* path);
-    std::shared_ptr<Response> Head(const char* path, const Headers& headers);
+using ContentProviderWithoutLength =
+    std::function<bool(size_t offset, DataSink &sink)>;
 
-    std::shared_ptr<Response> Post(const char* path, const std::string& body, const char* content_type);
-    std::shared_ptr<Response> Post(const char* path, const Headers& headers, const std::string& body, const char* content_type);
+using ContentProviderResourceReleaser = std::function<void(bool success)>;
 
-    std::shared_ptr<Response> Post(const char* path, const Params& params);
-    std::shared_ptr<Response> Post(const char* path, const Headers& headers, const Params& params);
+struct FormDataProvider {
+  std::string name;
+  ContentProviderWithoutLength provider;
+  std::string filename;
+  std::string content_type;
+};
+using FormDataProviderItems = std::vector<FormDataProvider>;
 
-    std::shared_ptr<Response> Put(const char* path, const std::string& body, const char* content_type);
-    std::shared_ptr<Response> Put(const char* path, const Headers& headers, const std::string& body, const char* content_type);
+using ContentReceiverWithProgress = std::function<bool(
+    const char *data, size_t data_length, size_t offset, size_t total_length)>;
 
-    std::shared_ptr<Response> Delete(const char* path);
-    std::shared_ptr<Response> Delete(const char* path, const Headers& headers);
+using ContentReceiver =
+    std::function<bool(const char *data, size_t data_length)>;
 
-    std::shared_ptr<Response> Options(const char* path);
-    std::shared_ptr<Response> Options(const char* path, const Headers& headers);
+using FormDataHeader = std::function<bool(const FormData &file)>;
 
-    bool send(Request& req, Response& res);
+class ContentReader {
+public:
+  using Reader = std::function<bool(ContentReceiver receiver)>;
+  using FormDataReader =
+      std::function<bool(FormDataHeader header, ContentReceiver receiver)>;
 
-protected:
-    bool process_request(Stream& strm, Request& req, Response& res, bool& connection_close);
+  ContentReader(Reader reader, FormDataReader multipart_reader)
+      : reader_(std::move(reader)),
+        formdata_reader_(std::move(multipart_reader)) {}
 
-    const std::string host_;
-    const int         port_;
-    size_t            timeout_sec_;
-    const std::string host_and_port_;
+  bool operator()(FormDataHeader header, ContentReceiver receiver) const {
+    return formdata_reader_(std::move(header), std::move(receiver));
+  }
 
-private:
-    socket_t create_client_socket() const;
-    bool read_response_line(Stream& strm, Response& res);
-    void write_request(Stream& strm, Request& req);
+  bool operator()(ContentReceiver receiver) const {
+    return reader_(std::move(receiver));
+  }
 
-    virtual bool read_and_close_socket(socket_t sock, Request& req, Response& res);
+  Reader reader_;
+  FormDataReader formdata_reader_;
 };
 
+using Range = std::pair<ssize_t, ssize_t>;
+using Ranges = std::vector<Range>;
+
+struct Request {
+  std::string method;
+  std::string path;
+  std::string matched_route;
+  Params params;
+  Headers headers;
+  Headers trailers;
+  std::string body;
+
+  std::string remote_addr;
+  int remote_port = -1;
+  std::string local_addr;
+  int local_port = -1;
+
+  // for server
+  std::string version;
+  std::string target;
+  MultipartFormData form;
+  Ranges ranges;
+  Match matches;
+  std::unordered_map<std::string, std::string> path_params;
+  std::function<bool()> is_connection_closed = []() { return true; };
+
+  // for client
+  std::vector<std::string> accept_content_types;
+  ResponseHandler response_handler;
+  ContentReceiverWithProgress content_receiver;
+  DownloadProgress download_progress;
+  UploadProgress upload_progress;
 #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-class SSLSocketStream : public Stream {
-public:
-    SSLSocketStream(socket_t sock, SSL* ssl);
-    virtual ~SSLSocketStream();
+  const SSL *ssl = nullptr;
+#endif
 
-    virtual int read(char* ptr, size_t size);
-    virtual int write(const char* ptr, size_t size);
-    virtual int write(const char* ptr);
-    virtual std::string get_remote_addr();
+  bool has_header(const std::string &key) const;
+  std::string get_header_value(const std::string &key, const char *def = "",
+                               size_t id = 0) const;
+  size_t get_header_value_u64(const std::string &key, size_t def = 0,
+                              size_t id = 0) const;
+  size_t get_header_value_count(const std::string &key) const;
+  void set_header(const std::string &key, const std::string &val);
+
+  bool has_trailer(const std::string &key) const;
+  std::string get_trailer_value(const std::string &key, size_t id = 0) const;
+  size_t get_trailer_value_count(const std::string &key) const;
+
+  bool has_param(const std::string &key) const;
+  std::string get_param_value(const std::string &key, size_t id = 0) const;
+  size_t get_param_value_count(const std::string &key) const;
+
+  bool is_multipart_form_data() const;
+
+  // private members...
+  size_t redirect_count_ = CPPHTTPLIB_REDIRECT_MAX_COUNT;
+  size_t content_length_ = 0;
+  ContentProvider content_provider_;
+  bool is_chunked_content_provider_ = false;
+  size_t authorization_count_ = 0;
+  std::chrono::time_point<std::chrono::steady_clock> start_time_ =
+      (std::chrono::steady_clock::time_point::min)();
+};
 
-private:
-    socket_t sock_;
-    SSL* ssl_;
+struct Response {
+  std::string version;
+  int status = -1;
+  std::string reason;
+  Headers headers;
+  Headers trailers;
+  std::string body;
+  std::string location; // Redirect location
+
+  bool has_header(const std::string &key) const;
+  std::string get_header_value(const std::string &key, const char *def = "",
+                               size_t id = 0) const;
+  size_t get_header_value_u64(const std::string &key, size_t def = 0,
+                              size_t id = 0) const;
+  size_t get_header_value_count(const std::string &key) const;
+  void set_header(const std::string &key, const std::string &val);
+
+  bool has_trailer(const std::string &key) const;
+  std::string get_trailer_value(const std::string &key, size_t id = 0) const;
+  size_t get_trailer_value_count(const std::string &key) const;
+
+  void set_redirect(const std::string &url, int status = StatusCode::Found_302);
+  void set_content(const char *s, size_t n, const std::string &content_type);
+  void set_content(const std::string &s, const std::string &content_type);
+  void set_content(std::string &&s, const std::string &content_type);
+
+  void set_content_provider(
+      size_t length, const std::string &content_type, ContentProvider provider,
+      ContentProviderResourceReleaser resource_releaser = nullptr);
+
+  void set_content_provider(
+      const std::string &content_type, ContentProviderWithoutLength provider,
+      ContentProviderResourceReleaser resource_releaser = nullptr);
+
+  void set_chunked_content_provider(
+      const std::string &content_type, ContentProviderWithoutLength provider,
+      ContentProviderResourceReleaser resource_releaser = nullptr);
+
+  void set_file_content(const std::string &path,
+                        const std::string &content_type);
+  void set_file_content(const std::string &path);
+
+  Response() = default;
+  Response(const Response &) = default;
+  Response &operator=(const Response &) = default;
+  Response(Response &&) = default;
+  Response &operator=(Response &&) = default;
+  ~Response() {
+    if (content_provider_resource_releaser_) {
+      content_provider_resource_releaser_(content_provider_success_);
+    }
+  }
+
+  // private members...
+  size_t content_length_ = 0;
+  ContentProvider content_provider_;
+  ContentProviderResourceReleaser content_provider_resource_releaser_;
+  bool is_chunked_content_provider_ = false;
+  bool content_provider_success_ = false;
+  std::string file_content_path_;
+  std::string file_content_content_type_;
 };
 
-class SSLServer : public Server {
+class Stream {
 public:
-    SSLServer(
-        const char* cert_path, const char* private_key_path);
+  virtual ~Stream() = default;
 
-    virtual ~SSLServer();
+  virtual bool is_readable() const = 0;
+  virtual bool wait_readable() const = 0;
+  virtual bool wait_writable() const = 0;
 
-    virtual bool is_valid() const;
+  virtual ssize_t read(char *ptr, size_t size) = 0;
+  virtual ssize_t write(const char *ptr, size_t size) = 0;
+  virtual void get_remote_ip_and_port(std::string &ip, int &port) const = 0;
+  virtual void get_local_ip_and_port(std::string &ip, int &port) const = 0;
+  virtual socket_t socket() const = 0;
 
-private:
-    virtual bool read_and_close_socket(socket_t sock);
+  virtual time_t duration() const = 0;
 
-    SSL_CTX* ctx_;
-    std::mutex ctx_mutex_;
+  ssize_t write(const char *ptr);
+  ssize_t write(const std::string &s);
 };
 
-class SSLClient : public Client {
+class TaskQueue {
 public:
-    SSLClient(
-        const char* host,
-        int port = 80,
-        size_t timeout_sec = 300);
-
-    virtual ~SSLClient();
+  TaskQueue() = default;
+  virtual ~TaskQueue() = default;
 
-    virtual bool is_valid() const;
+  virtual bool enqueue(std::function<void()> fn) = 0;
+  virtual void shutdown() = 0;
 
-private:
-    virtual bool read_and_close_socket(socket_t sock, Request& req, Response& res);
-
-    SSL_CTX* ctx_;
-    std::mutex ctx_mutex_;
+  virtual void on_idle() {}
 };
-#endif
 
-/*
- * Implementation
- */
-namespace detail {
+class ThreadPool final : public TaskQueue {
+public:
+  explicit ThreadPool(size_t n, size_t mqr = 0)
+      : shutdown_(false), max_queued_requests_(mqr) {
+    while (n) {
+      threads_.emplace_back(worker(*this));
+      n--;
+    }
+  }
 
-template <class Fn>
-void split(const char* b, const char* e, char d, Fn fn)
-{
-    int i = 0;
-    int beg = 0;
+  ThreadPool(const ThreadPool &) = delete;
+  ~ThreadPool() override = default;
 
-    while (e ? (b + i != e) : (b[i] != '\0')) {
-        if (b[i] == d) {
-            fn(&b[beg], &b[i]);
-            beg = i + 1;
-        }
-        i++;
+  bool enqueue(std::function<void()> fn) override {
+    {
+      std::unique_lock<std::mutex> lock(mutex_);
+      if (max_queued_requests_ > 0 && jobs_.size() >= max_queued_requests_) {
+        return false;
+      }
+      jobs_.push_back(std::move(fn));
     }
 
-    if (i) {
-        fn(&b[beg], &b[i]);
-    }
-}
+    cond_.notify_one();
+    return true;
+  }
 
-// NOTE: until the read size reaches `fixed_buffer_size`, use `fixed_buffer`
-// to store data. The call can set memory on stack for performance.
-class stream_line_reader {
-public:
-    stream_line_reader(Stream& strm, char* fixed_buffer, size_t fixed_buffer_size)
-        : strm_(strm)
-        , fixed_buffer_(fixed_buffer)
-        , fixed_buffer_size_(fixed_buffer_size) {
+  void shutdown() override {
+    // Stop all worker threads...
+    {
+      std::unique_lock<std::mutex> lock(mutex_);
+      shutdown_ = true;
     }
 
-    const char* ptr() const {
-        if (glowable_buffer_.empty()) {
-            return fixed_buffer_;
-        } else {
-            return glowable_buffer_.data();
-        }
+    cond_.notify_all();
+
+    // Join...
+    for (auto &t : threads_) {
+      t.join();
     }
+  }
 
-    bool getline() {
-        fixed_buffer_used_size_ = 0;
-        glowable_buffer_.clear();
+private:
+  struct worker {
+    explicit worker(ThreadPool &pool) : pool_(pool) {}
 
-        for (size_t i = 0; ; i++) {
-            char byte;
-            auto n = strm_.read(&byte, 1);
+    void operator()() {
+      for (;;) {
+        std::function<void()> fn;
+        {
+          std::unique_lock<std::mutex> lock(pool_.mutex_);
 
-            if (n < 0) {
-                return false;
-            } else if (n == 0) {
-                if (i == 0) {
-                    return false;
-                } else {
-                    break;
-                }
-            }
+          pool_.cond_.wait(
+              lock, [&] { return !pool_.jobs_.empty() || pool_.shutdown_; });
 
-            append(byte);
+          if (pool_.shutdown_ && pool_.jobs_.empty()) { break; }
 
-            if (byte == '\n') {
-                break;
-            }
+          fn = pool_.jobs_.front();
+          pool_.jobs_.pop_front();
         }
 
-        return true;
-    }
+        assert(true == static_cast<bool>(fn));
+        fn();
+      }
 
-private:
-    void append(char c) {
-        if (fixed_buffer_used_size_ < fixed_buffer_size_ - 1) {
-            fixed_buffer_[fixed_buffer_used_size_++] = c;
-            fixed_buffer_[fixed_buffer_used_size_] = '\0';
-        } else {
-            if (glowable_buffer_.empty()) {
-                assert(fixed_buffer_[fixed_buffer_used_size_] == '\0');
-                glowable_buffer_.assign(fixed_buffer_, fixed_buffer_used_size_);
-            }
-            glowable_buffer_ += c;
-        }
+#if defined(CPPHTTPLIB_OPENSSL_SUPPORT) && !defined(OPENSSL_IS_BORINGSSL) &&   \
+    !defined(LIBRESSL_VERSION_NUMBER)
+      OPENSSL_thread_stop();
+#endif
     }
 
-    Stream& strm_;
-    char* fixed_buffer_;
-    const size_t fixed_buffer_size_;
-    size_t fixed_buffer_used_size_;
-    std::string glowable_buffer_;
-};
+    ThreadPool &pool_;
+  };
+  friend struct worker;
 
-inline int close_socket(socket_t sock)
-{
-#ifdef _WIN32
-    return closesocket(sock);
-#else
-    return close(sock);
-#endif
-}
+  std::vector<std::thread> threads_;
+  std::list<std::function<void()>> jobs_;
 
-inline int select_read(socket_t sock, size_t sec, size_t usec)
-{
-    fd_set fds;
-    FD_ZERO(&fds);
-    FD_SET(sock, &fds);
+  bool shutdown_;
+  size_t max_queued_requests_ = 0;
 
-    timeval tv;
-    tv.tv_sec = sec;
-    tv.tv_usec = usec;
+  std::condition_variable cond_;
+  std::mutex mutex_;
+};
 
-    return select(sock + 1, &fds, NULL, NULL, &tv);
-}
+using Logger = std::function<void(const Request &, const Response &)>;
 
-inline bool wait_until_socket_is_ready(socket_t sock, size_t sec, size_t usec)
-{
-    fd_set fdsr;
-    FD_ZERO(&fdsr);
-    FD_SET(sock, &fdsr);
+// Forward declaration for Error type
+enum class Error;
+using ErrorLogger = std::function<void(const Error &, const Request *)>;
 
-    auto fdsw = fdsr;
-    auto fdse = fdsr;
+using SocketOptions = std::function<void(socket_t sock)>;
 
-    timeval tv;
-    tv.tv_sec = sec;
-    tv.tv_usec = usec;
+namespace detail {
 
-    if (select(sock + 1, &fdsr, &fdsw, &fdse, &tv) < 0) {
-        return false;
-    } else if (FD_ISSET(sock, &fdsr) || FD_ISSET(sock, &fdsw)) {
-        int error = 0;
-        socklen_t len = sizeof(error);
-        if (getsockopt(sock, SOL_SOCKET, SO_ERROR, (char*)&error, &len) < 0 || error) {
-            return false;
-        }
-    } else {
-        return false;
-    }
+bool set_socket_opt_impl(socket_t sock, int level, int optname,
+                         const void *optval, socklen_t optlen);
+bool set_socket_opt(socket_t sock, int level, int optname, int opt);
+bool set_socket_opt_time(socket_t sock, int level, int optname, time_t sec,
+                         time_t usec);
 
-    return true;
-}
+} // namespace detail
 
-template <typename T>
-inline bool read_and_close_socket(socket_t sock, size_t keep_alive_max_count, T callback)
-{
-    bool ret = false;
-
-    if (keep_alive_max_count > 0) {
-        auto count = keep_alive_max_count;
-        while (count > 0 &&
-               detail::select_read(sock,
-                   CPPHTTPLIB_KEEPALIVE_TIMEOUT_SECOND,
-                   CPPHTTPLIB_KEEPALIVE_TIMEOUT_USECOND) > 0) {
-            SocketStream strm(sock);
-            auto last_connection = count == 1;
-            auto connection_close = false;
-
-            ret = callback(strm, last_connection, connection_close);
-            if (!ret || connection_close) {
-                break;
-            }
+void default_socket_options(socket_t sock);
 
-            count--;
-        }
-    } else {
-        SocketStream strm(sock);
-        auto dummy_connection_close = false;
-        ret = callback(strm, true, dummy_connection_close);
-    }
+const char *status_message(int status);
 
-    close_socket(sock);
-    return ret;
-}
+std::string get_bearer_token_auth(const Request &req);
 
-inline int shutdown_socket(socket_t sock)
-{
-#ifdef _WIN32
-    return shutdown(sock, SD_BOTH);
-#else
-    return shutdown(sock, SHUT_RDWR);
-#endif
-}
+namespace detail {
 
-template <typename Fn>
-socket_t create_socket(const char* host, int port, Fn fn, int socket_flags = 0)
-{
-#ifdef _WIN32
-#define SO_SYNCHRONOUS_NONALERT 0x20
-#define SO_OPENTYPE 0x7008
+class MatcherBase {
+public:
+  MatcherBase(std::string pattern) : pattern_(pattern) {}
+  virtual ~MatcherBase() = default;
 
-    int opt = SO_SYNCHRONOUS_NONALERT;
-    setsockopt(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE, (char*)&opt, sizeof(opt));
-#endif
+  const std::string &pattern() const { return pattern_; }
 
-    // Get address info
-    struct addrinfo hints;
-    struct addrinfo *result;
+  // Match request path and populate its matches and
+  virtual bool match(Request &request) const = 0;
 
-    memset(&hints, 0, sizeof(struct addrinfo));
+private:
+  std::string pattern_;
+};
+
+/**
+ * Captures parameters in request path and stores them in Request::path_params
+ *
+ * Capture name is a substring of a pattern from : to /.
+ * The rest of the pattern is matched against the request path directly
+ * Parameters are captured starting from the next character after
+ * the end of the last matched static pattern fragment until the next /.
+ *
+ * Example pattern:
+ * "/path/fragments/:capture/more/fragments/:second_capture"
+ * Static fragments:
+ * "/path/fragments/", "more/fragments/"
+ *
+ * Given the following request path:
+ * "/path/fragments/:1/more/fragments/:2"
+ * the resulting capture will be
+ * {{"capture", "1"}, {"second_capture", "2"}}
+ */
+class PathParamsMatcher final : public MatcherBase {
+public:
+  PathParamsMatcher(const std::string &pattern);
+
+  bool match(Request &request) const override;
+
+private:
+  // Treat segment separators as the end of path parameter capture
+  // Does not need to handle query parameters as they are parsed before path
+  // matching
+  static constexpr char separator = '/';
+
+  // Contains static path fragments to match against, excluding the '/' after
+  // path params
+  // Fragments are separated by path params
+  std::vector<std::string> static_fragments_;
+  // Stores the names of the path parameters to be used as keys in the
+  // Request::path_params map
+  std::vector<std::string> param_names_;
+};
+
+/**
+ * Performs std::regex_match on request path
+ * and stores the result in Request::matches
+ *
+ * Note that regex match is performed directly on the whole request.
+ * This means that wildcard patterns may match multiple path segments with /:
+ * "/begin/(.*)/end" will match both "/begin/middle/end" and "/begin/1/2/end".
+ */
+class RegexMatcher final : public MatcherBase {
+public:
+  RegexMatcher(const std::string &pattern)
+      : MatcherBase(pattern), regex_(pattern) {}
+
+  bool match(Request &request) const override;
+
+private:
+  std::regex regex_;
+};
+
+ssize_t write_headers(Stream &strm, const Headers &headers);
+
+std::string make_host_and_port_string(const std::string &host, int port,
+                                      bool is_ssl);
+
+} // namespace detail
+
+class Server {
+public:
+  using Handler = std::function<void(const Request &, Response &)>;
+
+  using ExceptionHandler =
+      std::function<void(const Request &, Response &, std::exception_ptr ep)>;
+
+  enum class HandlerResponse {
+    Handled,
+    Unhandled,
+  };
+  using HandlerWithResponse =
+      std::function<HandlerResponse(const Request &, Response &)>;
+
+  using HandlerWithContentReader = std::function<void(
+      const Request &, Response &, const ContentReader &content_reader)>;
+
+  using Expect100ContinueHandler =
+      std::function<int(const Request &, Response &)>;
+
+  Server();
+
+  virtual ~Server();
+
+  virtual bool is_valid() const;
+
+  Server &Get(const std::string &pattern, Handler handler);
+  Server &Post(const std::string &pattern, Handler handler);
+  Server &Post(const std::string &pattern, HandlerWithContentReader handler);
+  Server &Put(const std::string &pattern, Handler handler);
+  Server &Put(const std::string &pattern, HandlerWithContentReader handler);
+  Server &Patch(const std::string &pattern, Handler handler);
+  Server &Patch(const std::string &pattern, HandlerWithContentReader handler);
+  Server &Delete(const std::string &pattern, Handler handler);
+  Server &Delete(const std::string &pattern, HandlerWithContentReader handler);
+  Server &Options(const std::string &pattern, Handler handler);
+
+  bool set_base_dir(const std::string &dir,
+                    const std::string &mount_point = std::string());
+  bool set_mount_point(const std::string &mount_point, const std::string &dir,
+                       Headers headers = Headers());
+  bool remove_mount_point(const std::string &mount_point);
+  Server &set_file_extension_and_mimetype_mapping(const std::string &ext,
+                                                  const std::string &mime);
+  Server &set_default_file_mimetype(const std::string &mime);
+  Server &set_file_request_handler(Handler handler);
+
+  template <class ErrorHandlerFunc>
+  Server &set_error_handler(ErrorHandlerFunc &&handler) {
+    return set_error_handler_core(
+        std::forward<ErrorHandlerFunc>(handler),
+        std::is_convertible<ErrorHandlerFunc, HandlerWithResponse>{});
+  }
+
+  Server &set_exception_handler(ExceptionHandler handler);
+
+  Server &set_pre_routing_handler(HandlerWithResponse handler);
+  Server &set_post_routing_handler(Handler handler);
+
+  Server &set_pre_request_handler(HandlerWithResponse handler);
+
+  Server &set_expect_100_continue_handler(Expect100ContinueHandler handler);
+  Server &set_logger(Logger logger);
+  Server &set_pre_compression_logger(Logger logger);
+  Server &set_error_logger(ErrorLogger error_logger);
+
+  Server &set_address_family(int family);
+  Server &set_tcp_nodelay(bool on);
+  Server &set_ipv6_v6only(bool on);
+  Server &set_socket_options(SocketOptions socket_options);
+
+  Server &set_default_headers(Headers headers);
+  Server &
+  set_header_writer(std::function<ssize_t(Stream &, Headers &)> const &writer);
+
+  Server &set_trusted_proxies(const std::vector<std::string> &proxies);
+
+  Server &set_keep_alive_max_count(size_t count);
+  Server &set_keep_alive_timeout(time_t sec);
+
+  Server &set_read_timeout(time_t sec, time_t usec = 0);
+  template <class Rep, class Period>
+  Server &set_read_timeout(const std::chrono::duration<Rep, Period> &duration);
+
+  Server &set_write_timeout(time_t sec, time_t usec = 0);
+  template <class Rep, class Period>
+  Server &set_write_timeout(const std::chrono::duration<Rep, Period> &duration);
+
+  Server &set_idle_interval(time_t sec, time_t usec = 0);
+  template <class Rep, class Period>
+  Server &set_idle_interval(const std::chrono::duration<Rep, Period> &duration);
+
+  Server &set_payload_max_length(size_t length);
+
+  bool bind_to_port(const std::string &host, int port, int socket_flags = 0);
+  int bind_to_any_port(const std::string &host, int socket_flags = 0);
+  bool listen_after_bind();
+
+  bool listen(const std::string &host, int port, int socket_flags = 0);
+
+  bool is_running() const;
+  void wait_until_ready() const;
+  void stop();
+  void decommission();
+
+  std::function<TaskQueue *(void)> new_task_queue;
+
+protected:
+  bool process_request(Stream &strm, const std::string &remote_addr,
+                       int remote_port, const std::string &local_addr,
+                       int local_port, bool close_connection,
+                       bool &connection_closed,
+                       const std::function<void(Request &)> &setup_request);
+
+  std::atomic<socket_t> svr_sock_{INVALID_SOCKET};
+
+  std::vector<std::string> trusted_proxies_;
+
+  size_t keep_alive_max_count_ = CPPHTTPLIB_KEEPALIVE_MAX_COUNT;
+  time_t keep_alive_timeout_sec_ = CPPHTTPLIB_KEEPALIVE_TIMEOUT_SECOND;
+  time_t read_timeout_sec_ = CPPHTTPLIB_SERVER_READ_TIMEOUT_SECOND;
+  time_t read_timeout_usec_ = CPPHTTPLIB_SERVER_READ_TIMEOUT_USECOND;
+  time_t write_timeout_sec_ = CPPHTTPLIB_SERVER_WRITE_TIMEOUT_SECOND;
+  time_t write_timeout_usec_ = CPPHTTPLIB_SERVER_WRITE_TIMEOUT_USECOND;
+  time_t idle_interval_sec_ = CPPHTTPLIB_IDLE_INTERVAL_SECOND;
+  time_t idle_interval_usec_ = CPPHTTPLIB_IDLE_INTERVAL_USECOND;
+  size_t payload_max_length_ = CPPHTTPLIB_PAYLOAD_MAX_LENGTH;
+
+private:
+  using Handlers =
+      std::vector<std::pair<std::unique_ptr<detail::MatcherBase>, Handler>>;
+  using HandlersForContentReader =
+      std::vector<std::pair<std::unique_ptr<detail::MatcherBase>,
+                            HandlerWithContentReader>>;
+
+  static std::unique_ptr<detail::MatcherBase>
+  make_matcher(const std::string &pattern);
+
+  Server &set_error_handler_core(HandlerWithResponse handler, std::true_type);
+  Server &set_error_handler_core(Handler handler, std::false_type);
+
+  socket_t create_server_socket(const std::string &host, int port,
+                                int socket_flags,
+                                SocketOptions socket_options) const;
+  int bind_internal(const std::string &host, int port, int socket_flags);
+  bool listen_internal();
+
+  bool routing(Request &req, Response &res, Stream &strm);
+  bool handle_file_request(const Request &req, Response &res);
+  bool dispatch_request(Request &req, Response &res,
+                        const Handlers &handlers) const;
+  bool dispatch_request_for_content_reader(
+      Request &req, Response &res, ContentReader content_reader,
+      const HandlersForContentReader &handlers) const;
+
+  bool parse_request_line(const char *s, Request &req) const;
+  void apply_ranges(const Request &req, Response &res,
+                    std::string &content_type, std::string &boundary) const;
+  bool write_response(Stream &strm, bool close_connection, Request &req,
+                      Response &res);
+  bool write_response_with_content(Stream &strm, bool close_connection,
+                                   const Request &req, Response &res);
+  bool write_response_core(Stream &strm, bool close_connection,
+                           const Request &req, Response &res,
+                           bool need_apply_ranges);
+  bool write_content_with_provider(Stream &strm, const Request &req,
+                                   Response &res, const std::string &boundary,
+                                   const std::string &content_type);
+  bool read_content(Stream &strm, Request &req, Response &res);
+  bool read_content_with_content_receiver(Stream &strm, Request &req,
+                                          Response &res,
+                                          ContentReceiver receiver,
+                                          FormDataHeader multipart_header,
+                                          ContentReceiver multipart_receiver);
+  bool read_content_core(Stream &strm, Request &req, Response &res,
+                         ContentReceiver receiver,
+                         FormDataHeader multipart_header,
+                         ContentReceiver multipart_receiver) const;
+
+  virtual bool process_and_close_socket(socket_t sock);
+
+  void output_log(const Request &req, const Response &res) const;
+  void output_pre_compression_log(const Request &req,
+                                  const Response &res) const;
+  void output_error_log(const Error &err, const Request *req) const;
+
+  std::atomic<bool> is_running_{false};
+  std::atomic<bool> is_decommissioned{false};
+
+  struct MountPointEntry {
+    std::string mount_point;
+    std::string base_dir;
+    Headers headers;
+  };
+  std::vector<MountPointEntry> base_dirs_;
+  std::map<std::string, std::string> file_extension_and_mimetype_map_;
+  std::string default_file_mimetype_ = "application/octet-stream";
+  Handler file_request_handler_;
+
+  Handlers get_handlers_;
+  Handlers post_handlers_;
+  HandlersForContentReader post_handlers_for_content_reader_;
+  Handlers put_handlers_;
+  HandlersForContentReader put_handlers_for_content_reader_;
+  Handlers patch_handlers_;
+  HandlersForContentReader patch_handlers_for_content_reader_;
+  Handlers delete_handlers_;
+  HandlersForContentReader delete_handlers_for_content_reader_;
+  Handlers options_handlers_;
+
+  HandlerWithResponse error_handler_;
+  ExceptionHandler exception_handler_;
+  HandlerWithResponse pre_routing_handler_;
+  Handler post_routing_handler_;
+  HandlerWithResponse pre_request_handler_;
+  Expect100ContinueHandler expect_100_continue_handler_;
+
+  mutable std::mutex logger_mutex_;
+  Logger logger_;
+  Logger pre_compression_logger_;
+  ErrorLogger error_logger_;
+
+  int address_family_ = AF_UNSPEC;
+  bool tcp_nodelay_ = CPPHTTPLIB_TCP_NODELAY;
+  bool ipv6_v6only_ = CPPHTTPLIB_IPV6_V6ONLY;
+  SocketOptions socket_options_ = default_socket_options;
+
+  Headers default_headers_;
+  std::function<ssize_t(Stream &, Headers &)> header_writer_ =
+      detail::write_headers;
+};
+
+enum class Error {
+  Success = 0,
+  Unknown,
+  Connection,
+  BindIPAddress,
+  Read,
+  Write,
+  ExceedRedirectCount,
+  Canceled,
+  SSLConnection,
+  SSLLoadingCerts,
+  SSLServerVerification,
+  SSLServerHostnameVerification,
+  UnsupportedMultipartBoundaryChars,
+  Compression,
+  ConnectionTimeout,
+  ProxyConnection,
+  ResourceExhaustion,
+  TooManyFormDataFiles,
+  ExceedMaxPayloadSize,
+  ExceedUriMaxLength,
+  ExceedMaxSocketDescriptorCount,
+  InvalidRequestLine,
+  InvalidHTTPMethod,
+  InvalidHTTPVersion,
+  InvalidHeaders,
+  MultipartParsing,
+  OpenFile,
+  Listen,
+  GetSockName,
+  UnsupportedAddressFamily,
+  HTTPParsing,
+  InvalidRangeHeader,
+
+  // For internal use only
+  SSLPeerCouldBeClosed_,
+};
+
+std::string to_string(Error error);
+
+std::ostream &operator<<(std::ostream &os, const Error &obj);
+
+class Result {
+public:
+  Result() = default;
+  Result(std::unique_ptr<Response> &&res, Error err,
+         Headers &&request_headers = Headers{})
+      : res_(std::move(res)), err_(err),
+        request_headers_(std::move(request_headers)) {}
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  Result(std::unique_ptr<Response> &&res, Error err, Headers &&request_headers,
+         int ssl_error)
+      : res_(std::move(res)), err_(err),
+        request_headers_(std::move(request_headers)), ssl_error_(ssl_error) {}
+  Result(std::unique_ptr<Response> &&res, Error err, Headers &&request_headers,
+         int ssl_error, unsigned long ssl_openssl_error)
+      : res_(std::move(res)), err_(err),
+        request_headers_(std::move(request_headers)), ssl_error_(ssl_error),
+        ssl_openssl_error_(ssl_openssl_error) {}
+#endif
+  // Response
+  operator bool() const { return res_ != nullptr; }
+  bool operator==(std::nullptr_t) const { return res_ == nullptr; }
+  bool operator!=(std::nullptr_t) const { return res_ != nullptr; }
+  const Response &value() const { return *res_; }
+  Response &value() { return *res_; }
+  const Response &operator*() const { return *res_; }
+  Response &operator*() { return *res_; }
+  const Response *operator->() const { return res_.get(); }
+  Response *operator->() { return res_.get(); }
+
+  // Error
+  Error error() const { return err_; }
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  // SSL Error
+  int ssl_error() const { return ssl_error_; }
+  // OpenSSL Error
+  unsigned long ssl_openssl_error() const { return ssl_openssl_error_; }
+#endif
+
+  // Request Headers
+  bool has_request_header(const std::string &key) const;
+  std::string get_request_header_value(const std::string &key,
+                                       const char *def = "",
+                                       size_t id = 0) const;
+  size_t get_request_header_value_u64(const std::string &key, size_t def = 0,
+                                      size_t id = 0) const;
+  size_t get_request_header_value_count(const std::string &key) const;
+
+private:
+  std::unique_ptr<Response> res_;
+  Error err_ = Error::Unknown;
+  Headers request_headers_;
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  int ssl_error_ = 0;
+  unsigned long ssl_openssl_error_ = 0;
+#endif
+};
+
+class ClientImpl {
+public:
+  explicit ClientImpl(const std::string &host);
+
+  explicit ClientImpl(const std::string &host, int port);
+
+  explicit ClientImpl(const std::string &host, int port,
+                      const std::string &client_cert_path,
+                      const std::string &client_key_path);
+
+  virtual ~ClientImpl();
+
+  virtual bool is_valid() const;
+
+  // clang-format off
+  Result Get(const std::string &path, DownloadProgress progress = nullptr);
+  Result Get(const std::string &path, ContentReceiver content_receiver, DownloadProgress progress = nullptr);
+  Result Get(const std::string &path, ResponseHandler response_handler, ContentReceiver content_receiver, DownloadProgress progress = nullptr);
+  Result Get(const std::string &path, const Headers &headers, DownloadProgress progress = nullptr);
+  Result Get(const std::string &path, const Headers &headers, ContentReceiver content_receiver, DownloadProgress progress = nullptr);
+  Result Get(const std::string &path, const Headers &headers, ResponseHandler response_handler, ContentReceiver content_receiver, DownloadProgress progress = nullptr);
+  Result Get(const std::string &path, const Params &params, const Headers &headers, DownloadProgress progress = nullptr);
+  Result Get(const std::string &path, const Params &params, const Headers &headers, ContentReceiver content_receiver, DownloadProgress progress = nullptr);
+  Result Get(const std::string &path, const Params &params, const Headers &headers, ResponseHandler response_handler, ContentReceiver content_receiver, DownloadProgress progress = nullptr);
+
+  Result Head(const std::string &path);
+  Result Head(const std::string &path, const Headers &headers);
+
+  Result Post(const std::string &path);
+  Result Post(const std::string &path, const char *body, size_t content_length, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Post(const std::string &path, const std::string &body, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Post(const std::string &path, size_t content_length, ContentProvider content_provider, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Post(const std::string &path, ContentProviderWithoutLength content_provider, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Post(const std::string &path, const Params &params);
+  Result Post(const std::string &path, const UploadFormDataItems &items, UploadProgress progress = nullptr);
+  Result Post(const std::string &path, const Headers &headers);
+  Result Post(const std::string &path, const Headers &headers, const char *body, size_t content_length, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Post(const std::string &path, const Headers &headers, const std::string &body, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Post(const std::string &path, const Headers &headers, size_t content_length, ContentProvider content_provider, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Post(const std::string &path, const Headers &headers, ContentProviderWithoutLength content_provider, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Post(const std::string &path, const Headers &headers, const Params &params);
+  Result Post(const std::string &path, const Headers &headers, const UploadFormDataItems &items, UploadProgress progress = nullptr);
+  Result Post(const std::string &path, const Headers &headers, const UploadFormDataItems &items, const std::string &boundary, UploadProgress progress = nullptr);
+  Result Post(const std::string &path, const Headers &headers, const UploadFormDataItems &items, const FormDataProviderItems &provider_items, UploadProgress progress = nullptr);
+  Result Post(const std::string &path, const Headers &headers, const std::string &body, const std::string &content_type, ContentReceiver content_receiver, DownloadProgress progress = nullptr);
+
+  Result Put(const std::string &path);
+  Result Put(const std::string &path, const char *body, size_t content_length, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Put(const std::string &path, const std::string &body, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Put(const std::string &path, size_t content_length, ContentProvider content_provider, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Put(const std::string &path, ContentProviderWithoutLength content_provider, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Put(const std::string &path, const Params &params);
+  Result Put(const std::string &path, const UploadFormDataItems &items, UploadProgress progress = nullptr);
+  Result Put(const std::string &path, const Headers &headers);
+  Result Put(const std::string &path, const Headers &headers, const char *body, size_t content_length, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Put(const std::string &path, const Headers &headers, const std::string &body, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Put(const std::string &path, const Headers &headers, size_t content_length, ContentProvider content_provider, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Put(const std::string &path, const Headers &headers, ContentProviderWithoutLength content_provider, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Put(const std::string &path, const Headers &headers, const Params &params);
+  Result Put(const std::string &path, const Headers &headers, const UploadFormDataItems &items, UploadProgress progress = nullptr);
+  Result Put(const std::string &path, const Headers &headers, const UploadFormDataItems &items, const std::string &boundary, UploadProgress progress = nullptr);
+  Result Put(const std::string &path, const Headers &headers, const UploadFormDataItems &items, const FormDataProviderItems &provider_items, UploadProgress progress = nullptr);
+  Result Put(const std::string &path, const Headers &headers, const std::string &body, const std::string &content_type, ContentReceiver content_receiver, DownloadProgress progress = nullptr);
+
+  Result Patch(const std::string &path);
+  Result Patch(const std::string &path, const char *body, size_t content_length, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Patch(const std::string &path, const std::string &body, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Patch(const std::string &path, size_t content_length, ContentProvider content_provider, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Patch(const std::string &path, ContentProviderWithoutLength content_provider, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Patch(const std::string &path, const Params &params);
+  Result Patch(const std::string &path, const UploadFormDataItems &items, UploadProgress progress = nullptr);
+  Result Patch(const std::string &path, const Headers &headers, UploadProgress progress = nullptr);
+  Result Patch(const std::string &path, const Headers &headers, const char *body, size_t content_length, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Patch(const std::string &path, const Headers &headers, const std::string &body, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Patch(const std::string &path, const Headers &headers, size_t content_length, ContentProvider content_provider, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Patch(const std::string &path, const Headers &headers, ContentProviderWithoutLength content_provider, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Patch(const std::string &path, const Headers &headers, const Params &params);
+  Result Patch(const std::string &path, const Headers &headers, const UploadFormDataItems &items, UploadProgress progress = nullptr);
+  Result Patch(const std::string &path, const Headers &headers, const UploadFormDataItems &items, const std::string &boundary, UploadProgress progress = nullptr);
+  Result Patch(const std::string &path, const Headers &headers, const UploadFormDataItems &items, const FormDataProviderItems &provider_items, UploadProgress progress = nullptr);
+  Result Patch(const std::string &path, const Headers &headers, const std::string &body, const std::string &content_type, ContentReceiver content_receiver, DownloadProgress progress = nullptr);
+
+  Result Delete(const std::string &path, DownloadProgress progress = nullptr);
+  Result Delete(const std::string &path, const char *body, size_t content_length, const std::string &content_type, DownloadProgress progress = nullptr);
+  Result Delete(const std::string &path, const std::string &body, const std::string &content_type, DownloadProgress progress = nullptr);
+  Result Delete(const std::string &path, const Params &params, DownloadProgress progress = nullptr);
+  Result Delete(const std::string &path, const Headers &headers, DownloadProgress progress = nullptr);
+  Result Delete(const std::string &path, const Headers &headers, const char *body, size_t content_length, const std::string &content_type, DownloadProgress progress = nullptr);
+  Result Delete(const std::string &path, const Headers &headers, const std::string &body, const std::string &content_type, DownloadProgress progress = nullptr);
+  Result Delete(const std::string &path, const Headers &headers, const Params &params, DownloadProgress progress = nullptr);
+
+  Result Options(const std::string &path);
+  Result Options(const std::string &path, const Headers &headers);
+  // clang-format on
+
+  bool send(Request &req, Response &res, Error &error);
+  Result send(const Request &req);
+
+  void stop();
+
+  std::string host() const;
+  int port() const;
+
+  size_t is_socket_open() const;
+  socket_t socket() const;
+
+  void set_hostname_addr_map(std::map<std::string, std::string> addr_map);
+
+  void set_default_headers(Headers headers);
+
+  void
+  set_header_writer(std::function<ssize_t(Stream &, Headers &)> const &writer);
+
+  void set_address_family(int family);
+  void set_tcp_nodelay(bool on);
+  void set_ipv6_v6only(bool on);
+  void set_socket_options(SocketOptions socket_options);
+
+  void set_connection_timeout(time_t sec, time_t usec = 0);
+  template <class Rep, class Period>
+  void
+  set_connection_timeout(const std::chrono::duration<Rep, Period> &duration);
+
+  void set_read_timeout(time_t sec, time_t usec = 0);
+  template <class Rep, class Period>
+  void set_read_timeout(const std::chrono::duration<Rep, Period> &duration);
+
+  void set_write_timeout(time_t sec, time_t usec = 0);
+  template <class Rep, class Period>
+  void set_write_timeout(const std::chrono::duration<Rep, Period> &duration);
+
+  void set_max_timeout(time_t msec);
+  template <class Rep, class Period>
+  void set_max_timeout(const std::chrono::duration<Rep, Period> &duration);
+
+  void set_basic_auth(const std::string &username, const std::string &password);
+  void set_bearer_token_auth(const std::string &token);
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  void set_digest_auth(const std::string &username,
+                       const std::string &password);
+#endif
+
+  void set_keep_alive(bool on);
+  void set_follow_location(bool on);
+
+  void set_path_encode(bool on);
+
+  void set_compress(bool on);
+
+  void set_decompress(bool on);
+
+  void set_interface(const std::string &intf);
+
+  void set_proxy(const std::string &host, int port);
+  void set_proxy_basic_auth(const std::string &username,
+                            const std::string &password);
+  void set_proxy_bearer_token_auth(const std::string &token);
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  void set_proxy_digest_auth(const std::string &username,
+                             const std::string &password);
+#endif
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  void set_ca_cert_path(const std::string &ca_cert_file_path,
+                        const std::string &ca_cert_dir_path = std::string());
+  void set_ca_cert_store(X509_STORE *ca_cert_store);
+  X509_STORE *create_ca_cert_store(const char *ca_cert, std::size_t size) const;
+#endif
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  void enable_server_certificate_verification(bool enabled);
+  void enable_server_hostname_verification(bool enabled);
+  void set_server_certificate_verifier(
+      std::function<SSLVerifierResponse(SSL *ssl)> verifier);
+#endif
+
+  void set_logger(Logger logger);
+  void set_error_logger(ErrorLogger error_logger);
+
+protected:
+  struct Socket {
+    socket_t sock = INVALID_SOCKET;
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+    SSL *ssl = nullptr;
+#endif
+
+    bool is_open() const { return sock != INVALID_SOCKET; }
+  };
+
+  virtual bool create_and_connect_socket(Socket &socket, Error &error);
+
+  // All of:
+  //   shutdown_ssl
+  //   shutdown_socket
+  //   close_socket
+  // should ONLY be called when socket_mutex_ is locked.
+  // Also, shutdown_ssl and close_socket should also NOT be called concurrently
+  // with a DIFFERENT thread sending requests using that socket.
+  virtual void shutdown_ssl(Socket &socket, bool shutdown_gracefully);
+  void shutdown_socket(Socket &socket) const;
+  void close_socket(Socket &socket);
+
+  bool process_request(Stream &strm, Request &req, Response &res,
+                       bool close_connection, Error &error);
+
+  bool write_content_with_provider(Stream &strm, const Request &req,
+                                   Error &error) const;
+
+  void copy_settings(const ClientImpl &rhs);
+
+  void output_log(const Request &req, const Response &res) const;
+  void output_error_log(const Error &err, const Request *req) const;
+
+  // Socket endpoint information
+  const std::string host_;
+  const int port_;
+  const std::string host_and_port_;
+
+  // Current open socket
+  Socket socket_;
+  mutable std::mutex socket_mutex_;
+  std::recursive_mutex request_mutex_;
+
+  // These are all protected under socket_mutex
+  size_t socket_requests_in_flight_ = 0;
+  std::thread::id socket_requests_are_from_thread_ = std::thread::id();
+  bool socket_should_be_closed_when_request_is_done_ = false;
+
+  // Hostname-IP map
+  std::map<std::string, std::string> addr_map_;
+
+  // Default headers
+  Headers default_headers_;
+
+  // Header writer
+  std::function<ssize_t(Stream &, Headers &)> header_writer_ =
+      detail::write_headers;
+
+  // Settings
+  std::string client_cert_path_;
+  std::string client_key_path_;
+
+  time_t connection_timeout_sec_ = CPPHTTPLIB_CONNECTION_TIMEOUT_SECOND;
+  time_t connection_timeout_usec_ = CPPHTTPLIB_CONNECTION_TIMEOUT_USECOND;
+  time_t read_timeout_sec_ = CPPHTTPLIB_CLIENT_READ_TIMEOUT_SECOND;
+  time_t read_timeout_usec_ = CPPHTTPLIB_CLIENT_READ_TIMEOUT_USECOND;
+  time_t write_timeout_sec_ = CPPHTTPLIB_CLIENT_WRITE_TIMEOUT_SECOND;
+  time_t write_timeout_usec_ = CPPHTTPLIB_CLIENT_WRITE_TIMEOUT_USECOND;
+  time_t max_timeout_msec_ = CPPHTTPLIB_CLIENT_MAX_TIMEOUT_MSECOND;
+
+  std::string basic_auth_username_;
+  std::string basic_auth_password_;
+  std::string bearer_token_auth_token_;
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  std::string digest_auth_username_;
+  std::string digest_auth_password_;
+#endif
+
+  bool keep_alive_ = false;
+  bool follow_location_ = false;
+
+  bool path_encode_ = true;
+
+  int address_family_ = AF_UNSPEC;
+  bool tcp_nodelay_ = CPPHTTPLIB_TCP_NODELAY;
+  bool ipv6_v6only_ = CPPHTTPLIB_IPV6_V6ONLY;
+  SocketOptions socket_options_ = nullptr;
+
+  bool compress_ = false;
+  bool decompress_ = true;
+
+  std::string interface_;
+
+  std::string proxy_host_;
+  int proxy_port_ = -1;
+
+  std::string proxy_basic_auth_username_;
+  std::string proxy_basic_auth_password_;
+  std::string proxy_bearer_token_auth_token_;
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  std::string proxy_digest_auth_username_;
+  std::string proxy_digest_auth_password_;
+#endif
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  std::string ca_cert_file_path_;
+  std::string ca_cert_dir_path_;
+
+  X509_STORE *ca_cert_store_ = nullptr;
+#endif
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  bool server_certificate_verification_ = true;
+  bool server_hostname_verification_ = true;
+  std::function<SSLVerifierResponse(SSL *ssl)> server_certificate_verifier_;
+#endif
+
+  mutable std::mutex logger_mutex_;
+  Logger logger_;
+  ErrorLogger error_logger_;
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  int last_ssl_error_ = 0;
+  unsigned long last_openssl_error_ = 0;
+#endif
+
+private:
+  bool send_(Request &req, Response &res, Error &error);
+  Result send_(Request &&req);
+
+  socket_t create_client_socket(Error &error) const;
+  bool read_response_line(Stream &strm, const Request &req,
+                          Response &res) const;
+  bool write_request(Stream &strm, Request &req, bool close_connection,
+                     Error &error);
+  bool redirect(Request &req, Response &res, Error &error);
+  bool create_redirect_client(const std::string &scheme,
+                              const std::string &host, int port, Request &req,
+                              Response &res, const std::string &path,
+                              const std::string &location, Error &error);
+  template <typename ClientType> void setup_redirect_client(ClientType &client);
+  bool handle_request(Stream &strm, Request &req, Response &res,
+                      bool close_connection, Error &error);
+  std::unique_ptr<Response> send_with_content_provider(
+      Request &req, const char *body, size_t content_length,
+      ContentProvider content_provider,
+      ContentProviderWithoutLength content_provider_without_length,
+      const std::string &content_type, Error &error);
+  Result send_with_content_provider(
+      const std::string &method, const std::string &path,
+      const Headers &headers, const char *body, size_t content_length,
+      ContentProvider content_provider,
+      ContentProviderWithoutLength content_provider_without_length,
+      const std::string &content_type, UploadProgress progress);
+  ContentProviderWithoutLength get_multipart_content_provider(
+      const std::string &boundary, const UploadFormDataItems &items,
+      const FormDataProviderItems &provider_items) const;
+
+  virtual bool
+  process_socket(const Socket &socket,
+                 std::chrono::time_point<std::chrono::steady_clock> start_time,
+                 std::function<bool(Stream &strm)> callback);
+  virtual bool is_ssl() const;
+};
+
+class Client {
+public:
+  // Universal interface
+  explicit Client(const std::string &scheme_host_port);
+
+  explicit Client(const std::string &scheme_host_port,
+                  const std::string &client_cert_path,
+                  const std::string &client_key_path);
+
+  // HTTP only interface
+  explicit Client(const std::string &host, int port);
+
+  explicit Client(const std::string &host, int port,
+                  const std::string &client_cert_path,
+                  const std::string &client_key_path);
+
+  Client(Client &&) = default;
+  Client &operator=(Client &&) = default;
+
+  ~Client();
+
+  bool is_valid() const;
+
+  // clang-format off
+  Result Get(const std::string &path, DownloadProgress progress = nullptr);
+  Result Get(const std::string &path, ContentReceiver content_receiver, DownloadProgress progress = nullptr);
+  Result Get(const std::string &path, ResponseHandler response_handler, ContentReceiver content_receiver, DownloadProgress progress = nullptr);
+  Result Get(const std::string &path, const Headers &headers, DownloadProgress progress = nullptr);
+  Result Get(const std::string &path, const Headers &headers, ContentReceiver content_receiver, DownloadProgress progress = nullptr);
+  Result Get(const std::string &path, const Headers &headers, ResponseHandler response_handler, ContentReceiver content_receiver, DownloadProgress progress = nullptr);
+  Result Get(const std::string &path, const Params &params, const Headers &headers, DownloadProgress progress = nullptr);
+  Result Get(const std::string &path, const Params &params, const Headers &headers, ContentReceiver content_receiver, DownloadProgress progress = nullptr);
+  Result Get(const std::string &path, const Params &params, const Headers &headers, ResponseHandler response_handler, ContentReceiver content_receiver, DownloadProgress progress = nullptr);
+
+  Result Head(const std::string &path);
+  Result Head(const std::string &path, const Headers &headers);
+
+  Result Post(const std::string &path);
+  Result Post(const std::string &path, const char *body, size_t content_length, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Post(const std::string &path, const std::string &body, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Post(const std::string &path, size_t content_length, ContentProvider content_provider, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Post(const std::string &path, ContentProviderWithoutLength content_provider, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Post(const std::string &path, const Params &params);
+  Result Post(const std::string &path, const UploadFormDataItems &items, UploadProgress progress = nullptr);
+  Result Post(const std::string &path, const Headers &headers);
+  Result Post(const std::string &path, const Headers &headers, const char *body, size_t content_length, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Post(const std::string &path, const Headers &headers, const std::string &body, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Post(const std::string &path, const Headers &headers, size_t content_length, ContentProvider content_provider, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Post(const std::string &path, const Headers &headers, ContentProviderWithoutLength content_provider, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Post(const std::string &path, const Headers &headers, const Params &params);
+  Result Post(const std::string &path, const Headers &headers, const UploadFormDataItems &items, UploadProgress progress = nullptr);
+  Result Post(const std::string &path, const Headers &headers, const UploadFormDataItems &items, const std::string &boundary, UploadProgress progress = nullptr);
+  Result Post(const std::string &path, const Headers &headers, const UploadFormDataItems &items, const FormDataProviderItems &provider_items, UploadProgress progress = nullptr);
+  Result Post(const std::string &path, const Headers &headers, const std::string &body, const std::string &content_type, ContentReceiver content_receiver, DownloadProgress progress = nullptr);
+
+  Result Put(const std::string &path);
+  Result Put(const std::string &path, const char *body, size_t content_length, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Put(const std::string &path, const std::string &body, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Put(const std::string &path, size_t content_length, ContentProvider content_provider, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Put(const std::string &path, ContentProviderWithoutLength content_provider, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Put(const std::string &path, const Params &params);
+  Result Put(const std::string &path, const UploadFormDataItems &items, UploadProgress progress = nullptr);
+  Result Put(const std::string &path, const Headers &headers);
+  Result Put(const std::string &path, const Headers &headers, const char *body, size_t content_length, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Put(const std::string &path, const Headers &headers, const std::string &body, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Put(const std::string &path, const Headers &headers, size_t content_length, ContentProvider content_provider, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Put(const std::string &path, const Headers &headers, ContentProviderWithoutLength content_provider, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Put(const std::string &path, const Headers &headers, const Params &params);
+  Result Put(const std::string &path, const Headers &headers, const UploadFormDataItems &items, UploadProgress progress = nullptr);
+  Result Put(const std::string &path, const Headers &headers, const UploadFormDataItems &items, const std::string &boundary, UploadProgress progress = nullptr);
+  Result Put(const std::string &path, const Headers &headers, const UploadFormDataItems &items, const FormDataProviderItems &provider_items, UploadProgress progress = nullptr);
+  Result Put(const std::string &path, const Headers &headers, const std::string &body, const std::string &content_type, ContentReceiver content_receiver, DownloadProgress progress = nullptr);
+
+  Result Patch(const std::string &path);
+  Result Patch(const std::string &path, const char *body, size_t content_length, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Patch(const std::string &path, const std::string &body, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Patch(const std::string &path, size_t content_length, ContentProvider content_provider, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Patch(const std::string &path, ContentProviderWithoutLength content_provider, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Patch(const std::string &path, const Params &params);
+  Result Patch(const std::string &path, const UploadFormDataItems &items, UploadProgress progress = nullptr);
+  Result Patch(const std::string &path, const Headers &headers);
+  Result Patch(const std::string &path, const Headers &headers, const char *body, size_t content_length, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Patch(const std::string &path, const Headers &headers, const std::string &body, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Patch(const std::string &path, const Headers &headers, size_t content_length, ContentProvider content_provider, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Patch(const std::string &path, const Headers &headers, ContentProviderWithoutLength content_provider, const std::string &content_type, UploadProgress progress = nullptr);
+  Result Patch(const std::string &path, const Headers &headers, const Params &params);
+  Result Patch(const std::string &path, const Headers &headers, const UploadFormDataItems &items, UploadProgress progress = nullptr);
+  Result Patch(const std::string &path, const Headers &headers, const UploadFormDataItems &items, const std::string &boundary, UploadProgress progress = nullptr);
+  Result Patch(const std::string &path, const Headers &headers, const UploadFormDataItems &items, const FormDataProviderItems &provider_items, UploadProgress progress = nullptr);
+  Result Patch(const std::string &path, const Headers &headers, const std::string &body, const std::string &content_type, ContentReceiver content_receiver, DownloadProgress progress = nullptr);
+
+  Result Delete(const std::string &path, DownloadProgress progress = nullptr);
+  Result Delete(const std::string &path, const char *body, size_t content_length, const std::string &content_type, DownloadProgress progress = nullptr);
+  Result Delete(const std::string &path, const std::string &body, const std::string &content_type, DownloadProgress progress = nullptr);
+  Result Delete(const std::string &path, const Params &params, DownloadProgress progress = nullptr);
+  Result Delete(const std::string &path, const Headers &headers, DownloadProgress progress = nullptr);
+  Result Delete(const std::string &path, const Headers &headers, const char *body, size_t content_length, const std::string &content_type, DownloadProgress progress = nullptr);
+  Result Delete(const std::string &path, const Headers &headers, const std::string &body, const std::string &content_type, DownloadProgress progress = nullptr);
+  Result Delete(const std::string &path, const Headers &headers, const Params &params, DownloadProgress progress = nullptr);
+
+  Result Options(const std::string &path);
+  Result Options(const std::string &path, const Headers &headers);
+  // clang-format on
+
+  bool send(Request &req, Response &res, Error &error);
+  Result send(const Request &req);
+
+  void stop();
+
+  std::string host() const;
+  int port() const;
+
+  size_t is_socket_open() const;
+  socket_t socket() const;
+
+  void set_hostname_addr_map(std::map<std::string, std::string> addr_map);
+
+  void set_default_headers(Headers headers);
+
+  void
+  set_header_writer(std::function<ssize_t(Stream &, Headers &)> const &writer);
+
+  void set_address_family(int family);
+  void set_tcp_nodelay(bool on);
+  void set_socket_options(SocketOptions socket_options);
+
+  void set_connection_timeout(time_t sec, time_t usec = 0);
+  template <class Rep, class Period>
+  void
+  set_connection_timeout(const std::chrono::duration<Rep, Period> &duration);
+
+  void set_read_timeout(time_t sec, time_t usec = 0);
+  template <class Rep, class Period>
+  void set_read_timeout(const std::chrono::duration<Rep, Period> &duration);
+
+  void set_write_timeout(time_t sec, time_t usec = 0);
+  template <class Rep, class Period>
+  void set_write_timeout(const std::chrono::duration<Rep, Period> &duration);
+
+  void set_max_timeout(time_t msec);
+  template <class Rep, class Period>
+  void set_max_timeout(const std::chrono::duration<Rep, Period> &duration);
+
+  void set_basic_auth(const std::string &username, const std::string &password);
+  void set_bearer_token_auth(const std::string &token);
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  void set_digest_auth(const std::string &username,
+                       const std::string &password);
+#endif
+
+  void set_keep_alive(bool on);
+  void set_follow_location(bool on);
+
+  void set_path_encode(bool on);
+  void set_url_encode(bool on);
+
+  void set_compress(bool on);
+
+  void set_decompress(bool on);
+
+  void set_interface(const std::string &intf);
+
+  void set_proxy(const std::string &host, int port);
+  void set_proxy_basic_auth(const std::string &username,
+                            const std::string &password);
+  void set_proxy_bearer_token_auth(const std::string &token);
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  void set_proxy_digest_auth(const std::string &username,
+                             const std::string &password);
+#endif
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  void enable_server_certificate_verification(bool enabled);
+  void enable_server_hostname_verification(bool enabled);
+  void set_server_certificate_verifier(
+      std::function<SSLVerifierResponse(SSL *ssl)> verifier);
+#endif
+
+  void set_logger(Logger logger);
+  void set_error_logger(ErrorLogger error_logger);
+
+  // SSL
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  void set_ca_cert_path(const std::string &ca_cert_file_path,
+                        const std::string &ca_cert_dir_path = std::string());
+
+  void set_ca_cert_store(X509_STORE *ca_cert_store);
+  void load_ca_cert_store(const char *ca_cert, std::size_t size);
+
+  long get_openssl_verify_result() const;
+
+  SSL_CTX *ssl_context() const;
+#endif
+
+private:
+  std::unique_ptr<ClientImpl> cli_;
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  bool is_ssl_ = false;
+#endif
+};
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+class SSLServer : public Server {
+public:
+  SSLServer(const char *cert_path, const char *private_key_path,
+            const char *client_ca_cert_file_path = nullptr,
+            const char *client_ca_cert_dir_path = nullptr,
+            const char *private_key_password = nullptr);
+
+  SSLServer(X509 *cert, EVP_PKEY *private_key,
+            X509_STORE *client_ca_cert_store = nullptr);
+
+  SSLServer(
+      const std::function<bool(SSL_CTX &ssl_ctx)> &setup_ssl_ctx_callback);
+
+  ~SSLServer() override;
+
+  bool is_valid() const override;
+
+  SSL_CTX *ssl_context() const;
+
+  void update_certs(X509 *cert, EVP_PKEY *private_key,
+                    X509_STORE *client_ca_cert_store = nullptr);
+
+  int ssl_last_error() const { return last_ssl_error_; }
+
+private:
+  bool process_and_close_socket(socket_t sock) override;
+
+  STACK_OF(X509_NAME) * extract_ca_names_from_x509_store(X509_STORE *store);
+
+  SSL_CTX *ctx_;
+  std::mutex ctx_mutex_;
+
+  int last_ssl_error_ = 0;
+};
+
+class SSLClient final : public ClientImpl {
+public:
+  explicit SSLClient(const std::string &host);
+
+  explicit SSLClient(const std::string &host, int port);
+
+  explicit SSLClient(const std::string &host, int port,
+                     const std::string &client_cert_path,
+                     const std::string &client_key_path,
+                     const std::string &private_key_password = std::string());
+
+  explicit SSLClient(const std::string &host, int port, X509 *client_cert,
+                     EVP_PKEY *client_key,
+                     const std::string &private_key_password = std::string());
+
+  ~SSLClient() override;
+
+  bool is_valid() const override;
+
+  void set_ca_cert_store(X509_STORE *ca_cert_store);
+  void load_ca_cert_store(const char *ca_cert, std::size_t size);
+
+  long get_openssl_verify_result() const;
+
+  SSL_CTX *ssl_context() const;
+
+private:
+  bool create_and_connect_socket(Socket &socket, Error &error) override;
+  void shutdown_ssl(Socket &socket, bool shutdown_gracefully) override;
+  void shutdown_ssl_impl(Socket &socket, bool shutdown_gracefully);
+
+  bool
+  process_socket(const Socket &socket,
+                 std::chrono::time_point<std::chrono::steady_clock> start_time,
+                 std::function<bool(Stream &strm)> callback) override;
+  bool is_ssl() const override;
+
+  bool connect_with_proxy(
+      Socket &sock,
+      std::chrono::time_point<std::chrono::steady_clock> start_time,
+      Response &res, bool &success, Error &error);
+  bool initialize_ssl(Socket &socket, Error &error);
+
+  bool load_certs();
+
+  bool verify_host(X509 *server_cert) const;
+  bool verify_host_with_subject_alt_name(X509 *server_cert) const;
+  bool verify_host_with_common_name(X509 *server_cert) const;
+  bool check_host_name(const char *pattern, size_t pattern_len) const;
+
+  SSL_CTX *ctx_;
+  std::mutex ctx_mutex_;
+  std::once_flag initialize_cert_;
+
+  std::vector<std::string> host_components_;
+
+  long verify_result_ = 0;
+
+  friend class ClientImpl;
+};
+#endif
+
+/*
+ * Implementation of template methods.
+ */
+
+namespace detail {
+
+template <typename T, typename U>
+inline void duration_to_sec_and_usec(const T &duration, U callback) {
+  auto sec = std::chrono::duration_cast<std::chrono::seconds>(duration).count();
+  auto usec = std::chrono::duration_cast<std::chrono::microseconds>(
+                  duration - std::chrono::seconds(sec))
+                  .count();
+  callback(static_cast<time_t>(sec), static_cast<time_t>(usec));
+}
+
+template <size_t N> inline constexpr size_t str_len(const char (&)[N]) {
+  return N - 1;
+}
+
+inline bool is_numeric(const std::string &str) {
+  return !str.empty() &&
+         std::all_of(str.cbegin(), str.cend(),
+                     [](unsigned char c) { return std::isdigit(c); });
+}
+
+inline size_t get_header_value_u64(const Headers &headers,
+                                   const std::string &key, size_t def,
+                                   size_t id, bool &is_invalid_value) {
+  is_invalid_value = false;
+  auto rng = headers.equal_range(key);
+  auto it = rng.first;
+  std::advance(it, static_cast<ssize_t>(id));
+  if (it != rng.second) {
+    if (is_numeric(it->second)) {
+      return std::strtoull(it->second.data(), nullptr, 10);
+    } else {
+      is_invalid_value = true;
+    }
+  }
+  return def;
+}
+
+inline size_t get_header_value_u64(const Headers &headers,
+                                   const std::string &key, size_t def,
+                                   size_t id) {
+  auto dummy = false;
+  return get_header_value_u64(headers, key, def, id, dummy);
+}
+
+} // namespace detail
+
+inline size_t Request::get_header_value_u64(const std::string &key, size_t def,
+                                            size_t id) const {
+  return detail::get_header_value_u64(headers, key, def, id);
+}
+
+inline size_t Response::get_header_value_u64(const std::string &key, size_t def,
+                                             size_t id) const {
+  return detail::get_header_value_u64(headers, key, def, id);
+}
+
+namespace detail {
+
+inline bool set_socket_opt_impl(socket_t sock, int level, int optname,
+                                const void *optval, socklen_t optlen) {
+  return setsockopt(sock, level, optname,
+#ifdef _WIN32
+                    reinterpret_cast<const char *>(optval),
+#else
+                    optval,
+#endif
+                    optlen) == 0;
+}
+
+inline bool set_socket_opt(socket_t sock, int level, int optname, int optval) {
+  return set_socket_opt_impl(sock, level, optname, &optval, sizeof(optval));
+}
+
+inline bool set_socket_opt_time(socket_t sock, int level, int optname,
+                                time_t sec, time_t usec) {
+#ifdef _WIN32
+  auto timeout = static_cast<uint32_t>(sec * 1000 + usec / 1000);
+#else
+  timeval timeout;
+  timeout.tv_sec = static_cast<long>(sec);
+  timeout.tv_usec = static_cast<decltype(timeout.tv_usec)>(usec);
+#endif
+  return set_socket_opt_impl(sock, level, optname, &timeout, sizeof(timeout));
+}
+
+} // namespace detail
+
+inline void default_socket_options(socket_t sock) {
+  detail::set_socket_opt(sock, SOL_SOCKET,
+#ifdef SO_REUSEPORT
+                         SO_REUSEPORT,
+#else
+                         SO_REUSEADDR,
+#endif
+                         1);
+}
+
+inline const char *status_message(int status) {
+  switch (status) {
+  case StatusCode::Continue_100: return "Continue";
+  case StatusCode::SwitchingProtocol_101: return "Switching Protocol";
+  case StatusCode::Processing_102: return "Processing";
+  case StatusCode::EarlyHints_103: return "Early Hints";
+  case StatusCode::OK_200: return "OK";
+  case StatusCode::Created_201: return "Created";
+  case StatusCode::Accepted_202: return "Accepted";
+  case StatusCode::NonAuthoritativeInformation_203:
+    return "Non-Authoritative Information";
+  case StatusCode::NoContent_204: return "No Content";
+  case StatusCode::ResetContent_205: return "Reset Content";
+  case StatusCode::PartialContent_206: return "Partial Content";
+  case StatusCode::MultiStatus_207: return "Multi-Status";
+  case StatusCode::AlreadyReported_208: return "Already Reported";
+  case StatusCode::IMUsed_226: return "IM Used";
+  case StatusCode::MultipleChoices_300: return "Multiple Choices";
+  case StatusCode::MovedPermanently_301: return "Moved Permanently";
+  case StatusCode::Found_302: return "Found";
+  case StatusCode::SeeOther_303: return "See Other";
+  case StatusCode::NotModified_304: return "Not Modified";
+  case StatusCode::UseProxy_305: return "Use Proxy";
+  case StatusCode::unused_306: return "unused";
+  case StatusCode::TemporaryRedirect_307: return "Temporary Redirect";
+  case StatusCode::PermanentRedirect_308: return "Permanent Redirect";
+  case StatusCode::BadRequest_400: return "Bad Request";
+  case StatusCode::Unauthorized_401: return "Unauthorized";
+  case StatusCode::PaymentRequired_402: return "Payment Required";
+  case StatusCode::Forbidden_403: return "Forbidden";
+  case StatusCode::NotFound_404: return "Not Found";
+  case StatusCode::MethodNotAllowed_405: return "Method Not Allowed";
+  case StatusCode::NotAcceptable_406: return "Not Acceptable";
+  case StatusCode::ProxyAuthenticationRequired_407:
+    return "Proxy Authentication Required";
+  case StatusCode::RequestTimeout_408: return "Request Timeout";
+  case StatusCode::Conflict_409: return "Conflict";
+  case StatusCode::Gone_410: return "Gone";
+  case StatusCode::LengthRequired_411: return "Length Required";
+  case StatusCode::PreconditionFailed_412: return "Precondition Failed";
+  case StatusCode::PayloadTooLarge_413: return "Payload Too Large";
+  case StatusCode::UriTooLong_414: return "URI Too Long";
+  case StatusCode::UnsupportedMediaType_415: return "Unsupported Media Type";
+  case StatusCode::RangeNotSatisfiable_416: return "Range Not Satisfiable";
+  case StatusCode::ExpectationFailed_417: return "Expectation Failed";
+  case StatusCode::ImATeapot_418: return "I'm a teapot";
+  case StatusCode::MisdirectedRequest_421: return "Misdirected Request";
+  case StatusCode::UnprocessableContent_422: return "Unprocessable Content";
+  case StatusCode::Locked_423: return "Locked";
+  case StatusCode::FailedDependency_424: return "Failed Dependency";
+  case StatusCode::TooEarly_425: return "Too Early";
+  case StatusCode::UpgradeRequired_426: return "Upgrade Required";
+  case StatusCode::PreconditionRequired_428: return "Precondition Required";
+  case StatusCode::TooManyRequests_429: return "Too Many Requests";
+  case StatusCode::RequestHeaderFieldsTooLarge_431:
+    return "Request Header Fields Too Large";
+  case StatusCode::UnavailableForLegalReasons_451:
+    return "Unavailable For Legal Reasons";
+  case StatusCode::NotImplemented_501: return "Not Implemented";
+  case StatusCode::BadGateway_502: return "Bad Gateway";
+  case StatusCode::ServiceUnavailable_503: return "Service Unavailable";
+  case StatusCode::GatewayTimeout_504: return "Gateway Timeout";
+  case StatusCode::HttpVersionNotSupported_505:
+    return "HTTP Version Not Supported";
+  case StatusCode::VariantAlsoNegotiates_506: return "Variant Also Negotiates";
+  case StatusCode::InsufficientStorage_507: return "Insufficient Storage";
+  case StatusCode::LoopDetected_508: return "Loop Detected";
+  case StatusCode::NotExtended_510: return "Not Extended";
+  case StatusCode::NetworkAuthenticationRequired_511:
+    return "Network Authentication Required";
+
+  default:
+  case StatusCode::InternalServerError_500: return "Internal Server Error";
+  }
+}
+
+inline std::string get_bearer_token_auth(const Request &req) {
+  if (req.has_header("Authorization")) {
+    constexpr auto bearer_header_prefix_len = detail::str_len("Bearer ");
+    return req.get_header_value("Authorization")
+        .substr(bearer_header_prefix_len);
+  }
+  return "";
+}
+
+template <class Rep, class Period>
+inline Server &
+Server::set_read_timeout(const std::chrono::duration<Rep, Period> &duration) {
+  detail::duration_to_sec_and_usec(
+      duration, [&](time_t sec, time_t usec) { set_read_timeout(sec, usec); });
+  return *this;
+}
+
+template <class Rep, class Period>
+inline Server &
+Server::set_write_timeout(const std::chrono::duration<Rep, Period> &duration) {
+  detail::duration_to_sec_and_usec(
+      duration, [&](time_t sec, time_t usec) { set_write_timeout(sec, usec); });
+  return *this;
+}
+
+template <class Rep, class Period>
+inline Server &
+Server::set_idle_interval(const std::chrono::duration<Rep, Period> &duration) {
+  detail::duration_to_sec_and_usec(
+      duration, [&](time_t sec, time_t usec) { set_idle_interval(sec, usec); });
+  return *this;
+}
+
+inline std::string to_string(const Error error) {
+  switch (error) {
+  case Error::Success: return "Success (no error)";
+  case Error::Unknown: return "Unknown";
+  case Error::Connection: return "Could not establish connection";
+  case Error::BindIPAddress: return "Failed to bind IP address";
+  case Error::Read: return "Failed to read connection";
+  case Error::Write: return "Failed to write connection";
+  case Error::ExceedRedirectCount: return "Maximum redirect count exceeded";
+  case Error::Canceled: return "Connection handling canceled";
+  case Error::SSLConnection: return "SSL connection failed";
+  case Error::SSLLoadingCerts: return "SSL certificate loading failed";
+  case Error::SSLServerVerification: return "SSL server verification failed";
+  case Error::SSLServerHostnameVerification:
+    return "SSL server hostname verification failed";
+  case Error::UnsupportedMultipartBoundaryChars:
+    return "Unsupported HTTP multipart boundary characters";
+  case Error::Compression: return "Compression failed";
+  case Error::ConnectionTimeout: return "Connection timed out";
+  case Error::ProxyConnection: return "Proxy connection failed";
+  case Error::ResourceExhaustion: return "Resource exhaustion";
+  case Error::TooManyFormDataFiles: return "Too many form data files";
+  case Error::ExceedMaxPayloadSize: return "Exceeded maximum payload size";
+  case Error::ExceedUriMaxLength: return "Exceeded maximum URI length";
+  case Error::ExceedMaxSocketDescriptorCount:
+    return "Exceeded maximum socket descriptor count";
+  case Error::InvalidRequestLine: return "Invalid request line";
+  case Error::InvalidHTTPMethod: return "Invalid HTTP method";
+  case Error::InvalidHTTPVersion: return "Invalid HTTP version";
+  case Error::InvalidHeaders: return "Invalid headers";
+  case Error::MultipartParsing: return "Multipart parsing failed";
+  case Error::OpenFile: return "Failed to open file";
+  case Error::Listen: return "Failed to listen on socket";
+  case Error::GetSockName: return "Failed to get socket name";
+  case Error::UnsupportedAddressFamily: return "Unsupported address family";
+  case Error::HTTPParsing: return "HTTP parsing failed";
+  case Error::InvalidRangeHeader: return "Invalid Range header";
+  default: break;
+  }
+
+  return "Invalid";
+}
+
+inline std::ostream &operator<<(std::ostream &os, const Error &obj) {
+  os << to_string(obj);
+  os << " (" << static_cast<std::underlying_type<Error>::type>(obj) << ')';
+  return os;
+}
+
+inline size_t Result::get_request_header_value_u64(const std::string &key,
+                                                   size_t def,
+                                                   size_t id) const {
+  return detail::get_header_value_u64(request_headers_, key, def, id);
+}
+
+template <class Rep, class Period>
+inline void ClientImpl::set_connection_timeout(
+    const std::chrono::duration<Rep, Period> &duration) {
+  detail::duration_to_sec_and_usec(duration, [&](time_t sec, time_t usec) {
+    set_connection_timeout(sec, usec);
+  });
+}
+
+template <class Rep, class Period>
+inline void ClientImpl::set_read_timeout(
+    const std::chrono::duration<Rep, Period> &duration) {
+  detail::duration_to_sec_and_usec(
+      duration, [&](time_t sec, time_t usec) { set_read_timeout(sec, usec); });
+}
+
+template <class Rep, class Period>
+inline void ClientImpl::set_write_timeout(
+    const std::chrono::duration<Rep, Period> &duration) {
+  detail::duration_to_sec_and_usec(
+      duration, [&](time_t sec, time_t usec) { set_write_timeout(sec, usec); });
+}
+
+template <class Rep, class Period>
+inline void ClientImpl::set_max_timeout(
+    const std::chrono::duration<Rep, Period> &duration) {
+  auto msec =
+      std::chrono::duration_cast<std::chrono::milliseconds>(duration).count();
+  set_max_timeout(msec);
+}
+
+template <class Rep, class Period>
+inline void Client::set_connection_timeout(
+    const std::chrono::duration<Rep, Period> &duration) {
+  cli_->set_connection_timeout(duration);
+}
+
+template <class Rep, class Period>
+inline void
+Client::set_read_timeout(const std::chrono::duration<Rep, Period> &duration) {
+  cli_->set_read_timeout(duration);
+}
+
+template <class Rep, class Period>
+inline void
+Client::set_write_timeout(const std::chrono::duration<Rep, Period> &duration) {
+  cli_->set_write_timeout(duration);
+}
+
+inline void Client::set_max_timeout(time_t msec) {
+  cli_->set_max_timeout(msec);
+}
+
+template <class Rep, class Period>
+inline void
+Client::set_max_timeout(const std::chrono::duration<Rep, Period> &duration) {
+  cli_->set_max_timeout(duration);
+}
+
+/*
+ * Forward declarations and types that will be part of the .h file if split into
+ * .h + .cc.
+ */
+
+std::string hosted_at(const std::string &hostname);
+
+void hosted_at(const std::string &hostname, std::vector<std::string> &addrs);
+
+// JavaScript-style URL encoding/decoding functions
+std::string encode_uri_component(const std::string &value);
+std::string encode_uri(const std::string &value);
+std::string decode_uri_component(const std::string &value);
+std::string decode_uri(const std::string &value);
+
+// RFC 3986 compliant URL component encoding/decoding functions
+std::string encode_path_component(const std::string &component);
+std::string decode_path_component(const std::string &component);
+std::string encode_query_component(const std::string &component,
+                                   bool space_as_plus = true);
+std::string decode_query_component(const std::string &component,
+                                   bool plus_as_space = true);
+
+std::string append_query_params(const std::string &path, const Params &params);
+
+std::pair<std::string, std::string> make_range_header(const Ranges &ranges);
+
+std::pair<std::string, std::string>
+make_basic_authentication_header(const std::string &username,
+                                 const std::string &password,
+                                 bool is_proxy = false);
+
+namespace detail {
+
+#if defined(_WIN32)
+inline std::wstring u8string_to_wstring(const char *s) {
+  std::wstring ws;
+  auto len = static_cast<int>(strlen(s));
+  auto wlen = ::MultiByteToWideChar(CP_UTF8, 0, s, len, nullptr, 0);
+  if (wlen > 0) {
+    ws.resize(wlen);
+    wlen = ::MultiByteToWideChar(
+        CP_UTF8, 0, s, len,
+        const_cast<LPWSTR>(reinterpret_cast<LPCWSTR>(ws.data())), wlen);
+    if (wlen != static_cast<int>(ws.size())) { ws.clear(); }
+  }
+  return ws;
+}
+#endif
+
+struct FileStat {
+  FileStat(const std::string &path);
+  bool is_file() const;
+  bool is_dir() const;
+
+private:
+#if defined(_WIN32)
+  struct _stat st_;
+#else
+  struct stat st_;
+#endif
+  int ret_ = -1;
+};
+
+std::string trim_copy(const std::string &s);
+
+void divide(
+    const char *data, std::size_t size, char d,
+    std::function<void(const char *, std::size_t, const char *, std::size_t)>
+        fn);
+
+void divide(
+    const std::string &str, char d,
+    std::function<void(const char *, std::size_t, const char *, std::size_t)>
+        fn);
+
+void split(const char *b, const char *e, char d,
+           std::function<void(const char *, const char *)> fn);
+
+void split(const char *b, const char *e, char d, size_t m,
+           std::function<void(const char *, const char *)> fn);
+
+bool process_client_socket(
+    socket_t sock, time_t read_timeout_sec, time_t read_timeout_usec,
+    time_t write_timeout_sec, time_t write_timeout_usec,
+    time_t max_timeout_msec,
+    std::chrono::time_point<std::chrono::steady_clock> start_time,
+    std::function<bool(Stream &)> callback);
+
+socket_t create_client_socket(const std::string &host, const std::string &ip,
+                              int port, int address_family, bool tcp_nodelay,
+                              bool ipv6_v6only, SocketOptions socket_options,
+                              time_t connection_timeout_sec,
+                              time_t connection_timeout_usec,
+                              time_t read_timeout_sec, time_t read_timeout_usec,
+                              time_t write_timeout_sec,
+                              time_t write_timeout_usec,
+                              const std::string &intf, Error &error);
+
+const char *get_header_value(const Headers &headers, const std::string &key,
+                             const char *def, size_t id);
+
+std::string params_to_query_str(const Params &params);
+
+void parse_query_text(const char *data, std::size_t size, Params &params);
+
+void parse_query_text(const std::string &s, Params &params);
+
+bool parse_multipart_boundary(const std::string &content_type,
+                              std::string &boundary);
+
+bool parse_range_header(const std::string &s, Ranges &ranges);
+
+bool parse_accept_header(const std::string &s,
+                         std::vector<std::string> &content_types);
+
+int close_socket(socket_t sock);
+
+ssize_t send_socket(socket_t sock, const void *ptr, size_t size, int flags);
+
+ssize_t read_socket(socket_t sock, void *ptr, size_t size, int flags);
+
+enum class EncodingType { None = 0, Gzip, Brotli, Zstd };
+
+EncodingType encoding_type(const Request &req, const Response &res);
+
+class BufferStream final : public Stream {
+public:
+  BufferStream() = default;
+  ~BufferStream() override = default;
+
+  bool is_readable() const override;
+  bool wait_readable() const override;
+  bool wait_writable() const override;
+  ssize_t read(char *ptr, size_t size) override;
+  ssize_t write(const char *ptr, size_t size) override;
+  void get_remote_ip_and_port(std::string &ip, int &port) const override;
+  void get_local_ip_and_port(std::string &ip, int &port) const override;
+  socket_t socket() const override;
+  time_t duration() const override;
+
+  const std::string &get_buffer() const;
+
+private:
+  std::string buffer;
+  size_t position = 0;
+};
+
+class compressor {
+public:
+  virtual ~compressor() = default;
+
+  typedef std::function<bool(const char *data, size_t data_len)> Callback;
+  virtual bool compress(const char *data, size_t data_length, bool last,
+                        Callback callback) = 0;
+};
+
+class decompressor {
+public:
+  virtual ~decompressor() = default;
+
+  virtual bool is_valid() const = 0;
+
+  typedef std::function<bool(const char *data, size_t data_len)> Callback;
+  virtual bool decompress(const char *data, size_t data_length,
+                          Callback callback) = 0;
+};
+
+class nocompressor final : public compressor {
+public:
+  ~nocompressor() override = default;
+
+  bool compress(const char *data, size_t data_length, bool /*last*/,
+                Callback callback) override;
+};
+
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+class gzip_compressor final : public compressor {
+public:
+  gzip_compressor();
+  ~gzip_compressor() override;
+
+  bool compress(const char *data, size_t data_length, bool last,
+                Callback callback) override;
+
+private:
+  bool is_valid_ = false;
+  z_stream strm_;
+};
+
+class gzip_decompressor final : public decompressor {
+public:
+  gzip_decompressor();
+  ~gzip_decompressor() override;
+
+  bool is_valid() const override;
+
+  bool decompress(const char *data, size_t data_length,
+                  Callback callback) override;
+
+private:
+  bool is_valid_ = false;
+  z_stream strm_;
+};
+#endif
+
+#ifdef CPPHTTPLIB_BROTLI_SUPPORT
+class brotli_compressor final : public compressor {
+public:
+  brotli_compressor();
+  ~brotli_compressor();
+
+  bool compress(const char *data, size_t data_length, bool last,
+                Callback callback) override;
+
+private:
+  BrotliEncoderState *state_ = nullptr;
+};
+
+class brotli_decompressor final : public decompressor {
+public:
+  brotli_decompressor();
+  ~brotli_decompressor();
+
+  bool is_valid() const override;
+
+  bool decompress(const char *data, size_t data_length,
+                  Callback callback) override;
+
+private:
+  BrotliDecoderResult decoder_r;
+  BrotliDecoderState *decoder_s = nullptr;
+};
+#endif
+
+#ifdef CPPHTTPLIB_ZSTD_SUPPORT
+class zstd_compressor : public compressor {
+public:
+  zstd_compressor();
+  ~zstd_compressor();
+
+  bool compress(const char *data, size_t data_length, bool last,
+                Callback callback) override;
+
+private:
+  ZSTD_CCtx *ctx_ = nullptr;
+};
+
+class zstd_decompressor : public decompressor {
+public:
+  zstd_decompressor();
+  ~zstd_decompressor();
+
+  bool is_valid() const override;
+
+  bool decompress(const char *data, size_t data_length,
+                  Callback callback) override;
+
+private:
+  ZSTD_DCtx *ctx_ = nullptr;
+};
+#endif
+
+// NOTE: until the read size reaches `fixed_buffer_size`, use `fixed_buffer`
+// to store data. The call can set memory on stack for performance.
+class stream_line_reader {
+public:
+  stream_line_reader(Stream &strm, char *fixed_buffer,
+                     size_t fixed_buffer_size);
+  const char *ptr() const;
+  size_t size() const;
+  bool end_with_crlf() const;
+  bool getline();
+
+private:
+  void append(char c);
+
+  Stream &strm_;
+  char *fixed_buffer_;
+  const size_t fixed_buffer_size_;
+  size_t fixed_buffer_used_size_ = 0;
+  std::string growable_buffer_;
+};
+
+class mmap {
+public:
+  mmap(const char *path);
+  ~mmap();
+
+  bool open(const char *path);
+  void close();
+
+  bool is_open() const;
+  size_t size() const;
+  const char *data() const;
+
+private:
+#if defined(_WIN32)
+  HANDLE hFile_ = NULL;
+  HANDLE hMapping_ = NULL;
+#else
+  int fd_ = -1;
+#endif
+  size_t size_ = 0;
+  void *addr_ = nullptr;
+  bool is_open_empty_file = false;
+};
+
+// NOTE: https://www.rfc-editor.org/rfc/rfc9110#section-5
+namespace fields {
+
+inline bool is_token_char(char c) {
+  return std::isalnum(c) || c == '!' || c == '#' || c == '$' || c == '%' ||
+         c == '&' || c == '\'' || c == '*' || c == '+' || c == '-' ||
+         c == '.' || c == '^' || c == '_' || c == '`' || c == '|' || c == '~';
+}
+
+inline bool is_token(const std::string &s) {
+  if (s.empty()) { return false; }
+  for (auto c : s) {
+    if (!is_token_char(c)) { return false; }
+  }
+  return true;
+}
+
+inline bool is_field_name(const std::string &s) { return is_token(s); }
+
+inline bool is_vchar(char c) { return c >= 33 && c <= 126; }
+
+inline bool is_obs_text(char c) { return 128 <= static_cast<unsigned char>(c); }
+
+inline bool is_field_vchar(char c) { return is_vchar(c) || is_obs_text(c); }
+
+inline bool is_field_content(const std::string &s) {
+  if (s.empty()) { return true; }
+
+  if (s.size() == 1) {
+    return is_field_vchar(s[0]);
+  } else if (s.size() == 2) {
+    return is_field_vchar(s[0]) && is_field_vchar(s[1]);
+  } else {
+    size_t i = 0;
+
+    if (!is_field_vchar(s[i])) { return false; }
+    i++;
+
+    while (i < s.size() - 1) {
+      auto c = s[i++];
+      if (c == ' ' || c == '\t' || is_field_vchar(c)) {
+      } else {
+        return false;
+      }
+    }
+
+    return is_field_vchar(s[i]);
+  }
+}
+
+inline bool is_field_value(const std::string &s) { return is_field_content(s); }
+
+} // namespace fields
+
+} // namespace detail
+
+// ----------------------------------------------------------------------------
+
+/*
+ * Implementation that will be part of the .cc file if split into .h + .cc.
+ */
+
+namespace detail {
+
+inline bool is_hex(char c, int &v) {
+  if (0x20 <= c && isdigit(c)) {
+    v = c - '0';
+    return true;
+  } else if ('A' <= c && c <= 'F') {
+    v = c - 'A' + 10;
+    return true;
+  } else if ('a' <= c && c <= 'f') {
+    v = c - 'a' + 10;
+    return true;
+  }
+  return false;
+}
+
+inline bool from_hex_to_i(const std::string &s, size_t i, size_t cnt,
+                          int &val) {
+  if (i >= s.size()) { return false; }
+
+  val = 0;
+  for (; cnt; i++, cnt--) {
+    if (!s[i]) { return false; }
+    auto v = 0;
+    if (is_hex(s[i], v)) {
+      val = val * 16 + v;
+    } else {
+      return false;
+    }
+  }
+  return true;
+}
+
+inline std::string from_i_to_hex(size_t n) {
+  static const auto charset = "0123456789abcdef";
+  std::string ret;
+  do {
+    ret = charset[n & 15] + ret;
+    n >>= 4;
+  } while (n > 0);
+  return ret;
+}
+
+inline size_t to_utf8(int code, char *buff) {
+  if (code < 0x0080) {
+    buff[0] = static_cast<char>(code & 0x7F);
+    return 1;
+  } else if (code < 0x0800) {
+    buff[0] = static_cast<char>(0xC0 | ((code >> 6) & 0x1F));
+    buff[1] = static_cast<char>(0x80 | (code & 0x3F));
+    return 2;
+  } else if (code < 0xD800) {
+    buff[0] = static_cast<char>(0xE0 | ((code >> 12) & 0xF));
+    buff[1] = static_cast<char>(0x80 | ((code >> 6) & 0x3F));
+    buff[2] = static_cast<char>(0x80 | (code & 0x3F));
+    return 3;
+  } else if (code < 0xE000) { // D800 - DFFF is invalid...
+    return 0;
+  } else if (code < 0x10000) {
+    buff[0] = static_cast<char>(0xE0 | ((code >> 12) & 0xF));
+    buff[1] = static_cast<char>(0x80 | ((code >> 6) & 0x3F));
+    buff[2] = static_cast<char>(0x80 | (code & 0x3F));
+    return 3;
+  } else if (code < 0x110000) {
+    buff[0] = static_cast<char>(0xF0 | ((code >> 18) & 0x7));
+    buff[1] = static_cast<char>(0x80 | ((code >> 12) & 0x3F));
+    buff[2] = static_cast<char>(0x80 | ((code >> 6) & 0x3F));
+    buff[3] = static_cast<char>(0x80 | (code & 0x3F));
+    return 4;
+  }
+
+  // NOTREACHED
+  return 0;
+}
+
+// NOTE: This code came up with the following stackoverflow post:
+// https://stackoverflow.com/questions/180947/base64-decode-snippet-in-c
+inline std::string base64_encode(const std::string &in) {
+  static const auto lookup =
+      "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+  std::string out;
+  out.reserve(in.size());
+
+  auto val = 0;
+  auto valb = -6;
+
+  for (auto c : in) {
+    val = (val << 8) + static_cast<uint8_t>(c);
+    valb += 8;
+    while (valb >= 0) {
+      out.push_back(lookup[(val >> valb) & 0x3F]);
+      valb -= 6;
+    }
+  }
+
+  if (valb > -6) { out.push_back(lookup[((val << 8) >> (valb + 8)) & 0x3F]); }
+
+  while (out.size() % 4) {
+    out.push_back('=');
+  }
+
+  return out;
+}
+
+inline bool is_valid_path(const std::string &path) {
+  size_t level = 0;
+  size_t i = 0;
+
+  // Skip slash
+  while (i < path.size() && path[i] == '/') {
+    i++;
+  }
+
+  while (i < path.size()) {
+    // Read component
+    auto beg = i;
+    while (i < path.size() && path[i] != '/') {
+      if (path[i] == '\0') {
+        return false;
+      } else if (path[i] == '\\') {
+        return false;
+      }
+      i++;
+    }
+
+    auto len = i - beg;
+    assert(len > 0);
+
+    if (!path.compare(beg, len, ".")) {
+      ;
+    } else if (!path.compare(beg, len, "..")) {
+      if (level == 0) { return false; }
+      level--;
+    } else {
+      level++;
+    }
+
+    // Skip slash
+    while (i < path.size() && path[i] == '/') {
+      i++;
+    }
+  }
+
+  return true;
+}
+
+inline FileStat::FileStat(const std::string &path) {
+#if defined(_WIN32)
+  auto wpath = u8string_to_wstring(path.c_str());
+  ret_ = _wstat(wpath.c_str(), &st_);
+#else
+  ret_ = stat(path.c_str(), &st_);
+#endif
+}
+inline bool FileStat::is_file() const {
+  return ret_ >= 0 && S_ISREG(st_.st_mode);
+}
+inline bool FileStat::is_dir() const {
+  return ret_ >= 0 && S_ISDIR(st_.st_mode);
+}
+
+inline std::string encode_path(const std::string &s) {
+  std::string result;
+  result.reserve(s.size());
+
+  for (size_t i = 0; s[i]; i++) {
+    switch (s[i]) {
+    case ' ': result += "%20"; break;
+    case '+': result += "%2B"; break;
+    case '\r': result += "%0D"; break;
+    case '\n': result += "%0A"; break;
+    case '\'': result += "%27"; break;
+    case ',': result += "%2C"; break;
+    // case ':': result += "%3A"; break; // ok? probably...
+    case ';': result += "%3B"; break;
+    default:
+      auto c = static_cast<uint8_t>(s[i]);
+      if (c >= 0x80) {
+        result += '%';
+        char hex[4];
+        auto len = snprintf(hex, sizeof(hex) - 1, "%02X", c);
+        assert(len == 2);
+        result.append(hex, static_cast<size_t>(len));
+      } else {
+        result += s[i];
+      }
+      break;
+    }
+  }
+
+  return result;
+}
+
+inline std::string file_extension(const std::string &path) {
+  std::smatch m;
+  thread_local auto re = std::regex("\\.([a-zA-Z0-9]+)$");
+  if (std::regex_search(path, m, re)) { return m[1].str(); }
+  return std::string();
+}
+
+inline bool is_space_or_tab(char c) { return c == ' ' || c == '\t'; }
+
+inline std::pair<size_t, size_t> trim(const char *b, const char *e, size_t left,
+                                      size_t right) {
+  while (b + left < e && is_space_or_tab(b[left])) {
+    left++;
+  }
+  while (right > 0 && is_space_or_tab(b[right - 1])) {
+    right--;
+  }
+  return std::make_pair(left, right);
+}
+
+inline std::string trim_copy(const std::string &s) {
+  auto r = trim(s.data(), s.data() + s.size(), 0, s.size());
+  return s.substr(r.first, r.second - r.first);
+}
+
+inline std::string trim_double_quotes_copy(const std::string &s) {
+  if (s.length() >= 2 && s.front() == '"' && s.back() == '"') {
+    return s.substr(1, s.size() - 2);
+  }
+  return s;
+}
+
+inline void
+divide(const char *data, std::size_t size, char d,
+       std::function<void(const char *, std::size_t, const char *, std::size_t)>
+           fn) {
+  const auto it = std::find(data, data + size, d);
+  const auto found = static_cast<std::size_t>(it != data + size);
+  const auto lhs_data = data;
+  const auto lhs_size = static_cast<std::size_t>(it - data);
+  const auto rhs_data = it + found;
+  const auto rhs_size = size - lhs_size - found;
+
+  fn(lhs_data, lhs_size, rhs_data, rhs_size);
+}
+
+inline void
+divide(const std::string &str, char d,
+       std::function<void(const char *, std::size_t, const char *, std::size_t)>
+           fn) {
+  divide(str.data(), str.size(), d, std::move(fn));
+}
+
+inline void split(const char *b, const char *e, char d,
+                  std::function<void(const char *, const char *)> fn) {
+  return split(b, e, d, (std::numeric_limits<size_t>::max)(), std::move(fn));
+}
+
+inline void split(const char *b, const char *e, char d, size_t m,
+                  std::function<void(const char *, const char *)> fn) {
+  size_t i = 0;
+  size_t beg = 0;
+  size_t count = 1;
+
+  while (e ? (b + i < e) : (b[i] != '\0')) {
+    if (b[i] == d && count < m) {
+      auto r = trim(b, e, beg, i);
+      if (r.first < r.second) { fn(&b[r.first], &b[r.second]); }
+      beg = i + 1;
+      count++;
+    }
+    i++;
+  }
+
+  if (i) {
+    auto r = trim(b, e, beg, i);
+    if (r.first < r.second) { fn(&b[r.first], &b[r.second]); }
+  }
+}
+
+inline stream_line_reader::stream_line_reader(Stream &strm, char *fixed_buffer,
+                                              size_t fixed_buffer_size)
+    : strm_(strm), fixed_buffer_(fixed_buffer),
+      fixed_buffer_size_(fixed_buffer_size) {}
+
+inline const char *stream_line_reader::ptr() const {
+  if (growable_buffer_.empty()) {
+    return fixed_buffer_;
+  } else {
+    return growable_buffer_.data();
+  }
+}
+
+inline size_t stream_line_reader::size() const {
+  if (growable_buffer_.empty()) {
+    return fixed_buffer_used_size_;
+  } else {
+    return growable_buffer_.size();
+  }
+}
+
+inline bool stream_line_reader::end_with_crlf() const {
+  auto end = ptr() + size();
+  return size() >= 2 && end[-2] == '\r' && end[-1] == '\n';
+}
+
+inline bool stream_line_reader::getline() {
+  fixed_buffer_used_size_ = 0;
+  growable_buffer_.clear();
+
+#ifndef CPPHTTPLIB_ALLOW_LF_AS_LINE_TERMINATOR
+  char prev_byte = 0;
+#endif
+
+  for (size_t i = 0;; i++) {
+    if (size() >= CPPHTTPLIB_MAX_LINE_LENGTH) {
+      // Treat exceptionally long lines as an error to
+      // prevent infinite loops/memory exhaustion
+      return false;
+    }
+    char byte;
+    auto n = strm_.read(&byte, 1);
+
+    if (n < 0) {
+      return false;
+    } else if (n == 0) {
+      if (i == 0) {
+        return false;
+      } else {
+        break;
+      }
+    }
+
+    append(byte);
+
+#ifdef CPPHTTPLIB_ALLOW_LF_AS_LINE_TERMINATOR
+    if (byte == '\n') { break; }
+#else
+    if (prev_byte == '\r' && byte == '\n') { break; }
+    prev_byte = byte;
+#endif
+  }
+
+  return true;
+}
+
+inline void stream_line_reader::append(char c) {
+  if (fixed_buffer_used_size_ < fixed_buffer_size_ - 1) {
+    fixed_buffer_[fixed_buffer_used_size_++] = c;
+    fixed_buffer_[fixed_buffer_used_size_] = '\0';
+  } else {
+    if (growable_buffer_.empty()) {
+      assert(fixed_buffer_[fixed_buffer_used_size_] == '\0');
+      growable_buffer_.assign(fixed_buffer_, fixed_buffer_used_size_);
+    }
+    growable_buffer_ += c;
+  }
+}
+
+inline mmap::mmap(const char *path) { open(path); }
+
+inline mmap::~mmap() { close(); }
+
+inline bool mmap::open(const char *path) {
+  close();
+
+#if defined(_WIN32)
+  auto wpath = u8string_to_wstring(path);
+  if (wpath.empty()) { return false; }
+
+#if _WIN32_WINNT >= _WIN32_WINNT_WIN8
+  hFile_ = ::CreateFile2(wpath.c_str(), GENERIC_READ, FILE_SHARE_READ,
+                         OPEN_EXISTING, NULL);
+#else
+  hFile_ = ::CreateFileW(wpath.c_str(), GENERIC_READ, FILE_SHARE_READ, NULL,
+                         OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+#endif
+
+  if (hFile_ == INVALID_HANDLE_VALUE) { return false; }
+
+  LARGE_INTEGER size{};
+  if (!::GetFileSizeEx(hFile_, &size)) { return false; }
+  // If the following line doesn't compile due to QuadPart, update Windows SDK.
+  // See:
+  // https://github.com/yhirose/cpp-httplib/issues/1903#issuecomment-2316520721
+  if (static_cast<ULONGLONG>(size.QuadPart) >
+      (std::numeric_limits<decltype(size_)>::max)()) {
+    // `size_t` might be 32-bits, on 32-bits Windows.
+    return false;
+  }
+  size_ = static_cast<size_t>(size.QuadPart);
+
+#if _WIN32_WINNT >= _WIN32_WINNT_WIN8
+  hMapping_ =
+      ::CreateFileMappingFromApp(hFile_, NULL, PAGE_READONLY, size_, NULL);
+#else
+  hMapping_ = ::CreateFileMappingW(hFile_, NULL, PAGE_READONLY, 0, 0, NULL);
+#endif
+
+  // Special treatment for an empty file...
+  if (hMapping_ == NULL && size_ == 0) {
+    close();
+    is_open_empty_file = true;
+    return true;
+  }
+
+  if (hMapping_ == NULL) {
+    close();
+    return false;
+  }
+
+#if _WIN32_WINNT >= _WIN32_WINNT_WIN8
+  addr_ = ::MapViewOfFileFromApp(hMapping_, FILE_MAP_READ, 0, 0);
+#else
+  addr_ = ::MapViewOfFile(hMapping_, FILE_MAP_READ, 0, 0, 0);
+#endif
+
+  if (addr_ == nullptr) {
+    close();
+    return false;
+  }
+#else
+  fd_ = ::open(path, O_RDONLY);
+  if (fd_ == -1) { return false; }
+
+  struct stat sb;
+  if (fstat(fd_, &sb) == -1) {
+    close();
+    return false;
+  }
+  size_ = static_cast<size_t>(sb.st_size);
+
+  addr_ = ::mmap(NULL, size_, PROT_READ, MAP_PRIVATE, fd_, 0);
+
+  // Special treatment for an empty file...
+  if (addr_ == MAP_FAILED && size_ == 0) {
+    close();
+    is_open_empty_file = true;
+    return false;
+  }
+#endif
+
+  return true;
+}
+
+inline bool mmap::is_open() const {
+  return is_open_empty_file ? true : addr_ != nullptr;
+}
+
+inline size_t mmap::size() const { return size_; }
+
+inline const char *mmap::data() const {
+  return is_open_empty_file ? "" : static_cast<const char *>(addr_);
+}
+
+inline void mmap::close() {
+#if defined(_WIN32)
+  if (addr_) {
+    ::UnmapViewOfFile(addr_);
+    addr_ = nullptr;
+  }
+
+  if (hMapping_) {
+    ::CloseHandle(hMapping_);
+    hMapping_ = NULL;
+  }
+
+  if (hFile_ != INVALID_HANDLE_VALUE) {
+    ::CloseHandle(hFile_);
+    hFile_ = INVALID_HANDLE_VALUE;
+  }
+
+  is_open_empty_file = false;
+#else
+  if (addr_ != nullptr) {
+    munmap(addr_, size_);
+    addr_ = nullptr;
+  }
+
+  if (fd_ != -1) {
+    ::close(fd_);
+    fd_ = -1;
+  }
+#endif
+  size_ = 0;
+}
+inline int close_socket(socket_t sock) {
+#ifdef _WIN32
+  return closesocket(sock);
+#else
+  return close(sock);
+#endif
+}
+
+template <typename T> inline ssize_t handle_EINTR(T fn) {
+  ssize_t res = 0;
+  while (true) {
+    res = fn();
+    if (res < 0 && errno == EINTR) {
+      std::this_thread::sleep_for(std::chrono::microseconds{1});
+      continue;
+    }
+    break;
+  }
+  return res;
+}
+
+inline ssize_t read_socket(socket_t sock, void *ptr, size_t size, int flags) {
+  return handle_EINTR([&]() {
+    return recv(sock,
+#ifdef _WIN32
+                static_cast<char *>(ptr), static_cast<int>(size),
+#else
+                ptr, size,
+#endif
+                flags);
+  });
+}
+
+inline ssize_t send_socket(socket_t sock, const void *ptr, size_t size,
+                           int flags) {
+  return handle_EINTR([&]() {
+    return send(sock,
+#ifdef _WIN32
+                static_cast<const char *>(ptr), static_cast<int>(size),
+#else
+                ptr, size,
+#endif
+                flags);
+  });
+}
+
+inline int poll_wrapper(struct pollfd *fds, nfds_t nfds, int timeout) {
+#ifdef _WIN32
+  return ::WSAPoll(fds, nfds, timeout);
+#else
+  return ::poll(fds, nfds, timeout);
+#endif
+}
+
+template <bool Read>
+inline ssize_t select_impl(socket_t sock, time_t sec, time_t usec) {
+#ifdef __APPLE__
+  if (sock >= FD_SETSIZE) { return -1; }
+
+  fd_set fds, *rfds, *wfds;
+  FD_ZERO(&fds);
+  FD_SET(sock, &fds);
+  rfds = (Read ? &fds : nullptr);
+  wfds = (Read ? nullptr : &fds);
+
+  timeval tv;
+  tv.tv_sec = static_cast<long>(sec);
+  tv.tv_usec = static_cast<decltype(tv.tv_usec)>(usec);
+
+  return handle_EINTR([&]() {
+    return select(static_cast<int>(sock + 1), rfds, wfds, nullptr, &tv);
+  });
+#else
+  struct pollfd pfd;
+  pfd.fd = sock;
+  pfd.events = (Read ? POLLIN : POLLOUT);
+
+  auto timeout = static_cast<int>(sec * 1000 + usec / 1000);
+
+  return handle_EINTR([&]() { return poll_wrapper(&pfd, 1, timeout); });
+#endif
+}
+
+inline ssize_t select_read(socket_t sock, time_t sec, time_t usec) {
+  return select_impl<true>(sock, sec, usec);
+}
+
+inline ssize_t select_write(socket_t sock, time_t sec, time_t usec) {
+  return select_impl<false>(sock, sec, usec);
+}
+
+inline Error wait_until_socket_is_ready(socket_t sock, time_t sec,
+                                        time_t usec) {
+#ifdef __APPLE__
+  if (sock >= FD_SETSIZE) { return Error::Connection; }
+
+  fd_set fdsr, fdsw;
+  FD_ZERO(&fdsr);
+  FD_ZERO(&fdsw);
+  FD_SET(sock, &fdsr);
+  FD_SET(sock, &fdsw);
+
+  timeval tv;
+  tv.tv_sec = static_cast<long>(sec);
+  tv.tv_usec = static_cast<decltype(tv.tv_usec)>(usec);
+
+  auto ret = handle_EINTR([&]() {
+    return select(static_cast<int>(sock + 1), &fdsr, &fdsw, nullptr, &tv);
+  });
+
+  if (ret == 0) { return Error::ConnectionTimeout; }
+
+  if (ret > 0 && (FD_ISSET(sock, &fdsr) || FD_ISSET(sock, &fdsw))) {
+    auto error = 0;
+    socklen_t len = sizeof(error);
+    auto res = getsockopt(sock, SOL_SOCKET, SO_ERROR,
+                          reinterpret_cast<char *>(&error), &len);
+    auto successful = res >= 0 && !error;
+    return successful ? Error::Success : Error::Connection;
+  }
+
+  return Error::Connection;
+#else
+  struct pollfd pfd_read;
+  pfd_read.fd = sock;
+  pfd_read.events = POLLIN | POLLOUT;
+
+  auto timeout = static_cast<int>(sec * 1000 + usec / 1000);
+
+  auto poll_res =
+      handle_EINTR([&]() { return poll_wrapper(&pfd_read, 1, timeout); });
+
+  if (poll_res == 0) { return Error::ConnectionTimeout; }
+
+  if (poll_res > 0 && pfd_read.revents & (POLLIN | POLLOUT)) {
+    auto error = 0;
+    socklen_t len = sizeof(error);
+    auto res = getsockopt(sock, SOL_SOCKET, SO_ERROR,
+                          reinterpret_cast<char *>(&error), &len);
+    auto successful = res >= 0 && !error;
+    return successful ? Error::Success : Error::Connection;
+  }
+
+  return Error::Connection;
+#endif
+}
+
+inline bool is_socket_alive(socket_t sock) {
+  const auto val = detail::select_read(sock, 0, 0);
+  if (val == 0) {
+    return true;
+  } else if (val < 0 && errno == EBADF) {
+    return false;
+  }
+  char buf[1];
+  return detail::read_socket(sock, &buf[0], sizeof(buf), MSG_PEEK) > 0;
+}
+
+class SocketStream final : public Stream {
+public:
+  SocketStream(socket_t sock, time_t read_timeout_sec, time_t read_timeout_usec,
+               time_t write_timeout_sec, time_t write_timeout_usec,
+               time_t max_timeout_msec = 0,
+               std::chrono::time_point<std::chrono::steady_clock> start_time =
+                   (std::chrono::steady_clock::time_point::min)());
+  ~SocketStream() override;
+
+  bool is_readable() const override;
+  bool wait_readable() const override;
+  bool wait_writable() const override;
+  ssize_t read(char *ptr, size_t size) override;
+  ssize_t write(const char *ptr, size_t size) override;
+  void get_remote_ip_and_port(std::string &ip, int &port) const override;
+  void get_local_ip_and_port(std::string &ip, int &port) const override;
+  socket_t socket() const override;
+  time_t duration() const override;
+
+private:
+  socket_t sock_;
+  time_t read_timeout_sec_;
+  time_t read_timeout_usec_;
+  time_t write_timeout_sec_;
+  time_t write_timeout_usec_;
+  time_t max_timeout_msec_;
+  const std::chrono::time_point<std::chrono::steady_clock> start_time_;
+
+  std::vector<char> read_buff_;
+  size_t read_buff_off_ = 0;
+  size_t read_buff_content_size_ = 0;
+
+  static const size_t read_buff_size_ = 1024l * 4;
+};
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+class SSLSocketStream final : public Stream {
+public:
+  SSLSocketStream(
+      socket_t sock, SSL *ssl, time_t read_timeout_sec,
+      time_t read_timeout_usec, time_t write_timeout_sec,
+      time_t write_timeout_usec, time_t max_timeout_msec = 0,
+      std::chrono::time_point<std::chrono::steady_clock> start_time =
+          (std::chrono::steady_clock::time_point::min)());
+  ~SSLSocketStream() override;
+
+  bool is_readable() const override;
+  bool wait_readable() const override;
+  bool wait_writable() const override;
+  ssize_t read(char *ptr, size_t size) override;
+  ssize_t write(const char *ptr, size_t size) override;
+  void get_remote_ip_and_port(std::string &ip, int &port) const override;
+  void get_local_ip_and_port(std::string &ip, int &port) const override;
+  socket_t socket() const override;
+  time_t duration() const override;
+
+private:
+  socket_t sock_;
+  SSL *ssl_;
+  time_t read_timeout_sec_;
+  time_t read_timeout_usec_;
+  time_t write_timeout_sec_;
+  time_t write_timeout_usec_;
+  time_t max_timeout_msec_;
+  const std::chrono::time_point<std::chrono::steady_clock> start_time_;
+};
+#endif
+
+inline bool keep_alive(const std::atomic<socket_t> &svr_sock, socket_t sock,
+                       time_t keep_alive_timeout_sec) {
+  using namespace std::chrono;
+
+  const auto interval_usec =
+      CPPHTTPLIB_KEEPALIVE_TIMEOUT_CHECK_INTERVAL_USECOND;
+
+  // Avoid expensive `steady_clock::now()` call for the first time
+  if (select_read(sock, 0, interval_usec) > 0) { return true; }
+
+  const auto start = steady_clock::now() - microseconds{interval_usec};
+  const auto timeout = seconds{keep_alive_timeout_sec};
+
+  while (true) {
+    if (svr_sock == INVALID_SOCKET) {
+      break; // Server socket is closed
+    }
+
+    auto val = select_read(sock, 0, interval_usec);
+    if (val < 0) {
+      break; // Ssocket error
+    } else if (val == 0) {
+      if (steady_clock::now() - start > timeout) {
+        break; // Timeout
+      }
+    } else {
+      return true; // Ready for read
+    }
+  }
+
+  return false;
+}
+
+template <typename T>
+inline bool
+process_server_socket_core(const std::atomic<socket_t> &svr_sock, socket_t sock,
+                           size_t keep_alive_max_count,
+                           time_t keep_alive_timeout_sec, T callback) {
+  assert(keep_alive_max_count > 0);
+  auto ret = false;
+  auto count = keep_alive_max_count;
+  while (count > 0 && keep_alive(svr_sock, sock, keep_alive_timeout_sec)) {
+    auto close_connection = count == 1;
+    auto connection_closed = false;
+    ret = callback(close_connection, connection_closed);
+    if (!ret || connection_closed) { break; }
+    count--;
+  }
+  return ret;
+}
+
+template <typename T>
+inline bool
+process_server_socket(const std::atomic<socket_t> &svr_sock, socket_t sock,
+                      size_t keep_alive_max_count,
+                      time_t keep_alive_timeout_sec, time_t read_timeout_sec,
+                      time_t read_timeout_usec, time_t write_timeout_sec,
+                      time_t write_timeout_usec, T callback) {
+  return process_server_socket_core(
+      svr_sock, sock, keep_alive_max_count, keep_alive_timeout_sec,
+      [&](bool close_connection, bool &connection_closed) {
+        SocketStream strm(sock, read_timeout_sec, read_timeout_usec,
+                          write_timeout_sec, write_timeout_usec);
+        return callback(strm, close_connection, connection_closed);
+      });
+}
+
+inline bool process_client_socket(
+    socket_t sock, time_t read_timeout_sec, time_t read_timeout_usec,
+    time_t write_timeout_sec, time_t write_timeout_usec,
+    time_t max_timeout_msec,
+    std::chrono::time_point<std::chrono::steady_clock> start_time,
+    std::function<bool(Stream &)> callback) {
+  SocketStream strm(sock, read_timeout_sec, read_timeout_usec,
+                    write_timeout_sec, write_timeout_usec, max_timeout_msec,
+                    start_time);
+  return callback(strm);
+}
+
+inline int shutdown_socket(socket_t sock) {
+#ifdef _WIN32
+  return shutdown(sock, SD_BOTH);
+#else
+  return shutdown(sock, SHUT_RDWR);
+#endif
+}
+
+inline std::string escape_abstract_namespace_unix_domain(const std::string &s) {
+  if (s.size() > 1 && s[0] == '\0') {
+    auto ret = s;
+    ret[0] = '@';
+    return ret;
+  }
+  return s;
+}
+
+inline std::string
+unescape_abstract_namespace_unix_domain(const std::string &s) {
+  if (s.size() > 1 && s[0] == '@') {
+    auto ret = s;
+    ret[0] = '\0';
+    return ret;
+  }
+  return s;
+}
+
+inline int getaddrinfo_with_timeout(const char *node, const char *service,
+                                    const struct addrinfo *hints,
+                                    struct addrinfo **res, time_t timeout_sec) {
+#ifdef CPPHTTPLIB_USE_NON_BLOCKING_GETADDRINFO
+  if (timeout_sec <= 0) {
+    // No timeout specified, use standard getaddrinfo
+    return getaddrinfo(node, service, hints, res);
+  }
+
+#ifdef _WIN32
+  // Windows-specific implementation using GetAddrInfoEx with overlapped I/O
+  OVERLAPPED overlapped = {0};
+  HANDLE event = CreateEventW(nullptr, TRUE, FALSE, nullptr);
+  if (!event) { return EAI_FAIL; }
+
+  overlapped.hEvent = event;
+
+  PADDRINFOEXW result_addrinfo = nullptr;
+  HANDLE cancel_handle = nullptr;
+
+  ADDRINFOEXW hints_ex = {0};
+  if (hints) {
+    hints_ex.ai_flags = hints->ai_flags;
+    hints_ex.ai_family = hints->ai_family;
+    hints_ex.ai_socktype = hints->ai_socktype;
+    hints_ex.ai_protocol = hints->ai_protocol;
+  }
+
+  auto wnode = u8string_to_wstring(node);
+  auto wservice = u8string_to_wstring(service);
+
+  auto ret = ::GetAddrInfoExW(wnode.data(), wservice.data(), NS_DNS, nullptr,
+                              hints ? &hints_ex : nullptr, &result_addrinfo,
+                              nullptr, &overlapped, nullptr, &cancel_handle);
+
+  if (ret == WSA_IO_PENDING) {
+    auto wait_result =
+        ::WaitForSingleObject(event, static_cast<DWORD>(timeout_sec * 1000));
+    if (wait_result == WAIT_TIMEOUT) {
+      if (cancel_handle) { ::GetAddrInfoExCancel(&cancel_handle); }
+      ::CloseHandle(event);
+      return EAI_AGAIN;
+    }
+
+    DWORD bytes_returned;
+    if (!::GetOverlappedResult((HANDLE)INVALID_SOCKET, &overlapped,
+                               &bytes_returned, FALSE)) {
+      ::CloseHandle(event);
+      return ::WSAGetLastError();
+    }
+  }
+
+  ::CloseHandle(event);
+
+  if (ret == NO_ERROR || ret == WSA_IO_PENDING) {
+    *res = reinterpret_cast<struct addrinfo *>(result_addrinfo);
+    return 0;
+  }
+
+  return ret;
+#elif TARGET_OS_MAC
+  // macOS implementation using CFHost API for asynchronous DNS resolution
+  CFStringRef hostname_ref = CFStringCreateWithCString(
+      kCFAllocatorDefault, node, kCFStringEncodingUTF8);
+  if (!hostname_ref) { return EAI_MEMORY; }
+
+  CFHostRef host_ref = CFHostCreateWithName(kCFAllocatorDefault, hostname_ref);
+  CFRelease(hostname_ref);
+  if (!host_ref) { return EAI_MEMORY; }
+
+  // Set up context for callback
+  struct CFHostContext {
+    bool completed = false;
+    bool success = false;
+    CFArrayRef addresses = nullptr;
+    std::mutex mutex;
+    std::condition_variable cv;
+  } context;
+
+  CFHostClientContext client_context;
+  memset(&client_context, 0, sizeof(client_context));
+  client_context.info = &context;
+
+  // Set callback
+  auto callback = [](CFHostRef theHost, CFHostInfoType /*typeInfo*/,
+                     const CFStreamError *error, void *info) {
+    auto ctx = static_cast<CFHostContext *>(info);
+    std::lock_guard<std::mutex> lock(ctx->mutex);
+
+    if (error && error->error != 0) {
+      ctx->success = false;
+    } else {
+      Boolean hasBeenResolved;
+      ctx->addresses = CFHostGetAddressing(theHost, &hasBeenResolved);
+      if (ctx->addresses && hasBeenResolved) {
+        CFRetain(ctx->addresses);
+        ctx->success = true;
+      } else {
+        ctx->success = false;
+      }
+    }
+    ctx->completed = true;
+    ctx->cv.notify_one();
+  };
+
+  if (!CFHostSetClient(host_ref, callback, &client_context)) {
+    CFRelease(host_ref);
+    return EAI_SYSTEM;
+  }
+
+  // Schedule on run loop
+  CFRunLoopRef run_loop = CFRunLoopGetCurrent();
+  CFHostScheduleWithRunLoop(host_ref, run_loop, kCFRunLoopDefaultMode);
+
+  // Start resolution
+  CFStreamError stream_error;
+  if (!CFHostStartInfoResolution(host_ref, kCFHostAddresses, &stream_error)) {
+    CFHostUnscheduleFromRunLoop(host_ref, run_loop, kCFRunLoopDefaultMode);
+    CFRelease(host_ref);
+    return EAI_FAIL;
+  }
+
+  // Wait for completion with timeout
+  auto timeout_time =
+      std::chrono::steady_clock::now() + std::chrono::seconds(timeout_sec);
+  bool timed_out = false;
+
+  {
+    std::unique_lock<std::mutex> lock(context.mutex);
+
+    while (!context.completed) {
+      auto now = std::chrono::steady_clock::now();
+      if (now >= timeout_time) {
+        timed_out = true;
+        break;
+      }
+
+      // Run the runloop for a short time
+      lock.unlock();
+      CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.1, true);
+      lock.lock();
+    }
+  }
+
+  // Clean up
+  CFHostUnscheduleFromRunLoop(host_ref, run_loop, kCFRunLoopDefaultMode);
+  CFHostSetClient(host_ref, nullptr, nullptr);
+
+  if (timed_out || !context.completed) {
+    CFHostCancelInfoResolution(host_ref, kCFHostAddresses);
+    CFRelease(host_ref);
+    return EAI_AGAIN;
+  }
+
+  if (!context.success || !context.addresses) {
+    CFRelease(host_ref);
+    return EAI_NODATA;
+  }
+
+  // Convert CFArray to addrinfo
+  CFIndex count = CFArrayGetCount(context.addresses);
+  if (count == 0) {
+    CFRelease(context.addresses);
+    CFRelease(host_ref);
+    return EAI_NODATA;
+  }
+
+  struct addrinfo *result_addrinfo = nullptr;
+  struct addrinfo **current = &result_addrinfo;
+
+  for (CFIndex i = 0; i < count; i++) {
+    CFDataRef addr_data =
+        static_cast<CFDataRef>(CFArrayGetValueAtIndex(context.addresses, i));
+    if (!addr_data) continue;
+
+    const struct sockaddr *sockaddr_ptr =
+        reinterpret_cast<const struct sockaddr *>(CFDataGetBytePtr(addr_data));
+    socklen_t sockaddr_len = static_cast<socklen_t>(CFDataGetLength(addr_data));
+
+    // Allocate addrinfo structure
+    *current = static_cast<struct addrinfo *>(malloc(sizeof(struct addrinfo)));
+    if (!*current) {
+      freeaddrinfo(result_addrinfo);
+      CFRelease(context.addresses);
+      CFRelease(host_ref);
+      return EAI_MEMORY;
+    }
+
+    memset(*current, 0, sizeof(struct addrinfo));
+
+    // Set up addrinfo fields
+    (*current)->ai_family = sockaddr_ptr->sa_family;
+    (*current)->ai_socktype = hints ? hints->ai_socktype : SOCK_STREAM;
+    (*current)->ai_protocol = hints ? hints->ai_protocol : IPPROTO_TCP;
+    (*current)->ai_addrlen = sockaddr_len;
+
+    // Copy sockaddr
+    (*current)->ai_addr = static_cast<struct sockaddr *>(malloc(sockaddr_len));
+    if (!(*current)->ai_addr) {
+      freeaddrinfo(result_addrinfo);
+      CFRelease(context.addresses);
+      CFRelease(host_ref);
+      return EAI_MEMORY;
+    }
+    memcpy((*current)->ai_addr, sockaddr_ptr, sockaddr_len);
+
+    // Set port if service is specified
+    if (service && strlen(service) > 0) {
+      int port = atoi(service);
+      if (port > 0) {
+        if (sockaddr_ptr->sa_family == AF_INET) {
+          reinterpret_cast<struct sockaddr_in *>((*current)->ai_addr)
+              ->sin_port = htons(static_cast<uint16_t>(port));
+        } else if (sockaddr_ptr->sa_family == AF_INET6) {
+          reinterpret_cast<struct sockaddr_in6 *>((*current)->ai_addr)
+              ->sin6_port = htons(static_cast<uint16_t>(port));
+        }
+      }
+    }
+
+    current = &((*current)->ai_next);
+  }
+
+  CFRelease(context.addresses);
+  CFRelease(host_ref);
+
+  *res = result_addrinfo;
+  return 0;
+#elif defined(_GNU_SOURCE) && defined(__GLIBC__) &&                            \
+    (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2))
+  // Linux implementation using getaddrinfo_a for asynchronous DNS resolution
+  struct gaicb request;
+  struct gaicb *requests[1] = {&request};
+  struct sigevent sevp;
+  struct timespec timeout;
+
+  // Initialize the request structure
+  memset(&request, 0, sizeof(request));
+  request.ar_name = node;
+  request.ar_service = service;
+  request.ar_request = hints;
+
+  // Set up timeout
+  timeout.tv_sec = timeout_sec;
+  timeout.tv_nsec = 0;
+
+  // Initialize sigevent structure (not used, but required)
+  memset(&sevp, 0, sizeof(sevp));
+  sevp.sigev_notify = SIGEV_NONE;
+
+  // Start asynchronous resolution
+  int start_result = getaddrinfo_a(GAI_NOWAIT, requests, 1, &sevp);
+  if (start_result != 0) { return start_result; }
+
+  // Wait for completion with timeout
+  int wait_result =
+      gai_suspend((const struct gaicb *const *)requests, 1, &timeout);
+
+  if (wait_result == 0 || wait_result == EAI_ALLDONE) {
+    // Completed successfully, get the result
+    int gai_result = gai_error(&request);
+    if (gai_result == 0) {
+      *res = request.ar_result;
+      return 0;
+    } else {
+      // Clean up on error
+      if (request.ar_result) { freeaddrinfo(request.ar_result); }
+      return gai_result;
+    }
+  } else if (wait_result == EAI_AGAIN) {
+    // Timeout occurred, cancel the request
+    gai_cancel(&request);
+    return EAI_AGAIN;
+  } else {
+    // Other error occurred
+    gai_cancel(&request);
+    return wait_result;
+  }
+#else
+  // Fallback implementation using thread-based timeout for other Unix systems
+
+  struct GetAddrInfoState {
+    std::mutex mutex;
+    std::condition_variable result_cv;
+    bool completed = false;
+    int result = EAI_SYSTEM;
+    std::string node = node;
+    std::string service = service;
+    struct addrinfo hints = hints;
+    struct addrinfo *info = nullptr;
+  };
+
+  // Allocate on the heap, so the resolver thread can keep using the data.
+  auto state = std::make_shared<GetAddrInfoState>();
+
+  std::thread resolve_thread([=]() {
+    auto thread_result = getaddrinfo(
+        state->node.c_str(), state->service.c_str(), hints, &state->info);
+
+    std::lock_guard<std::mutex> lock(state->mutex);
+    state->result = thread_result;
+    state->completed = true;
+    state->result_cv.notify_one();
+  });
+
+  // Wait for completion or timeout
+  std::unique_lock<std::mutex> lock(state->mutex);
+  auto finished =
+      state->result_cv.wait_for(lock, std::chrono::seconds(timeout_sec),
+                                [&] { return state->completed; });
+
+  if (finished) {
+    // Operation completed within timeout
+    resolve_thread.join();
+    *res = state->info;
+    return state->result;
+  } else {
+    // Timeout occurred
+    resolve_thread.detach(); // Let the thread finish in background
+    return EAI_AGAIN;        // Return timeout error
+  }
+#endif
+#else
+  (void)(timeout_sec); // Unused parameter for non-blocking getaddrinfo
+  return getaddrinfo(node, service, hints, res);
+#endif
+}
+
+template <typename BindOrConnect>
+socket_t create_socket(const std::string &host, const std::string &ip, int port,
+                       int address_family, int socket_flags, bool tcp_nodelay,
+                       bool ipv6_v6only, SocketOptions socket_options,
+                       BindOrConnect bind_or_connect, time_t timeout_sec = 0) {
+  // Get address info
+  const char *node = nullptr;
+  struct addrinfo hints;
+  struct addrinfo *result;
+
+  memset(&hints, 0, sizeof(struct addrinfo));
+  hints.ai_socktype = SOCK_STREAM;
+  hints.ai_protocol = IPPROTO_IP;
+
+  if (!ip.empty()) {
+    node = ip.c_str();
+    // Ask getaddrinfo to convert IP in c-string to address
     hints.ai_family = AF_UNSPEC;
-    hints.ai_socktype = SOCK_STREAM;
+    hints.ai_flags = AI_NUMERICHOST;
+  } else {
+    if (!host.empty()) { node = host.c_str(); }
+    hints.ai_family = address_family;
     hints.ai_flags = socket_flags;
-    hints.ai_protocol = 0;
+  }
+
+#if !defined(_WIN32) || defined(CPPHTTPLIB_HAVE_AFUNIX_H)
+  if (hints.ai_family == AF_UNIX) {
+    const auto addrlen = host.length();
+    if (addrlen > sizeof(sockaddr_un::sun_path)) { return INVALID_SOCKET; }
+
+#ifdef SOCK_CLOEXEC
+    auto sock = socket(hints.ai_family, hints.ai_socktype | SOCK_CLOEXEC,
+                       hints.ai_protocol);
+#else
+    auto sock = socket(hints.ai_family, hints.ai_socktype, hints.ai_protocol);
+#endif
+
+    if (sock != INVALID_SOCKET) {
+      sockaddr_un addr{};
+      addr.sun_family = AF_UNIX;
+
+      auto unescaped_host = unescape_abstract_namespace_unix_domain(host);
+      std::copy(unescaped_host.begin(), unescaped_host.end(), addr.sun_path);
+
+      hints.ai_addr = reinterpret_cast<sockaddr *>(&addr);
+      hints.ai_addrlen = static_cast<socklen_t>(
+          sizeof(addr) - sizeof(addr.sun_path) + addrlen);
+
+#ifndef SOCK_CLOEXEC
+#ifndef _WIN32
+      fcntl(sock, F_SETFD, FD_CLOEXEC);
+#endif
+#endif
+
+      if (socket_options) { socket_options(sock); }
+
+#ifdef _WIN32
+      // Setting SO_REUSEADDR seems not to work well with AF_UNIX on windows, so
+      // remove the option.
+      detail::set_socket_opt(sock, SOL_SOCKET, SO_REUSEADDR, 0);
+#endif
+
+      bool dummy;
+      if (!bind_or_connect(sock, hints, dummy)) {
+        close_socket(sock);
+        sock = INVALID_SOCKET;
+      }
+    }
+    return sock;
+  }
+#endif
+
+  auto service = std::to_string(port);
+
+  if (getaddrinfo_with_timeout(node, service.c_str(), &hints, &result,
+                               timeout_sec)) {
+#if defined __linux__ && !defined __ANDROID__
+    res_init();
+#endif
+    return INVALID_SOCKET;
+  }
+  auto se = detail::scope_exit([&] { freeaddrinfo(result); });
+
+  for (auto rp = result; rp; rp = rp->ai_next) {
+    // Create a socket
+#ifdef _WIN32
+    auto sock =
+        WSASocketW(rp->ai_family, rp->ai_socktype, rp->ai_protocol, nullptr, 0,
+                   WSA_FLAG_NO_HANDLE_INHERIT | WSA_FLAG_OVERLAPPED);
+    /**
+     * Since the WSA_FLAG_NO_HANDLE_INHERIT is only supported on Windows 7 SP1
+     * and above the socket creation fails on older Windows Systems.
+     *
+     * Let's try to create a socket the old way in this case.
+     *
+     * Reference:
+     * https://docs.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-wsasocketa
+     *
+     * WSA_FLAG_NO_HANDLE_INHERIT:
+     * This flag is supported on Windows 7 with SP1, Windows Server 2008 R2 with
+     * SP1, and later
+     *
+     */
+    if (sock == INVALID_SOCKET) {
+      sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
+    }
+#else
+
+#ifdef SOCK_CLOEXEC
+    auto sock =
+        socket(rp->ai_family, rp->ai_socktype | SOCK_CLOEXEC, rp->ai_protocol);
+#else
+    auto sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
+#endif
+
+#endif
+    if (sock == INVALID_SOCKET) { continue; }
+
+#if !defined _WIN32 && !defined SOCK_CLOEXEC
+    if (fcntl(sock, F_SETFD, FD_CLOEXEC) == -1) {
+      close_socket(sock);
+      continue;
+    }
+#endif
+
+    if (tcp_nodelay) { set_socket_opt(sock, IPPROTO_TCP, TCP_NODELAY, 1); }
+
+    if (rp->ai_family == AF_INET6) {
+      set_socket_opt(sock, IPPROTO_IPV6, IPV6_V6ONLY, ipv6_v6only ? 1 : 0);
+    }
+
+    if (socket_options) { socket_options(sock); }
+
+    // bind or connect
+    auto quit = false;
+    if (bind_or_connect(sock, *rp, quit)) { return sock; }
+
+    close_socket(sock);
+
+    if (quit) { break; }
+  }
+
+  return INVALID_SOCKET;
+}
+
+inline void set_nonblocking(socket_t sock, bool nonblocking) {
+#ifdef _WIN32
+  auto flags = nonblocking ? 1UL : 0UL;
+  ioctlsocket(sock, FIONBIO, &flags);
+#else
+  auto flags = fcntl(sock, F_GETFL, 0);
+  fcntl(sock, F_SETFL,
+        nonblocking ? (flags | O_NONBLOCK) : (flags & (~O_NONBLOCK)));
+#endif
+}
+
+inline bool is_connection_error() {
+#ifdef _WIN32
+  return WSAGetLastError() != WSAEWOULDBLOCK;
+#else
+  return errno != EINPROGRESS;
+#endif
+}
+
+inline bool bind_ip_address(socket_t sock, const std::string &host) {
+  struct addrinfo hints;
+  struct addrinfo *result;
+
+  memset(&hints, 0, sizeof(struct addrinfo));
+  hints.ai_family = AF_UNSPEC;
+  hints.ai_socktype = SOCK_STREAM;
+  hints.ai_protocol = 0;
+
+  if (getaddrinfo_with_timeout(host.c_str(), "0", &hints, &result, 0)) {
+    return false;
+  }
+
+  auto se = detail::scope_exit([&] { freeaddrinfo(result); });
+
+  auto ret = false;
+  for (auto rp = result; rp; rp = rp->ai_next) {
+    const auto &ai = *rp;
+    if (!::bind(sock, ai.ai_addr, static_cast<socklen_t>(ai.ai_addrlen))) {
+      ret = true;
+      break;
+    }
+  }
+
+  return ret;
+}
+
+#if !defined _WIN32 && !defined ANDROID && !defined _AIX && !defined __MVS__
+#define USE_IF2IP
+#endif
+
+#ifdef USE_IF2IP
+inline std::string if2ip(int address_family, const std::string &ifn) {
+  struct ifaddrs *ifap;
+  getifaddrs(&ifap);
+  auto se = detail::scope_exit([&] { freeifaddrs(ifap); });
+
+  std::string addr_candidate;
+  for (auto ifa = ifap; ifa; ifa = ifa->ifa_next) {
+    if (ifa->ifa_addr && ifn == ifa->ifa_name &&
+        (AF_UNSPEC == address_family ||
+         ifa->ifa_addr->sa_family == address_family)) {
+      if (ifa->ifa_addr->sa_family == AF_INET) {
+        auto sa = reinterpret_cast<struct sockaddr_in *>(ifa->ifa_addr);
+        char buf[INET_ADDRSTRLEN];
+        if (inet_ntop(AF_INET, &sa->sin_addr, buf, INET_ADDRSTRLEN)) {
+          return std::string(buf, INET_ADDRSTRLEN);
+        }
+      } else if (ifa->ifa_addr->sa_family == AF_INET6) {
+        auto sa = reinterpret_cast<struct sockaddr_in6 *>(ifa->ifa_addr);
+        if (!IN6_IS_ADDR_LINKLOCAL(&sa->sin6_addr)) {
+          char buf[INET6_ADDRSTRLEN] = {};
+          if (inet_ntop(AF_INET6, &sa->sin6_addr, buf, INET6_ADDRSTRLEN)) {
+            // equivalent to mac's IN6_IS_ADDR_UNIQUE_LOCAL
+            auto s6_addr_head = sa->sin6_addr.s6_addr[0];
+            if (s6_addr_head == 0xfc || s6_addr_head == 0xfd) {
+              addr_candidate = std::string(buf, INET6_ADDRSTRLEN);
+            } else {
+              return std::string(buf, INET6_ADDRSTRLEN);
+            }
+          }
+        }
+      }
+    }
+  }
+  return addr_candidate;
+}
+#endif
+
+inline socket_t create_client_socket(
+    const std::string &host, const std::string &ip, int port,
+    int address_family, bool tcp_nodelay, bool ipv6_v6only,
+    SocketOptions socket_options, time_t connection_timeout_sec,
+    time_t connection_timeout_usec, time_t read_timeout_sec,
+    time_t read_timeout_usec, time_t write_timeout_sec,
+    time_t write_timeout_usec, const std::string &intf, Error &error) {
+  auto sock = create_socket(
+      host, ip, port, address_family, 0, tcp_nodelay, ipv6_v6only,
+      std::move(socket_options),
+      [&](socket_t sock2, struct addrinfo &ai, bool &quit) -> bool {
+        if (!intf.empty()) {
+#ifdef USE_IF2IP
+          auto ip_from_if = if2ip(address_family, intf);
+          if (ip_from_if.empty()) { ip_from_if = intf; }
+          if (!bind_ip_address(sock2, ip_from_if)) {
+            error = Error::BindIPAddress;
+            return false;
+          }
+#endif
+        }
+
+        set_nonblocking(sock2, true);
+
+        auto ret =
+            ::connect(sock2, ai.ai_addr, static_cast<socklen_t>(ai.ai_addrlen));
+
+        if (ret < 0) {
+          if (is_connection_error()) {
+            error = Error::Connection;
+            return false;
+          }
+          error = wait_until_socket_is_ready(sock2, connection_timeout_sec,
+                                             connection_timeout_usec);
+          if (error != Error::Success) {
+            if (error == Error::ConnectionTimeout) { quit = true; }
+            return false;
+          }
+        }
+
+        set_nonblocking(sock2, false);
+        set_socket_opt_time(sock2, SOL_SOCKET, SO_RCVTIMEO, read_timeout_sec,
+                            read_timeout_usec);
+        set_socket_opt_time(sock2, SOL_SOCKET, SO_SNDTIMEO, write_timeout_sec,
+                            write_timeout_usec);
+
+        error = Error::Success;
+        return true;
+      },
+      connection_timeout_sec); // Pass DNS timeout
+
+  if (sock != INVALID_SOCKET) {
+    error = Error::Success;
+  } else {
+    if (error == Error::Success) { error = Error::Connection; }
+  }
+
+  return sock;
+}
+
+inline bool get_ip_and_port(const struct sockaddr_storage &addr,
+                            socklen_t addr_len, std::string &ip, int &port) {
+  if (addr.ss_family == AF_INET) {
+    port = ntohs(reinterpret_cast<const struct sockaddr_in *>(&addr)->sin_port);
+  } else if (addr.ss_family == AF_INET6) {
+    port =
+        ntohs(reinterpret_cast<const struct sockaddr_in6 *>(&addr)->sin6_port);
+  } else {
+    return false;
+  }
+
+  std::array<char, NI_MAXHOST> ipstr{};
+  if (getnameinfo(reinterpret_cast<const struct sockaddr *>(&addr), addr_len,
+                  ipstr.data(), static_cast<socklen_t>(ipstr.size()), nullptr,
+                  0, NI_NUMERICHOST)) {
+    return false;
+  }
+
+  ip = ipstr.data();
+  return true;
+}
+
+inline void get_local_ip_and_port(socket_t sock, std::string &ip, int &port) {
+  struct sockaddr_storage addr;
+  socklen_t addr_len = sizeof(addr);
+  if (!getsockname(sock, reinterpret_cast<struct sockaddr *>(&addr),
+                   &addr_len)) {
+    get_ip_and_port(addr, addr_len, ip, port);
+  }
+}
+
+inline void get_remote_ip_and_port(socket_t sock, std::string &ip, int &port) {
+  struct sockaddr_storage addr;
+  socklen_t addr_len = sizeof(addr);
+
+  if (!getpeername(sock, reinterpret_cast<struct sockaddr *>(&addr),
+                   &addr_len)) {
+#ifndef _WIN32
+    if (addr.ss_family == AF_UNIX) {
+#if defined(__linux__)
+      struct ucred ucred;
+      socklen_t len = sizeof(ucred);
+      if (getsockopt(sock, SOL_SOCKET, SO_PEERCRED, &ucred, &len) == 0) {
+        port = ucred.pid;
+      }
+#elif defined(SOL_LOCAL) && defined(SO_PEERPID)
+      pid_t pid;
+      socklen_t len = sizeof(pid);
+      if (getsockopt(sock, SOL_LOCAL, SO_PEERPID, &pid, &len) == 0) {
+        port = pid;
+      }
+#endif
+      return;
+    }
+#endif
+    get_ip_and_port(addr, addr_len, ip, port);
+  }
+}
+
+inline constexpr unsigned int str2tag_core(const char *s, size_t l,
+                                           unsigned int h) {
+  return (l == 0)
+             ? h
+             : str2tag_core(
+                   s + 1, l - 1,
+                   // Unsets the 6 high bits of h, therefore no overflow happens
+                   (((std::numeric_limits<unsigned int>::max)() >> 6) &
+                    h * 33) ^
+                       static_cast<unsigned char>(*s));
+}
+
+inline unsigned int str2tag(const std::string &s) {
+  return str2tag_core(s.data(), s.size(), 0);
+}
+
+namespace udl {
+
+inline constexpr unsigned int operator""_t(const char *s, size_t l) {
+  return str2tag_core(s, l, 0);
+}
+
+} // namespace udl
+
+inline std::string
+find_content_type(const std::string &path,
+                  const std::map<std::string, std::string> &user_data,
+                  const std::string &default_content_type) {
+  auto ext = file_extension(path);
+
+  auto it = user_data.find(ext);
+  if (it != user_data.end()) { return it->second; }
+
+  using udl::operator""_t;
+
+  switch (str2tag(ext)) {
+  default: return default_content_type;
+
+  case "css"_t: return "text/css";
+  case "csv"_t: return "text/csv";
+  case "htm"_t:
+  case "html"_t: return "text/html";
+  case "js"_t:
+  case "mjs"_t: return "text/javascript";
+  case "txt"_t: return "text/plain";
+  case "vtt"_t: return "text/vtt";
+
+  case "apng"_t: return "image/apng";
+  case "avif"_t: return "image/avif";
+  case "bmp"_t: return "image/bmp";
+  case "gif"_t: return "image/gif";
+  case "png"_t: return "image/png";
+  case "svg"_t: return "image/svg+xml";
+  case "webp"_t: return "image/webp";
+  case "ico"_t: return "image/x-icon";
+  case "tif"_t: return "image/tiff";
+  case "tiff"_t: return "image/tiff";
+  case "jpg"_t:
+  case "jpeg"_t: return "image/jpeg";
+
+  case "mp4"_t: return "video/mp4";
+  case "mpeg"_t: return "video/mpeg";
+  case "webm"_t: return "video/webm";
+
+  case "mp3"_t: return "audio/mp3";
+  case "mpga"_t: return "audio/mpeg";
+  case "weba"_t: return "audio/webm";
+  case "wav"_t: return "audio/wave";
+
+  case "otf"_t: return "font/otf";
+  case "ttf"_t: return "font/ttf";
+  case "woff"_t: return "font/woff";
+  case "woff2"_t: return "font/woff2";
+
+  case "7z"_t: return "application/x-7z-compressed";
+  case "atom"_t: return "application/atom+xml";
+  case "pdf"_t: return "application/pdf";
+  case "json"_t: return "application/json";
+  case "rss"_t: return "application/rss+xml";
+  case "tar"_t: return "application/x-tar";
+  case "xht"_t:
+  case "xhtml"_t: return "application/xhtml+xml";
+  case "xslt"_t: return "application/xslt+xml";
+  case "xml"_t: return "application/xml";
+  case "gz"_t: return "application/gzip";
+  case "zip"_t: return "application/zip";
+  case "wasm"_t: return "application/wasm";
+  }
+}
+
+inline bool can_compress_content_type(const std::string &content_type) {
+  using udl::operator""_t;
+
+  auto tag = str2tag(content_type);
+
+  switch (tag) {
+  case "image/svg+xml"_t:
+  case "application/javascript"_t:
+  case "application/json"_t:
+  case "application/xml"_t:
+  case "application/protobuf"_t:
+  case "application/xhtml+xml"_t: return true;
+
+  case "text/event-stream"_t: return false;
+
+  default: return !content_type.rfind("text/", 0);
+  }
+}
+
+inline EncodingType encoding_type(const Request &req, const Response &res) {
+  auto ret =
+      detail::can_compress_content_type(res.get_header_value("Content-Type"));
+  if (!ret) { return EncodingType::None; }
+
+  const auto &s = req.get_header_value("Accept-Encoding");
+  (void)(s);
+
+#ifdef CPPHTTPLIB_BROTLI_SUPPORT
+  // TODO: 'Accept-Encoding' has br, not br;q=0
+  ret = s.find("br") != std::string::npos;
+  if (ret) { return EncodingType::Brotli; }
+#endif
+
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+  // TODO: 'Accept-Encoding' has gzip, not gzip;q=0
+  ret = s.find("gzip") != std::string::npos;
+  if (ret) { return EncodingType::Gzip; }
+#endif
+
+#ifdef CPPHTTPLIB_ZSTD_SUPPORT
+  // TODO: 'Accept-Encoding' has zstd, not zstd;q=0
+  ret = s.find("zstd") != std::string::npos;
+  if (ret) { return EncodingType::Zstd; }
+#endif
+
+  return EncodingType::None;
+}
+
+inline bool nocompressor::compress(const char *data, size_t data_length,
+                                   bool /*last*/, Callback callback) {
+  if (!data_length) { return true; }
+  return callback(data, data_length);
+}
+
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+inline gzip_compressor::gzip_compressor() {
+  std::memset(&strm_, 0, sizeof(strm_));
+  strm_.zalloc = Z_NULL;
+  strm_.zfree = Z_NULL;
+  strm_.opaque = Z_NULL;
+
+  is_valid_ = deflateInit2(&strm_, Z_DEFAULT_COMPRESSION, Z_DEFLATED, 31, 8,
+                           Z_DEFAULT_STRATEGY) == Z_OK;
+}
+
+inline gzip_compressor::~gzip_compressor() { deflateEnd(&strm_); }
+
+inline bool gzip_compressor::compress(const char *data, size_t data_length,
+                                      bool last, Callback callback) {
+  assert(is_valid_);
+
+  do {
+    constexpr size_t max_avail_in =
+        (std::numeric_limits<decltype(strm_.avail_in)>::max)();
+
+    strm_.avail_in = static_cast<decltype(strm_.avail_in)>(
+        (std::min)(data_length, max_avail_in));
+    strm_.next_in = const_cast<Bytef *>(reinterpret_cast<const Bytef *>(data));
+
+    data_length -= strm_.avail_in;
+    data += strm_.avail_in;
+
+    auto flush = (last && data_length == 0) ? Z_FINISH : Z_NO_FLUSH;
+    auto ret = Z_OK;
+
+    std::array<char, CPPHTTPLIB_COMPRESSION_BUFSIZ> buff{};
+    do {
+      strm_.avail_out = static_cast<uInt>(buff.size());
+      strm_.next_out = reinterpret_cast<Bytef *>(buff.data());
+
+      ret = deflate(&strm_, flush);
+      if (ret == Z_STREAM_ERROR) { return false; }
+
+      if (!callback(buff.data(), buff.size() - strm_.avail_out)) {
+        return false;
+      }
+    } while (strm_.avail_out == 0);
+
+    assert((flush == Z_FINISH && ret == Z_STREAM_END) ||
+           (flush == Z_NO_FLUSH && ret == Z_OK));
+    assert(strm_.avail_in == 0);
+  } while (data_length > 0);
+
+  return true;
+}
+
+inline gzip_decompressor::gzip_decompressor() {
+  std::memset(&strm_, 0, sizeof(strm_));
+  strm_.zalloc = Z_NULL;
+  strm_.zfree = Z_NULL;
+  strm_.opaque = Z_NULL;
+
+  // 15 is the value of wbits, which should be at the maximum possible value
+  // to ensure that any gzip stream can be decoded. The offset of 32 specifies
+  // that the stream type should be automatically detected either gzip or
+  // deflate.
+  is_valid_ = inflateInit2(&strm_, 32 + 15) == Z_OK;
+}
+
+inline gzip_decompressor::~gzip_decompressor() { inflateEnd(&strm_); }
+
+inline bool gzip_decompressor::is_valid() const { return is_valid_; }
+
+inline bool gzip_decompressor::decompress(const char *data, size_t data_length,
+                                          Callback callback) {
+  assert(is_valid_);
+
+  auto ret = Z_OK;
+
+  do {
+    constexpr size_t max_avail_in =
+        (std::numeric_limits<decltype(strm_.avail_in)>::max)();
+
+    strm_.avail_in = static_cast<decltype(strm_.avail_in)>(
+        (std::min)(data_length, max_avail_in));
+    strm_.next_in = const_cast<Bytef *>(reinterpret_cast<const Bytef *>(data));
+
+    data_length -= strm_.avail_in;
+    data += strm_.avail_in;
+
+    std::array<char, CPPHTTPLIB_COMPRESSION_BUFSIZ> buff{};
+    while (strm_.avail_in > 0 && ret == Z_OK) {
+      strm_.avail_out = static_cast<uInt>(buff.size());
+      strm_.next_out = reinterpret_cast<Bytef *>(buff.data());
+
+      ret = inflate(&strm_, Z_NO_FLUSH);
+
+      assert(ret != Z_STREAM_ERROR);
+      switch (ret) {
+      case Z_NEED_DICT:
+      case Z_DATA_ERROR:
+      case Z_MEM_ERROR: inflateEnd(&strm_); return false;
+      }
+
+      if (!callback(buff.data(), buff.size() - strm_.avail_out)) {
+        return false;
+      }
+    }
+
+    if (ret != Z_OK && ret != Z_STREAM_END) { return false; }
+
+  } while (data_length > 0);
+
+  return true;
+}
+#endif
+
+#ifdef CPPHTTPLIB_BROTLI_SUPPORT
+inline brotli_compressor::brotli_compressor() {
+  state_ = BrotliEncoderCreateInstance(nullptr, nullptr, nullptr);
+}
+
+inline brotli_compressor::~brotli_compressor() {
+  BrotliEncoderDestroyInstance(state_);
+}
+
+inline bool brotli_compressor::compress(const char *data, size_t data_length,
+                                        bool last, Callback callback) {
+  std::array<uint8_t, CPPHTTPLIB_COMPRESSION_BUFSIZ> buff{};
+
+  auto operation = last ? BROTLI_OPERATION_FINISH : BROTLI_OPERATION_PROCESS;
+  auto available_in = data_length;
+  auto next_in = reinterpret_cast<const uint8_t *>(data);
+
+  for (;;) {
+    if (last) {
+      if (BrotliEncoderIsFinished(state_)) { break; }
+    } else {
+      if (!available_in) { break; }
+    }
+
+    auto available_out = buff.size();
+    auto next_out = buff.data();
+
+    if (!BrotliEncoderCompressStream(state_, operation, &available_in, &next_in,
+                                     &available_out, &next_out, nullptr)) {
+      return false;
+    }
+
+    auto output_bytes = buff.size() - available_out;
+    if (output_bytes) {
+      callback(reinterpret_cast<const char *>(buff.data()), output_bytes);
+    }
+  }
+
+  return true;
+}
+
+inline brotli_decompressor::brotli_decompressor() {
+  decoder_s = BrotliDecoderCreateInstance(0, 0, 0);
+  decoder_r = decoder_s ? BROTLI_DECODER_RESULT_NEEDS_MORE_INPUT
+                        : BROTLI_DECODER_RESULT_ERROR;
+}
+
+inline brotli_decompressor::~brotli_decompressor() {
+  if (decoder_s) { BrotliDecoderDestroyInstance(decoder_s); }
+}
+
+inline bool brotli_decompressor::is_valid() const { return decoder_s; }
+
+inline bool brotli_decompressor::decompress(const char *data,
+                                            size_t data_length,
+                                            Callback callback) {
+  if (decoder_r == BROTLI_DECODER_RESULT_SUCCESS ||
+      decoder_r == BROTLI_DECODER_RESULT_ERROR) {
+    return 0;
+  }
+
+  auto next_in = reinterpret_cast<const uint8_t *>(data);
+  size_t avail_in = data_length;
+  size_t total_out;
+
+  decoder_r = BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT;
+
+  std::array<char, CPPHTTPLIB_COMPRESSION_BUFSIZ> buff{};
+  while (decoder_r == BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT) {
+    char *next_out = buff.data();
+    size_t avail_out = buff.size();
+
+    decoder_r = BrotliDecoderDecompressStream(
+        decoder_s, &avail_in, &next_in, &avail_out,
+        reinterpret_cast<uint8_t **>(&next_out), &total_out);
+
+    if (decoder_r == BROTLI_DECODER_RESULT_ERROR) { return false; }
+
+    if (!callback(buff.data(), buff.size() - avail_out)) { return false; }
+  }
+
+  return decoder_r == BROTLI_DECODER_RESULT_SUCCESS ||
+         decoder_r == BROTLI_DECODER_RESULT_NEEDS_MORE_INPUT;
+}
+#endif
+
+#ifdef CPPHTTPLIB_ZSTD_SUPPORT
+inline zstd_compressor::zstd_compressor() {
+  ctx_ = ZSTD_createCCtx();
+  ZSTD_CCtx_setParameter(ctx_, ZSTD_c_compressionLevel, ZSTD_fast);
+}
+
+inline zstd_compressor::~zstd_compressor() { ZSTD_freeCCtx(ctx_); }
+
+inline bool zstd_compressor::compress(const char *data, size_t data_length,
+                                      bool last, Callback callback) {
+  std::array<char, CPPHTTPLIB_COMPRESSION_BUFSIZ> buff{};
+
+  ZSTD_EndDirective mode = last ? ZSTD_e_end : ZSTD_e_continue;
+  ZSTD_inBuffer input = {data, data_length, 0};
+
+  bool finished;
+  do {
+    ZSTD_outBuffer output = {buff.data(), CPPHTTPLIB_COMPRESSION_BUFSIZ, 0};
+    size_t const remaining = ZSTD_compressStream2(ctx_, &output, &input, mode);
+
+    if (ZSTD_isError(remaining)) { return false; }
+
+    if (!callback(buff.data(), output.pos)) { return false; }
+
+    finished = last ? (remaining == 0) : (input.pos == input.size);
+
+  } while (!finished);
+
+  return true;
+}
+
+inline zstd_decompressor::zstd_decompressor() { ctx_ = ZSTD_createDCtx(); }
+
+inline zstd_decompressor::~zstd_decompressor() { ZSTD_freeDCtx(ctx_); }
+
+inline bool zstd_decompressor::is_valid() const { return ctx_ != nullptr; }
+
+inline bool zstd_decompressor::decompress(const char *data, size_t data_length,
+                                          Callback callback) {
+  std::array<char, CPPHTTPLIB_COMPRESSION_BUFSIZ> buff{};
+  ZSTD_inBuffer input = {data, data_length, 0};
+
+  while (input.pos < input.size) {
+    ZSTD_outBuffer output = {buff.data(), CPPHTTPLIB_COMPRESSION_BUFSIZ, 0};
+    size_t const remaining = ZSTD_decompressStream(ctx_, &output, &input);
+
+    if (ZSTD_isError(remaining)) { return false; }
+
+    if (!callback(buff.data(), output.pos)) { return false; }
+  }
+
+  return true;
+}
+#endif
+
+inline bool is_prohibited_header_name(const std::string &name) {
+  using udl::operator""_t;
+
+  switch (str2tag(name)) {
+  case "REMOTE_ADDR"_t:
+  case "REMOTE_PORT"_t:
+  case "LOCAL_ADDR"_t:
+  case "LOCAL_PORT"_t: return true;
+  default: return false;
+  }
+}
+
+inline bool has_header(const Headers &headers, const std::string &key) {
+  if (is_prohibited_header_name(key)) { return false; }
+  return headers.find(key) != headers.end();
+}
+
+inline const char *get_header_value(const Headers &headers,
+                                    const std::string &key, const char *def,
+                                    size_t id) {
+  if (is_prohibited_header_name(key)) {
+#ifndef CPPHTTPLIB_NO_EXCEPTIONS
+    std::string msg = "Prohibited header name '" + key + "' is specified.";
+    throw std::invalid_argument(msg);
+#else
+    return "";
+#endif
+  }
+
+  auto rng = headers.equal_range(key);
+  auto it = rng.first;
+  std::advance(it, static_cast<ssize_t>(id));
+  if (it != rng.second) { return it->second.c_str(); }
+  return def;
+}
+
+template <typename T>
+inline bool parse_header(const char *beg, const char *end, T fn) {
+  // Skip trailing spaces and tabs.
+  while (beg < end && is_space_or_tab(end[-1])) {
+    end--;
+  }
+
+  auto p = beg;
+  while (p < end && *p != ':') {
+    p++;
+  }
+
+  auto name = std::string(beg, p);
+  if (!detail::fields::is_field_name(name)) { return false; }
+
+  if (p == end) { return false; }
+
+  auto key_end = p;
+
+  if (*p++ != ':') { return false; }
+
+  while (p < end && is_space_or_tab(*p)) {
+    p++;
+  }
+
+  if (p <= end) {
+    auto key_len = key_end - beg;
+    if (!key_len) { return false; }
+
+    auto key = std::string(beg, key_end);
+    auto val = std::string(p, end);
+
+    if (!detail::fields::is_field_value(val)) { return false; }
+
+    if (case_ignore::equal(key, "Location") ||
+        case_ignore::equal(key, "Referer")) {
+      fn(key, val);
+    } else {
+      fn(key, decode_path_component(val));
+    }
+
+    return true;
+  }
+
+  return false;
+}
+
+inline bool read_headers(Stream &strm, Headers &headers) {
+  const auto bufsiz = 2048;
+  char buf[bufsiz];
+  stream_line_reader line_reader(strm, buf, bufsiz);
+
+  size_t header_count = 0;
+
+  for (;;) {
+    if (!line_reader.getline()) { return false; }
+
+    // Check if the line ends with CRLF.
+    auto line_terminator_len = 2;
+    if (line_reader.end_with_crlf()) {
+      // Blank line indicates end of headers.
+      if (line_reader.size() == 2) { break; }
+    } else {
+#ifdef CPPHTTPLIB_ALLOW_LF_AS_LINE_TERMINATOR
+      // Blank line indicates end of headers.
+      if (line_reader.size() == 1) { break; }
+      line_terminator_len = 1;
+#else
+      continue; // Skip invalid line.
+#endif
+    }
+
+    if (line_reader.size() > CPPHTTPLIB_HEADER_MAX_LENGTH) { return false; }
+
+    // Check header count limit
+    if (header_count >= CPPHTTPLIB_HEADER_MAX_COUNT) { return false; }
+
+    // Exclude line terminator
+    auto end = line_reader.ptr() + line_reader.size() - line_terminator_len;
+
+    if (!parse_header(line_reader.ptr(), end,
+                      [&](const std::string &key, const std::string &val) {
+                        headers.emplace(key, val);
+                      })) {
+      return false;
+    }
+
+    header_count++;
+  }
+
+  return true;
+}
+
+inline bool read_content_with_length(Stream &strm, size_t len,
+                                     DownloadProgress progress,
+                                     ContentReceiverWithProgress out) {
+  char buf[CPPHTTPLIB_RECV_BUFSIZ];
+
+  size_t r = 0;
+  while (r < len) {
+    auto read_len = static_cast<size_t>(len - r);
+    auto n = strm.read(buf, (std::min)(read_len, CPPHTTPLIB_RECV_BUFSIZ));
+    if (n <= 0) { return false; }
+
+    if (!out(buf, static_cast<size_t>(n), r, len)) { return false; }
+    r += static_cast<size_t>(n);
+
+    if (progress) {
+      if (!progress(r, len)) { return false; }
+    }
+  }
+
+  return true;
+}
+
+inline void skip_content_with_length(Stream &strm, size_t len) {
+  char buf[CPPHTTPLIB_RECV_BUFSIZ];
+  size_t r = 0;
+  while (r < len) {
+    auto read_len = static_cast<size_t>(len - r);
+    auto n = strm.read(buf, (std::min)(read_len, CPPHTTPLIB_RECV_BUFSIZ));
+    if (n <= 0) { return; }
+    r += static_cast<size_t>(n);
+  }
+}
+
+enum class ReadContentResult {
+  Success,         // Successfully read the content
+  PayloadTooLarge, // The content exceeds the specified payload limit
+  Error            // An error occurred while reading the content
+};
+
+inline ReadContentResult
+read_content_without_length(Stream &strm, size_t payload_max_length,
+                            ContentReceiverWithProgress out) {
+  char buf[CPPHTTPLIB_RECV_BUFSIZ];
+  size_t r = 0;
+  for (;;) {
+    auto n = strm.read(buf, CPPHTTPLIB_RECV_BUFSIZ);
+    if (n == 0) { return ReadContentResult::Success; }
+    if (n < 0) { return ReadContentResult::Error; }
+
+    // Check if adding this data would exceed the payload limit
+    if (r > payload_max_length ||
+        payload_max_length - r < static_cast<size_t>(n)) {
+      return ReadContentResult::PayloadTooLarge;
+    }
+
+    if (!out(buf, static_cast<size_t>(n), r, 0)) {
+      return ReadContentResult::Error;
+    }
+    r += static_cast<size_t>(n);
+  }
+
+  return ReadContentResult::Success;
+}
+
+template <typename T>
+inline ReadContentResult read_content_chunked(Stream &strm, T &x,
+                                              size_t payload_max_length,
+                                              ContentReceiverWithProgress out) {
+  const auto bufsiz = 16;
+  char buf[bufsiz];
+
+  stream_line_reader line_reader(strm, buf, bufsiz);
+
+  if (!line_reader.getline()) { return ReadContentResult::Error; }
+
+  unsigned long chunk_len;
+  size_t total_len = 0;
+  while (true) {
+    char *end_ptr;
+
+    chunk_len = std::strtoul(line_reader.ptr(), &end_ptr, 16);
+
+    if (end_ptr == line_reader.ptr()) { return ReadContentResult::Error; }
+    if (chunk_len == ULONG_MAX) { return ReadContentResult::Error; }
+
+    if (chunk_len == 0) { break; }
+
+    // Check if adding this chunk would exceed the payload limit
+    if (total_len > payload_max_length ||
+        payload_max_length - total_len < chunk_len) {
+      return ReadContentResult::PayloadTooLarge;
+    }
+
+    total_len += chunk_len;
+
+    if (!read_content_with_length(strm, chunk_len, nullptr, out)) {
+      return ReadContentResult::Error;
+    }
+
+    if (!line_reader.getline()) { return ReadContentResult::Error; }
+
+    if (strcmp(line_reader.ptr(), "\r\n") != 0) {
+      return ReadContentResult::Error;
+    }
+
+    if (!line_reader.getline()) { return ReadContentResult::Error; }
+  }
+
+  assert(chunk_len == 0);
+
+  // NOTE: In RFC 9112, '7.1 Chunked Transfer Coding' mentions "The chunked
+  // transfer coding is complete when a chunk with a chunk-size of zero is
+  // received, possibly followed by a trailer section, and finally terminated by
+  // an empty line". https://www.rfc-editor.org/rfc/rfc9112.html#section-7.1
+  //
+  // In '7.1.3. Decoding Chunked', however, the pseudo-code in the section
+  // does't care for the existence of the final CRLF. In other words, it seems
+  // to be ok whether the final CRLF exists or not in the chunked data.
+  // https://www.rfc-editor.org/rfc/rfc9112.html#section-7.1.3
+  //
+  // According to the reference code in RFC 9112, cpp-httplib now allows
+  // chunked transfer coding data without the final CRLF.
+  if (!line_reader.getline()) { return ReadContentResult::Success; }
+
+  // RFC 7230 Section 4.1.2 - Headers prohibited in trailers
+  thread_local case_ignore::unordered_set<std::string> prohibited_trailers = {
+      // Message framing
+      "transfer-encoding", "content-length",
+
+      // Routing
+      "host",
+
+      // Authentication
+      "authorization", "www-authenticate", "proxy-authenticate",
+      "proxy-authorization", "cookie", "set-cookie",
+
+      // Request modifiers
+      "cache-control", "expect", "max-forwards", "pragma", "range", "te",
+
+      // Response control
+      "age", "expires", "date", "location", "retry-after", "vary", "warning",
+
+      // Payload processing
+      "content-encoding", "content-type", "content-range", "trailer"};
+
+  // Parse declared trailer headers once for performance
+  case_ignore::unordered_set<std::string> declared_trailers;
+  if (has_header(x.headers, "Trailer")) {
+    auto trailer_header = get_header_value(x.headers, "Trailer", "", 0);
+    auto len = std::strlen(trailer_header);
+
+    split(trailer_header, trailer_header + len, ',',
+          [&](const char *b, const char *e) {
+            std::string key(b, e);
+            if (prohibited_trailers.find(key) == prohibited_trailers.end()) {
+              declared_trailers.insert(key);
+            }
+          });
+  }
+
+  size_t trailer_header_count = 0;
+  while (strcmp(line_reader.ptr(), "\r\n") != 0) {
+    if (line_reader.size() > CPPHTTPLIB_HEADER_MAX_LENGTH) {
+      return ReadContentResult::Error;
+    }
+
+    // Check trailer header count limit
+    if (trailer_header_count >= CPPHTTPLIB_HEADER_MAX_COUNT) {
+      return ReadContentResult::Error;
+    }
+
+    // Exclude line terminator
+    constexpr auto line_terminator_len = 2;
+    auto end = line_reader.ptr() + line_reader.size() - line_terminator_len;
+
+    parse_header(line_reader.ptr(), end,
+                 [&](const std::string &key, const std::string &val) {
+                   if (declared_trailers.find(key) != declared_trailers.end()) {
+                     x.trailers.emplace(key, val);
+                     trailer_header_count++;
+                   }
+                 });
+
+    if (!line_reader.getline()) { return ReadContentResult::Error; }
+  }
+
+  return ReadContentResult::Success;
+}
+
+inline bool is_chunked_transfer_encoding(const Headers &headers) {
+  return case_ignore::equal(
+      get_header_value(headers, "Transfer-Encoding", "", 0), "chunked");
+}
+
+template <typename T, typename U>
+bool prepare_content_receiver(T &x, int &status,
+                              ContentReceiverWithProgress receiver,
+                              bool decompress, U callback) {
+  if (decompress) {
+    std::string encoding = x.get_header_value("Content-Encoding");
+    std::unique_ptr<decompressor> decompressor;
+
+    if (encoding == "gzip" || encoding == "deflate") {
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+      decompressor = detail::make_unique<gzip_decompressor>();
+#else
+      status = StatusCode::UnsupportedMediaType_415;
+      return false;
+#endif
+    } else if (encoding.find("br") != std::string::npos) {
+#ifdef CPPHTTPLIB_BROTLI_SUPPORT
+      decompressor = detail::make_unique<brotli_decompressor>();
+#else
+      status = StatusCode::UnsupportedMediaType_415;
+      return false;
+#endif
+    } else if (encoding == "zstd") {
+#ifdef CPPHTTPLIB_ZSTD_SUPPORT
+      decompressor = detail::make_unique<zstd_decompressor>();
+#else
+      status = StatusCode::UnsupportedMediaType_415;
+      return false;
+#endif
+    }
+
+    if (decompressor) {
+      if (decompressor->is_valid()) {
+        ContentReceiverWithProgress out = [&](const char *buf, size_t n,
+                                              size_t off, size_t len) {
+          return decompressor->decompress(buf, n,
+                                          [&](const char *buf2, size_t n2) {
+                                            return receiver(buf2, n2, off, len);
+                                          });
+        };
+        return callback(std::move(out));
+      } else {
+        status = StatusCode::InternalServerError_500;
+        return false;
+      }
+    }
+  }
+
+  ContentReceiverWithProgress out = [&](const char *buf, size_t n, size_t off,
+                                        size_t len) {
+    return receiver(buf, n, off, len);
+  };
+  return callback(std::move(out));
+}
+
+template <typename T>
+bool read_content(Stream &strm, T &x, size_t payload_max_length, int &status,
+                  DownloadProgress progress,
+                  ContentReceiverWithProgress receiver, bool decompress) {
+  return prepare_content_receiver(
+      x, status, std::move(receiver), decompress,
+      [&](const ContentReceiverWithProgress &out) {
+        auto ret = true;
+        auto exceed_payload_max_length = false;
+
+        if (is_chunked_transfer_encoding(x.headers)) {
+          auto result = read_content_chunked(strm, x, payload_max_length, out);
+          if (result == ReadContentResult::Success) {
+            ret = true;
+          } else if (result == ReadContentResult::PayloadTooLarge) {
+            exceed_payload_max_length = true;
+            ret = false;
+          } else {
+            ret = false;
+          }
+        } else if (!has_header(x.headers, "Content-Length")) {
+          auto result =
+              read_content_without_length(strm, payload_max_length, out);
+          if (result == ReadContentResult::Success) {
+            ret = true;
+          } else if (result == ReadContentResult::PayloadTooLarge) {
+            exceed_payload_max_length = true;
+            ret = false;
+          } else {
+            ret = false;
+          }
+        } else {
+          auto is_invalid_value = false;
+          auto len = get_header_value_u64(x.headers, "Content-Length",
+                                          (std::numeric_limits<size_t>::max)(),
+                                          0, is_invalid_value);
+
+          if (is_invalid_value) {
+            ret = false;
+          } else if (len > payload_max_length) {
+            exceed_payload_max_length = true;
+            skip_content_with_length(strm, len);
+            ret = false;
+          } else if (len > 0) {
+            ret = read_content_with_length(strm, len, std::move(progress), out);
+          }
+        }
+
+        if (!ret) {
+          status = exceed_payload_max_length ? StatusCode::PayloadTooLarge_413
+                                             : StatusCode::BadRequest_400;
+        }
+        return ret;
+      });
+}
+
+inline ssize_t write_request_line(Stream &strm, const std::string &method,
+                                  const std::string &path) {
+  std::string s = method;
+  s += " ";
+  s += path;
+  s += " HTTP/1.1\r\n";
+  return strm.write(s.data(), s.size());
+}
+
+inline ssize_t write_response_line(Stream &strm, int status) {
+  std::string s = "HTTP/1.1 ";
+  s += std::to_string(status);
+  s += " ";
+  s += httplib::status_message(status);
+  s += "\r\n";
+  return strm.write(s.data(), s.size());
+}
+
+inline ssize_t write_headers(Stream &strm, const Headers &headers) {
+  ssize_t write_len = 0;
+  for (const auto &x : headers) {
+    std::string s;
+    s = x.first;
+    s += ": ";
+    s += x.second;
+    s += "\r\n";
+
+    auto len = strm.write(s.data(), s.size());
+    if (len < 0) { return len; }
+    write_len += len;
+  }
+  auto len = strm.write("\r\n");
+  if (len < 0) { return len; }
+  write_len += len;
+  return write_len;
+}
+
+inline bool write_data(Stream &strm, const char *d, size_t l) {
+  size_t offset = 0;
+  while (offset < l) {
+    auto length = strm.write(d + offset, l - offset);
+    if (length < 0) { return false; }
+    offset += static_cast<size_t>(length);
+  }
+  return true;
+}
+
+template <typename T>
+inline bool write_content_with_progress(Stream &strm,
+                                        const ContentProvider &content_provider,
+                                        size_t offset, size_t length,
+                                        T is_shutting_down,
+                                        const UploadProgress &upload_progress,
+                                        Error &error) {
+  size_t end_offset = offset + length;
+  size_t start_offset = offset;
+  auto ok = true;
+  DataSink data_sink;
+
+  data_sink.write = [&](const char *d, size_t l) -> bool {
+    if (ok) {
+      if (write_data(strm, d, l)) {
+        offset += l;
+
+        if (upload_progress && length > 0) {
+          size_t current_written = offset - start_offset;
+          if (!upload_progress(current_written, length)) {
+            ok = false;
+            return false;
+          }
+        }
+      } else {
+        ok = false;
+      }
+    }
+    return ok;
+  };
+
+  data_sink.is_writable = [&]() -> bool { return strm.wait_writable(); };
+
+  while (offset < end_offset && !is_shutting_down()) {
+    if (!strm.wait_writable()) {
+      error = Error::Write;
+      return false;
+    } else if (!content_provider(offset, end_offset - offset, data_sink)) {
+      error = Error::Canceled;
+      return false;
+    } else if (!ok) {
+      error = Error::Write;
+      return false;
+    }
+  }
+
+  error = Error::Success;
+  return true;
+}
+
+template <typename T>
+inline bool write_content(Stream &strm, const ContentProvider &content_provider,
+                          size_t offset, size_t length, T is_shutting_down,
+                          Error &error) {
+  return write_content_with_progress<T>(strm, content_provider, offset, length,
+                                        is_shutting_down, nullptr, error);
+}
+
+template <typename T>
+inline bool write_content(Stream &strm, const ContentProvider &content_provider,
+                          size_t offset, size_t length,
+                          const T &is_shutting_down) {
+  auto error = Error::Success;
+  return write_content(strm, content_provider, offset, length, is_shutting_down,
+                       error);
+}
+
+template <typename T>
+inline bool
+write_content_without_length(Stream &strm,
+                             const ContentProvider &content_provider,
+                             const T &is_shutting_down) {
+  size_t offset = 0;
+  auto data_available = true;
+  auto ok = true;
+  DataSink data_sink;
+
+  data_sink.write = [&](const char *d, size_t l) -> bool {
+    if (ok) {
+      offset += l;
+      if (!write_data(strm, d, l)) { ok = false; }
+    }
+    return ok;
+  };
+
+  data_sink.is_writable = [&]() -> bool { return strm.wait_writable(); };
+
+  data_sink.done = [&](void) { data_available = false; };
+
+  while (data_available && !is_shutting_down()) {
+    if (!strm.wait_writable()) {
+      return false;
+    } else if (!content_provider(offset, 0, data_sink)) {
+      return false;
+    } else if (!ok) {
+      return false;
+    }
+  }
+  return true;
+}
+
+template <typename T, typename U>
+inline bool
+write_content_chunked(Stream &strm, const ContentProvider &content_provider,
+                      const T &is_shutting_down, U &compressor, Error &error) {
+  size_t offset = 0;
+  auto data_available = true;
+  auto ok = true;
+  DataSink data_sink;
+
+  data_sink.write = [&](const char *d, size_t l) -> bool {
+    if (ok) {
+      data_available = l > 0;
+      offset += l;
+
+      std::string payload;
+      if (compressor.compress(d, l, false,
+                              [&](const char *data, size_t data_len) {
+                                payload.append(data, data_len);
+                                return true;
+                              })) {
+        if (!payload.empty()) {
+          // Emit chunked response header and footer for each chunk
+          auto chunk =
+              from_i_to_hex(payload.size()) + "\r\n" + payload + "\r\n";
+          if (!write_data(strm, chunk.data(), chunk.size())) { ok = false; }
+        }
+      } else {
+        ok = false;
+      }
+    }
+    return ok;
+  };
+
+  data_sink.is_writable = [&]() -> bool { return strm.wait_writable(); };
+
+  auto done_with_trailer = [&](const Headers *trailer) {
+    if (!ok) { return; }
+
+    data_available = false;
+
+    std::string payload;
+    if (!compressor.compress(nullptr, 0, true,
+                             [&](const char *data, size_t data_len) {
+                               payload.append(data, data_len);
+                               return true;
+                             })) {
+      ok = false;
+      return;
+    }
+
+    if (!payload.empty()) {
+      // Emit chunked response header and footer for each chunk
+      auto chunk = from_i_to_hex(payload.size()) + "\r\n" + payload + "\r\n";
+      if (!write_data(strm, chunk.data(), chunk.size())) {
+        ok = false;
+        return;
+      }
+    }
+
+    constexpr const char done_marker[] = "0\r\n";
+    if (!write_data(strm, done_marker, str_len(done_marker))) { ok = false; }
+
+    // Trailer
+    if (trailer) {
+      for (const auto &kv : *trailer) {
+        std::string field_line = kv.first + ": " + kv.second + "\r\n";
+        if (!write_data(strm, field_line.data(), field_line.size())) {
+          ok = false;
+        }
+      }
+    }
+
+    constexpr const char crlf[] = "\r\n";
+    if (!write_data(strm, crlf, str_len(crlf))) { ok = false; }
+  };
+
+  data_sink.done = [&](void) { done_with_trailer(nullptr); };
+
+  data_sink.done_with_trailer = [&](const Headers &trailer) {
+    done_with_trailer(&trailer);
+  };
+
+  while (data_available && !is_shutting_down()) {
+    if (!strm.wait_writable()) {
+      error = Error::Write;
+      return false;
+    } else if (!content_provider(offset, 0, data_sink)) {
+      error = Error::Canceled;
+      return false;
+    } else if (!ok) {
+      error = Error::Write;
+      return false;
+    }
+  }
+
+  error = Error::Success;
+  return true;
+}
+
+template <typename T, typename U>
+inline bool write_content_chunked(Stream &strm,
+                                  const ContentProvider &content_provider,
+                                  const T &is_shutting_down, U &compressor) {
+  auto error = Error::Success;
+  return write_content_chunked(strm, content_provider, is_shutting_down,
+                               compressor, error);
+}
+
+template <typename T>
+inline bool redirect(T &cli, Request &req, Response &res,
+                     const std::string &path, const std::string &location,
+                     Error &error) {
+  Request new_req = req;
+  new_req.path = path;
+  new_req.redirect_count_ -= 1;
+
+  if (res.status == StatusCode::SeeOther_303 &&
+      (req.method != "GET" && req.method != "HEAD")) {
+    new_req.method = "GET";
+    new_req.body.clear();
+    new_req.headers.clear();
+  }
+
+  Response new_res;
+
+  auto ret = cli.send(new_req, new_res, error);
+  if (ret) {
+    req = new_req;
+    res = new_res;
+
+    if (res.location.empty()) { res.location = location; }
+  }
+  return ret;
+}
+
+inline std::string params_to_query_str(const Params &params) {
+  std::string query;
+
+  for (auto it = params.begin(); it != params.end(); ++it) {
+    if (it != params.begin()) { query += "&"; }
+    query += encode_query_component(it->first);
+    query += "=";
+    query += encode_query_component(it->second);
+  }
+  return query;
+}
+
+inline void parse_query_text(const char *data, std::size_t size,
+                             Params &params) {
+  std::set<std::string> cache;
+  split(data, data + size, '&', [&](const char *b, const char *e) {
+    std::string kv(b, e);
+    if (cache.find(kv) != cache.end()) { return; }
+    cache.insert(std::move(kv));
+
+    std::string key;
+    std::string val;
+    divide(b, static_cast<std::size_t>(e - b), '=',
+           [&](const char *lhs_data, std::size_t lhs_size, const char *rhs_data,
+               std::size_t rhs_size) {
+             key.assign(lhs_data, lhs_size);
+             val.assign(rhs_data, rhs_size);
+           });
+
+    if (!key.empty()) {
+      params.emplace(decode_query_component(key), decode_query_component(val));
+    }
+  });
+}
+
+inline void parse_query_text(const std::string &s, Params &params) {
+  parse_query_text(s.data(), s.size(), params);
+}
+
+inline bool parse_multipart_boundary(const std::string &content_type,
+                                     std::string &boundary) {
+  auto boundary_keyword = "boundary=";
+  auto pos = content_type.find(boundary_keyword);
+  if (pos == std::string::npos) { return false; }
+  auto end = content_type.find(';', pos);
+  auto beg = pos + strlen(boundary_keyword);
+  boundary = trim_double_quotes_copy(content_type.substr(beg, end - beg));
+  return !boundary.empty();
+}
+
+inline void parse_disposition_params(const std::string &s, Params &params) {
+  std::set<std::string> cache;
+  split(s.data(), s.data() + s.size(), ';', [&](const char *b, const char *e) {
+    std::string kv(b, e);
+    if (cache.find(kv) != cache.end()) { return; }
+    cache.insert(kv);
+
+    std::string key;
+    std::string val;
+    split(b, e, '=', [&](const char *b2, const char *e2) {
+      if (key.empty()) {
+        key.assign(b2, e2);
+      } else {
+        val.assign(b2, e2);
+      }
+    });
+
+    if (!key.empty()) {
+      params.emplace(trim_double_quotes_copy((key)),
+                     trim_double_quotes_copy((val)));
+    }
+  });
+}
+
+#ifdef CPPHTTPLIB_NO_EXCEPTIONS
+inline bool parse_range_header(const std::string &s, Ranges &ranges) {
+#else
+inline bool parse_range_header(const std::string &s, Ranges &ranges) try {
+#endif
+  auto is_valid = [](const std::string &str) {
+    return std::all_of(str.cbegin(), str.cend(),
+                       [](unsigned char c) { return std::isdigit(c); });
+  };
+
+  if (s.size() > 7 && s.compare(0, 6, "bytes=") == 0) {
+    const auto pos = static_cast<size_t>(6);
+    const auto len = static_cast<size_t>(s.size() - 6);
+    auto all_valid_ranges = true;
+    split(&s[pos], &s[pos + len], ',', [&](const char *b, const char *e) {
+      if (!all_valid_ranges) { return; }
+
+      const auto it = std::find(b, e, '-');
+      if (it == e) {
+        all_valid_ranges = false;
+        return;
+      }
+
+      const auto lhs = std::string(b, it);
+      const auto rhs = std::string(it + 1, e);
+      if (!is_valid(lhs) || !is_valid(rhs)) {
+        all_valid_ranges = false;
+        return;
+      }
+
+      const auto first =
+          static_cast<ssize_t>(lhs.empty() ? -1 : std::stoll(lhs));
+      const auto last =
+          static_cast<ssize_t>(rhs.empty() ? -1 : std::stoll(rhs));
+      if ((first == -1 && last == -1) ||
+          (first != -1 && last != -1 && first > last)) {
+        all_valid_ranges = false;
+        return;
+      }
+
+      ranges.emplace_back(first, last);
+    });
+    return all_valid_ranges && !ranges.empty();
+  }
+  return false;
+#ifdef CPPHTTPLIB_NO_EXCEPTIONS
+}
+#else
+} catch (...) { return false; }
+#endif
+
+inline bool parse_accept_header(const std::string &s,
+                                std::vector<std::string> &content_types) {
+  content_types.clear();
+
+  // Empty string is considered valid (no preference)
+  if (s.empty()) { return true; }
+
+  // Check for invalid patterns: leading/trailing commas or consecutive commas
+  if (s.front() == ',' || s.back() == ',' ||
+      s.find(",,") != std::string::npos) {
+    return false;
+  }
+
+  struct AcceptEntry {
+    std::string media_type;
+    double quality;
+    int order; // Original order in header
+  };
+
+  std::vector<AcceptEntry> entries;
+  int order = 0;
+  bool has_invalid_entry = false;
+
+  // Split by comma and parse each entry
+  split(s.data(), s.data() + s.size(), ',', [&](const char *b, const char *e) {
+    std::string entry(b, e);
+    entry = trim_copy(entry);
+
+    if (entry.empty()) {
+      has_invalid_entry = true;
+      return;
+    }
+
+    AcceptEntry accept_entry;
+    accept_entry.quality = 1.0; // Default quality
+    accept_entry.order = order++;
+
+    // Find q= parameter
+    auto q_pos = entry.find(";q=");
+    if (q_pos == std::string::npos) { q_pos = entry.find("; q="); }
+
+    if (q_pos != std::string::npos) {
+      // Extract media type (before q parameter)
+      accept_entry.media_type = trim_copy(entry.substr(0, q_pos));
+
+      // Extract quality value
+      auto q_start = entry.find('=', q_pos) + 1;
+      auto q_end = entry.find(';', q_start);
+      if (q_end == std::string::npos) { q_end = entry.length(); }
+
+      std::string quality_str =
+          trim_copy(entry.substr(q_start, q_end - q_start));
+      if (quality_str.empty()) {
+        has_invalid_entry = true;
+        return;
+      }
+
+#ifdef CPPHTTPLIB_NO_EXCEPTIONS
+      {
+        std::istringstream iss(quality_str);
+        iss >> accept_entry.quality;
+
+        // Check if conversion was successful and entire string was consumed
+        if (iss.fail() || !iss.eof()) {
+          has_invalid_entry = true;
+          return;
+        }
+      }
+#else
+      try {
+        accept_entry.quality = std::stod(quality_str);
+      } catch (...) {
+        has_invalid_entry = true;
+        return;
+      }
+#endif
+      // Check if quality is in valid range [0.0, 1.0]
+      if (accept_entry.quality < 0.0 || accept_entry.quality > 1.0) {
+        has_invalid_entry = true;
+        return;
+      }
+    } else {
+      // No quality parameter, use entire entry as media type
+      accept_entry.media_type = entry;
+    }
+
+    // Remove additional parameters from media type
+    auto param_pos = accept_entry.media_type.find(';');
+    if (param_pos != std::string::npos) {
+      accept_entry.media_type =
+          trim_copy(accept_entry.media_type.substr(0, param_pos));
+    }
+
+    // Basic validation of media type format
+    if (accept_entry.media_type.empty()) {
+      has_invalid_entry = true;
+      return;
+    }
+
+    // Check for basic media type format (should contain '/' or be '*')
+    if (accept_entry.media_type != "*" &&
+        accept_entry.media_type.find('/') == std::string::npos) {
+      has_invalid_entry = true;
+      return;
+    }
+
+    entries.push_back(accept_entry);
+  });
+
+  // Return false if any invalid entry was found
+  if (has_invalid_entry) { return false; }
+
+  // Sort by quality (descending), then by original order (ascending)
+  std::sort(entries.begin(), entries.end(),
+            [](const AcceptEntry &a, const AcceptEntry &b) {
+              if (a.quality != b.quality) {
+                return a.quality > b.quality; // Higher quality first
+              }
+              return a.order < b.order; // Earlier order first for same quality
+            });
+
+  // Extract sorted media types
+  content_types.reserve(entries.size());
+  for (const auto &entry : entries) {
+    content_types.push_back(entry.media_type);
+  }
+
+  return true;
+}
+
+class FormDataParser {
+public:
+  FormDataParser() = default;
+
+  void set_boundary(std::string &&boundary) {
+    boundary_ = boundary;
+    dash_boundary_crlf_ = dash_ + boundary_ + crlf_;
+    crlf_dash_boundary_ = crlf_ + dash_ + boundary_;
+  }
+
+  bool is_valid() const { return is_valid_; }
+
+  bool parse(const char *buf, size_t n, const FormDataHeader &header_callback,
+             const ContentReceiver &content_callback) {
+
+    buf_append(buf, n);
+
+    while (buf_size() > 0) {
+      switch (state_) {
+      case 0: { // Initial boundary
+        auto pos = buf_find(dash_boundary_crlf_);
+        if (pos == buf_size()) { return true; }
+        buf_erase(pos + dash_boundary_crlf_.size());
+        state_ = 1;
+        break;
+      }
+      case 1: { // New entry
+        clear_file_info();
+        state_ = 2;
+        break;
+      }
+      case 2: { // Headers
+        auto pos = buf_find(crlf_);
+        if (pos > CPPHTTPLIB_HEADER_MAX_LENGTH) { return false; }
+        while (pos < buf_size()) {
+          // Empty line
+          if (pos == 0) {
+            if (!header_callback(file_)) {
+              is_valid_ = false;
+              return false;
+            }
+            buf_erase(crlf_.size());
+            state_ = 3;
+            break;
+          }
+
+          const auto header = buf_head(pos);
+
+          if (!parse_header(header.data(), header.data() + header.size(),
+                            [&](const std::string &, const std::string &) {})) {
+            is_valid_ = false;
+            return false;
+          }
+
+          // Parse and emplace space trimmed headers into a map
+          if (!parse_header(
+                  header.data(), header.data() + header.size(),
+                  [&](const std::string &key, const std::string &val) {
+                    file_.headers.emplace(key, val);
+                  })) {
+            is_valid_ = false;
+            return false;
+          }
+
+          constexpr const char header_content_type[] = "Content-Type:";
+
+          if (start_with_case_ignore(header, header_content_type)) {
+            file_.content_type =
+                trim_copy(header.substr(str_len(header_content_type)));
+          } else {
+            thread_local const std::regex re_content_disposition(
+                R"~(^Content-Disposition:\s*form-data;\s*(.*)$)~",
+                std::regex_constants::icase);
+
+            std::smatch m;
+            if (std::regex_match(header, m, re_content_disposition)) {
+              Params params;
+              parse_disposition_params(m[1], params);
+
+              auto it = params.find("name");
+              if (it != params.end()) {
+                file_.name = it->second;
+              } else {
+                is_valid_ = false;
+                return false;
+              }
+
+              it = params.find("filename");
+              if (it != params.end()) { file_.filename = it->second; }
+
+              it = params.find("filename*");
+              if (it != params.end()) {
+                // Only allow UTF-8 encoding...
+                thread_local const std::regex re_rfc5987_encoding(
+                    R"~(^UTF-8''(.+?)$)~", std::regex_constants::icase);
+
+                std::smatch m2;
+                if (std::regex_match(it->second, m2, re_rfc5987_encoding)) {
+                  file_.filename = decode_path_component(m2[1]); // override...
+                } else {
+                  is_valid_ = false;
+                  return false;
+                }
+              }
+            }
+          }
+          buf_erase(pos + crlf_.size());
+          pos = buf_find(crlf_);
+        }
+        if (state_ != 3) { return true; }
+        break;
+      }
+      case 3: { // Body
+        if (crlf_dash_boundary_.size() > buf_size()) { return true; }
+        auto pos = buf_find(crlf_dash_boundary_);
+        if (pos < buf_size()) {
+          if (!content_callback(buf_data(), pos)) {
+            is_valid_ = false;
+            return false;
+          }
+          buf_erase(pos + crlf_dash_boundary_.size());
+          state_ = 4;
+        } else {
+          auto len = buf_size() - crlf_dash_boundary_.size();
+          if (len > 0) {
+            if (!content_callback(buf_data(), len)) {
+              is_valid_ = false;
+              return false;
+            }
+            buf_erase(len);
+          }
+          return true;
+        }
+        break;
+      }
+      case 4: { // Boundary
+        if (crlf_.size() > buf_size()) { return true; }
+        if (buf_start_with(crlf_)) {
+          buf_erase(crlf_.size());
+          state_ = 1;
+        } else {
+          if (dash_.size() > buf_size()) { return true; }
+          if (buf_start_with(dash_)) {
+            buf_erase(dash_.size());
+            is_valid_ = true;
+            buf_erase(buf_size()); // Remove epilogue
+          } else {
+            return true;
+          }
+        }
+        break;
+      }
+      }
+    }
+
+    return true;
+  }
+
+private:
+  void clear_file_info() {
+    file_.name.clear();
+    file_.filename.clear();
+    file_.content_type.clear();
+    file_.headers.clear();
+  }
+
+  bool start_with_case_ignore(const std::string &a, const char *b) const {
+    const auto b_len = strlen(b);
+    if (a.size() < b_len) { return false; }
+    for (size_t i = 0; i < b_len; i++) {
+      if (case_ignore::to_lower(a[i]) != case_ignore::to_lower(b[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  const std::string dash_ = "--";
+  const std::string crlf_ = "\r\n";
+  std::string boundary_;
+  std::string dash_boundary_crlf_;
+  std::string crlf_dash_boundary_;
+
+  size_t state_ = 0;
+  bool is_valid_ = false;
+  FormData file_;
+
+  // Buffer
+  bool start_with(const std::string &a, size_t spos, size_t epos,
+                  const std::string &b) const {
+    if (epos - spos < b.size()) { return false; }
+    for (size_t i = 0; i < b.size(); i++) {
+      if (a[i + spos] != b[i]) { return false; }
+    }
+    return true;
+  }
+
+  size_t buf_size() const { return buf_epos_ - buf_spos_; }
+
+  const char *buf_data() const { return &buf_[buf_spos_]; }
+
+  std::string buf_head(size_t l) const { return buf_.substr(buf_spos_, l); }
+
+  bool buf_start_with(const std::string &s) const {
+    return start_with(buf_, buf_spos_, buf_epos_, s);
+  }
+
+  size_t buf_find(const std::string &s) const {
+    auto c = s.front();
+
+    size_t off = buf_spos_;
+    while (off < buf_epos_) {
+      auto pos = off;
+      while (true) {
+        if (pos == buf_epos_) { return buf_size(); }
+        if (buf_[pos] == c) { break; }
+        pos++;
+      }
+
+      auto remaining_size = buf_epos_ - pos;
+      if (s.size() > remaining_size) { return buf_size(); }
+
+      if (start_with(buf_, pos, buf_epos_, s)) { return pos - buf_spos_; }
+
+      off = pos + 1;
+    }
+
+    return buf_size();
+  }
+
+  void buf_append(const char *data, size_t n) {
+    auto remaining_size = buf_size();
+    if (remaining_size > 0 && buf_spos_ > 0) {
+      for (size_t i = 0; i < remaining_size; i++) {
+        buf_[i] = buf_[buf_spos_ + i];
+      }
+    }
+    buf_spos_ = 0;
+    buf_epos_ = remaining_size;
+
+    if (remaining_size + n > buf_.size()) { buf_.resize(remaining_size + n); }
+
+    for (size_t i = 0; i < n; i++) {
+      buf_[buf_epos_ + i] = data[i];
+    }
+    buf_epos_ += n;
+  }
+
+  void buf_erase(size_t size) { buf_spos_ += size; }
+
+  std::string buf_;
+  size_t buf_spos_ = 0;
+  size_t buf_epos_ = 0;
+};
+
+inline std::string random_string(size_t length) {
+  constexpr const char data[] =
+      "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+
+  thread_local auto engine([]() {
+    // std::random_device might actually be deterministic on some
+    // platforms, but due to lack of support in the c++ standard library,
+    // doing better requires either some ugly hacks or breaking portability.
+    std::random_device seed_gen;
+    // Request 128 bits of entropy for initialization
+    std::seed_seq seed_sequence{seed_gen(), seed_gen(), seed_gen(), seed_gen()};
+    return std::mt19937(seed_sequence);
+  }());
+
+  std::string result;
+  for (size_t i = 0; i < length; i++) {
+    result += data[engine() % (sizeof(data) - 1)];
+  }
+  return result;
+}
+
+inline std::string make_multipart_data_boundary() {
+  return "--cpp-httplib-multipart-data-" + detail::random_string(16);
+}
+
+inline bool is_multipart_boundary_chars_valid(const std::string &boundary) {
+  auto valid = true;
+  for (size_t i = 0; i < boundary.size(); i++) {
+    auto c = boundary[i];
+    if (!std::isalnum(c) && c != '-' && c != '_') {
+      valid = false;
+      break;
+    }
+  }
+  return valid;
+}
+
+template <typename T>
+inline std::string
+serialize_multipart_formdata_item_begin(const T &item,
+                                        const std::string &boundary) {
+  std::string body = "--" + boundary + "\r\n";
+  body += "Content-Disposition: form-data; name=\"" + item.name + "\"";
+  if (!item.filename.empty()) {
+    body += "; filename=\"" + item.filename + "\"";
+  }
+  body += "\r\n";
+  if (!item.content_type.empty()) {
+    body += "Content-Type: " + item.content_type + "\r\n";
+  }
+  body += "\r\n";
+
+  return body;
+}
+
+inline std::string serialize_multipart_formdata_item_end() { return "\r\n"; }
+
+inline std::string
+serialize_multipart_formdata_finish(const std::string &boundary) {
+  return "--" + boundary + "--\r\n";
+}
+
+inline std::string
+serialize_multipart_formdata_get_content_type(const std::string &boundary) {
+  return "multipart/form-data; boundary=" + boundary;
+}
+
+inline std::string
+serialize_multipart_formdata(const UploadFormDataItems &items,
+                             const std::string &boundary, bool finish = true) {
+  std::string body;
+
+  for (const auto &item : items) {
+    body += serialize_multipart_formdata_item_begin(item, boundary);
+    body += item.content + serialize_multipart_formdata_item_end();
+  }
+
+  if (finish) { body += serialize_multipart_formdata_finish(boundary); }
+
+  return body;
+}
+
+inline void coalesce_ranges(Ranges &ranges, size_t content_length) {
+  if (ranges.size() <= 1) return;
+
+  // Sort ranges by start position
+  std::sort(ranges.begin(), ranges.end(),
+            [](const Range &a, const Range &b) { return a.first < b.first; });
+
+  Ranges coalesced;
+  coalesced.reserve(ranges.size());
+
+  for (auto &r : ranges) {
+    auto first_pos = r.first;
+    auto last_pos = r.second;
+
+    // Handle special cases like in range_error
+    if (first_pos == -1 && last_pos == -1) {
+      first_pos = 0;
+      last_pos = static_cast<ssize_t>(content_length);
+    }
+
+    if (first_pos == -1) {
+      first_pos = static_cast<ssize_t>(content_length) - last_pos;
+      last_pos = static_cast<ssize_t>(content_length) - 1;
+    }
+
+    if (last_pos == -1 || last_pos >= static_cast<ssize_t>(content_length)) {
+      last_pos = static_cast<ssize_t>(content_length) - 1;
+    }
+
+    // Skip invalid ranges
+    if (!(0 <= first_pos && first_pos <= last_pos &&
+          last_pos < static_cast<ssize_t>(content_length))) {
+      continue;
+    }
+
+    // Coalesce with previous range if overlapping or adjacent (but not
+    // identical)
+    if (!coalesced.empty()) {
+      auto &prev = coalesced.back();
+      // Check if current range overlaps or is adjacent to previous range
+      // but don't coalesce identical ranges (allow duplicates)
+      if (first_pos <= prev.second + 1 &&
+          !(first_pos == prev.first && last_pos == prev.second)) {
+        // Extend the previous range
+        prev.second = (std::max)(prev.second, last_pos);
+        continue;
+      }
+    }
+
+    // Add new range
+    coalesced.emplace_back(first_pos, last_pos);
+  }
+
+  ranges = std::move(coalesced);
+}
+
+inline bool range_error(Request &req, Response &res) {
+  if (!req.ranges.empty() && 200 <= res.status && res.status < 300) {
+    ssize_t content_len = static_cast<ssize_t>(
+        res.content_length_ ? res.content_length_ : res.body.size());
+
+    std::vector<std::pair<ssize_t, ssize_t>> processed_ranges;
+    size_t overwrapping_count = 0;
+
+    // NOTE: The following Range check is based on '14.2. Range' in RFC 9110
+    // 'HTTP Semantics' to avoid potential denial-of-service attacks.
+    // https://www.rfc-editor.org/rfc/rfc9110#section-14.2
+
+    // Too many ranges
+    if (req.ranges.size() > CPPHTTPLIB_RANGE_MAX_COUNT) { return true; }
+
+    for (auto &r : req.ranges) {
+      auto &first_pos = r.first;
+      auto &last_pos = r.second;
+
+      if (first_pos == -1 && last_pos == -1) {
+        first_pos = 0;
+        last_pos = content_len;
+      }
+
+      if (first_pos == -1) {
+        first_pos = content_len - last_pos;
+        last_pos = content_len - 1;
+      }
+
+      // NOTE: RFC-9110 '14.1.2. Byte Ranges':
+      // A client can limit the number of bytes requested without knowing the
+      // size of the selected representation. If the last-pos value is absent,
+      // or if the value is greater than or equal to the current length of the
+      // representation data, the byte range is interpreted as the remainder of
+      // the representation (i.e., the server replaces the value of last-pos
+      // with a value that is one less than the current length of the selected
+      // representation).
+      // https://www.rfc-editor.org/rfc/rfc9110.html#section-14.1.2-6
+      if (last_pos == -1 || last_pos >= content_len) {
+        last_pos = content_len - 1;
+      }
+
+      // Range must be within content length
+      if (!(0 <= first_pos && first_pos <= last_pos &&
+            last_pos <= content_len - 1)) {
+        return true;
+      }
+
+      // Request must not have more than two overlapping ranges
+      for (const auto &processed_range : processed_ranges) {
+        if (!(last_pos < processed_range.first ||
+              first_pos > processed_range.second)) {
+          overwrapping_count++;
+          if (overwrapping_count > 2) { return true; }
+          break; // Only count once per range
+        }
+      }
+
+      processed_ranges.emplace_back(first_pos, last_pos);
+    }
+
+    // After validation, coalesce overlapping ranges as per RFC 9110
+    coalesce_ranges(req.ranges, static_cast<size_t>(content_len));
+  }
+
+  return false;
+}
+
+inline std::pair<size_t, size_t>
+get_range_offset_and_length(Range r, size_t content_length) {
+  assert(r.first != -1 && r.second != -1);
+  assert(0 <= r.first && r.first < static_cast<ssize_t>(content_length));
+  assert(r.first <= r.second &&
+         r.second < static_cast<ssize_t>(content_length));
+  (void)(content_length);
+  return std::make_pair(r.first, static_cast<size_t>(r.second - r.first) + 1);
+}
+
+inline std::string make_content_range_header_field(
+    const std::pair<size_t, size_t> &offset_and_length, size_t content_length) {
+  auto st = offset_and_length.first;
+  auto ed = st + offset_and_length.second - 1;
+
+  std::string field = "bytes ";
+  field += std::to_string(st);
+  field += "-";
+  field += std::to_string(ed);
+  field += "/";
+  field += std::to_string(content_length);
+  return field;
+}
+
+template <typename SToken, typename CToken, typename Content>
+bool process_multipart_ranges_data(const Request &req,
+                                   const std::string &boundary,
+                                   const std::string &content_type,
+                                   size_t content_length, SToken stoken,
+                                   CToken ctoken, Content content) {
+  for (size_t i = 0; i < req.ranges.size(); i++) {
+    ctoken("--");
+    stoken(boundary);
+    ctoken("\r\n");
+    if (!content_type.empty()) {
+      ctoken("Content-Type: ");
+      stoken(content_type);
+      ctoken("\r\n");
+    }
+
+    auto offset_and_length =
+        get_range_offset_and_length(req.ranges[i], content_length);
+
+    ctoken("Content-Range: ");
+    stoken(make_content_range_header_field(offset_and_length, content_length));
+    ctoken("\r\n");
+    ctoken("\r\n");
+
+    if (!content(offset_and_length.first, offset_and_length.second)) {
+      return false;
+    }
+    ctoken("\r\n");
+  }
+
+  ctoken("--");
+  stoken(boundary);
+  ctoken("--");
+
+  return true;
+}
+
+inline void make_multipart_ranges_data(const Request &req, Response &res,
+                                       const std::string &boundary,
+                                       const std::string &content_type,
+                                       size_t content_length,
+                                       std::string &data) {
+  process_multipart_ranges_data(
+      req, boundary, content_type, content_length,
+      [&](const std::string &token) { data += token; },
+      [&](const std::string &token) { data += token; },
+      [&](size_t offset, size_t length) {
+        assert(offset + length <= content_length);
+        data += res.body.substr(offset, length);
+        return true;
+      });
+}
+
+inline size_t get_multipart_ranges_data_length(const Request &req,
+                                               const std::string &boundary,
+                                               const std::string &content_type,
+                                               size_t content_length) {
+  size_t data_length = 0;
+
+  process_multipart_ranges_data(
+      req, boundary, content_type, content_length,
+      [&](const std::string &token) { data_length += token.size(); },
+      [&](const std::string &token) { data_length += token.size(); },
+      [&](size_t /*offset*/, size_t length) {
+        data_length += length;
+        return true;
+      });
+
+  return data_length;
+}
+
+template <typename T>
+inline bool
+write_multipart_ranges_data(Stream &strm, const Request &req, Response &res,
+                            const std::string &boundary,
+                            const std::string &content_type,
+                            size_t content_length, const T &is_shutting_down) {
+  return process_multipart_ranges_data(
+      req, boundary, content_type, content_length,
+      [&](const std::string &token) { strm.write(token); },
+      [&](const std::string &token) { strm.write(token); },
+      [&](size_t offset, size_t length) {
+        return write_content(strm, res.content_provider_, offset, length,
+                             is_shutting_down);
+      });
+}
+
+inline bool expect_content(const Request &req) {
+  if (req.method == "POST" || req.method == "PUT" || req.method == "PATCH" ||
+      req.method == "DELETE") {
+    return true;
+  }
+  if (req.has_header("Content-Length") &&
+      req.get_header_value_u64("Content-Length") > 0) {
+    return true;
+  }
+  if (is_chunked_transfer_encoding(req.headers)) { return true; }
+  return false;
+}
+
+inline bool has_crlf(const std::string &s) {
+  auto p = s.c_str();
+  while (*p) {
+    if (*p == '\r' || *p == '\n') { return true; }
+    p++;
+  }
+  return false;
+}
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+inline std::string message_digest(const std::string &s, const EVP_MD *algo) {
+  auto context = std::unique_ptr<EVP_MD_CTX, decltype(&EVP_MD_CTX_free)>(
+      EVP_MD_CTX_new(), EVP_MD_CTX_free);
+
+  unsigned int hash_length = 0;
+  unsigned char hash[EVP_MAX_MD_SIZE];
+
+  EVP_DigestInit_ex(context.get(), algo, nullptr);
+  EVP_DigestUpdate(context.get(), s.c_str(), s.size());
+  EVP_DigestFinal_ex(context.get(), hash, &hash_length);
+
+  std::stringstream ss;
+  for (auto i = 0u; i < hash_length; ++i) {
+    ss << std::hex << std::setw(2) << std::setfill('0')
+       << static_cast<unsigned int>(hash[i]);
+  }
+
+  return ss.str();
+}
+
+inline std::string MD5(const std::string &s) {
+  return message_digest(s, EVP_md5());
+}
+
+inline std::string SHA_256(const std::string &s) {
+  return message_digest(s, EVP_sha256());
+}
+
+inline std::string SHA_512(const std::string &s) {
+  return message_digest(s, EVP_sha512());
+}
+
+inline std::pair<std::string, std::string> make_digest_authentication_header(
+    const Request &req, const std::map<std::string, std::string> &auth,
+    size_t cnonce_count, const std::string &cnonce, const std::string &username,
+    const std::string &password, bool is_proxy = false) {
+  std::string nc;
+  {
+    std::stringstream ss;
+    ss << std::setfill('0') << std::setw(8) << std::hex << cnonce_count;
+    nc = ss.str();
+  }
+
+  std::string qop;
+  if (auth.find("qop") != auth.end()) {
+    qop = auth.at("qop");
+    if (qop.find("auth-int") != std::string::npos) {
+      qop = "auth-int";
+    } else if (qop.find("auth") != std::string::npos) {
+      qop = "auth";
+    } else {
+      qop.clear();
+    }
+  }
+
+  std::string algo = "MD5";
+  if (auth.find("algorithm") != auth.end()) { algo = auth.at("algorithm"); }
+
+  std::string response;
+  {
+    auto H = algo == "SHA-256"   ? detail::SHA_256
+             : algo == "SHA-512" ? detail::SHA_512
+                                 : detail::MD5;
+
+    auto A1 = username + ":" + auth.at("realm") + ":" + password;
+
+    auto A2 = req.method + ":" + req.path;
+    if (qop == "auth-int") { A2 += ":" + H(req.body); }
+
+    if (qop.empty()) {
+      response = H(H(A1) + ":" + auth.at("nonce") + ":" + H(A2));
+    } else {
+      response = H(H(A1) + ":" + auth.at("nonce") + ":" + nc + ":" + cnonce +
+                   ":" + qop + ":" + H(A2));
+    }
+  }
+
+  auto opaque = (auth.find("opaque") != auth.end()) ? auth.at("opaque") : "";
+
+  auto field = "Digest username=\"" + username + "\", realm=\"" +
+               auth.at("realm") + "\", nonce=\"" + auth.at("nonce") +
+               "\", uri=\"" + req.path + "\", algorithm=" + algo +
+               (qop.empty() ? ", response=\""
+                            : ", qop=" + qop + ", nc=" + nc + ", cnonce=\"" +
+                                  cnonce + "\", response=\"") +
+               response + "\"" +
+               (opaque.empty() ? "" : ", opaque=\"" + opaque + "\"");
+
+  auto key = is_proxy ? "Proxy-Authorization" : "Authorization";
+  return std::make_pair(key, field);
+}
+
+inline bool is_ssl_peer_could_be_closed(SSL *ssl, socket_t sock) {
+  detail::set_nonblocking(sock, true);
+  auto se = detail::scope_exit([&]() { detail::set_nonblocking(sock, false); });
+
+  char buf[1];
+  return !SSL_peek(ssl, buf, 1) &&
+         SSL_get_error(ssl, 0) == SSL_ERROR_ZERO_RETURN;
+}
+
+#ifdef _WIN32
+// NOTE: This code came up with the following stackoverflow post:
+// https://stackoverflow.com/questions/9507184/can-openssl-on-windows-use-the-system-certificate-store
+inline bool load_system_certs_on_windows(X509_STORE *store) {
+  auto hStore = CertOpenSystemStoreW((HCRYPTPROV_LEGACY)NULL, L"ROOT");
+  if (!hStore) { return false; }
+
+  auto result = false;
+  PCCERT_CONTEXT pContext = NULL;
+  while ((pContext = CertEnumCertificatesInStore(hStore, pContext)) !=
+         nullptr) {
+    auto encoded_cert =
+        static_cast<const unsigned char *>(pContext->pbCertEncoded);
+
+    auto x509 = d2i_X509(NULL, &encoded_cert, pContext->cbCertEncoded);
+    if (x509) {
+      X509_STORE_add_cert(store, x509);
+      X509_free(x509);
+      result = true;
+    }
+  }
+
+  CertFreeCertificateContext(pContext);
+  CertCloseStore(hStore, 0);
+
+  return result;
+}
+#elif defined(CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN) && TARGET_OS_MAC
+template <typename T>
+using CFObjectPtr =
+    std::unique_ptr<typename std::remove_pointer<T>::type, void (*)(CFTypeRef)>;
+
+inline void cf_object_ptr_deleter(CFTypeRef obj) {
+  if (obj) { CFRelease(obj); }
+}
+
+inline bool retrieve_certs_from_keychain(CFObjectPtr<CFArrayRef> &certs) {
+  CFStringRef keys[] = {kSecClass, kSecMatchLimit, kSecReturnRef};
+  CFTypeRef values[] = {kSecClassCertificate, kSecMatchLimitAll,
+                        kCFBooleanTrue};
+
+  CFObjectPtr<CFDictionaryRef> query(
+      CFDictionaryCreate(nullptr, reinterpret_cast<const void **>(keys), values,
+                         sizeof(keys) / sizeof(keys[0]),
+                         &kCFTypeDictionaryKeyCallBacks,
+                         &kCFTypeDictionaryValueCallBacks),
+      cf_object_ptr_deleter);
+
+  if (!query) { return false; }
+
+  CFTypeRef security_items = nullptr;
+  if (SecItemCopyMatching(query.get(), &security_items) != errSecSuccess ||
+      CFArrayGetTypeID() != CFGetTypeID(security_items)) {
+    return false;
+  }
+
+  certs.reset(reinterpret_cast<CFArrayRef>(security_items));
+  return true;
+}
+
+inline bool retrieve_root_certs_from_keychain(CFObjectPtr<CFArrayRef> &certs) {
+  CFArrayRef root_security_items = nullptr;
+  if (SecTrustCopyAnchorCertificates(&root_security_items) != errSecSuccess) {
+    return false;
+  }
+
+  certs.reset(root_security_items);
+  return true;
+}
+
+inline bool add_certs_to_x509_store(CFArrayRef certs, X509_STORE *store) {
+  auto result = false;
+  for (auto i = 0; i < CFArrayGetCount(certs); ++i) {
+    const auto cert = reinterpret_cast<const __SecCertificate *>(
+        CFArrayGetValueAtIndex(certs, i));
+
+    if (SecCertificateGetTypeID() != CFGetTypeID(cert)) { continue; }
+
+    CFDataRef cert_data = nullptr;
+    if (SecItemExport(cert, kSecFormatX509Cert, 0, nullptr, &cert_data) !=
+        errSecSuccess) {
+      continue;
+    }
+
+    CFObjectPtr<CFDataRef> cert_data_ptr(cert_data, cf_object_ptr_deleter);
+
+    auto encoded_cert = static_cast<const unsigned char *>(
+        CFDataGetBytePtr(cert_data_ptr.get()));
+
+    auto x509 =
+        d2i_X509(NULL, &encoded_cert, CFDataGetLength(cert_data_ptr.get()));
+
+    if (x509) {
+      X509_STORE_add_cert(store, x509);
+      X509_free(x509);
+      result = true;
+    }
+  }
+
+  return result;
+}
+
+inline bool load_system_certs_on_macos(X509_STORE *store) {
+  auto result = false;
+  CFObjectPtr<CFArrayRef> certs(nullptr, cf_object_ptr_deleter);
+  if (retrieve_certs_from_keychain(certs) && certs) {
+    result = add_certs_to_x509_store(certs.get(), store);
+  }
+
+  if (retrieve_root_certs_from_keychain(certs) && certs) {
+    result = add_certs_to_x509_store(certs.get(), store) || result;
+  }
+
+  return result;
+}
+#endif // _WIN32
+#endif // CPPHTTPLIB_OPENSSL_SUPPORT
+
+#ifdef _WIN32
+class WSInit {
+public:
+  WSInit() {
+    WSADATA wsaData;
+    if (WSAStartup(0x0002, &wsaData) == 0) is_valid_ = true;
+  }
+
+  ~WSInit() {
+    if (is_valid_) WSACleanup();
+  }
+
+  bool is_valid_ = false;
+};
+
+static WSInit wsinit_;
+#endif
+
+inline bool parse_www_authenticate(const Response &res,
+                                   std::map<std::string, std::string> &auth,
+                                   bool is_proxy) {
+  auto auth_key = is_proxy ? "Proxy-Authenticate" : "WWW-Authenticate";
+  if (res.has_header(auth_key)) {
+    thread_local auto re =
+        std::regex(R"~((?:(?:,\s*)?(.+?)=(?:"(.*?)"|([^,]*))))~");
+    auto s = res.get_header_value(auth_key);
+    auto pos = s.find(' ');
+    if (pos != std::string::npos) {
+      auto type = s.substr(0, pos);
+      if (type == "Basic") {
+        return false;
+      } else if (type == "Digest") {
+        s = s.substr(pos + 1);
+        auto beg = std::sregex_iterator(s.begin(), s.end(), re);
+        for (auto i = beg; i != std::sregex_iterator(); ++i) {
+          const auto &m = *i;
+          auto key = s.substr(static_cast<size_t>(m.position(1)),
+                              static_cast<size_t>(m.length(1)));
+          auto val = m.length(2) > 0
+                         ? s.substr(static_cast<size_t>(m.position(2)),
+                                    static_cast<size_t>(m.length(2)))
+                         : s.substr(static_cast<size_t>(m.position(3)),
+                                    static_cast<size_t>(m.length(3)));
+          auth[key] = val;
+        }
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
+class ContentProviderAdapter {
+public:
+  explicit ContentProviderAdapter(
+      ContentProviderWithoutLength &&content_provider)
+      : content_provider_(content_provider) {}
+
+  bool operator()(size_t offset, size_t, DataSink &sink) {
+    return content_provider_(offset, sink);
+  }
+
+private:
+  ContentProviderWithoutLength content_provider_;
+};
+
+} // namespace detail
+
+inline std::string hosted_at(const std::string &hostname) {
+  std::vector<std::string> addrs;
+  hosted_at(hostname, addrs);
+  if (addrs.empty()) { return std::string(); }
+  return addrs[0];
+}
+
+inline void hosted_at(const std::string &hostname,
+                      std::vector<std::string> &addrs) {
+  struct addrinfo hints;
+  struct addrinfo *result;
+
+  memset(&hints, 0, sizeof(struct addrinfo));
+  hints.ai_family = AF_UNSPEC;
+  hints.ai_socktype = SOCK_STREAM;
+  hints.ai_protocol = 0;
+
+  if (detail::getaddrinfo_with_timeout(hostname.c_str(), nullptr, &hints,
+                                       &result, 0)) {
+#if defined __linux__ && !defined __ANDROID__
+    res_init();
+#endif
+    return;
+  }
+  auto se = detail::scope_exit([&] { freeaddrinfo(result); });
+
+  for (auto rp = result; rp; rp = rp->ai_next) {
+    const auto &addr =
+        *reinterpret_cast<struct sockaddr_storage *>(rp->ai_addr);
+    std::string ip;
+    auto dummy = -1;
+    if (detail::get_ip_and_port(addr, sizeof(struct sockaddr_storage), ip,
+                                dummy)) {
+      addrs.push_back(ip);
+    }
+  }
+}
+
+inline std::string encode_uri_component(const std::string &value) {
+  std::ostringstream escaped;
+  escaped.fill('0');
+  escaped << std::hex;
+
+  for (auto c : value) {
+    if (std::isalnum(static_cast<uint8_t>(c)) || c == '-' || c == '_' ||
+        c == '.' || c == '!' || c == '~' || c == '*' || c == '\'' || c == '(' ||
+        c == ')') {
+      escaped << c;
+    } else {
+      escaped << std::uppercase;
+      escaped << '%' << std::setw(2)
+              << static_cast<int>(static_cast<unsigned char>(c));
+      escaped << std::nouppercase;
+    }
+  }
+
+  return escaped.str();
+}
+
+inline std::string encode_uri(const std::string &value) {
+  std::ostringstream escaped;
+  escaped.fill('0');
+  escaped << std::hex;
+
+  for (auto c : value) {
+    if (std::isalnum(static_cast<uint8_t>(c)) || c == '-' || c == '_' ||
+        c == '.' || c == '!' || c == '~' || c == '*' || c == '\'' || c == '(' ||
+        c == ')' || c == ';' || c == '/' || c == '?' || c == ':' || c == '@' ||
+        c == '&' || c == '=' || c == '+' || c == '$' || c == ',' || c == '#') {
+      escaped << c;
+    } else {
+      escaped << std::uppercase;
+      escaped << '%' << std::setw(2)
+              << static_cast<int>(static_cast<unsigned char>(c));
+      escaped << std::nouppercase;
+    }
+  }
+
+  return escaped.str();
+}
+
+inline std::string decode_uri_component(const std::string &value) {
+  std::string result;
+
+  for (size_t i = 0; i < value.size(); i++) {
+    if (value[i] == '%' && i + 2 < value.size()) {
+      auto val = 0;
+      if (detail::from_hex_to_i(value, i + 1, 2, val)) {
+        result += static_cast<char>(val);
+        i += 2;
+      } else {
+        result += value[i];
+      }
+    } else {
+      result += value[i];
+    }
+  }
+
+  return result;
+}
+
+inline std::string decode_uri(const std::string &value) {
+  std::string result;
+
+  for (size_t i = 0; i < value.size(); i++) {
+    if (value[i] == '%' && i + 2 < value.size()) {
+      auto val = 0;
+      if (detail::from_hex_to_i(value, i + 1, 2, val)) {
+        result += static_cast<char>(val);
+        i += 2;
+      } else {
+        result += value[i];
+      }
+    } else {
+      result += value[i];
+    }
+  }
+
+  return result;
+}
+
+inline std::string encode_path_component(const std::string &component) {
+  std::string result;
+  result.reserve(component.size() * 3);
+
+  for (size_t i = 0; i < component.size(); i++) {
+    auto c = static_cast<unsigned char>(component[i]);
+
+    // Unreserved characters per RFC 3986: ALPHA / DIGIT / "-" / "." / "_" / "~"
+    if (std::isalnum(c) || c == '-' || c == '.' || c == '_' || c == '~') {
+      result += static_cast<char>(c);
+    }
+    // Path-safe sub-delimiters: "!" / "$" / "&" / "'" / "(" / ")" / "*" / "+" /
+    // "," / ";" / "="
+    else if (c == '!' || c == '$' || c == '&' || c == '\'' || c == '(' ||
+             c == ')' || c == '*' || c == '+' || c == ',' || c == ';' ||
+             c == '=') {
+      result += static_cast<char>(c);
+    }
+    // Colon is allowed in path segments except first segment
+    else if (c == ':') {
+      result += static_cast<char>(c);
+    }
+    // @ is allowed in path
+    else if (c == '@') {
+      result += static_cast<char>(c);
+    } else {
+      result += '%';
+      char hex[3];
+      snprintf(hex, sizeof(hex), "%02X", c);
+      result.append(hex, 2);
+    }
+  }
+  return result;
+}
+
+inline std::string decode_path_component(const std::string &component) {
+  std::string result;
+  result.reserve(component.size());
+
+  for (size_t i = 0; i < component.size(); i++) {
+    if (component[i] == '%' && i + 1 < component.size()) {
+      if (component[i + 1] == 'u') {
+        // Unicode %uXXXX encoding
+        auto val = 0;
+        if (detail::from_hex_to_i(component, i + 2, 4, val)) {
+          // 4 digits Unicode codes
+          char buff[4];
+          size_t len = detail::to_utf8(val, buff);
+          if (len > 0) { result.append(buff, len); }
+          i += 5; // 'u0000'
+        } else {
+          result += component[i];
+        }
+      } else {
+        // Standard %XX encoding
+        auto val = 0;
+        if (detail::from_hex_to_i(component, i + 1, 2, val)) {
+          // 2 digits hex codes
+          result += static_cast<char>(val);
+          i += 2; // 'XX'
+        } else {
+          result += component[i];
+        }
+      }
+    } else {
+      result += component[i];
+    }
+  }
+  return result;
+}
+
+inline std::string encode_query_component(const std::string &component,
+                                          bool space_as_plus) {
+  std::string result;
+  result.reserve(component.size() * 3);
+
+  for (size_t i = 0; i < component.size(); i++) {
+    auto c = static_cast<unsigned char>(component[i]);
+
+    // Unreserved characters per RFC 3986
+    if (std::isalnum(c) || c == '-' || c == '.' || c == '_' || c == '~') {
+      result += static_cast<char>(c);
+    }
+    // Space handling
+    else if (c == ' ') {
+      if (space_as_plus) {
+        result += '+';
+      } else {
+        result += "%20";
+      }
+    }
+    // Plus sign handling
+    else if (c == '+') {
+      if (space_as_plus) {
+        result += "%2B";
+      } else {
+        result += static_cast<char>(c);
+      }
+    }
+    // Query-safe sub-delimiters (excluding & and = which are query delimiters)
+    else if (c == '!' || c == '$' || c == '\'' || c == '(' || c == ')' ||
+             c == '*' || c == ',' || c == ';') {
+      result += static_cast<char>(c);
+    }
+    // Colon and @ are allowed in query
+    else if (c == ':' || c == '@') {
+      result += static_cast<char>(c);
+    }
+    // Forward slash is allowed in query values
+    else if (c == '/') {
+      result += static_cast<char>(c);
+    }
+    // Question mark is allowed in query values (after first ?)
+    else if (c == '?') {
+      result += static_cast<char>(c);
+    } else {
+      result += '%';
+      char hex[3];
+      snprintf(hex, sizeof(hex), "%02X", c);
+      result.append(hex, 2);
+    }
+  }
+  return result;
+}
+
+inline std::string decode_query_component(const std::string &component,
+                                          bool plus_as_space) {
+  std::string result;
+  result.reserve(component.size());
+
+  for (size_t i = 0; i < component.size(); i++) {
+    if (component[i] == '%' && i + 2 < component.size()) {
+      std::string hex = component.substr(i + 1, 2);
+      char *end;
+      unsigned long value = std::strtoul(hex.c_str(), &end, 16);
+      if (end == hex.c_str() + 2) {
+        result += static_cast<char>(value);
+        i += 2;
+      } else {
+        result += component[i];
+      }
+    } else if (component[i] == '+' && plus_as_space) {
+      result += ' '; // + becomes space in form-urlencoded
+    } else {
+      result += component[i];
+    }
+  }
+  return result;
+}
+
+inline std::string append_query_params(const std::string &path,
+                                       const Params &params) {
+  std::string path_with_query = path;
+  thread_local const std::regex re("[^?]+\\?.*");
+  auto delm = std::regex_match(path, re) ? '&' : '?';
+  path_with_query += delm + detail::params_to_query_str(params);
+  return path_with_query;
+}
+
+// Header utilities
+inline std::pair<std::string, std::string>
+make_range_header(const Ranges &ranges) {
+  std::string field = "bytes=";
+  auto i = 0;
+  for (const auto &r : ranges) {
+    if (i != 0) { field += ", "; }
+    if (r.first != -1) { field += std::to_string(r.first); }
+    field += '-';
+    if (r.second != -1) { field += std::to_string(r.second); }
+    i++;
+  }
+  return std::make_pair("Range", std::move(field));
+}
+
+inline std::pair<std::string, std::string>
+make_basic_authentication_header(const std::string &username,
+                                 const std::string &password, bool is_proxy) {
+  auto field = "Basic " + detail::base64_encode(username + ":" + password);
+  auto key = is_proxy ? "Proxy-Authorization" : "Authorization";
+  return std::make_pair(key, std::move(field));
+}
+
+inline std::pair<std::string, std::string>
+make_bearer_token_authentication_header(const std::string &token,
+                                        bool is_proxy = false) {
+  auto field = "Bearer " + token;
+  auto key = is_proxy ? "Proxy-Authorization" : "Authorization";
+  return std::make_pair(key, std::move(field));
+}
+
+// Request implementation
+inline bool Request::has_header(const std::string &key) const {
+  return detail::has_header(headers, key);
+}
+
+inline std::string Request::get_header_value(const std::string &key,
+                                             const char *def, size_t id) const {
+  return detail::get_header_value(headers, key, def, id);
+}
+
+inline size_t Request::get_header_value_count(const std::string &key) const {
+  auto r = headers.equal_range(key);
+  return static_cast<size_t>(std::distance(r.first, r.second));
+}
+
+inline void Request::set_header(const std::string &key,
+                                const std::string &val) {
+  if (detail::fields::is_field_name(key) &&
+      detail::fields::is_field_value(val)) {
+    headers.emplace(key, val);
+  }
+}
+
+inline bool Request::has_trailer(const std::string &key) const {
+  return trailers.find(key) != trailers.end();
+}
+
+inline std::string Request::get_trailer_value(const std::string &key,
+                                              size_t id) const {
+  auto rng = trailers.equal_range(key);
+  auto it = rng.first;
+  std::advance(it, static_cast<ssize_t>(id));
+  if (it != rng.second) { return it->second; }
+  return std::string();
+}
+
+inline size_t Request::get_trailer_value_count(const std::string &key) const {
+  auto r = trailers.equal_range(key);
+  return static_cast<size_t>(std::distance(r.first, r.second));
+}
+
+inline bool Request::has_param(const std::string &key) const {
+  return params.find(key) != params.end();
+}
+
+inline std::string Request::get_param_value(const std::string &key,
+                                            size_t id) const {
+  auto rng = params.equal_range(key);
+  auto it = rng.first;
+  std::advance(it, static_cast<ssize_t>(id));
+  if (it != rng.second) { return it->second; }
+  return std::string();
+}
+
+inline size_t Request::get_param_value_count(const std::string &key) const {
+  auto r = params.equal_range(key);
+  return static_cast<size_t>(std::distance(r.first, r.second));
+}
+
+inline bool Request::is_multipart_form_data() const {
+  const auto &content_type = get_header_value("Content-Type");
+  return !content_type.rfind("multipart/form-data", 0);
+}
+
+// Multipart FormData implementation
+inline std::string MultipartFormData::get_field(const std::string &key,
+                                                size_t id) const {
+  auto rng = fields.equal_range(key);
+  auto it = rng.first;
+  std::advance(it, static_cast<ssize_t>(id));
+  if (it != rng.second) { return it->second.content; }
+  return std::string();
+}
+
+inline std::vector<std::string>
+MultipartFormData::get_fields(const std::string &key) const {
+  std::vector<std::string> values;
+  auto rng = fields.equal_range(key);
+  for (auto it = rng.first; it != rng.second; it++) {
+    values.push_back(it->second.content);
+  }
+  return values;
+}
+
+inline bool MultipartFormData::has_field(const std::string &key) const {
+  return fields.find(key) != fields.end();
+}
+
+inline size_t MultipartFormData::get_field_count(const std::string &key) const {
+  auto r = fields.equal_range(key);
+  return static_cast<size_t>(std::distance(r.first, r.second));
+}
+
+inline FormData MultipartFormData::get_file(const std::string &key,
+                                            size_t id) const {
+  auto rng = files.equal_range(key);
+  auto it = rng.first;
+  std::advance(it, static_cast<ssize_t>(id));
+  if (it != rng.second) { return it->second; }
+  return FormData();
+}
+
+inline std::vector<FormData>
+MultipartFormData::get_files(const std::string &key) const {
+  std::vector<FormData> values;
+  auto rng = files.equal_range(key);
+  for (auto it = rng.first; it != rng.second; it++) {
+    values.push_back(it->second);
+  }
+  return values;
+}
+
+inline bool MultipartFormData::has_file(const std::string &key) const {
+  return files.find(key) != files.end();
+}
+
+inline size_t MultipartFormData::get_file_count(const std::string &key) const {
+  auto r = files.equal_range(key);
+  return static_cast<size_t>(std::distance(r.first, r.second));
+}
+
+// Response implementation
+inline bool Response::has_header(const std::string &key) const {
+  return headers.find(key) != headers.end();
+}
+
+inline std::string Response::get_header_value(const std::string &key,
+                                              const char *def,
+                                              size_t id) const {
+  return detail::get_header_value(headers, key, def, id);
+}
+
+inline size_t Response::get_header_value_count(const std::string &key) const {
+  auto r = headers.equal_range(key);
+  return static_cast<size_t>(std::distance(r.first, r.second));
+}
+
+inline void Response::set_header(const std::string &key,
+                                 const std::string &val) {
+  if (detail::fields::is_field_name(key) &&
+      detail::fields::is_field_value(val)) {
+    headers.emplace(key, val);
+  }
+}
+inline bool Response::has_trailer(const std::string &key) const {
+  return trailers.find(key) != trailers.end();
+}
+
+inline std::string Response::get_trailer_value(const std::string &key,
+                                               size_t id) const {
+  auto rng = trailers.equal_range(key);
+  auto it = rng.first;
+  std::advance(it, static_cast<ssize_t>(id));
+  if (it != rng.second) { return it->second; }
+  return std::string();
+}
+
+inline size_t Response::get_trailer_value_count(const std::string &key) const {
+  auto r = trailers.equal_range(key);
+  return static_cast<size_t>(std::distance(r.first, r.second));
+}
+
+inline void Response::set_redirect(const std::string &url, int stat) {
+  if (detail::fields::is_field_value(url)) {
+    set_header("Location", url);
+    if (300 <= stat && stat < 400) {
+      this->status = stat;
+    } else {
+      this->status = StatusCode::Found_302;
+    }
+  }
+}
+
+inline void Response::set_content(const char *s, size_t n,
+                                  const std::string &content_type) {
+  body.assign(s, n);
+
+  auto rng = headers.equal_range("Content-Type");
+  headers.erase(rng.first, rng.second);
+  set_header("Content-Type", content_type);
+}
+
+inline void Response::set_content(const std::string &s,
+                                  const std::string &content_type) {
+  set_content(s.data(), s.size(), content_type);
+}
+
+inline void Response::set_content(std::string &&s,
+                                  const std::string &content_type) {
+  body = std::move(s);
+
+  auto rng = headers.equal_range("Content-Type");
+  headers.erase(rng.first, rng.second);
+  set_header("Content-Type", content_type);
+}
+
+inline void Response::set_content_provider(
+    size_t in_length, const std::string &content_type, ContentProvider provider,
+    ContentProviderResourceReleaser resource_releaser) {
+  set_header("Content-Type", content_type);
+  content_length_ = in_length;
+  if (in_length > 0) { content_provider_ = std::move(provider); }
+  content_provider_resource_releaser_ = std::move(resource_releaser);
+  is_chunked_content_provider_ = false;
+}
+
+inline void Response::set_content_provider(
+    const std::string &content_type, ContentProviderWithoutLength provider,
+    ContentProviderResourceReleaser resource_releaser) {
+  set_header("Content-Type", content_type);
+  content_length_ = 0;
+  content_provider_ = detail::ContentProviderAdapter(std::move(provider));
+  content_provider_resource_releaser_ = std::move(resource_releaser);
+  is_chunked_content_provider_ = false;
+}
+
+inline void Response::set_chunked_content_provider(
+    const std::string &content_type, ContentProviderWithoutLength provider,
+    ContentProviderResourceReleaser resource_releaser) {
+  set_header("Content-Type", content_type);
+  content_length_ = 0;
+  content_provider_ = detail::ContentProviderAdapter(std::move(provider));
+  content_provider_resource_releaser_ = std::move(resource_releaser);
+  is_chunked_content_provider_ = true;
+}
+
+inline void Response::set_file_content(const std::string &path,
+                                       const std::string &content_type) {
+  file_content_path_ = path;
+  file_content_content_type_ = content_type;
+}
+
+inline void Response::set_file_content(const std::string &path) {
+  file_content_path_ = path;
+}
+
+// Result implementation
+inline bool Result::has_request_header(const std::string &key) const {
+  return request_headers_.find(key) != request_headers_.end();
+}
+
+inline std::string Result::get_request_header_value(const std::string &key,
+                                                    const char *def,
+                                                    size_t id) const {
+  return detail::get_header_value(request_headers_, key, def, id);
+}
+
+inline size_t
+Result::get_request_header_value_count(const std::string &key) const {
+  auto r = request_headers_.equal_range(key);
+  return static_cast<size_t>(std::distance(r.first, r.second));
+}
+
+// Stream implementation
+inline ssize_t Stream::write(const char *ptr) {
+  return write(ptr, strlen(ptr));
+}
+
+inline ssize_t Stream::write(const std::string &s) {
+  return write(s.data(), s.size());
+}
+
+namespace detail {
+
+inline void calc_actual_timeout(time_t max_timeout_msec, time_t duration_msec,
+                                time_t timeout_sec, time_t timeout_usec,
+                                time_t &actual_timeout_sec,
+                                time_t &actual_timeout_usec) {
+  auto timeout_msec = (timeout_sec * 1000) + (timeout_usec / 1000);
+
+  auto actual_timeout_msec =
+      (std::min)(max_timeout_msec - duration_msec, timeout_msec);
+
+  if (actual_timeout_msec < 0) { actual_timeout_msec = 0; }
+
+  actual_timeout_sec = actual_timeout_msec / 1000;
+  actual_timeout_usec = (actual_timeout_msec % 1000) * 1000;
+}
+
+// Socket stream implementation
+inline SocketStream::SocketStream(
+    socket_t sock, time_t read_timeout_sec, time_t read_timeout_usec,
+    time_t write_timeout_sec, time_t write_timeout_usec,
+    time_t max_timeout_msec,
+    std::chrono::time_point<std::chrono::steady_clock> start_time)
+    : sock_(sock), read_timeout_sec_(read_timeout_sec),
+      read_timeout_usec_(read_timeout_usec),
+      write_timeout_sec_(write_timeout_sec),
+      write_timeout_usec_(write_timeout_usec),
+      max_timeout_msec_(max_timeout_msec), start_time_(start_time),
+      read_buff_(read_buff_size_, 0) {}
+
+inline SocketStream::~SocketStream() = default;
+
+inline bool SocketStream::is_readable() const {
+  return read_buff_off_ < read_buff_content_size_;
+}
+
+inline bool SocketStream::wait_readable() const {
+  if (max_timeout_msec_ <= 0) {
+    return select_read(sock_, read_timeout_sec_, read_timeout_usec_) > 0;
+  }
+
+  time_t read_timeout_sec;
+  time_t read_timeout_usec;
+  calc_actual_timeout(max_timeout_msec_, duration(), read_timeout_sec_,
+                      read_timeout_usec_, read_timeout_sec, read_timeout_usec);
+
+  return select_read(sock_, read_timeout_sec, read_timeout_usec) > 0;
+}
+
+inline bool SocketStream::wait_writable() const {
+  return select_write(sock_, write_timeout_sec_, write_timeout_usec_) > 0 &&
+         is_socket_alive(sock_);
+}
+
+inline ssize_t SocketStream::read(char *ptr, size_t size) {
+#ifdef _WIN32
+  size =
+      (std::min)(size, static_cast<size_t>((std::numeric_limits<int>::max)()));
+#else
+  size = (std::min)(size,
+                    static_cast<size_t>((std::numeric_limits<ssize_t>::max)()));
+#endif
+
+  if (read_buff_off_ < read_buff_content_size_) {
+    auto remaining_size = read_buff_content_size_ - read_buff_off_;
+    if (size <= remaining_size) {
+      memcpy(ptr, read_buff_.data() + read_buff_off_, size);
+      read_buff_off_ += size;
+      return static_cast<ssize_t>(size);
+    } else {
+      memcpy(ptr, read_buff_.data() + read_buff_off_, remaining_size);
+      read_buff_off_ += remaining_size;
+      return static_cast<ssize_t>(remaining_size);
+    }
+  }
+
+  if (!wait_readable()) { return -1; }
+
+  read_buff_off_ = 0;
+  read_buff_content_size_ = 0;
+
+  if (size < read_buff_size_) {
+    auto n = read_socket(sock_, read_buff_.data(), read_buff_size_,
+                         CPPHTTPLIB_RECV_FLAGS);
+    if (n <= 0) {
+      return n;
+    } else if (n <= static_cast<ssize_t>(size)) {
+      memcpy(ptr, read_buff_.data(), static_cast<size_t>(n));
+      return n;
+    } else {
+      memcpy(ptr, read_buff_.data(), size);
+      read_buff_off_ = size;
+      read_buff_content_size_ = static_cast<size_t>(n);
+      return static_cast<ssize_t>(size);
+    }
+  } else {
+    return read_socket(sock_, ptr, size, CPPHTTPLIB_RECV_FLAGS);
+  }
+}
+
+inline ssize_t SocketStream::write(const char *ptr, size_t size) {
+  if (!wait_writable()) { return -1; }
+
+#if defined(_WIN32) && !defined(_WIN64)
+  size =
+      (std::min)(size, static_cast<size_t>((std::numeric_limits<int>::max)()));
+#endif
+
+  return send_socket(sock_, ptr, size, CPPHTTPLIB_SEND_FLAGS);
+}
+
+inline void SocketStream::get_remote_ip_and_port(std::string &ip,
+                                                 int &port) const {
+  return detail::get_remote_ip_and_port(sock_, ip, port);
+}
+
+inline void SocketStream::get_local_ip_and_port(std::string &ip,
+                                                int &port) const {
+  return detail::get_local_ip_and_port(sock_, ip, port);
+}
+
+inline socket_t SocketStream::socket() const { return sock_; }
+
+inline time_t SocketStream::duration() const {
+  return std::chrono::duration_cast<std::chrono::milliseconds>(
+             std::chrono::steady_clock::now() - start_time_)
+      .count();
+}
+
+// Buffer stream implementation
+inline bool BufferStream::is_readable() const { return true; }
+
+inline bool BufferStream::wait_readable() const { return true; }
+
+inline bool BufferStream::wait_writable() const { return true; }
+
+inline ssize_t BufferStream::read(char *ptr, size_t size) {
+#if defined(_MSC_VER) && _MSC_VER < 1910
+  auto len_read = buffer._Copy_s(ptr, size, size, position);
+#else
+  auto len_read = buffer.copy(ptr, size, position);
+#endif
+  position += static_cast<size_t>(len_read);
+  return static_cast<ssize_t>(len_read);
+}
+
+inline ssize_t BufferStream::write(const char *ptr, size_t size) {
+  buffer.append(ptr, size);
+  return static_cast<ssize_t>(size);
+}
+
+inline void BufferStream::get_remote_ip_and_port(std::string & /*ip*/,
+                                                 int & /*port*/) const {}
+
+inline void BufferStream::get_local_ip_and_port(std::string & /*ip*/,
+                                                int & /*port*/) const {}
+
+inline socket_t BufferStream::socket() const { return 0; }
+
+inline time_t BufferStream::duration() const { return 0; }
+
+inline const std::string &BufferStream::get_buffer() const { return buffer; }
+
+inline PathParamsMatcher::PathParamsMatcher(const std::string &pattern)
+    : MatcherBase(pattern) {
+  constexpr const char marker[] = "/:";
+
+  // One past the last ending position of a path param substring
+  std::size_t last_param_end = 0;
+
+#ifndef CPPHTTPLIB_NO_EXCEPTIONS
+  // Needed to ensure that parameter names are unique during matcher
+  // construction
+  // If exceptions are disabled, only last duplicate path
+  // parameter will be set
+  std::unordered_set<std::string> param_name_set;
+#endif
+
+  while (true) {
+    const auto marker_pos = pattern.find(
+        marker, last_param_end == 0 ? last_param_end : last_param_end - 1);
+    if (marker_pos == std::string::npos) { break; }
+
+    static_fragments_.push_back(
+        pattern.substr(last_param_end, marker_pos - last_param_end + 1));
+
+    const auto param_name_start = marker_pos + str_len(marker);
+
+    auto sep_pos = pattern.find(separator, param_name_start);
+    if (sep_pos == std::string::npos) { sep_pos = pattern.length(); }
+
+    auto param_name =
+        pattern.substr(param_name_start, sep_pos - param_name_start);
+
+#ifndef CPPHTTPLIB_NO_EXCEPTIONS
+    if (param_name_set.find(param_name) != param_name_set.cend()) {
+      std::string msg = "Encountered path parameter '" + param_name +
+                        "' multiple times in route pattern '" + pattern + "'.";
+      throw std::invalid_argument(msg);
+    }
+#endif
+
+    param_names_.push_back(std::move(param_name));
+
+    last_param_end = sep_pos + 1;
+  }
+
+  if (last_param_end < pattern.length()) {
+    static_fragments_.push_back(pattern.substr(last_param_end));
+  }
+}
+
+inline bool PathParamsMatcher::match(Request &request) const {
+  request.matches = std::smatch();
+  request.path_params.clear();
+  request.path_params.reserve(param_names_.size());
+
+  // One past the position at which the path matched the pattern last time
+  std::size_t starting_pos = 0;
+  for (size_t i = 0; i < static_fragments_.size(); ++i) {
+    const auto &fragment = static_fragments_[i];
+
+    if (starting_pos + fragment.length() > request.path.length()) {
+      return false;
+    }
+
+    // Avoid unnecessary allocation by using strncmp instead of substr +
+    // comparison
+    if (std::strncmp(request.path.c_str() + starting_pos, fragment.c_str(),
+                     fragment.length()) != 0) {
+      return false;
+    }
+
+    starting_pos += fragment.length();
+
+    // Should only happen when we have a static fragment after a param
+    // Example: '/users/:id/subscriptions'
+    // The 'subscriptions' fragment here does not have a corresponding param
+    if (i >= param_names_.size()) { continue; }
+
+    auto sep_pos = request.path.find(separator, starting_pos);
+    if (sep_pos == std::string::npos) { sep_pos = request.path.length(); }
+
+    const auto &param_name = param_names_[i];
+
+    request.path_params.emplace(
+        param_name, request.path.substr(starting_pos, sep_pos - starting_pos));
+
+    // Mark everything up to '/' as matched
+    starting_pos = sep_pos + 1;
+  }
+  // Returns false if the path is longer than the pattern
+  return starting_pos >= request.path.length();
+}
+
+inline bool RegexMatcher::match(Request &request) const {
+  request.path_params.clear();
+  return std::regex_match(request.path, request.matches, regex_);
+}
+
+inline std::string make_host_and_port_string(const std::string &host, int port,
+                                             bool is_ssl) {
+  std::string result;
+
+  // Enclose IPv6 address in brackets (but not if already enclosed)
+  if (host.find(':') == std::string::npos ||
+      (!host.empty() && host[0] == '[')) {
+    // IPv4, hostname, or already bracketed IPv6
+    result = host;
+  } else {
+    // IPv6 address without brackets
+    result = "[" + host + "]";
+  }
+
+  // Append port if not default
+  if ((!is_ssl && port == 80) || (is_ssl && port == 443)) {
+    ; // do nothing
+  } else {
+    result += ":" + std::to_string(port);
+  }
+
+  return result;
+}
+
+} // namespace detail
+
+// HTTP server implementation
+inline Server::Server()
+    : new_task_queue(
+          [] { return new ThreadPool(CPPHTTPLIB_THREAD_POOL_COUNT); }) {
+#ifndef _WIN32
+  signal(SIGPIPE, SIG_IGN);
+#endif
+}
+
+inline Server::~Server() = default;
+
+inline std::unique_ptr<detail::MatcherBase>
+Server::make_matcher(const std::string &pattern) {
+  if (pattern.find("/:") != std::string::npos) {
+    return detail::make_unique<detail::PathParamsMatcher>(pattern);
+  } else {
+    return detail::make_unique<detail::RegexMatcher>(pattern);
+  }
+}
+
+inline Server &Server::Get(const std::string &pattern, Handler handler) {
+  get_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
+  return *this;
+}
+
+inline Server &Server::Post(const std::string &pattern, Handler handler) {
+  post_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
+  return *this;
+}
+
+inline Server &Server::Post(const std::string &pattern,
+                            HandlerWithContentReader handler) {
+  post_handlers_for_content_reader_.emplace_back(make_matcher(pattern),
+                                                 std::move(handler));
+  return *this;
+}
+
+inline Server &Server::Put(const std::string &pattern, Handler handler) {
+  put_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
+  return *this;
+}
+
+inline Server &Server::Put(const std::string &pattern,
+                           HandlerWithContentReader handler) {
+  put_handlers_for_content_reader_.emplace_back(make_matcher(pattern),
+                                                std::move(handler));
+  return *this;
+}
+
+inline Server &Server::Patch(const std::string &pattern, Handler handler) {
+  patch_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
+  return *this;
+}
+
+inline Server &Server::Patch(const std::string &pattern,
+                             HandlerWithContentReader handler) {
+  patch_handlers_for_content_reader_.emplace_back(make_matcher(pattern),
+                                                  std::move(handler));
+  return *this;
+}
+
+inline Server &Server::Delete(const std::string &pattern, Handler handler) {
+  delete_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
+  return *this;
+}
+
+inline Server &Server::Delete(const std::string &pattern,
+                              HandlerWithContentReader handler) {
+  delete_handlers_for_content_reader_.emplace_back(make_matcher(pattern),
+                                                   std::move(handler));
+  return *this;
+}
+
+inline Server &Server::Options(const std::string &pattern, Handler handler) {
+  options_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
+  return *this;
+}
+
+inline bool Server::set_base_dir(const std::string &dir,
+                                 const std::string &mount_point) {
+  return set_mount_point(mount_point, dir);
+}
+
+inline bool Server::set_mount_point(const std::string &mount_point,
+                                    const std::string &dir, Headers headers) {
+  detail::FileStat stat(dir);
+  if (stat.is_dir()) {
+    std::string mnt = !mount_point.empty() ? mount_point : "/";
+    if (!mnt.empty() && mnt[0] == '/') {
+      base_dirs_.push_back({mnt, dir, std::move(headers)});
+      return true;
+    }
+  }
+  return false;
+}
+
+inline bool Server::remove_mount_point(const std::string &mount_point) {
+  for (auto it = base_dirs_.begin(); it != base_dirs_.end(); ++it) {
+    if (it->mount_point == mount_point) {
+      base_dirs_.erase(it);
+      return true;
+    }
+  }
+  return false;
+}
+
+inline Server &
+Server::set_file_extension_and_mimetype_mapping(const std::string &ext,
+                                                const std::string &mime) {
+  file_extension_and_mimetype_map_[ext] = mime;
+  return *this;
+}
+
+inline Server &Server::set_default_file_mimetype(const std::string &mime) {
+  default_file_mimetype_ = mime;
+  return *this;
+}
+
+inline Server &Server::set_file_request_handler(Handler handler) {
+  file_request_handler_ = std::move(handler);
+  return *this;
+}
+
+inline Server &Server::set_error_handler_core(HandlerWithResponse handler,
+                                              std::true_type) {
+  error_handler_ = std::move(handler);
+  return *this;
+}
+
+inline Server &Server::set_error_handler_core(Handler handler,
+                                              std::false_type) {
+  error_handler_ = [handler](const Request &req, Response &res) {
+    handler(req, res);
+    return HandlerResponse::Handled;
+  };
+  return *this;
+}
+
+inline Server &Server::set_exception_handler(ExceptionHandler handler) {
+  exception_handler_ = std::move(handler);
+  return *this;
+}
+
+inline Server &Server::set_pre_routing_handler(HandlerWithResponse handler) {
+  pre_routing_handler_ = std::move(handler);
+  return *this;
+}
+
+inline Server &Server::set_post_routing_handler(Handler handler) {
+  post_routing_handler_ = std::move(handler);
+  return *this;
+}
+
+inline Server &Server::set_pre_request_handler(HandlerWithResponse handler) {
+  pre_request_handler_ = std::move(handler);
+  return *this;
+}
+
+inline Server &Server::set_logger(Logger logger) {
+  logger_ = std::move(logger);
+  return *this;
+}
+
+inline Server &Server::set_error_logger(ErrorLogger error_logger) {
+  error_logger_ = std::move(error_logger);
+  return *this;
+}
+
+inline Server &Server::set_pre_compression_logger(Logger logger) {
+  pre_compression_logger_ = std::move(logger);
+  return *this;
+}
+
+inline Server &
+Server::set_expect_100_continue_handler(Expect100ContinueHandler handler) {
+  expect_100_continue_handler_ = std::move(handler);
+  return *this;
+}
+
+inline Server &Server::set_address_family(int family) {
+  address_family_ = family;
+  return *this;
+}
+
+inline Server &Server::set_tcp_nodelay(bool on) {
+  tcp_nodelay_ = on;
+  return *this;
+}
+
+inline Server &Server::set_ipv6_v6only(bool on) {
+  ipv6_v6only_ = on;
+  return *this;
+}
+
+inline Server &Server::set_socket_options(SocketOptions socket_options) {
+  socket_options_ = std::move(socket_options);
+  return *this;
+}
+
+inline Server &Server::set_default_headers(Headers headers) {
+  default_headers_ = std::move(headers);
+  return *this;
+}
+
+inline Server &Server::set_header_writer(
+    std::function<ssize_t(Stream &, Headers &)> const &writer) {
+  header_writer_ = writer;
+  return *this;
+}
+
+inline Server &
+Server::set_trusted_proxies(const std::vector<std::string> &proxies) {
+  trusted_proxies_ = proxies;
+  return *this;
+}
+
+inline Server &Server::set_keep_alive_max_count(size_t count) {
+  keep_alive_max_count_ = count;
+  return *this;
+}
+
+inline Server &Server::set_keep_alive_timeout(time_t sec) {
+  keep_alive_timeout_sec_ = sec;
+  return *this;
+}
+
+inline Server &Server::set_read_timeout(time_t sec, time_t usec) {
+  read_timeout_sec_ = sec;
+  read_timeout_usec_ = usec;
+  return *this;
+}
+
+inline Server &Server::set_write_timeout(time_t sec, time_t usec) {
+  write_timeout_sec_ = sec;
+  write_timeout_usec_ = usec;
+  return *this;
+}
+
+inline Server &Server::set_idle_interval(time_t sec, time_t usec) {
+  idle_interval_sec_ = sec;
+  idle_interval_usec_ = usec;
+  return *this;
+}
+
+inline Server &Server::set_payload_max_length(size_t length) {
+  payload_max_length_ = length;
+  return *this;
+}
+
+inline bool Server::bind_to_port(const std::string &host, int port,
+                                 int socket_flags) {
+  auto ret = bind_internal(host, port, socket_flags);
+  if (ret == -1) { is_decommissioned = true; }
+  return ret >= 0;
+}
+inline int Server::bind_to_any_port(const std::string &host, int socket_flags) {
+  auto ret = bind_internal(host, 0, socket_flags);
+  if (ret == -1) { is_decommissioned = true; }
+  return ret;
+}
+
+inline bool Server::listen_after_bind() { return listen_internal(); }
+
+inline bool Server::listen(const std::string &host, int port,
+                           int socket_flags) {
+  return bind_to_port(host, port, socket_flags) && listen_internal();
+}
+
+inline bool Server::is_running() const { return is_running_; }
+
+inline void Server::wait_until_ready() const {
+  while (!is_running_ && !is_decommissioned) {
+    std::this_thread::sleep_for(std::chrono::milliseconds{1});
+  }
+}
+
+inline void Server::stop() {
+  if (is_running_) {
+    assert(svr_sock_ != INVALID_SOCKET);
+    std::atomic<socket_t> sock(svr_sock_.exchange(INVALID_SOCKET));
+    detail::shutdown_socket(sock);
+    detail::close_socket(sock);
+  }
+  is_decommissioned = false;
+}
+
+inline void Server::decommission() { is_decommissioned = true; }
+
+inline bool Server::parse_request_line(const char *s, Request &req) const {
+  auto len = strlen(s);
+  if (len < 2 || s[len - 2] != '\r' || s[len - 1] != '\n') { return false; }
+  len -= 2;
+
+  {
+    size_t count = 0;
+
+    detail::split(s, s + len, ' ', [&](const char *b, const char *e) {
+      switch (count) {
+      case 0: req.method = std::string(b, e); break;
+      case 1: req.target = std::string(b, e); break;
+      case 2: req.version = std::string(b, e); break;
+      default: break;
+      }
+      count++;
+    });
+
+    if (count != 3) { return false; }
+  }
+
+  thread_local const std::set<std::string> methods{
+      "GET",     "HEAD",    "POST",  "PUT",   "DELETE",
+      "CONNECT", "OPTIONS", "TRACE", "PATCH", "PRI"};
+
+  if (methods.find(req.method) == methods.end()) {
+    output_error_log(Error::InvalidHTTPMethod, &req);
+    return false;
+  }
+
+  if (req.version != "HTTP/1.1" && req.version != "HTTP/1.0") {
+    output_error_log(Error::InvalidHTTPVersion, &req);
+    return false;
+  }
+
+  {
+    // Skip URL fragment
+    for (size_t i = 0; i < req.target.size(); i++) {
+      if (req.target[i] == '#') {
+        req.target.erase(i);
+        break;
+      }
+    }
+
+    detail::divide(req.target, '?',
+                   [&](const char *lhs_data, std::size_t lhs_size,
+                       const char *rhs_data, std::size_t rhs_size) {
+                     req.path =
+                         decode_path_component(std::string(lhs_data, lhs_size));
+                     detail::parse_query_text(rhs_data, rhs_size, req.params);
+                   });
+  }
+
+  return true;
+}
+
+inline bool Server::write_response(Stream &strm, bool close_connection,
+                                   Request &req, Response &res) {
+  // NOTE: `req.ranges` should be empty, otherwise it will be applied
+  // incorrectly to the error content.
+  req.ranges.clear();
+  return write_response_core(strm, close_connection, req, res, false);
+}
+
+inline bool Server::write_response_with_content(Stream &strm,
+                                                bool close_connection,
+                                                const Request &req,
+                                                Response &res) {
+  return write_response_core(strm, close_connection, req, res, true);
+}
+
+inline bool Server::write_response_core(Stream &strm, bool close_connection,
+                                        const Request &req, Response &res,
+                                        bool need_apply_ranges) {
+  assert(res.status != -1);
+
+  if (400 <= res.status && error_handler_ &&
+      error_handler_(req, res) == HandlerResponse::Handled) {
+    need_apply_ranges = true;
+  }
+
+  std::string content_type;
+  std::string boundary;
+  if (need_apply_ranges) { apply_ranges(req, res, content_type, boundary); }
+
+  // Prepare additional headers
+  if (close_connection || req.get_header_value("Connection") == "close") {
+    res.set_header("Connection", "close");
+  } else {
+    std::string s = "timeout=";
+    s += std::to_string(keep_alive_timeout_sec_);
+    s += ", max=";
+    s += std::to_string(keep_alive_max_count_);
+    res.set_header("Keep-Alive", s);
+  }
+
+  if ((!res.body.empty() || res.content_length_ > 0 || res.content_provider_) &&
+      !res.has_header("Content-Type")) {
+    res.set_header("Content-Type", "text/plain");
+  }
+
+  if (res.body.empty() && !res.content_length_ && !res.content_provider_ &&
+      !res.has_header("Content-Length")) {
+    res.set_header("Content-Length", "0");
+  }
+
+  if (req.method == "HEAD" && !res.has_header("Accept-Ranges")) {
+    res.set_header("Accept-Ranges", "bytes");
+  }
+
+  if (post_routing_handler_) { post_routing_handler_(req, res); }
+
+  // Response line and headers
+  {
+    detail::BufferStream bstrm;
+    if (!detail::write_response_line(bstrm, res.status)) { return false; }
+    if (!header_writer_(bstrm, res.headers)) { return false; }
+
+    // Flush buffer
+    auto &data = bstrm.get_buffer();
+    detail::write_data(strm, data.data(), data.size());
+  }
+
+  // Body
+  auto ret = true;
+  if (req.method != "HEAD") {
+    if (!res.body.empty()) {
+      if (!detail::write_data(strm, res.body.data(), res.body.size())) {
+        ret = false;
+      }
+    } else if (res.content_provider_) {
+      if (write_content_with_provider(strm, req, res, boundary, content_type)) {
+        res.content_provider_success_ = true;
+      } else {
+        ret = false;
+      }
+    }
+  }
+
+  // Log
+  output_log(req, res);
+
+  return ret;
+}
+
+inline bool
+Server::write_content_with_provider(Stream &strm, const Request &req,
+                                    Response &res, const std::string &boundary,
+                                    const std::string &content_type) {
+  auto is_shutting_down = [this]() {
+    return this->svr_sock_ == INVALID_SOCKET;
+  };
+
+  if (res.content_length_ > 0) {
+    if (req.ranges.empty()) {
+      return detail::write_content(strm, res.content_provider_, 0,
+                                   res.content_length_, is_shutting_down);
+    } else if (req.ranges.size() == 1) {
+      auto offset_and_length = detail::get_range_offset_and_length(
+          req.ranges[0], res.content_length_);
+
+      return detail::write_content(strm, res.content_provider_,
+                                   offset_and_length.first,
+                                   offset_and_length.second, is_shutting_down);
+    } else {
+      return detail::write_multipart_ranges_data(
+          strm, req, res, boundary, content_type, res.content_length_,
+          is_shutting_down);
+    }
+  } else {
+    if (res.is_chunked_content_provider_) {
+      auto type = detail::encoding_type(req, res);
+
+      std::unique_ptr<detail::compressor> compressor;
+      if (type == detail::EncodingType::Gzip) {
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+        compressor = detail::make_unique<detail::gzip_compressor>();
+#endif
+      } else if (type == detail::EncodingType::Brotli) {
+#ifdef CPPHTTPLIB_BROTLI_SUPPORT
+        compressor = detail::make_unique<detail::brotli_compressor>();
+#endif
+      } else if (type == detail::EncodingType::Zstd) {
+#ifdef CPPHTTPLIB_ZSTD_SUPPORT
+        compressor = detail::make_unique<detail::zstd_compressor>();
+#endif
+      } else {
+        compressor = detail::make_unique<detail::nocompressor>();
+      }
+      assert(compressor != nullptr);
+
+      return detail::write_content_chunked(strm, res.content_provider_,
+                                           is_shutting_down, *compressor);
+    } else {
+      return detail::write_content_without_length(strm, res.content_provider_,
+                                                  is_shutting_down);
+    }
+  }
+}
+
+inline bool Server::read_content(Stream &strm, Request &req, Response &res) {
+  FormFields::iterator cur_field;
+  FormFiles::iterator cur_file;
+  auto is_text_field = false;
+  size_t count = 0;
+  if (read_content_core(
+          strm, req, res,
+          // Regular
+          [&](const char *buf, size_t n) {
+            if (req.body.size() + n > req.body.max_size()) { return false; }
+            req.body.append(buf, n);
+            return true;
+          },
+          // Multipart FormData
+          [&](const FormData &file) {
+            if (count++ == CPPHTTPLIB_MULTIPART_FORM_DATA_FILE_MAX_COUNT) {
+              output_error_log(Error::TooManyFormDataFiles, &req);
+              return false;
+            }
+
+            if (file.filename.empty()) {
+              cur_field = req.form.fields.emplace(
+                  file.name, FormField{file.name, file.content, file.headers});
+              is_text_field = true;
+            } else {
+              cur_file = req.form.files.emplace(file.name, file);
+              is_text_field = false;
+            }
+            return true;
+          },
+          [&](const char *buf, size_t n) {
+            if (is_text_field) {
+              auto &content = cur_field->second.content;
+              if (content.size() + n > content.max_size()) { return false; }
+              content.append(buf, n);
+            } else {
+              auto &content = cur_file->second.content;
+              if (content.size() + n > content.max_size()) { return false; }
+              content.append(buf, n);
+            }
+            return true;
+          })) {
+    const auto &content_type = req.get_header_value("Content-Type");
+    if (!content_type.find("application/x-www-form-urlencoded")) {
+      if (req.body.size() > CPPHTTPLIB_FORM_URL_ENCODED_PAYLOAD_MAX_LENGTH) {
+        res.status = StatusCode::PayloadTooLarge_413; // NOTE: should be 414?
+        output_error_log(Error::ExceedMaxPayloadSize, &req);
+        return false;
+      }
+      detail::parse_query_text(req.body, req.params);
+    }
+    return true;
+  }
+  return false;
+}
+
+inline bool Server::read_content_with_content_receiver(
+    Stream &strm, Request &req, Response &res, ContentReceiver receiver,
+    FormDataHeader multipart_header, ContentReceiver multipart_receiver) {
+  return read_content_core(strm, req, res, std::move(receiver),
+                           std::move(multipart_header),
+                           std::move(multipart_receiver));
+}
+
+inline bool Server::read_content_core(
+    Stream &strm, Request &req, Response &res, ContentReceiver receiver,
+    FormDataHeader multipart_header, ContentReceiver multipart_receiver) const {
+  detail::FormDataParser multipart_form_data_parser;
+  ContentReceiverWithProgress out;
+
+  if (req.is_multipart_form_data()) {
+    const auto &content_type = req.get_header_value("Content-Type");
+    std::string boundary;
+    if (!detail::parse_multipart_boundary(content_type, boundary)) {
+      res.status = StatusCode::BadRequest_400;
+      output_error_log(Error::MultipartParsing, &req);
+      return false;
+    }
+
+    multipart_form_data_parser.set_boundary(std::move(boundary));
+    out = [&](const char *buf, size_t n, size_t /*off*/, size_t /*len*/) {
+      return multipart_form_data_parser.parse(buf, n, multipart_header,
+                                              multipart_receiver);
+    };
+  } else {
+    out = [receiver](const char *buf, size_t n, size_t /*off*/,
+                     size_t /*len*/) { return receiver(buf, n); };
+  }
+
+  if (req.method == "DELETE" && !req.has_header("Content-Length")) {
+    return true;
+  }
+
+  if (!detail::read_content(strm, req, payload_max_length_, res.status, nullptr,
+                            out, true)) {
+    return false;
+  }
+
+  if (req.is_multipart_form_data()) {
+    if (!multipart_form_data_parser.is_valid()) {
+      res.status = StatusCode::BadRequest_400;
+      output_error_log(Error::MultipartParsing, &req);
+      return false;
+    }
+  }
+
+  return true;
+}
+
+inline bool Server::handle_file_request(const Request &req, Response &res) {
+  for (const auto &entry : base_dirs_) {
+    // Prefix match
+    if (!req.path.compare(0, entry.mount_point.size(), entry.mount_point)) {
+      std::string sub_path = "/" + req.path.substr(entry.mount_point.size());
+      if (detail::is_valid_path(sub_path)) {
+        auto path = entry.base_dir + sub_path;
+        if (path.back() == '/') { path += "index.html"; }
+
+        detail::FileStat stat(path);
+
+        if (stat.is_dir()) {
+          res.set_redirect(sub_path + "/", StatusCode::MovedPermanently_301);
+          return true;
+        }
+
+        if (stat.is_file()) {
+          for (const auto &kv : entry.headers) {
+            res.set_header(kv.first, kv.second);
+          }
+
+          auto mm = std::make_shared<detail::mmap>(path.c_str());
+          if (!mm->is_open()) {
+            output_error_log(Error::OpenFile, &req);
+            return false;
+          }
+
+          res.set_content_provider(
+              mm->size(),
+              detail::find_content_type(path, file_extension_and_mimetype_map_,
+                                        default_file_mimetype_),
+              [mm](size_t offset, size_t length, DataSink &sink) -> bool {
+                sink.write(mm->data() + offset, length);
+                return true;
+              });
+
+          if (req.method != "HEAD" && file_request_handler_) {
+            file_request_handler_(req, res);
+          }
+
+          return true;
+        } else {
+          output_error_log(Error::OpenFile, &req);
+        }
+      }
+    }
+  }
+  return false;
+}
+
+inline socket_t
+Server::create_server_socket(const std::string &host, int port,
+                             int socket_flags,
+                             SocketOptions socket_options) const {
+  return detail::create_socket(
+      host, std::string(), port, address_family_, socket_flags, tcp_nodelay_,
+      ipv6_v6only_, std::move(socket_options),
+      [&](socket_t sock, struct addrinfo &ai, bool & /*quit*/) -> bool {
+        if (::bind(sock, ai.ai_addr, static_cast<socklen_t>(ai.ai_addrlen))) {
+          output_error_log(Error::BindIPAddress, nullptr);
+          return false;
+        }
+        if (::listen(sock, CPPHTTPLIB_LISTEN_BACKLOG)) {
+          output_error_log(Error::Listen, nullptr);
+          return false;
+        }
+        return true;
+      });
+}
+
+inline int Server::bind_internal(const std::string &host, int port,
+                                 int socket_flags) {
+  if (is_decommissioned) { return -1; }
+
+  if (!is_valid()) { return -1; }
+
+  svr_sock_ = create_server_socket(host, port, socket_flags, socket_options_);
+  if (svr_sock_ == INVALID_SOCKET) { return -1; }
+
+  if (port == 0) {
+    struct sockaddr_storage addr;
+    socklen_t addr_len = sizeof(addr);
+    if (getsockname(svr_sock_, reinterpret_cast<struct sockaddr *>(&addr),
+                    &addr_len) == -1) {
+      output_error_log(Error::GetSockName, nullptr);
+      return -1;
+    }
+    if (addr.ss_family == AF_INET) {
+      return ntohs(reinterpret_cast<struct sockaddr_in *>(&addr)->sin_port);
+    } else if (addr.ss_family == AF_INET6) {
+      return ntohs(reinterpret_cast<struct sockaddr_in6 *>(&addr)->sin6_port);
+    } else {
+      output_error_log(Error::UnsupportedAddressFamily, nullptr);
+      return -1;
+    }
+  } else {
+    return port;
+  }
+}
+
+inline bool Server::listen_internal() {
+  if (is_decommissioned) { return false; }
+
+  auto ret = true;
+  is_running_ = true;
+  auto se = detail::scope_exit([&]() { is_running_ = false; });
+
+  {
+    std::unique_ptr<TaskQueue> task_queue(new_task_queue());
+
+    while (svr_sock_ != INVALID_SOCKET) {
+#ifndef _WIN32
+      if (idle_interval_sec_ > 0 || idle_interval_usec_ > 0) {
+#endif
+        auto val = detail::select_read(svr_sock_, idle_interval_sec_,
+                                       idle_interval_usec_);
+        if (val == 0) { // Timeout
+          task_queue->on_idle();
+          continue;
+        }
+#ifndef _WIN32
+      }
+#endif
+
+#if defined _WIN32
+      // sockets connected via WASAccept inherit flags NO_HANDLE_INHERIT,
+      // OVERLAPPED
+      socket_t sock = WSAAccept(svr_sock_, nullptr, nullptr, nullptr, 0);
+#elif defined SOCK_CLOEXEC
+      socket_t sock = accept4(svr_sock_, nullptr, nullptr, SOCK_CLOEXEC);
+#else
+      socket_t sock = accept(svr_sock_, nullptr, nullptr);
+#endif
+
+      if (sock == INVALID_SOCKET) {
+        if (errno == EMFILE) {
+          // The per-process limit of open file descriptors has been reached.
+          // Try to accept new connections after a short sleep.
+          std::this_thread::sleep_for(std::chrono::microseconds{1});
+          continue;
+        } else if (errno == EINTR || errno == EAGAIN) {
+          continue;
+        }
+        if (svr_sock_ != INVALID_SOCKET) {
+          detail::close_socket(svr_sock_);
+          ret = false;
+          output_error_log(Error::Connection, nullptr);
+        } else {
+          ; // The server socket was closed by user.
+        }
+        break;
+      }
+
+      detail::set_socket_opt_time(sock, SOL_SOCKET, SO_RCVTIMEO,
+                                  read_timeout_sec_, read_timeout_usec_);
+      detail::set_socket_opt_time(sock, SOL_SOCKET, SO_SNDTIMEO,
+                                  write_timeout_sec_, write_timeout_usec_);
+
+      if (!task_queue->enqueue(
+              [this, sock]() { process_and_close_socket(sock); })) {
+        output_error_log(Error::ResourceExhaustion, nullptr);
+        detail::shutdown_socket(sock);
+        detail::close_socket(sock);
+      }
+    }
+
+    task_queue->shutdown();
+  }
+
+  is_decommissioned = !ret;
+  return ret;
+}
+
+inline bool Server::routing(Request &req, Response &res, Stream &strm) {
+  if (pre_routing_handler_ &&
+      pre_routing_handler_(req, res) == HandlerResponse::Handled) {
+    return true;
+  }
+
+  // File handler
+  if ((req.method == "GET" || req.method == "HEAD") &&
+      handle_file_request(req, res)) {
+    return true;
+  }
+
+  if (detail::expect_content(req)) {
+    // Content reader handler
+    {
+      ContentReader reader(
+          [&](ContentReceiver receiver) {
+            auto result = read_content_with_content_receiver(
+                strm, req, res, std::move(receiver), nullptr, nullptr);
+            if (!result) { output_error_log(Error::Read, &req); }
+            return result;
+          },
+          [&](FormDataHeader header, ContentReceiver receiver) {
+            auto result = read_content_with_content_receiver(
+                strm, req, res, nullptr, std::move(header),
+                std::move(receiver));
+            if (!result) { output_error_log(Error::Read, &req); }
+            return result;
+          });
+
+      if (req.method == "POST") {
+        if (dispatch_request_for_content_reader(
+                req, res, std::move(reader),
+                post_handlers_for_content_reader_)) {
+          return true;
+        }
+      } else if (req.method == "PUT") {
+        if (dispatch_request_for_content_reader(
+                req, res, std::move(reader),
+                put_handlers_for_content_reader_)) {
+          return true;
+        }
+      } else if (req.method == "PATCH") {
+        if (dispatch_request_for_content_reader(
+                req, res, std::move(reader),
+                patch_handlers_for_content_reader_)) {
+          return true;
+        }
+      } else if (req.method == "DELETE") {
+        if (dispatch_request_for_content_reader(
+                req, res, std::move(reader),
+                delete_handlers_for_content_reader_)) {
+          return true;
+        }
+      }
+    }
+
+    // Read content into `req.body`
+    if (!read_content(strm, req, res)) {
+      output_error_log(Error::Read, &req);
+      return false;
+    }
+  }
+
+  // Regular handler
+  if (req.method == "GET" || req.method == "HEAD") {
+    return dispatch_request(req, res, get_handlers_);
+  } else if (req.method == "POST") {
+    return dispatch_request(req, res, post_handlers_);
+  } else if (req.method == "PUT") {
+    return dispatch_request(req, res, put_handlers_);
+  } else if (req.method == "DELETE") {
+    return dispatch_request(req, res, delete_handlers_);
+  } else if (req.method == "OPTIONS") {
+    return dispatch_request(req, res, options_handlers_);
+  } else if (req.method == "PATCH") {
+    return dispatch_request(req, res, patch_handlers_);
+  }
+
+  res.status = StatusCode::BadRequest_400;
+  return false;
+}
+
+inline bool Server::dispatch_request(Request &req, Response &res,
+                                     const Handlers &handlers) const {
+  for (const auto &x : handlers) {
+    const auto &matcher = x.first;
+    const auto &handler = x.second;
+
+    if (matcher->match(req)) {
+      req.matched_route = matcher->pattern();
+      if (!pre_request_handler_ ||
+          pre_request_handler_(req, res) != HandlerResponse::Handled) {
+        handler(req, res);
+      }
+      return true;
+    }
+  }
+  return false;
+}
+
+inline void Server::apply_ranges(const Request &req, Response &res,
+                                 std::string &content_type,
+                                 std::string &boundary) const {
+  if (req.ranges.size() > 1 && res.status == StatusCode::PartialContent_206) {
+    auto it = res.headers.find("Content-Type");
+    if (it != res.headers.end()) {
+      content_type = it->second;
+      res.headers.erase(it);
+    }
+
+    boundary = detail::make_multipart_data_boundary();
+
+    res.set_header("Content-Type",
+                   "multipart/byteranges; boundary=" + boundary);
+  }
+
+  auto type = detail::encoding_type(req, res);
+
+  if (res.body.empty()) {
+    if (res.content_length_ > 0) {
+      size_t length = 0;
+      if (req.ranges.empty() || res.status != StatusCode::PartialContent_206) {
+        length = res.content_length_;
+      } else if (req.ranges.size() == 1) {
+        auto offset_and_length = detail::get_range_offset_and_length(
+            req.ranges[0], res.content_length_);
+
+        length = offset_and_length.second;
+
+        auto content_range = detail::make_content_range_header_field(
+            offset_and_length, res.content_length_);
+        res.set_header("Content-Range", content_range);
+      } else {
+        length = detail::get_multipart_ranges_data_length(
+            req, boundary, content_type, res.content_length_);
+      }
+      res.set_header("Content-Length", std::to_string(length));
+    } else {
+      if (res.content_provider_) {
+        if (res.is_chunked_content_provider_) {
+          res.set_header("Transfer-Encoding", "chunked");
+          if (type == detail::EncodingType::Gzip) {
+            res.set_header("Content-Encoding", "gzip");
+          } else if (type == detail::EncodingType::Brotli) {
+            res.set_header("Content-Encoding", "br");
+          } else if (type == detail::EncodingType::Zstd) {
+            res.set_header("Content-Encoding", "zstd");
+          }
+        }
+      }
+    }
+  } else {
+    if (req.ranges.empty() || res.status != StatusCode::PartialContent_206) {
+      ;
+    } else if (req.ranges.size() == 1) {
+      auto offset_and_length =
+          detail::get_range_offset_and_length(req.ranges[0], res.body.size());
+      auto offset = offset_and_length.first;
+      auto length = offset_and_length.second;
+
+      auto content_range = detail::make_content_range_header_field(
+          offset_and_length, res.body.size());
+      res.set_header("Content-Range", content_range);
+
+      assert(offset + length <= res.body.size());
+      res.body = res.body.substr(offset, length);
+    } else {
+      std::string data;
+      detail::make_multipart_ranges_data(req, res, boundary, content_type,
+                                         res.body.size(), data);
+      res.body.swap(data);
+    }
+
+    if (type != detail::EncodingType::None) {
+      output_pre_compression_log(req, res);
+
+      std::unique_ptr<detail::compressor> compressor;
+      std::string content_encoding;
+
+      if (type == detail::EncodingType::Gzip) {
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+        compressor = detail::make_unique<detail::gzip_compressor>();
+        content_encoding = "gzip";
+#endif
+      } else if (type == detail::EncodingType::Brotli) {
+#ifdef CPPHTTPLIB_BROTLI_SUPPORT
+        compressor = detail::make_unique<detail::brotli_compressor>();
+        content_encoding = "br";
+#endif
+      } else if (type == detail::EncodingType::Zstd) {
+#ifdef CPPHTTPLIB_ZSTD_SUPPORT
+        compressor = detail::make_unique<detail::zstd_compressor>();
+        content_encoding = "zstd";
+#endif
+      }
+
+      if (compressor) {
+        std::string compressed;
+        if (compressor->compress(res.body.data(), res.body.size(), true,
+                                 [&](const char *data, size_t data_len) {
+                                   compressed.append(data, data_len);
+                                   return true;
+                                 })) {
+          res.body.swap(compressed);
+          res.set_header("Content-Encoding", content_encoding);
+        }
+      }
+    }
+
+    auto length = std::to_string(res.body.size());
+    res.set_header("Content-Length", length);
+  }
+}
+
+inline bool Server::dispatch_request_for_content_reader(
+    Request &req, Response &res, ContentReader content_reader,
+    const HandlersForContentReader &handlers) const {
+  for (const auto &x : handlers) {
+    const auto &matcher = x.first;
+    const auto &handler = x.second;
+
+    if (matcher->match(req)) {
+      req.matched_route = matcher->pattern();
+      if (!pre_request_handler_ ||
+          pre_request_handler_(req, res) != HandlerResponse::Handled) {
+        handler(req, res, content_reader);
+      }
+      return true;
+    }
+  }
+  return false;
+}
+
+inline std::string
+get_client_ip(const std::string &x_forwarded_for,
+              const std::vector<std::string> &trusted_proxies) {
+  // X-Forwarded-For is a comma-separated list per RFC 7239
+  std::vector<std::string> ip_list;
+  detail::split(x_forwarded_for.data(),
+                x_forwarded_for.data() + x_forwarded_for.size(), ',',
+                [&](const char *b, const char *e) {
+                  auto r = detail::trim(b, e, 0, static_cast<size_t>(e - b));
+                  ip_list.emplace_back(std::string(b + r.first, b + r.second));
+                });
+
+  for (size_t i = 0; i < ip_list.size(); ++i) {
+    auto ip = ip_list[i];
+
+    auto is_trusted_proxy =
+        std::any_of(trusted_proxies.begin(), trusted_proxies.end(),
+                    [&](const std::string &proxy) { return ip == proxy; });
+
+    if (is_trusted_proxy) {
+      if (i == 0) {
+        // If the trusted proxy is the first IP, there's no preceding client IP
+        return ip;
+      } else {
+        // Return the IP immediately before the trusted proxy
+        return ip_list[i - 1];
+      }
+    }
+  }
+
+  // If no trusted proxy is found, return the first IP in the list
+  return ip_list.front();
+}
+
+inline bool
+Server::process_request(Stream &strm, const std::string &remote_addr,
+                        int remote_port, const std::string &local_addr,
+                        int local_port, bool close_connection,
+                        bool &connection_closed,
+                        const std::function<void(Request &)> &setup_request) {
+  std::array<char, 2048> buf{};
+
+  detail::stream_line_reader line_reader(strm, buf.data(), buf.size());
+
+  // Connection has been closed on client
+  if (!line_reader.getline()) { return false; }
+
+  Request req;
+  req.start_time_ = std::chrono::steady_clock::now();
+
+  Response res;
+  res.version = "HTTP/1.1";
+  res.headers = default_headers_;
+
+#ifdef __APPLE__
+  // Socket file descriptor exceeded FD_SETSIZE...
+  if (strm.socket() >= FD_SETSIZE) {
+    Headers dummy;
+    detail::read_headers(strm, dummy);
+    res.status = StatusCode::InternalServerError_500;
+    output_error_log(Error::ExceedMaxSocketDescriptorCount, &req);
+    return write_response(strm, close_connection, req, res);
+  }
+#endif
+
+  // Request line and headers
+  if (!parse_request_line(line_reader.ptr(), req)) {
+    res.status = StatusCode::BadRequest_400;
+    output_error_log(Error::InvalidRequestLine, &req);
+    return write_response(strm, close_connection, req, res);
+  }
+
+  // Request headers
+  if (!detail::read_headers(strm, req.headers)) {
+    res.status = StatusCode::BadRequest_400;
+    output_error_log(Error::InvalidHeaders, &req);
+    return write_response(strm, close_connection, req, res);
+  }
+
+  // Check if the request URI doesn't exceed the limit
+  if (req.target.size() > CPPHTTPLIB_REQUEST_URI_MAX_LENGTH) {
+    Headers dummy;
+    detail::read_headers(strm, dummy);
+    res.status = StatusCode::UriTooLong_414;
+    output_error_log(Error::ExceedUriMaxLength, &req);
+    return write_response(strm, close_connection, req, res);
+  }
+
+  if (req.get_header_value("Connection") == "close") {
+    connection_closed = true;
+  }
+
+  if (req.version == "HTTP/1.0" &&
+      req.get_header_value("Connection") != "Keep-Alive") {
+    connection_closed = true;
+  }
+
+  if (!trusted_proxies_.empty() && req.has_header("X-Forwarded-For")) {
+    auto x_forwarded_for = req.get_header_value("X-Forwarded-For");
+    req.remote_addr = get_client_ip(x_forwarded_for, trusted_proxies_);
+  } else {
+    req.remote_addr = remote_addr;
+  }
+  req.remote_port = remote_port;
+
+  req.local_addr = local_addr;
+  req.local_port = local_port;
+
+  if (req.has_header("Accept")) {
+    const auto &accept_header = req.get_header_value("Accept");
+    if (!detail::parse_accept_header(accept_header, req.accept_content_types)) {
+      res.status = StatusCode::BadRequest_400;
+      output_error_log(Error::HTTPParsing, &req);
+      return write_response(strm, close_connection, req, res);
+    }
+  }
+
+  if (req.has_header("Range")) {
+    const auto &range_header_value = req.get_header_value("Range");
+    if (!detail::parse_range_header(range_header_value, req.ranges)) {
+      res.status = StatusCode::RangeNotSatisfiable_416;
+      output_error_log(Error::InvalidRangeHeader, &req);
+      return write_response(strm, close_connection, req, res);
+    }
+  }
+
+  if (setup_request) { setup_request(req); }
+
+  if (req.get_header_value("Expect") == "100-continue") {
+    int status = StatusCode::Continue_100;
+    if (expect_100_continue_handler_) {
+      status = expect_100_continue_handler_(req, res);
+    }
+    switch (status) {
+    case StatusCode::Continue_100:
+    case StatusCode::ExpectationFailed_417:
+      detail::write_response_line(strm, status);
+      strm.write("\r\n");
+      break;
+    default:
+      connection_closed = true;
+      return write_response(strm, true, req, res);
+    }
+  }
+
+  // Setup `is_connection_closed` method
+  auto sock = strm.socket();
+  req.is_connection_closed = [sock]() {
+    return !detail::is_socket_alive(sock);
+  };
+
+  // Routing
+  auto routed = false;
+#ifdef CPPHTTPLIB_NO_EXCEPTIONS
+  routed = routing(req, res, strm);
+#else
+  try {
+    routed = routing(req, res, strm);
+  } catch (std::exception &e) {
+    if (exception_handler_) {
+      auto ep = std::current_exception();
+      exception_handler_(req, res, ep);
+      routed = true;
+    } else {
+      res.status = StatusCode::InternalServerError_500;
+      std::string val;
+      auto s = e.what();
+      for (size_t i = 0; s[i]; i++) {
+        switch (s[i]) {
+        case '\r': val += "\\r"; break;
+        case '\n': val += "\\n"; break;
+        default: val += s[i]; break;
+        }
+      }
+      res.set_header("EXCEPTION_WHAT", val);
+    }
+  } catch (...) {
+    if (exception_handler_) {
+      auto ep = std::current_exception();
+      exception_handler_(req, res, ep);
+      routed = true;
+    } else {
+      res.status = StatusCode::InternalServerError_500;
+      res.set_header("EXCEPTION_WHAT", "UNKNOWN");
+    }
+  }
+#endif
+  if (routed) {
+    if (res.status == -1) {
+      res.status = req.ranges.empty() ? StatusCode::OK_200
+                                      : StatusCode::PartialContent_206;
+    }
 
-    auto service = std::to_string(port);
+    // Serve file content by using a content provider
+    if (!res.file_content_path_.empty()) {
+      const auto &path = res.file_content_path_;
+      auto mm = std::make_shared<detail::mmap>(path.c_str());
+      if (!mm->is_open()) {
+        res.body.clear();
+        res.content_length_ = 0;
+        res.content_provider_ = nullptr;
+        res.status = StatusCode::NotFound_404;
+        output_error_log(Error::OpenFile, &req);
+        return write_response(strm, close_connection, req, res);
+      }
+
+      auto content_type = res.file_content_content_type_;
+      if (content_type.empty()) {
+        content_type = detail::find_content_type(
+            path, file_extension_and_mimetype_map_, default_file_mimetype_);
+      }
+
+      res.set_content_provider(
+          mm->size(), content_type,
+          [mm](size_t offset, size_t length, DataSink &sink) -> bool {
+            sink.write(mm->data() + offset, length);
+            return true;
+          });
+    }
 
-    if (getaddrinfo(host, service.c_str(), &hints, &result)) {
-        return INVALID_SOCKET;
+    if (detail::range_error(req, res)) {
+      res.body.clear();
+      res.content_length_ = 0;
+      res.content_provider_ = nullptr;
+      res.status = StatusCode::RangeNotSatisfiable_416;
+      return write_response(strm, close_connection, req, res);
     }
 
-    for (auto rp = result; rp; rp = rp->ai_next) {
-       // Create a socket
-       auto sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
-       if (sock == INVALID_SOCKET) {
-          continue;
-       }
+    return write_response_with_content(strm, close_connection, req, res);
+  } else {
+    if (res.status == -1) { res.status = StatusCode::NotFound_404; }
+
+    return write_response(strm, close_connection, req, res);
+  }
+}
+
+inline bool Server::is_valid() const { return true; }
+
+inline bool Server::process_and_close_socket(socket_t sock) {
+  std::string remote_addr;
+  int remote_port = 0;
+  detail::get_remote_ip_and_port(sock, remote_addr, remote_port);
+
+  std::string local_addr;
+  int local_port = 0;
+  detail::get_local_ip_and_port(sock, local_addr, local_port);
+
+  auto ret = detail::process_server_socket(
+      svr_sock_, sock, keep_alive_max_count_, keep_alive_timeout_sec_,
+      read_timeout_sec_, read_timeout_usec_, write_timeout_sec_,
+      write_timeout_usec_,
+      [&](Stream &strm, bool close_connection, bool &connection_closed) {
+        return process_request(strm, remote_addr, remote_port, local_addr,
+                               local_port, close_connection, connection_closed,
+                               nullptr);
+      });
+
+  detail::shutdown_socket(sock);
+  detail::close_socket(sock);
+  return ret;
+}
 
-       // Make 'reuse address' option available
-       int yes = 1;
-       setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char*)&yes, sizeof(yes));
+inline void Server::output_log(const Request &req, const Response &res) const {
+  if (logger_) {
+    std::lock_guard<std::mutex> guard(logger_mutex_);
+    logger_(req, res);
+  }
+}
+
+inline void Server::output_pre_compression_log(const Request &req,
+                                               const Response &res) const {
+  if (pre_compression_logger_) {
+    std::lock_guard<std::mutex> guard(logger_mutex_);
+    pre_compression_logger_(req, res);
+  }
+}
 
-       // bind or connect
-       if (fn(sock, *rp)) {
-          freeaddrinfo(result);
-          return sock;
-       }
+inline void Server::output_error_log(const Error &err,
+                                     const Request *req) const {
+  if (error_logger_) {
+    std::lock_guard<std::mutex> guard(logger_mutex_);
+    error_logger_(err, req);
+  }
+}
 
-       close_socket(sock);
+// HTTP client implementation
+inline ClientImpl::ClientImpl(const std::string &host)
+    : ClientImpl(host, 80, std::string(), std::string()) {}
+
+inline ClientImpl::ClientImpl(const std::string &host, int port)
+    : ClientImpl(host, port, std::string(), std::string()) {}
+
+inline ClientImpl::ClientImpl(const std::string &host, int port,
+                              const std::string &client_cert_path,
+                              const std::string &client_key_path)
+    : host_(detail::escape_abstract_namespace_unix_domain(host)), port_(port),
+      host_and_port_(detail::make_host_and_port_string(host_, port, is_ssl())),
+      client_cert_path_(client_cert_path), client_key_path_(client_key_path) {}
+
+inline ClientImpl::~ClientImpl() {
+  // Wait until all the requests in flight are handled.
+  size_t retry_count = 10;
+  while (retry_count-- > 0) {
+    {
+      std::lock_guard<std::mutex> guard(socket_mutex_);
+      if (socket_requests_in_flight_ == 0) { break; }
     }
+    std::this_thread::sleep_for(std::chrono::milliseconds{1});
+  }
 
-    freeaddrinfo(result);
-    return INVALID_SOCKET;
+  std::lock_guard<std::mutex> guard(socket_mutex_);
+  shutdown_socket(socket_);
+  close_socket(socket_);
 }
 
-inline void set_nonblocking(socket_t sock, bool nonblocking)
-{
-#ifdef _WIN32
-    auto flags = nonblocking ? 1UL : 0UL;
-    ioctlsocket(sock, FIONBIO, &flags);
-#else
-    auto flags = fcntl(sock, F_GETFL, 0);
-    fcntl(sock, F_SETFL, nonblocking ? (flags | O_NONBLOCK) : (flags & (~O_NONBLOCK)));
+inline bool ClientImpl::is_valid() const { return true; }
+
+inline void ClientImpl::copy_settings(const ClientImpl &rhs) {
+  client_cert_path_ = rhs.client_cert_path_;
+  client_key_path_ = rhs.client_key_path_;
+  connection_timeout_sec_ = rhs.connection_timeout_sec_;
+  read_timeout_sec_ = rhs.read_timeout_sec_;
+  read_timeout_usec_ = rhs.read_timeout_usec_;
+  write_timeout_sec_ = rhs.write_timeout_sec_;
+  write_timeout_usec_ = rhs.write_timeout_usec_;
+  max_timeout_msec_ = rhs.max_timeout_msec_;
+  basic_auth_username_ = rhs.basic_auth_username_;
+  basic_auth_password_ = rhs.basic_auth_password_;
+  bearer_token_auth_token_ = rhs.bearer_token_auth_token_;
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  digest_auth_username_ = rhs.digest_auth_username_;
+  digest_auth_password_ = rhs.digest_auth_password_;
+#endif
+  keep_alive_ = rhs.keep_alive_;
+  follow_location_ = rhs.follow_location_;
+  path_encode_ = rhs.path_encode_;
+  address_family_ = rhs.address_family_;
+  tcp_nodelay_ = rhs.tcp_nodelay_;
+  ipv6_v6only_ = rhs.ipv6_v6only_;
+  socket_options_ = rhs.socket_options_;
+  compress_ = rhs.compress_;
+  decompress_ = rhs.decompress_;
+  interface_ = rhs.interface_;
+  proxy_host_ = rhs.proxy_host_;
+  proxy_port_ = rhs.proxy_port_;
+  proxy_basic_auth_username_ = rhs.proxy_basic_auth_username_;
+  proxy_basic_auth_password_ = rhs.proxy_basic_auth_password_;
+  proxy_bearer_token_auth_token_ = rhs.proxy_bearer_token_auth_token_;
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  proxy_digest_auth_username_ = rhs.proxy_digest_auth_username_;
+  proxy_digest_auth_password_ = rhs.proxy_digest_auth_password_;
+#endif
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  ca_cert_file_path_ = rhs.ca_cert_file_path_;
+  ca_cert_dir_path_ = rhs.ca_cert_dir_path_;
+  ca_cert_store_ = rhs.ca_cert_store_;
+#endif
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  server_certificate_verification_ = rhs.server_certificate_verification_;
+  server_hostname_verification_ = rhs.server_hostname_verification_;
+  server_certificate_verifier_ = rhs.server_certificate_verifier_;
 #endif
+  logger_ = rhs.logger_;
+  error_logger_ = rhs.error_logger_;
 }
 
-inline bool is_connection_error()
-{
-#ifdef _WIN32
-    return WSAGetLastError() != WSAEWOULDBLOCK;
-#else
-    return errno != EINPROGRESS;
-#endif
+inline socket_t ClientImpl::create_client_socket(Error &error) const {
+  if (!proxy_host_.empty() && proxy_port_ != -1) {
+    return detail::create_client_socket(
+        proxy_host_, std::string(), proxy_port_, address_family_, tcp_nodelay_,
+        ipv6_v6only_, socket_options_, connection_timeout_sec_,
+        connection_timeout_usec_, read_timeout_sec_, read_timeout_usec_,
+        write_timeout_sec_, write_timeout_usec_, interface_, error);
+  }
+
+  // Check is custom IP specified for host_
+  std::string ip;
+  auto it = addr_map_.find(host_);
+  if (it != addr_map_.end()) { ip = it->second; }
+
+  return detail::create_client_socket(
+      host_, ip, port_, address_family_, tcp_nodelay_, ipv6_v6only_,
+      socket_options_, connection_timeout_sec_, connection_timeout_usec_,
+      read_timeout_sec_, read_timeout_usec_, write_timeout_sec_,
+      write_timeout_usec_, interface_, error);
 }
 
-inline std::string get_remote_addr(socket_t sock) {
-    struct sockaddr_storage addr;
-    socklen_t len = sizeof(addr);
+inline bool ClientImpl::create_and_connect_socket(Socket &socket,
+                                                  Error &error) {
+  auto sock = create_client_socket(error);
+  if (sock == INVALID_SOCKET) { return false; }
+  socket.sock = sock;
+  return true;
+}
 
-    if (!getpeername(sock, (struct sockaddr*)&addr, &len)) {
-        char ipstr[NI_MAXHOST];
+inline void ClientImpl::shutdown_ssl(Socket & /*socket*/,
+                                     bool /*shutdown_gracefully*/) {
+  // If there are any requests in flight from threads other than us, then it's
+  // a thread-unsafe race because individual ssl* objects are not thread-safe.
+  assert(socket_requests_in_flight_ == 0 ||
+         socket_requests_are_from_thread_ == std::this_thread::get_id());
+}
 
-        if (!getnameinfo((struct sockaddr*)&addr, len,
-            ipstr, sizeof(ipstr), nullptr, 0, NI_NUMERICHOST)) {
-            return ipstr;
-        }
-    }
+inline void ClientImpl::shutdown_socket(Socket &socket) const {
+  if (socket.sock == INVALID_SOCKET) { return; }
+  detail::shutdown_socket(socket.sock);
+}
 
-    return std::string();
+inline void ClientImpl::close_socket(Socket &socket) {
+  // If there are requests in flight in another thread, usually closing
+  // the socket will be fine and they will simply receive an error when
+  // using the closed socket, but it is still a bug since rarely the OS
+  // may reassign the socket id to be used for a new socket, and then
+  // suddenly they will be operating on a live socket that is different
+  // than the one they intended!
+  assert(socket_requests_in_flight_ == 0 ||
+         socket_requests_are_from_thread_ == std::this_thread::get_id());
+
+  // It is also a bug if this happens while SSL is still active
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  assert(socket.ssl == nullptr);
+#endif
+  if (socket.sock == INVALID_SOCKET) { return; }
+  detail::close_socket(socket.sock);
+  socket.sock = INVALID_SOCKET;
 }
 
-inline bool is_file(const std::string& path)
-{
-    struct stat st;
-    return stat(path.c_str(), &st) >= 0 && S_ISREG(st.st_mode);
+inline bool ClientImpl::read_response_line(Stream &strm, const Request &req,
+                                           Response &res) const {
+  std::array<char, 2048> buf{};
+
+  detail::stream_line_reader line_reader(strm, buf.data(), buf.size());
+
+  if (!line_reader.getline()) { return false; }
+
+#ifdef CPPHTTPLIB_ALLOW_LF_AS_LINE_TERMINATOR
+  thread_local const std::regex re("(HTTP/1\\.[01]) (\\d{3})(?: (.*?))?\r?\n");
+#else
+  thread_local const std::regex re("(HTTP/1\\.[01]) (\\d{3})(?: (.*?))?\r\n");
+#endif
+
+  std::cmatch m;
+  if (!std::regex_match(line_reader.ptr(), m, re)) {
+    return req.method == "CONNECT";
+  }
+  res.version = std::string(m[1]);
+  res.status = std::stoi(std::string(m[2]));
+  res.reason = std::string(m[3]);
+
+  // Ignore '100 Continue'
+  while (res.status == StatusCode::Continue_100) {
+    if (!line_reader.getline()) { return false; } // CRLF
+    if (!line_reader.getline()) { return false; } // next response line
+
+    if (!std::regex_match(line_reader.ptr(), m, re)) { return false; }
+    res.version = std::string(m[1]);
+    res.status = std::stoi(std::string(m[2]));
+    res.reason = std::string(m[3]);
+  }
+
+  return true;
 }
 
-inline bool is_dir(const std::string& path)
-{
-    struct stat st;
-    return stat(path.c_str(), &st) >= 0 && S_ISDIR(st.st_mode);
+inline bool ClientImpl::send(Request &req, Response &res, Error &error) {
+  std::lock_guard<std::recursive_mutex> request_mutex_guard(request_mutex_);
+  auto ret = send_(req, res, error);
+  if (error == Error::SSLPeerCouldBeClosed_) {
+    assert(!ret);
+    ret = send_(req, res, error);
+  }
+  return ret;
 }
 
-inline bool is_valid_path(const std::string& path) {
-    size_t level = 0;
-    size_t i = 0;
+inline bool ClientImpl::send_(Request &req, Response &res, Error &error) {
+  {
+    std::lock_guard<std::mutex> guard(socket_mutex_);
 
-    // Skip slash
-    while (i < path.size() && path[i] == '/') {
-        i++;
-    }
+    // Set this to false immediately - if it ever gets set to true by the end
+    // of the request, we know another thread instructed us to close the
+    // socket.
+    socket_should_be_closed_when_request_is_done_ = false;
+
+    auto is_alive = false;
+    if (socket_.is_open()) {
+      is_alive = detail::is_socket_alive(socket_.sock);
 
-    while (i < path.size()) {
-        // Read component
-        auto beg = i;
-        while (i < path.size() && path[i] != '/') {
-            i++;
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+      if (is_alive && is_ssl()) {
+        if (detail::is_ssl_peer_could_be_closed(socket_.ssl, socket_.sock)) {
+          is_alive = false;
         }
+      }
+#endif
 
-        auto len = i - beg;
-        assert(len > 0);
+      if (!is_alive) {
+        // Attempt to avoid sigpipe by shutting down non-gracefully if it
+        // seems like the other side has already closed the connection Also,
+        // there cannot be any requests in flight from other threads since we
+        // locked request_mutex_, so safe to close everything immediately
+        const bool shutdown_gracefully = false;
+        shutdown_ssl(socket_, shutdown_gracefully);
+        shutdown_socket(socket_);
+        close_socket(socket_);
+      }
+    }
 
-        if (!path.compare(beg, len, ".")) {
-            ;
-        } else if (!path.compare(beg, len, "..")) {
-            if (level == 0) {
-                return false;
-            }
-            level--;
-        } else {
-            level++;
+    if (!is_alive) {
+      if (!create_and_connect_socket(socket_, error)) {
+        output_error_log(error, &req);
+        return false;
+      }
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+      // TODO: refactoring
+      if (is_ssl()) {
+        auto &scli = static_cast<SSLClient &>(*this);
+        if (!proxy_host_.empty() && proxy_port_ != -1) {
+          auto success = false;
+          if (!scli.connect_with_proxy(socket_, req.start_time_, res, success,
+                                       error)) {
+            if (!success) { output_error_log(error, &req); }
+            return success;
+          }
         }
 
-        // Skip slash
-        while (i < path.size() && path[i] == '/') {
-            i++;
+        if (!scli.initialize_ssl(socket_, error)) {
+          output_error_log(error, &req);
+          return false;
         }
+      }
+#endif
     }
 
-    return true;
+    // Mark the current socket as being in use so that it cannot be closed by
+    // anyone else while this request is ongoing, even though we will be
+    // releasing the mutex.
+    if (socket_requests_in_flight_ > 1) {
+      assert(socket_requests_are_from_thread_ == std::this_thread::get_id());
+    }
+    socket_requests_in_flight_ += 1;
+    socket_requests_are_from_thread_ = std::this_thread::get_id();
+  }
+
+  for (const auto &header : default_headers_) {
+    if (req.headers.find(header.first) == req.headers.end()) {
+      req.headers.insert(header);
+    }
+  }
+
+  auto ret = false;
+  auto close_connection = !keep_alive_;
+
+  auto se = detail::scope_exit([&]() {
+    // Briefly lock mutex in order to mark that a request is no longer ongoing
+    std::lock_guard<std::mutex> guard(socket_mutex_);
+    socket_requests_in_flight_ -= 1;
+    if (socket_requests_in_flight_ <= 0) {
+      assert(socket_requests_in_flight_ == 0);
+      socket_requests_are_from_thread_ = std::thread::id();
+    }
+
+    if (socket_should_be_closed_when_request_is_done_ || close_connection ||
+        !ret) {
+      shutdown_ssl(socket_, true);
+      shutdown_socket(socket_);
+      close_socket(socket_);
+    }
+  });
+
+  ret = process_socket(socket_, req.start_time_, [&](Stream &strm) {
+    return handle_request(strm, req, res, close_connection, error);
+  });
+
+  if (!ret) {
+    if (error == Error::Success) {
+      error = Error::Unknown;
+      output_error_log(error, &req);
+    }
+  }
+
+  return ret;
+}
+
+inline Result ClientImpl::send(const Request &req) {
+  auto req2 = req;
+  return send_(std::move(req2));
+}
+
+inline Result ClientImpl::send_(Request &&req) {
+  auto res = detail::make_unique<Response>();
+  auto error = Error::Success;
+  auto ret = send(req, *res, error);
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  return Result{ret ? std::move(res) : nullptr, error, std::move(req.headers),
+                last_ssl_error_, last_openssl_error_};
+#else
+  return Result{ret ? std::move(res) : nullptr, error, std::move(req.headers)};
+#endif
 }
 
-inline void read_file(const std::string& path, std::string& out)
-{
-    std::ifstream fs(path, std::ios_base::binary);
-    fs.seekg(0, std::ios_base::end);
-    auto size = fs.tellg();
-    fs.seekg(0);
-    out.resize(static_cast<size_t>(size));
-    fs.read(&out[0], size);
-}
-
-inline std::string file_extension(const std::string& path)
-{
-    std::smatch m;
-    auto pat = std::regex("\\.([a-zA-Z0-9]+)$");
-    if (std::regex_search(path, m, pat)) {
-        return m[1].str();
-    }
-    return std::string();
-}
-
-inline const char* find_content_type(const std::string& path)
-{
-    auto ext = file_extension(path);
-    if (ext == "txt") {
-        return "text/plain";
-    } else if (ext == "html") {
-        return "text/html";
-    } else if (ext == "css") {
-        return "text/css";
-    } else if (ext == "jpeg" || ext == "jpg") {
-        return "image/jpg";
-    } else if (ext == "png") {
-        return "image/png";
-    } else if (ext == "gif") {
-        return "image/gif";
-    } else if (ext == "svg") {
-        return "image/svg+xml";
-    } else if (ext == "ico") {
-        return "image/x-icon";
-    } else if (ext == "json") {
-        return "application/json";
-    } else if (ext == "pdf") {
-        return "application/pdf";
-    } else if (ext == "js") {
-        return "application/javascript";
-    } else if (ext == "xml") {
-        return "application/xml";
-    } else if (ext == "xhtml") {
-        return "application/xhtml+xml";
+inline bool ClientImpl::handle_request(Stream &strm, Request &req,
+                                       Response &res, bool close_connection,
+                                       Error &error) {
+  if (req.path.empty()) {
+    error = Error::Connection;
+    output_error_log(error, &req);
+    return false;
+  }
+
+  auto req_save = req;
+
+  bool ret;
+
+  if (!is_ssl() && !proxy_host_.empty() && proxy_port_ != -1) {
+    auto req2 = req;
+    req2.path = "http://" + host_and_port_ + req.path;
+    ret = process_request(strm, req2, res, close_connection, error);
+    req = req2;
+    req.path = req_save.path;
+  } else {
+    ret = process_request(strm, req, res, close_connection, error);
+  }
+
+  if (!ret) { return false; }
+
+  if (res.get_header_value("Connection") == "close" ||
+      (res.version == "HTTP/1.0" && res.reason != "Connection established")) {
+    // TODO this requires a not-entirely-obvious chain of calls to be correct
+    // for this to be safe.
+
+    // This is safe to call because handle_request is only called by send_
+    // which locks the request mutex during the process. It would be a bug
+    // to call it from a different thread since it's a thread-safety issue
+    // to do these things to the socket if another thread is using the socket.
+    std::lock_guard<std::mutex> guard(socket_mutex_);
+    shutdown_ssl(socket_, true);
+    shutdown_socket(socket_);
+    close_socket(socket_);
+  }
+
+  if (300 < res.status && res.status < 400 && follow_location_) {
+    req = req_save;
+    ret = redirect(req, res, error);
+  }
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  if ((res.status == StatusCode::Unauthorized_401 ||
+       res.status == StatusCode::ProxyAuthenticationRequired_407) &&
+      req.authorization_count_ < 5) {
+    auto is_proxy = res.status == StatusCode::ProxyAuthenticationRequired_407;
+    const auto &username =
+        is_proxy ? proxy_digest_auth_username_ : digest_auth_username_;
+    const auto &password =
+        is_proxy ? proxy_digest_auth_password_ : digest_auth_password_;
+
+    if (!username.empty() && !password.empty()) {
+      std::map<std::string, std::string> auth;
+      if (detail::parse_www_authenticate(res, auth, is_proxy)) {
+        Request new_req = req;
+        new_req.authorization_count_ += 1;
+        new_req.headers.erase(is_proxy ? "Proxy-Authorization"
+                                       : "Authorization");
+        new_req.headers.insert(detail::make_digest_authentication_header(
+            req, auth, new_req.authorization_count_, detail::random_string(10),
+            username, password, is_proxy));
+
+        Response new_res;
+
+        ret = send(new_req, new_res, error);
+        if (ret) { res = new_res; }
+      }
     }
-    return nullptr;
+  }
+#endif
+
+  return ret;
 }
 
-inline const char* status_message(int status)
-{
-    switch (status) {
-    case 200: return "OK";
-    case 400: return "Bad Request";
-    case 404: return "Not Found";
-    case 415: return "Unsupported Media Type";
-    default:
-        case 500: return "Internal Server Error";
+inline bool ClientImpl::redirect(Request &req, Response &res, Error &error) {
+  if (req.redirect_count_ == 0) {
+    error = Error::ExceedRedirectCount;
+    output_error_log(error, &req);
+    return false;
+  }
+
+  auto location = res.get_header_value("location");
+  if (location.empty()) { return false; }
+
+  thread_local const std::regex re(
+      R"((?:(https?):)?(?://(?:\[([a-fA-F\d:]+)\]|([^:/?#]+))(?::(\d+))?)?([^?#]*)(\?[^#]*)?(?:#.*)?)");
+
+  std::smatch m;
+  if (!std::regex_match(location, m, re)) { return false; }
+
+  auto scheme = is_ssl() ? "https" : "http";
+
+  auto next_scheme = m[1].str();
+  auto next_host = m[2].str();
+  if (next_host.empty()) { next_host = m[3].str(); }
+  auto port_str = m[4].str();
+  auto next_path = m[5].str();
+  auto next_query = m[6].str();
+
+  auto next_port = port_;
+  if (!port_str.empty()) {
+    next_port = std::stoi(port_str);
+  } else if (!next_scheme.empty()) {
+    next_port = next_scheme == "https" ? 443 : 80;
+  }
+
+  if (next_scheme.empty()) { next_scheme = scheme; }
+  if (next_host.empty()) { next_host = host_; }
+  if (next_path.empty()) { next_path = "/"; }
+
+  auto path = decode_query_component(next_path, true) + next_query;
+
+  // Same host redirect - use current client
+  if (next_scheme == scheme && next_host == host_ && next_port == port_) {
+    return detail::redirect(*this, req, res, path, location, error);
+  }
+
+  // Cross-host/scheme redirect - create new client with robust setup
+  return create_redirect_client(next_scheme, next_host, next_port, req, res,
+                                path, location, error);
+}
+
+// New method for robust redirect client creation
+inline bool ClientImpl::create_redirect_client(
+    const std::string &scheme, const std::string &host, int port, Request &req,
+    Response &res, const std::string &path, const std::string &location,
+    Error &error) {
+  // Determine if we need SSL
+  auto need_ssl = (scheme == "https");
+
+  // Clean up request headers that are host/client specific
+  // Remove headers that should not be carried over to new host
+  auto headers_to_remove =
+      std::vector<std::string>{"Host", "Proxy-Authorization", "Authorization"};
+
+  for (const auto &header_name : headers_to_remove) {
+    auto it = req.headers.find(header_name);
+    while (it != req.headers.end()) {
+      it = req.headers.erase(it);
+      it = req.headers.find(header_name);
+    }
+  }
+
+  // Create appropriate client type and handle redirect
+  if (need_ssl) {
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+    // Create SSL client for HTTPS redirect
+    SSLClient redirect_client(host, port);
+
+    // Setup basic client configuration first
+    setup_redirect_client(redirect_client);
+
+    // SSL-specific configuration for proxy environments
+    if (!proxy_host_.empty() && proxy_port_ != -1) {
+      // Critical: Disable SSL verification for proxy environments
+      redirect_client.enable_server_certificate_verification(false);
+      redirect_client.enable_server_hostname_verification(false);
+    } else {
+      // For direct SSL connections, copy SSL verification settings
+      redirect_client.enable_server_certificate_verification(
+          server_certificate_verification_);
+      redirect_client.enable_server_hostname_verification(
+          server_hostname_verification_);
+    }
+
+    // Handle CA certificate store and paths if available
+    if (ca_cert_store_ && X509_STORE_up_ref(ca_cert_store_)) {
+      redirect_client.set_ca_cert_store(ca_cert_store_);
+    }
+    if (!ca_cert_file_path_.empty()) {
+      redirect_client.set_ca_cert_path(ca_cert_file_path_, ca_cert_dir_path_);
     }
+
+    // Client certificates are set through constructor for SSLClient
+    // NOTE: SSLClient constructor already takes client_cert_path and
+    // client_key_path so we need to create it properly if client certs are
+    // needed
+
+    // Execute the redirect
+    return detail::redirect(redirect_client, req, res, path, location, error);
+#else
+    // SSL not supported - set appropriate error
+    error = Error::SSLConnection;
+    output_error_log(error, &req);
+    return false;
+#endif
+  } else {
+    // HTTP redirect
+    ClientImpl redirect_client(host, port);
+
+    // Setup client with robust configuration
+    setup_redirect_client(redirect_client);
+
+    // Execute the redirect
+    return detail::redirect(redirect_client, req, res, path, location, error);
+  }
 }
 
-inline const char* get_header_value(const Headers& headers, const char* key, const char* def)
-{
-    auto it = headers.find(key);
-    if (it != headers.end()) {
-        return it->second.c_str();
+// New method for robust client setup (based on basic_manual_redirect.cpp
+// logic)
+template <typename ClientType>
+inline void ClientImpl::setup_redirect_client(ClientType &client) {
+  // Copy basic settings first
+  client.set_connection_timeout(connection_timeout_sec_);
+  client.set_read_timeout(read_timeout_sec_, read_timeout_usec_);
+  client.set_write_timeout(write_timeout_sec_, write_timeout_usec_);
+  client.set_keep_alive(keep_alive_);
+  client.set_follow_location(
+      true); // Enable redirects to handle multi-step redirects
+  client.set_path_encode(path_encode_);
+  client.set_compress(compress_);
+  client.set_decompress(decompress_);
+
+  // Copy authentication settings BEFORE proxy setup
+  if (!basic_auth_username_.empty()) {
+    client.set_basic_auth(basic_auth_username_, basic_auth_password_);
+  }
+  if (!bearer_token_auth_token_.empty()) {
+    client.set_bearer_token_auth(bearer_token_auth_token_);
+  }
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  if (!digest_auth_username_.empty()) {
+    client.set_digest_auth(digest_auth_username_, digest_auth_password_);
+  }
+#endif
+
+  // Setup proxy configuration (CRITICAL ORDER - proxy must be set
+  // before proxy auth)
+  if (!proxy_host_.empty() && proxy_port_ != -1) {
+    // First set proxy host and port
+    client.set_proxy(proxy_host_, proxy_port_);
+
+    // Then set proxy authentication (order matters!)
+    if (!proxy_basic_auth_username_.empty()) {
+      client.set_proxy_basic_auth(proxy_basic_auth_username_,
+                                  proxy_basic_auth_password_);
+    }
+    if (!proxy_bearer_token_auth_token_.empty()) {
+      client.set_proxy_bearer_token_auth(proxy_bearer_token_auth_token_);
     }
-    return def;
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+    if (!proxy_digest_auth_username_.empty()) {
+      client.set_proxy_digest_auth(proxy_digest_auth_username_,
+                                   proxy_digest_auth_password_);
+    }
+#endif
+  }
+
+  // Copy network and socket settings
+  client.set_address_family(address_family_);
+  client.set_tcp_nodelay(tcp_nodelay_);
+  client.set_ipv6_v6only(ipv6_v6only_);
+  if (socket_options_) { client.set_socket_options(socket_options_); }
+  if (!interface_.empty()) { client.set_interface(interface_); }
+
+  // Copy logging and headers
+  if (logger_) { client.set_logger(logger_); }
+  if (error_logger_) { client.set_error_logger(error_logger_); }
+
+  // NOTE: DO NOT copy default_headers_ as they may contain stale Host headers
+  // Each new client should generate its own headers based on its target host
 }
 
-inline int get_header_value_int(const Headers& headers, const char* key, int def)
-{
-    auto it = headers.find(key);
-    if (it != headers.end()) {
-        return std::stoi(it->second);
+inline bool ClientImpl::write_content_with_provider(Stream &strm,
+                                                    const Request &req,
+                                                    Error &error) const {
+  auto is_shutting_down = []() { return false; };
+
+  if (req.is_chunked_content_provider_) {
+    // TODO: Brotli support
+    std::unique_ptr<detail::compressor> compressor;
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+    if (compress_) {
+      compressor = detail::make_unique<detail::gzip_compressor>();
+    } else
+#endif
+    {
+      compressor = detail::make_unique<detail::nocompressor>();
     }
-    return def;
+
+    return detail::write_content_chunked(strm, req.content_provider_,
+                                         is_shutting_down, *compressor, error);
+  } else {
+    return detail::write_content_with_progress(
+        strm, req.content_provider_, 0, req.content_length_, is_shutting_down,
+        req.upload_progress, error);
+  }
 }
 
-inline bool read_headers(Stream& strm, Headers& headers)
-{
-    static std::regex re(R"((.+?):\s*(.+?)\s*\r\n)");
+inline bool ClientImpl::write_request(Stream &strm, Request &req,
+                                      bool close_connection, Error &error) {
+  // Prepare additional headers
+  if (close_connection) {
+    if (!req.has_header("Connection")) {
+      req.set_header("Connection", "close");
+    }
+  }
 
-    const auto bufsiz = 2048;
-    char buf[bufsiz];
+  if (!req.has_header("Host")) {
+    // For Unix socket connections, use "localhost" as Host header (similar to
+    // curl behavior)
+    if (address_family_ == AF_UNIX) {
+      req.set_header("Host", "localhost");
+    } else {
+      req.set_header("Host", host_and_port_);
+    }
+  }
 
-    stream_line_reader reader(strm, buf, bufsiz);
+  if (!req.has_header("Accept")) { req.set_header("Accept", "*/*"); }
 
-    for (;;) {
-        if (!reader.getline()) {
-            return false;
-        }
-        if (!strcmp(reader.ptr(), "\r\n")) {
-            break;
-        }
-        std::cmatch m;
-        if (std::regex_match(reader.ptr(), m, re)) {
-            auto key = std::string(m[1]);
-            auto val = std::string(m[2]);
-            headers.emplace(key, val);
+  if (!req.content_receiver) {
+    if (!req.has_header("Accept-Encoding")) {
+      std::string accept_encoding;
+#ifdef CPPHTTPLIB_BROTLI_SUPPORT
+      accept_encoding = "br";
+#endif
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+      if (!accept_encoding.empty()) { accept_encoding += ", "; }
+      accept_encoding += "gzip, deflate";
+#endif
+#ifdef CPPHTTPLIB_ZSTD_SUPPORT
+      if (!accept_encoding.empty()) { accept_encoding += ", "; }
+      accept_encoding += "zstd";
+#endif
+      req.set_header("Accept-Encoding", accept_encoding);
+    }
+
+#ifndef CPPHTTPLIB_NO_DEFAULT_USER_AGENT
+    if (!req.has_header("User-Agent")) {
+      auto agent = std::string("cpp-httplib/") + CPPHTTPLIB_VERSION;
+      req.set_header("User-Agent", agent);
+    }
+#endif
+  };
+
+  if (req.body.empty()) {
+    if (req.content_provider_) {
+      if (!req.is_chunked_content_provider_) {
+        if (!req.has_header("Content-Length")) {
+          auto length = std::to_string(req.content_length_);
+          req.set_header("Content-Length", length);
         }
+      }
+    } else {
+      if (req.method == "POST" || req.method == "PUT" ||
+          req.method == "PATCH") {
+        req.set_header("Content-Length", "0");
+      }
+    }
+  } else {
+    if (!req.has_header("Content-Type")) {
+      req.set_header("Content-Type", "text/plain");
     }
 
-    return true;
-}
+    if (!req.has_header("Content-Length")) {
+      auto length = std::to_string(req.body.size());
+      req.set_header("Content-Length", length);
+    }
+  }
 
-inline bool read_content_with_length(Stream& strm, std::string& out, size_t len, Progress progress)
-{
-    out.assign(len, 0);
-    size_t r = 0;
-    while (r < len){
-        auto n = strm.read(&out[r], len - r);
-        if (n <= 0) {
-            return false;
-        }
+  if (!basic_auth_password_.empty() || !basic_auth_username_.empty()) {
+    if (!req.has_header("Authorization")) {
+      req.headers.insert(make_basic_authentication_header(
+          basic_auth_username_, basic_auth_password_, false));
+    }
+  }
+
+  if (!proxy_basic_auth_username_.empty() &&
+      !proxy_basic_auth_password_.empty()) {
+    if (!req.has_header("Proxy-Authorization")) {
+      req.headers.insert(make_basic_authentication_header(
+          proxy_basic_auth_username_, proxy_basic_auth_password_, true));
+    }
+  }
 
-        r += n;
+  if (!bearer_token_auth_token_.empty()) {
+    if (!req.has_header("Authorization")) {
+      req.headers.insert(make_bearer_token_authentication_header(
+          bearer_token_auth_token_, false));
+    }
+  }
 
-        if (progress) {
-            progress(r, len);
-        }
+  if (!proxy_bearer_token_auth_token_.empty()) {
+    if (!req.has_header("Proxy-Authorization")) {
+      req.headers.insert(make_bearer_token_authentication_header(
+          proxy_bearer_token_auth_token_, true));
+    }
+  }
+
+  // Request line and headers
+  {
+    detail::BufferStream bstrm;
+
+    // Extract path and query from req.path
+    std::string path_part, query_part;
+    auto query_pos = req.path.find('?');
+    if (query_pos != std::string::npos) {
+      path_part = req.path.substr(0, query_pos);
+      query_part = req.path.substr(query_pos + 1);
+    } else {
+      path_part = req.path;
+      query_part = "";
     }
 
-    return true;
+    // Encode path and query
+    auto path_with_query =
+        path_encode_ ? detail::encode_path(path_part) : path_part;
+
+    detail::parse_query_text(query_part, req.params);
+    if (!req.params.empty()) {
+      path_with_query = append_query_params(path_with_query, req.params);
+    }
+
+    // Write request line and headers
+    detail::write_request_line(bstrm, req.method, path_with_query);
+    header_writer_(bstrm, req.headers);
+
+    // Flush buffer
+    auto &data = bstrm.get_buffer();
+    if (!detail::write_data(strm, data.data(), data.size())) {
+      error = Error::Write;
+      output_error_log(error, &req);
+      return false;
+    }
+  }
+
+  // Body
+  if (req.body.empty()) {
+    return write_content_with_provider(strm, req, error);
+  }
+
+  if (req.upload_progress) {
+    auto body_size = req.body.size();
+    size_t written = 0;
+    auto data = req.body.data();
+
+    while (written < body_size) {
+      size_t to_write = (std::min)(CPPHTTPLIB_SEND_BUFSIZ, body_size - written);
+      if (!detail::write_data(strm, data + written, to_write)) {
+        error = Error::Write;
+        output_error_log(error, &req);
+        return false;
+      }
+      written += to_write;
+
+      if (!req.upload_progress(written, body_size)) {
+        error = Error::Canceled;
+        output_error_log(error, &req);
+        return false;
+      }
+    }
+  } else {
+    if (!detail::write_data(strm, req.body.data(), req.body.size())) {
+      error = Error::Write;
+      output_error_log(error, &req);
+      return false;
+    }
+  }
+
+  return true;
 }
 
-inline bool read_content_without_length(Stream& strm, std::string& out)
-{
-    for (;;) {
-        char byte;
-        auto n = strm.read(&byte, 1);
-        if (n < 0) {
-            return false;
-        } else if (n == 0) {
-            return true;
+inline std::unique_ptr<Response> ClientImpl::send_with_content_provider(
+    Request &req, const char *body, size_t content_length,
+    ContentProvider content_provider,
+    ContentProviderWithoutLength content_provider_without_length,
+    const std::string &content_type, Error &error) {
+  if (!content_type.empty()) { req.set_header("Content-Type", content_type); }
+
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+  if (compress_) { req.set_header("Content-Encoding", "gzip"); }
+#endif
+
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+  if (compress_ && !content_provider_without_length) {
+    // TODO: Brotli support
+    detail::gzip_compressor compressor;
+
+    if (content_provider) {
+      auto ok = true;
+      size_t offset = 0;
+      DataSink data_sink;
+
+      data_sink.write = [&](const char *data, size_t data_len) -> bool {
+        if (ok) {
+          auto last = offset + data_len == content_length;
+
+          auto ret = compressor.compress(
+              data, data_len, last,
+              [&](const char *compressed_data, size_t compressed_data_len) {
+                req.body.append(compressed_data, compressed_data_len);
+                return true;
+              });
+
+          if (ret) {
+            offset += data_len;
+          } else {
+            ok = false;
+          }
         }
-        out += byte;
+        return ok;
+      };
+
+      while (ok && offset < content_length) {
+        if (!content_provider(offset, content_length - offset, data_sink)) {
+          error = Error::Canceled;
+          output_error_log(error, &req);
+          return nullptr;
+        }
+      }
+    } else {
+      if (!compressor.compress(body, content_length, true,
+                               [&](const char *data, size_t data_len) {
+                                 req.body.append(data, data_len);
+                                 return true;
+                               })) {
+        error = Error::Compression;
+        output_error_log(error, &req);
+        return nullptr;
+      }
+    }
+  } else
+#endif
+  {
+    if (content_provider) {
+      req.content_length_ = content_length;
+      req.content_provider_ = std::move(content_provider);
+      req.is_chunked_content_provider_ = false;
+    } else if (content_provider_without_length) {
+      req.content_length_ = 0;
+      req.content_provider_ = detail::ContentProviderAdapter(
+          std::move(content_provider_without_length));
+      req.is_chunked_content_provider_ = true;
+      req.set_header("Transfer-Encoding", "chunked");
+    } else {
+      req.body.assign(body, content_length);
     }
+  }
 
-    return true;
+  auto res = detail::make_unique<Response>();
+  return send(req, *res, error) ? std::move(res) : nullptr;
+}
+
+inline Result ClientImpl::send_with_content_provider(
+    const std::string &method, const std::string &path, const Headers &headers,
+    const char *body, size_t content_length, ContentProvider content_provider,
+    ContentProviderWithoutLength content_provider_without_length,
+    const std::string &content_type, UploadProgress progress) {
+  Request req;
+  req.method = method;
+  req.headers = headers;
+  req.path = path;
+  req.upload_progress = std::move(progress);
+  if (max_timeout_msec_ > 0) {
+    req.start_time_ = std::chrono::steady_clock::now();
+  }
+
+  auto error = Error::Success;
+
+  auto res = send_with_content_provider(
+      req, body, content_length, std::move(content_provider),
+      std::move(content_provider_without_length), content_type, error);
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  return Result{std::move(res), error, std::move(req.headers), last_ssl_error_,
+                last_openssl_error_};
+#else
+  return Result{std::move(res), error, std::move(req.headers)};
+#endif
 }
 
-inline bool read_content_chunked(Stream& strm, std::string& out)
-{
-    const auto bufsiz = 16;
-    char buf[bufsiz];
+inline void ClientImpl::output_log(const Request &req,
+                                   const Response &res) const {
+  if (logger_) {
+    std::lock_guard<std::mutex> guard(logger_mutex_);
+    logger_(req, res);
+  }
+}
+
+inline void ClientImpl::output_error_log(const Error &err,
+                                         const Request *req) const {
+  if (error_logger_) {
+    std::lock_guard<std::mutex> guard(logger_mutex_);
+    error_logger_(err, req);
+  }
+}
 
-    stream_line_reader reader(strm, buf, bufsiz);
+inline bool ClientImpl::process_request(Stream &strm, Request &req,
+                                        Response &res, bool close_connection,
+                                        Error &error) {
+  // Send request
+  if (!write_request(strm, req, close_connection, error)) { return false; }
 
-    if (!reader.getline()) {
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  if (is_ssl()) {
+    auto is_proxy_enabled = !proxy_host_.empty() && proxy_port_ != -1;
+    if (!is_proxy_enabled) {
+      if (detail::is_ssl_peer_could_be_closed(socket_.ssl, socket_.sock)) {
+        error = Error::SSLPeerCouldBeClosed_;
+        output_error_log(error, &req);
         return false;
+      }
     }
+  }
+#endif
 
-    auto chunk_len = std::stoi(reader.ptr(), 0, 16);
+  // Receive response and headers
+  if (!read_response_line(strm, req, res) ||
+      !detail::read_headers(strm, res.headers)) {
+    error = Error::Read;
+    output_error_log(error, &req);
+    return false;
+  }
+
+  // Body
+  if ((res.status != StatusCode::NoContent_204) && req.method != "HEAD" &&
+      req.method != "CONNECT") {
+    auto redirect = 300 < res.status && res.status < 400 &&
+                    res.status != StatusCode::NotModified_304 &&
+                    follow_location_;
+
+    if (req.response_handler && !redirect) {
+      if (!req.response_handler(res)) {
+        error = Error::Canceled;
+        output_error_log(error, &req);
+        return false;
+      }
+    }
 
-    while (chunk_len > 0){
-        std::string chunk;
-        if (!read_content_with_length(strm, chunk, chunk_len, nullptr)) {
-            return false;
+    auto out =
+        req.content_receiver
+            ? static_cast<ContentReceiverWithProgress>(
+                  [&](const char *buf, size_t n, size_t off, size_t len) {
+                    if (redirect) { return true; }
+                    auto ret = req.content_receiver(buf, n, off, len);
+                    if (!ret) {
+                      error = Error::Canceled;
+                      output_error_log(error, &req);
+                    }
+                    return ret;
+                  })
+            : static_cast<ContentReceiverWithProgress>(
+                  [&](const char *buf, size_t n, size_t /*off*/,
+                      size_t /*len*/) {
+                    assert(res.body.size() + n <= res.body.max_size());
+                    res.body.append(buf, n);
+                    return true;
+                  });
+
+    auto progress = [&](size_t current, size_t total) {
+      if (!req.download_progress || redirect) { return true; }
+      auto ret = req.download_progress(current, total);
+      if (!ret) {
+        error = Error::Canceled;
+        output_error_log(error, &req);
+      }
+      return ret;
+    };
+
+    if (res.has_header("Content-Length")) {
+      if (!req.content_receiver) {
+        auto len = res.get_header_value_u64("Content-Length");
+        if (len > res.body.max_size()) {
+          error = Error::Read;
+          output_error_log(error, &req);
+          return false;
         }
+        res.body.reserve(static_cast<size_t>(len));
+      }
+    }
 
-        if (!reader.getline()) {
-            return false;
-        }
+    if (res.status != StatusCode::NotModified_304) {
+      int dummy_status;
+      if (!detail::read_content(strm, res, (std::numeric_limits<size_t>::max)(),
+                                dummy_status, std::move(progress),
+                                std::move(out), decompress_)) {
+        if (error != Error::Canceled) { error = Error::Read; }
+        output_error_log(error, &req);
+        return false;
+      }
+    }
+  }
 
-        if (strcmp(reader.ptr(), "\r\n")) {
-            break;
-        }
+  // Log
+  output_log(req, res);
+
+  return true;
+}
+
+inline ContentProviderWithoutLength ClientImpl::get_multipart_content_provider(
+    const std::string &boundary, const UploadFormDataItems &items,
+    const FormDataProviderItems &provider_items) const {
+  size_t cur_item = 0;
+  size_t cur_start = 0;
+  // cur_item and cur_start are copied to within the std::function and
+  // maintain state between successive calls
+  return [&, cur_item, cur_start](size_t offset,
+                                  DataSink &sink) mutable -> bool {
+    if (!offset && !items.empty()) {
+      sink.os << detail::serialize_multipart_formdata(items, boundary, false);
+      return true;
+    } else if (cur_item < provider_items.size()) {
+      if (!cur_start) {
+        const auto &begin = detail::serialize_multipart_formdata_item_begin(
+            provider_items[cur_item], boundary);
+        offset += begin.size();
+        cur_start = offset;
+        sink.os << begin;
+      }
+
+      DataSink cur_sink;
+      auto has_data = true;
+      cur_sink.write = sink.write;
+      cur_sink.done = [&]() { has_data = false; };
+
+      if (!provider_items[cur_item].provider(offset - cur_start, cur_sink)) {
+        return false;
+      }
+
+      if (!has_data) {
+        sink.os << detail::serialize_multipart_formdata_item_end();
+        cur_item++;
+        cur_start = 0;
+      }
+      return true;
+    } else {
+      sink.os << detail::serialize_multipart_formdata_finish(boundary);
+      sink.done();
+      return true;
+    }
+  };
+}
+
+inline bool ClientImpl::process_socket(
+    const Socket &socket,
+    std::chrono::time_point<std::chrono::steady_clock> start_time,
+    std::function<bool(Stream &strm)> callback) {
+  return detail::process_client_socket(
+      socket.sock, read_timeout_sec_, read_timeout_usec_, write_timeout_sec_,
+      write_timeout_usec_, max_timeout_msec_, start_time, std::move(callback));
+}
+
+inline bool ClientImpl::is_ssl() const { return false; }
+
+inline Result ClientImpl::Get(const std::string &path,
+                              DownloadProgress progress) {
+  return Get(path, Headers(), std::move(progress));
+}
+
+inline Result ClientImpl::Get(const std::string &path, const Params &params,
+                              const Headers &headers,
+                              DownloadProgress progress) {
+  if (params.empty()) { return Get(path, headers); }
+
+  std::string path_with_query = append_query_params(path, params);
+  return Get(path_with_query, headers, std::move(progress));
+}
+
+inline Result ClientImpl::Get(const std::string &path, const Headers &headers,
+                              DownloadProgress progress) {
+  Request req;
+  req.method = "GET";
+  req.path = path;
+  req.headers = headers;
+  req.download_progress = std::move(progress);
+  if (max_timeout_msec_ > 0) {
+    req.start_time_ = std::chrono::steady_clock::now();
+  }
+
+  return send_(std::move(req));
+}
+
+inline Result ClientImpl::Get(const std::string &path,
+                              ContentReceiver content_receiver,
+                              DownloadProgress progress) {
+  return Get(path, Headers(), nullptr, std::move(content_receiver),
+             std::move(progress));
+}
+
+inline Result ClientImpl::Get(const std::string &path, const Headers &headers,
+                              ContentReceiver content_receiver,
+                              DownloadProgress progress) {
+  return Get(path, headers, nullptr, std::move(content_receiver),
+             std::move(progress));
+}
+
+inline Result ClientImpl::Get(const std::string &path,
+                              ResponseHandler response_handler,
+                              ContentReceiver content_receiver,
+                              DownloadProgress progress) {
+  return Get(path, Headers(), std::move(response_handler),
+             std::move(content_receiver), std::move(progress));
+}
+
+inline Result ClientImpl::Get(const std::string &path, const Headers &headers,
+                              ResponseHandler response_handler,
+                              ContentReceiver content_receiver,
+                              DownloadProgress progress) {
+  Request req;
+  req.method = "GET";
+  req.path = path;
+  req.headers = headers;
+  req.response_handler = std::move(response_handler);
+  req.content_receiver =
+      [content_receiver](const char *data, size_t data_length,
+                         size_t /*offset*/, size_t /*total_length*/) {
+        return content_receiver(data, data_length);
+      };
+  req.download_progress = std::move(progress);
+  if (max_timeout_msec_ > 0) {
+    req.start_time_ = std::chrono::steady_clock::now();
+  }
+
+  return send_(std::move(req));
+}
+
+inline Result ClientImpl::Get(const std::string &path, const Params &params,
+                              const Headers &headers,
+                              ContentReceiver content_receiver,
+                              DownloadProgress progress) {
+  return Get(path, params, headers, nullptr, std::move(content_receiver),
+             std::move(progress));
+}
+
+inline Result ClientImpl::Get(const std::string &path, const Params &params,
+                              const Headers &headers,
+                              ResponseHandler response_handler,
+                              ContentReceiver content_receiver,
+                              DownloadProgress progress) {
+  if (params.empty()) {
+    return Get(path, headers, std::move(response_handler),
+               std::move(content_receiver), std::move(progress));
+  }
+
+  std::string path_with_query = append_query_params(path, params);
+  return Get(path_with_query, headers, std::move(response_handler),
+             std::move(content_receiver), std::move(progress));
+}
+
+inline Result ClientImpl::Head(const std::string &path) {
+  return Head(path, Headers());
+}
+
+inline Result ClientImpl::Head(const std::string &path,
+                               const Headers &headers) {
+  Request req;
+  req.method = "HEAD";
+  req.headers = headers;
+  req.path = path;
+  if (max_timeout_msec_ > 0) {
+    req.start_time_ = std::chrono::steady_clock::now();
+  }
+
+  return send_(std::move(req));
+}
+
+inline Result ClientImpl::Post(const std::string &path) {
+  return Post(path, std::string(), std::string());
+}
+
+inline Result ClientImpl::Post(const std::string &path,
+                               const Headers &headers) {
+  return Post(path, headers, nullptr, 0, std::string());
+}
+
+inline Result ClientImpl::Post(const std::string &path, const char *body,
+                               size_t content_length,
+                               const std::string &content_type,
+                               UploadProgress progress) {
+  return Post(path, Headers(), body, content_length, content_type, progress);
+}
+
+inline Result ClientImpl::Post(const std::string &path, const std::string &body,
+                               const std::string &content_type,
+                               UploadProgress progress) {
+  return Post(path, Headers(), body, content_type, progress);
+}
+
+inline Result ClientImpl::Post(const std::string &path, const Params &params) {
+  return Post(path, Headers(), params);
+}
 
-        out += chunk;
+inline Result ClientImpl::Post(const std::string &path, size_t content_length,
+                               ContentProvider content_provider,
+                               const std::string &content_type,
+                               UploadProgress progress) {
+  return Post(path, Headers(), content_length, std::move(content_provider),
+              content_type, progress);
+}
 
-        if (!reader.getline()) {
-            return false;
-        }
+inline Result ClientImpl::Post(const std::string &path,
+                               ContentProviderWithoutLength content_provider,
+                               const std::string &content_type,
+                               UploadProgress progress) {
+  return Post(path, Headers(), std::move(content_provider), content_type,
+              progress);
+}
 
-        chunk_len = std::stoi(reader.ptr(), 0, 16);
-    }
+inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
+                               const Params &params) {
+  auto query = detail::params_to_query_str(params);
+  return Post(path, headers, query, "application/x-www-form-urlencoded");
+}
 
-    if (chunk_len == 0) {
-        // Reader terminator after chunks
-        if (!reader.getline() || strcmp(reader.ptr(), "\r\n"))
-            return false;
-    }
+inline Result ClientImpl::Post(const std::string &path,
+                               const UploadFormDataItems &items,
+                               UploadProgress progress) {
+  return Post(path, Headers(), items, progress);
+}
 
-    return true;
+inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
+                               const UploadFormDataItems &items,
+                               UploadProgress progress) {
+  const auto &boundary = detail::make_multipart_data_boundary();
+  const auto &content_type =
+      detail::serialize_multipart_formdata_get_content_type(boundary);
+  const auto &body = detail::serialize_multipart_formdata(items, boundary);
+  return Post(path, headers, body, content_type, progress);
 }
 
-template <typename T>
-bool read_content(Stream& strm, T& x, Progress progress = Progress())
-{
-    auto len = get_header_value_int(x.headers, "Content-Length", 0);
+inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
+                               const UploadFormDataItems &items,
+                               const std::string &boundary,
+                               UploadProgress progress) {
+  if (!detail::is_multipart_boundary_chars_valid(boundary)) {
+    return Result{nullptr, Error::UnsupportedMultipartBoundaryChars};
+  }
+
+  const auto &content_type =
+      detail::serialize_multipart_formdata_get_content_type(boundary);
+  const auto &body = detail::serialize_multipart_formdata(items, boundary);
+  return Post(path, headers, body, content_type, progress);
+}
 
-    if (len) {
-        return read_content_with_length(strm, x.body, len, progress);
-    } else {
-        const auto& encoding = get_header_value(x.headers, "Transfer-Encoding", "");
+inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
+                               const char *body, size_t content_length,
+                               const std::string &content_type,
+                               UploadProgress progress) {
+  return send_with_content_provider("POST", path, headers, body, content_length,
+                                    nullptr, nullptr, content_type, progress);
+}
 
-        if (!strcasecmp(encoding, "chunked")) {
-            return read_content_chunked(strm, x.body);
-        } else {
-            return read_content_without_length(strm, x.body);
-        }
-    }
+inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
+                               const std::string &body,
+                               const std::string &content_type,
+                               UploadProgress progress) {
+  return send_with_content_provider("POST", path, headers, body.data(),
+                                    body.size(), nullptr, nullptr, content_type,
+                                    progress);
+}
 
-    return true;
+inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
+                               size_t content_length,
+                               ContentProvider content_provider,
+                               const std::string &content_type,
+                               UploadProgress progress) {
+  return send_with_content_provider("POST", path, headers, nullptr,
+                                    content_length, std::move(content_provider),
+                                    nullptr, content_type, progress);
 }
 
-template <typename T>
-inline void write_headers(Stream& strm, const T& info)
-{
-    for (const auto& x: info.headers) {
-        strm.write_format("%s: %s\r\n", x.first.c_str(), x.second.c_str());
-    }
-    strm.write("\r\n");
+inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
+                               ContentProviderWithoutLength content_provider,
+                               const std::string &content_type,
+                               UploadProgress progress) {
+  return send_with_content_provider("POST", path, headers, nullptr, 0, nullptr,
+                                    std::move(content_provider), content_type,
+                                    progress);
 }
 
-inline std::string encode_url(const std::string& s)
-{
-    std::string result;
+inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
+                               const UploadFormDataItems &items,
+                               const FormDataProviderItems &provider_items,
+                               UploadProgress progress) {
+  const auto &boundary = detail::make_multipart_data_boundary();
+  const auto &content_type =
+      detail::serialize_multipart_formdata_get_content_type(boundary);
+  return send_with_content_provider(
+      "POST", path, headers, nullptr, 0, nullptr,
+      get_multipart_content_provider(boundary, items, provider_items),
+      content_type, progress);
+}
 
-    for (auto i = 0; s[i]; i++) {
-        switch (s[i]) {
-        case ' ':  result += "+"; break;
-        case '\'': result += "%27"; break;
-        case ',':  result += "%2C"; break;
-        case ':':  result += "%3A"; break;
-        case ';':  result += "%3B"; break;
-        default:
-            if (s[i] < 0) {
-                result += '%';
-                char hex[4];
-                size_t len = snprintf(hex, sizeof(hex) - 1, "%02X", (unsigned char)s[i]);
-                assert(len == 2);
-                result.append(hex, len);
-            } else {
-                result += s[i];
-            }
-            break;
-        }
-   }
+inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
+                               const std::string &body,
+                               const std::string &content_type,
+                               ContentReceiver content_receiver,
+                               DownloadProgress progress) {
+  Request req;
+  req.method = "POST";
+  req.path = path;
+  req.headers = headers;
+  req.body = body;
+  req.content_receiver =
+      [content_receiver](const char *data, size_t data_length,
+                         size_t /*offset*/, size_t /*total_length*/) {
+        return content_receiver(data, data_length);
+      };
+  req.download_progress = std::move(progress);
+
+  if (max_timeout_msec_ > 0) {
+    req.start_time_ = std::chrono::steady_clock::now();
+  }
+
+  if (!content_type.empty()) { req.set_header("Content-Type", content_type); }
+
+  return send_(std::move(req));
+}
 
-    return result;
+inline Result ClientImpl::Put(const std::string &path) {
+  return Put(path, std::string(), std::string());
 }
 
-inline bool is_hex(char c, int& v)
-{
-    if (0x20 <= c && isdigit(c)) {
-        v = c - '0';
-        return true;
-    } else if ('A' <= c && c <= 'F') {
-        v = c - 'A' + 10;
-        return true;
-    } else if ('a' <= c && c <= 'f') {
-        v = c - 'a' + 10;
-        return true;
-    }
-    return false;
+inline Result ClientImpl::Put(const std::string &path, const Headers &headers) {
+  return Put(path, headers, nullptr, 0, std::string());
 }
 
-inline bool from_hex_to_i(const std::string& s, int i, int cnt, int& val)
-{
-    val = 0;
-    for (; cnt; i++, cnt--) {
-        if (!s[i]) {
-            return false;
-        }
-        int v = 0;
-        if (is_hex(s[i], v)) {
-            val = val * 16 + v;
-        } else {
-            return false;
-        }
-    }
-    return true;
+inline Result ClientImpl::Put(const std::string &path, const char *body,
+                              size_t content_length,
+                              const std::string &content_type,
+                              UploadProgress progress) {
+  return Put(path, Headers(), body, content_length, content_type, progress);
 }
 
-inline size_t to_utf8(int code, char* buff)
-{
-    if (code < 0x0080) {
-        buff[0] = (code & 0x7F);
-        return 1;
-    } else if (code < 0x0800) {
-        buff[0] = (0xC0 | ((code >> 6) & 0x1F));
-        buff[1] = (0x80 | (code & 0x3F));
-        return 2;
-    } else if (code < 0xD800) {
-        buff[0] = (0xE0 | ((code >> 12) & 0xF));
-        buff[1] = (0x80 | ((code >> 6) & 0x3F));
-        buff[2] = (0x80 | (code & 0x3F));
-        return 3;
-    } else if (code < 0xE000)  { // D800 - DFFF is invalid...
-        return 0;
-    } else if (code < 0x10000) {
-        buff[0] = (0xE0 | ((code >> 12) & 0xF));
-        buff[1] = (0x80 | ((code >> 6) & 0x3F));
-        buff[2] = (0x80 | (code & 0x3F));
-        return 3;
-    } else if (code < 0x110000) {
-        buff[0] = (0xF0 | ((code >> 18) & 0x7));
-        buff[1] = (0x80 | ((code >> 12) & 0x3F));
-        buff[2] = (0x80 | ((code >> 6) & 0x3F));
-        buff[3] = (0x80 | (code & 0x3F));
-        return 4;
-    }
-
-    // NOTREACHED
-    return 0;
+inline Result ClientImpl::Put(const std::string &path, const std::string &body,
+                              const std::string &content_type,
+                              UploadProgress progress) {
+  return Put(path, Headers(), body, content_type, progress);
 }
 
-inline std::string decode_url(const std::string& s)
-{
-    std::string result;
-
-    for (int i = 0; s[i]; i++) {
-        if (s[i] == '%') {
-            if (s[i + 1] && s[i + 1] == 'u') {
-                int val = 0;
-                if (from_hex_to_i(s, i + 2, 4, val)) {
-                    // 4 digits Unicode codes
-                    char buff[4];
-                    size_t len = to_utf8(val, buff);
-                    if (len > 0) {
-                        result.append(buff, len);
-                    }
-                    i += 5; // 'u0000'
-                } else {
-                    result += s[i];
-                }
-            } else {
-                int val = 0;
-                if (from_hex_to_i(s, i + 1, 2, val)) {
-                    // 2 digits hex codes
-                    result += val;
-                    i += 2; // '00'
-                } else {
-                    result += s[i];
-                }
-            }
-        } else if (s[i] == '+') {
-            result += ' ';
-        } else {
-            result += s[i];
-        }
-    }
+inline Result ClientImpl::Put(const std::string &path, const Params &params) {
+  return Put(path, Headers(), params);
+}
 
-    return result;
+inline Result ClientImpl::Put(const std::string &path, size_t content_length,
+                              ContentProvider content_provider,
+                              const std::string &content_type,
+                              UploadProgress progress) {
+  return Put(path, Headers(), content_length, std::move(content_provider),
+             content_type, progress);
 }
 
-inline void parse_query_text(const std::string& s, Params& params)
-{
-    split(&s[0], &s[s.size()], '&', [&](const char* b, const char* e) {
-        std::string key;
-        std::string val;
-        split(b, e, '=', [&](const char* b, const char* e) {
-            if (key.empty()) {
-                key.assign(b, e);
-            } else {
-                val.assign(b, e);
-            }
-        });
-        params.emplace(key, decode_url(val));
-    });
+inline Result ClientImpl::Put(const std::string &path,
+                              ContentProviderWithoutLength content_provider,
+                              const std::string &content_type,
+                              UploadProgress progress) {
+  return Put(path, Headers(), std::move(content_provider), content_type,
+             progress);
 }
 
-inline bool parse_multipart_boundary(const std::string& content_type, std::string& boundary)
-{
-    auto pos = content_type.find("boundary=");
-    if (pos == std::string::npos) {
-        return false;
-    }
+inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
+                              const Params &params) {
+  auto query = detail::params_to_query_str(params);
+  return Put(path, headers, query, "application/x-www-form-urlencoded");
+}
 
-    boundary = content_type.substr(pos + 9);
-    return true;
+inline Result ClientImpl::Put(const std::string &path,
+                              const UploadFormDataItems &items,
+                              UploadProgress progress) {
+  return Put(path, Headers(), items, progress);
 }
 
-inline bool parse_multipart_formdata(
-    const std::string& boundary, const std::string& body, MultipartFiles& files)
-{
-    static std::string dash = "--";
-    static std::string crlf = "\r\n";
+inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
+                              const UploadFormDataItems &items,
+                              UploadProgress progress) {
+  const auto &boundary = detail::make_multipart_data_boundary();
+  const auto &content_type =
+      detail::serialize_multipart_formdata_get_content_type(boundary);
+  const auto &body = detail::serialize_multipart_formdata(items, boundary);
+  return Put(path, headers, body, content_type, progress);
+}
 
-    static std::regex re_content_type(
-        "Content-Type: (.*?)", std::regex_constants::icase);
+inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
+                              const UploadFormDataItems &items,
+                              const std::string &boundary,
+                              UploadProgress progress) {
+  if (!detail::is_multipart_boundary_chars_valid(boundary)) {
+    return Result{nullptr, Error::UnsupportedMultipartBoundaryChars};
+  }
+
+  const auto &content_type =
+      detail::serialize_multipart_formdata_get_content_type(boundary);
+  const auto &body = detail::serialize_multipart_formdata(items, boundary);
+  return Put(path, headers, body, content_type, progress);
+}
 
-    static std::regex re_content_disposition(
-        "Content-Disposition: form-data; name=\"(.*?)\"(?:; filename=\"(.*?)\")?",
-        std::regex_constants::icase);
+inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
+                              const char *body, size_t content_length,
+                              const std::string &content_type,
+                              UploadProgress progress) {
+  return send_with_content_provider("PUT", path, headers, body, content_length,
+                                    nullptr, nullptr, content_type, progress);
+}
 
-    auto dash_boundary = dash + boundary;
+inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
+                              const std::string &body,
+                              const std::string &content_type,
+                              UploadProgress progress) {
+  return send_with_content_provider("PUT", path, headers, body.data(),
+                                    body.size(), nullptr, nullptr, content_type,
+                                    progress);
+}
 
-    auto pos = body.find(dash_boundary);
-    if (pos != 0) {
-        return false;
-    }
+inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
+                              size_t content_length,
+                              ContentProvider content_provider,
+                              const std::string &content_type,
+                              UploadProgress progress) {
+  return send_with_content_provider("PUT", path, headers, nullptr,
+                                    content_length, std::move(content_provider),
+                                    nullptr, content_type, progress);
+}
 
-    pos += dash_boundary.size();
+inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
+                              ContentProviderWithoutLength content_provider,
+                              const std::string &content_type,
+                              UploadProgress progress) {
+  return send_with_content_provider("PUT", path, headers, nullptr, 0, nullptr,
+                                    std::move(content_provider), content_type,
+                                    progress);
+}
 
-    auto next_pos = body.find(crlf, pos);
-    if (next_pos == std::string::npos) {
-        return false;
-    }
+inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
+                              const UploadFormDataItems &items,
+                              const FormDataProviderItems &provider_items,
+                              UploadProgress progress) {
+  const auto &boundary = detail::make_multipart_data_boundary();
+  const auto &content_type =
+      detail::serialize_multipart_formdata_get_content_type(boundary);
+  return send_with_content_provider(
+      "PUT", path, headers, nullptr, 0, nullptr,
+      get_multipart_content_provider(boundary, items, provider_items),
+      content_type, progress);
+}
 
-    pos = next_pos + crlf.size();
+inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
+                              const std::string &body,
+                              const std::string &content_type,
+                              ContentReceiver content_receiver,
+                              DownloadProgress progress) {
+  Request req;
+  req.method = "PUT";
+  req.path = path;
+  req.headers = headers;
+  req.body = body;
+  req.content_receiver =
+      [content_receiver](const char *data, size_t data_length,
+                         size_t /*offset*/, size_t /*total_length*/) {
+        return content_receiver(data, data_length);
+      };
+  req.download_progress = std::move(progress);
+
+  if (max_timeout_msec_ > 0) {
+    req.start_time_ = std::chrono::steady_clock::now();
+  }
+
+  if (!content_type.empty()) { req.set_header("Content-Type", content_type); }
+
+  return send_(std::move(req));
+}
 
-    while (pos < body.size()) {
-        next_pos = body.find(crlf, pos);
-        if (next_pos == std::string::npos) {
-            return false;
-        }
+inline Result ClientImpl::Patch(const std::string &path) {
+  return Patch(path, std::string(), std::string());
+}
 
-        std::string name;
-        MultipartFile file;
+inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
+                                UploadProgress progress) {
+  return Patch(path, headers, nullptr, 0, std::string(), progress);
+}
 
-        auto header = body.substr(pos, (next_pos - pos));
+inline Result ClientImpl::Patch(const std::string &path, const char *body,
+                                size_t content_length,
+                                const std::string &content_type,
+                                UploadProgress progress) {
+  return Patch(path, Headers(), body, content_length, content_type, progress);
+}
 
-        while (pos != next_pos) {
-            std::smatch m;
-            if (std::regex_match(header, m, re_content_type)) {
-                file.content_type = m[1];
-            } else if (std::regex_match(header, m, re_content_disposition)) {
-                name = m[1];
-                file.filename = m[2];
-            }
+inline Result ClientImpl::Patch(const std::string &path,
+                                const std::string &body,
+                                const std::string &content_type,
+                                UploadProgress progress) {
+  return Patch(path, Headers(), body, content_type, progress);
+}
 
-            pos = next_pos + crlf.size();
+inline Result ClientImpl::Patch(const std::string &path, const Params &params) {
+  return Patch(path, Headers(), params);
+}
 
-            next_pos = body.find(crlf, pos);
-            if (next_pos == std::string::npos) {
-                return false;
-            }
+inline Result ClientImpl::Patch(const std::string &path, size_t content_length,
+                                ContentProvider content_provider,
+                                const std::string &content_type,
+                                UploadProgress progress) {
+  return Patch(path, Headers(), content_length, std::move(content_provider),
+               content_type, progress);
+}
 
-            header = body.substr(pos, (next_pos - pos));
-        }
+inline Result ClientImpl::Patch(const std::string &path,
+                                ContentProviderWithoutLength content_provider,
+                                const std::string &content_type,
+                                UploadProgress progress) {
+  return Patch(path, Headers(), std::move(content_provider), content_type,
+               progress);
+}
 
-        pos = next_pos + crlf.size();
+inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
+                                const Params &params) {
+  auto query = detail::params_to_query_str(params);
+  return Patch(path, headers, query, "application/x-www-form-urlencoded");
+}
 
-        next_pos = body.find(crlf + dash_boundary, pos);
+inline Result ClientImpl::Patch(const std::string &path,
+                                const UploadFormDataItems &items,
+                                UploadProgress progress) {
+  return Patch(path, Headers(), items, progress);
+}
 
-        if (next_pos == std::string::npos) {
-            return false;
-        }
+inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
+                                const UploadFormDataItems &items,
+                                UploadProgress progress) {
+  const auto &boundary = detail::make_multipart_data_boundary();
+  const auto &content_type =
+      detail::serialize_multipart_formdata_get_content_type(boundary);
+  const auto &body = detail::serialize_multipart_formdata(items, boundary);
+  return Patch(path, headers, body, content_type, progress);
+}
 
-        file.offset = pos;
-        file.length = next_pos - pos;
+inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
+                                const UploadFormDataItems &items,
+                                const std::string &boundary,
+                                UploadProgress progress) {
+  if (!detail::is_multipart_boundary_chars_valid(boundary)) {
+    return Result{nullptr, Error::UnsupportedMultipartBoundaryChars};
+  }
+
+  const auto &content_type =
+      detail::serialize_multipart_formdata_get_content_type(boundary);
+  const auto &body = detail::serialize_multipart_formdata(items, boundary);
+  return Patch(path, headers, body, content_type, progress);
+}
 
-        pos = next_pos + crlf.size() + dash_boundary.size();
+inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
+                                const char *body, size_t content_length,
+                                const std::string &content_type,
+                                UploadProgress progress) {
+  return send_with_content_provider("PATCH", path, headers, body,
+                                    content_length, nullptr, nullptr,
+                                    content_type, progress);
+}
 
-        next_pos = body.find(crlf, pos);
-        if (next_pos == std::string::npos) {
-            return false;
-        }
+inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
+                                const std::string &body,
+                                const std::string &content_type,
+                                UploadProgress progress) {
+  return send_with_content_provider("PATCH", path, headers, body.data(),
+                                    body.size(), nullptr, nullptr, content_type,
+                                    progress);
+}
 
-        files.emplace(name, file);
+inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
+                                size_t content_length,
+                                ContentProvider content_provider,
+                                const std::string &content_type,
+                                UploadProgress progress) {
+  return send_with_content_provider("PATCH", path, headers, nullptr,
+                                    content_length, std::move(content_provider),
+                                    nullptr, content_type, progress);
+}
 
-        pos = next_pos + crlf.size();
-    }
+inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
+                                ContentProviderWithoutLength content_provider,
+                                const std::string &content_type,
+                                UploadProgress progress) {
+  return send_with_content_provider("PATCH", path, headers, nullptr, 0, nullptr,
+                                    std::move(content_provider), content_type,
+                                    progress);
+}
 
-    return true;
+inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
+                                const UploadFormDataItems &items,
+                                const FormDataProviderItems &provider_items,
+                                UploadProgress progress) {
+  const auto &boundary = detail::make_multipart_data_boundary();
+  const auto &content_type =
+      detail::serialize_multipart_formdata_get_content_type(boundary);
+  return send_with_content_provider(
+      "PATCH", path, headers, nullptr, 0, nullptr,
+      get_multipart_content_provider(boundary, items, provider_items),
+      content_type, progress);
 }
 
-inline std::string to_lower(const char* beg, const char* end)
-{
-    std::string out;
-    auto it = beg;
-    while (it != end) {
-        out += ::tolower(*it);
-        it++;
-    }
-    return out;
+inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
+                                const std::string &body,
+                                const std::string &content_type,
+                                ContentReceiver content_receiver,
+                                DownloadProgress progress) {
+  Request req;
+  req.method = "PATCH";
+  req.path = path;
+  req.headers = headers;
+  req.body = body;
+  req.content_receiver =
+      [content_receiver](const char *data, size_t data_length,
+                         size_t /*offset*/, size_t /*total_length*/) {
+        return content_receiver(data, data_length);
+      };
+  req.download_progress = std::move(progress);
+
+  if (max_timeout_msec_ > 0) {
+    req.start_time_ = std::chrono::steady_clock::now();
+  }
+
+  if (!content_type.empty()) { req.set_header("Content-Type", content_type); }
+
+  return send_(std::move(req));
 }
 
-inline void make_range_header_core(std::string&) {}
+inline Result ClientImpl::Delete(const std::string &path,
+                                 DownloadProgress progress) {
+  return Delete(path, Headers(), std::string(), std::string(), progress);
+}
 
-template<typename uint64_t>
-inline void make_range_header_core(std::string& field, uint64_t value)
-{
-    if (!field.empty()) {
-        field += ", ";
-    }
-    field += std::to_string(value) + "-";
+inline Result ClientImpl::Delete(const std::string &path,
+                                 const Headers &headers,
+                                 DownloadProgress progress) {
+  return Delete(path, headers, std::string(), std::string(), progress);
 }
 
-template<typename uint64_t, typename... Args>
-inline void make_range_header_core(std::string& field, uint64_t value1, uint64_t value2, Args... args)
-{
-    if (!field.empty()) {
-        field += ", ";
-    }
-    field += std::to_string(value1) + "-" + std::to_string(value2);
-    make_range_header_core(field, args...);
+inline Result ClientImpl::Delete(const std::string &path, const char *body,
+                                 size_t content_length,
+                                 const std::string &content_type,
+                                 DownloadProgress progress) {
+  return Delete(path, Headers(), body, content_length, content_type, progress);
 }
 
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-inline bool can_compress(const std::string& content_type) {
-    return !content_type.find("text/") ||
-        content_type == "image/svg+xml" ||
-        content_type == "application/javascript" ||
-        content_type == "application/json" ||
-        content_type == "application/xml" ||
-        content_type == "application/xhtml+xml";
-}
-
-inline void compress(std::string& content)
-{
-    z_stream strm;
-    strm.zalloc = Z_NULL;
-    strm.zfree = Z_NULL;
-    strm.opaque = Z_NULL;
-
-    auto ret = deflateInit2(&strm, Z_DEFAULT_COMPRESSION, Z_DEFLATED, 31, 8, Z_DEFAULT_STRATEGY);
-    if (ret != Z_OK) {
-        return;
-    }
+inline Result ClientImpl::Delete(const std::string &path,
+                                 const std::string &body,
+                                 const std::string &content_type,
+                                 DownloadProgress progress) {
+  return Delete(path, Headers(), body.data(), body.size(), content_type,
+                progress);
+}
 
-    strm.avail_in = content.size();
-    strm.next_in = (Bytef *)content.data();
+inline Result ClientImpl::Delete(const std::string &path,
+                                 const Headers &headers,
+                                 const std::string &body,
+                                 const std::string &content_type,
+                                 DownloadProgress progress) {
+  return Delete(path, headers, body.data(), body.size(), content_type,
+                progress);
+}
 
-    std::string compressed;
+inline Result ClientImpl::Delete(const std::string &path, const Params &params,
+                                 DownloadProgress progress) {
+  return Delete(path, Headers(), params, progress);
+}
 
-    const auto bufsiz = 16384;
-    char buff[bufsiz];
-    do {
-        strm.avail_out = bufsiz;
-        strm.next_out = (Bytef *)buff;
-        deflate(&strm, Z_FINISH);
-        compressed.append(buff, bufsiz - strm.avail_out);
-    } while (strm.avail_out == 0);
+inline Result ClientImpl::Delete(const std::string &path,
+                                 const Headers &headers, const Params &params,
+                                 DownloadProgress progress) {
+  auto query = detail::params_to_query_str(params);
+  return Delete(path, headers, query, "application/x-www-form-urlencoded",
+                progress);
+}
 
-    content.swap(compressed);
+inline Result ClientImpl::Delete(const std::string &path,
+                                 const Headers &headers, const char *body,
+                                 size_t content_length,
+                                 const std::string &content_type,
+                                 DownloadProgress progress) {
+  Request req;
+  req.method = "DELETE";
+  req.headers = headers;
+  req.path = path;
+  req.download_progress = std::move(progress);
+  if (max_timeout_msec_ > 0) {
+    req.start_time_ = std::chrono::steady_clock::now();
+  }
+
+  if (!content_type.empty()) { req.set_header("Content-Type", content_type); }
+  req.body.assign(body, content_length);
+
+  return send_(std::move(req));
+}
 
-    deflateEnd(&strm);
+inline Result ClientImpl::Options(const std::string &path) {
+  return Options(path, Headers());
 }
 
-inline void decompress(std::string& content)
-{
-    z_stream strm;
-    strm.zalloc = Z_NULL;
-    strm.zfree = Z_NULL;
-    strm.opaque = Z_NULL;
+inline Result ClientImpl::Options(const std::string &path,
+                                  const Headers &headers) {
+  Request req;
+  req.method = "OPTIONS";
+  req.headers = headers;
+  req.path = path;
+  if (max_timeout_msec_ > 0) {
+    req.start_time_ = std::chrono::steady_clock::now();
+  }
+
+  return send_(std::move(req));
+}
 
-    // 15 is the value of wbits, which should be at the maximum possible value to ensure
-    // that any gzip stream can be decoded. The offset of 16 specifies that the stream
-    // to decompress will be formatted with a gzip wrapper.
-    auto ret = inflateInit2(&strm, 16 + 15);
-    if (ret != Z_OK) {
-        return;
-    }
+inline void ClientImpl::stop() {
+  std::lock_guard<std::mutex> guard(socket_mutex_);
+
+  // If there is anything ongoing right now, the ONLY thread-safe thing we can
+  // do is to shutdown_socket, so that threads using this socket suddenly
+  // discover they can't read/write any more and error out. Everything else
+  // (closing the socket, shutting ssl down) is unsafe because these actions
+  // are not thread-safe.
+  if (socket_requests_in_flight_ > 0) {
+    shutdown_socket(socket_);
+
+    // Aside from that, we set a flag for the socket to be closed when we're
+    // done.
+    socket_should_be_closed_when_request_is_done_ = true;
+    return;
+  }
+
+  // Otherwise, still holding the mutex, we can shut everything down ourselves
+  shutdown_ssl(socket_, true);
+  shutdown_socket(socket_);
+  close_socket(socket_);
+}
 
-    strm.avail_in = content.size();
-    strm.next_in = (Bytef *)content.data();
+inline std::string ClientImpl::host() const { return host_; }
 
-    std::string decompressed;
+inline int ClientImpl::port() const { return port_; }
 
-    const auto bufsiz = 16384;
-    char buff[bufsiz];
-    do {
-        strm.avail_out = bufsiz;
-        strm.next_out = (Bytef *)buff;
-        inflate(&strm, Z_NO_FLUSH);
-        decompressed.append(buff, bufsiz - strm.avail_out);
-    } while (strm.avail_out == 0);
+inline size_t ClientImpl::is_socket_open() const {
+  std::lock_guard<std::mutex> guard(socket_mutex_);
+  return socket_.is_open();
+}
 
-    content.swap(decompressed);
+inline socket_t ClientImpl::socket() const { return socket_.sock; }
 
-    inflateEnd(&strm);
+inline void ClientImpl::set_connection_timeout(time_t sec, time_t usec) {
+  connection_timeout_sec_ = sec;
+  connection_timeout_usec_ = usec;
 }
-#endif
 
-#ifdef _WIN32
-class WSInit {
-public:
-    WSInit() {
-        WSADATA wsaData;
-        WSAStartup(0x0002, &wsaData);
-    }
+inline void ClientImpl::set_read_timeout(time_t sec, time_t usec) {
+  read_timeout_sec_ = sec;
+  read_timeout_usec_ = usec;
+}
 
-    ~WSInit() {
-        WSACleanup();
-    }
-};
+inline void ClientImpl::set_write_timeout(time_t sec, time_t usec) {
+  write_timeout_sec_ = sec;
+  write_timeout_usec_ = usec;
+}
 
-static WSInit wsinit_;
-#endif
+inline void ClientImpl::set_max_timeout(time_t msec) {
+  max_timeout_msec_ = msec;
+}
 
-} // namespace detail
+inline void ClientImpl::set_basic_auth(const std::string &username,
+                                       const std::string &password) {
+  basic_auth_username_ = username;
+  basic_auth_password_ = password;
+}
 
-// Header utilities
-template<typename uint64_t, typename... Args>
-inline std::pair<std::string, std::string> make_range_header(uint64_t value, Args... args)
-{
-    std::string field;
-    detail::make_range_header_core(field, value, args...);
-    field.insert(0, "bytes=");
-    return std::make_pair("Range", field);
+inline void ClientImpl::set_bearer_token_auth(const std::string &token) {
+  bearer_token_auth_token_ = token;
 }
 
-// Request implementation
-inline bool Request::has_header(const char* key) const
-{
-    return headers.find(key) != headers.end();
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+inline void ClientImpl::set_digest_auth(const std::string &username,
+                                        const std::string &password) {
+  digest_auth_username_ = username;
+  digest_auth_password_ = password;
 }
+#endif
+
+inline void ClientImpl::set_keep_alive(bool on) { keep_alive_ = on; }
+
+inline void ClientImpl::set_follow_location(bool on) { follow_location_ = on; }
+
+inline void ClientImpl::set_path_encode(bool on) { path_encode_ = on; }
 
-inline std::string Request::get_header_value(const char* key) const
-{
-    return detail::get_header_value(headers, key, "");
+inline void
+ClientImpl::set_hostname_addr_map(std::map<std::string, std::string> addr_map) {
+  addr_map_ = std::move(addr_map);
 }
 
-inline void Request::set_header(const char* key, const char* val)
-{
-    headers.emplace(key, val);
+inline void ClientImpl::set_default_headers(Headers headers) {
+  default_headers_ = std::move(headers);
 }
 
-inline bool Request::has_param(const char* key) const
-{
-    return params.find(key) != params.end();
+inline void ClientImpl::set_header_writer(
+    std::function<ssize_t(Stream &, Headers &)> const &writer) {
+  header_writer_ = writer;
 }
 
-inline std::string Request::get_param_value(const char* key) const
-{
-    auto it = params.find(key);
-    if (it != params.end()) {
-        return it->second;
-    }
-    return std::string();
+inline void ClientImpl::set_address_family(int family) {
+  address_family_ = family;
 }
 
-inline bool Request::has_file(const char* key) const
-{
-    return files.find(key) != files.end();
+inline void ClientImpl::set_tcp_nodelay(bool on) { tcp_nodelay_ = on; }
+
+inline void ClientImpl::set_ipv6_v6only(bool on) { ipv6_v6only_ = on; }
+
+inline void ClientImpl::set_socket_options(SocketOptions socket_options) {
+  socket_options_ = std::move(socket_options);
 }
 
-inline MultipartFile Request::get_file_value(const char* key) const
-{
-    auto it = files.find(key);
-    if (it != files.end()) {
-        return it->second;
-    }
-    return MultipartFile();
+inline void ClientImpl::set_compress(bool on) { compress_ = on; }
+
+inline void ClientImpl::set_decompress(bool on) { decompress_ = on; }
+
+inline void ClientImpl::set_interface(const std::string &intf) {
+  interface_ = intf;
 }
 
-// Response implementation
-inline bool Response::has_header(const char* key) const
-{
-    return headers.find(key) != headers.end();
+inline void ClientImpl::set_proxy(const std::string &host, int port) {
+  proxy_host_ = host;
+  proxy_port_ = port;
 }
 
-inline std::string Response::get_header_value(const char* key) const
-{
-    return detail::get_header_value(headers, key, "");
+inline void ClientImpl::set_proxy_basic_auth(const std::string &username,
+                                             const std::string &password) {
+  proxy_basic_auth_username_ = username;
+  proxy_basic_auth_password_ = password;
 }
 
-inline void Response::set_header(const char* key, const char* val)
-{
-    headers.emplace(key, val);
+inline void ClientImpl::set_proxy_bearer_token_auth(const std::string &token) {
+  proxy_bearer_token_auth_token_ = token;
 }
 
-inline void Response::set_redirect(const char* url)
-{
-    set_header("Location", url);
-    status = 302;
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+inline void ClientImpl::set_proxy_digest_auth(const std::string &username,
+                                              const std::string &password) {
+  proxy_digest_auth_username_ = username;
+  proxy_digest_auth_password_ = password;
 }
 
-inline void Response::set_content(const char* s, size_t n, const char* content_type)
-{
-    body.assign(s, n);
-    set_header("Content-Type", content_type);
+inline void ClientImpl::set_ca_cert_path(const std::string &ca_cert_file_path,
+                                         const std::string &ca_cert_dir_path) {
+  ca_cert_file_path_ = ca_cert_file_path;
+  ca_cert_dir_path_ = ca_cert_dir_path;
 }
 
-inline void Response::set_content(const std::string& s, const char* content_type)
-{
-    body = s;
-    set_header("Content-Type", content_type);
+inline void ClientImpl::set_ca_cert_store(X509_STORE *ca_cert_store) {
+  if (ca_cert_store && ca_cert_store != ca_cert_store_) {
+    ca_cert_store_ = ca_cert_store;
+  }
 }
 
-// Rstream implementation
-template <typename ...Args>
-inline void Stream::write_format(const char* fmt, const Args& ...args)
-{
-    const auto bufsiz = 2048;
-    char buf[bufsiz];
+inline X509_STORE *ClientImpl::create_ca_cert_store(const char *ca_cert,
+                                                    std::size_t size) const {
+  auto mem = BIO_new_mem_buf(ca_cert, static_cast<int>(size));
+  auto se = detail::scope_exit([&] { BIO_free_all(mem); });
+  if (!mem) { return nullptr; }
 
-#if defined(_MSC_VER) && _MSC_VER < 1900
-    auto n = _snprintf_s(buf, bufsiz, bufsiz - 1, fmt, args...);
-#else
-    auto n = snprintf(buf, bufsiz - 1, fmt, args...);
-#endif
-    if (n > 0) {
-        if (n >= bufsiz - 1) {
-            std::vector<char> glowable_buf(bufsiz);
+  auto inf = PEM_X509_INFO_read_bio(mem, nullptr, nullptr, nullptr);
+  if (!inf) { return nullptr; }
 
-            while (n >= static_cast<int>(glowable_buf.size() - 1)) {
-                glowable_buf.resize(glowable_buf.size() * 2);
-#if defined(_MSC_VER) && _MSC_VER < 1900
-                n = _snprintf_s(&glowable_buf[0], glowable_buf.size(), glowable_buf.size() - 1, fmt, args...);
-#else
-                n = snprintf(&glowable_buf[0], glowable_buf.size() - 1, fmt, args...);
-#endif
-            }
-            write(&glowable_buf[0], n);
-        } else {
-            write(buf, n);
-        }
+  auto cts = X509_STORE_new();
+  if (cts) {
+    for (auto i = 0; i < static_cast<int>(sk_X509_INFO_num(inf)); i++) {
+      auto itmp = sk_X509_INFO_value(inf, i);
+      if (!itmp) { continue; }
+
+      if (itmp->x509) { X509_STORE_add_cert(cts, itmp->x509); }
+      if (itmp->crl) { X509_STORE_add_crl(cts, itmp->crl); }
     }
-}
+  }
 
-// Socket stream implementation
-inline SocketStream::SocketStream(socket_t sock): sock_(sock)
-{
+  sk_X509_INFO_pop_free(inf, X509_INFO_free);
+  return cts;
 }
 
-inline SocketStream::~SocketStream()
-{
+inline void ClientImpl::enable_server_certificate_verification(bool enabled) {
+  server_certificate_verification_ = enabled;
 }
 
-inline int SocketStream::read(char* ptr, size_t size)
-{
-    return recv(sock_, ptr, size, 0);
+inline void ClientImpl::enable_server_hostname_verification(bool enabled) {
+  server_hostname_verification_ = enabled;
 }
 
-inline int SocketStream::write(const char* ptr, size_t size)
-{
-    return send(sock_, ptr, size, 0);
+inline void ClientImpl::set_server_certificate_verifier(
+    std::function<SSLVerifierResponse(SSL *ssl)> verifier) {
+  server_certificate_verifier_ = verifier;
 }
+#endif
 
-inline int SocketStream::write(const char* ptr)
-{
-    return write(ptr, strlen(ptr));
+inline void ClientImpl::set_logger(Logger logger) {
+  logger_ = std::move(logger);
 }
 
-inline std::string SocketStream::get_remote_addr() {
-    return detail::get_remote_addr(sock_);
+inline void ClientImpl::set_error_logger(ErrorLogger error_logger) {
+  error_logger_ = std::move(error_logger);
 }
 
-// HTTP server implementation
-inline Server::Server()
-    : keep_alive_max_count_(5)
-    , is_running_(false)
-    , svr_sock_(INVALID_SOCKET)
-    , running_threads_(0)
-{
-#ifndef _WIN32
-    signal(SIGPIPE, SIG_IGN);
-#endif
-}
+/*
+ * SSL Implementation
+ */
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+namespace detail {
 
-inline Server::~Server()
-{
+inline bool is_ip_address(const std::string &host) {
+  struct in_addr addr4;
+  struct in6_addr addr6;
+  return inet_pton(AF_INET, host.c_str(), &addr4) == 1 ||
+         inet_pton(AF_INET6, host.c_str(), &addr6) == 1;
 }
 
-inline Server& Server::Get(const char* pattern, Handler handler)
-{
-    get_handlers_.push_back(std::make_pair(std::regex(pattern), handler));
-    return *this;
-}
+template <typename U, typename V>
+inline SSL *ssl_new(socket_t sock, SSL_CTX *ctx, std::mutex &ctx_mutex,
+                    U SSL_connect_or_accept, V setup) {
+  SSL *ssl = nullptr;
+  {
+    std::lock_guard<std::mutex> guard(ctx_mutex);
+    ssl = SSL_new(ctx);
+  }
+
+  if (ssl) {
+    set_nonblocking(sock, true);
+    auto bio = BIO_new_socket(static_cast<int>(sock), BIO_NOCLOSE);
+    BIO_set_nbio(bio, 1);
+    SSL_set_bio(ssl, bio, bio);
 
-inline Server& Server::Post(const char* pattern, Handler handler)
-{
-    post_handlers_.push_back(std::make_pair(std::regex(pattern), handler));
-    return *this;
-}
+    if (!setup(ssl) || SSL_connect_or_accept(ssl) != 1) {
+      SSL_shutdown(ssl);
+      {
+        std::lock_guard<std::mutex> guard(ctx_mutex);
+        SSL_free(ssl);
+      }
+      set_nonblocking(sock, false);
+      return nullptr;
+    }
+    BIO_set_nbio(bio, 0);
+    set_nonblocking(sock, false);
+  }
 
-inline Server& Server::Put(const char* pattern, Handler handler)
-{
-    put_handlers_.push_back(std::make_pair(std::regex(pattern), handler));
-    return *this;
+  return ssl;
 }
 
-inline Server& Server::Delete(const char* pattern, Handler handler)
-{
-    delete_handlers_.push_back(std::make_pair(std::regex(pattern), handler));
-    return *this;
-}
+inline void ssl_delete(std::mutex &ctx_mutex, SSL *ssl, socket_t sock,
+                       bool shutdown_gracefully) {
+  // sometimes we may want to skip this to try to avoid SIGPIPE if we know
+  // the remote has closed the network connection
+  // Note that it is not always possible to avoid SIGPIPE, this is merely a
+  // best-efforts.
+  if (shutdown_gracefully) {
+    (void)(sock);
+    // SSL_shutdown() returns 0 on first call (indicating close_notify alert
+    // sent) and 1 on subsequent call (indicating close_notify alert received)
+    if (SSL_shutdown(ssl) == 0) {
+      // Expected to return 1, but even if it doesn't, we free ssl
+      SSL_shutdown(ssl);
+    }
+  }
 
-inline Server& Server::Options(const char* pattern, Handler handler)
-{
-    options_handlers_.push_back(std::make_pair(std::regex(pattern), handler));
-    return *this;
+  std::lock_guard<std::mutex> guard(ctx_mutex);
+  SSL_free(ssl);
 }
 
-inline bool Server::set_base_dir(const char* path)
-{
-    if (detail::is_dir(path)) {
-        base_dir_ = path;
-        return true;
+template <typename U>
+bool ssl_connect_or_accept_nonblocking(socket_t sock, SSL *ssl,
+                                       U ssl_connect_or_accept,
+                                       time_t timeout_sec, time_t timeout_usec,
+                                       int *ssl_error) {
+  auto res = 0;
+  while ((res = ssl_connect_or_accept(ssl)) != 1) {
+    auto err = SSL_get_error(ssl, res);
+    switch (err) {
+    case SSL_ERROR_WANT_READ:
+      if (select_read(sock, timeout_sec, timeout_usec) > 0) { continue; }
+      break;
+    case SSL_ERROR_WANT_WRITE:
+      if (select_write(sock, timeout_sec, timeout_usec) > 0) { continue; }
+      break;
+    default: break;
     }
+    if (ssl_error) { *ssl_error = err; }
     return false;
+  }
+  return true;
 }
 
-inline void Server::set_error_handler(Handler handler)
-{
-    error_handler_ = handler;
+template <typename T>
+inline bool process_server_socket_ssl(
+    const std::atomic<socket_t> &svr_sock, SSL *ssl, socket_t sock,
+    size_t keep_alive_max_count, time_t keep_alive_timeout_sec,
+    time_t read_timeout_sec, time_t read_timeout_usec, time_t write_timeout_sec,
+    time_t write_timeout_usec, T callback) {
+  return process_server_socket_core(
+      svr_sock, sock, keep_alive_max_count, keep_alive_timeout_sec,
+      [&](bool close_connection, bool &connection_closed) {
+        SSLSocketStream strm(sock, ssl, read_timeout_sec, read_timeout_usec,
+                             write_timeout_sec, write_timeout_usec);
+        return callback(strm, close_connection, connection_closed);
+      });
 }
 
-inline void Server::set_logger(Logger logger)
-{
-    logger_ = logger;
+template <typename T>
+inline bool process_client_socket_ssl(
+    SSL *ssl, socket_t sock, time_t read_timeout_sec, time_t read_timeout_usec,
+    time_t write_timeout_sec, time_t write_timeout_usec,
+    time_t max_timeout_msec,
+    std::chrono::time_point<std::chrono::steady_clock> start_time, T callback) {
+  SSLSocketStream strm(sock, ssl, read_timeout_sec, read_timeout_usec,
+                       write_timeout_sec, write_timeout_usec, max_timeout_msec,
+                       start_time);
+  return callback(strm);
 }
 
-inline void Server::set_keep_alive_max_count(size_t count)
-{
-    keep_alive_max_count_ = count;
+// SSL socket stream implementation
+inline SSLSocketStream::SSLSocketStream(
+    socket_t sock, SSL *ssl, time_t read_timeout_sec, time_t read_timeout_usec,
+    time_t write_timeout_sec, time_t write_timeout_usec,
+    time_t max_timeout_msec,
+    std::chrono::time_point<std::chrono::steady_clock> start_time)
+    : sock_(sock), ssl_(ssl), read_timeout_sec_(read_timeout_sec),
+      read_timeout_usec_(read_timeout_usec),
+      write_timeout_sec_(write_timeout_sec),
+      write_timeout_usec_(write_timeout_usec),
+      max_timeout_msec_(max_timeout_msec), start_time_(start_time) {
+  SSL_clear_mode(ssl, SSL_MODE_AUTO_RETRY);
 }
 
-inline int Server::bind_to_any_port(const char* host, int socket_flags)
-{
-    return bind_internal(host, 0, socket_flags);
-}
+inline SSLSocketStream::~SSLSocketStream() = default;
 
-inline bool Server::listen_after_bind() {
-    return listen_internal();
+inline bool SSLSocketStream::is_readable() const {
+  return SSL_pending(ssl_) > 0;
 }
 
-inline bool Server::listen(const char* host, int port, int socket_flags)
-{
-    if (bind_internal(host, port, socket_flags) < 0)
-        return false;
-    return listen_internal();
+inline bool SSLSocketStream::wait_readable() const {
+  if (max_timeout_msec_ <= 0) {
+    return select_read(sock_, read_timeout_sec_, read_timeout_usec_) > 0;
+  }
+
+  time_t read_timeout_sec;
+  time_t read_timeout_usec;
+  calc_actual_timeout(max_timeout_msec_, duration(), read_timeout_sec_,
+                      read_timeout_usec_, read_timeout_sec, read_timeout_usec);
+
+  return select_read(sock_, read_timeout_sec, read_timeout_usec) > 0;
 }
 
-inline bool Server::is_running() const
-{
-    return is_running_;
+inline bool SSLSocketStream::wait_writable() const {
+  return select_write(sock_, write_timeout_sec_, write_timeout_usec_) > 0 &&
+         is_socket_alive(sock_) && !is_ssl_peer_could_be_closed(ssl_, sock_);
 }
 
-inline void Server::stop()
-{
-    if (is_running_) {
-        assert(svr_sock_ != INVALID_SOCKET);
-        detail::shutdown_socket(svr_sock_);
-        detail::close_socket(svr_sock_);
-        svr_sock_ = INVALID_SOCKET;
+inline ssize_t SSLSocketStream::read(char *ptr, size_t size) {
+  if (SSL_pending(ssl_) > 0) {
+    return SSL_read(ssl_, ptr, static_cast<int>(size));
+  } else if (wait_readable()) {
+    auto ret = SSL_read(ssl_, ptr, static_cast<int>(size));
+    if (ret < 0) {
+      auto err = SSL_get_error(ssl_, ret);
+      auto n = 1000;
+#ifdef _WIN32
+      while (--n >= 0 && (err == SSL_ERROR_WANT_READ ||
+                          (err == SSL_ERROR_SYSCALL &&
+                           WSAGetLastError() == WSAETIMEDOUT))) {
+#else
+      while (--n >= 0 && err == SSL_ERROR_WANT_READ) {
+#endif
+        if (SSL_pending(ssl_) > 0) {
+          return SSL_read(ssl_, ptr, static_cast<int>(size));
+        } else if (wait_readable()) {
+          std::this_thread::sleep_for(std::chrono::microseconds{10});
+          ret = SSL_read(ssl_, ptr, static_cast<int>(size));
+          if (ret >= 0) { return ret; }
+          err = SSL_get_error(ssl_, ret);
+        } else {
+          break;
+        }
+      }
+      assert(ret < 0);
     }
+    return ret;
+  } else {
+    return -1;
+  }
 }
 
-inline bool Server::parse_request_line(const char* s, Request& req)
-{
-    static std::regex re("(GET|HEAD|POST|PUT|DELETE|OPTIONS) (([^?]+)(?:\\?(.+?))?) (HTTP/1\\.[01])\r\n");
+inline ssize_t SSLSocketStream::write(const char *ptr, size_t size) {
+  if (wait_writable()) {
+    auto handle_size = static_cast<int>(
+        std::min<size_t>(size, (std::numeric_limits<int>::max)()));
 
-    std::cmatch m;
-    if (std::regex_match(s, m, re)) {
-        req.version = std::string(m[4]);
-        req.method = std::string(m[1]);
-        req.target = std::string(m[2]);
-        req.path = detail::decode_url(m[3]);
-
-        // Parse query text
-        auto len = std::distance(m[4].first, m[4].second);
-        if (len > 0) {
-            detail::parse_query_text(m[4], req.params);
+    auto ret = SSL_write(ssl_, ptr, static_cast<int>(handle_size));
+    if (ret < 0) {
+      auto err = SSL_get_error(ssl_, ret);
+      auto n = 1000;
+#ifdef _WIN32
+      while (--n >= 0 && (err == SSL_ERROR_WANT_WRITE ||
+                          (err == SSL_ERROR_SYSCALL &&
+                           WSAGetLastError() == WSAETIMEDOUT))) {
+#else
+      while (--n >= 0 && err == SSL_ERROR_WANT_WRITE) {
+#endif
+        if (wait_writable()) {
+          std::this_thread::sleep_for(std::chrono::microseconds{10});
+          ret = SSL_write(ssl_, ptr, static_cast<int>(handle_size));
+          if (ret >= 0) { return ret; }
+          err = SSL_get_error(ssl_, ret);
+        } else {
+          break;
         }
-
-        return true;
+      }
+      assert(ret < 0);
     }
+    return ret;
+  }
+  return -1;
+}
 
-    return false;
+inline void SSLSocketStream::get_remote_ip_and_port(std::string &ip,
+                                                    int &port) const {
+  detail::get_remote_ip_and_port(sock_, ip, port);
 }
 
-inline void Server::write_response(Stream& strm, bool last_connection, const Request& req, Response& res)
-{
-    assert(res.status != -1);
+inline void SSLSocketStream::get_local_ip_and_port(std::string &ip,
+                                                   int &port) const {
+  detail::get_local_ip_and_port(sock_, ip, port);
+}
 
-    if (400 <= res.status && error_handler_) {
-        error_handler_(req, res);
-    }
+inline socket_t SSLSocketStream::socket() const { return sock_; }
 
-    // Response line
-    strm.write_format("HTTP/1.1 %d %s\r\n",
-        res.status,
-        detail::status_message(res.status));
+inline time_t SSLSocketStream::duration() const {
+  return std::chrono::duration_cast<std::chrono::milliseconds>(
+             std::chrono::steady_clock::now() - start_time_)
+      .count();
+}
 
-    // Headers
-    if (last_connection ||
-        req.version == "HTTP/1.0" ||
-        req.get_header_value("Connection") == "close") {
-        res.set_header("Connection", "close");
-    }
+} // namespace detail
 
-    if (!res.body.empty()) {
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-        // TODO: 'Accpet-Encoding' has gzip, not gzip;q=0
-        const auto& encodings = req.get_header_value("Accept-Encoding");
-        if (encodings.find("gzip") != std::string::npos &&
-            detail::can_compress(res.get_header_value("Content-Type"))) {
-            detail::compress(res.body);
-            res.set_header("Content-Encoding", "gzip");
-        }
-#endif
+// SSL HTTP server implementation
+inline SSLServer::SSLServer(const char *cert_path, const char *private_key_path,
+                            const char *client_ca_cert_file_path,
+                            const char *client_ca_cert_dir_path,
+                            const char *private_key_password) {
+  ctx_ = SSL_CTX_new(TLS_server_method());
+
+  if (ctx_) {
+    SSL_CTX_set_options(ctx_,
+                        SSL_OP_NO_COMPRESSION |
+                            SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);
 
-        if (!res.has_header("Content-Type")) {
-            res.set_header("Content-Type", "text/plain");
-        }
+    SSL_CTX_set_min_proto_version(ctx_, TLS1_2_VERSION);
 
-        auto length = std::to_string(res.body.size());
-        res.set_header("Content-Length", length.c_str());
+    if (private_key_password != nullptr && (private_key_password[0] != '\0')) {
+      SSL_CTX_set_default_passwd_cb_userdata(
+          ctx_,
+          reinterpret_cast<void *>(const_cast<char *>(private_key_password)));
     }
 
-    detail::write_headers(strm, res);
-
-    // Body
-    if (!res.body.empty() && req.method != "HEAD") {
-        strm.write(res.body.c_str(), res.body.size());
-    }
+    if (SSL_CTX_use_certificate_chain_file(ctx_, cert_path) != 1 ||
+        SSL_CTX_use_PrivateKey_file(ctx_, private_key_path, SSL_FILETYPE_PEM) !=
+            1 ||
+        SSL_CTX_check_private_key(ctx_) != 1) {
+      last_ssl_error_ = static_cast<int>(ERR_get_error());
+      SSL_CTX_free(ctx_);
+      ctx_ = nullptr;
+    } else if (client_ca_cert_file_path || client_ca_cert_dir_path) {
+      SSL_CTX_load_verify_locations(ctx_, client_ca_cert_file_path,
+                                    client_ca_cert_dir_path);
+
+      // Set client CA list to be sent to clients during TLS handshake
+      if (client_ca_cert_file_path) {
+        auto ca_list = SSL_load_client_CA_file(client_ca_cert_file_path);
+        if (ca_list != nullptr) {
+          SSL_CTX_set_client_CA_list(ctx_, ca_list);
+        } else {
+          // Failed to load client CA list, but we continue since
+          // SSL_CTX_load_verify_locations already succeeded and
+          // certificate verification will still work
+          last_ssl_error_ = static_cast<int>(ERR_get_error());
+        }
+      }
 
-    // Log
-    if (logger_) {
-        logger_(req, res);
+      SSL_CTX_set_verify(
+          ctx_, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, nullptr);
     }
+  }
 }
 
-inline bool Server::handle_file_request(Request& req, Response& res)
-{
-    if (!base_dir_.empty() && detail::is_valid_path(req.path)) {
-        std::string path = base_dir_ + req.path;
+inline SSLServer::SSLServer(X509 *cert, EVP_PKEY *private_key,
+                            X509_STORE *client_ca_cert_store) {
+  ctx_ = SSL_CTX_new(TLS_server_method());
 
-        if (!path.empty() && path.back() == '/') {
-            path += "index.html";
-        }
+  if (ctx_) {
+    SSL_CTX_set_options(ctx_,
+                        SSL_OP_NO_COMPRESSION |
+                            SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);
 
-        if (detail::is_file(path)) {
-            detail::read_file(path, res.body);
-            auto type = detail::find_content_type(path);
-            if (type) {
-                res.set_header("Content-Type", type);
-            }
-            res.status = 200;
-            return true;
-        }
+    SSL_CTX_set_min_proto_version(ctx_, TLS1_2_VERSION);
+
+    if (SSL_CTX_use_certificate(ctx_, cert) != 1 ||
+        SSL_CTX_use_PrivateKey(ctx_, private_key) != 1) {
+      SSL_CTX_free(ctx_);
+      ctx_ = nullptr;
+    } else if (client_ca_cert_store) {
+      SSL_CTX_set_cert_store(ctx_, client_ca_cert_store);
+
+      // Extract CA names from the store and set them as the client CA list
+      auto ca_list = extract_ca_names_from_x509_store(client_ca_cert_store);
+      if (ca_list) {
+        SSL_CTX_set_client_CA_list(ctx_, ca_list);
+      } else {
+        // Failed to extract CA names, record the error
+        last_ssl_error_ = static_cast<int>(ERR_get_error());
+      }
+
+      SSL_CTX_set_verify(
+          ctx_, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, nullptr);
     }
+  }
+}
 
-    return false;
+inline SSLServer::SSLServer(
+    const std::function<bool(SSL_CTX &ssl_ctx)> &setup_ssl_ctx_callback) {
+  ctx_ = SSL_CTX_new(TLS_method());
+  if (ctx_) {
+    if (!setup_ssl_ctx_callback(*ctx_)) {
+      SSL_CTX_free(ctx_);
+      ctx_ = nullptr;
+    }
+  }
 }
 
-inline socket_t Server::create_server_socket(const char* host, int port, int socket_flags) const
-{
-    return detail::create_socket(host, port,
-        [](socket_t sock, struct addrinfo& ai) -> bool {
-            if (::bind(sock, ai.ai_addr, ai.ai_addrlen)) {
-                  return false;
-            }
-            if (::listen(sock, 5)) { // Listen through 5 channels
-                return false;
-            }
-            return true;
-        }, socket_flags);
+inline SSLServer::~SSLServer() {
+  if (ctx_) { SSL_CTX_free(ctx_); }
 }
 
-inline int Server::bind_internal(const char* host, int port, int socket_flags)
-{
-    if (!is_valid()) {
-        return -1;
-    }
+inline bool SSLServer::is_valid() const { return ctx_; }
 
-    svr_sock_ = create_server_socket(host, port, socket_flags);
-    if (svr_sock_ == INVALID_SOCKET) {
-        return -1;
-    }
+inline SSL_CTX *SSLServer::ssl_context() const { return ctx_; }
 
-    if (port == 0) {
-        struct sockaddr_storage address;
-        socklen_t len = sizeof(address);
-        if (getsockname(svr_sock_, reinterpret_cast<struct sockaddr *>(&address), &len) == -1) {
-            return -1;
-        }
-        if (address.ss_family == AF_INET) {
-          return ntohs(reinterpret_cast<struct sockaddr_in*>(&address)->sin_port);
-        } else if (address.ss_family == AF_INET6) {
-          return ntohs(reinterpret_cast<struct sockaddr_in6*>(&address)->sin6_port);
-        } else {
-          return -1;
-        }
-    } else {
-        return port;
-    }
+inline void SSLServer::update_certs(X509 *cert, EVP_PKEY *private_key,
+                                    X509_STORE *client_ca_cert_store) {
+
+  std::lock_guard<std::mutex> guard(ctx_mutex_);
+
+  SSL_CTX_use_certificate(ctx_, cert);
+  SSL_CTX_use_PrivateKey(ctx_, private_key);
+
+  if (client_ca_cert_store != nullptr) {
+    SSL_CTX_set_cert_store(ctx_, client_ca_cert_store);
+  }
 }
 
-inline bool Server::listen_internal()
-{
-    auto ret = true;
+inline bool SSLServer::process_and_close_socket(socket_t sock) {
+  auto ssl = detail::ssl_new(
+      sock, ctx_, ctx_mutex_,
+      [&](SSL *ssl2) {
+        return detail::ssl_connect_or_accept_nonblocking(
+            sock, ssl2, SSL_accept, read_timeout_sec_, read_timeout_usec_,
+            &last_ssl_error_);
+      },
+      [](SSL * /*ssl2*/) { return true; });
+
+  auto ret = false;
+  if (ssl) {
+    std::string remote_addr;
+    int remote_port = 0;
+    detail::get_remote_ip_and_port(sock, remote_addr, remote_port);
+
+    std::string local_addr;
+    int local_port = 0;
+    detail::get_local_ip_and_port(sock, local_addr, local_port);
+
+    ret = detail::process_server_socket_ssl(
+        svr_sock_, ssl, sock, keep_alive_max_count_, keep_alive_timeout_sec_,
+        read_timeout_sec_, read_timeout_usec_, write_timeout_sec_,
+        write_timeout_usec_,
+        [&](Stream &strm, bool close_connection, bool &connection_closed) {
+          return process_request(strm, remote_addr, remote_port, local_addr,
+                                 local_port, close_connection,
+                                 connection_closed,
+                                 [&](Request &req) { req.ssl = ssl; });
+        });
 
-    is_running_ = true;
+    // Shutdown gracefully if the result seemed successful, non-gracefully if
+    // the connection appeared to be closed.
+    const bool shutdown_gracefully = ret;
+    detail::ssl_delete(ctx_mutex_, ssl, sock, shutdown_gracefully);
+  }
 
-    for (;;) {
-        auto val = detail::select_read(svr_sock_, 0, 100000);
+  detail::shutdown_socket(sock);
+  detail::close_socket(sock);
+  return ret;
+}
 
-        if (val == 0) { // Timeout
-            if (svr_sock_ == INVALID_SOCKET) {
-                // The server socket was closed by 'stop' method.
-                break;
-            }
-            continue;
-        }
+inline STACK_OF(X509_NAME) * SSLServer::extract_ca_names_from_x509_store(
+                                 X509_STORE *store) {
+  if (!store) { return nullptr; }
 
-        socket_t sock = accept(svr_sock_, NULL, NULL);
+  auto ca_list = sk_X509_NAME_new_null();
+  if (!ca_list) { return nullptr; }
 
-        if (sock == INVALID_SOCKET) {
-            if (svr_sock_ != INVALID_SOCKET) {
-                detail::close_socket(svr_sock_);
-                ret = false;
-            } else {
-                ; // The server socket was closed by user.
-            }
-            break;
+  // Get all objects from the store
+  auto objs = X509_STORE_get0_objects(store);
+  if (!objs) {
+    sk_X509_NAME_free(ca_list);
+    return nullptr;
+  }
+
+  // Iterate through objects and extract certificate subject names
+  auto count = sk_X509_OBJECT_num(objs);
+  for (decltype(count) i = 0; i < count; i++) {
+    auto obj = sk_X509_OBJECT_value(objs, i);
+    if (X509_OBJECT_get_type(obj) == X509_LU_X509) {
+      auto cert = X509_OBJECT_get0_X509(obj);
+      if (cert) {
+        auto subject = X509_get_subject_name(cert);
+        if (subject) {
+          auto name_dup = X509_NAME_dup(subject);
+          if (name_dup) { sk_X509_NAME_push(ca_list, name_dup); }
         }
+      }
+    }
+  }
+
+  // If no names were extracted, free the list and return nullptr
+  if (sk_X509_NAME_num(ca_list) == 0) {
+    sk_X509_NAME_free(ca_list);
+    return nullptr;
+  }
 
-        // TODO: Use thread pool...
-        std::thread([=]() {
-            {
-                std::lock_guard<std::mutex> guard(running_threads_mutex_);
-                running_threads_++;
-            }
+  return ca_list;
+}
 
-            read_and_close_socket(sock);
+// SSL HTTP client implementation
+inline SSLClient::SSLClient(const std::string &host)
+    : SSLClient(host, 443, std::string(), std::string()) {}
+
+inline SSLClient::SSLClient(const std::string &host, int port)
+    : SSLClient(host, port, std::string(), std::string()) {}
+
+inline SSLClient::SSLClient(const std::string &host, int port,
+                            const std::string &client_cert_path,
+                            const std::string &client_key_path,
+                            const std::string &private_key_password)
+    : ClientImpl(host, port, client_cert_path, client_key_path) {
+  ctx_ = SSL_CTX_new(TLS_client_method());
+
+  SSL_CTX_set_min_proto_version(ctx_, TLS1_2_VERSION);
+
+  detail::split(&host_[0], &host_[host_.size()], '.',
+                [&](const char *b, const char *e) {
+                  host_components_.emplace_back(b, e);
+                });
+
+  if (!client_cert_path.empty() && !client_key_path.empty()) {
+    if (!private_key_password.empty()) {
+      SSL_CTX_set_default_passwd_cb_userdata(
+          ctx_, reinterpret_cast<void *>(
+                    const_cast<char *>(private_key_password.c_str())));
+    }
 
-            {
-                std::lock_guard<std::mutex> guard(running_threads_mutex_);
-                running_threads_--;
-            }
-        }).detach();
+    if (SSL_CTX_use_certificate_file(ctx_, client_cert_path.c_str(),
+                                     SSL_FILETYPE_PEM) != 1 ||
+        SSL_CTX_use_PrivateKey_file(ctx_, client_key_path.c_str(),
+                                    SSL_FILETYPE_PEM) != 1) {
+      last_openssl_error_ = ERR_get_error();
+      SSL_CTX_free(ctx_);
+      ctx_ = nullptr;
     }
+  }
+}
 
-    // TODO: Use thread pool...
-    for (;;) {
-        std::this_thread::sleep_for(std::chrono::milliseconds(10));
-        std::lock_guard<std::mutex> guard(running_threads_mutex_);
-        if (!running_threads_) {
-            break;
-        }
+inline SSLClient::SSLClient(const std::string &host, int port,
+                            X509 *client_cert, EVP_PKEY *client_key,
+                            const std::string &private_key_password)
+    : ClientImpl(host, port) {
+  ctx_ = SSL_CTX_new(TLS_client_method());
+
+  detail::split(&host_[0], &host_[host_.size()], '.',
+                [&](const char *b, const char *e) {
+                  host_components_.emplace_back(b, e);
+                });
+
+  if (client_cert != nullptr && client_key != nullptr) {
+    if (!private_key_password.empty()) {
+      SSL_CTX_set_default_passwd_cb_userdata(
+          ctx_, reinterpret_cast<void *>(
+                    const_cast<char *>(private_key_password.c_str())));
     }
 
-    is_running_ = false;
+    if (SSL_CTX_use_certificate(ctx_, client_cert) != 1 ||
+        SSL_CTX_use_PrivateKey(ctx_, client_key) != 1) {
+      last_openssl_error_ = ERR_get_error();
+      SSL_CTX_free(ctx_);
+      ctx_ = nullptr;
+    }
+  }
+}
 
-    return ret;
+inline SSLClient::~SSLClient() {
+  if (ctx_) { SSL_CTX_free(ctx_); }
+  // Make sure to shut down SSL since shutdown_ssl will resolve to the
+  // base function rather than the derived function once we get to the
+  // base class destructor, and won't free the SSL (causing a leak).
+  shutdown_ssl_impl(socket_, true);
 }
 
-inline bool Server::routing(Request& req, Response& res)
-{
-    if (req.method == "GET" && handle_file_request(req, res)) {
-        return true;
-    }
+inline bool SSLClient::is_valid() const { return ctx_; }
 
-    if (req.method == "GET" || req.method == "HEAD") {
-        return dispatch_request(req, res, get_handlers_);
-    } else if (req.method == "POST") {
-        return dispatch_request(req, res, post_handlers_);
-    } else if (req.method == "PUT") {
-        return dispatch_request(req, res, put_handlers_);
-    } else if (req.method == "DELETE") {
-        return dispatch_request(req, res, delete_handlers_);
-    } else if (req.method == "OPTIONS") {
-        return dispatch_request(req, res, options_handlers_);
+inline void SSLClient::set_ca_cert_store(X509_STORE *ca_cert_store) {
+  if (ca_cert_store) {
+    if (ctx_) {
+      if (SSL_CTX_get_cert_store(ctx_) != ca_cert_store) {
+        // Free memory allocated for old cert and use new store
+        // `ca_cert_store`
+        SSL_CTX_set_cert_store(ctx_, ca_cert_store);
+        ca_cert_store_ = ca_cert_store;
+      }
+    } else {
+      X509_STORE_free(ca_cert_store);
     }
+  }
+}
+
+inline void SSLClient::load_ca_cert_store(const char *ca_cert,
+                                          std::size_t size) {
+  set_ca_cert_store(ClientImpl::create_ca_cert_store(ca_cert, size));
+}
+
+inline long SSLClient::get_openssl_verify_result() const {
+  return verify_result_;
+}
+
+inline SSL_CTX *SSLClient::ssl_context() const { return ctx_; }
+
+inline bool SSLClient::create_and_connect_socket(Socket &socket, Error &error) {
+  if (!is_valid()) {
+    error = Error::SSLConnection;
     return false;
+  }
+  return ClientImpl::create_and_connect_socket(socket, error);
 }
 
-inline bool Server::dispatch_request(Request& req, Response& res, Handlers& handlers)
-{
-    for (const auto& x: handlers) {
-        const auto& pattern = x.first;
-        const auto& handler = x.second;
+// Assumes that socket_mutex_ is locked and that there are no requests in
+// flight
+inline bool SSLClient::connect_with_proxy(
+    Socket &socket,
+    std::chrono::time_point<std::chrono::steady_clock> start_time,
+    Response &res, bool &success, Error &error) {
+  success = true;
+  Response proxy_res;
+  if (!detail::process_client_socket(
+          socket.sock, read_timeout_sec_, read_timeout_usec_,
+          write_timeout_sec_, write_timeout_usec_, max_timeout_msec_,
+          start_time, [&](Stream &strm) {
+            Request req2;
+            req2.method = "CONNECT";
+            req2.path = host_and_port_;
+            if (max_timeout_msec_ > 0) {
+              req2.start_time_ = std::chrono::steady_clock::now();
+            }
+            return process_request(strm, req2, proxy_res, false, error);
+          })) {
+    // Thread-safe to close everything because we are assuming there are no
+    // requests in flight
+    shutdown_ssl(socket, true);
+    shutdown_socket(socket);
+    close_socket(socket);
+    success = false;
+    return false;
+  }
+
+  if (proxy_res.status == StatusCode::ProxyAuthenticationRequired_407) {
+    if (!proxy_digest_auth_username_.empty() &&
+        !proxy_digest_auth_password_.empty()) {
+      std::map<std::string, std::string> auth;
+      if (detail::parse_www_authenticate(proxy_res, auth, true)) {
+        // Close the current socket and create a new one for the authenticated
+        // request
+        shutdown_ssl(socket, true);
+        shutdown_socket(socket);
+        close_socket(socket);
+
+        // Create a new socket for the authenticated CONNECT request
+        if (!create_and_connect_socket(socket, error)) {
+          success = false;
+          output_error_log(error, nullptr);
+          return false;
+        }
 
-        if (std::regex_match(req.path, req.matches, pattern)) {
-            handler(req, res);
-            return true;
+        proxy_res = Response();
+        if (!detail::process_client_socket(
+                socket.sock, read_timeout_sec_, read_timeout_usec_,
+                write_timeout_sec_, write_timeout_usec_, max_timeout_msec_,
+                start_time, [&](Stream &strm) {
+                  Request req3;
+                  req3.method = "CONNECT";
+                  req3.path = host_and_port_;
+                  req3.headers.insert(detail::make_digest_authentication_header(
+                      req3, auth, 1, detail::random_string(10),
+                      proxy_digest_auth_username_, proxy_digest_auth_password_,
+                      true));
+                  if (max_timeout_msec_ > 0) {
+                    req3.start_time_ = std::chrono::steady_clock::now();
+                  }
+                  return process_request(strm, req3, proxy_res, false, error);
+                })) {
+          // Thread-safe to close everything because we are assuming there are
+          // no requests in flight
+          shutdown_ssl(socket, true);
+          shutdown_socket(socket);
+          close_socket(socket);
+          success = false;
+          return false;
         }
+      }
     }
+  }
+
+  // If status code is not 200, proxy request is failed.
+  // Set error to ProxyConnection and return proxy response
+  // as the response of the request
+  if (proxy_res.status != StatusCode::OK_200) {
+    error = Error::ProxyConnection;
+    output_error_log(error, nullptr);
+    res = std::move(proxy_res);
+    // Thread-safe to close everything because we are assuming there are
+    // no requests in flight
+    shutdown_ssl(socket, true);
+    shutdown_socket(socket);
+    close_socket(socket);
     return false;
+  }
+
+  return true;
 }
 
-inline bool Server::process_request(Stream& strm, bool last_connection, bool& connection_close)
-{
-    const auto bufsiz = 2048;
-    char buf[bufsiz];
+inline bool SSLClient::load_certs() {
+  auto ret = true;
+
+  std::call_once(initialize_cert_, [&]() {
+    std::lock_guard<std::mutex> guard(ctx_mutex_);
+    if (!ca_cert_file_path_.empty()) {
+      if (!SSL_CTX_load_verify_locations(ctx_, ca_cert_file_path_.c_str(),
+                                         nullptr)) {
+        last_openssl_error_ = ERR_get_error();
+        ret = false;
+      }
+    } else if (!ca_cert_dir_path_.empty()) {
+      if (!SSL_CTX_load_verify_locations(ctx_, nullptr,
+                                         ca_cert_dir_path_.c_str())) {
+        last_openssl_error_ = ERR_get_error();
+        ret = false;
+      }
+    } else {
+      auto loaded = false;
+#ifdef _WIN32
+      loaded =
+          detail::load_system_certs_on_windows(SSL_CTX_get_cert_store(ctx_));
+#elif defined(CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN) && TARGET_OS_MAC
+      loaded = detail::load_system_certs_on_macos(SSL_CTX_get_cert_store(ctx_));
+#endif // _WIN32
+      if (!loaded) { SSL_CTX_set_default_verify_paths(ctx_); }
+    }
+  });
 
-    detail::stream_line_reader reader(strm, buf, bufsiz);
+  return ret;
+}
 
-    // Connection has been closed on client
-    if (!reader.getline()) {
-        return false;
-    }
+inline bool SSLClient::initialize_ssl(Socket &socket, Error &error) {
+  auto ssl = detail::ssl_new(
+      socket.sock, ctx_, ctx_mutex_,
+      [&](SSL *ssl2) {
+        if (server_certificate_verification_) {
+          if (!load_certs()) {
+            error = Error::SSLLoadingCerts;
+            output_error_log(error, nullptr);
+            return false;
+          }
+          SSL_set_verify(ssl2, SSL_VERIFY_NONE, nullptr);
+        }
 
-    Request req;
-    Response res;
+        if (!detail::ssl_connect_or_accept_nonblocking(
+                socket.sock, ssl2, SSL_connect, connection_timeout_sec_,
+                connection_timeout_usec_, &last_ssl_error_)) {
+          error = Error::SSLConnection;
+          output_error_log(error, nullptr);
+          return false;
+        }
 
-    res.version = "HTTP/1.1";
+        if (server_certificate_verification_) {
+          auto verification_status = SSLVerifierResponse::NoDecisionMade;
 
-    // Request line and headers
-    if (!parse_request_line(reader.ptr(), req) || !detail::read_headers(strm, req.headers)) {
-        res.status = 400;
-        write_response(strm, last_connection, req, res);
-        return true;
-    }
+          if (server_certificate_verifier_) {
+            verification_status = server_certificate_verifier_(ssl2);
+          }
 
-    auto ret = true;
-    if (req.get_header_value("Connection") == "close") {
-        // ret = false;
-        connection_close = true;
-    }
+          if (verification_status == SSLVerifierResponse::CertificateRejected) {
+            last_openssl_error_ = ERR_get_error();
+            error = Error::SSLServerVerification;
+            output_error_log(error, nullptr);
+            return false;
+          }
 
-    req.set_header("REMOTE_ADDR", strm.get_remote_addr().c_str());
+          if (verification_status == SSLVerifierResponse::NoDecisionMade) {
+            verify_result_ = SSL_get_verify_result(ssl2);
 
-    // Body
-    if (req.method == "POST" || req.method == "PUT") {
-        if (!detail::read_content(strm, req)) {
-            res.status = 400;
-            write_response(strm, last_connection, req, res);
-            return ret;
-        }
+            if (verify_result_ != X509_V_OK) {
+              last_openssl_error_ = static_cast<unsigned long>(verify_result_);
+              error = Error::SSLServerVerification;
+              output_error_log(error, nullptr);
+              return false;
+            }
 
-        const auto& content_type = req.get_header_value("Content-Type");
+            auto server_cert = SSL_get1_peer_certificate(ssl2);
+            auto se = detail::scope_exit([&] { X509_free(server_cert); });
 
-        if (req.get_header_value("Content-Encoding") == "gzip") {
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-            detail::decompress(req.body);
-#else
-            res.status = 415;
-            write_response(strm, last_connection, req, res);
-            return ret;
-#endif
-        }
+            if (server_cert == nullptr) {
+              last_openssl_error_ = ERR_get_error();
+              error = Error::SSLServerVerification;
+              output_error_log(error, nullptr);
+              return false;
+            }
 
-        if (!content_type.find("application/x-www-form-urlencoded")) {
-            detail::parse_query_text(req.body, req.params);
-        } else if(!content_type.find("multipart/form-data")) {
-            std::string boundary;
-            if (!detail::parse_multipart_boundary(content_type, boundary) ||
-                !detail::parse_multipart_formdata(boundary, req.body, req.files)) {
-                res.status = 400;
-                write_response(strm, last_connection, req, res);
-                return ret;
+            if (server_hostname_verification_) {
+              if (!verify_host(server_cert)) {
+                last_openssl_error_ = X509_V_ERR_HOSTNAME_MISMATCH;
+                error = Error::SSLServerHostnameVerification;
+                output_error_log(error, nullptr);
+                return false;
+              }
             }
+          }
         }
-    }
 
-    if (routing(req, res)) {
-        if (res.status == -1) {
-            res.status = 200;
+        return true;
+      },
+      [&](SSL *ssl2) {
+        // Set SNI only if host is not IP address
+        if (!detail::is_ip_address(host_)) {
+#if defined(OPENSSL_IS_BORINGSSL)
+          SSL_set_tlsext_host_name(ssl2, host_.c_str());
+#else
+          // NOTE: Direct call instead of using the OpenSSL macro to suppress
+          // -Wold-style-cast warning
+          SSL_ctrl(ssl2, SSL_CTRL_SET_TLSEXT_HOSTNAME,
+                   TLSEXT_NAMETYPE_host_name,
+                   static_cast<void *>(const_cast<char *>(host_.c_str())));
+#endif
         }
-    } else {
-        res.status = 404;
-    }
-
-    write_response(strm, last_connection, req, res);
-    return ret;
-}
+        return true;
+      });
 
-inline bool Server::is_valid() const
-{
+  if (ssl) {
+    socket.ssl = ssl;
     return true;
-}
+  }
 
-inline bool Server::read_and_close_socket(socket_t sock)
-{
-    return detail::read_and_close_socket(
-        sock,
-        keep_alive_max_count_,
-        [this](Stream& strm, bool last_connection, bool& connection_close) {
-            return process_request(strm, last_connection, connection_close);
-        });
-}
+  if (ctx_ == nullptr) {
+    error = Error::SSLConnection;
+    last_openssl_error_ = ERR_get_error();
+  }
 
-// HTTP client implementation
-inline Client::Client(
-    const char* host, int port, size_t timeout_sec)
-    : host_(host)
-    , port_(port)
-    , timeout_sec_(timeout_sec)
-    , host_and_port_(host_ + ":" + std::to_string(port_))
-{
+  shutdown_socket(socket);
+  close_socket(socket);
+  return false;
 }
 
-inline Client::~Client()
-{
+inline void SSLClient::shutdown_ssl(Socket &socket, bool shutdown_gracefully) {
+  shutdown_ssl_impl(socket, shutdown_gracefully);
 }
 
-inline bool Client::is_valid() const
-{
-    return true;
+inline void SSLClient::shutdown_ssl_impl(Socket &socket,
+                                         bool shutdown_gracefully) {
+  if (socket.sock == INVALID_SOCKET) {
+    assert(socket.ssl == nullptr);
+    return;
+  }
+  if (socket.ssl) {
+    detail::ssl_delete(ctx_mutex_, socket.ssl, socket.sock,
+                       shutdown_gracefully);
+    socket.ssl = nullptr;
+  }
+  assert(socket.ssl == nullptr);
 }
 
-inline socket_t Client::create_client_socket() const
-{
-    return detail::create_socket(host_.c_str(), port_,
-        [=](socket_t sock, struct addrinfo& ai) -> bool {
-            detail::set_nonblocking(sock, true);
-
-            auto ret = connect(sock, ai.ai_addr, ai.ai_addrlen);
-            if (ret < 0) {
-                if (detail::is_connection_error() ||
-                    !detail::wait_until_socket_is_ready(sock, timeout_sec_, 0)) {
-                    detail::close_socket(sock);
-                    return false;
-                }
-            }
-
-            detail::set_nonblocking(sock, false);
-            return true;
-        });
+inline bool SSLClient::process_socket(
+    const Socket &socket,
+    std::chrono::time_point<std::chrono::steady_clock> start_time,
+    std::function<bool(Stream &strm)> callback) {
+  assert(socket.ssl);
+  return detail::process_client_socket_ssl(
+      socket.ssl, socket.sock, read_timeout_sec_, read_timeout_usec_,
+      write_timeout_sec_, write_timeout_usec_, max_timeout_msec_, start_time,
+      std::move(callback));
 }
 
-inline bool Client::read_response_line(Stream& strm, Response& res)
-{
-    const auto bufsiz = 2048;
-    char buf[bufsiz];
+inline bool SSLClient::is_ssl() const { return true; }
 
-    detail::stream_line_reader reader(strm, buf, bufsiz);
+inline bool SSLClient::verify_host(X509 *server_cert) const {
+  /* Quote from RFC2818 section 3.1 "Server Identity"
 
-    if (!reader.getline()) {
-        return false;
-    }
+     If a subjectAltName extension of type dNSName is present, that MUST
+     be used as the identity. Otherwise, the (most specific) Common Name
+     field in the Subject field of the certificate MUST be used. Although
+     the use of the Common Name is existing practice, it is deprecated and
+     Certification Authorities are encouraged to use the dNSName instead.
 
-    const static std::regex re("(HTTP/1\\.[01]) (\\d+?) .+\r\n");
+     Matching is performed using the matching rules specified by
+     [RFC2459].  If more than one identity of a given type is present in
+     the certificate (e.g., more than one dNSName name, a match in any one
+     of the set is considered acceptable.) Names may contain the wildcard
+     character * which is considered to match any single domain name
+     component or component fragment. E.g., *.a.com matches foo.a.com but
+     not bar.foo.a.com. f*.com matches foo.com but not bar.com.
 
-    std::cmatch m;
-    if (std::regex_match(reader.ptr(), m, re)) {
-        res.version = std::string(m[1]);
-        res.status = std::stoi(std::string(m[2]));
-    }
+     In some cases, the URI is specified as an IP address rather than a
+     hostname. In this case, the iPAddress subjectAltName must be present
+     in the certificate and must exactly match the IP in the URI.
 
-    return true;
+  */
+  return verify_host_with_subject_alt_name(server_cert) ||
+         verify_host_with_common_name(server_cert);
 }
 
-inline bool Client::send(Request& req, Response& res)
-{
-    if (req.path.empty()) {
-        return false;
-    }
-
-    auto sock = create_client_socket();
-    if (sock == INVALID_SOCKET) {
-        return false;
-    }
+inline bool
+SSLClient::verify_host_with_subject_alt_name(X509 *server_cert) const {
+  auto ret = false;
 
-    return read_and_close_socket(sock, req, res);
-}
+  auto type = GEN_DNS;
 
-inline void Client::write_request(Stream& strm, Request& req)
-{
-    auto path = detail::encode_url(req.path);
+  struct in6_addr addr6 = {};
+  struct in_addr addr = {};
+  size_t addr_len = 0;
 
-    // Request line
-    strm.write_format("%s %s HTTP/1.1\r\n",
-        req.method.c_str(),
-        path.c_str());
+#ifndef __MINGW32__
+  if (inet_pton(AF_INET6, host_.c_str(), &addr6)) {
+    type = GEN_IPADD;
+    addr_len = sizeof(struct in6_addr);
+  } else if (inet_pton(AF_INET, host_.c_str(), &addr)) {
+    type = GEN_IPADD;
+    addr_len = sizeof(struct in_addr);
+  }
+#endif
 
-    // Headers
-    req.set_header("Host", host_and_port_.c_str());
+  auto alt_names = static_cast<const struct stack_st_GENERAL_NAME *>(
+      X509_get_ext_d2i(server_cert, NID_subject_alt_name, nullptr, nullptr));
 
-    if (!req.has_header("Accept")) {
-        req.set_header("Accept", "*/*");
-    }
+  if (alt_names) {
+    auto dsn_matched = false;
+    auto ip_matched = false;
 
-    if (!req.has_header("User-Agent")) {
-        req.set_header("User-Agent", "cpp-httplib/0.2");
-    }
+    auto count = sk_GENERAL_NAME_num(alt_names);
 
-    // TODO: Support KeepAlive connection
-    // if (!req.has_header("Connection")) {
-        req.set_header("Connection", "close");
-    // }
+    for (decltype(count) i = 0; i < count && !dsn_matched; i++) {
+      auto val = sk_GENERAL_NAME_value(alt_names, i);
+      if (!val || val->type != type) { continue; }
 
-    if (!req.body.empty()) {
-        if (!req.has_header("Content-Type")) {
-            req.set_header("Content-Type", "text/plain");
-        }
+      auto name =
+          reinterpret_cast<const char *>(ASN1_STRING_get0_data(val->d.ia5));
+      if (name == nullptr) { continue; }
 
-        auto length = std::to_string(req.body.size());
-        req.set_header("Content-Length", length.c_str());
-    }
+      auto name_len = static_cast<size_t>(ASN1_STRING_length(val->d.ia5));
 
-    detail::write_headers(strm, req);
+      switch (type) {
+      case GEN_DNS: dsn_matched = check_host_name(name, name_len); break;
 
-    // Body
-    if (!req.body.empty()) {
-        if (req.get_header_value("Content-Type") == "application/x-www-form-urlencoded") {
-            auto str = detail::encode_url(req.body);
-            strm.write(str.c_str(), str.size());
-        } else {
-            strm.write(req.body.c_str(), req.body.size());
+      case GEN_IPADD:
+        if (!memcmp(&addr6, name, addr_len) || !memcmp(&addr, name, addr_len)) {
+          ip_matched = true;
         }
+        break;
+      }
     }
-}
 
-inline bool Client::process_request(Stream& strm, Request& req, Response& res, bool& connection_close)
-{
-    // Send request
-    write_request(strm, req);
+    if (dsn_matched || ip_matched) { ret = true; }
+  }
 
-    // Receive response and headers
-    if (!read_response_line(strm, res) || !detail::read_headers(strm, res.headers)) {
-        return false;
-    }
+  GENERAL_NAMES_free(const_cast<STACK_OF(GENERAL_NAME) *>(
+      reinterpret_cast<const STACK_OF(GENERAL_NAME) *>(alt_names)));
+  return ret;
+}
 
-    if (res.get_header_value("Connection") == "close" || res.version == "HTTP/1.0") {
-        connection_close = true;
-    }
+inline bool SSLClient::verify_host_with_common_name(X509 *server_cert) const {
+  const auto subject_name = X509_get_subject_name(server_cert);
 
-    // Body
-    if (req.method != "HEAD") {
-        if (!detail::read_content(strm, res, req.progress)) {
-            return false;
-        }
+  if (subject_name != nullptr) {
+    char name[BUFSIZ];
+    auto name_len = X509_NAME_get_text_by_NID(subject_name, NID_commonName,
+                                              name, sizeof(name));
 
-        if (res.get_header_value("Content-Encoding") == "gzip") {
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-            detail::decompress(res.body);
-#else
-            return false;
-#endif
-        }
+    if (name_len != -1) {
+      return check_host_name(name, static_cast<size_t>(name_len));
     }
+  }
 
-    return true;
+  return false;
 }
 
-inline bool Client::read_and_close_socket(socket_t sock, Request& req, Response& res)
-{
-    return detail::read_and_close_socket(
-        sock,
-        0,
-        [&](Stream& strm, bool /*last_connection*/, bool& connection_close) {
-            return process_request(strm, req, res, connection_close);
-        });
-}
+inline bool SSLClient::check_host_name(const char *pattern,
+                                       size_t pattern_len) const {
+  if (host_.size() == pattern_len && host_ == pattern) { return true; }
+
+  // Wildcard match
+  // https://bugs.launchpad.net/ubuntu/+source/firefox-3.0/+bug/376484
+  std::vector<std::string> pattern_components;
+  detail::split(&pattern[0], &pattern[pattern_len], '.',
+                [&](const char *b, const char *e) {
+                  pattern_components.emplace_back(b, e);
+                });
+
+  if (host_components_.size() != pattern_components.size()) { return false; }
+
+  auto itr = pattern_components.begin();
+  for (const auto &h : host_components_) {
+    auto &p = *itr;
+    if (p != h && p != "*") {
+      auto partial_match = (p.size() > 0 && p[p.size() - 1] == '*' &&
+                            !p.compare(0, p.size() - 1, h));
+      if (!partial_match) { return false; }
+    }
+    ++itr;
+  }
 
-inline std::shared_ptr<Response> Client::Get(const char* path, Progress progress)
-{
-    return Get(path, Headers(), progress);
+  return true;
 }
+#endif
 
-inline std::shared_ptr<Response> Client::Get(const char* path, const Headers& headers, Progress progress)
-{
-    Request req;
-    req.method = "GET";
-    req.path = path;
-    req.headers = headers;
-    req.progress = progress;
+// Universal client implementation
+inline Client::Client(const std::string &scheme_host_port)
+    : Client(scheme_host_port, std::string(), std::string()) {}
 
-    auto res = std::make_shared<Response>();
+inline Client::Client(const std::string &scheme_host_port,
+                      const std::string &client_cert_path,
+                      const std::string &client_key_path) {
+  const static std::regex re(
+      R"((?:([a-z]+):\/\/)?(?:\[([a-fA-F\d:]+)\]|([^:/?#]+))(?::(\d+))?)");
 
-    return send(req, *res) ? res : nullptr;
-}
+  std::smatch m;
+  if (std::regex_match(scheme_host_port, m, re)) {
+    auto scheme = m[1].str();
 
-inline std::shared_ptr<Response> Client::Head(const char* path)
-{
-    return Head(path, Headers());
-}
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+    if (!scheme.empty() && (scheme != "http" && scheme != "https")) {
+#else
+    if (!scheme.empty() && scheme != "http") {
+#endif
+#ifndef CPPHTTPLIB_NO_EXCEPTIONS
+      std::string msg = "'" + scheme + "' scheme is not supported.";
+      throw std::invalid_argument(msg);
+#endif
+      return;
+    }
 
-inline std::shared_ptr<Response> Client::Head(const char* path, const Headers& headers)
-{
-    Request req;
-    req.method = "HEAD";
-    req.headers = headers;
-    req.path = path;
+    auto is_ssl = scheme == "https";
 
-    auto res = std::make_shared<Response>();
+    auto host = m[2].str();
+    if (host.empty()) { host = m[3].str(); }
 
-    return send(req, *res) ? res : nullptr;
-}
+    auto port_str = m[4].str();
+    auto port = !port_str.empty() ? std::stoi(port_str) : (is_ssl ? 443 : 80);
 
-inline std::shared_ptr<Response> Client::Post(
-    const char* path, const std::string& body, const char* content_type)
-{
-    return Post(path, Headers(), body, content_type);
-}
+    if (is_ssl) {
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+      cli_ = detail::make_unique<SSLClient>(host, port, client_cert_path,
+                                            client_key_path);
+      is_ssl_ = is_ssl;
+#endif
+    } else {
+      cli_ = detail::make_unique<ClientImpl>(host, port, client_cert_path,
+                                             client_key_path);
+    }
+  } else {
+    // NOTE: Update TEST(UniversalClientImplTest, Ipv6LiteralAddress)
+    // if port param below changes.
+    cli_ = detail::make_unique<ClientImpl>(scheme_host_port, 80,
+                                           client_cert_path, client_key_path);
+  }
+} // namespace detail
 
-inline std::shared_ptr<Response> Client::Post(
-    const char* path, const Headers& headers, const std::string& body, const char* content_type)
-{
-    Request req;
-    req.method = "POST";
-    req.headers = headers;
-    req.path = path;
+inline Client::Client(const std::string &host, int port)
+    : cli_(detail::make_unique<ClientImpl>(host, port)) {}
 
-    req.headers.emplace("Content-Type", content_type);
-    req.body = body;
+inline Client::Client(const std::string &host, int port,
+                      const std::string &client_cert_path,
+                      const std::string &client_key_path)
+    : cli_(detail::make_unique<ClientImpl>(host, port, client_cert_path,
+                                           client_key_path)) {}
 
-    auto res = std::make_shared<Response>();
+inline Client::~Client() = default;
 
-    return send(req, *res) ? res : nullptr;
+inline bool Client::is_valid() const {
+  return cli_ != nullptr && cli_->is_valid();
 }
 
-inline std::shared_ptr<Response> Client::Post(const char* path, const Params& params)
-{
-    return Post(path, Headers(), params);
+inline Result Client::Get(const std::string &path, DownloadProgress progress) {
+  return cli_->Get(path, std::move(progress));
 }
-
-inline std::shared_ptr<Response> Client::Post(const char* path, const Headers& headers, const Params& params)
-{
-    std::string query;
-    for (auto it = params.begin(); it != params.end(); ++it) {
-        if (it != params.begin()) {
-            query += "&";
-        }
-        query += it->first;
-        query += "=";
-        query += it->second;
-    }
-
-    return Post(path, headers, query, "application/x-www-form-urlencoded");
+inline Result Client::Get(const std::string &path, const Headers &headers,
+                          DownloadProgress progress) {
+  return cli_->Get(path, headers, std::move(progress));
 }
-
-inline std::shared_ptr<Response> Client::Put(
-    const char* path, const std::string& body, const char* content_type)
-{
-    return Put(path, Headers(), body, content_type);
+inline Result Client::Get(const std::string &path,
+                          ContentReceiver content_receiver,
+                          DownloadProgress progress) {
+  return cli_->Get(path, std::move(content_receiver), std::move(progress));
+}
+inline Result Client::Get(const std::string &path, const Headers &headers,
+                          ContentReceiver content_receiver,
+                          DownloadProgress progress) {
+  return cli_->Get(path, headers, std::move(content_receiver),
+                   std::move(progress));
+}
+inline Result Client::Get(const std::string &path,
+                          ResponseHandler response_handler,
+                          ContentReceiver content_receiver,
+                          DownloadProgress progress) {
+  return cli_->Get(path, std::move(response_handler),
+                   std::move(content_receiver), std::move(progress));
+}
+inline Result Client::Get(const std::string &path, const Headers &headers,
+                          ResponseHandler response_handler,
+                          ContentReceiver content_receiver,
+                          DownloadProgress progress) {
+  return cli_->Get(path, headers, std::move(response_handler),
+                   std::move(content_receiver), std::move(progress));
+}
+inline Result Client::Get(const std::string &path, const Params &params,
+                          const Headers &headers, DownloadProgress progress) {
+  return cli_->Get(path, params, headers, std::move(progress));
+}
+inline Result Client::Get(const std::string &path, const Params &params,
+                          const Headers &headers,
+                          ContentReceiver content_receiver,
+                          DownloadProgress progress) {
+  return cli_->Get(path, params, headers, std::move(content_receiver),
+                   std::move(progress));
+}
+inline Result Client::Get(const std::string &path, const Params &params,
+                          const Headers &headers,
+                          ResponseHandler response_handler,
+                          ContentReceiver content_receiver,
+                          DownloadProgress progress) {
+  return cli_->Get(path, params, headers, std::move(response_handler),
+                   std::move(content_receiver), std::move(progress));
 }
 
-inline std::shared_ptr<Response> Client::Put(
-    const char* path, const Headers& headers, const std::string& body, const char* content_type)
-{
-    Request req;
-    req.method = "PUT";
-    req.headers = headers;
-    req.path = path;
-
-    req.headers.emplace("Content-Type", content_type);
-    req.body = body;
-
-    auto res = std::make_shared<Response>();
+inline Result Client::Head(const std::string &path) { return cli_->Head(path); }
+inline Result Client::Head(const std::string &path, const Headers &headers) {
+  return cli_->Head(path, headers);
+}
 
-    return send(req, *res) ? res : nullptr;
+inline Result Client::Post(const std::string &path) { return cli_->Post(path); }
+inline Result Client::Post(const std::string &path, const Headers &headers) {
+  return cli_->Post(path, headers);
+}
+inline Result Client::Post(const std::string &path, const char *body,
+                           size_t content_length,
+                           const std::string &content_type,
+                           UploadProgress progress) {
+  return cli_->Post(path, body, content_length, content_type, progress);
+}
+inline Result Client::Post(const std::string &path, const Headers &headers,
+                           const char *body, size_t content_length,
+                           const std::string &content_type,
+                           UploadProgress progress) {
+  return cli_->Post(path, headers, body, content_length, content_type,
+                    progress);
+}
+inline Result Client::Post(const std::string &path, const std::string &body,
+                           const std::string &content_type,
+                           UploadProgress progress) {
+  return cli_->Post(path, body, content_type, progress);
+}
+inline Result Client::Post(const std::string &path, const Headers &headers,
+                           const std::string &body,
+                           const std::string &content_type,
+                           UploadProgress progress) {
+  return cli_->Post(path, headers, body, content_type, progress);
+}
+inline Result Client::Post(const std::string &path, size_t content_length,
+                           ContentProvider content_provider,
+                           const std::string &content_type,
+                           UploadProgress progress) {
+  return cli_->Post(path, content_length, std::move(content_provider),
+                    content_type, progress);
+}
+inline Result Client::Post(const std::string &path,
+                           ContentProviderWithoutLength content_provider,
+                           const std::string &content_type,
+                           UploadProgress progress) {
+  return cli_->Post(path, std::move(content_provider), content_type, progress);
+}
+inline Result Client::Post(const std::string &path, const Headers &headers,
+                           size_t content_length,
+                           ContentProvider content_provider,
+                           const std::string &content_type,
+                           UploadProgress progress) {
+  return cli_->Post(path, headers, content_length, std::move(content_provider),
+                    content_type, progress);
+}
+inline Result Client::Post(const std::string &path, const Headers &headers,
+                           ContentProviderWithoutLength content_provider,
+                           const std::string &content_type,
+                           UploadProgress progress) {
+  return cli_->Post(path, headers, std::move(content_provider), content_type,
+                    progress);
+}
+inline Result Client::Post(const std::string &path, const Params &params) {
+  return cli_->Post(path, params);
+}
+inline Result Client::Post(const std::string &path, const Headers &headers,
+                           const Params &params) {
+  return cli_->Post(path, headers, params);
+}
+inline Result Client::Post(const std::string &path,
+                           const UploadFormDataItems &items,
+                           UploadProgress progress) {
+  return cli_->Post(path, items, progress);
+}
+inline Result Client::Post(const std::string &path, const Headers &headers,
+                           const UploadFormDataItems &items,
+                           UploadProgress progress) {
+  return cli_->Post(path, headers, items, progress);
+}
+inline Result Client::Post(const std::string &path, const Headers &headers,
+                           const UploadFormDataItems &items,
+                           const std::string &boundary,
+                           UploadProgress progress) {
+  return cli_->Post(path, headers, items, boundary, progress);
+}
+inline Result Client::Post(const std::string &path, const Headers &headers,
+                           const UploadFormDataItems &items,
+                           const FormDataProviderItems &provider_items,
+                           UploadProgress progress) {
+  return cli_->Post(path, headers, items, provider_items, progress);
+}
+inline Result Client::Post(const std::string &path, const Headers &headers,
+                           const std::string &body,
+                           const std::string &content_type,
+                           ContentReceiver content_receiver,
+                           DownloadProgress progress) {
+  return cli_->Post(path, headers, body, content_type, content_receiver,
+                    progress);
 }
 
-inline std::shared_ptr<Response> Client::Delete(const char* path)
-{
-    return Delete(path, Headers());
+inline Result Client::Put(const std::string &path) { return cli_->Put(path); }
+inline Result Client::Put(const std::string &path, const Headers &headers) {
+  return cli_->Put(path, headers);
+}
+inline Result Client::Put(const std::string &path, const char *body,
+                          size_t content_length,
+                          const std::string &content_type,
+                          UploadProgress progress) {
+  return cli_->Put(path, body, content_length, content_type, progress);
+}
+inline Result Client::Put(const std::string &path, const Headers &headers,
+                          const char *body, size_t content_length,
+                          const std::string &content_type,
+                          UploadProgress progress) {
+  return cli_->Put(path, headers, body, content_length, content_type, progress);
+}
+inline Result Client::Put(const std::string &path, const std::string &body,
+                          const std::string &content_type,
+                          UploadProgress progress) {
+  return cli_->Put(path, body, content_type, progress);
+}
+inline Result Client::Put(const std::string &path, const Headers &headers,
+                          const std::string &body,
+                          const std::string &content_type,
+                          UploadProgress progress) {
+  return cli_->Put(path, headers, body, content_type, progress);
+}
+inline Result Client::Put(const std::string &path, size_t content_length,
+                          ContentProvider content_provider,
+                          const std::string &content_type,
+                          UploadProgress progress) {
+  return cli_->Put(path, content_length, std::move(content_provider),
+                   content_type, progress);
+}
+inline Result Client::Put(const std::string &path,
+                          ContentProviderWithoutLength content_provider,
+                          const std::string &content_type,
+                          UploadProgress progress) {
+  return cli_->Put(path, std::move(content_provider), content_type, progress);
+}
+inline Result Client::Put(const std::string &path, const Headers &headers,
+                          size_t content_length,
+                          ContentProvider content_provider,
+                          const std::string &content_type,
+                          UploadProgress progress) {
+  return cli_->Put(path, headers, content_length, std::move(content_provider),
+                   content_type, progress);
+}
+inline Result Client::Put(const std::string &path, const Headers &headers,
+                          ContentProviderWithoutLength content_provider,
+                          const std::string &content_type,
+                          UploadProgress progress) {
+  return cli_->Put(path, headers, std::move(content_provider), content_type,
+                   progress);
+}
+inline Result Client::Put(const std::string &path, const Params &params) {
+  return cli_->Put(path, params);
+}
+inline Result Client::Put(const std::string &path, const Headers &headers,
+                          const Params &params) {
+  return cli_->Put(path, headers, params);
+}
+inline Result Client::Put(const std::string &path,
+                          const UploadFormDataItems &items,
+                          UploadProgress progress) {
+  return cli_->Put(path, items, progress);
+}
+inline Result Client::Put(const std::string &path, const Headers &headers,
+                          const UploadFormDataItems &items,
+                          UploadProgress progress) {
+  return cli_->Put(path, headers, items, progress);
+}
+inline Result Client::Put(const std::string &path, const Headers &headers,
+                          const UploadFormDataItems &items,
+                          const std::string &boundary,
+                          UploadProgress progress) {
+  return cli_->Put(path, headers, items, boundary, progress);
+}
+inline Result Client::Put(const std::string &path, const Headers &headers,
+                          const UploadFormDataItems &items,
+                          const FormDataProviderItems &provider_items,
+                          UploadProgress progress) {
+  return cli_->Put(path, headers, items, provider_items, progress);
+}
+inline Result Client::Put(const std::string &path, const Headers &headers,
+                          const std::string &body,
+                          const std::string &content_type,
+                          ContentReceiver content_receiver,
+                          DownloadProgress progress) {
+  return cli_->Put(path, headers, body, content_type, content_receiver,
+                   progress);
 }
 
-inline std::shared_ptr<Response> Client::Delete(const char* path, const Headers& headers)
-{
-    Request req;
-    req.method = "DELETE";
-    req.path = path;
-    req.headers = headers;
+inline Result Client::Patch(const std::string &path) {
+  return cli_->Patch(path);
+}
+inline Result Client::Patch(const std::string &path, const Headers &headers) {
+  return cli_->Patch(path, headers);
+}
+inline Result Client::Patch(const std::string &path, const char *body,
+                            size_t content_length,
+                            const std::string &content_type,
+                            UploadProgress progress) {
+  return cli_->Patch(path, body, content_length, content_type, progress);
+}
+inline Result Client::Patch(const std::string &path, const Headers &headers,
+                            const char *body, size_t content_length,
+                            const std::string &content_type,
+                            UploadProgress progress) {
+  return cli_->Patch(path, headers, body, content_length, content_type,
+                     progress);
+}
+inline Result Client::Patch(const std::string &path, const std::string &body,
+                            const std::string &content_type,
+                            UploadProgress progress) {
+  return cli_->Patch(path, body, content_type, progress);
+}
+inline Result Client::Patch(const std::string &path, const Headers &headers,
+                            const std::string &body,
+                            const std::string &content_type,
+                            UploadProgress progress) {
+  return cli_->Patch(path, headers, body, content_type, progress);
+}
+inline Result Client::Patch(const std::string &path, size_t content_length,
+                            ContentProvider content_provider,
+                            const std::string &content_type,
+                            UploadProgress progress) {
+  return cli_->Patch(path, content_length, std::move(content_provider),
+                     content_type, progress);
+}
+inline Result Client::Patch(const std::string &path,
+                            ContentProviderWithoutLength content_provider,
+                            const std::string &content_type,
+                            UploadProgress progress) {
+  return cli_->Patch(path, std::move(content_provider), content_type, progress);
+}
+inline Result Client::Patch(const std::string &path, const Headers &headers,
+                            size_t content_length,
+                            ContentProvider content_provider,
+                            const std::string &content_type,
+                            UploadProgress progress) {
+  return cli_->Patch(path, headers, content_length, std::move(content_provider),
+                     content_type, progress);
+}
+inline Result Client::Patch(const std::string &path, const Headers &headers,
+                            ContentProviderWithoutLength content_provider,
+                            const std::string &content_type,
+                            UploadProgress progress) {
+  return cli_->Patch(path, headers, std::move(content_provider), content_type,
+                     progress);
+}
+inline Result Client::Patch(const std::string &path, const Params &params) {
+  return cli_->Patch(path, params);
+}
+inline Result Client::Patch(const std::string &path, const Headers &headers,
+                            const Params &params) {
+  return cli_->Patch(path, headers, params);
+}
+inline Result Client::Patch(const std::string &path,
+                            const UploadFormDataItems &items,
+                            UploadProgress progress) {
+  return cli_->Patch(path, items, progress);
+}
+inline Result Client::Patch(const std::string &path, const Headers &headers,
+                            const UploadFormDataItems &items,
+                            UploadProgress progress) {
+  return cli_->Patch(path, headers, items, progress);
+}
+inline Result Client::Patch(const std::string &path, const Headers &headers,
+                            const UploadFormDataItems &items,
+                            const std::string &boundary,
+                            UploadProgress progress) {
+  return cli_->Patch(path, headers, items, boundary, progress);
+}
+inline Result Client::Patch(const std::string &path, const Headers &headers,
+                            const UploadFormDataItems &items,
+                            const FormDataProviderItems &provider_items,
+                            UploadProgress progress) {
+  return cli_->Patch(path, headers, items, provider_items, progress);
+}
+inline Result Client::Patch(const std::string &path, const Headers &headers,
+                            const std::string &body,
+                            const std::string &content_type,
+                            ContentReceiver content_receiver,
+                            DownloadProgress progress) {
+  return cli_->Patch(path, headers, body, content_type, content_receiver,
+                     progress);
+}
 
-    auto res = std::make_shared<Response>();
+inline Result Client::Delete(const std::string &path,
+                             DownloadProgress progress) {
+  return cli_->Delete(path, progress);
+}
+inline Result Client::Delete(const std::string &path, const Headers &headers,
+                             DownloadProgress progress) {
+  return cli_->Delete(path, headers, progress);
+}
+inline Result Client::Delete(const std::string &path, const char *body,
+                             size_t content_length,
+                             const std::string &content_type,
+                             DownloadProgress progress) {
+  return cli_->Delete(path, body, content_length, content_type, progress);
+}
+inline Result Client::Delete(const std::string &path, const Headers &headers,
+                             const char *body, size_t content_length,
+                             const std::string &content_type,
+                             DownloadProgress progress) {
+  return cli_->Delete(path, headers, body, content_length, content_type,
+                      progress);
+}
+inline Result Client::Delete(const std::string &path, const std::string &body,
+                             const std::string &content_type,
+                             DownloadProgress progress) {
+  return cli_->Delete(path, body, content_type, progress);
+}
+inline Result Client::Delete(const std::string &path, const Headers &headers,
+                             const std::string &body,
+                             const std::string &content_type,
+                             DownloadProgress progress) {
+  return cli_->Delete(path, headers, body, content_type, progress);
+}
+inline Result Client::Delete(const std::string &path, const Params &params,
+                             DownloadProgress progress) {
+  return cli_->Delete(path, params, progress);
+}
+inline Result Client::Delete(const std::string &path, const Headers &headers,
+                             const Params &params, DownloadProgress progress) {
+  return cli_->Delete(path, headers, params, progress);
+}
 
-    return send(req, *res) ? res : nullptr;
+inline Result Client::Options(const std::string &path) {
+  return cli_->Options(path);
+}
+inline Result Client::Options(const std::string &path, const Headers &headers) {
+  return cli_->Options(path, headers);
 }
 
-inline std::shared_ptr<Response> Client::Options(const char* path)
-{
-    return Options(path, Headers());
+inline bool Client::send(Request &req, Response &res, Error &error) {
+  return cli_->send(req, res, error);
 }
 
-inline std::shared_ptr<Response> Client::Options(const char* path, const Headers& headers)
-{
-    Request req;
-    req.method = "OPTIONS";
-    req.path = path;
-    req.headers = headers;
+inline Result Client::send(const Request &req) { return cli_->send(req); }
 
-    auto res = std::make_shared<Response>();
+inline void Client::stop() { cli_->stop(); }
 
-    return send(req, *res) ? res : nullptr;
-}
+inline std::string Client::host() const { return cli_->host(); }
 
-/*
- * SSL Implementation
- */
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-namespace detail {
+inline int Client::port() const { return cli_->port(); }
 
-template <typename U, typename V, typename T>
-inline bool read_and_close_socket_ssl(
-    socket_t sock, size_t keep_alive_max_count,
-    // TODO: OpenSSL 1.0.2 occasionally crashes...
-    // The upcoming 1.1.0 is going to be thread safe.
-    SSL_CTX* ctx, std::mutex& ctx_mutex,
-    U SSL_connect_or_accept, V setup,
-    T callback)
-{
-    SSL* ssl = nullptr;
-    {
-        std::lock_guard<std::mutex> guard(ctx_mutex);
+inline size_t Client::is_socket_open() const { return cli_->is_socket_open(); }
 
-        ssl = SSL_new(ctx);
-        if (!ssl) {
-            return false;
-        }
-    }
+inline socket_t Client::socket() const { return cli_->socket(); }
 
-    auto bio = BIO_new_socket(sock, BIO_NOCLOSE);
-    SSL_set_bio(ssl, bio, bio);
+inline void
+Client::set_hostname_addr_map(std::map<std::string, std::string> addr_map) {
+  cli_->set_hostname_addr_map(std::move(addr_map));
+}
 
-    setup(ssl);
+inline void Client::set_default_headers(Headers headers) {
+  cli_->set_default_headers(std::move(headers));
+}
 
-    SSL_connect_or_accept(ssl);
+inline void Client::set_header_writer(
+    std::function<ssize_t(Stream &, Headers &)> const &writer) {
+  cli_->set_header_writer(writer);
+}
 
-    bool ret = false;
+inline void Client::set_address_family(int family) {
+  cli_->set_address_family(family);
+}
 
-    if (keep_alive_max_count > 0) {
-        auto count = keep_alive_max_count;
-        while (count > 0 &&
-               detail::select_read(sock,
-                   CPPHTTPLIB_KEEPALIVE_TIMEOUT_SECOND,
-                   CPPHTTPLIB_KEEPALIVE_TIMEOUT_USECOND) > 0) {
-            SSLSocketStream strm(sock, ssl);
-            auto last_connection = count == 1;
-            auto connection_close = false;
+inline void Client::set_tcp_nodelay(bool on) { cli_->set_tcp_nodelay(on); }
 
-            ret = callback(strm, last_connection, connection_close);
-            if (!ret || connection_close) {
-                break;
-            }
+inline void Client::set_socket_options(SocketOptions socket_options) {
+  cli_->set_socket_options(std::move(socket_options));
+}
 
-            count--;
-        }
-    } else {
-        SSLSocketStream strm(sock, ssl);
-        auto dummy_connection_close = false;
-        ret = callback(strm, true, dummy_connection_close);
-    }
+inline void Client::set_connection_timeout(time_t sec, time_t usec) {
+  cli_->set_connection_timeout(sec, usec);
+}
 
-    SSL_shutdown(ssl);
+inline void Client::set_read_timeout(time_t sec, time_t usec) {
+  cli_->set_read_timeout(sec, usec);
+}
 
-    {
-        std::lock_guard<std::mutex> guard(ctx_mutex);
-        SSL_free(ssl);
-    }
+inline void Client::set_write_timeout(time_t sec, time_t usec) {
+  cli_->set_write_timeout(sec, usec);
+}
 
-    close_socket(sock);
+inline void Client::set_basic_auth(const std::string &username,
+                                   const std::string &password) {
+  cli_->set_basic_auth(username, password);
+}
+inline void Client::set_bearer_token_auth(const std::string &token) {
+  cli_->set_bearer_token_auth(token);
+}
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+inline void Client::set_digest_auth(const std::string &username,
+                                    const std::string &password) {
+  cli_->set_digest_auth(username, password);
+}
+#endif
 
-    return ret;
+inline void Client::set_keep_alive(bool on) { cli_->set_keep_alive(on); }
+inline void Client::set_follow_location(bool on) {
+  cli_->set_follow_location(on);
 }
 
-class SSLInit {
-public:
-    SSLInit() {
-        SSL_load_error_strings();
-        SSL_library_init();
-    }
-};
+inline void Client::set_path_encode(bool on) { cli_->set_path_encode(on); }
 
-static SSLInit sslinit_;
+[[deprecated("Use set_path_encode instead")]]
+inline void Client::set_url_encode(bool on) {
+  cli_->set_path_encode(on);
+}
 
-} // namespace detail
+inline void Client::set_compress(bool on) { cli_->set_compress(on); }
 
-// SSL socket stream implementation
-inline SSLSocketStream::SSLSocketStream(socket_t sock, SSL* ssl)
-    : sock_(sock), ssl_(ssl)
-{
-}
+inline void Client::set_decompress(bool on) { cli_->set_decompress(on); }
 
-inline SSLSocketStream::~SSLSocketStream()
-{
+inline void Client::set_interface(const std::string &intf) {
+  cli_->set_interface(intf);
 }
 
-inline int SSLSocketStream::read(char* ptr, size_t size)
-{
-    return SSL_read(ssl_, ptr, size);
+inline void Client::set_proxy(const std::string &host, int port) {
+  cli_->set_proxy(host, port);
 }
-
-inline int SSLSocketStream::write(const char* ptr, size_t size)
-{
-    return SSL_write(ssl_, ptr, size);
+inline void Client::set_proxy_basic_auth(const std::string &username,
+                                         const std::string &password) {
+  cli_->set_proxy_basic_auth(username, password);
 }
-
-inline int SSLSocketStream::write(const char* ptr)
-{
-    return write(ptr, strlen(ptr));
+inline void Client::set_proxy_bearer_token_auth(const std::string &token) {
+  cli_->set_proxy_bearer_token_auth(token);
 }
-
-inline std::string SSLSocketStream::get_remote_addr() {
-    return detail::get_remote_addr(sock_);
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+inline void Client::set_proxy_digest_auth(const std::string &username,
+                                          const std::string &password) {
+  cli_->set_proxy_digest_auth(username, password);
 }
+#endif
 
-// SSL HTTP server implementation
-inline SSLServer::SSLServer(const char* cert_path, const char* private_key_path)
-{
-    ctx_ = SSL_CTX_new(SSLv23_server_method());
-
-    if (ctx_) {
-        SSL_CTX_set_options(ctx_,
-                            SSL_OP_ALL | SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 |
-                            SSL_OP_NO_COMPRESSION |
-                            SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+inline void Client::enable_server_certificate_verification(bool enabled) {
+  cli_->enable_server_certificate_verification(enabled);
+}
 
-        // auto ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
-        // SSL_CTX_set_tmp_ecdh(ctx_, ecdh);
-        // EC_KEY_free(ecdh);
+inline void Client::enable_server_hostname_verification(bool enabled) {
+  cli_->enable_server_hostname_verification(enabled);
+}
 
-        if (SSL_CTX_use_certificate_file(ctx_, cert_path, SSL_FILETYPE_PEM) != 1 ||
-            SSL_CTX_use_PrivateKey_file(ctx_, private_key_path, SSL_FILETYPE_PEM) != 1) {
-            SSL_CTX_free(ctx_);
-            ctx_ = nullptr;
-        }
-    }
+inline void Client::set_server_certificate_verifier(
+    std::function<SSLVerifierResponse(SSL *ssl)> verifier) {
+  cli_->set_server_certificate_verifier(verifier);
 }
+#endif
 
-inline SSLServer::~SSLServer()
-{
-    if (ctx_) {
-        SSL_CTX_free(ctx_);
-    }
+inline void Client::set_logger(Logger logger) {
+  cli_->set_logger(std::move(logger));
 }
 
-inline bool SSLServer::is_valid() const
-{
-    return ctx_;
+inline void Client::set_error_logger(ErrorLogger error_logger) {
+  cli_->set_error_logger(std::move(error_logger));
 }
 
-inline bool SSLServer::read_and_close_socket(socket_t sock)
-{
-    return detail::read_and_close_socket_ssl(
-        sock,
-        keep_alive_max_count_,
-        ctx_, ctx_mutex_,
-        SSL_accept,
-        [](SSL* /*ssl*/) {},
-        [this](Stream& strm, bool last_connection, bool& connection_close) {
-            return process_request(strm, last_connection, connection_close);
-        });
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+inline void Client::set_ca_cert_path(const std::string &ca_cert_file_path,
+                                     const std::string &ca_cert_dir_path) {
+  cli_->set_ca_cert_path(ca_cert_file_path, ca_cert_dir_path);
 }
 
-// SSL HTTP client implementation
-inline SSLClient::SSLClient(const char* host, int port, size_t timeout_sec)
-    : Client(host, port, timeout_sec)
-{
-    ctx_ = SSL_CTX_new(SSLv23_client_method());
+inline void Client::set_ca_cert_store(X509_STORE *ca_cert_store) {
+  if (is_ssl_) {
+    static_cast<SSLClient &>(*cli_).set_ca_cert_store(ca_cert_store);
+  } else {
+    cli_->set_ca_cert_store(ca_cert_store);
+  }
 }
 
-inline SSLClient::~SSLClient()
-{
-    if (ctx_) {
-        SSL_CTX_free(ctx_);
-    }
+inline void Client::load_ca_cert_store(const char *ca_cert, std::size_t size) {
+  set_ca_cert_store(cli_->create_ca_cert_store(ca_cert, size));
 }
 
-inline bool SSLClient::is_valid() const
-{
-    return ctx_;
+inline long Client::get_openssl_verify_result() const {
+  if (is_ssl_) {
+    return static_cast<SSLClient &>(*cli_).get_openssl_verify_result();
+  }
+  return -1; // NOTE: -1 doesn't match any of X509_V_ERR_???
 }
 
-inline bool SSLClient::read_and_close_socket(socket_t sock, Request& req, Response& res)
-{
-    return is_valid() && detail::read_and_close_socket_ssl(
-        sock, 0,
-        ctx_, ctx_mutex_,
-        SSL_connect,
-        [&](SSL* ssl) {
-            SSL_set_tlsext_host_name(ssl, host_.c_str());
-        },
-        [&](Stream& strm, bool /*last_connection*/, bool& connection_close) {
-            return process_request(strm, req, res, connection_close);
-        });
+inline SSL_CTX *Client::ssl_context() const {
+  if (is_ssl_) { return static_cast<SSLClient &>(*cli_).ssl_context(); }
+  return nullptr;
 }
 #endif
 
-} // namespace httplib
+// ----------------------------------------------------------------------------
 
-#endif
+} // namespace httplib
 
-// vim: et ts=4 sw=4 cin cino={1s ff=unix
+#endif // CPPHTTPLIB_HTTPLIB_H
diff --git a/extern/crashpad/crashpad/third_party/edo/BUILD.gn b/extern/crashpad/crashpad/third_party/edo/BUILD.gn
index 73dca1aab4..9744cbc989 100644
--- a/extern/crashpad/crashpad/third_party/edo/BUILD.gn
+++ b/extern/crashpad/crashpad/third_party/edo/BUILD.gn
@@ -1,19 +1,31 @@
-# Copyright 2018 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
+# Copyright 2025 The Crashpad Authors
+#
+# 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.
 
 import("../../build/crashpad_buildconfig.gni")
 
 if (crashpad_is_in_chromium) {
   group("edo") {
     testonly = true
-    public_deps = [
-      "//ios/third_party/edo",
-    ]
+    public_deps = [ "//ios/third_party/edo" ]
   }
 } else {
   config("config") {
     include_dirs = [ "../../third_party/edo/edo" ]
+    cflags = [ "-Wno-newline-eof" ]
+    if (xcode_version_int >= 1630) {
+      cflags += [ "-Wno-cast-function-type-mismatch" ]
+    }
   }
 
   source_set("edo") {
@@ -103,6 +115,8 @@ if (crashpad_is_in_chromium) {
       "edo/Service/Sources/EDORemoteException.m",
       "edo/Service/Sources/EDORemoteVariable.h",
       "edo/Service/Sources/EDORemoteVariable.m",
+      "edo/Service/Sources/EDORuntimeUtils.h",
+      "edo/Service/Sources/EDORuntimeUtils.m",
       "edo/Service/Sources/EDOServiceError.h",
       "edo/Service/Sources/EDOServiceError.m",
       "edo/Service/Sources/EDOServiceException.h",
@@ -139,8 +153,6 @@ if (crashpad_is_in_chromium) {
     ]
 
     public_configs = [ ":config" ]
-    deps = [
-      "../../build:ios_enable_arc",
-    ]
+    deps = [ "../../build:apple_enable_arc" ]
   }
 }
diff --git a/extern/crashpad/crashpad/third_party/edo/README.crashpad b/extern/crashpad/crashpad/third_party/edo/README.crashpad
index fb8315825e..770026aaeb 100644
--- a/extern/crashpad/crashpad/third_party/edo/README.crashpad
+++ b/extern/crashpad/crashpad/third_party/edo/README.crashpad
@@ -5,6 +5,7 @@ Revision: See DEPS
 License: Apache 2.0
 License File: edo/LICENSE
 Security Critical: no
+Shipped: no
 
 Description:
 iOS remote method invocations (distant object) over Inter-process communication layer.
diff --git a/extern/crashpad/crashpad/third_party/fuchsia/BUILD.gn b/extern/crashpad/crashpad/third_party/fuchsia/BUILD.gn
index b1ed5e4b81..51aa43ba6e 100644
--- a/extern/crashpad/crashpad/third_party/fuchsia/BUILD.gn
+++ b/extern/crashpad/crashpad/third_party/fuchsia/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2018 The Crashpad Authors. All rights reserved.
+# Copyright 2018 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ if (crashpad_is_in_fuchsia) {
   group("fuchsia") {
     public_deps = [
       "//sdk/lib/fdio",
-      "//zircon/public/lib/zx",
+      "//zircon/system/ulib/zx",
     ]
   }
 } else if (crashpad_is_in_chromium) {
diff --git a/extern/crashpad/crashpad/third_party/fuchsia/runner.py b/extern/crashpad/crashpad/third_party/fuchsia/runner.py
index 229d8a42b7..73fab2ac6c 100755
--- a/extern/crashpad/crashpad/third_party/fuchsia/runner.py
+++ b/extern/crashpad/crashpad/third_party/fuchsia/runner.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright 2018 The Crashpad Authors. All rights reserved.
+# Copyright 2018 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/third_party/getopt/BUILD.gn b/extern/crashpad/crashpad/third_party/getopt/BUILD.gn
index da27624f64..59ecc5e251 100644
--- a/extern/crashpad/crashpad/third_party/getopt/BUILD.gn
+++ b/extern/crashpad/crashpad/third_party/getopt/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2014 The Crashpad Authors. All rights reserved.
+# Copyright 2014 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/third_party/getopt/README.crashpad b/extern/crashpad/crashpad/third_party/getopt/README.crashpad
index b7ff954361..ac3201a61e 100644
--- a/extern/crashpad/crashpad/third_party/getopt/README.crashpad
+++ b/extern/crashpad/crashpad/third_party/getopt/README.crashpad
@@ -4,6 +4,7 @@ URL: https://sourceware.org/ml/newlib/2005/msg00758.html
 License: Public domain
 License File: LICENSE
 Security Critical: no
+Shipped: yes
 
 Description:
 A public domain implementation of getopt.
diff --git a/extern/crashpad/crashpad/third_party/glibc/COPYING.LIB b/extern/crashpad/crashpad/third_party/glibc/COPYING.LIB
deleted file mode 100644
index 4362b49151..0000000000
--- a/extern/crashpad/crashpad/third_party/glibc/COPYING.LIB
+++ /dev/null
@@ -1,502 +0,0 @@
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
diff --git a/extern/crashpad/crashpad/third_party/glibc/README.crashpad b/extern/crashpad/crashpad/third_party/glibc/README.crashpad
deleted file mode 100644
index b550ad98a7..0000000000
--- a/extern/crashpad/crashpad/third_party/glibc/README.crashpad
+++ /dev/null
@@ -1,16 +0,0 @@
-Name: GNU C Library
-Short Name: glibc
-URL: https://www.gnu.org/software/libc/
-URL: https://sourceware.org/git/?p=glibc.git
-Version: 2.29
-License: GNU LGPL 2.1
-License File: COPYING.LIB
-Security Critical: no
-
-Description:
-glibc is the GNU Project’s implementation of the C standard library.
-
-Local Modifications:
- - Only elf/elf.h is included. Its #include of <features.h> has been removed,
-   and it uses of __BEGIN_DECLS and __END_DECLS have been replaced with inline
-   versions in the manner that misc/sys/cdefs.h defines those macros.
diff --git a/extern/crashpad/crashpad/third_party/glibc/elf/elf.h b/extern/crashpad/crashpad/third_party/glibc/elf/elf.h
deleted file mode 100644
index 331536b497..0000000000
--- a/extern/crashpad/crashpad/third_party/glibc/elf/elf.h
+++ /dev/null
@@ -1,4003 +0,0 @@
-/* This file defines standard ELF types, structures, and macros.
-   Copyright (C) 1995-2019 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _ELF_H
-#define	_ELF_H 1
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* Standard ELF types.  */
-
-#include <stdint.h>
-
-/* Type for a 16-bit quantity.  */
-typedef uint16_t Elf32_Half;
-typedef uint16_t Elf64_Half;
-
-/* Types for signed and unsigned 32-bit quantities.  */
-typedef uint32_t Elf32_Word;
-typedef	int32_t  Elf32_Sword;
-typedef uint32_t Elf64_Word;
-typedef	int32_t  Elf64_Sword;
-
-/* Types for signed and unsigned 64-bit quantities.  */
-typedef uint64_t Elf32_Xword;
-typedef	int64_t  Elf32_Sxword;
-typedef uint64_t Elf64_Xword;
-typedef	int64_t  Elf64_Sxword;
-
-/* Type of addresses.  */
-typedef uint32_t Elf32_Addr;
-typedef uint64_t Elf64_Addr;
-
-/* Type of file offsets.  */
-typedef uint32_t Elf32_Off;
-typedef uint64_t Elf64_Off;
-
-/* Type for section indices, which are 16-bit quantities.  */
-typedef uint16_t Elf32_Section;
-typedef uint16_t Elf64_Section;
-
-/* Type for version symbol information.  */
-typedef Elf32_Half Elf32_Versym;
-typedef Elf64_Half Elf64_Versym;
-
-
-/* The ELF file header.  This appears at the start of every ELF file.  */
-
-#define EI_NIDENT (16)
-
-typedef struct
-{
-  unsigned char	e_ident[EI_NIDENT];	/* Magic number and other info */
-  Elf32_Half	e_type;			/* Object file type */
-  Elf32_Half	e_machine;		/* Architecture */
-  Elf32_Word	e_version;		/* Object file version */
-  Elf32_Addr	e_entry;		/* Entry point virtual address */
-  Elf32_Off	e_phoff;		/* Program header table file offset */
-  Elf32_Off	e_shoff;		/* Section header table file offset */
-  Elf32_Word	e_flags;		/* Processor-specific flags */
-  Elf32_Half	e_ehsize;		/* ELF header size in bytes */
-  Elf32_Half	e_phentsize;		/* Program header table entry size */
-  Elf32_Half	e_phnum;		/* Program header table entry count */
-  Elf32_Half	e_shentsize;		/* Section header table entry size */
-  Elf32_Half	e_shnum;		/* Section header table entry count */
-  Elf32_Half	e_shstrndx;		/* Section header string table index */
-} Elf32_Ehdr;
-
-typedef struct
-{
-  unsigned char	e_ident[EI_NIDENT];	/* Magic number and other info */
-  Elf64_Half	e_type;			/* Object file type */
-  Elf64_Half	e_machine;		/* Architecture */
-  Elf64_Word	e_version;		/* Object file version */
-  Elf64_Addr	e_entry;		/* Entry point virtual address */
-  Elf64_Off	e_phoff;		/* Program header table file offset */
-  Elf64_Off	e_shoff;		/* Section header table file offset */
-  Elf64_Word	e_flags;		/* Processor-specific flags */
-  Elf64_Half	e_ehsize;		/* ELF header size in bytes */
-  Elf64_Half	e_phentsize;		/* Program header table entry size */
-  Elf64_Half	e_phnum;		/* Program header table entry count */
-  Elf64_Half	e_shentsize;		/* Section header table entry size */
-  Elf64_Half	e_shnum;		/* Section header table entry count */
-  Elf64_Half	e_shstrndx;		/* Section header string table index */
-} Elf64_Ehdr;
-
-/* Fields in the e_ident array.  The EI_* macros are indices into the
-   array.  The macros under each EI_* macro are the values the byte
-   may have.  */
-
-#define EI_MAG0		0		/* File identification byte 0 index */
-#define ELFMAG0		0x7f		/* Magic number byte 0 */
-
-#define EI_MAG1		1		/* File identification byte 1 index */
-#define ELFMAG1		'E'		/* Magic number byte 1 */
-
-#define EI_MAG2		2		/* File identification byte 2 index */
-#define ELFMAG2		'L'		/* Magic number byte 2 */
-
-#define EI_MAG3		3		/* File identification byte 3 index */
-#define ELFMAG3		'F'		/* Magic number byte 3 */
-
-/* Conglomeration of the identification bytes, for easy testing as a word.  */
-#define	ELFMAG		"\177ELF"
-#define	SELFMAG		4
-
-#define EI_CLASS	4		/* File class byte index */
-#define ELFCLASSNONE	0		/* Invalid class */
-#define ELFCLASS32	1		/* 32-bit objects */
-#define ELFCLASS64	2		/* 64-bit objects */
-#define ELFCLASSNUM	3
-
-#define EI_DATA		5		/* Data encoding byte index */
-#define ELFDATANONE	0		/* Invalid data encoding */
-#define ELFDATA2LSB	1		/* 2's complement, little endian */
-#define ELFDATA2MSB	2		/* 2's complement, big endian */
-#define ELFDATANUM	3
-
-#define EI_VERSION	6		/* File version byte index */
-					/* Value must be EV_CURRENT */
-
-#define EI_OSABI	7		/* OS ABI identification */
-#define ELFOSABI_NONE		0	/* UNIX System V ABI */
-#define ELFOSABI_SYSV		0	/* Alias.  */
-#define ELFOSABI_HPUX		1	/* HP-UX */
-#define ELFOSABI_NETBSD		2	/* NetBSD.  */
-#define ELFOSABI_GNU		3	/* Object uses GNU ELF extensions.  */
-#define ELFOSABI_LINUX		ELFOSABI_GNU /* Compatibility alias.  */
-#define ELFOSABI_SOLARIS	6	/* Sun Solaris.  */
-#define ELFOSABI_AIX		7	/* IBM AIX.  */
-#define ELFOSABI_IRIX		8	/* SGI Irix.  */
-#define ELFOSABI_FREEBSD	9	/* FreeBSD.  */
-#define ELFOSABI_TRU64		10	/* Compaq TRU64 UNIX.  */
-#define ELFOSABI_MODESTO	11	/* Novell Modesto.  */
-#define ELFOSABI_OPENBSD	12	/* OpenBSD.  */
-#define ELFOSABI_ARM_AEABI	64	/* ARM EABI */
-#define ELFOSABI_ARM		97	/* ARM */
-#define ELFOSABI_STANDALONE	255	/* Standalone (embedded) application */
-
-#define EI_ABIVERSION	8		/* ABI version */
-
-#define EI_PAD		9		/* Byte index of padding bytes */
-
-/* Legal values for e_type (object file type).  */
-
-#define ET_NONE		0		/* No file type */
-#define ET_REL		1		/* Relocatable file */
-#define ET_EXEC		2		/* Executable file */
-#define ET_DYN		3		/* Shared object file */
-#define ET_CORE		4		/* Core file */
-#define	ET_NUM		5		/* Number of defined types */
-#define ET_LOOS		0xfe00		/* OS-specific range start */
-#define ET_HIOS		0xfeff		/* OS-specific range end */
-#define ET_LOPROC	0xff00		/* Processor-specific range start */
-#define ET_HIPROC	0xffff		/* Processor-specific range end */
-
-/* Legal values for e_machine (architecture).  */
-
-#define EM_NONE		 0	/* No machine */
-#define EM_M32		 1	/* AT&T WE 32100 */
-#define EM_SPARC	 2	/* SUN SPARC */
-#define EM_386		 3	/* Intel 80386 */
-#define EM_68K		 4	/* Motorola m68k family */
-#define EM_88K		 5	/* Motorola m88k family */
-#define EM_IAMCU	 6	/* Intel MCU */
-#define EM_860		 7	/* Intel 80860 */
-#define EM_MIPS		 8	/* MIPS R3000 big-endian */
-#define EM_S370		 9	/* IBM System/370 */
-#define EM_MIPS_RS3_LE	10	/* MIPS R3000 little-endian */
-				/* reserved 11-14 */
-#define EM_PARISC	15	/* HPPA */
-				/* reserved 16 */
-#define EM_VPP500	17	/* Fujitsu VPP500 */
-#define EM_SPARC32PLUS	18	/* Sun's "v8plus" */
-#define EM_960		19	/* Intel 80960 */
-#define EM_PPC		20	/* PowerPC */
-#define EM_PPC64	21	/* PowerPC 64-bit */
-#define EM_S390		22	/* IBM S390 */
-#define EM_SPU		23	/* IBM SPU/SPC */
-				/* reserved 24-35 */
-#define EM_V800		36	/* NEC V800 series */
-#define EM_FR20		37	/* Fujitsu FR20 */
-#define EM_RH32		38	/* TRW RH-32 */
-#define EM_RCE		39	/* Motorola RCE */
-#define EM_ARM		40	/* ARM */
-#define EM_FAKE_ALPHA	41	/* Digital Alpha */
-#define EM_SH		42	/* Hitachi SH */
-#define EM_SPARCV9	43	/* SPARC v9 64-bit */
-#define EM_TRICORE	44	/* Siemens Tricore */
-#define EM_ARC		45	/* Argonaut RISC Core */
-#define EM_H8_300	46	/* Hitachi H8/300 */
-#define EM_H8_300H	47	/* Hitachi H8/300H */
-#define EM_H8S		48	/* Hitachi H8S */
-#define EM_H8_500	49	/* Hitachi H8/500 */
-#define EM_IA_64	50	/* Intel Merced */
-#define EM_MIPS_X	51	/* Stanford MIPS-X */
-#define EM_COLDFIRE	52	/* Motorola Coldfire */
-#define EM_68HC12	53	/* Motorola M68HC12 */
-#define EM_MMA		54	/* Fujitsu MMA Multimedia Accelerator */
-#define EM_PCP		55	/* Siemens PCP */
-#define EM_NCPU		56	/* Sony nCPU embeeded RISC */
-#define EM_NDR1		57	/* Denso NDR1 microprocessor */
-#define EM_STARCORE	58	/* Motorola Start*Core processor */
-#define EM_ME16		59	/* Toyota ME16 processor */
-#define EM_ST100	60	/* STMicroelectronic ST100 processor */
-#define EM_TINYJ	61	/* Advanced Logic Corp. Tinyj emb.fam */
-#define EM_X86_64	62	/* AMD x86-64 architecture */
-#define EM_PDSP		63	/* Sony DSP Processor */
-#define EM_PDP10	64	/* Digital PDP-10 */
-#define EM_PDP11	65	/* Digital PDP-11 */
-#define EM_FX66		66	/* Siemens FX66 microcontroller */
-#define EM_ST9PLUS	67	/* STMicroelectronics ST9+ 8/16 mc */
-#define EM_ST7		68	/* STmicroelectronics ST7 8 bit mc */
-#define EM_68HC16	69	/* Motorola MC68HC16 microcontroller */
-#define EM_68HC11	70	/* Motorola MC68HC11 microcontroller */
-#define EM_68HC08	71	/* Motorola MC68HC08 microcontroller */
-#define EM_68HC05	72	/* Motorola MC68HC05 microcontroller */
-#define EM_SVX		73	/* Silicon Graphics SVx */
-#define EM_ST19		74	/* STMicroelectronics ST19 8 bit mc */
-#define EM_VAX		75	/* Digital VAX */
-#define EM_CRIS		76	/* Axis Communications 32-bit emb.proc */
-#define EM_JAVELIN	77	/* Infineon Technologies 32-bit emb.proc */
-#define EM_FIREPATH	78	/* Element 14 64-bit DSP Processor */
-#define EM_ZSP		79	/* LSI Logic 16-bit DSP Processor */
-#define EM_MMIX		80	/* Donald Knuth's educational 64-bit proc */
-#define EM_HUANY	81	/* Harvard University machine-independent object files */
-#define EM_PRISM	82	/* SiTera Prism */
-#define EM_AVR		83	/* Atmel AVR 8-bit microcontroller */
-#define EM_FR30		84	/* Fujitsu FR30 */
-#define EM_D10V		85	/* Mitsubishi D10V */
-#define EM_D30V		86	/* Mitsubishi D30V */
-#define EM_V850		87	/* NEC v850 */
-#define EM_M32R		88	/* Mitsubishi M32R */
-#define EM_MN10300	89	/* Matsushita MN10300 */
-#define EM_MN10200	90	/* Matsushita MN10200 */
-#define EM_PJ		91	/* picoJava */
-#define EM_OPENRISC	92	/* OpenRISC 32-bit embedded processor */
-#define EM_ARC_COMPACT	93	/* ARC International ARCompact */
-#define EM_XTENSA	94	/* Tensilica Xtensa Architecture */
-#define EM_VIDEOCORE	95	/* Alphamosaic VideoCore */
-#define EM_TMM_GPP	96	/* Thompson Multimedia General Purpose Proc */
-#define EM_NS32K	97	/* National Semi. 32000 */
-#define EM_TPC		98	/* Tenor Network TPC */
-#define EM_SNP1K	99	/* Trebia SNP 1000 */
-#define EM_ST200	100	/* STMicroelectronics ST200 */
-#define EM_IP2K		101	/* Ubicom IP2xxx */
-#define EM_MAX		102	/* MAX processor */
-#define EM_CR		103	/* National Semi. CompactRISC */
-#define EM_F2MC16	104	/* Fujitsu F2MC16 */
-#define EM_MSP430	105	/* Texas Instruments msp430 */
-#define EM_BLACKFIN	106	/* Analog Devices Blackfin DSP */
-#define EM_SE_C33	107	/* Seiko Epson S1C33 family */
-#define EM_SEP		108	/* Sharp embedded microprocessor */
-#define EM_ARCA		109	/* Arca RISC */
-#define EM_UNICORE	110	/* PKU-Unity & MPRC Peking Uni. mc series */
-#define EM_EXCESS	111	/* eXcess configurable cpu */
-#define EM_DXP		112	/* Icera Semi. Deep Execution Processor */
-#define EM_ALTERA_NIOS2 113	/* Altera Nios II */
-#define EM_CRX		114	/* National Semi. CompactRISC CRX */
-#define EM_XGATE	115	/* Motorola XGATE */
-#define EM_C166		116	/* Infineon C16x/XC16x */
-#define EM_M16C		117	/* Renesas M16C */
-#define EM_DSPIC30F	118	/* Microchip Technology dsPIC30F */
-#define EM_CE		119	/* Freescale Communication Engine RISC */
-#define EM_M32C		120	/* Renesas M32C */
-				/* reserved 121-130 */
-#define EM_TSK3000	131	/* Altium TSK3000 */
-#define EM_RS08		132	/* Freescale RS08 */
-#define EM_SHARC	133	/* Analog Devices SHARC family */
-#define EM_ECOG2	134	/* Cyan Technology eCOG2 */
-#define EM_SCORE7	135	/* Sunplus S+core7 RISC */
-#define EM_DSP24	136	/* New Japan Radio (NJR) 24-bit DSP */
-#define EM_VIDEOCORE3	137	/* Broadcom VideoCore III */
-#define EM_LATTICEMICO32 138	/* RISC for Lattice FPGA */
-#define EM_SE_C17	139	/* Seiko Epson C17 */
-#define EM_TI_C6000	140	/* Texas Instruments TMS320C6000 DSP */
-#define EM_TI_C2000	141	/* Texas Instruments TMS320C2000 DSP */
-#define EM_TI_C5500	142	/* Texas Instruments TMS320C55x DSP */
-#define EM_TI_ARP32	143	/* Texas Instruments App. Specific RISC */
-#define EM_TI_PRU	144	/* Texas Instruments Prog. Realtime Unit */
-				/* reserved 145-159 */
-#define EM_MMDSP_PLUS	160	/* STMicroelectronics 64bit VLIW DSP */
-#define EM_CYPRESS_M8C	161	/* Cypress M8C */
-#define EM_R32C		162	/* Renesas R32C */
-#define EM_TRIMEDIA	163	/* NXP Semi. TriMedia */
-#define EM_QDSP6	164	/* QUALCOMM DSP6 */
-#define EM_8051		165	/* Intel 8051 and variants */
-#define EM_STXP7X	166	/* STMicroelectronics STxP7x */
-#define EM_NDS32	167	/* Andes Tech. compact code emb. RISC */
-#define EM_ECOG1X	168	/* Cyan Technology eCOG1X */
-#define EM_MAXQ30	169	/* Dallas Semi. MAXQ30 mc */
-#define EM_XIMO16	170	/* New Japan Radio (NJR) 16-bit DSP */
-#define EM_MANIK	171	/* M2000 Reconfigurable RISC */
-#define EM_CRAYNV2	172	/* Cray NV2 vector architecture */
-#define EM_RX		173	/* Renesas RX */
-#define EM_METAG	174	/* Imagination Tech. META */
-#define EM_MCST_ELBRUS	175	/* MCST Elbrus */
-#define EM_ECOG16	176	/* Cyan Technology eCOG16 */
-#define EM_CR16		177	/* National Semi. CompactRISC CR16 */
-#define EM_ETPU		178	/* Freescale Extended Time Processing Unit */
-#define EM_SLE9X	179	/* Infineon Tech. SLE9X */
-#define EM_L10M		180	/* Intel L10M */
-#define EM_K10M		181	/* Intel K10M */
-				/* reserved 182 */
-#define EM_AARCH64	183	/* ARM AARCH64 */
-				/* reserved 184 */
-#define EM_AVR32	185	/* Amtel 32-bit microprocessor */
-#define EM_STM8		186	/* STMicroelectronics STM8 */
-#define EM_TILE64	187	/* Tileta TILE64 */
-#define EM_TILEPRO	188	/* Tilera TILEPro */
-#define EM_MICROBLAZE	189	/* Xilinx MicroBlaze */
-#define EM_CUDA		190	/* NVIDIA CUDA */
-#define EM_TILEGX	191	/* Tilera TILE-Gx */
-#define EM_CLOUDSHIELD	192	/* CloudShield */
-#define EM_COREA_1ST	193	/* KIPO-KAIST Core-A 1st gen. */
-#define EM_COREA_2ND	194	/* KIPO-KAIST Core-A 2nd gen. */
-#define EM_ARC_COMPACT2	195	/* Synopsys ARCompact V2 */
-#define EM_OPEN8	196	/* Open8 RISC */
-#define EM_RL78		197	/* Renesas RL78 */
-#define EM_VIDEOCORE5	198	/* Broadcom VideoCore V */
-#define EM_78KOR	199	/* Renesas 78KOR */
-#define EM_56800EX	200	/* Freescale 56800EX DSC */
-#define EM_BA1		201	/* Beyond BA1 */
-#define EM_BA2		202	/* Beyond BA2 */
-#define EM_XCORE	203	/* XMOS xCORE */
-#define EM_MCHP_PIC	204	/* Microchip 8-bit PIC(r) */
-				/* reserved 205-209 */
-#define EM_KM32		210	/* KM211 KM32 */
-#define EM_KMX32	211	/* KM211 KMX32 */
-#define EM_EMX16	212	/* KM211 KMX16 */
-#define EM_EMX8		213	/* KM211 KMX8 */
-#define EM_KVARC	214	/* KM211 KVARC */
-#define EM_CDP		215	/* Paneve CDP */
-#define EM_COGE		216	/* Cognitive Smart Memory Processor */
-#define EM_COOL		217	/* Bluechip CoolEngine */
-#define EM_NORC		218	/* Nanoradio Optimized RISC */
-#define EM_CSR_KALIMBA	219	/* CSR Kalimba */
-#define EM_Z80		220	/* Zilog Z80 */
-#define EM_VISIUM	221	/* Controls and Data Services VISIUMcore */
-#define EM_FT32		222	/* FTDI Chip FT32 */
-#define EM_MOXIE	223	/* Moxie processor */
-#define EM_AMDGPU	224	/* AMD GPU */
-				/* reserved 225-242 */
-#define EM_RISCV	243	/* RISC-V */
-
-#define EM_BPF		247	/* Linux BPF -- in-kernel virtual machine */
-#define EM_CSKY		252     /* C_SKY */
-
-#define EM_NUM		253
-
-/* Old spellings/synonyms.  */
-
-#define EM_ARC_A5	EM_ARC_COMPACT
-
-/* If it is necessary to assign new unofficial EM_* values, please
-   pick large random numbers (0x8523, 0xa7f2, etc.) to minimize the
-   chances of collision with official or non-GNU unofficial values.  */
-
-#define EM_ALPHA	0x9026
-
-/* Legal values for e_version (version).  */
-
-#define EV_NONE		0		/* Invalid ELF version */
-#define EV_CURRENT	1		/* Current version */
-#define EV_NUM		2
-
-/* Section header.  */
-
-typedef struct
-{
-  Elf32_Word	sh_name;		/* Section name (string tbl index) */
-  Elf32_Word	sh_type;		/* Section type */
-  Elf32_Word	sh_flags;		/* Section flags */
-  Elf32_Addr	sh_addr;		/* Section virtual addr at execution */
-  Elf32_Off	sh_offset;		/* Section file offset */
-  Elf32_Word	sh_size;		/* Section size in bytes */
-  Elf32_Word	sh_link;		/* Link to another section */
-  Elf32_Word	sh_info;		/* Additional section information */
-  Elf32_Word	sh_addralign;		/* Section alignment */
-  Elf32_Word	sh_entsize;		/* Entry size if section holds table */
-} Elf32_Shdr;
-
-typedef struct
-{
-  Elf64_Word	sh_name;		/* Section name (string tbl index) */
-  Elf64_Word	sh_type;		/* Section type */
-  Elf64_Xword	sh_flags;		/* Section flags */
-  Elf64_Addr	sh_addr;		/* Section virtual addr at execution */
-  Elf64_Off	sh_offset;		/* Section file offset */
-  Elf64_Xword	sh_size;		/* Section size in bytes */
-  Elf64_Word	sh_link;		/* Link to another section */
-  Elf64_Word	sh_info;		/* Additional section information */
-  Elf64_Xword	sh_addralign;		/* Section alignment */
-  Elf64_Xword	sh_entsize;		/* Entry size if section holds table */
-} Elf64_Shdr;
-
-/* Special section indices.  */
-
-#define SHN_UNDEF	0		/* Undefined section */
-#define SHN_LORESERVE	0xff00		/* Start of reserved indices */
-#define SHN_LOPROC	0xff00		/* Start of processor-specific */
-#define SHN_BEFORE	0xff00		/* Order section before all others
-					   (Solaris).  */
-#define SHN_AFTER	0xff01		/* Order section after all others
-					   (Solaris).  */
-#define SHN_HIPROC	0xff1f		/* End of processor-specific */
-#define SHN_LOOS	0xff20		/* Start of OS-specific */
-#define SHN_HIOS	0xff3f		/* End of OS-specific */
-#define SHN_ABS		0xfff1		/* Associated symbol is absolute */
-#define SHN_COMMON	0xfff2		/* Associated symbol is common */
-#define SHN_XINDEX	0xffff		/* Index is in extra table.  */
-#define SHN_HIRESERVE	0xffff		/* End of reserved indices */
-
-/* Legal values for sh_type (section type).  */
-
-#define SHT_NULL	  0		/* Section header table entry unused */
-#define SHT_PROGBITS	  1		/* Program data */
-#define SHT_SYMTAB	  2		/* Symbol table */
-#define SHT_STRTAB	  3		/* String table */
-#define SHT_RELA	  4		/* Relocation entries with addends */
-#define SHT_HASH	  5		/* Symbol hash table */
-#define SHT_DYNAMIC	  6		/* Dynamic linking information */
-#define SHT_NOTE	  7		/* Notes */
-#define SHT_NOBITS	  8		/* Program space with no data (bss) */
-#define SHT_REL		  9		/* Relocation entries, no addends */
-#define SHT_SHLIB	  10		/* Reserved */
-#define SHT_DYNSYM	  11		/* Dynamic linker symbol table */
-#define SHT_INIT_ARRAY	  14		/* Array of constructors */
-#define SHT_FINI_ARRAY	  15		/* Array of destructors */
-#define SHT_PREINIT_ARRAY 16		/* Array of pre-constructors */
-#define SHT_GROUP	  17		/* Section group */
-#define SHT_SYMTAB_SHNDX  18		/* Extended section indeces */
-#define	SHT_NUM		  19		/* Number of defined types.  */
-#define SHT_LOOS	  0x60000000	/* Start OS-specific.  */
-#define SHT_GNU_ATTRIBUTES 0x6ffffff5	/* Object attributes.  */
-#define SHT_GNU_HASH	  0x6ffffff6	/* GNU-style hash table.  */
-#define SHT_GNU_LIBLIST	  0x6ffffff7	/* Prelink library list */
-#define SHT_CHECKSUM	  0x6ffffff8	/* Checksum for DSO content.  */
-#define SHT_LOSUNW	  0x6ffffffa	/* Sun-specific low bound.  */
-#define SHT_SUNW_move	  0x6ffffffa
-#define SHT_SUNW_COMDAT   0x6ffffffb
-#define SHT_SUNW_syminfo  0x6ffffffc
-#define SHT_GNU_verdef	  0x6ffffffd	/* Version definition section.  */
-#define SHT_GNU_verneed	  0x6ffffffe	/* Version needs section.  */
-#define SHT_GNU_versym	  0x6fffffff	/* Version symbol table.  */
-#define SHT_HISUNW	  0x6fffffff	/* Sun-specific high bound.  */
-#define SHT_HIOS	  0x6fffffff	/* End OS-specific type */
-#define SHT_LOPROC	  0x70000000	/* Start of processor-specific */
-#define SHT_HIPROC	  0x7fffffff	/* End of processor-specific */
-#define SHT_LOUSER	  0x80000000	/* Start of application-specific */
-#define SHT_HIUSER	  0x8fffffff	/* End of application-specific */
-
-/* Legal values for sh_flags (section flags).  */
-
-#define SHF_WRITE	     (1 << 0)	/* Writable */
-#define SHF_ALLOC	     (1 << 1)	/* Occupies memory during execution */
-#define SHF_EXECINSTR	     (1 << 2)	/* Executable */
-#define SHF_MERGE	     (1 << 4)	/* Might be merged */
-#define SHF_STRINGS	     (1 << 5)	/* Contains nul-terminated strings */
-#define SHF_INFO_LINK	     (1 << 6)	/* `sh_info' contains SHT index */
-#define SHF_LINK_ORDER	     (1 << 7)	/* Preserve order after combining */
-#define SHF_OS_NONCONFORMING (1 << 8)	/* Non-standard OS specific handling
-					   required */
-#define SHF_GROUP	     (1 << 9)	/* Section is member of a group.  */
-#define SHF_TLS		     (1 << 10)	/* Section hold thread-local data.  */
-#define SHF_COMPRESSED	     (1 << 11)	/* Section with compressed data. */
-#define SHF_MASKOS	     0x0ff00000	/* OS-specific.  */
-#define SHF_MASKPROC	     0xf0000000	/* Processor-specific */
-#define SHF_ORDERED	     (1 << 30)	/* Special ordering requirement
-					   (Solaris).  */
-#define SHF_EXCLUDE	     (1U << 31)	/* Section is excluded unless
-					   referenced or allocated (Solaris).*/
-
-/* Section compression header.  Used when SHF_COMPRESSED is set.  */
-
-typedef struct
-{
-  Elf32_Word	ch_type;	/* Compression format.  */
-  Elf32_Word	ch_size;	/* Uncompressed data size.  */
-  Elf32_Word	ch_addralign;	/* Uncompressed data alignment.  */
-} Elf32_Chdr;
-
-typedef struct
-{
-  Elf64_Word	ch_type;	/* Compression format.  */
-  Elf64_Word	ch_reserved;
-  Elf64_Xword	ch_size;	/* Uncompressed data size.  */
-  Elf64_Xword	ch_addralign;	/* Uncompressed data alignment.  */
-} Elf64_Chdr;
-
-/* Legal values for ch_type (compression algorithm).  */
-#define ELFCOMPRESS_ZLIB	1	   /* ZLIB/DEFLATE algorithm.  */
-#define ELFCOMPRESS_LOOS	0x60000000 /* Start of OS-specific.  */
-#define ELFCOMPRESS_HIOS	0x6fffffff /* End of OS-specific.  */
-#define ELFCOMPRESS_LOPROC	0x70000000 /* Start of processor-specific.  */
-#define ELFCOMPRESS_HIPROC	0x7fffffff /* End of processor-specific.  */
-
-/* Section group handling.  */
-#define GRP_COMDAT	0x1		/* Mark group as COMDAT.  */
-
-/* Symbol table entry.  */
-
-typedef struct
-{
-  Elf32_Word	st_name;		/* Symbol name (string tbl index) */
-  Elf32_Addr	st_value;		/* Symbol value */
-  Elf32_Word	st_size;		/* Symbol size */
-  unsigned char	st_info;		/* Symbol type and binding */
-  unsigned char	st_other;		/* Symbol visibility */
-  Elf32_Section	st_shndx;		/* Section index */
-} Elf32_Sym;
-
-typedef struct
-{
-  Elf64_Word	st_name;		/* Symbol name (string tbl index) */
-  unsigned char	st_info;		/* Symbol type and binding */
-  unsigned char st_other;		/* Symbol visibility */
-  Elf64_Section	st_shndx;		/* Section index */
-  Elf64_Addr	st_value;		/* Symbol value */
-  Elf64_Xword	st_size;		/* Symbol size */
-} Elf64_Sym;
-
-/* The syminfo section if available contains additional information about
-   every dynamic symbol.  */
-
-typedef struct
-{
-  Elf32_Half si_boundto;		/* Direct bindings, symbol bound to */
-  Elf32_Half si_flags;			/* Per symbol flags */
-} Elf32_Syminfo;
-
-typedef struct
-{
-  Elf64_Half si_boundto;		/* Direct bindings, symbol bound to */
-  Elf64_Half si_flags;			/* Per symbol flags */
-} Elf64_Syminfo;
-
-/* Possible values for si_boundto.  */
-#define SYMINFO_BT_SELF		0xffff	/* Symbol bound to self */
-#define SYMINFO_BT_PARENT	0xfffe	/* Symbol bound to parent */
-#define SYMINFO_BT_LOWRESERVE	0xff00	/* Beginning of reserved entries */
-
-/* Possible bitmasks for si_flags.  */
-#define SYMINFO_FLG_DIRECT	0x0001	/* Direct bound symbol */
-#define SYMINFO_FLG_PASSTHRU	0x0002	/* Pass-thru symbol for translator */
-#define SYMINFO_FLG_COPY	0x0004	/* Symbol is a copy-reloc */
-#define SYMINFO_FLG_LAZYLOAD	0x0008	/* Symbol bound to object to be lazy
-					   loaded */
-/* Syminfo version values.  */
-#define SYMINFO_NONE		0
-#define SYMINFO_CURRENT		1
-#define SYMINFO_NUM		2
-
-
-/* How to extract and insert information held in the st_info field.  */
-
-#define ELF32_ST_BIND(val)		(((unsigned char) (val)) >> 4)
-#define ELF32_ST_TYPE(val)		((val) & 0xf)
-#define ELF32_ST_INFO(bind, type)	(((bind) << 4) + ((type) & 0xf))
-
-/* Both Elf32_Sym and Elf64_Sym use the same one-byte st_info field.  */
-#define ELF64_ST_BIND(val)		ELF32_ST_BIND (val)
-#define ELF64_ST_TYPE(val)		ELF32_ST_TYPE (val)
-#define ELF64_ST_INFO(bind, type)	ELF32_ST_INFO ((bind), (type))
-
-/* Legal values for ST_BIND subfield of st_info (symbol binding).  */
-
-#define STB_LOCAL	0		/* Local symbol */
-#define STB_GLOBAL	1		/* Global symbol */
-#define STB_WEAK	2		/* Weak symbol */
-#define	STB_NUM		3		/* Number of defined types.  */
-#define STB_LOOS	10		/* Start of OS-specific */
-#define STB_GNU_UNIQUE	10		/* Unique symbol.  */
-#define STB_HIOS	12		/* End of OS-specific */
-#define STB_LOPROC	13		/* Start of processor-specific */
-#define STB_HIPROC	15		/* End of processor-specific */
-
-/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
-
-#define STT_NOTYPE	0		/* Symbol type is unspecified */
-#define STT_OBJECT	1		/* Symbol is a data object */
-#define STT_FUNC	2		/* Symbol is a code object */
-#define STT_SECTION	3		/* Symbol associated with a section */
-#define STT_FILE	4		/* Symbol's name is file name */
-#define STT_COMMON	5		/* Symbol is a common data object */
-#define STT_TLS		6		/* Symbol is thread-local data object*/
-#define	STT_NUM		7		/* Number of defined types.  */
-#define STT_LOOS	10		/* Start of OS-specific */
-#define STT_GNU_IFUNC	10		/* Symbol is indirect code object */
-#define STT_HIOS	12		/* End of OS-specific */
-#define STT_LOPROC	13		/* Start of processor-specific */
-#define STT_HIPROC	15		/* End of processor-specific */
-
-
-/* Symbol table indices are found in the hash buckets and chain table
-   of a symbol hash table section.  This special index value indicates
-   the end of a chain, meaning no further symbols are found in that bucket.  */
-
-#define STN_UNDEF	0		/* End of a chain.  */
-
-
-/* How to extract and insert information held in the st_other field.  */
-
-#define ELF32_ST_VISIBILITY(o)	((o) & 0x03)
-
-/* For ELF64 the definitions are the same.  */
-#define ELF64_ST_VISIBILITY(o)	ELF32_ST_VISIBILITY (o)
-
-/* Symbol visibility specification encoded in the st_other field.  */
-#define STV_DEFAULT	0		/* Default symbol visibility rules */
-#define STV_INTERNAL	1		/* Processor specific hidden class */
-#define STV_HIDDEN	2		/* Sym unavailable in other modules */
-#define STV_PROTECTED	3		/* Not preemptible, not exported */
-
-
-/* Relocation table entry without addend (in section of type SHT_REL).  */
-
-typedef struct
-{
-  Elf32_Addr	r_offset;		/* Address */
-  Elf32_Word	r_info;			/* Relocation type and symbol index */
-} Elf32_Rel;
-
-/* I have seen two different definitions of the Elf64_Rel and
-   Elf64_Rela structures, so we'll leave them out until Novell (or
-   whoever) gets their act together.  */
-/* The following, at least, is used on Sparc v9, MIPS, and Alpha.  */
-
-typedef struct
-{
-  Elf64_Addr	r_offset;		/* Address */
-  Elf64_Xword	r_info;			/* Relocation type and symbol index */
-} Elf64_Rel;
-
-/* Relocation table entry with addend (in section of type SHT_RELA).  */
-
-typedef struct
-{
-  Elf32_Addr	r_offset;		/* Address */
-  Elf32_Word	r_info;			/* Relocation type and symbol index */
-  Elf32_Sword	r_addend;		/* Addend */
-} Elf32_Rela;
-
-typedef struct
-{
-  Elf64_Addr	r_offset;		/* Address */
-  Elf64_Xword	r_info;			/* Relocation type and symbol index */
-  Elf64_Sxword	r_addend;		/* Addend */
-} Elf64_Rela;
-
-/* How to extract and insert information held in the r_info field.  */
-
-#define ELF32_R_SYM(val)		((val) >> 8)
-#define ELF32_R_TYPE(val)		((val) & 0xff)
-#define ELF32_R_INFO(sym, type)		(((sym) << 8) + ((type) & 0xff))
-
-#define ELF64_R_SYM(i)			((i) >> 32)
-#define ELF64_R_TYPE(i)			((i) & 0xffffffff)
-#define ELF64_R_INFO(sym,type)		((((Elf64_Xword) (sym)) << 32) + (type))
-
-/* Program segment header.  */
-
-typedef struct
-{
-  Elf32_Word	p_type;			/* Segment type */
-  Elf32_Off	p_offset;		/* Segment file offset */
-  Elf32_Addr	p_vaddr;		/* Segment virtual address */
-  Elf32_Addr	p_paddr;		/* Segment physical address */
-  Elf32_Word	p_filesz;		/* Segment size in file */
-  Elf32_Word	p_memsz;		/* Segment size in memory */
-  Elf32_Word	p_flags;		/* Segment flags */
-  Elf32_Word	p_align;		/* Segment alignment */
-} Elf32_Phdr;
-
-typedef struct
-{
-  Elf64_Word	p_type;			/* Segment type */
-  Elf64_Word	p_flags;		/* Segment flags */
-  Elf64_Off	p_offset;		/* Segment file offset */
-  Elf64_Addr	p_vaddr;		/* Segment virtual address */
-  Elf64_Addr	p_paddr;		/* Segment physical address */
-  Elf64_Xword	p_filesz;		/* Segment size in file */
-  Elf64_Xword	p_memsz;		/* Segment size in memory */
-  Elf64_Xword	p_align;		/* Segment alignment */
-} Elf64_Phdr;
-
-/* Special value for e_phnum.  This indicates that the real number of
-   program headers is too large to fit into e_phnum.  Instead the real
-   value is in the field sh_info of section 0.  */
-
-#define PN_XNUM		0xffff
-
-/* Legal values for p_type (segment type).  */
-
-#define	PT_NULL		0		/* Program header table entry unused */
-#define PT_LOAD		1		/* Loadable program segment */
-#define PT_DYNAMIC	2		/* Dynamic linking information */
-#define PT_INTERP	3		/* Program interpreter */
-#define PT_NOTE		4		/* Auxiliary information */
-#define PT_SHLIB	5		/* Reserved */
-#define PT_PHDR		6		/* Entry for header table itself */
-#define PT_TLS		7		/* Thread-local storage segment */
-#define	PT_NUM		8		/* Number of defined types */
-#define PT_LOOS		0x60000000	/* Start of OS-specific */
-#define PT_GNU_EH_FRAME	0x6474e550	/* GCC .eh_frame_hdr segment */
-#define PT_GNU_STACK	0x6474e551	/* Indicates stack executability */
-#define PT_GNU_RELRO	0x6474e552	/* Read-only after relocation */
-#define PT_LOSUNW	0x6ffffffa
-#define PT_SUNWBSS	0x6ffffffa	/* Sun Specific segment */
-#define PT_SUNWSTACK	0x6ffffffb	/* Stack segment */
-#define PT_HISUNW	0x6fffffff
-#define PT_HIOS		0x6fffffff	/* End of OS-specific */
-#define PT_LOPROC	0x70000000	/* Start of processor-specific */
-#define PT_HIPROC	0x7fffffff	/* End of processor-specific */
-
-/* Legal values for p_flags (segment flags).  */
-
-#define PF_X		(1 << 0)	/* Segment is executable */
-#define PF_W		(1 << 1)	/* Segment is writable */
-#define PF_R		(1 << 2)	/* Segment is readable */
-#define PF_MASKOS	0x0ff00000	/* OS-specific */
-#define PF_MASKPROC	0xf0000000	/* Processor-specific */
-
-/* Legal values for note segment descriptor types for core files. */
-
-#define NT_PRSTATUS	1		/* Contains copy of prstatus struct */
-#define NT_PRFPREG	2		/* Contains copy of fpregset
-					   struct.  */
-#define NT_FPREGSET	2		/* Contains copy of fpregset struct */
-#define NT_PRPSINFO	3		/* Contains copy of prpsinfo struct */
-#define NT_PRXREG	4		/* Contains copy of prxregset struct */
-#define NT_TASKSTRUCT	4		/* Contains copy of task structure */
-#define NT_PLATFORM	5		/* String from sysinfo(SI_PLATFORM) */
-#define NT_AUXV		6		/* Contains copy of auxv array */
-#define NT_GWINDOWS	7		/* Contains copy of gwindows struct */
-#define NT_ASRS		8		/* Contains copy of asrset struct */
-#define NT_PSTATUS	10		/* Contains copy of pstatus struct */
-#define NT_PSINFO	13		/* Contains copy of psinfo struct */
-#define NT_PRCRED	14		/* Contains copy of prcred struct */
-#define NT_UTSNAME	15		/* Contains copy of utsname struct */
-#define NT_LWPSTATUS	16		/* Contains copy of lwpstatus struct */
-#define NT_LWPSINFO	17		/* Contains copy of lwpinfo struct */
-#define NT_PRFPXREG	20		/* Contains copy of fprxregset struct */
-#define NT_SIGINFO	0x53494749	/* Contains copy of siginfo_t,
-					   size might increase */
-#define NT_FILE		0x46494c45	/* Contains information about mapped
-					   files */
-#define NT_PRXFPREG	0x46e62b7f	/* Contains copy of user_fxsr_struct */
-#define NT_PPC_VMX	0x100		/* PowerPC Altivec/VMX registers */
-#define NT_PPC_SPE	0x101		/* PowerPC SPE/EVR registers */
-#define NT_PPC_VSX	0x102		/* PowerPC VSX registers */
-#define NT_PPC_TAR	0x103		/* Target Address Register */
-#define NT_PPC_PPR	0x104		/* Program Priority Register */
-#define NT_PPC_DSCR	0x105		/* Data Stream Control Register */
-#define NT_PPC_EBB	0x106		/* Event Based Branch Registers */
-#define NT_PPC_PMU	0x107		/* Performance Monitor Registers */
-#define NT_PPC_TM_CGPR	0x108		/* TM checkpointed GPR Registers */
-#define NT_PPC_TM_CFPR	0x109		/* TM checkpointed FPR Registers */
-#define NT_PPC_TM_CVMX	0x10a		/* TM checkpointed VMX Registers */
-#define NT_PPC_TM_CVSX	0x10b		/* TM checkpointed VSX Registers */
-#define NT_PPC_TM_SPR	0x10c		/* TM Special Purpose Registers */
-#define NT_PPC_TM_CTAR	0x10d		/* TM checkpointed Target Address
-					   Register */
-#define NT_PPC_TM_CPPR	0x10e		/* TM checkpointed Program Priority
-					   Register */
-#define NT_PPC_TM_CDSCR	0x10f		/* TM checkpointed Data Stream Control
-					   Register */
-#define NT_PPC_PKEY	0x110		/* Memory Protection Keys
-					   registers.  */
-#define NT_386_TLS	0x200		/* i386 TLS slots (struct user_desc) */
-#define NT_386_IOPERM	0x201		/* x86 io permission bitmap (1=deny) */
-#define NT_X86_XSTATE	0x202		/* x86 extended state using xsave */
-#define NT_S390_HIGH_GPRS	0x300	/* s390 upper register halves */
-#define NT_S390_TIMER	0x301		/* s390 timer register */
-#define NT_S390_TODCMP	0x302		/* s390 TOD clock comparator register */
-#define NT_S390_TODPREG	0x303		/* s390 TOD programmable register */
-#define NT_S390_CTRS	0x304		/* s390 control registers */
-#define NT_S390_PREFIX	0x305		/* s390 prefix register */
-#define NT_S390_LAST_BREAK	0x306	/* s390 breaking event address */
-#define NT_S390_SYSTEM_CALL	0x307	/* s390 system call restart data */
-#define NT_S390_TDB	0x308		/* s390 transaction diagnostic block */
-#define NT_S390_VXRS_LOW	0x309	/* s390 vector registers 0-15
-					   upper half.  */
-#define NT_S390_VXRS_HIGH	0x30a	/* s390 vector registers 16-31.  */
-#define NT_S390_GS_CB	0x30b		/* s390 guarded storage registers.  */
-#define NT_S390_GS_BC	0x30c		/* s390 guarded storage
-					   broadcast control block.  */
-#define NT_S390_RI_CB	0x30d		/* s390 runtime instrumentation.  */
-#define NT_ARM_VFP	0x400		/* ARM VFP/NEON registers */
-#define NT_ARM_TLS	0x401		/* ARM TLS register */
-#define NT_ARM_HW_BREAK	0x402		/* ARM hardware breakpoint registers */
-#define NT_ARM_HW_WATCH	0x403		/* ARM hardware watchpoint registers */
-#define NT_ARM_SYSTEM_CALL	0x404	/* ARM system call number */
-#define NT_ARM_SVE	0x405		/* ARM Scalable Vector Extension
-					   registers */
-#define NT_VMCOREDD	0x700		/* Vmcore Device Dump Note.  */
-#define NT_MIPS_DSP	0x800		/* MIPS DSP ASE registers.  */
-#define NT_MIPS_FP_MODE	0x801		/* MIPS floating-point mode.  */
-
-/* Legal values for the note segment descriptor types for object files.  */
-
-#define NT_VERSION	1		/* Contains a version string.  */
-
-
-/* Dynamic section entry.  */
-
-typedef struct
-{
-  Elf32_Sword	d_tag;			/* Dynamic entry type */
-  union
-    {
-      Elf32_Word d_val;			/* Integer value */
-      Elf32_Addr d_ptr;			/* Address value */
-    } d_un;
-} Elf32_Dyn;
-
-typedef struct
-{
-  Elf64_Sxword	d_tag;			/* Dynamic entry type */
-  union
-    {
-      Elf64_Xword d_val;		/* Integer value */
-      Elf64_Addr d_ptr;			/* Address value */
-    } d_un;
-} Elf64_Dyn;
-
-/* Legal values for d_tag (dynamic entry type).  */
-
-#define DT_NULL		0		/* Marks end of dynamic section */
-#define DT_NEEDED	1		/* Name of needed library */
-#define DT_PLTRELSZ	2		/* Size in bytes of PLT relocs */
-#define DT_PLTGOT	3		/* Processor defined value */
-#define DT_HASH		4		/* Address of symbol hash table */
-#define DT_STRTAB	5		/* Address of string table */
-#define DT_SYMTAB	6		/* Address of symbol table */
-#define DT_RELA		7		/* Address of Rela relocs */
-#define DT_RELASZ	8		/* Total size of Rela relocs */
-#define DT_RELAENT	9		/* Size of one Rela reloc */
-#define DT_STRSZ	10		/* Size of string table */
-#define DT_SYMENT	11		/* Size of one symbol table entry */
-#define DT_INIT		12		/* Address of init function */
-#define DT_FINI		13		/* Address of termination function */
-#define DT_SONAME	14		/* Name of shared object */
-#define DT_RPATH	15		/* Library search path (deprecated) */
-#define DT_SYMBOLIC	16		/* Start symbol search here */
-#define DT_REL		17		/* Address of Rel relocs */
-#define DT_RELSZ	18		/* Total size of Rel relocs */
-#define DT_RELENT	19		/* Size of one Rel reloc */
-#define DT_PLTREL	20		/* Type of reloc in PLT */
-#define DT_DEBUG	21		/* For debugging; unspecified */
-#define DT_TEXTREL	22		/* Reloc might modify .text */
-#define DT_JMPREL	23		/* Address of PLT relocs */
-#define	DT_BIND_NOW	24		/* Process relocations of object */
-#define	DT_INIT_ARRAY	25		/* Array with addresses of init fct */
-#define	DT_FINI_ARRAY	26		/* Array with addresses of fini fct */
-#define	DT_INIT_ARRAYSZ	27		/* Size in bytes of DT_INIT_ARRAY */
-#define	DT_FINI_ARRAYSZ	28		/* Size in bytes of DT_FINI_ARRAY */
-#define DT_RUNPATH	29		/* Library search path */
-#define DT_FLAGS	30		/* Flags for the object being loaded */
-#define DT_ENCODING	32		/* Start of encoded range */
-#define DT_PREINIT_ARRAY 32		/* Array with addresses of preinit fct*/
-#define DT_PREINIT_ARRAYSZ 33		/* size in bytes of DT_PREINIT_ARRAY */
-#define DT_SYMTAB_SHNDX	34		/* Address of SYMTAB_SHNDX section */
-#define	DT_NUM		35		/* Number used */
-#define DT_LOOS		0x6000000d	/* Start of OS-specific */
-#define DT_HIOS		0x6ffff000	/* End of OS-specific */
-#define DT_LOPROC	0x70000000	/* Start of processor-specific */
-#define DT_HIPROC	0x7fffffff	/* End of processor-specific */
-#define	DT_PROCNUM	DT_MIPS_NUM	/* Most used by any processor */
-
-/* DT_* entries which fall between DT_VALRNGHI & DT_VALRNGLO use the
-   Dyn.d_un.d_val field of the Elf*_Dyn structure.  This follows Sun's
-   approach.  */
-#define DT_VALRNGLO	0x6ffffd00
-#define DT_GNU_PRELINKED 0x6ffffdf5	/* Prelinking timestamp */
-#define DT_GNU_CONFLICTSZ 0x6ffffdf6	/* Size of conflict section */
-#define DT_GNU_LIBLISTSZ 0x6ffffdf7	/* Size of library list */
-#define DT_CHECKSUM	0x6ffffdf8
-#define DT_PLTPADSZ	0x6ffffdf9
-#define DT_MOVEENT	0x6ffffdfa
-#define DT_MOVESZ	0x6ffffdfb
-#define DT_FEATURE_1	0x6ffffdfc	/* Feature selection (DTF_*).  */
-#define DT_POSFLAG_1	0x6ffffdfd	/* Flags for DT_* entries, effecting
-					   the following DT_* entry.  */
-#define DT_SYMINSZ	0x6ffffdfe	/* Size of syminfo table (in bytes) */
-#define DT_SYMINENT	0x6ffffdff	/* Entry size of syminfo */
-#define DT_VALRNGHI	0x6ffffdff
-#define DT_VALTAGIDX(tag)	(DT_VALRNGHI - (tag))	/* Reverse order! */
-#define DT_VALNUM 12
-
-/* DT_* entries which fall between DT_ADDRRNGHI & DT_ADDRRNGLO use the
-   Dyn.d_un.d_ptr field of the Elf*_Dyn structure.
-
-   If any adjustment is made to the ELF object after it has been
-   built these entries will need to be adjusted.  */
-#define DT_ADDRRNGLO	0x6ffffe00
-#define DT_GNU_HASH	0x6ffffef5	/* GNU-style hash table.  */
-#define DT_TLSDESC_PLT	0x6ffffef6
-#define DT_TLSDESC_GOT	0x6ffffef7
-#define DT_GNU_CONFLICT	0x6ffffef8	/* Start of conflict section */
-#define DT_GNU_LIBLIST	0x6ffffef9	/* Library list */
-#define DT_CONFIG	0x6ffffefa	/* Configuration information.  */
-#define DT_DEPAUDIT	0x6ffffefb	/* Dependency auditing.  */
-#define DT_AUDIT	0x6ffffefc	/* Object auditing.  */
-#define	DT_PLTPAD	0x6ffffefd	/* PLT padding.  */
-#define	DT_MOVETAB	0x6ffffefe	/* Move table.  */
-#define DT_SYMINFO	0x6ffffeff	/* Syminfo table.  */
-#define DT_ADDRRNGHI	0x6ffffeff
-#define DT_ADDRTAGIDX(tag)	(DT_ADDRRNGHI - (tag))	/* Reverse order! */
-#define DT_ADDRNUM 11
-
-/* The versioning entry types.  The next are defined as part of the
-   GNU extension.  */
-#define DT_VERSYM	0x6ffffff0
-
-#define DT_RELACOUNT	0x6ffffff9
-#define DT_RELCOUNT	0x6ffffffa
-
-/* These were chosen by Sun.  */
-#define DT_FLAGS_1	0x6ffffffb	/* State flags, see DF_1_* below.  */
-#define	DT_VERDEF	0x6ffffffc	/* Address of version definition
-					   table */
-#define	DT_VERDEFNUM	0x6ffffffd	/* Number of version definitions */
-#define	DT_VERNEED	0x6ffffffe	/* Address of table with needed
-					   versions */
-#define	DT_VERNEEDNUM	0x6fffffff	/* Number of needed versions */
-#define DT_VERSIONTAGIDX(tag)	(DT_VERNEEDNUM - (tag))	/* Reverse order! */
-#define DT_VERSIONTAGNUM 16
-
-/* Sun added these machine-independent extensions in the "processor-specific"
-   range.  Be compatible.  */
-#define DT_AUXILIARY    0x7ffffffd      /* Shared object to load before self */
-#define DT_FILTER       0x7fffffff      /* Shared object to get values from */
-#define DT_EXTRATAGIDX(tag)	((Elf32_Word)-((Elf32_Sword) (tag) <<1>>1)-1)
-#define DT_EXTRANUM	3
-
-/* Values of `d_un.d_val' in the DT_FLAGS entry.  */
-#define DF_ORIGIN	0x00000001	/* Object may use DF_ORIGIN */
-#define DF_SYMBOLIC	0x00000002	/* Symbol resolutions starts here */
-#define DF_TEXTREL	0x00000004	/* Object contains text relocations */
-#define DF_BIND_NOW	0x00000008	/* No lazy binding for this object */
-#define DF_STATIC_TLS	0x00000010	/* Module uses the static TLS model */
-
-/* State flags selectable in the `d_un.d_val' element of the DT_FLAGS_1
-   entry in the dynamic section.  */
-#define DF_1_NOW	0x00000001	/* Set RTLD_NOW for this object.  */
-#define DF_1_GLOBAL	0x00000002	/* Set RTLD_GLOBAL for this object.  */
-#define DF_1_GROUP	0x00000004	/* Set RTLD_GROUP for this object.  */
-#define DF_1_NODELETE	0x00000008	/* Set RTLD_NODELETE for this object.*/
-#define DF_1_LOADFLTR	0x00000010	/* Trigger filtee loading at runtime.*/
-#define DF_1_INITFIRST	0x00000020	/* Set RTLD_INITFIRST for this object*/
-#define DF_1_NOOPEN	0x00000040	/* Set RTLD_NOOPEN for this object.  */
-#define DF_1_ORIGIN	0x00000080	/* $ORIGIN must be handled.  */
-#define DF_1_DIRECT	0x00000100	/* Direct binding enabled.  */
-#define DF_1_TRANS	0x00000200
-#define DF_1_INTERPOSE	0x00000400	/* Object is used to interpose.  */
-#define DF_1_NODEFLIB	0x00000800	/* Ignore default lib search path.  */
-#define DF_1_NODUMP	0x00001000	/* Object can't be dldump'ed.  */
-#define DF_1_CONFALT	0x00002000	/* Configuration alternative created.*/
-#define DF_1_ENDFILTEE	0x00004000	/* Filtee terminates filters search. */
-#define	DF_1_DISPRELDNE	0x00008000	/* Disp reloc applied at build time. */
-#define	DF_1_DISPRELPND	0x00010000	/* Disp reloc applied at run-time.  */
-#define	DF_1_NODIRECT	0x00020000	/* Object has no-direct binding. */
-#define	DF_1_IGNMULDEF	0x00040000
-#define	DF_1_NOKSYMS	0x00080000
-#define	DF_1_NOHDR	0x00100000
-#define	DF_1_EDITED	0x00200000	/* Object is modified after built.  */
-#define	DF_1_NORELOC	0x00400000
-#define	DF_1_SYMINTPOSE	0x00800000	/* Object has individual interposers.  */
-#define	DF_1_GLOBAUDIT	0x01000000	/* Global auditing required.  */
-#define	DF_1_SINGLETON	0x02000000	/* Singleton symbols are used.  */
-#define	DF_1_STUB	0x04000000
-#define	DF_1_PIE	0x08000000
-
-/* Flags for the feature selection in DT_FEATURE_1.  */
-#define DTF_1_PARINIT	0x00000001
-#define DTF_1_CONFEXP	0x00000002
-
-/* Flags in the DT_POSFLAG_1 entry effecting only the next DT_* entry.  */
-#define DF_P1_LAZYLOAD	0x00000001	/* Lazyload following object.  */
-#define DF_P1_GROUPPERM	0x00000002	/* Symbols from next object are not
-					   generally available.  */
-
-/* Version definition sections.  */
-
-typedef struct
-{
-  Elf32_Half	vd_version;		/* Version revision */
-  Elf32_Half	vd_flags;		/* Version information */
-  Elf32_Half	vd_ndx;			/* Version Index */
-  Elf32_Half	vd_cnt;			/* Number of associated aux entries */
-  Elf32_Word	vd_hash;		/* Version name hash value */
-  Elf32_Word	vd_aux;			/* Offset in bytes to verdaux array */
-  Elf32_Word	vd_next;		/* Offset in bytes to next verdef
-					   entry */
-} Elf32_Verdef;
-
-typedef struct
-{
-  Elf64_Half	vd_version;		/* Version revision */
-  Elf64_Half	vd_flags;		/* Version information */
-  Elf64_Half	vd_ndx;			/* Version Index */
-  Elf64_Half	vd_cnt;			/* Number of associated aux entries */
-  Elf64_Word	vd_hash;		/* Version name hash value */
-  Elf64_Word	vd_aux;			/* Offset in bytes to verdaux array */
-  Elf64_Word	vd_next;		/* Offset in bytes to next verdef
-					   entry */
-} Elf64_Verdef;
-
-
-/* Legal values for vd_version (version revision).  */
-#define VER_DEF_NONE	0		/* No version */
-#define VER_DEF_CURRENT	1		/* Current version */
-#define VER_DEF_NUM	2		/* Given version number */
-
-/* Legal values for vd_flags (version information flags).  */
-#define VER_FLG_BASE	0x1		/* Version definition of file itself */
-#define VER_FLG_WEAK	0x2		/* Weak version identifier */
-
-/* Versym symbol index values.  */
-#define	VER_NDX_LOCAL		0	/* Symbol is local.  */
-#define	VER_NDX_GLOBAL		1	/* Symbol is global.  */
-#define	VER_NDX_LORESERVE	0xff00	/* Beginning of reserved entries.  */
-#define	VER_NDX_ELIMINATE	0xff01	/* Symbol is to be eliminated.  */
-
-/* Auxialiary version information.  */
-
-typedef struct
-{
-  Elf32_Word	vda_name;		/* Version or dependency names */
-  Elf32_Word	vda_next;		/* Offset in bytes to next verdaux
-					   entry */
-} Elf32_Verdaux;
-
-typedef struct
-{
-  Elf64_Word	vda_name;		/* Version or dependency names */
-  Elf64_Word	vda_next;		/* Offset in bytes to next verdaux
-					   entry */
-} Elf64_Verdaux;
-
-
-/* Version dependency section.  */
-
-typedef struct
-{
-  Elf32_Half	vn_version;		/* Version of structure */
-  Elf32_Half	vn_cnt;			/* Number of associated aux entries */
-  Elf32_Word	vn_file;		/* Offset of filename for this
-					   dependency */
-  Elf32_Word	vn_aux;			/* Offset in bytes to vernaux array */
-  Elf32_Word	vn_next;		/* Offset in bytes to next verneed
-					   entry */
-} Elf32_Verneed;
-
-typedef struct
-{
-  Elf64_Half	vn_version;		/* Version of structure */
-  Elf64_Half	vn_cnt;			/* Number of associated aux entries */
-  Elf64_Word	vn_file;		/* Offset of filename for this
-					   dependency */
-  Elf64_Word	vn_aux;			/* Offset in bytes to vernaux array */
-  Elf64_Word	vn_next;		/* Offset in bytes to next verneed
-					   entry */
-} Elf64_Verneed;
-
-
-/* Legal values for vn_version (version revision).  */
-#define VER_NEED_NONE	 0		/* No version */
-#define VER_NEED_CURRENT 1		/* Current version */
-#define VER_NEED_NUM	 2		/* Given version number */
-
-/* Auxiliary needed version information.  */
-
-typedef struct
-{
-  Elf32_Word	vna_hash;		/* Hash value of dependency name */
-  Elf32_Half	vna_flags;		/* Dependency specific information */
-  Elf32_Half	vna_other;		/* Unused */
-  Elf32_Word	vna_name;		/* Dependency name string offset */
-  Elf32_Word	vna_next;		/* Offset in bytes to next vernaux
-					   entry */
-} Elf32_Vernaux;
-
-typedef struct
-{
-  Elf64_Word	vna_hash;		/* Hash value of dependency name */
-  Elf64_Half	vna_flags;		/* Dependency specific information */
-  Elf64_Half	vna_other;		/* Unused */
-  Elf64_Word	vna_name;		/* Dependency name string offset */
-  Elf64_Word	vna_next;		/* Offset in bytes to next vernaux
-					   entry */
-} Elf64_Vernaux;
-
-
-/* Legal values for vna_flags.  */
-#define VER_FLG_WEAK	0x2		/* Weak version identifier */
-
-
-/* Auxiliary vector.  */
-
-/* This vector is normally only used by the program interpreter.  The
-   usual definition in an ABI supplement uses the name auxv_t.  The
-   vector is not usually defined in a standard <elf.h> file, but it
-   can't hurt.  We rename it to avoid conflicts.  The sizes of these
-   types are an arrangement between the exec server and the program
-   interpreter, so we don't fully specify them here.  */
-
-typedef struct
-{
-  uint32_t a_type;		/* Entry type */
-  union
-    {
-      uint32_t a_val;		/* Integer value */
-      /* We use to have pointer elements added here.  We cannot do that,
-	 though, since it does not work when using 32-bit definitions
-	 on 64-bit platforms and vice versa.  */
-    } a_un;
-} Elf32_auxv_t;
-
-typedef struct
-{
-  uint64_t a_type;		/* Entry type */
-  union
-    {
-      uint64_t a_val;		/* Integer value */
-      /* We use to have pointer elements added here.  We cannot do that,
-	 though, since it does not work when using 32-bit definitions
-	 on 64-bit platforms and vice versa.  */
-    } a_un;
-} Elf64_auxv_t;
-
-/* Legal values for a_type (entry type).  */
-
-#define AT_NULL		0		/* End of vector */
-#define AT_IGNORE	1		/* Entry should be ignored */
-#define AT_EXECFD	2		/* File descriptor of program */
-#define AT_PHDR		3		/* Program headers for program */
-#define AT_PHENT	4		/* Size of program header entry */
-#define AT_PHNUM	5		/* Number of program headers */
-#define AT_PAGESZ	6		/* System page size */
-#define AT_BASE		7		/* Base address of interpreter */
-#define AT_FLAGS	8		/* Flags */
-#define AT_ENTRY	9		/* Entry point of program */
-#define AT_NOTELF	10		/* Program is not ELF */
-#define AT_UID		11		/* Real uid */
-#define AT_EUID		12		/* Effective uid */
-#define AT_GID		13		/* Real gid */
-#define AT_EGID		14		/* Effective gid */
-#define AT_CLKTCK	17		/* Frequency of times() */
-
-/* Some more special a_type values describing the hardware.  */
-#define AT_PLATFORM	15		/* String identifying platform.  */
-#define AT_HWCAP	16		/* Machine-dependent hints about
-					   processor capabilities.  */
-
-/* This entry gives some information about the FPU initialization
-   performed by the kernel.  */
-#define AT_FPUCW	18		/* Used FPU control word.  */
-
-/* Cache block sizes.  */
-#define AT_DCACHEBSIZE	19		/* Data cache block size.  */
-#define AT_ICACHEBSIZE	20		/* Instruction cache block size.  */
-#define AT_UCACHEBSIZE	21		/* Unified cache block size.  */
-
-/* A special ignored value for PPC, used by the kernel to control the
-   interpretation of the AUXV. Must be > 16.  */
-#define AT_IGNOREPPC	22		/* Entry should be ignored.  */
-
-#define	AT_SECURE	23		/* Boolean, was exec setuid-like?  */
-
-#define AT_BASE_PLATFORM 24		/* String identifying real platforms.*/
-
-#define AT_RANDOM	25		/* Address of 16 random bytes.  */
-
-#define AT_HWCAP2	26		/* More machine-dependent hints about
-					   processor capabilities.  */
-
-#define AT_EXECFN	31		/* Filename of executable.  */
-
-/* Pointer to the global system page used for system calls and other
-   nice things.  */
-#define AT_SYSINFO	32
-#define AT_SYSINFO_EHDR	33
-
-/* Shapes of the caches.  Bits 0-3 contains associativity; bits 4-7 contains
-   log2 of line size; mask those to get cache size.  */
-#define AT_L1I_CACHESHAPE	34
-#define AT_L1D_CACHESHAPE	35
-#define AT_L2_CACHESHAPE	36
-#define AT_L3_CACHESHAPE	37
-
-/* Shapes of the caches, with more room to describe them.
-   *GEOMETRY are comprised of cache line size in bytes in the bottom 16 bits
-   and the cache associativity in the next 16 bits.  */
-#define AT_L1I_CACHESIZE	40
-#define AT_L1I_CACHEGEOMETRY	41
-#define AT_L1D_CACHESIZE	42
-#define AT_L1D_CACHEGEOMETRY	43
-#define AT_L2_CACHESIZE		44
-#define AT_L2_CACHEGEOMETRY	45
-#define AT_L3_CACHESIZE		46
-#define AT_L3_CACHEGEOMETRY	47
-
-#define AT_MINSIGSTKSZ		51 /* Stack needed for signal delivery
-				      (AArch64).  */
-
-/* Note section contents.  Each entry in the note section begins with
-   a header of a fixed form.  */
-
-typedef struct
-{
-  Elf32_Word n_namesz;			/* Length of the note's name.  */
-  Elf32_Word n_descsz;			/* Length of the note's descriptor.  */
-  Elf32_Word n_type;			/* Type of the note.  */
-} Elf32_Nhdr;
-
-typedef struct
-{
-  Elf64_Word n_namesz;			/* Length of the note's name.  */
-  Elf64_Word n_descsz;			/* Length of the note's descriptor.  */
-  Elf64_Word n_type;			/* Type of the note.  */
-} Elf64_Nhdr;
-
-/* Known names of notes.  */
-
-/* Solaris entries in the note section have this name.  */
-#define ELF_NOTE_SOLARIS	"SUNW Solaris"
-
-/* Note entries for GNU systems have this name.  */
-#define ELF_NOTE_GNU		"GNU"
-
-
-/* Defined types of notes for Solaris.  */
-
-/* Value of descriptor (one word) is desired pagesize for the binary.  */
-#define ELF_NOTE_PAGESIZE_HINT	1
-
-
-/* Defined note types for GNU systems.  */
-
-/* ABI information.  The descriptor consists of words:
-   word 0: OS descriptor
-   word 1: major version of the ABI
-   word 2: minor version of the ABI
-   word 3: subminor version of the ABI
-*/
-#define NT_GNU_ABI_TAG	1
-#define ELF_NOTE_ABI	NT_GNU_ABI_TAG /* Old name.  */
-
-/* Known OSes.  These values can appear in word 0 of an
-   NT_GNU_ABI_TAG note section entry.  */
-#define ELF_NOTE_OS_LINUX	0
-#define ELF_NOTE_OS_GNU		1
-#define ELF_NOTE_OS_SOLARIS2	2
-#define ELF_NOTE_OS_FREEBSD	3
-
-/* Synthetic hwcap information.  The descriptor begins with two words:
-   word 0: number of entries
-   word 1: bitmask of enabled entries
-   Then follow variable-length entries, one byte followed by a
-   '\0'-terminated hwcap name string.  The byte gives the bit
-   number to test if enabled, (1U << bit) & bitmask.  */
-#define NT_GNU_HWCAP	2
-
-/* Build ID bits as generated by ld --build-id.
-   The descriptor consists of any nonzero number of bytes.  */
-#define NT_GNU_BUILD_ID	3
-
-/* Version note generated by GNU gold containing a version string.  */
-#define NT_GNU_GOLD_VERSION	4
-
-/* Program property.  */
-#define NT_GNU_PROPERTY_TYPE_0 5
-
-/* Note section name of program property.   */
-#define NOTE_GNU_PROPERTY_SECTION_NAME ".note.gnu.property"
-
-/* Values used in GNU .note.gnu.property notes (NT_GNU_PROPERTY_TYPE_0).  */
-
-/* Stack size.  */
-#define GNU_PROPERTY_STACK_SIZE			1
-/* No copy relocation on protected data symbol.  */
-#define GNU_PROPERTY_NO_COPY_ON_PROTECTED	2
-
-/* Processor-specific semantics, lo */
-#define GNU_PROPERTY_LOPROC			0xc0000000
-/* Processor-specific semantics, hi */
-#define GNU_PROPERTY_HIPROC			0xdfffffff
-/* Application-specific semantics, lo */
-#define GNU_PROPERTY_LOUSER			0xe0000000
-/* Application-specific semantics, hi */
-#define GNU_PROPERTY_HIUSER			0xffffffff
-
-/* The x86 instruction sets indicated by the corresponding bits are
-   used in program.  Their support in the hardware is optional.  */
-#define GNU_PROPERTY_X86_ISA_1_USED		0xc0000000
-/* The x86 instruction sets indicated by the corresponding bits are
-   used in program and they must be supported by the hardware.   */
-#define GNU_PROPERTY_X86_ISA_1_NEEDED		0xc0000001
-/* X86 processor-specific features used in program.  */
-#define GNU_PROPERTY_X86_FEATURE_1_AND		0xc0000002
-
-#define GNU_PROPERTY_X86_ISA_1_486		(1U << 0)
-#define GNU_PROPERTY_X86_ISA_1_586		(1U << 1)
-#define GNU_PROPERTY_X86_ISA_1_686		(1U << 2)
-#define GNU_PROPERTY_X86_ISA_1_SSE		(1U << 3)
-#define GNU_PROPERTY_X86_ISA_1_SSE2		(1U << 4)
-#define GNU_PROPERTY_X86_ISA_1_SSE3		(1U << 5)
-#define GNU_PROPERTY_X86_ISA_1_SSSE3		(1U << 6)
-#define GNU_PROPERTY_X86_ISA_1_SSE4_1		(1U << 7)
-#define GNU_PROPERTY_X86_ISA_1_SSE4_2		(1U << 8)
-#define GNU_PROPERTY_X86_ISA_1_AVX		(1U << 9)
-#define GNU_PROPERTY_X86_ISA_1_AVX2		(1U << 10)
-#define GNU_PROPERTY_X86_ISA_1_AVX512F		(1U << 11)
-#define GNU_PROPERTY_X86_ISA_1_AVX512CD		(1U << 12)
-#define GNU_PROPERTY_X86_ISA_1_AVX512ER		(1U << 13)
-#define GNU_PROPERTY_X86_ISA_1_AVX512PF		(1U << 14)
-#define GNU_PROPERTY_X86_ISA_1_AVX512VL		(1U << 15)
-#define GNU_PROPERTY_X86_ISA_1_AVX512DQ		(1U << 16)
-#define GNU_PROPERTY_X86_ISA_1_AVX512BW		(1U << 17)
-
-/* This indicates that all executable sections are compatible with
-   IBT.  */
-#define GNU_PROPERTY_X86_FEATURE_1_IBT		(1U << 0)
-/* This indicates that all executable sections are compatible with
-   SHSTK.  */
-#define GNU_PROPERTY_X86_FEATURE_1_SHSTK	(1U << 1)
-
-/* Move records.  */
-typedef struct
-{
-  Elf32_Xword m_value;		/* Symbol value.  */
-  Elf32_Word m_info;		/* Size and index.  */
-  Elf32_Word m_poffset;		/* Symbol offset.  */
-  Elf32_Half m_repeat;		/* Repeat count.  */
-  Elf32_Half m_stride;		/* Stride info.  */
-} Elf32_Move;
-
-typedef struct
-{
-  Elf64_Xword m_value;		/* Symbol value.  */
-  Elf64_Xword m_info;		/* Size and index.  */
-  Elf64_Xword m_poffset;	/* Symbol offset.  */
-  Elf64_Half m_repeat;		/* Repeat count.  */
-  Elf64_Half m_stride;		/* Stride info.  */
-} Elf64_Move;
-
-/* Macro to construct move records.  */
-#define ELF32_M_SYM(info)	((info) >> 8)
-#define ELF32_M_SIZE(info)	((unsigned char) (info))
-#define ELF32_M_INFO(sym, size)	(((sym) << 8) + (unsigned char) (size))
-
-#define ELF64_M_SYM(info)	ELF32_M_SYM (info)
-#define ELF64_M_SIZE(info)	ELF32_M_SIZE (info)
-#define ELF64_M_INFO(sym, size)	ELF32_M_INFO (sym, size)
-
-
-/* Motorola 68k specific definitions.  */
-
-/* Values for Elf32_Ehdr.e_flags.  */
-#define EF_CPU32	0x00810000
-
-/* m68k relocs.  */
-
-#define R_68K_NONE	0		/* No reloc */
-#define R_68K_32	1		/* Direct 32 bit  */
-#define R_68K_16	2		/* Direct 16 bit  */
-#define R_68K_8		3		/* Direct 8 bit  */
-#define R_68K_PC32	4		/* PC relative 32 bit */
-#define R_68K_PC16	5		/* PC relative 16 bit */
-#define R_68K_PC8	6		/* PC relative 8 bit */
-#define R_68K_GOT32	7		/* 32 bit PC relative GOT entry */
-#define R_68K_GOT16	8		/* 16 bit PC relative GOT entry */
-#define R_68K_GOT8	9		/* 8 bit PC relative GOT entry */
-#define R_68K_GOT32O	10		/* 32 bit GOT offset */
-#define R_68K_GOT16O	11		/* 16 bit GOT offset */
-#define R_68K_GOT8O	12		/* 8 bit GOT offset */
-#define R_68K_PLT32	13		/* 32 bit PC relative PLT address */
-#define R_68K_PLT16	14		/* 16 bit PC relative PLT address */
-#define R_68K_PLT8	15		/* 8 bit PC relative PLT address */
-#define R_68K_PLT32O	16		/* 32 bit PLT offset */
-#define R_68K_PLT16O	17		/* 16 bit PLT offset */
-#define R_68K_PLT8O	18		/* 8 bit PLT offset */
-#define R_68K_COPY	19		/* Copy symbol at runtime */
-#define R_68K_GLOB_DAT	20		/* Create GOT entry */
-#define R_68K_JMP_SLOT	21		/* Create PLT entry */
-#define R_68K_RELATIVE	22		/* Adjust by program base */
-#define R_68K_TLS_GD32      25          /* 32 bit GOT offset for GD */
-#define R_68K_TLS_GD16      26          /* 16 bit GOT offset for GD */
-#define R_68K_TLS_GD8       27          /* 8 bit GOT offset for GD */
-#define R_68K_TLS_LDM32     28          /* 32 bit GOT offset for LDM */
-#define R_68K_TLS_LDM16     29          /* 16 bit GOT offset for LDM */
-#define R_68K_TLS_LDM8      30          /* 8 bit GOT offset for LDM */
-#define R_68K_TLS_LDO32     31          /* 32 bit module-relative offset */
-#define R_68K_TLS_LDO16     32          /* 16 bit module-relative offset */
-#define R_68K_TLS_LDO8      33          /* 8 bit module-relative offset */
-#define R_68K_TLS_IE32      34          /* 32 bit GOT offset for IE */
-#define R_68K_TLS_IE16      35          /* 16 bit GOT offset for IE */
-#define R_68K_TLS_IE8       36          /* 8 bit GOT offset for IE */
-#define R_68K_TLS_LE32      37          /* 32 bit offset relative to
-					   static TLS block */
-#define R_68K_TLS_LE16      38          /* 16 bit offset relative to
-					   static TLS block */
-#define R_68K_TLS_LE8       39          /* 8 bit offset relative to
-					   static TLS block */
-#define R_68K_TLS_DTPMOD32  40          /* 32 bit module number */
-#define R_68K_TLS_DTPREL32  41          /* 32 bit module-relative offset */
-#define R_68K_TLS_TPREL32   42          /* 32 bit TP-relative offset */
-/* Keep this the last entry.  */
-#define R_68K_NUM	43
-
-/* Intel 80386 specific definitions.  */
-
-/* i386 relocs.  */
-
-#define R_386_NONE	   0		/* No reloc */
-#define R_386_32	   1		/* Direct 32 bit  */
-#define R_386_PC32	   2		/* PC relative 32 bit */
-#define R_386_GOT32	   3		/* 32 bit GOT entry */
-#define R_386_PLT32	   4		/* 32 bit PLT address */
-#define R_386_COPY	   5		/* Copy symbol at runtime */
-#define R_386_GLOB_DAT	   6		/* Create GOT entry */
-#define R_386_JMP_SLOT	   7		/* Create PLT entry */
-#define R_386_RELATIVE	   8		/* Adjust by program base */
-#define R_386_GOTOFF	   9		/* 32 bit offset to GOT */
-#define R_386_GOTPC	   10		/* 32 bit PC relative offset to GOT */
-#define R_386_32PLT	   11
-#define R_386_TLS_TPOFF	   14		/* Offset in static TLS block */
-#define R_386_TLS_IE	   15		/* Address of GOT entry for static TLS
-					   block offset */
-#define R_386_TLS_GOTIE	   16		/* GOT entry for static TLS block
-					   offset */
-#define R_386_TLS_LE	   17		/* Offset relative to static TLS
-					   block */
-#define R_386_TLS_GD	   18		/* Direct 32 bit for GNU version of
-					   general dynamic thread local data */
-#define R_386_TLS_LDM	   19		/* Direct 32 bit for GNU version of
-					   local dynamic thread local data
-					   in LE code */
-#define R_386_16	   20
-#define R_386_PC16	   21
-#define R_386_8		   22
-#define R_386_PC8	   23
-#define R_386_TLS_GD_32	   24		/* Direct 32 bit for general dynamic
-					   thread local data */
-#define R_386_TLS_GD_PUSH  25		/* Tag for pushl in GD TLS code */
-#define R_386_TLS_GD_CALL  26		/* Relocation for call to
-					   __tls_get_addr() */
-#define R_386_TLS_GD_POP   27		/* Tag for popl in GD TLS code */
-#define R_386_TLS_LDM_32   28		/* Direct 32 bit for local dynamic
-					   thread local data in LE code */
-#define R_386_TLS_LDM_PUSH 29		/* Tag for pushl in LDM TLS code */
-#define R_386_TLS_LDM_CALL 30		/* Relocation for call to
-					   __tls_get_addr() in LDM code */
-#define R_386_TLS_LDM_POP  31		/* Tag for popl in LDM TLS code */
-#define R_386_TLS_LDO_32   32		/* Offset relative to TLS block */
-#define R_386_TLS_IE_32	   33		/* GOT entry for negated static TLS
-					   block offset */
-#define R_386_TLS_LE_32	   34		/* Negated offset relative to static
-					   TLS block */
-#define R_386_TLS_DTPMOD32 35		/* ID of module containing symbol */
-#define R_386_TLS_DTPOFF32 36		/* Offset in TLS block */
-#define R_386_TLS_TPOFF32  37		/* Negated offset in static TLS block */
-#define R_386_SIZE32	   38 		/* 32-bit symbol size */
-#define R_386_TLS_GOTDESC  39		/* GOT offset for TLS descriptor.  */
-#define R_386_TLS_DESC_CALL 40		/* Marker of call through TLS
-					   descriptor for
-					   relaxation.  */
-#define R_386_TLS_DESC     41		/* TLS descriptor containing
-					   pointer to code and to
-					   argument, returning the TLS
-					   offset for the symbol.  */
-#define R_386_IRELATIVE	   42		/* Adjust indirectly by program base */
-#define R_386_GOT32X	   43		/* Load from 32 bit GOT entry,
-					   relaxable. */
-/* Keep this the last entry.  */
-#define R_386_NUM	   44
-
-/* SUN SPARC specific definitions.  */
-
-/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
-
-#define STT_SPARC_REGISTER	13	/* Global register reserved to app. */
-
-/* Values for Elf64_Ehdr.e_flags.  */
-
-#define EF_SPARCV9_MM		3
-#define EF_SPARCV9_TSO		0
-#define EF_SPARCV9_PSO		1
-#define EF_SPARCV9_RMO		2
-#define EF_SPARC_LEDATA		0x800000 /* little endian data */
-#define EF_SPARC_EXT_MASK	0xFFFF00
-#define EF_SPARC_32PLUS		0x000100 /* generic V8+ features */
-#define EF_SPARC_SUN_US1	0x000200 /* Sun UltraSPARC1 extensions */
-#define EF_SPARC_HAL_R1		0x000400 /* HAL R1 extensions */
-#define EF_SPARC_SUN_US3	0x000800 /* Sun UltraSPARCIII extensions */
-
-/* SPARC relocs.  */
-
-#define R_SPARC_NONE		0	/* No reloc */
-#define R_SPARC_8		1	/* Direct 8 bit */
-#define R_SPARC_16		2	/* Direct 16 bit */
-#define R_SPARC_32		3	/* Direct 32 bit */
-#define R_SPARC_DISP8		4	/* PC relative 8 bit */
-#define R_SPARC_DISP16		5	/* PC relative 16 bit */
-#define R_SPARC_DISP32		6	/* PC relative 32 bit */
-#define R_SPARC_WDISP30		7	/* PC relative 30 bit shifted */
-#define R_SPARC_WDISP22		8	/* PC relative 22 bit shifted */
-#define R_SPARC_HI22		9	/* High 22 bit */
-#define R_SPARC_22		10	/* Direct 22 bit */
-#define R_SPARC_13		11	/* Direct 13 bit */
-#define R_SPARC_LO10		12	/* Truncated 10 bit */
-#define R_SPARC_GOT10		13	/* Truncated 10 bit GOT entry */
-#define R_SPARC_GOT13		14	/* 13 bit GOT entry */
-#define R_SPARC_GOT22		15	/* 22 bit GOT entry shifted */
-#define R_SPARC_PC10		16	/* PC relative 10 bit truncated */
-#define R_SPARC_PC22		17	/* PC relative 22 bit shifted */
-#define R_SPARC_WPLT30		18	/* 30 bit PC relative PLT address */
-#define R_SPARC_COPY		19	/* Copy symbol at runtime */
-#define R_SPARC_GLOB_DAT	20	/* Create GOT entry */
-#define R_SPARC_JMP_SLOT	21	/* Create PLT entry */
-#define R_SPARC_RELATIVE	22	/* Adjust by program base */
-#define R_SPARC_UA32		23	/* Direct 32 bit unaligned */
-
-/* Additional Sparc64 relocs.  */
-
-#define R_SPARC_PLT32		24	/* Direct 32 bit ref to PLT entry */
-#define R_SPARC_HIPLT22		25	/* High 22 bit PLT entry */
-#define R_SPARC_LOPLT10		26	/* Truncated 10 bit PLT entry */
-#define R_SPARC_PCPLT32		27	/* PC rel 32 bit ref to PLT entry */
-#define R_SPARC_PCPLT22		28	/* PC rel high 22 bit PLT entry */
-#define R_SPARC_PCPLT10		29	/* PC rel trunc 10 bit PLT entry */
-#define R_SPARC_10		30	/* Direct 10 bit */
-#define R_SPARC_11		31	/* Direct 11 bit */
-#define R_SPARC_64		32	/* Direct 64 bit */
-#define R_SPARC_OLO10		33	/* 10bit with secondary 13bit addend */
-#define R_SPARC_HH22		34	/* Top 22 bits of direct 64 bit */
-#define R_SPARC_HM10		35	/* High middle 10 bits of ... */
-#define R_SPARC_LM22		36	/* Low middle 22 bits of ... */
-#define R_SPARC_PC_HH22		37	/* Top 22 bits of pc rel 64 bit */
-#define R_SPARC_PC_HM10		38	/* High middle 10 bit of ... */
-#define R_SPARC_PC_LM22		39	/* Low miggle 22 bits of ... */
-#define R_SPARC_WDISP16		40	/* PC relative 16 bit shifted */
-#define R_SPARC_WDISP19		41	/* PC relative 19 bit shifted */
-#define R_SPARC_GLOB_JMP	42	/* was part of v9 ABI but was removed */
-#define R_SPARC_7		43	/* Direct 7 bit */
-#define R_SPARC_5		44	/* Direct 5 bit */
-#define R_SPARC_6		45	/* Direct 6 bit */
-#define R_SPARC_DISP64		46	/* PC relative 64 bit */
-#define R_SPARC_PLT64		47	/* Direct 64 bit ref to PLT entry */
-#define R_SPARC_HIX22		48	/* High 22 bit complemented */
-#define R_SPARC_LOX10		49	/* Truncated 11 bit complemented */
-#define R_SPARC_H44		50	/* Direct high 12 of 44 bit */
-#define R_SPARC_M44		51	/* Direct mid 22 of 44 bit */
-#define R_SPARC_L44		52	/* Direct low 10 of 44 bit */
-#define R_SPARC_REGISTER	53	/* Global register usage */
-#define R_SPARC_UA64		54	/* Direct 64 bit unaligned */
-#define R_SPARC_UA16		55	/* Direct 16 bit unaligned */
-#define R_SPARC_TLS_GD_HI22	56
-#define R_SPARC_TLS_GD_LO10	57
-#define R_SPARC_TLS_GD_ADD	58
-#define R_SPARC_TLS_GD_CALL	59
-#define R_SPARC_TLS_LDM_HI22	60
-#define R_SPARC_TLS_LDM_LO10	61
-#define R_SPARC_TLS_LDM_ADD	62
-#define R_SPARC_TLS_LDM_CALL	63
-#define R_SPARC_TLS_LDO_HIX22	64
-#define R_SPARC_TLS_LDO_LOX10	65
-#define R_SPARC_TLS_LDO_ADD	66
-#define R_SPARC_TLS_IE_HI22	67
-#define R_SPARC_TLS_IE_LO10	68
-#define R_SPARC_TLS_IE_LD	69
-#define R_SPARC_TLS_IE_LDX	70
-#define R_SPARC_TLS_IE_ADD	71
-#define R_SPARC_TLS_LE_HIX22	72
-#define R_SPARC_TLS_LE_LOX10	73
-#define R_SPARC_TLS_DTPMOD32	74
-#define R_SPARC_TLS_DTPMOD64	75
-#define R_SPARC_TLS_DTPOFF32	76
-#define R_SPARC_TLS_DTPOFF64	77
-#define R_SPARC_TLS_TPOFF32	78
-#define R_SPARC_TLS_TPOFF64	79
-#define R_SPARC_GOTDATA_HIX22	80
-#define R_SPARC_GOTDATA_LOX10	81
-#define R_SPARC_GOTDATA_OP_HIX22	82
-#define R_SPARC_GOTDATA_OP_LOX10	83
-#define R_SPARC_GOTDATA_OP	84
-#define R_SPARC_H34		85
-#define R_SPARC_SIZE32		86
-#define R_SPARC_SIZE64		87
-#define R_SPARC_WDISP10		88
-#define R_SPARC_JMP_IREL	248
-#define R_SPARC_IRELATIVE	249
-#define R_SPARC_GNU_VTINHERIT	250
-#define R_SPARC_GNU_VTENTRY	251
-#define R_SPARC_REV32		252
-/* Keep this the last entry.  */
-#define R_SPARC_NUM		253
-
-/* For Sparc64, legal values for d_tag of Elf64_Dyn.  */
-
-#define DT_SPARC_REGISTER	0x70000001
-#define DT_SPARC_NUM		2
-
-/* MIPS R3000 specific definitions.  */
-
-/* Legal values for e_flags field of Elf32_Ehdr.  */
-
-#define EF_MIPS_NOREORDER	1     /* A .noreorder directive was used.  */
-#define EF_MIPS_PIC		2     /* Contains PIC code.  */
-#define EF_MIPS_CPIC		4     /* Uses PIC calling sequence.  */
-#define EF_MIPS_XGOT		8
-#define EF_MIPS_64BIT_WHIRL	16
-#define EF_MIPS_ABI2		32
-#define EF_MIPS_ABI_ON32	64
-#define EF_MIPS_FP64		512  /* Uses FP64 (12 callee-saved).  */
-#define EF_MIPS_NAN2008	1024  /* Uses IEEE 754-2008 NaN encoding.  */
-#define EF_MIPS_ARCH		0xf0000000 /* MIPS architecture level.  */
-
-/* Legal values for MIPS architecture level.  */
-
-#define EF_MIPS_ARCH_1		0x00000000 /* -mips1 code.  */
-#define EF_MIPS_ARCH_2		0x10000000 /* -mips2 code.  */
-#define EF_MIPS_ARCH_3		0x20000000 /* -mips3 code.  */
-#define EF_MIPS_ARCH_4		0x30000000 /* -mips4 code.  */
-#define EF_MIPS_ARCH_5		0x40000000 /* -mips5 code.  */
-#define EF_MIPS_ARCH_32		0x50000000 /* MIPS32 code.  */
-#define EF_MIPS_ARCH_64		0x60000000 /* MIPS64 code.  */
-#define EF_MIPS_ARCH_32R2	0x70000000 /* MIPS32r2 code.  */
-#define EF_MIPS_ARCH_64R2	0x80000000 /* MIPS64r2 code.  */
-
-/* The following are unofficial names and should not be used.  */
-
-#define E_MIPS_ARCH_1		EF_MIPS_ARCH_1
-#define E_MIPS_ARCH_2		EF_MIPS_ARCH_2
-#define E_MIPS_ARCH_3		EF_MIPS_ARCH_3
-#define E_MIPS_ARCH_4		EF_MIPS_ARCH_4
-#define E_MIPS_ARCH_5		EF_MIPS_ARCH_5
-#define E_MIPS_ARCH_32		EF_MIPS_ARCH_32
-#define E_MIPS_ARCH_64		EF_MIPS_ARCH_64
-
-/* Special section indices.  */
-
-#define SHN_MIPS_ACOMMON	0xff00	/* Allocated common symbols.  */
-#define SHN_MIPS_TEXT		0xff01	/* Allocated test symbols.  */
-#define SHN_MIPS_DATA		0xff02	/* Allocated data symbols.  */
-#define SHN_MIPS_SCOMMON 	0xff03	/* Small common symbols.  */
-#define SHN_MIPS_SUNDEFINED	0xff04	/* Small undefined symbols.  */
-
-/* Legal values for sh_type field of Elf32_Shdr.  */
-
-#define SHT_MIPS_LIBLIST	0x70000000 /* Shared objects used in link.  */
-#define SHT_MIPS_MSYM		0x70000001
-#define SHT_MIPS_CONFLICT	0x70000002 /* Conflicting symbols.  */
-#define SHT_MIPS_GPTAB		0x70000003 /* Global data area sizes.  */
-#define SHT_MIPS_UCODE		0x70000004 /* Reserved for SGI/MIPS compilers */
-#define SHT_MIPS_DEBUG		0x70000005 /* MIPS ECOFF debugging info.  */
-#define SHT_MIPS_REGINFO	0x70000006 /* Register usage information.  */
-#define SHT_MIPS_PACKAGE	0x70000007
-#define SHT_MIPS_PACKSYM	0x70000008
-#define SHT_MIPS_RELD		0x70000009
-#define SHT_MIPS_IFACE		0x7000000b
-#define SHT_MIPS_CONTENT	0x7000000c
-#define SHT_MIPS_OPTIONS	0x7000000d /* Miscellaneous options.  */
-#define SHT_MIPS_SHDR		0x70000010
-#define SHT_MIPS_FDESC		0x70000011
-#define SHT_MIPS_EXTSYM		0x70000012
-#define SHT_MIPS_DENSE		0x70000013
-#define SHT_MIPS_PDESC		0x70000014
-#define SHT_MIPS_LOCSYM		0x70000015
-#define SHT_MIPS_AUXSYM		0x70000016
-#define SHT_MIPS_OPTSYM		0x70000017
-#define SHT_MIPS_LOCSTR		0x70000018
-#define SHT_MIPS_LINE		0x70000019
-#define SHT_MIPS_RFDESC		0x7000001a
-#define SHT_MIPS_DELTASYM	0x7000001b
-#define SHT_MIPS_DELTAINST	0x7000001c
-#define SHT_MIPS_DELTACLASS	0x7000001d
-#define SHT_MIPS_DWARF		0x7000001e /* DWARF debugging information.  */
-#define SHT_MIPS_DELTADECL	0x7000001f
-#define SHT_MIPS_SYMBOL_LIB	0x70000020
-#define SHT_MIPS_EVENTS		0x70000021 /* Event section.  */
-#define SHT_MIPS_TRANSLATE	0x70000022
-#define SHT_MIPS_PIXIE		0x70000023
-#define SHT_MIPS_XLATE		0x70000024
-#define SHT_MIPS_XLATE_DEBUG	0x70000025
-#define SHT_MIPS_WHIRL		0x70000026
-#define SHT_MIPS_EH_REGION	0x70000027
-#define SHT_MIPS_XLATE_OLD	0x70000028
-#define SHT_MIPS_PDR_EXCEPTION	0x70000029
-
-/* Legal values for sh_flags field of Elf32_Shdr.  */
-
-#define SHF_MIPS_GPREL		0x10000000 /* Must be in global data area.  */
-#define SHF_MIPS_MERGE		0x20000000
-#define SHF_MIPS_ADDR		0x40000000
-#define SHF_MIPS_STRINGS	0x80000000
-#define SHF_MIPS_NOSTRIP	0x08000000
-#define SHF_MIPS_LOCAL		0x04000000
-#define SHF_MIPS_NAMES		0x02000000
-#define SHF_MIPS_NODUPE		0x01000000
-
-
-/* Symbol tables.  */
-
-/* MIPS specific values for `st_other'.  */
-#define STO_MIPS_DEFAULT		0x0
-#define STO_MIPS_INTERNAL		0x1
-#define STO_MIPS_HIDDEN			0x2
-#define STO_MIPS_PROTECTED		0x3
-#define STO_MIPS_PLT			0x8
-#define STO_MIPS_SC_ALIGN_UNUSED	0xff
-
-/* MIPS specific values for `st_info'.  */
-#define STB_MIPS_SPLIT_COMMON		13
-
-/* Entries found in sections of type SHT_MIPS_GPTAB.  */
-
-typedef union
-{
-  struct
-    {
-      Elf32_Word gt_current_g_value;	/* -G value used for compilation.  */
-      Elf32_Word gt_unused;		/* Not used.  */
-    } gt_header;			/* First entry in section.  */
-  struct
-    {
-      Elf32_Word gt_g_value;		/* If this value were used for -G.  */
-      Elf32_Word gt_bytes;		/* This many bytes would be used.  */
-    } gt_entry;				/* Subsequent entries in section.  */
-} Elf32_gptab;
-
-/* Entry found in sections of type SHT_MIPS_REGINFO.  */
-
-typedef struct
-{
-  Elf32_Word ri_gprmask;		/* General registers used.  */
-  Elf32_Word ri_cprmask[4];		/* Coprocessor registers used.  */
-  Elf32_Sword ri_gp_value;		/* $gp register value.  */
-} Elf32_RegInfo;
-
-/* Entries found in sections of type SHT_MIPS_OPTIONS.  */
-
-typedef struct
-{
-  unsigned char kind;		/* Determines interpretation of the
-				   variable part of descriptor.  */
-  unsigned char size;		/* Size of descriptor, including header.  */
-  Elf32_Section section;	/* Section header index of section affected,
-				   0 for global options.  */
-  Elf32_Word info;		/* Kind-specific information.  */
-} Elf_Options;
-
-/* Values for `kind' field in Elf_Options.  */
-
-#define ODK_NULL	0	/* Undefined.  */
-#define ODK_REGINFO	1	/* Register usage information.  */
-#define ODK_EXCEPTIONS	2	/* Exception processing options.  */
-#define ODK_PAD		3	/* Section padding options.  */
-#define ODK_HWPATCH	4	/* Hardware workarounds performed */
-#define ODK_FILL	5	/* record the fill value used by the linker. */
-#define ODK_TAGS	6	/* reserve space for desktop tools to write. */
-#define ODK_HWAND	7	/* HW workarounds.  'AND' bits when merging. */
-#define ODK_HWOR	8	/* HW workarounds.  'OR' bits when merging.  */
-
-/* Values for `info' in Elf_Options for ODK_EXCEPTIONS entries.  */
-
-#define OEX_FPU_MIN	0x1f	/* FPE's which MUST be enabled.  */
-#define OEX_FPU_MAX	0x1f00	/* FPE's which MAY be enabled.  */
-#define OEX_PAGE0	0x10000	/* page zero must be mapped.  */
-#define OEX_SMM		0x20000	/* Force sequential memory mode?  */
-#define OEX_FPDBUG	0x40000	/* Force floating point debug mode?  */
-#define OEX_PRECISEFP	OEX_FPDBUG
-#define OEX_DISMISS	0x80000	/* Dismiss invalid address faults?  */
-
-#define OEX_FPU_INVAL	0x10
-#define OEX_FPU_DIV0	0x08
-#define OEX_FPU_OFLO	0x04
-#define OEX_FPU_UFLO	0x02
-#define OEX_FPU_INEX	0x01
-
-/* Masks for `info' in Elf_Options for an ODK_HWPATCH entry.  */
-
-#define OHW_R4KEOP	0x1	/* R4000 end-of-page patch.  */
-#define OHW_R8KPFETCH	0x2	/* may need R8000 prefetch patch.  */
-#define OHW_R5KEOP	0x4	/* R5000 end-of-page patch.  */
-#define OHW_R5KCVTL	0x8	/* R5000 cvt.[ds].l bug.  clean=1.  */
-
-#define OPAD_PREFIX	0x1
-#define OPAD_POSTFIX	0x2
-#define OPAD_SYMBOL	0x4
-
-/* Entry found in `.options' section.  */
-
-typedef struct
-{
-  Elf32_Word hwp_flags1;	/* Extra flags.  */
-  Elf32_Word hwp_flags2;	/* Extra flags.  */
-} Elf_Options_Hw;
-
-/* Masks for `info' in ElfOptions for ODK_HWAND and ODK_HWOR entries.  */
-
-#define OHWA0_R4KEOP_CHECKED	0x00000001
-#define OHWA1_R4KEOP_CLEAN	0x00000002
-
-/* MIPS relocs.  */
-
-#define R_MIPS_NONE		0	/* No reloc */
-#define R_MIPS_16		1	/* Direct 16 bit */
-#define R_MIPS_32		2	/* Direct 32 bit */
-#define R_MIPS_REL32		3	/* PC relative 32 bit */
-#define R_MIPS_26		4	/* Direct 26 bit shifted */
-#define R_MIPS_HI16		5	/* High 16 bit */
-#define R_MIPS_LO16		6	/* Low 16 bit */
-#define R_MIPS_GPREL16		7	/* GP relative 16 bit */
-#define R_MIPS_LITERAL		8	/* 16 bit literal entry */
-#define R_MIPS_GOT16		9	/* 16 bit GOT entry */
-#define R_MIPS_PC16		10	/* PC relative 16 bit */
-#define R_MIPS_CALL16		11	/* 16 bit GOT entry for function */
-#define R_MIPS_GPREL32		12	/* GP relative 32 bit */
-
-#define R_MIPS_SHIFT5		16
-#define R_MIPS_SHIFT6		17
-#define R_MIPS_64		18
-#define R_MIPS_GOT_DISP		19
-#define R_MIPS_GOT_PAGE		20
-#define R_MIPS_GOT_OFST		21
-#define R_MIPS_GOT_HI16		22
-#define R_MIPS_GOT_LO16		23
-#define R_MIPS_SUB		24
-#define R_MIPS_INSERT_A		25
-#define R_MIPS_INSERT_B		26
-#define R_MIPS_DELETE		27
-#define R_MIPS_HIGHER		28
-#define R_MIPS_HIGHEST		29
-#define R_MIPS_CALL_HI16	30
-#define R_MIPS_CALL_LO16	31
-#define R_MIPS_SCN_DISP		32
-#define R_MIPS_REL16		33
-#define R_MIPS_ADD_IMMEDIATE	34
-#define R_MIPS_PJUMP		35
-#define R_MIPS_RELGOT		36
-#define R_MIPS_JALR		37
-#define R_MIPS_TLS_DTPMOD32	38	/* Module number 32 bit */
-#define R_MIPS_TLS_DTPREL32	39	/* Module-relative offset 32 bit */
-#define R_MIPS_TLS_DTPMOD64	40	/* Module number 64 bit */
-#define R_MIPS_TLS_DTPREL64	41	/* Module-relative offset 64 bit */
-#define R_MIPS_TLS_GD		42	/* 16 bit GOT offset for GD */
-#define R_MIPS_TLS_LDM		43	/* 16 bit GOT offset for LDM */
-#define R_MIPS_TLS_DTPREL_HI16	44	/* Module-relative offset, high 16 bits */
-#define R_MIPS_TLS_DTPREL_LO16	45	/* Module-relative offset, low 16 bits */
-#define R_MIPS_TLS_GOTTPREL	46	/* 16 bit GOT offset for IE */
-#define R_MIPS_TLS_TPREL32	47	/* TP-relative offset, 32 bit */
-#define R_MIPS_TLS_TPREL64	48	/* TP-relative offset, 64 bit */
-#define R_MIPS_TLS_TPREL_HI16	49	/* TP-relative offset, high 16 bits */
-#define R_MIPS_TLS_TPREL_LO16	50	/* TP-relative offset, low 16 bits */
-#define R_MIPS_GLOB_DAT		51
-#define R_MIPS_COPY		126
-#define R_MIPS_JUMP_SLOT        127
-/* Keep this the last entry.  */
-#define R_MIPS_NUM		128
-
-/* Legal values for p_type field of Elf32_Phdr.  */
-
-#define PT_MIPS_REGINFO	  0x70000000	/* Register usage information. */
-#define PT_MIPS_RTPROC	  0x70000001	/* Runtime procedure table. */
-#define PT_MIPS_OPTIONS	  0x70000002
-#define PT_MIPS_ABIFLAGS  0x70000003	/* FP mode requirement. */
-
-/* Special program header types.  */
-
-#define PF_MIPS_LOCAL	0x10000000
-
-/* Legal values for d_tag field of Elf32_Dyn.  */
-
-#define DT_MIPS_RLD_VERSION  0x70000001	/* Runtime linker interface version */
-#define DT_MIPS_TIME_STAMP   0x70000002	/* Timestamp */
-#define DT_MIPS_ICHECKSUM    0x70000003	/* Checksum */
-#define DT_MIPS_IVERSION     0x70000004	/* Version string (string tbl index) */
-#define DT_MIPS_FLAGS	     0x70000005	/* Flags */
-#define DT_MIPS_BASE_ADDRESS 0x70000006	/* Base address */
-#define DT_MIPS_MSYM	     0x70000007
-#define DT_MIPS_CONFLICT     0x70000008	/* Address of CONFLICT section */
-#define DT_MIPS_LIBLIST	     0x70000009	/* Address of LIBLIST section */
-#define DT_MIPS_LOCAL_GOTNO  0x7000000a	/* Number of local GOT entries */
-#define DT_MIPS_CONFLICTNO   0x7000000b	/* Number of CONFLICT entries */
-#define DT_MIPS_LIBLISTNO    0x70000010	/* Number of LIBLIST entries */
-#define DT_MIPS_SYMTABNO     0x70000011	/* Number of DYNSYM entries */
-#define DT_MIPS_UNREFEXTNO   0x70000012	/* First external DYNSYM */
-#define DT_MIPS_GOTSYM	     0x70000013	/* First GOT entry in DYNSYM */
-#define DT_MIPS_HIPAGENO     0x70000014	/* Number of GOT page table entries */
-#define DT_MIPS_RLD_MAP	     0x70000016	/* Address of run time loader map.  */
-#define DT_MIPS_DELTA_CLASS  0x70000017	/* Delta C++ class definition.  */
-#define DT_MIPS_DELTA_CLASS_NO    0x70000018 /* Number of entries in
-						DT_MIPS_DELTA_CLASS.  */
-#define DT_MIPS_DELTA_INSTANCE    0x70000019 /* Delta C++ class instances.  */
-#define DT_MIPS_DELTA_INSTANCE_NO 0x7000001a /* Number of entries in
-						DT_MIPS_DELTA_INSTANCE.  */
-#define DT_MIPS_DELTA_RELOC  0x7000001b /* Delta relocations.  */
-#define DT_MIPS_DELTA_RELOC_NO 0x7000001c /* Number of entries in
-					     DT_MIPS_DELTA_RELOC.  */
-#define DT_MIPS_DELTA_SYM    0x7000001d /* Delta symbols that Delta
-					   relocations refer to.  */
-#define DT_MIPS_DELTA_SYM_NO 0x7000001e /* Number of entries in
-					   DT_MIPS_DELTA_SYM.  */
-#define DT_MIPS_DELTA_CLASSSYM 0x70000020 /* Delta symbols that hold the
-					     class declaration.  */
-#define DT_MIPS_DELTA_CLASSSYM_NO 0x70000021 /* Number of entries in
-						DT_MIPS_DELTA_CLASSSYM.  */
-#define DT_MIPS_CXX_FLAGS    0x70000022 /* Flags indicating for C++ flavor.  */
-#define DT_MIPS_PIXIE_INIT   0x70000023
-#define DT_MIPS_SYMBOL_LIB   0x70000024
-#define DT_MIPS_LOCALPAGE_GOTIDX 0x70000025
-#define DT_MIPS_LOCAL_GOTIDX 0x70000026
-#define DT_MIPS_HIDDEN_GOTIDX 0x70000027
-#define DT_MIPS_PROTECTED_GOTIDX 0x70000028
-#define DT_MIPS_OPTIONS	     0x70000029 /* Address of .options.  */
-#define DT_MIPS_INTERFACE    0x7000002a /* Address of .interface.  */
-#define DT_MIPS_DYNSTR_ALIGN 0x7000002b
-#define DT_MIPS_INTERFACE_SIZE 0x7000002c /* Size of the .interface section. */
-#define DT_MIPS_RLD_TEXT_RESOLVE_ADDR 0x7000002d /* Address of rld_text_rsolve
-						    function stored in GOT.  */
-#define DT_MIPS_PERF_SUFFIX  0x7000002e /* Default suffix of dso to be added
-					   by rld on dlopen() calls.  */
-#define DT_MIPS_COMPACT_SIZE 0x7000002f /* (O32)Size of compact rel section. */
-#define DT_MIPS_GP_VALUE     0x70000030 /* GP value for aux GOTs.  */
-#define DT_MIPS_AUX_DYNAMIC  0x70000031 /* Address of aux .dynamic.  */
-/* The address of .got.plt in an executable using the new non-PIC ABI.  */
-#define DT_MIPS_PLTGOT	     0x70000032
-/* The base of the PLT in an executable using the new non-PIC ABI if that
-   PLT is writable.  For a non-writable PLT, this is omitted or has a zero
-   value.  */
-#define DT_MIPS_RWPLT        0x70000034
-/* An alternative description of the classic MIPS RLD_MAP that is usable
-   in a PIE as it stores a relative offset from the address of the tag
-   rather than an absolute address.  */
-#define DT_MIPS_RLD_MAP_REL  0x70000035
-#define DT_MIPS_NUM	     0x36
-
-/* Legal values for DT_MIPS_FLAGS Elf32_Dyn entry.  */
-
-#define RHF_NONE		   0		/* No flags */
-#define RHF_QUICKSTART		   (1 << 0)	/* Use quickstart */
-#define RHF_NOTPOT		   (1 << 1)	/* Hash size not power of 2 */
-#define RHF_NO_LIBRARY_REPLACEMENT (1 << 2)	/* Ignore LD_LIBRARY_PATH */
-#define RHF_NO_MOVE		   (1 << 3)
-#define RHF_SGI_ONLY		   (1 << 4)
-#define RHF_GUARANTEE_INIT	   (1 << 5)
-#define RHF_DELTA_C_PLUS_PLUS	   (1 << 6)
-#define RHF_GUARANTEE_START_INIT   (1 << 7)
-#define RHF_PIXIE		   (1 << 8)
-#define RHF_DEFAULT_DELAY_LOAD	   (1 << 9)
-#define RHF_REQUICKSTART	   (1 << 10)
-#define RHF_REQUICKSTARTED	   (1 << 11)
-#define RHF_CORD		   (1 << 12)
-#define RHF_NO_UNRES_UNDEF	   (1 << 13)
-#define RHF_RLD_ORDER_SAFE	   (1 << 14)
-
-/* Entries found in sections of type SHT_MIPS_LIBLIST.  */
-
-typedef struct
-{
-  Elf32_Word l_name;		/* Name (string table index) */
-  Elf32_Word l_time_stamp;	/* Timestamp */
-  Elf32_Word l_checksum;	/* Checksum */
-  Elf32_Word l_version;		/* Interface version */
-  Elf32_Word l_flags;		/* Flags */
-} Elf32_Lib;
-
-typedef struct
-{
-  Elf64_Word l_name;		/* Name (string table index) */
-  Elf64_Word l_time_stamp;	/* Timestamp */
-  Elf64_Word l_checksum;	/* Checksum */
-  Elf64_Word l_version;		/* Interface version */
-  Elf64_Word l_flags;		/* Flags */
-} Elf64_Lib;
-
-
-/* Legal values for l_flags.  */
-
-#define LL_NONE		  0
-#define LL_EXACT_MATCH	  (1 << 0)	/* Require exact match */
-#define LL_IGNORE_INT_VER (1 << 1)	/* Ignore interface version */
-#define LL_REQUIRE_MINOR  (1 << 2)
-#define LL_EXPORTS	  (1 << 3)
-#define LL_DELAY_LOAD	  (1 << 4)
-#define LL_DELTA	  (1 << 5)
-
-/* Entries found in sections of type SHT_MIPS_CONFLICT.  */
-
-typedef Elf32_Addr Elf32_Conflict;
-
-typedef struct
-{
-  /* Version of flags structure.  */
-  Elf32_Half version;
-  /* The level of the ISA: 1-5, 32, 64.  */
-  unsigned char isa_level;
-  /* The revision of ISA: 0 for MIPS V and below, 1-n otherwise.  */
-  unsigned char isa_rev;
-  /* The size of general purpose registers.  */
-  unsigned char gpr_size;
-  /* The size of co-processor 1 registers.  */
-  unsigned char cpr1_size;
-  /* The size of co-processor 2 registers.  */
-  unsigned char cpr2_size;
-  /* The floating-point ABI.  */
-  unsigned char fp_abi;
-  /* Processor-specific extension.  */
-  Elf32_Word isa_ext;
-  /* Mask of ASEs used.  */
-  Elf32_Word ases;
-  /* Mask of general flags.  */
-  Elf32_Word flags1;
-  Elf32_Word flags2;
-} Elf_MIPS_ABIFlags_v0;
-
-/* Values for the register size bytes of an abi flags structure.  */
-
-#define MIPS_AFL_REG_NONE	0x00	 /* No registers.  */
-#define MIPS_AFL_REG_32		0x01	 /* 32-bit registers.  */
-#define MIPS_AFL_REG_64		0x02	 /* 64-bit registers.  */
-#define MIPS_AFL_REG_128	0x03	 /* 128-bit registers.  */
-
-/* Masks for the ases word of an ABI flags structure.  */
-
-#define MIPS_AFL_ASE_DSP	0x00000001 /* DSP ASE.  */
-#define MIPS_AFL_ASE_DSPR2	0x00000002 /* DSP R2 ASE.  */
-#define MIPS_AFL_ASE_EVA	0x00000004 /* Enhanced VA Scheme.  */
-#define MIPS_AFL_ASE_MCU	0x00000008 /* MCU (MicroController) ASE.  */
-#define MIPS_AFL_ASE_MDMX	0x00000010 /* MDMX ASE.  */
-#define MIPS_AFL_ASE_MIPS3D	0x00000020 /* MIPS-3D ASE.  */
-#define MIPS_AFL_ASE_MT		0x00000040 /* MT ASE.  */
-#define MIPS_AFL_ASE_SMARTMIPS	0x00000080 /* SmartMIPS ASE.  */
-#define MIPS_AFL_ASE_VIRT	0x00000100 /* VZ ASE.  */
-#define MIPS_AFL_ASE_MSA	0x00000200 /* MSA ASE.  */
-#define MIPS_AFL_ASE_MIPS16	0x00000400 /* MIPS16 ASE.  */
-#define MIPS_AFL_ASE_MICROMIPS	0x00000800 /* MICROMIPS ASE.  */
-#define MIPS_AFL_ASE_XPA	0x00001000 /* XPA ASE.  */
-#define MIPS_AFL_ASE_MASK	0x00001fff /* All ASEs.  */
-
-/* Values for the isa_ext word of an ABI flags structure.  */
-
-#define MIPS_AFL_EXT_XLR	  1   /* RMI Xlr instruction.  */
-#define MIPS_AFL_EXT_OCTEON2	  2   /* Cavium Networks Octeon2.  */
-#define MIPS_AFL_EXT_OCTEONP	  3   /* Cavium Networks OcteonP.  */
-#define MIPS_AFL_EXT_LOONGSON_3A  4   /* Loongson 3A.  */
-#define MIPS_AFL_EXT_OCTEON	  5   /* Cavium Networks Octeon.  */
-#define MIPS_AFL_EXT_5900	  6   /* MIPS R5900 instruction.  */
-#define MIPS_AFL_EXT_4650	  7   /* MIPS R4650 instruction.  */
-#define MIPS_AFL_EXT_4010	  8   /* LSI R4010 instruction.  */
-#define MIPS_AFL_EXT_4100	  9   /* NEC VR4100 instruction.  */
-#define MIPS_AFL_EXT_3900	  10  /* Toshiba R3900 instruction.  */
-#define MIPS_AFL_EXT_10000	  11  /* MIPS R10000 instruction.  */
-#define MIPS_AFL_EXT_SB1	  12  /* Broadcom SB-1 instruction.  */
-#define MIPS_AFL_EXT_4111	  13  /* NEC VR4111/VR4181 instruction.  */
-#define MIPS_AFL_EXT_4120	  14  /* NEC VR4120 instruction.  */
-#define MIPS_AFL_EXT_5400	  15  /* NEC VR5400 instruction.  */
-#define MIPS_AFL_EXT_5500	  16  /* NEC VR5500 instruction.  */
-#define MIPS_AFL_EXT_LOONGSON_2E  17  /* ST Microelectronics Loongson 2E.  */
-#define MIPS_AFL_EXT_LOONGSON_2F  18  /* ST Microelectronics Loongson 2F.  */
-
-/* Masks for the flags1 word of an ABI flags structure.  */
-#define MIPS_AFL_FLAGS1_ODDSPREG  1  /* Uses odd single-precision registers.  */
-
-/* Object attribute values.  */
-enum
-{
-  /* Not tagged or not using any ABIs affected by the differences.  */
-  Val_GNU_MIPS_ABI_FP_ANY = 0,
-  /* Using hard-float -mdouble-float.  */
-  Val_GNU_MIPS_ABI_FP_DOUBLE = 1,
-  /* Using hard-float -msingle-float.  */
-  Val_GNU_MIPS_ABI_FP_SINGLE = 2,
-  /* Using soft-float.  */
-  Val_GNU_MIPS_ABI_FP_SOFT = 3,
-  /* Using -mips32r2 -mfp64.  */
-  Val_GNU_MIPS_ABI_FP_OLD_64 = 4,
-  /* Using -mfpxx.  */
-  Val_GNU_MIPS_ABI_FP_XX = 5,
-  /* Using -mips32r2 -mfp64.  */
-  Val_GNU_MIPS_ABI_FP_64 = 6,
-  /* Using -mips32r2 -mfp64 -mno-odd-spreg.  */
-  Val_GNU_MIPS_ABI_FP_64A = 7,
-  /* Maximum allocated FP ABI value.  */
-  Val_GNU_MIPS_ABI_FP_MAX = 7
-};
-
-/* HPPA specific definitions.  */
-
-/* Legal values for e_flags field of Elf32_Ehdr.  */
-
-#define EF_PARISC_TRAPNIL	0x00010000 /* Trap nil pointer dereference.  */
-#define EF_PARISC_EXT		0x00020000 /* Program uses arch. extensions. */
-#define EF_PARISC_LSB		0x00040000 /* Program expects little endian. */
-#define EF_PARISC_WIDE		0x00080000 /* Program expects wide mode.  */
-#define EF_PARISC_NO_KABP	0x00100000 /* No kernel assisted branch
-					      prediction.  */
-#define EF_PARISC_LAZYSWAP	0x00400000 /* Allow lazy swapping.  */
-#define EF_PARISC_ARCH		0x0000ffff /* Architecture version.  */
-
-/* Defined values for `e_flags & EF_PARISC_ARCH' are:  */
-
-#define EFA_PARISC_1_0		    0x020b /* PA-RISC 1.0 big-endian.  */
-#define EFA_PARISC_1_1		    0x0210 /* PA-RISC 1.1 big-endian.  */
-#define EFA_PARISC_2_0		    0x0214 /* PA-RISC 2.0 big-endian.  */
-
-/* Additional section indeces.  */
-
-#define SHN_PARISC_ANSI_COMMON	0xff00	   /* Section for tenatively declared
-					      symbols in ANSI C.  */
-#define SHN_PARISC_HUGE_COMMON	0xff01	   /* Common blocks in huge model.  */
-
-/* Legal values for sh_type field of Elf32_Shdr.  */
-
-#define SHT_PARISC_EXT		0x70000000 /* Contains product specific ext. */
-#define SHT_PARISC_UNWIND	0x70000001 /* Unwind information.  */
-#define SHT_PARISC_DOC		0x70000002 /* Debug info for optimized code. */
-
-/* Legal values for sh_flags field of Elf32_Shdr.  */
-
-#define SHF_PARISC_SHORT	0x20000000 /* Section with short addressing. */
-#define SHF_PARISC_HUGE		0x40000000 /* Section far from gp.  */
-#define SHF_PARISC_SBP		0x80000000 /* Static branch prediction code. */
-
-/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
-
-#define STT_PARISC_MILLICODE	13	/* Millicode function entry point.  */
-
-#define STT_HP_OPAQUE		(STT_LOOS + 0x1)
-#define STT_HP_STUB		(STT_LOOS + 0x2)
-
-/* HPPA relocs.  */
-
-#define R_PARISC_NONE		0	/* No reloc.  */
-#define R_PARISC_DIR32		1	/* Direct 32-bit reference.  */
-#define R_PARISC_DIR21L		2	/* Left 21 bits of eff. address.  */
-#define R_PARISC_DIR17R		3	/* Right 17 bits of eff. address.  */
-#define R_PARISC_DIR17F		4	/* 17 bits of eff. address.  */
-#define R_PARISC_DIR14R		6	/* Right 14 bits of eff. address.  */
-#define R_PARISC_PCREL32	9	/* 32-bit rel. address.  */
-#define R_PARISC_PCREL21L	10	/* Left 21 bits of rel. address.  */
-#define R_PARISC_PCREL17R	11	/* Right 17 bits of rel. address.  */
-#define R_PARISC_PCREL17F	12	/* 17 bits of rel. address.  */
-#define R_PARISC_PCREL14R	14	/* Right 14 bits of rel. address.  */
-#define R_PARISC_DPREL21L	18	/* Left 21 bits of rel. address.  */
-#define R_PARISC_DPREL14R	22	/* Right 14 bits of rel. address.  */
-#define R_PARISC_GPREL21L	26	/* GP-relative, left 21 bits.  */
-#define R_PARISC_GPREL14R	30	/* GP-relative, right 14 bits.  */
-#define R_PARISC_LTOFF21L	34	/* LT-relative, left 21 bits.  */
-#define R_PARISC_LTOFF14R	38	/* LT-relative, right 14 bits.  */
-#define R_PARISC_SECREL32	41	/* 32 bits section rel. address.  */
-#define R_PARISC_SEGBASE	48	/* No relocation, set segment base.  */
-#define R_PARISC_SEGREL32	49	/* 32 bits segment rel. address.  */
-#define R_PARISC_PLTOFF21L	50	/* PLT rel. address, left 21 bits.  */
-#define R_PARISC_PLTOFF14R	54	/* PLT rel. address, right 14 bits.  */
-#define R_PARISC_LTOFF_FPTR32	57	/* 32 bits LT-rel. function pointer. */
-#define R_PARISC_LTOFF_FPTR21L	58	/* LT-rel. fct ptr, left 21 bits. */
-#define R_PARISC_LTOFF_FPTR14R	62	/* LT-rel. fct ptr, right 14 bits. */
-#define R_PARISC_FPTR64		64	/* 64 bits function address.  */
-#define R_PARISC_PLABEL32	65	/* 32 bits function address.  */
-#define R_PARISC_PLABEL21L	66	/* Left 21 bits of fdesc address.  */
-#define R_PARISC_PLABEL14R	70	/* Right 14 bits of fdesc address.  */
-#define R_PARISC_PCREL64	72	/* 64 bits PC-rel. address.  */
-#define R_PARISC_PCREL22F	74	/* 22 bits PC-rel. address.  */
-#define R_PARISC_PCREL14WR	75	/* PC-rel. address, right 14 bits.  */
-#define R_PARISC_PCREL14DR	76	/* PC rel. address, right 14 bits.  */
-#define R_PARISC_PCREL16F	77	/* 16 bits PC-rel. address.  */
-#define R_PARISC_PCREL16WF	78	/* 16 bits PC-rel. address.  */
-#define R_PARISC_PCREL16DF	79	/* 16 bits PC-rel. address.  */
-#define R_PARISC_DIR64		80	/* 64 bits of eff. address.  */
-#define R_PARISC_DIR14WR	83	/* 14 bits of eff. address.  */
-#define R_PARISC_DIR14DR	84	/* 14 bits of eff. address.  */
-#define R_PARISC_DIR16F		85	/* 16 bits of eff. address.  */
-#define R_PARISC_DIR16WF	86	/* 16 bits of eff. address.  */
-#define R_PARISC_DIR16DF	87	/* 16 bits of eff. address.  */
-#define R_PARISC_GPREL64	88	/* 64 bits of GP-rel. address.  */
-#define R_PARISC_GPREL14WR	91	/* GP-rel. address, right 14 bits.  */
-#define R_PARISC_GPREL14DR	92	/* GP-rel. address, right 14 bits.  */
-#define R_PARISC_GPREL16F	93	/* 16 bits GP-rel. address.  */
-#define R_PARISC_GPREL16WF	94	/* 16 bits GP-rel. address.  */
-#define R_PARISC_GPREL16DF	95	/* 16 bits GP-rel. address.  */
-#define R_PARISC_LTOFF64	96	/* 64 bits LT-rel. address.  */
-#define R_PARISC_LTOFF14WR	99	/* LT-rel. address, right 14 bits.  */
-#define R_PARISC_LTOFF14DR	100	/* LT-rel. address, right 14 bits.  */
-#define R_PARISC_LTOFF16F	101	/* 16 bits LT-rel. address.  */
-#define R_PARISC_LTOFF16WF	102	/* 16 bits LT-rel. address.  */
-#define R_PARISC_LTOFF16DF	103	/* 16 bits LT-rel. address.  */
-#define R_PARISC_SECREL64	104	/* 64 bits section rel. address.  */
-#define R_PARISC_SEGREL64	112	/* 64 bits segment rel. address.  */
-#define R_PARISC_PLTOFF14WR	115	/* PLT-rel. address, right 14 bits.  */
-#define R_PARISC_PLTOFF14DR	116	/* PLT-rel. address, right 14 bits.  */
-#define R_PARISC_PLTOFF16F	117	/* 16 bits LT-rel. address.  */
-#define R_PARISC_PLTOFF16WF	118	/* 16 bits PLT-rel. address.  */
-#define R_PARISC_PLTOFF16DF	119	/* 16 bits PLT-rel. address.  */
-#define R_PARISC_LTOFF_FPTR64	120	/* 64 bits LT-rel. function ptr.  */
-#define R_PARISC_LTOFF_FPTR14WR	123	/* LT-rel. fct. ptr., right 14 bits. */
-#define R_PARISC_LTOFF_FPTR14DR	124	/* LT-rel. fct. ptr., right 14 bits. */
-#define R_PARISC_LTOFF_FPTR16F	125	/* 16 bits LT-rel. function ptr.  */
-#define R_PARISC_LTOFF_FPTR16WF	126	/* 16 bits LT-rel. function ptr.  */
-#define R_PARISC_LTOFF_FPTR16DF	127	/* 16 bits LT-rel. function ptr.  */
-#define R_PARISC_LORESERVE	128
-#define R_PARISC_COPY		128	/* Copy relocation.  */
-#define R_PARISC_IPLT		129	/* Dynamic reloc, imported PLT */
-#define R_PARISC_EPLT		130	/* Dynamic reloc, exported PLT */
-#define R_PARISC_TPREL32	153	/* 32 bits TP-rel. address.  */
-#define R_PARISC_TPREL21L	154	/* TP-rel. address, left 21 bits.  */
-#define R_PARISC_TPREL14R	158	/* TP-rel. address, right 14 bits.  */
-#define R_PARISC_LTOFF_TP21L	162	/* LT-TP-rel. address, left 21 bits. */
-#define R_PARISC_LTOFF_TP14R	166	/* LT-TP-rel. address, right 14 bits.*/
-#define R_PARISC_LTOFF_TP14F	167	/* 14 bits LT-TP-rel. address.  */
-#define R_PARISC_TPREL64	216	/* 64 bits TP-rel. address.  */
-#define R_PARISC_TPREL14WR	219	/* TP-rel. address, right 14 bits.  */
-#define R_PARISC_TPREL14DR	220	/* TP-rel. address, right 14 bits.  */
-#define R_PARISC_TPREL16F	221	/* 16 bits TP-rel. address.  */
-#define R_PARISC_TPREL16WF	222	/* 16 bits TP-rel. address.  */
-#define R_PARISC_TPREL16DF	223	/* 16 bits TP-rel. address.  */
-#define R_PARISC_LTOFF_TP64	224	/* 64 bits LT-TP-rel. address.  */
-#define R_PARISC_LTOFF_TP14WR	227	/* LT-TP-rel. address, right 14 bits.*/
-#define R_PARISC_LTOFF_TP14DR	228	/* LT-TP-rel. address, right 14 bits.*/
-#define R_PARISC_LTOFF_TP16F	229	/* 16 bits LT-TP-rel. address.  */
-#define R_PARISC_LTOFF_TP16WF	230	/* 16 bits LT-TP-rel. address.  */
-#define R_PARISC_LTOFF_TP16DF	231	/* 16 bits LT-TP-rel. address.  */
-#define R_PARISC_GNU_VTENTRY	232
-#define R_PARISC_GNU_VTINHERIT	233
-#define R_PARISC_TLS_GD21L	234	/* GD 21-bit left.  */
-#define R_PARISC_TLS_GD14R	235	/* GD 14-bit right.  */
-#define R_PARISC_TLS_GDCALL	236	/* GD call to __t_g_a.  */
-#define R_PARISC_TLS_LDM21L	237	/* LD module 21-bit left.  */
-#define R_PARISC_TLS_LDM14R	238	/* LD module 14-bit right.  */
-#define R_PARISC_TLS_LDMCALL	239	/* LD module call to __t_g_a.  */
-#define R_PARISC_TLS_LDO21L	240	/* LD offset 21-bit left.  */
-#define R_PARISC_TLS_LDO14R	241	/* LD offset 14-bit right.  */
-#define R_PARISC_TLS_DTPMOD32	242	/* DTP module 32-bit.  */
-#define R_PARISC_TLS_DTPMOD64	243	/* DTP module 64-bit.  */
-#define R_PARISC_TLS_DTPOFF32	244	/* DTP offset 32-bit.  */
-#define R_PARISC_TLS_DTPOFF64	245	/* DTP offset 32-bit.  */
-#define R_PARISC_TLS_LE21L	R_PARISC_TPREL21L
-#define R_PARISC_TLS_LE14R	R_PARISC_TPREL14R
-#define R_PARISC_TLS_IE21L	R_PARISC_LTOFF_TP21L
-#define R_PARISC_TLS_IE14R	R_PARISC_LTOFF_TP14R
-#define R_PARISC_TLS_TPREL32	R_PARISC_TPREL32
-#define R_PARISC_TLS_TPREL64	R_PARISC_TPREL64
-#define R_PARISC_HIRESERVE	255
-
-/* Legal values for p_type field of Elf32_Phdr/Elf64_Phdr.  */
-
-#define PT_HP_TLS		(PT_LOOS + 0x0)
-#define PT_HP_CORE_NONE		(PT_LOOS + 0x1)
-#define PT_HP_CORE_VERSION	(PT_LOOS + 0x2)
-#define PT_HP_CORE_KERNEL	(PT_LOOS + 0x3)
-#define PT_HP_CORE_COMM		(PT_LOOS + 0x4)
-#define PT_HP_CORE_PROC		(PT_LOOS + 0x5)
-#define PT_HP_CORE_LOADABLE	(PT_LOOS + 0x6)
-#define PT_HP_CORE_STACK	(PT_LOOS + 0x7)
-#define PT_HP_CORE_SHM		(PT_LOOS + 0x8)
-#define PT_HP_CORE_MMF		(PT_LOOS + 0x9)
-#define PT_HP_PARALLEL		(PT_LOOS + 0x10)
-#define PT_HP_FASTBIND		(PT_LOOS + 0x11)
-#define PT_HP_OPT_ANNOT		(PT_LOOS + 0x12)
-#define PT_HP_HSL_ANNOT		(PT_LOOS + 0x13)
-#define PT_HP_STACK		(PT_LOOS + 0x14)
-
-#define PT_PARISC_ARCHEXT	0x70000000
-#define PT_PARISC_UNWIND	0x70000001
-
-/* Legal values for p_flags field of Elf32_Phdr/Elf64_Phdr.  */
-
-#define PF_PARISC_SBP		0x08000000
-
-#define PF_HP_PAGE_SIZE		0x00100000
-#define PF_HP_FAR_SHARED	0x00200000
-#define PF_HP_NEAR_SHARED	0x00400000
-#define PF_HP_CODE		0x01000000
-#define PF_HP_MODIFY		0x02000000
-#define PF_HP_LAZYSWAP		0x04000000
-#define PF_HP_SBP		0x08000000
-
-
-/* Alpha specific definitions.  */
-
-/* Legal values for e_flags field of Elf64_Ehdr.  */
-
-#define EF_ALPHA_32BIT		1	/* All addresses must be < 2GB.  */
-#define EF_ALPHA_CANRELAX	2	/* Relocations for relaxing exist.  */
-
-/* Legal values for sh_type field of Elf64_Shdr.  */
-
-/* These two are primerily concerned with ECOFF debugging info.  */
-#define SHT_ALPHA_DEBUG		0x70000001
-#define SHT_ALPHA_REGINFO	0x70000002
-
-/* Legal values for sh_flags field of Elf64_Shdr.  */
-
-#define SHF_ALPHA_GPREL		0x10000000
-
-/* Legal values for st_other field of Elf64_Sym.  */
-#define STO_ALPHA_NOPV		0x80	/* No PV required.  */
-#define STO_ALPHA_STD_GPLOAD	0x88	/* PV only used for initial ldgp.  */
-
-/* Alpha relocs.  */
-
-#define R_ALPHA_NONE		0	/* No reloc */
-#define R_ALPHA_REFLONG		1	/* Direct 32 bit */
-#define R_ALPHA_REFQUAD		2	/* Direct 64 bit */
-#define R_ALPHA_GPREL32		3	/* GP relative 32 bit */
-#define R_ALPHA_LITERAL		4	/* GP relative 16 bit w/optimization */
-#define R_ALPHA_LITUSE		5	/* Optimization hint for LITERAL */
-#define R_ALPHA_GPDISP		6	/* Add displacement to GP */
-#define R_ALPHA_BRADDR		7	/* PC+4 relative 23 bit shifted */
-#define R_ALPHA_HINT		8	/* PC+4 relative 16 bit shifted */
-#define R_ALPHA_SREL16		9	/* PC relative 16 bit */
-#define R_ALPHA_SREL32		10	/* PC relative 32 bit */
-#define R_ALPHA_SREL64		11	/* PC relative 64 bit */
-#define R_ALPHA_GPRELHIGH	17	/* GP relative 32 bit, high 16 bits */
-#define R_ALPHA_GPRELLOW	18	/* GP relative 32 bit, low 16 bits */
-#define R_ALPHA_GPREL16		19	/* GP relative 16 bit */
-#define R_ALPHA_COPY		24	/* Copy symbol at runtime */
-#define R_ALPHA_GLOB_DAT	25	/* Create GOT entry */
-#define R_ALPHA_JMP_SLOT	26	/* Create PLT entry */
-#define R_ALPHA_RELATIVE	27	/* Adjust by program base */
-#define R_ALPHA_TLS_GD_HI	28
-#define R_ALPHA_TLSGD		29
-#define R_ALPHA_TLS_LDM		30
-#define R_ALPHA_DTPMOD64	31
-#define R_ALPHA_GOTDTPREL	32
-#define R_ALPHA_DTPREL64	33
-#define R_ALPHA_DTPRELHI	34
-#define R_ALPHA_DTPRELLO	35
-#define R_ALPHA_DTPREL16	36
-#define R_ALPHA_GOTTPREL	37
-#define R_ALPHA_TPREL64		38
-#define R_ALPHA_TPRELHI		39
-#define R_ALPHA_TPRELLO		40
-#define R_ALPHA_TPREL16		41
-/* Keep this the last entry.  */
-#define R_ALPHA_NUM		46
-
-/* Magic values of the LITUSE relocation addend.  */
-#define LITUSE_ALPHA_ADDR	0
-#define LITUSE_ALPHA_BASE	1
-#define LITUSE_ALPHA_BYTOFF	2
-#define LITUSE_ALPHA_JSR	3
-#define LITUSE_ALPHA_TLS_GD	4
-#define LITUSE_ALPHA_TLS_LDM	5
-
-/* Legal values for d_tag of Elf64_Dyn.  */
-#define DT_ALPHA_PLTRO		(DT_LOPROC + 0)
-#define DT_ALPHA_NUM		1
-
-/* PowerPC specific declarations */
-
-/* Values for Elf32/64_Ehdr.e_flags.  */
-#define EF_PPC_EMB		0x80000000	/* PowerPC embedded flag */
-
-/* Cygnus local bits below */
-#define EF_PPC_RELOCATABLE	0x00010000	/* PowerPC -mrelocatable flag*/
-#define EF_PPC_RELOCATABLE_LIB	0x00008000	/* PowerPC -mrelocatable-lib
-						   flag */
-
-/* PowerPC relocations defined by the ABIs */
-#define R_PPC_NONE		0
-#define R_PPC_ADDR32		1	/* 32bit absolute address */
-#define R_PPC_ADDR24		2	/* 26bit address, 2 bits ignored.  */
-#define R_PPC_ADDR16		3	/* 16bit absolute address */
-#define R_PPC_ADDR16_LO		4	/* lower 16bit of absolute address */
-#define R_PPC_ADDR16_HI		5	/* high 16bit of absolute address */
-#define R_PPC_ADDR16_HA		6	/* adjusted high 16bit */
-#define R_PPC_ADDR14		7	/* 16bit address, 2 bits ignored */
-#define R_PPC_ADDR14_BRTAKEN	8
-#define R_PPC_ADDR14_BRNTAKEN	9
-#define R_PPC_REL24		10	/* PC relative 26 bit */
-#define R_PPC_REL14		11	/* PC relative 16 bit */
-#define R_PPC_REL14_BRTAKEN	12
-#define R_PPC_REL14_BRNTAKEN	13
-#define R_PPC_GOT16		14
-#define R_PPC_GOT16_LO		15
-#define R_PPC_GOT16_HI		16
-#define R_PPC_GOT16_HA		17
-#define R_PPC_PLTREL24		18
-#define R_PPC_COPY		19
-#define R_PPC_GLOB_DAT		20
-#define R_PPC_JMP_SLOT		21
-#define R_PPC_RELATIVE		22
-#define R_PPC_LOCAL24PC		23
-#define R_PPC_UADDR32		24
-#define R_PPC_UADDR16		25
-#define R_PPC_REL32		26
-#define R_PPC_PLT32		27
-#define R_PPC_PLTREL32		28
-#define R_PPC_PLT16_LO		29
-#define R_PPC_PLT16_HI		30
-#define R_PPC_PLT16_HA		31
-#define R_PPC_SDAREL16		32
-#define R_PPC_SECTOFF		33
-#define R_PPC_SECTOFF_LO	34
-#define R_PPC_SECTOFF_HI	35
-#define R_PPC_SECTOFF_HA	36
-
-/* PowerPC relocations defined for the TLS access ABI.  */
-#define R_PPC_TLS		67 /* none	(sym+add)@tls */
-#define R_PPC_DTPMOD32		68 /* word32	(sym+add)@dtpmod */
-#define R_PPC_TPREL16		69 /* half16*	(sym+add)@tprel */
-#define R_PPC_TPREL16_LO	70 /* half16	(sym+add)@tprel@l */
-#define R_PPC_TPREL16_HI	71 /* half16	(sym+add)@tprel@h */
-#define R_PPC_TPREL16_HA	72 /* half16	(sym+add)@tprel@ha */
-#define R_PPC_TPREL32		73 /* word32	(sym+add)@tprel */
-#define R_PPC_DTPREL16		74 /* half16*	(sym+add)@dtprel */
-#define R_PPC_DTPREL16_LO	75 /* half16	(sym+add)@dtprel@l */
-#define R_PPC_DTPREL16_HI	76 /* half16	(sym+add)@dtprel@h */
-#define R_PPC_DTPREL16_HA	77 /* half16	(sym+add)@dtprel@ha */
-#define R_PPC_DTPREL32		78 /* word32	(sym+add)@dtprel */
-#define R_PPC_GOT_TLSGD16	79 /* half16*	(sym+add)@got@tlsgd */
-#define R_PPC_GOT_TLSGD16_LO	80 /* half16	(sym+add)@got@tlsgd@l */
-#define R_PPC_GOT_TLSGD16_HI	81 /* half16	(sym+add)@got@tlsgd@h */
-#define R_PPC_GOT_TLSGD16_HA	82 /* half16	(sym+add)@got@tlsgd@ha */
-#define R_PPC_GOT_TLSLD16	83 /* half16*	(sym+add)@got@tlsld */
-#define R_PPC_GOT_TLSLD16_LO	84 /* half16	(sym+add)@got@tlsld@l */
-#define R_PPC_GOT_TLSLD16_HI	85 /* half16	(sym+add)@got@tlsld@h */
-#define R_PPC_GOT_TLSLD16_HA	86 /* half16	(sym+add)@got@tlsld@ha */
-#define R_PPC_GOT_TPREL16	87 /* half16*	(sym+add)@got@tprel */
-#define R_PPC_GOT_TPREL16_LO	88 /* half16	(sym+add)@got@tprel@l */
-#define R_PPC_GOT_TPREL16_HI	89 /* half16	(sym+add)@got@tprel@h */
-#define R_PPC_GOT_TPREL16_HA	90 /* half16	(sym+add)@got@tprel@ha */
-#define R_PPC_GOT_DTPREL16	91 /* half16*	(sym+add)@got@dtprel */
-#define R_PPC_GOT_DTPREL16_LO	92 /* half16*	(sym+add)@got@dtprel@l */
-#define R_PPC_GOT_DTPREL16_HI	93 /* half16*	(sym+add)@got@dtprel@h */
-#define R_PPC_GOT_DTPREL16_HA	94 /* half16*	(sym+add)@got@dtprel@ha */
-#define R_PPC_TLSGD		95 /* none	(sym+add)@tlsgd */
-#define R_PPC_TLSLD		96 /* none	(sym+add)@tlsld */
-
-/* The remaining relocs are from the Embedded ELF ABI, and are not
-   in the SVR4 ELF ABI.  */
-#define R_PPC_EMB_NADDR32	101
-#define R_PPC_EMB_NADDR16	102
-#define R_PPC_EMB_NADDR16_LO	103
-#define R_PPC_EMB_NADDR16_HI	104
-#define R_PPC_EMB_NADDR16_HA	105
-#define R_PPC_EMB_SDAI16	106
-#define R_PPC_EMB_SDA2I16	107
-#define R_PPC_EMB_SDA2REL	108
-#define R_PPC_EMB_SDA21		109	/* 16 bit offset in SDA */
-#define R_PPC_EMB_MRKREF	110
-#define R_PPC_EMB_RELSEC16	111
-#define R_PPC_EMB_RELST_LO	112
-#define R_PPC_EMB_RELST_HI	113
-#define R_PPC_EMB_RELST_HA	114
-#define R_PPC_EMB_BIT_FLD	115
-#define R_PPC_EMB_RELSDA	116	/* 16 bit relative offset in SDA */
-
-/* Diab tool relocations.  */
-#define R_PPC_DIAB_SDA21_LO	180	/* like EMB_SDA21, but lower 16 bit */
-#define R_PPC_DIAB_SDA21_HI	181	/* like EMB_SDA21, but high 16 bit */
-#define R_PPC_DIAB_SDA21_HA	182	/* like EMB_SDA21, adjusted high 16 */
-#define R_PPC_DIAB_RELSDA_LO	183	/* like EMB_RELSDA, but lower 16 bit */
-#define R_PPC_DIAB_RELSDA_HI	184	/* like EMB_RELSDA, but high 16 bit */
-#define R_PPC_DIAB_RELSDA_HA	185	/* like EMB_RELSDA, adjusted high 16 */
-
-/* GNU extension to support local ifunc.  */
-#define R_PPC_IRELATIVE		248
-
-/* GNU relocs used in PIC code sequences.  */
-#define R_PPC_REL16		249	/* half16   (sym+add-.) */
-#define R_PPC_REL16_LO		250	/* half16   (sym+add-.)@l */
-#define R_PPC_REL16_HI		251	/* half16   (sym+add-.)@h */
-#define R_PPC_REL16_HA		252	/* half16   (sym+add-.)@ha */
-
-/* This is a phony reloc to handle any old fashioned TOC16 references
-   that may still be in object files.  */
-#define R_PPC_TOC16		255
-
-/* PowerPC specific values for the Dyn d_tag field.  */
-#define DT_PPC_GOT		(DT_LOPROC + 0)
-#define DT_PPC_OPT		(DT_LOPROC + 1)
-#define DT_PPC_NUM		2
-
-/* PowerPC specific values for the DT_PPC_OPT Dyn entry.  */
-#define PPC_OPT_TLS		1
-
-/* PowerPC64 relocations defined by the ABIs */
-#define R_PPC64_NONE		R_PPC_NONE
-#define R_PPC64_ADDR32		R_PPC_ADDR32 /* 32bit absolute address */
-#define R_PPC64_ADDR24		R_PPC_ADDR24 /* 26bit address, word aligned */
-#define R_PPC64_ADDR16		R_PPC_ADDR16 /* 16bit absolute address */
-#define R_PPC64_ADDR16_LO	R_PPC_ADDR16_LO	/* lower 16bits of address */
-#define R_PPC64_ADDR16_HI	R_PPC_ADDR16_HI	/* high 16bits of address. */
-#define R_PPC64_ADDR16_HA	R_PPC_ADDR16_HA /* adjusted high 16bits.  */
-#define R_PPC64_ADDR14		R_PPC_ADDR14 /* 16bit address, word aligned */
-#define R_PPC64_ADDR14_BRTAKEN	R_PPC_ADDR14_BRTAKEN
-#define R_PPC64_ADDR14_BRNTAKEN	R_PPC_ADDR14_BRNTAKEN
-#define R_PPC64_REL24		R_PPC_REL24 /* PC-rel. 26 bit, word aligned */
-#define R_PPC64_REL14		R_PPC_REL14 /* PC relative 16 bit */
-#define R_PPC64_REL14_BRTAKEN	R_PPC_REL14_BRTAKEN
-#define R_PPC64_REL14_BRNTAKEN	R_PPC_REL14_BRNTAKEN
-#define R_PPC64_GOT16		R_PPC_GOT16
-#define R_PPC64_GOT16_LO	R_PPC_GOT16_LO
-#define R_PPC64_GOT16_HI	R_PPC_GOT16_HI
-#define R_PPC64_GOT16_HA	R_PPC_GOT16_HA
-
-#define R_PPC64_COPY		R_PPC_COPY
-#define R_PPC64_GLOB_DAT	R_PPC_GLOB_DAT
-#define R_PPC64_JMP_SLOT	R_PPC_JMP_SLOT
-#define R_PPC64_RELATIVE	R_PPC_RELATIVE
-
-#define R_PPC64_UADDR32		R_PPC_UADDR32
-#define R_PPC64_UADDR16		R_PPC_UADDR16
-#define R_PPC64_REL32		R_PPC_REL32
-#define R_PPC64_PLT32		R_PPC_PLT32
-#define R_PPC64_PLTREL32	R_PPC_PLTREL32
-#define R_PPC64_PLT16_LO	R_PPC_PLT16_LO
-#define R_PPC64_PLT16_HI	R_PPC_PLT16_HI
-#define R_PPC64_PLT16_HA	R_PPC_PLT16_HA
-
-#define R_PPC64_SECTOFF		R_PPC_SECTOFF
-#define R_PPC64_SECTOFF_LO	R_PPC_SECTOFF_LO
-#define R_PPC64_SECTOFF_HI	R_PPC_SECTOFF_HI
-#define R_PPC64_SECTOFF_HA	R_PPC_SECTOFF_HA
-#define R_PPC64_ADDR30		37 /* word30 (S + A - P) >> 2 */
-#define R_PPC64_ADDR64		38 /* doubleword64 S + A */
-#define R_PPC64_ADDR16_HIGHER	39 /* half16 #higher(S + A) */
-#define R_PPC64_ADDR16_HIGHERA	40 /* half16 #highera(S + A) */
-#define R_PPC64_ADDR16_HIGHEST	41 /* half16 #highest(S + A) */
-#define R_PPC64_ADDR16_HIGHESTA	42 /* half16 #highesta(S + A) */
-#define R_PPC64_UADDR64		43 /* doubleword64 S + A */
-#define R_PPC64_REL64		44 /* doubleword64 S + A - P */
-#define R_PPC64_PLT64		45 /* doubleword64 L + A */
-#define R_PPC64_PLTREL64	46 /* doubleword64 L + A - P */
-#define R_PPC64_TOC16		47 /* half16* S + A - .TOC */
-#define R_PPC64_TOC16_LO	48 /* half16 #lo(S + A - .TOC.) */
-#define R_PPC64_TOC16_HI	49 /* half16 #hi(S + A - .TOC.) */
-#define R_PPC64_TOC16_HA	50 /* half16 #ha(S + A - .TOC.) */
-#define R_PPC64_TOC		51 /* doubleword64 .TOC */
-#define R_PPC64_PLTGOT16	52 /* half16* M + A */
-#define R_PPC64_PLTGOT16_LO	53 /* half16 #lo(M + A) */
-#define R_PPC64_PLTGOT16_HI	54 /* half16 #hi(M + A) */
-#define R_PPC64_PLTGOT16_HA	55 /* half16 #ha(M + A) */
-
-#define R_PPC64_ADDR16_DS	56 /* half16ds* (S + A) >> 2 */
-#define R_PPC64_ADDR16_LO_DS	57 /* half16ds  #lo(S + A) >> 2 */
-#define R_PPC64_GOT16_DS	58 /* half16ds* (G + A) >> 2 */
-#define R_PPC64_GOT16_LO_DS	59 /* half16ds  #lo(G + A) >> 2 */
-#define R_PPC64_PLT16_LO_DS	60 /* half16ds  #lo(L + A) >> 2 */
-#define R_PPC64_SECTOFF_DS	61 /* half16ds* (R + A) >> 2 */
-#define R_PPC64_SECTOFF_LO_DS	62 /* half16ds  #lo(R + A) >> 2 */
-#define R_PPC64_TOC16_DS	63 /* half16ds* (S + A - .TOC.) >> 2 */
-#define R_PPC64_TOC16_LO_DS	64 /* half16ds  #lo(S + A - .TOC.) >> 2 */
-#define R_PPC64_PLTGOT16_DS	65 /* half16ds* (M + A) >> 2 */
-#define R_PPC64_PLTGOT16_LO_DS	66 /* half16ds  #lo(M + A) >> 2 */
-
-/* PowerPC64 relocations defined for the TLS access ABI.  */
-#define R_PPC64_TLS		67 /* none	(sym+add)@tls */
-#define R_PPC64_DTPMOD64	68 /* doubleword64 (sym+add)@dtpmod */
-#define R_PPC64_TPREL16		69 /* half16*	(sym+add)@tprel */
-#define R_PPC64_TPREL16_LO	70 /* half16	(sym+add)@tprel@l */
-#define R_PPC64_TPREL16_HI	71 /* half16	(sym+add)@tprel@h */
-#define R_PPC64_TPREL16_HA	72 /* half16	(sym+add)@tprel@ha */
-#define R_PPC64_TPREL64		73 /* doubleword64 (sym+add)@tprel */
-#define R_PPC64_DTPREL16	74 /* half16*	(sym+add)@dtprel */
-#define R_PPC64_DTPREL16_LO	75 /* half16	(sym+add)@dtprel@l */
-#define R_PPC64_DTPREL16_HI	76 /* half16	(sym+add)@dtprel@h */
-#define R_PPC64_DTPREL16_HA	77 /* half16	(sym+add)@dtprel@ha */
-#define R_PPC64_DTPREL64	78 /* doubleword64 (sym+add)@dtprel */
-#define R_PPC64_GOT_TLSGD16	79 /* half16*	(sym+add)@got@tlsgd */
-#define R_PPC64_GOT_TLSGD16_LO	80 /* half16	(sym+add)@got@tlsgd@l */
-#define R_PPC64_GOT_TLSGD16_HI	81 /* half16	(sym+add)@got@tlsgd@h */
-#define R_PPC64_GOT_TLSGD16_HA	82 /* half16	(sym+add)@got@tlsgd@ha */
-#define R_PPC64_GOT_TLSLD16	83 /* half16*	(sym+add)@got@tlsld */
-#define R_PPC64_GOT_TLSLD16_LO	84 /* half16	(sym+add)@got@tlsld@l */
-#define R_PPC64_GOT_TLSLD16_HI	85 /* half16	(sym+add)@got@tlsld@h */
-#define R_PPC64_GOT_TLSLD16_HA	86 /* half16	(sym+add)@got@tlsld@ha */
-#define R_PPC64_GOT_TPREL16_DS	87 /* half16ds*	(sym+add)@got@tprel */
-#define R_PPC64_GOT_TPREL16_LO_DS 88 /* half16ds (sym+add)@got@tprel@l */
-#define R_PPC64_GOT_TPREL16_HI	89 /* half16	(sym+add)@got@tprel@h */
-#define R_PPC64_GOT_TPREL16_HA	90 /* half16	(sym+add)@got@tprel@ha */
-#define R_PPC64_GOT_DTPREL16_DS	91 /* half16ds*	(sym+add)@got@dtprel */
-#define R_PPC64_GOT_DTPREL16_LO_DS 92 /* half16ds (sym+add)@got@dtprel@l */
-#define R_PPC64_GOT_DTPREL16_HI	93 /* half16	(sym+add)@got@dtprel@h */
-#define R_PPC64_GOT_DTPREL16_HA	94 /* half16	(sym+add)@got@dtprel@ha */
-#define R_PPC64_TPREL16_DS	95 /* half16ds*	(sym+add)@tprel */
-#define R_PPC64_TPREL16_LO_DS	96 /* half16ds	(sym+add)@tprel@l */
-#define R_PPC64_TPREL16_HIGHER	97 /* half16	(sym+add)@tprel@higher */
-#define R_PPC64_TPREL16_HIGHERA	98 /* half16	(sym+add)@tprel@highera */
-#define R_PPC64_TPREL16_HIGHEST	99 /* half16	(sym+add)@tprel@highest */
-#define R_PPC64_TPREL16_HIGHESTA 100 /* half16	(sym+add)@tprel@highesta */
-#define R_PPC64_DTPREL16_DS	101 /* half16ds* (sym+add)@dtprel */
-#define R_PPC64_DTPREL16_LO_DS	102 /* half16ds	(sym+add)@dtprel@l */
-#define R_PPC64_DTPREL16_HIGHER	103 /* half16	(sym+add)@dtprel@higher */
-#define R_PPC64_DTPREL16_HIGHERA 104 /* half16	(sym+add)@dtprel@highera */
-#define R_PPC64_DTPREL16_HIGHEST 105 /* half16	(sym+add)@dtprel@highest */
-#define R_PPC64_DTPREL16_HIGHESTA 106 /* half16	(sym+add)@dtprel@highesta */
-#define R_PPC64_TLSGD		107 /* none	(sym+add)@tlsgd */
-#define R_PPC64_TLSLD		108 /* none	(sym+add)@tlsld */
-#define R_PPC64_TOCSAVE		109 /* none */
-
-/* Added when HA and HI relocs were changed to report overflows.  */
-#define R_PPC64_ADDR16_HIGH	110
-#define R_PPC64_ADDR16_HIGHA	111
-#define R_PPC64_TPREL16_HIGH	112
-#define R_PPC64_TPREL16_HIGHA	113
-#define R_PPC64_DTPREL16_HIGH	114
-#define R_PPC64_DTPREL16_HIGHA	115
-
-/* GNU extension to support local ifunc.  */
-#define R_PPC64_JMP_IREL	247
-#define R_PPC64_IRELATIVE	248
-#define R_PPC64_REL16		249	/* half16   (sym+add-.) */
-#define R_PPC64_REL16_LO	250	/* half16   (sym+add-.)@l */
-#define R_PPC64_REL16_HI	251	/* half16   (sym+add-.)@h */
-#define R_PPC64_REL16_HA	252	/* half16   (sym+add-.)@ha */
-
-/* e_flags bits specifying ABI.
-   1 for original function descriptor using ABI,
-   2 for revised ABI without function descriptors,
-   0 for unspecified or not using any features affected by the differences.  */
-#define EF_PPC64_ABI	3
-
-/* PowerPC64 specific values for the Dyn d_tag field.  */
-#define DT_PPC64_GLINK  (DT_LOPROC + 0)
-#define DT_PPC64_OPD	(DT_LOPROC + 1)
-#define DT_PPC64_OPDSZ	(DT_LOPROC + 2)
-#define DT_PPC64_OPT	(DT_LOPROC + 3)
-#define DT_PPC64_NUM    4
-
-/* PowerPC64 specific bits in the DT_PPC64_OPT Dyn entry.  */
-#define PPC64_OPT_TLS		1
-#define PPC64_OPT_MULTI_TOC	2
-#define PPC64_OPT_LOCALENTRY	4
-
-/* PowerPC64 specific values for the Elf64_Sym st_other field.  */
-#define STO_PPC64_LOCAL_BIT	5
-#define STO_PPC64_LOCAL_MASK	(7 << STO_PPC64_LOCAL_BIT)
-#define PPC64_LOCAL_ENTRY_OFFSET(other)				\
- (((1 << (((other) & STO_PPC64_LOCAL_MASK) >> STO_PPC64_LOCAL_BIT)) >> 2) << 2)
-
-
-/* ARM specific declarations */
-
-/* Processor specific flags for the ELF header e_flags field.  */
-#define EF_ARM_RELEXEC		0x01
-#define EF_ARM_HASENTRY		0x02
-#define EF_ARM_INTERWORK	0x04
-#define EF_ARM_APCS_26		0x08
-#define EF_ARM_APCS_FLOAT	0x10
-#define EF_ARM_PIC		0x20
-#define EF_ARM_ALIGN8		0x40 /* 8-bit structure alignment is in use */
-#define EF_ARM_NEW_ABI		0x80
-#define EF_ARM_OLD_ABI		0x100
-#define EF_ARM_SOFT_FLOAT	0x200
-#define EF_ARM_VFP_FLOAT	0x400
-#define EF_ARM_MAVERICK_FLOAT	0x800
-
-#define EF_ARM_ABI_FLOAT_SOFT	0x200   /* NB conflicts with EF_ARM_SOFT_FLOAT */
-#define EF_ARM_ABI_FLOAT_HARD	0x400   /* NB conflicts with EF_ARM_VFP_FLOAT */
-
-
-/* Other constants defined in the ARM ELF spec. version B-01.  */
-/* NB. These conflict with values defined above.  */
-#define EF_ARM_SYMSARESORTED	0x04
-#define EF_ARM_DYNSYMSUSESEGIDX	0x08
-#define EF_ARM_MAPSYMSFIRST	0x10
-#define EF_ARM_EABIMASK		0XFF000000
-
-/* Constants defined in AAELF.  */
-#define EF_ARM_BE8	    0x00800000
-#define EF_ARM_LE8	    0x00400000
-
-#define EF_ARM_EABI_VERSION(flags)	((flags) & EF_ARM_EABIMASK)
-#define EF_ARM_EABI_UNKNOWN	0x00000000
-#define EF_ARM_EABI_VER1	0x01000000
-#define EF_ARM_EABI_VER2	0x02000000
-#define EF_ARM_EABI_VER3	0x03000000
-#define EF_ARM_EABI_VER4	0x04000000
-#define EF_ARM_EABI_VER5	0x05000000
-
-/* Additional symbol types for Thumb.  */
-#define STT_ARM_TFUNC		STT_LOPROC /* A Thumb function.  */
-#define STT_ARM_16BIT		STT_HIPROC /* A Thumb label.  */
-
-/* ARM-specific values for sh_flags */
-#define SHF_ARM_ENTRYSECT	0x10000000 /* Section contains an entry point */
-#define SHF_ARM_COMDEF		0x80000000 /* Section may be multiply defined
-					      in the input to a link step.  */
-
-/* ARM-specific program header flags */
-#define PF_ARM_SB		0x10000000 /* Segment contains the location
-					      addressed by the static base. */
-#define PF_ARM_PI		0x20000000 /* Position-independent segment.  */
-#define PF_ARM_ABS		0x40000000 /* Absolute segment.  */
-
-/* Processor specific values for the Phdr p_type field.  */
-#define PT_ARM_EXIDX		(PT_LOPROC + 1)	/* ARM unwind segment.  */
-
-/* Processor specific values for the Shdr sh_type field.  */
-#define SHT_ARM_EXIDX		(SHT_LOPROC + 1) /* ARM unwind section.  */
-#define SHT_ARM_PREEMPTMAP	(SHT_LOPROC + 2) /* Preemption details.  */
-#define SHT_ARM_ATTRIBUTES	(SHT_LOPROC + 3) /* ARM attributes section.  */
-
-
-/* AArch64 relocs.  */
-
-#define R_AARCH64_NONE            0	/* No relocation.  */
-
-/* ILP32 AArch64 relocs.  */
-#define R_AARCH64_P32_ABS32		  1	/* Direct 32 bit.  */
-#define R_AARCH64_P32_COPY		180	/* Copy symbol at runtime.  */
-#define R_AARCH64_P32_GLOB_DAT		181	/* Create GOT entry.  */
-#define R_AARCH64_P32_JUMP_SLOT		182	/* Create PLT entry.  */
-#define R_AARCH64_P32_RELATIVE		183	/* Adjust by program base.  */
-#define R_AARCH64_P32_TLS_DTPMOD	184	/* Module number, 32 bit.  */
-#define R_AARCH64_P32_TLS_DTPREL	185	/* Module-relative offset, 32 bit.  */
-#define R_AARCH64_P32_TLS_TPREL		186	/* TP-relative offset, 32 bit.  */
-#define R_AARCH64_P32_TLSDESC		187	/* TLS Descriptor.  */
-#define R_AARCH64_P32_IRELATIVE		188	/* STT_GNU_IFUNC relocation. */
-
-/* LP64 AArch64 relocs.  */
-#define R_AARCH64_ABS64         257	/* Direct 64 bit. */
-#define R_AARCH64_ABS32         258	/* Direct 32 bit.  */
-#define R_AARCH64_ABS16		259	/* Direct 16-bit.  */
-#define R_AARCH64_PREL64	260	/* PC-relative 64-bit.	*/
-#define R_AARCH64_PREL32	261	/* PC-relative 32-bit.	*/
-#define R_AARCH64_PREL16	262	/* PC-relative 16-bit.	*/
-#define R_AARCH64_MOVW_UABS_G0	263	/* Dir. MOVZ imm. from bits 15:0.  */
-#define R_AARCH64_MOVW_UABS_G0_NC 264	/* Likewise for MOVK; no check.  */
-#define R_AARCH64_MOVW_UABS_G1	265	/* Dir. MOVZ imm. from bits 31:16.  */
-#define R_AARCH64_MOVW_UABS_G1_NC 266	/* Likewise for MOVK; no check.  */
-#define R_AARCH64_MOVW_UABS_G2	267	/* Dir. MOVZ imm. from bits 47:32.  */
-#define R_AARCH64_MOVW_UABS_G2_NC 268	/* Likewise for MOVK; no check.  */
-#define R_AARCH64_MOVW_UABS_G3	269	/* Dir. MOV{K,Z} imm. from 63:48.  */
-#define R_AARCH64_MOVW_SABS_G0	270	/* Dir. MOV{N,Z} imm. from 15:0.  */
-#define R_AARCH64_MOVW_SABS_G1	271	/* Dir. MOV{N,Z} imm. from 31:16.  */
-#define R_AARCH64_MOVW_SABS_G2	272	/* Dir. MOV{N,Z} imm. from 47:32.  */
-#define R_AARCH64_LD_PREL_LO19	273	/* PC-rel. LD imm. from bits 20:2.  */
-#define R_AARCH64_ADR_PREL_LO21	274	/* PC-rel. ADR imm. from bits 20:0.  */
-#define R_AARCH64_ADR_PREL_PG_HI21 275	/* Page-rel. ADRP imm. from 32:12.  */
-#define R_AARCH64_ADR_PREL_PG_HI21_NC 276 /* Likewise; no overflow check.  */
-#define R_AARCH64_ADD_ABS_LO12_NC 277	/* Dir. ADD imm. from bits 11:0.  */
-#define R_AARCH64_LDST8_ABS_LO12_NC 278	/* Likewise for LD/ST; no check. */
-#define R_AARCH64_TSTBR14	279	/* PC-rel. TBZ/TBNZ imm. from 15:2.  */
-#define R_AARCH64_CONDBR19	280	/* PC-rel. cond. br. imm. from 20:2. */
-#define R_AARCH64_JUMP26	282	/* PC-rel. B imm. from bits 27:2.  */
-#define R_AARCH64_CALL26	283	/* Likewise for CALL.  */
-#define R_AARCH64_LDST16_ABS_LO12_NC 284 /* Dir. ADD imm. from bits 11:1.  */
-#define R_AARCH64_LDST32_ABS_LO12_NC 285 /* Likewise for bits 11:2.  */
-#define R_AARCH64_LDST64_ABS_LO12_NC 286 /* Likewise for bits 11:3.  */
-#define R_AARCH64_MOVW_PREL_G0	287	/* PC-rel. MOV{N,Z} imm. from 15:0.  */
-#define R_AARCH64_MOVW_PREL_G0_NC 288	/* Likewise for MOVK; no check.  */
-#define R_AARCH64_MOVW_PREL_G1	289	/* PC-rel. MOV{N,Z} imm. from 31:16. */
-#define R_AARCH64_MOVW_PREL_G1_NC 290	/* Likewise for MOVK; no check.  */
-#define R_AARCH64_MOVW_PREL_G2	291	/* PC-rel. MOV{N,Z} imm. from 47:32. */
-#define R_AARCH64_MOVW_PREL_G2_NC 292	/* Likewise for MOVK; no check.  */
-#define R_AARCH64_MOVW_PREL_G3	293	/* PC-rel. MOV{N,Z} imm. from 63:48. */
-#define R_AARCH64_LDST128_ABS_LO12_NC 299 /* Dir. ADD imm. from bits 11:4.  */
-#define R_AARCH64_MOVW_GOTOFF_G0 300	/* GOT-rel. off. MOV{N,Z} imm. 15:0. */
-#define R_AARCH64_MOVW_GOTOFF_G0_NC 301	/* Likewise for MOVK; no check.  */
-#define R_AARCH64_MOVW_GOTOFF_G1 302	/* GOT-rel. o. MOV{N,Z} imm. 31:16.  */
-#define R_AARCH64_MOVW_GOTOFF_G1_NC 303	/* Likewise for MOVK; no check.  */
-#define R_AARCH64_MOVW_GOTOFF_G2 304	/* GOT-rel. o. MOV{N,Z} imm. 47:32.  */
-#define R_AARCH64_MOVW_GOTOFF_G2_NC 305	/* Likewise for MOVK; no check.  */
-#define R_AARCH64_MOVW_GOTOFF_G3 306	/* GOT-rel. o. MOV{N,Z} imm. 63:48.  */
-#define R_AARCH64_GOTREL64	307	/* GOT-relative 64-bit.  */
-#define R_AARCH64_GOTREL32	308	/* GOT-relative 32-bit.  */
-#define R_AARCH64_GOT_LD_PREL19	309	/* PC-rel. GOT off. load imm. 20:2.  */
-#define R_AARCH64_LD64_GOTOFF_LO15 310	/* GOT-rel. off. LD/ST imm. 14:3.  */
-#define R_AARCH64_ADR_GOT_PAGE	311	/* P-page-rel. GOT off. ADRP 32:12.  */
-#define R_AARCH64_LD64_GOT_LO12_NC 312	/* Dir. GOT off. LD/ST imm. 11:3.  */
-#define R_AARCH64_LD64_GOTPAGE_LO15 313	/* GOT-page-rel. GOT off. LD/ST 14:3 */
-#define R_AARCH64_TLSGD_ADR_PREL21 512	/* PC-relative ADR imm. 20:0.  */
-#define R_AARCH64_TLSGD_ADR_PAGE21 513	/* page-rel. ADRP imm. 32:12.  */
-#define R_AARCH64_TLSGD_ADD_LO12_NC 514	/* direct ADD imm. from 11:0.  */
-#define R_AARCH64_TLSGD_MOVW_G1	515	/* GOT-rel. MOV{N,Z} 31:16.  */
-#define R_AARCH64_TLSGD_MOVW_G0_NC 516	/* GOT-rel. MOVK imm. 15:0.  */
-#define R_AARCH64_TLSLD_ADR_PREL21 517	/* Like 512; local dynamic model.  */
-#define R_AARCH64_TLSLD_ADR_PAGE21 518	/* Like 513; local dynamic model.  */
-#define R_AARCH64_TLSLD_ADD_LO12_NC 519	/* Like 514; local dynamic model.  */
-#define R_AARCH64_TLSLD_MOVW_G1	520	/* Like 515; local dynamic model.  */
-#define R_AARCH64_TLSLD_MOVW_G0_NC 521	/* Like 516; local dynamic model.  */
-#define R_AARCH64_TLSLD_LD_PREL19 522	/* TLS PC-rel. load imm. 20:2.  */
-#define R_AARCH64_TLSLD_MOVW_DTPREL_G2 523 /* TLS DTP-rel. MOV{N,Z} 47:32.  */
-#define R_AARCH64_TLSLD_MOVW_DTPREL_G1 524 /* TLS DTP-rel. MOV{N,Z} 31:16.  */
-#define R_AARCH64_TLSLD_MOVW_DTPREL_G1_NC 525 /* Likewise; MOVK; no check.  */
-#define R_AARCH64_TLSLD_MOVW_DTPREL_G0 526 /* TLS DTP-rel. MOV{N,Z} 15:0.  */
-#define R_AARCH64_TLSLD_MOVW_DTPREL_G0_NC 527 /* Likewise; MOVK; no check.  */
-#define R_AARCH64_TLSLD_ADD_DTPREL_HI12 528 /* DTP-rel. ADD imm. from 23:12. */
-#define R_AARCH64_TLSLD_ADD_DTPREL_LO12 529 /* DTP-rel. ADD imm. from 11:0.  */
-#define R_AARCH64_TLSLD_ADD_DTPREL_LO12_NC 530 /* Likewise; no ovfl. check.  */
-#define R_AARCH64_TLSLD_LDST8_DTPREL_LO12 531 /* DTP-rel. LD/ST imm. 11:0.  */
-#define R_AARCH64_TLSLD_LDST8_DTPREL_LO12_NC 532 /* Likewise; no check.  */
-#define R_AARCH64_TLSLD_LDST16_DTPREL_LO12 533 /* DTP-rel. LD/ST imm. 11:1.  */
-#define R_AARCH64_TLSLD_LDST16_DTPREL_LO12_NC 534 /* Likewise; no check.  */
-#define R_AARCH64_TLSLD_LDST32_DTPREL_LO12 535 /* DTP-rel. LD/ST imm. 11:2.  */
-#define R_AARCH64_TLSLD_LDST32_DTPREL_LO12_NC 536 /* Likewise; no check.  */
-#define R_AARCH64_TLSLD_LDST64_DTPREL_LO12 537 /* DTP-rel. LD/ST imm. 11:3.  */
-#define R_AARCH64_TLSLD_LDST64_DTPREL_LO12_NC 538 /* Likewise; no check.  */
-#define R_AARCH64_TLSIE_MOVW_GOTTPREL_G1 539 /* GOT-rel. MOV{N,Z} 31:16.  */
-#define R_AARCH64_TLSIE_MOVW_GOTTPREL_G0_NC 540 /* GOT-rel. MOVK 15:0.  */
-#define R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21 541 /* Page-rel. ADRP 32:12.  */
-#define R_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC 542 /* Direct LD off. 11:3.  */
-#define R_AARCH64_TLSIE_LD_GOTTPREL_PREL19 543 /* PC-rel. load imm. 20:2.  */
-#define R_AARCH64_TLSLE_MOVW_TPREL_G2 544 /* TLS TP-rel. MOV{N,Z} 47:32.  */
-#define R_AARCH64_TLSLE_MOVW_TPREL_G1 545 /* TLS TP-rel. MOV{N,Z} 31:16.  */
-#define R_AARCH64_TLSLE_MOVW_TPREL_G1_NC 546 /* Likewise; MOVK; no check.  */
-#define R_AARCH64_TLSLE_MOVW_TPREL_G0 547 /* TLS TP-rel. MOV{N,Z} 15:0.  */
-#define R_AARCH64_TLSLE_MOVW_TPREL_G0_NC 548 /* Likewise; MOVK; no check.  */
-#define R_AARCH64_TLSLE_ADD_TPREL_HI12 549 /* TP-rel. ADD imm. 23:12.  */
-#define R_AARCH64_TLSLE_ADD_TPREL_LO12 550 /* TP-rel. ADD imm. 11:0.  */
-#define R_AARCH64_TLSLE_ADD_TPREL_LO12_NC 551 /* Likewise; no ovfl. check.  */
-#define R_AARCH64_TLSLE_LDST8_TPREL_LO12 552 /* TP-rel. LD/ST off. 11:0.  */
-#define R_AARCH64_TLSLE_LDST8_TPREL_LO12_NC 553 /* Likewise; no ovfl. check. */
-#define R_AARCH64_TLSLE_LDST16_TPREL_LO12 554 /* TP-rel. LD/ST off. 11:1.  */
-#define R_AARCH64_TLSLE_LDST16_TPREL_LO12_NC 555 /* Likewise; no check.  */
-#define R_AARCH64_TLSLE_LDST32_TPREL_LO12 556 /* TP-rel. LD/ST off. 11:2.  */
-#define R_AARCH64_TLSLE_LDST32_TPREL_LO12_NC 557 /* Likewise; no check.  */
-#define R_AARCH64_TLSLE_LDST64_TPREL_LO12 558 /* TP-rel. LD/ST off. 11:3.  */
-#define R_AARCH64_TLSLE_LDST64_TPREL_LO12_NC 559 /* Likewise; no check.  */
-#define R_AARCH64_TLSDESC_LD_PREL19 560	/* PC-rel. load immediate 20:2.  */
-#define R_AARCH64_TLSDESC_ADR_PREL21 561 /* PC-rel. ADR immediate 20:0.  */
-#define R_AARCH64_TLSDESC_ADR_PAGE21 562 /* Page-rel. ADRP imm. 32:12.  */
-#define R_AARCH64_TLSDESC_LD64_LO12 563	/* Direct LD off. from 11:3.  */
-#define R_AARCH64_TLSDESC_ADD_LO12 564	/* Direct ADD imm. from 11:0.  */
-#define R_AARCH64_TLSDESC_OFF_G1 565	/* GOT-rel. MOV{N,Z} imm. 31:16.  */
-#define R_AARCH64_TLSDESC_OFF_G0_NC 566	/* GOT-rel. MOVK imm. 15:0; no ck.  */
-#define R_AARCH64_TLSDESC_LDR	567	/* Relax LDR.  */
-#define R_AARCH64_TLSDESC_ADD	568	/* Relax ADD.  */
-#define R_AARCH64_TLSDESC_CALL	569	/* Relax BLR.  */
-#define R_AARCH64_TLSLE_LDST128_TPREL_LO12 570 /* TP-rel. LD/ST off. 11:4.  */
-#define R_AARCH64_TLSLE_LDST128_TPREL_LO12_NC 571 /* Likewise; no check.  */
-#define R_AARCH64_TLSLD_LDST128_DTPREL_LO12 572 /* DTP-rel. LD/ST imm. 11:4. */
-#define R_AARCH64_TLSLD_LDST128_DTPREL_LO12_NC 573 /* Likewise; no check.  */
-#define R_AARCH64_COPY         1024	/* Copy symbol at runtime.  */
-#define R_AARCH64_GLOB_DAT     1025	/* Create GOT entry.  */
-#define R_AARCH64_JUMP_SLOT    1026	/* Create PLT entry.  */
-#define R_AARCH64_RELATIVE     1027	/* Adjust by program base.  */
-#define R_AARCH64_TLS_DTPMOD   1028	/* Module number, 64 bit.  */
-#define R_AARCH64_TLS_DTPREL   1029	/* Module-relative offset, 64 bit.  */
-#define R_AARCH64_TLS_TPREL    1030	/* TP-relative offset, 64 bit.  */
-#define R_AARCH64_TLSDESC      1031	/* TLS Descriptor.  */
-#define R_AARCH64_IRELATIVE	1032	/* STT_GNU_IFUNC relocation.  */
-
-/* ARM relocs.  */
-
-#define R_ARM_NONE		0	/* No reloc */
-#define R_ARM_PC24		1	/* Deprecated PC relative 26
-					   bit branch.  */
-#define R_ARM_ABS32		2	/* Direct 32 bit  */
-#define R_ARM_REL32		3	/* PC relative 32 bit */
-#define R_ARM_PC13		4
-#define R_ARM_ABS16		5	/* Direct 16 bit */
-#define R_ARM_ABS12		6	/* Direct 12 bit */
-#define R_ARM_THM_ABS5		7	/* Direct & 0x7C (LDR, STR).  */
-#define R_ARM_ABS8		8	/* Direct 8 bit */
-#define R_ARM_SBREL32		9
-#define R_ARM_THM_PC22		10	/* PC relative 24 bit (Thumb32 BL).  */
-#define R_ARM_THM_PC8		11	/* PC relative & 0x3FC
-					   (Thumb16 LDR, ADD, ADR).  */
-#define R_ARM_AMP_VCALL9	12
-#define R_ARM_SWI24		13	/* Obsolete static relocation.  */
-#define R_ARM_TLS_DESC		13      /* Dynamic relocation.  */
-#define R_ARM_THM_SWI8		14	/* Reserved.  */
-#define R_ARM_XPC25		15	/* Reserved.  */
-#define R_ARM_THM_XPC22		16	/* Reserved.  */
-#define R_ARM_TLS_DTPMOD32	17	/* ID of module containing symbol */
-#define R_ARM_TLS_DTPOFF32	18	/* Offset in TLS block */
-#define R_ARM_TLS_TPOFF32	19	/* Offset in static TLS block */
-#define R_ARM_COPY		20	/* Copy symbol at runtime */
-#define R_ARM_GLOB_DAT		21	/* Create GOT entry */
-#define R_ARM_JUMP_SLOT		22	/* Create PLT entry */
-#define R_ARM_RELATIVE		23	/* Adjust by program base */
-#define R_ARM_GOTOFF		24	/* 32 bit offset to GOT */
-#define R_ARM_GOTPC		25	/* 32 bit PC relative offset to GOT */
-#define R_ARM_GOT32		26	/* 32 bit GOT entry */
-#define R_ARM_PLT32		27	/* Deprecated, 32 bit PLT address.  */
-#define R_ARM_CALL		28	/* PC relative 24 bit (BL, BLX).  */
-#define R_ARM_JUMP24		29	/* PC relative 24 bit
-					   (B, BL<cond>).  */
-#define R_ARM_THM_JUMP24	30	/* PC relative 24 bit (Thumb32 B.W).  */
-#define R_ARM_BASE_ABS		31	/* Adjust by program base.  */
-#define R_ARM_ALU_PCREL_7_0	32	/* Obsolete.  */
-#define R_ARM_ALU_PCREL_15_8	33	/* Obsolete.  */
-#define R_ARM_ALU_PCREL_23_15	34	/* Obsolete.  */
-#define R_ARM_LDR_SBREL_11_0	35	/* Deprecated, prog. base relative.  */
-#define R_ARM_ALU_SBREL_19_12	36	/* Deprecated, prog. base relative.  */
-#define R_ARM_ALU_SBREL_27_20	37	/* Deprecated, prog. base relative.  */
-#define R_ARM_TARGET1		38
-#define R_ARM_SBREL31		39	/* Program base relative.  */
-#define R_ARM_V4BX		40
-#define R_ARM_TARGET2		41
-#define R_ARM_PREL31		42	/* 32 bit PC relative.  */
-#define R_ARM_MOVW_ABS_NC	43	/* Direct 16-bit (MOVW).  */
-#define R_ARM_MOVT_ABS		44	/* Direct high 16-bit (MOVT).  */
-#define R_ARM_MOVW_PREL_NC	45	/* PC relative 16-bit (MOVW).  */
-#define R_ARM_MOVT_PREL		46	/* PC relative (MOVT).  */
-#define R_ARM_THM_MOVW_ABS_NC	47	/* Direct 16 bit (Thumb32 MOVW).  */
-#define R_ARM_THM_MOVT_ABS	48	/* Direct high 16 bit
-					   (Thumb32 MOVT).  */
-#define R_ARM_THM_MOVW_PREL_NC	49	/* PC relative 16 bit
-					   (Thumb32 MOVW).  */
-#define R_ARM_THM_MOVT_PREL	50	/* PC relative high 16 bit
-					   (Thumb32 MOVT).  */
-#define R_ARM_THM_JUMP19	51	/* PC relative 20 bit
-					   (Thumb32 B<cond>.W).  */
-#define R_ARM_THM_JUMP6		52	/* PC relative X & 0x7E
-					   (Thumb16 CBZ, CBNZ).  */
-#define R_ARM_THM_ALU_PREL_11_0	53	/* PC relative 12 bit
-					   (Thumb32 ADR.W).  */
-#define R_ARM_THM_PC12		54	/* PC relative 12 bit
-					   (Thumb32 LDR{D,SB,H,SH}).  */
-#define R_ARM_ABS32_NOI		55	/* Direct 32-bit.  */
-#define R_ARM_REL32_NOI		56	/* PC relative 32-bit.  */
-#define R_ARM_ALU_PC_G0_NC	57	/* PC relative (ADD, SUB).  */
-#define R_ARM_ALU_PC_G0		58	/* PC relative (ADD, SUB).  */
-#define R_ARM_ALU_PC_G1_NC	59	/* PC relative (ADD, SUB).  */
-#define R_ARM_ALU_PC_G1		60	/* PC relative (ADD, SUB).  */
-#define R_ARM_ALU_PC_G2		61	/* PC relative (ADD, SUB).  */
-#define R_ARM_LDR_PC_G1		62	/* PC relative (LDR,STR,LDRB,STRB).  */
-#define R_ARM_LDR_PC_G2		63	/* PC relative (LDR,STR,LDRB,STRB).  */
-#define R_ARM_LDRS_PC_G0	64	/* PC relative (STR{D,H},
-					   LDR{D,SB,H,SH}).  */
-#define R_ARM_LDRS_PC_G1	65	/* PC relative (STR{D,H},
-					   LDR{D,SB,H,SH}).  */
-#define R_ARM_LDRS_PC_G2	66	/* PC relative (STR{D,H},
-					   LDR{D,SB,H,SH}).  */
-#define R_ARM_LDC_PC_G0		67	/* PC relative (LDC, STC).  */
-#define R_ARM_LDC_PC_G1		68	/* PC relative (LDC, STC).  */
-#define R_ARM_LDC_PC_G2		69	/* PC relative (LDC, STC).  */
-#define R_ARM_ALU_SB_G0_NC	70	/* Program base relative (ADD,SUB).  */
-#define R_ARM_ALU_SB_G0		71	/* Program base relative (ADD,SUB).  */
-#define R_ARM_ALU_SB_G1_NC	72	/* Program base relative (ADD,SUB).  */
-#define R_ARM_ALU_SB_G1		73	/* Program base relative (ADD,SUB).  */
-#define R_ARM_ALU_SB_G2		74	/* Program base relative (ADD,SUB).  */
-#define R_ARM_LDR_SB_G0		75	/* Program base relative (LDR,
-					   STR, LDRB, STRB).  */
-#define R_ARM_LDR_SB_G1		76	/* Program base relative
-					   (LDR, STR, LDRB, STRB).  */
-#define R_ARM_LDR_SB_G2		77	/* Program base relative
-					   (LDR, STR, LDRB, STRB).  */
-#define R_ARM_LDRS_SB_G0	78	/* Program base relative
-					   (LDR, STR, LDRB, STRB).  */
-#define R_ARM_LDRS_SB_G1	79	/* Program base relative
-					   (LDR, STR, LDRB, STRB).  */
-#define R_ARM_LDRS_SB_G2	80	/* Program base relative
-					   (LDR, STR, LDRB, STRB).  */
-#define R_ARM_LDC_SB_G0		81	/* Program base relative (LDC,STC).  */
-#define R_ARM_LDC_SB_G1		82	/* Program base relative (LDC,STC).  */
-#define R_ARM_LDC_SB_G2		83	/* Program base relative (LDC,STC).  */
-#define R_ARM_MOVW_BREL_NC	84	/* Program base relative 16
-					   bit (MOVW).  */
-#define R_ARM_MOVT_BREL		85	/* Program base relative high
-					   16 bit (MOVT).  */
-#define R_ARM_MOVW_BREL		86	/* Program base relative 16
-					   bit (MOVW).  */
-#define R_ARM_THM_MOVW_BREL_NC	87	/* Program base relative 16
-					   bit (Thumb32 MOVW).  */
-#define R_ARM_THM_MOVT_BREL	88	/* Program base relative high
-					   16 bit (Thumb32 MOVT).  */
-#define R_ARM_THM_MOVW_BREL	89	/* Program base relative 16
-					   bit (Thumb32 MOVW).  */
-#define R_ARM_TLS_GOTDESC	90
-#define R_ARM_TLS_CALL		91
-#define R_ARM_TLS_DESCSEQ	92	/* TLS relaxation.  */
-#define R_ARM_THM_TLS_CALL	93
-#define R_ARM_PLT32_ABS		94
-#define R_ARM_GOT_ABS		95	/* GOT entry.  */
-#define R_ARM_GOT_PREL		96	/* PC relative GOT entry.  */
-#define R_ARM_GOT_BREL12	97	/* GOT entry relative to GOT
-					   origin (LDR).  */
-#define R_ARM_GOTOFF12		98	/* 12 bit, GOT entry relative
-					   to GOT origin (LDR, STR).  */
-#define R_ARM_GOTRELAX		99
-#define R_ARM_GNU_VTENTRY	100
-#define R_ARM_GNU_VTINHERIT	101
-#define R_ARM_THM_PC11		102	/* PC relative & 0xFFE (Thumb16 B).  */
-#define R_ARM_THM_PC9		103	/* PC relative & 0x1FE
-					   (Thumb16 B/B<cond>).  */
-#define R_ARM_TLS_GD32		104	/* PC-rel 32 bit for global dynamic
-					   thread local data */
-#define R_ARM_TLS_LDM32		105	/* PC-rel 32 bit for local dynamic
-					   thread local data */
-#define R_ARM_TLS_LDO32		106	/* 32 bit offset relative to TLS
-					   block */
-#define R_ARM_TLS_IE32		107	/* PC-rel 32 bit for GOT entry of
-					   static TLS block offset */
-#define R_ARM_TLS_LE32		108	/* 32 bit offset relative to static
-					   TLS block */
-#define R_ARM_TLS_LDO12		109	/* 12 bit relative to TLS
-					   block (LDR, STR).  */
-#define R_ARM_TLS_LE12		110	/* 12 bit relative to static
-					   TLS block (LDR, STR).  */
-#define R_ARM_TLS_IE12GP	111	/* 12 bit GOT entry relative
-					   to GOT origin (LDR).  */
-#define R_ARM_ME_TOO		128	/* Obsolete.  */
-#define R_ARM_THM_TLS_DESCSEQ	129
-#define R_ARM_THM_TLS_DESCSEQ16	129
-#define R_ARM_THM_TLS_DESCSEQ32	130
-#define R_ARM_THM_GOT_BREL12	131	/* GOT entry relative to GOT
-					   origin, 12 bit (Thumb32 LDR).  */
-#define R_ARM_IRELATIVE		160
-#define R_ARM_RXPC25		249
-#define R_ARM_RSBREL32		250
-#define R_ARM_THM_RPC22		251
-#define R_ARM_RREL32		252
-#define R_ARM_RABS22		253
-#define R_ARM_RPC24		254
-#define R_ARM_RBASE		255
-/* Keep this the last entry.  */
-#define R_ARM_NUM		256
-
-/* csky */
-#define R_CKCORE_NONE               0	/* no reloc */
-#define R_CKCORE_ADDR32             1	/* direct 32 bit (S + A) */
-#define R_CKCORE_PCRELIMM8BY4       2	/* disp ((S + A - P) >> 2) & 0xff   */
-#define R_CKCORE_PCRELIMM11BY2      3	/* disp ((S + A - P) >> 1) & 0x7ff  */
-#define R_CKCORE_PCREL32            5	/* 32-bit rel (S + A - P)           */
-#define R_CKCORE_PCRELJSR_IMM11BY2  6	/* disp ((S + A - P) >>1) & 0x7ff   */
-#define R_CKCORE_RELATIVE           9	/* 32 bit adjust program base(B + A)*/
-#define R_CKCORE_COPY               10	/* 32 bit adjust by program base    */
-#define R_CKCORE_GLOB_DAT           11	/* off between got and sym (S)      */
-#define R_CKCORE_JUMP_SLOT          12	/* PLT entry (S) */
-#define R_CKCORE_GOTOFF             13	/* offset to GOT (S + A - GOT)      */
-#define R_CKCORE_GOTPC              14	/* PC offset to GOT (GOT + A - P)   */
-#define R_CKCORE_GOT32              15	/* 32 bit GOT entry (G) */
-#define R_CKCORE_PLT32              16	/* 32 bit PLT entry (G) */
-#define R_CKCORE_ADDRGOT            17	/* GOT entry in GLOB_DAT (GOT + G)  */
-#define R_CKCORE_ADDRPLT            18	/* PLT entry in GLOB_DAT (GOT + G)  */
-#define R_CKCORE_PCREL_IMM26BY2     19	/* ((S + A - P) >> 1) & 0x3ffffff   */
-#define R_CKCORE_PCREL_IMM16BY2     20	/* disp ((S + A - P) >> 1) & 0xffff */
-#define R_CKCORE_PCREL_IMM16BY4     21	/* disp ((S + A - P) >> 2) & 0xffff */
-#define R_CKCORE_PCREL_IMM10BY2     22	/* disp ((S + A - P) >> 1) & 0x3ff  */
-#define R_CKCORE_PCREL_IMM10BY4     23	/* disp ((S + A - P) >> 2) & 0x3ff  */
-#define R_CKCORE_ADDR_HI16          24	/* high & low 16 bit ADDR */
-                                        /* ((S + A) >> 16) & 0xffff */
-#define R_CKCORE_ADDR_LO16          25	/* (S + A) & 0xffff */
-#define R_CKCORE_GOTPC_HI16         26	/* high & low 16 bit GOTPC */
-                                        /* ((GOT + A - P) >> 16) & 0xffff */
-#define R_CKCORE_GOTPC_LO16         27	/* (GOT + A - P) & 0xffff */
-#define R_CKCORE_GOTOFF_HI16        28	/* high & low 16 bit GOTOFF */
-                                        /* ((S + A - GOT) >> 16) & 0xffff */
-#define R_CKCORE_GOTOFF_LO16        29	/* (S + A - GOT) & 0xffff */
-#define R_CKCORE_GOT12              30	/* 12 bit disp GOT entry (G) */
-#define R_CKCORE_GOT_HI16           31	/* high & low 16 bit GOT */
-                                        /* (G >> 16) & 0xffff */
-#define R_CKCORE_GOT_LO16           32	/* (G & 0xffff) */
-#define R_CKCORE_PLT12              33	/* 12 bit disp PLT entry (G) */
-#define R_CKCORE_PLT_HI16           34	/* high & low 16 bit PLT */
-                                        /* (G >> 16) & 0xffff */
-#define R_CKCORE_PLT_LO16           35	/* G & 0xffff */
-#define R_CKCORE_ADDRGOT_HI16       36	/* high & low 16 bit ADDRGOT */
-                                        /* (GOT + G * 4) & 0xffff */
-#define R_CKCORE_ADDRGOT_LO16       37	/* (GOT + G * 4) & 0xffff */
-#define R_CKCORE_ADDRPLT_HI16       38	/* high & low 16 bit ADDRPLT */
-                                        /* ((GOT + G * 4) >> 16) & 0xFFFF */
-#define R_CKCORE_ADDRPLT_LO16       39	/* (GOT+G*4) & 0xffff */
-#define R_CKCORE_PCREL_JSR_IMM26BY2 40	/* disp ((S+A-P) >>1) & x3ffffff */
-#define R_CKCORE_TOFFSET_LO16       41	/* (S+A-BTEXT) & 0xffff */
-#define R_CKCORE_DOFFSET_LO16       42	/* (S+A-BTEXT) & 0xffff */
-#define R_CKCORE_PCREL_IMM18BY2     43	/* disp ((S+A-P) >>1) & 0x3ffff */
-#define R_CKCORE_DOFFSET_IMM18      44	/* disp (S+A-BDATA) & 0x3ffff */
-#define R_CKCORE_DOFFSET_IMM18BY2   45	/* disp ((S+A-BDATA)>>1) & 0x3ffff */
-#define R_CKCORE_DOFFSET_IMM18BY4   46	/* disp ((S+A-BDATA)>>2) & 0x3ffff */
-#define R_CKCORE_GOT_IMM18BY4       48	/* disp (G >> 2) */
-#define R_CKCORE_PLT_IMM18BY4       49	/* disp (G >> 2) */
-#define R_CKCORE_PCREL_IMM7BY4      50	/* disp ((S+A-P) >>2) & 0x7f */
-#define R_CKCORE_TLS_LE32           51	/* 32 bit offset to TLS block */
-#define R_CKCORE_TLS_IE32           52
-#define R_CKCORE_TLS_GD32           53
-#define R_CKCORE_TLS_LDM32          54
-#define R_CKCORE_TLS_LDO32          55
-#define R_CKCORE_TLS_DTPMOD32       56
-#define R_CKCORE_TLS_DTPOFF32       57
-#define R_CKCORE_TLS_TPOFF32        58
-
-/* IA-64 specific declarations.  */
-
-/* Processor specific flags for the Ehdr e_flags field.  */
-#define EF_IA_64_MASKOS		0x0000000f	/* os-specific flags */
-#define EF_IA_64_ABI64		0x00000010	/* 64-bit ABI */
-#define EF_IA_64_ARCH		0xff000000	/* arch. version mask */
-
-/* Processor specific values for the Phdr p_type field.  */
-#define PT_IA_64_ARCHEXT	(PT_LOPROC + 0)	/* arch extension bits */
-#define PT_IA_64_UNWIND		(PT_LOPROC + 1)	/* ia64 unwind bits */
-#define PT_IA_64_HP_OPT_ANOT	(PT_LOOS + 0x12)
-#define PT_IA_64_HP_HSL_ANOT	(PT_LOOS + 0x13)
-#define PT_IA_64_HP_STACK	(PT_LOOS + 0x14)
-
-/* Processor specific flags for the Phdr p_flags field.  */
-#define PF_IA_64_NORECOV	0x80000000	/* spec insns w/o recovery */
-
-/* Processor specific values for the Shdr sh_type field.  */
-#define SHT_IA_64_EXT		(SHT_LOPROC + 0) /* extension bits */
-#define SHT_IA_64_UNWIND	(SHT_LOPROC + 1) /* unwind bits */
-
-/* Processor specific flags for the Shdr sh_flags field.  */
-#define SHF_IA_64_SHORT		0x10000000	/* section near gp */
-#define SHF_IA_64_NORECOV	0x20000000	/* spec insns w/o recovery */
-
-/* Processor specific values for the Dyn d_tag field.  */
-#define DT_IA_64_PLT_RESERVE	(DT_LOPROC + 0)
-#define DT_IA_64_NUM		1
-
-/* IA-64 relocations.  */
-#define R_IA64_NONE		0x00	/* none */
-#define R_IA64_IMM14		0x21	/* symbol + addend, add imm14 */
-#define R_IA64_IMM22		0x22	/* symbol + addend, add imm22 */
-#define R_IA64_IMM64		0x23	/* symbol + addend, mov imm64 */
-#define R_IA64_DIR32MSB		0x24	/* symbol + addend, data4 MSB */
-#define R_IA64_DIR32LSB		0x25	/* symbol + addend, data4 LSB */
-#define R_IA64_DIR64MSB		0x26	/* symbol + addend, data8 MSB */
-#define R_IA64_DIR64LSB		0x27	/* symbol + addend, data8 LSB */
-#define R_IA64_GPREL22		0x2a	/* @gprel(sym + add), add imm22 */
-#define R_IA64_GPREL64I		0x2b	/* @gprel(sym + add), mov imm64 */
-#define R_IA64_GPREL32MSB	0x2c	/* @gprel(sym + add), data4 MSB */
-#define R_IA64_GPREL32LSB	0x2d	/* @gprel(sym + add), data4 LSB */
-#define R_IA64_GPREL64MSB	0x2e	/* @gprel(sym + add), data8 MSB */
-#define R_IA64_GPREL64LSB	0x2f	/* @gprel(sym + add), data8 LSB */
-#define R_IA64_LTOFF22		0x32	/* @ltoff(sym + add), add imm22 */
-#define R_IA64_LTOFF64I		0x33	/* @ltoff(sym + add), mov imm64 */
-#define R_IA64_PLTOFF22		0x3a	/* @pltoff(sym + add), add imm22 */
-#define R_IA64_PLTOFF64I	0x3b	/* @pltoff(sym + add), mov imm64 */
-#define R_IA64_PLTOFF64MSB	0x3e	/* @pltoff(sym + add), data8 MSB */
-#define R_IA64_PLTOFF64LSB	0x3f	/* @pltoff(sym + add), data8 LSB */
-#define R_IA64_FPTR64I		0x43	/* @fptr(sym + add), mov imm64 */
-#define R_IA64_FPTR32MSB	0x44	/* @fptr(sym + add), data4 MSB */
-#define R_IA64_FPTR32LSB	0x45	/* @fptr(sym + add), data4 LSB */
-#define R_IA64_FPTR64MSB	0x46	/* @fptr(sym + add), data8 MSB */
-#define R_IA64_FPTR64LSB	0x47	/* @fptr(sym + add), data8 LSB */
-#define R_IA64_PCREL60B		0x48	/* @pcrel(sym + add), brl */
-#define R_IA64_PCREL21B		0x49	/* @pcrel(sym + add), ptb, call */
-#define R_IA64_PCREL21M		0x4a	/* @pcrel(sym + add), chk.s */
-#define R_IA64_PCREL21F		0x4b	/* @pcrel(sym + add), fchkf */
-#define R_IA64_PCREL32MSB	0x4c	/* @pcrel(sym + add), data4 MSB */
-#define R_IA64_PCREL32LSB	0x4d	/* @pcrel(sym + add), data4 LSB */
-#define R_IA64_PCREL64MSB	0x4e	/* @pcrel(sym + add), data8 MSB */
-#define R_IA64_PCREL64LSB	0x4f	/* @pcrel(sym + add), data8 LSB */
-#define R_IA64_LTOFF_FPTR22	0x52	/* @ltoff(@fptr(s+a)), imm22 */
-#define R_IA64_LTOFF_FPTR64I	0x53	/* @ltoff(@fptr(s+a)), imm64 */
-#define R_IA64_LTOFF_FPTR32MSB	0x54	/* @ltoff(@fptr(s+a)), data4 MSB */
-#define R_IA64_LTOFF_FPTR32LSB	0x55	/* @ltoff(@fptr(s+a)), data4 LSB */
-#define R_IA64_LTOFF_FPTR64MSB	0x56	/* @ltoff(@fptr(s+a)), data8 MSB */
-#define R_IA64_LTOFF_FPTR64LSB	0x57	/* @ltoff(@fptr(s+a)), data8 LSB */
-#define R_IA64_SEGREL32MSB	0x5c	/* @segrel(sym + add), data4 MSB */
-#define R_IA64_SEGREL32LSB	0x5d	/* @segrel(sym + add), data4 LSB */
-#define R_IA64_SEGREL64MSB	0x5e	/* @segrel(sym + add), data8 MSB */
-#define R_IA64_SEGREL64LSB	0x5f	/* @segrel(sym + add), data8 LSB */
-#define R_IA64_SECREL32MSB	0x64	/* @secrel(sym + add), data4 MSB */
-#define R_IA64_SECREL32LSB	0x65	/* @secrel(sym + add), data4 LSB */
-#define R_IA64_SECREL64MSB	0x66	/* @secrel(sym + add), data8 MSB */
-#define R_IA64_SECREL64LSB	0x67	/* @secrel(sym + add), data8 LSB */
-#define R_IA64_REL32MSB		0x6c	/* data 4 + REL */
-#define R_IA64_REL32LSB		0x6d	/* data 4 + REL */
-#define R_IA64_REL64MSB		0x6e	/* data 8 + REL */
-#define R_IA64_REL64LSB		0x6f	/* data 8 + REL */
-#define R_IA64_LTV32MSB		0x74	/* symbol + addend, data4 MSB */
-#define R_IA64_LTV32LSB		0x75	/* symbol + addend, data4 LSB */
-#define R_IA64_LTV64MSB		0x76	/* symbol + addend, data8 MSB */
-#define R_IA64_LTV64LSB		0x77	/* symbol + addend, data8 LSB */
-#define R_IA64_PCREL21BI	0x79	/* @pcrel(sym + add), 21bit inst */
-#define R_IA64_PCREL22		0x7a	/* @pcrel(sym + add), 22bit inst */
-#define R_IA64_PCREL64I		0x7b	/* @pcrel(sym + add), 64bit inst */
-#define R_IA64_IPLTMSB		0x80	/* dynamic reloc, imported PLT, MSB */
-#define R_IA64_IPLTLSB		0x81	/* dynamic reloc, imported PLT, LSB */
-#define R_IA64_COPY		0x84	/* copy relocation */
-#define R_IA64_SUB		0x85	/* Addend and symbol difference */
-#define R_IA64_LTOFF22X		0x86	/* LTOFF22, relaxable.  */
-#define R_IA64_LDXMOV		0x87	/* Use of LTOFF22X.  */
-#define R_IA64_TPREL14		0x91	/* @tprel(sym + add), imm14 */
-#define R_IA64_TPREL22		0x92	/* @tprel(sym + add), imm22 */
-#define R_IA64_TPREL64I		0x93	/* @tprel(sym + add), imm64 */
-#define R_IA64_TPREL64MSB	0x96	/* @tprel(sym + add), data8 MSB */
-#define R_IA64_TPREL64LSB	0x97	/* @tprel(sym + add), data8 LSB */
-#define R_IA64_LTOFF_TPREL22	0x9a	/* @ltoff(@tprel(s+a)), imm2 */
-#define R_IA64_DTPMOD64MSB	0xa6	/* @dtpmod(sym + add), data8 MSB */
-#define R_IA64_DTPMOD64LSB	0xa7	/* @dtpmod(sym + add), data8 LSB */
-#define R_IA64_LTOFF_DTPMOD22	0xaa	/* @ltoff(@dtpmod(sym + add)), imm22 */
-#define R_IA64_DTPREL14		0xb1	/* @dtprel(sym + add), imm14 */
-#define R_IA64_DTPREL22		0xb2	/* @dtprel(sym + add), imm22 */
-#define R_IA64_DTPREL64I	0xb3	/* @dtprel(sym + add), imm64 */
-#define R_IA64_DTPREL32MSB	0xb4	/* @dtprel(sym + add), data4 MSB */
-#define R_IA64_DTPREL32LSB	0xb5	/* @dtprel(sym + add), data4 LSB */
-#define R_IA64_DTPREL64MSB	0xb6	/* @dtprel(sym + add), data8 MSB */
-#define R_IA64_DTPREL64LSB	0xb7	/* @dtprel(sym + add), data8 LSB */
-#define R_IA64_LTOFF_DTPREL22	0xba	/* @ltoff(@dtprel(s+a)), imm22 */
-
-/* SH specific declarations */
-
-/* Processor specific flags for the ELF header e_flags field.  */
-#define EF_SH_MACH_MASK		0x1f
-#define EF_SH_UNKNOWN		0x0
-#define EF_SH1			0x1
-#define EF_SH2			0x2
-#define EF_SH3			0x3
-#define EF_SH_DSP		0x4
-#define EF_SH3_DSP		0x5
-#define EF_SH4AL_DSP		0x6
-#define EF_SH3E			0x8
-#define EF_SH4			0x9
-#define EF_SH2E			0xb
-#define EF_SH4A			0xc
-#define EF_SH2A			0xd
-#define EF_SH4_NOFPU		0x10
-#define EF_SH4A_NOFPU		0x11
-#define EF_SH4_NOMMU_NOFPU	0x12
-#define EF_SH2A_NOFPU		0x13
-#define EF_SH3_NOMMU		0x14
-#define EF_SH2A_SH4_NOFPU	0x15
-#define EF_SH2A_SH3_NOFPU	0x16
-#define EF_SH2A_SH4		0x17
-#define EF_SH2A_SH3E		0x18
-
-/* SH relocs.  */
-#define	R_SH_NONE		0
-#define	R_SH_DIR32		1
-#define	R_SH_REL32		2
-#define	R_SH_DIR8WPN		3
-#define	R_SH_IND12W		4
-#define	R_SH_DIR8WPL		5
-#define	R_SH_DIR8WPZ		6
-#define	R_SH_DIR8BP		7
-#define	R_SH_DIR8W		8
-#define	R_SH_DIR8L		9
-#define	R_SH_SWITCH16		25
-#define	R_SH_SWITCH32		26
-#define	R_SH_USES		27
-#define	R_SH_COUNT		28
-#define	R_SH_ALIGN		29
-#define	R_SH_CODE		30
-#define	R_SH_DATA		31
-#define	R_SH_LABEL		32
-#define	R_SH_SWITCH8		33
-#define	R_SH_GNU_VTINHERIT	34
-#define	R_SH_GNU_VTENTRY	35
-#define	R_SH_TLS_GD_32		144
-#define	R_SH_TLS_LD_32		145
-#define	R_SH_TLS_LDO_32		146
-#define	R_SH_TLS_IE_32		147
-#define	R_SH_TLS_LE_32		148
-#define	R_SH_TLS_DTPMOD32	149
-#define	R_SH_TLS_DTPOFF32	150
-#define	R_SH_TLS_TPOFF32	151
-#define	R_SH_GOT32		160
-#define	R_SH_PLT32		161
-#define	R_SH_COPY		162
-#define	R_SH_GLOB_DAT		163
-#define	R_SH_JMP_SLOT		164
-#define	R_SH_RELATIVE		165
-#define	R_SH_GOTOFF		166
-#define	R_SH_GOTPC		167
-/* Keep this the last entry.  */
-#define	R_SH_NUM		256
-
-/* S/390 specific definitions.  */
-
-/* Valid values for the e_flags field.  */
-
-#define EF_S390_HIGH_GPRS    0x00000001  /* High GPRs kernel facility needed.  */
-
-/* Additional s390 relocs */
-
-#define R_390_NONE		0	/* No reloc.  */
-#define R_390_8			1	/* Direct 8 bit.  */
-#define R_390_12		2	/* Direct 12 bit.  */
-#define R_390_16		3	/* Direct 16 bit.  */
-#define R_390_32		4	/* Direct 32 bit.  */
-#define R_390_PC32		5	/* PC relative 32 bit.	*/
-#define R_390_GOT12		6	/* 12 bit GOT offset.  */
-#define R_390_GOT32		7	/* 32 bit GOT offset.  */
-#define R_390_PLT32		8	/* 32 bit PC relative PLT address.  */
-#define R_390_COPY		9	/* Copy symbol at runtime.  */
-#define R_390_GLOB_DAT		10	/* Create GOT entry.  */
-#define R_390_JMP_SLOT		11	/* Create PLT entry.  */
-#define R_390_RELATIVE		12	/* Adjust by program base.  */
-#define R_390_GOTOFF32		13	/* 32 bit offset to GOT.	 */
-#define R_390_GOTPC		14	/* 32 bit PC relative offset to GOT.  */
-#define R_390_GOT16		15	/* 16 bit GOT offset.  */
-#define R_390_PC16		16	/* PC relative 16 bit.	*/
-#define R_390_PC16DBL		17	/* PC relative 16 bit shifted by 1.  */
-#define R_390_PLT16DBL		18	/* 16 bit PC rel. PLT shifted by 1.  */
-#define R_390_PC32DBL		19	/* PC relative 32 bit shifted by 1.  */
-#define R_390_PLT32DBL		20	/* 32 bit PC rel. PLT shifted by 1.  */
-#define R_390_GOTPCDBL		21	/* 32 bit PC rel. GOT shifted by 1.  */
-#define R_390_64		22	/* Direct 64 bit.  */
-#define R_390_PC64		23	/* PC relative 64 bit.	*/
-#define R_390_GOT64		24	/* 64 bit GOT offset.  */
-#define R_390_PLT64		25	/* 64 bit PC relative PLT address.  */
-#define R_390_GOTENT		26	/* 32 bit PC rel. to GOT entry >> 1. */
-#define R_390_GOTOFF16		27	/* 16 bit offset to GOT. */
-#define R_390_GOTOFF64		28	/* 64 bit offset to GOT. */
-#define R_390_GOTPLT12		29	/* 12 bit offset to jump slot.	*/
-#define R_390_GOTPLT16		30	/* 16 bit offset to jump slot.	*/
-#define R_390_GOTPLT32		31	/* 32 bit offset to jump slot.	*/
-#define R_390_GOTPLT64		32	/* 64 bit offset to jump slot.	*/
-#define R_390_GOTPLTENT		33	/* 32 bit rel. offset to jump slot.  */
-#define R_390_PLTOFF16		34	/* 16 bit offset from GOT to PLT. */
-#define R_390_PLTOFF32		35	/* 32 bit offset from GOT to PLT. */
-#define R_390_PLTOFF64		36	/* 16 bit offset from GOT to PLT. */
-#define R_390_TLS_LOAD		37	/* Tag for load insn in TLS code.  */
-#define R_390_TLS_GDCALL	38	/* Tag for function call in general
-					   dynamic TLS code. */
-#define R_390_TLS_LDCALL	39	/* Tag for function call in local
-					   dynamic TLS code. */
-#define R_390_TLS_GD32		40	/* Direct 32 bit for general dynamic
-					   thread local data.  */
-#define R_390_TLS_GD64		41	/* Direct 64 bit for general dynamic
-					  thread local data.  */
-#define R_390_TLS_GOTIE12	42	/* 12 bit GOT offset for static TLS
-					   block offset.  */
-#define R_390_TLS_GOTIE32	43	/* 32 bit GOT offset for static TLS
-					   block offset.  */
-#define R_390_TLS_GOTIE64	44	/* 64 bit GOT offset for static TLS
-					   block offset. */
-#define R_390_TLS_LDM32		45	/* Direct 32 bit for local dynamic
-					   thread local data in LE code.  */
-#define R_390_TLS_LDM64		46	/* Direct 64 bit for local dynamic
-					   thread local data in LE code.  */
-#define R_390_TLS_IE32		47	/* 32 bit address of GOT entry for
-					   negated static TLS block offset.  */
-#define R_390_TLS_IE64		48	/* 64 bit address of GOT entry for
-					   negated static TLS block offset.  */
-#define R_390_TLS_IEENT		49	/* 32 bit rel. offset to GOT entry for
-					   negated static TLS block offset.  */
-#define R_390_TLS_LE32		50	/* 32 bit negated offset relative to
-					   static TLS block.  */
-#define R_390_TLS_LE64		51	/* 64 bit negated offset relative to
-					   static TLS block.  */
-#define R_390_TLS_LDO32		52	/* 32 bit offset relative to TLS
-					   block.  */
-#define R_390_TLS_LDO64		53	/* 64 bit offset relative to TLS
-					   block.  */
-#define R_390_TLS_DTPMOD	54	/* ID of module containing symbol.  */
-#define R_390_TLS_DTPOFF	55	/* Offset in TLS block.	 */
-#define R_390_TLS_TPOFF		56	/* Negated offset in static TLS
-					   block.  */
-#define R_390_20		57	/* Direct 20 bit.  */
-#define R_390_GOT20		58	/* 20 bit GOT offset.  */
-#define R_390_GOTPLT20		59	/* 20 bit offset to jump slot.  */
-#define R_390_TLS_GOTIE20	60	/* 20 bit GOT offset for static TLS
-					   block offset.  */
-#define R_390_IRELATIVE         61      /* STT_GNU_IFUNC relocation.  */
-/* Keep this the last entry.  */
-#define R_390_NUM		62
-
-
-/* CRIS relocations.  */
-#define R_CRIS_NONE		0
-#define R_CRIS_8		1
-#define R_CRIS_16		2
-#define R_CRIS_32		3
-#define R_CRIS_8_PCREL		4
-#define R_CRIS_16_PCREL		5
-#define R_CRIS_32_PCREL		6
-#define R_CRIS_GNU_VTINHERIT	7
-#define R_CRIS_GNU_VTENTRY	8
-#define R_CRIS_COPY		9
-#define R_CRIS_GLOB_DAT		10
-#define R_CRIS_JUMP_SLOT	11
-#define R_CRIS_RELATIVE		12
-#define R_CRIS_16_GOT		13
-#define R_CRIS_32_GOT		14
-#define R_CRIS_16_GOTPLT	15
-#define R_CRIS_32_GOTPLT	16
-#define R_CRIS_32_GOTREL	17
-#define R_CRIS_32_PLT_GOTREL	18
-#define R_CRIS_32_PLT_PCREL	19
-
-#define R_CRIS_NUM		20
-
-
-/* AMD x86-64 relocations.  */
-#define R_X86_64_NONE		0	/* No reloc */
-#define R_X86_64_64		1	/* Direct 64 bit  */
-#define R_X86_64_PC32		2	/* PC relative 32 bit signed */
-#define R_X86_64_GOT32		3	/* 32 bit GOT entry */
-#define R_X86_64_PLT32		4	/* 32 bit PLT address */
-#define R_X86_64_COPY		5	/* Copy symbol at runtime */
-#define R_X86_64_GLOB_DAT	6	/* Create GOT entry */
-#define R_X86_64_JUMP_SLOT	7	/* Create PLT entry */
-#define R_X86_64_RELATIVE	8	/* Adjust by program base */
-#define R_X86_64_GOTPCREL	9	/* 32 bit signed PC relative
-					   offset to GOT */
-#define R_X86_64_32		10	/* Direct 32 bit zero extended */
-#define R_X86_64_32S		11	/* Direct 32 bit sign extended */
-#define R_X86_64_16		12	/* Direct 16 bit zero extended */
-#define R_X86_64_PC16		13	/* 16 bit sign extended pc relative */
-#define R_X86_64_8		14	/* Direct 8 bit sign extended  */
-#define R_X86_64_PC8		15	/* 8 bit sign extended pc relative */
-#define R_X86_64_DTPMOD64	16	/* ID of module containing symbol */
-#define R_X86_64_DTPOFF64	17	/* Offset in module's TLS block */
-#define R_X86_64_TPOFF64	18	/* Offset in initial TLS block */
-#define R_X86_64_TLSGD		19	/* 32 bit signed PC relative offset
-					   to two GOT entries for GD symbol */
-#define R_X86_64_TLSLD		20	/* 32 bit signed PC relative offset
-					   to two GOT entries for LD symbol */
-#define R_X86_64_DTPOFF32	21	/* Offset in TLS block */
-#define R_X86_64_GOTTPOFF	22	/* 32 bit signed PC relative offset
-					   to GOT entry for IE symbol */
-#define R_X86_64_TPOFF32	23	/* Offset in initial TLS block */
-#define R_X86_64_PC64		24	/* PC relative 64 bit */
-#define R_X86_64_GOTOFF64	25	/* 64 bit offset to GOT */
-#define R_X86_64_GOTPC32	26	/* 32 bit signed pc relative
-					   offset to GOT */
-#define R_X86_64_GOT64		27	/* 64-bit GOT entry offset */
-#define R_X86_64_GOTPCREL64	28	/* 64-bit PC relative offset
-					   to GOT entry */
-#define R_X86_64_GOTPC64	29	/* 64-bit PC relative offset to GOT */
-#define R_X86_64_GOTPLT64	30 	/* like GOT64, says PLT entry needed */
-#define R_X86_64_PLTOFF64	31	/* 64-bit GOT relative offset
-					   to PLT entry */
-#define R_X86_64_SIZE32		32	/* Size of symbol plus 32-bit addend */
-#define R_X86_64_SIZE64		33	/* Size of symbol plus 64-bit addend */
-#define R_X86_64_GOTPC32_TLSDESC 34	/* GOT offset for TLS descriptor.  */
-#define R_X86_64_TLSDESC_CALL   35	/* Marker for call through TLS
-					   descriptor.  */
-#define R_X86_64_TLSDESC        36	/* TLS descriptor.  */
-#define R_X86_64_IRELATIVE	37	/* Adjust indirectly by program base */
-#define R_X86_64_RELATIVE64	38	/* 64-bit adjust by program base */
-					/* 39 Reserved was R_X86_64_PC32_BND */
-					/* 40 Reserved was R_X86_64_PLT32_BND */
-#define R_X86_64_GOTPCRELX	41	/* Load from 32 bit signed pc relative
-					   offset to GOT entry without REX
-					   prefix, relaxable.  */
-#define R_X86_64_REX_GOTPCRELX	42	/* Load from 32 bit signed pc relative
-					   offset to GOT entry with REX prefix,
-					   relaxable.  */
-#define R_X86_64_NUM		43
-
-/* x86-64 sh_type values.  */
-#define SHT_X86_64_UNWIND	0x70000001 /* Unwind information.  */
-
-
-/* AM33 relocations.  */
-#define R_MN10300_NONE		0	/* No reloc.  */
-#define R_MN10300_32		1	/* Direct 32 bit.  */
-#define R_MN10300_16		2	/* Direct 16 bit.  */
-#define R_MN10300_8		3	/* Direct 8 bit.  */
-#define R_MN10300_PCREL32	4	/* PC-relative 32-bit.  */
-#define R_MN10300_PCREL16	5	/* PC-relative 16-bit signed.  */
-#define R_MN10300_PCREL8	6	/* PC-relative 8-bit signed.  */
-#define R_MN10300_GNU_VTINHERIT	7	/* Ancient C++ vtable garbage... */
-#define R_MN10300_GNU_VTENTRY	8	/* ... collection annotation.  */
-#define R_MN10300_24		9	/* Direct 24 bit.  */
-#define R_MN10300_GOTPC32	10	/* 32-bit PCrel offset to GOT.  */
-#define R_MN10300_GOTPC16	11	/* 16-bit PCrel offset to GOT.  */
-#define R_MN10300_GOTOFF32	12	/* 32-bit offset from GOT.  */
-#define R_MN10300_GOTOFF24	13	/* 24-bit offset from GOT.  */
-#define R_MN10300_GOTOFF16	14	/* 16-bit offset from GOT.  */
-#define R_MN10300_PLT32		15	/* 32-bit PCrel to PLT entry.  */
-#define R_MN10300_PLT16		16	/* 16-bit PCrel to PLT entry.  */
-#define R_MN10300_GOT32		17	/* 32-bit offset to GOT entry.  */
-#define R_MN10300_GOT24		18	/* 24-bit offset to GOT entry.  */
-#define R_MN10300_GOT16		19	/* 16-bit offset to GOT entry.  */
-#define R_MN10300_COPY		20	/* Copy symbol at runtime.  */
-#define R_MN10300_GLOB_DAT	21	/* Create GOT entry.  */
-#define R_MN10300_JMP_SLOT	22	/* Create PLT entry.  */
-#define R_MN10300_RELATIVE	23	/* Adjust by program base.  */
-#define R_MN10300_TLS_GD	24	/* 32-bit offset for global dynamic.  */
-#define R_MN10300_TLS_LD	25	/* 32-bit offset for local dynamic.  */
-#define R_MN10300_TLS_LDO	26	/* Module-relative offset.  */
-#define R_MN10300_TLS_GOTIE	27	/* GOT offset for static TLS block
-					   offset.  */
-#define R_MN10300_TLS_IE	28	/* GOT address for static TLS block
-					   offset.  */
-#define R_MN10300_TLS_LE	29	/* Offset relative to static TLS
-					   block.  */
-#define R_MN10300_TLS_DTPMOD	30	/* ID of module containing symbol.  */
-#define R_MN10300_TLS_DTPOFF	31	/* Offset in module TLS block.  */
-#define R_MN10300_TLS_TPOFF	32	/* Offset in static TLS block.  */
-#define R_MN10300_SYM_DIFF	33	/* Adjustment for next reloc as needed
-					   by linker relaxation.  */
-#define R_MN10300_ALIGN		34	/* Alignment requirement for linker
-					   relaxation.  */
-#define R_MN10300_NUM		35
-
-
-/* M32R relocs.  */
-#define R_M32R_NONE		0	/* No reloc. */
-#define R_M32R_16		1	/* Direct 16 bit. */
-#define R_M32R_32		2	/* Direct 32 bit. */
-#define R_M32R_24		3	/* Direct 24 bit. */
-#define R_M32R_10_PCREL		4	/* PC relative 10 bit shifted. */
-#define R_M32R_18_PCREL		5	/* PC relative 18 bit shifted. */
-#define R_M32R_26_PCREL		6	/* PC relative 26 bit shifted. */
-#define R_M32R_HI16_ULO		7	/* High 16 bit with unsigned low. */
-#define R_M32R_HI16_SLO		8	/* High 16 bit with signed low. */
-#define R_M32R_LO16		9	/* Low 16 bit. */
-#define R_M32R_SDA16		10	/* 16 bit offset in SDA. */
-#define R_M32R_GNU_VTINHERIT	11
-#define R_M32R_GNU_VTENTRY	12
-/* M32R relocs use SHT_RELA.  */
-#define R_M32R_16_RELA		33	/* Direct 16 bit. */
-#define R_M32R_32_RELA		34	/* Direct 32 bit. */
-#define R_M32R_24_RELA		35	/* Direct 24 bit. */
-#define R_M32R_10_PCREL_RELA	36	/* PC relative 10 bit shifted. */
-#define R_M32R_18_PCREL_RELA	37	/* PC relative 18 bit shifted. */
-#define R_M32R_26_PCREL_RELA	38	/* PC relative 26 bit shifted. */
-#define R_M32R_HI16_ULO_RELA	39	/* High 16 bit with unsigned low */
-#define R_M32R_HI16_SLO_RELA	40	/* High 16 bit with signed low */
-#define R_M32R_LO16_RELA	41	/* Low 16 bit */
-#define R_M32R_SDA16_RELA	42	/* 16 bit offset in SDA */
-#define R_M32R_RELA_GNU_VTINHERIT	43
-#define R_M32R_RELA_GNU_VTENTRY	44
-#define R_M32R_REL32		45	/* PC relative 32 bit.  */
-
-#define R_M32R_GOT24		48	/* 24 bit GOT entry */
-#define R_M32R_26_PLTREL	49	/* 26 bit PC relative to PLT shifted */
-#define R_M32R_COPY		50	/* Copy symbol at runtime */
-#define R_M32R_GLOB_DAT		51	/* Create GOT entry */
-#define R_M32R_JMP_SLOT		52	/* Create PLT entry */
-#define R_M32R_RELATIVE		53	/* Adjust by program base */
-#define R_M32R_GOTOFF		54	/* 24 bit offset to GOT */
-#define R_M32R_GOTPC24		55	/* 24 bit PC relative offset to GOT */
-#define R_M32R_GOT16_HI_ULO	56	/* High 16 bit GOT entry with unsigned
-					   low */
-#define R_M32R_GOT16_HI_SLO	57	/* High 16 bit GOT entry with signed
-					   low */
-#define R_M32R_GOT16_LO		58	/* Low 16 bit GOT entry */
-#define R_M32R_GOTPC_HI_ULO	59	/* High 16 bit PC relative offset to
-					   GOT with unsigned low */
-#define R_M32R_GOTPC_HI_SLO	60	/* High 16 bit PC relative offset to
-					   GOT with signed low */
-#define R_M32R_GOTPC_LO		61	/* Low 16 bit PC relative offset to
-					   GOT */
-#define R_M32R_GOTOFF_HI_ULO	62	/* High 16 bit offset to GOT
-					   with unsigned low */
-#define R_M32R_GOTOFF_HI_SLO	63	/* High 16 bit offset to GOT
-					   with signed low */
-#define R_M32R_GOTOFF_LO	64	/* Low 16 bit offset to GOT */
-#define R_M32R_NUM		256	/* Keep this the last entry. */
-
-/* MicroBlaze relocations */
-#define R_MICROBLAZE_NONE		0	/* No reloc. */
-#define R_MICROBLAZE_32 		1	/* Direct 32 bit. */
-#define R_MICROBLAZE_32_PCREL		2	/* PC relative 32 bit. */
-#define R_MICROBLAZE_64_PCREL		3	/* PC relative 64 bit. */
-#define R_MICROBLAZE_32_PCREL_LO	4	/* Low 16 bits of PCREL32. */
-#define R_MICROBLAZE_64 		5	/* Direct 64 bit. */
-#define R_MICROBLAZE_32_LO		6	/* Low 16 bit. */
-#define R_MICROBLAZE_SRO32		7	/* Read-only small data area. */
-#define R_MICROBLAZE_SRW32		8	/* Read-write small data area. */
-#define R_MICROBLAZE_64_NONE		9	/* No reloc. */
-#define R_MICROBLAZE_32_SYM_OP_SYM	10	/* Symbol Op Symbol relocation. */
-#define R_MICROBLAZE_GNU_VTINHERIT	11	/* GNU C++ vtable hierarchy. */
-#define R_MICROBLAZE_GNU_VTENTRY	12	/* GNU C++ vtable member usage. */
-#define R_MICROBLAZE_GOTPC_64		13	/* PC-relative GOT offset.  */
-#define R_MICROBLAZE_GOT_64		14	/* GOT entry offset.  */
-#define R_MICROBLAZE_PLT_64		15	/* PLT offset (PC-relative).  */
-#define R_MICROBLAZE_REL		16	/* Adjust by program base.  */
-#define R_MICROBLAZE_JUMP_SLOT		17	/* Create PLT entry.  */
-#define R_MICROBLAZE_GLOB_DAT		18	/* Create GOT entry.  */
-#define R_MICROBLAZE_GOTOFF_64		19	/* 64 bit offset to GOT. */
-#define R_MICROBLAZE_GOTOFF_32		20	/* 32 bit offset to GOT. */
-#define R_MICROBLAZE_COPY		21	/* Runtime copy.  */
-#define R_MICROBLAZE_TLS		22	/* TLS Reloc. */
-#define R_MICROBLAZE_TLSGD		23	/* TLS General Dynamic. */
-#define R_MICROBLAZE_TLSLD		24	/* TLS Local Dynamic. */
-#define R_MICROBLAZE_TLSDTPMOD32	25	/* TLS Module ID. */
-#define R_MICROBLAZE_TLSDTPREL32	26	/* TLS Offset Within TLS Block. */
-#define R_MICROBLAZE_TLSDTPREL64	27	/* TLS Offset Within TLS Block. */
-#define R_MICROBLAZE_TLSGOTTPREL32	28	/* TLS Offset From Thread Pointer. */
-#define R_MICROBLAZE_TLSTPREL32 	29	/* TLS Offset From Thread Pointer. */
-
-/* Legal values for d_tag (dynamic entry type).  */
-#define DT_NIOS2_GP             0x70000002 /* Address of _gp.  */
-
-/* Nios II relocations.  */
-#define R_NIOS2_NONE		0	/* No reloc.  */
-#define R_NIOS2_S16		1	/* Direct signed 16 bit.  */
-#define R_NIOS2_U16		2	/* Direct unsigned 16 bit.  */
-#define R_NIOS2_PCREL16		3	/* PC relative 16 bit.  */
-#define R_NIOS2_CALL26		4	/* Direct call.  */
-#define R_NIOS2_IMM5		5	/* 5 bit constant expression.  */
-#define R_NIOS2_CACHE_OPX	6	/* 5 bit expression, shift 22.  */
-#define R_NIOS2_IMM6		7	/* 6 bit constant expression.  */
-#define R_NIOS2_IMM8		8	/* 8 bit constant expression.  */
-#define R_NIOS2_HI16		9	/* High 16 bit.  */
-#define R_NIOS2_LO16		10	/* Low 16 bit.  */
-#define R_NIOS2_HIADJ16		11	/* High 16 bit, adjusted.  */
-#define R_NIOS2_BFD_RELOC_32	12	/* 32 bit symbol value + addend.  */
-#define R_NIOS2_BFD_RELOC_16	13	/* 16 bit symbol value + addend.  */
-#define R_NIOS2_BFD_RELOC_8	14	/* 8 bit symbol value + addend.  */
-#define R_NIOS2_GPREL		15	/* 16 bit GP pointer offset.  */
-#define R_NIOS2_GNU_VTINHERIT	16	/* GNU C++ vtable hierarchy.  */
-#define R_NIOS2_GNU_VTENTRY	17	/* GNU C++ vtable member usage.  */
-#define R_NIOS2_UJMP		18	/* Unconditional branch.  */
-#define R_NIOS2_CJMP		19	/* Conditional branch.  */
-#define R_NIOS2_CALLR		20	/* Indirect call through register.  */
-#define R_NIOS2_ALIGN		21	/* Alignment requirement for
-					   linker relaxation.  */
-#define R_NIOS2_GOT16		22	/* 16 bit GOT entry.  */
-#define R_NIOS2_CALL16		23	/* 16 bit GOT entry for function.  */
-#define R_NIOS2_GOTOFF_LO	24	/* %lo of offset to GOT pointer.  */
-#define R_NIOS2_GOTOFF_HA	25	/* %hiadj of offset to GOT pointer.  */
-#define R_NIOS2_PCREL_LO	26	/* %lo of PC relative offset.  */
-#define R_NIOS2_PCREL_HA	27	/* %hiadj of PC relative offset.  */
-#define R_NIOS2_TLS_GD16	28	/* 16 bit GOT offset for TLS GD.  */
-#define R_NIOS2_TLS_LDM16	29	/* 16 bit GOT offset for TLS LDM.  */
-#define R_NIOS2_TLS_LDO16	30	/* 16 bit module relative offset.  */
-#define R_NIOS2_TLS_IE16	31	/* 16 bit GOT offset for TLS IE.  */
-#define R_NIOS2_TLS_LE16	32	/* 16 bit LE TP-relative offset.  */
-#define R_NIOS2_TLS_DTPMOD	33	/* Module number.  */
-#define R_NIOS2_TLS_DTPREL	34	/* Module-relative offset.  */
-#define R_NIOS2_TLS_TPREL	35	/* TP-relative offset.  */
-#define R_NIOS2_COPY		36	/* Copy symbol at runtime.  */
-#define R_NIOS2_GLOB_DAT	37	/* Create GOT entry.  */
-#define R_NIOS2_JUMP_SLOT	38	/* Create PLT entry.  */
-#define R_NIOS2_RELATIVE	39	/* Adjust by program base.  */
-#define R_NIOS2_GOTOFF		40	/* 16 bit offset to GOT pointer.  */
-#define R_NIOS2_CALL26_NOAT	41	/* Direct call in .noat section.  */
-#define R_NIOS2_GOT_LO		42	/* %lo() of GOT entry.  */
-#define R_NIOS2_GOT_HA		43	/* %hiadj() of GOT entry.  */
-#define R_NIOS2_CALL_LO		44	/* %lo() of function GOT entry.  */
-#define R_NIOS2_CALL_HA		45	/* %hiadj() of function GOT entry.  */
-
-/* TILEPro relocations.  */
-#define R_TILEPRO_NONE		0	/* No reloc */
-#define R_TILEPRO_32		1	/* Direct 32 bit */
-#define R_TILEPRO_16		2	/* Direct 16 bit */
-#define R_TILEPRO_8		3	/* Direct 8 bit */
-#define R_TILEPRO_32_PCREL	4	/* PC relative 32 bit */
-#define R_TILEPRO_16_PCREL	5	/* PC relative 16 bit */
-#define R_TILEPRO_8_PCREL	6	/* PC relative 8 bit */
-#define R_TILEPRO_LO16		7	/* Low 16 bit */
-#define R_TILEPRO_HI16		8	/* High 16 bit */
-#define R_TILEPRO_HA16		9	/* High 16 bit, adjusted */
-#define R_TILEPRO_COPY		10	/* Copy relocation */
-#define R_TILEPRO_GLOB_DAT	11	/* Create GOT entry */
-#define R_TILEPRO_JMP_SLOT	12	/* Create PLT entry */
-#define R_TILEPRO_RELATIVE	13	/* Adjust by program base */
-#define R_TILEPRO_BROFF_X1	14	/* X1 pipe branch offset */
-#define R_TILEPRO_JOFFLONG_X1	15	/* X1 pipe jump offset */
-#define R_TILEPRO_JOFFLONG_X1_PLT 16	/* X1 pipe jump offset to PLT */
-#define R_TILEPRO_IMM8_X0	17	/* X0 pipe 8-bit */
-#define R_TILEPRO_IMM8_Y0	18	/* Y0 pipe 8-bit */
-#define R_TILEPRO_IMM8_X1	19	/* X1 pipe 8-bit */
-#define R_TILEPRO_IMM8_Y1	20	/* Y1 pipe 8-bit */
-#define R_TILEPRO_MT_IMM15_X1	21	/* X1 pipe mtspr */
-#define R_TILEPRO_MF_IMM15_X1	22	/* X1 pipe mfspr */
-#define R_TILEPRO_IMM16_X0	23	/* X0 pipe 16-bit */
-#define R_TILEPRO_IMM16_X1	24	/* X1 pipe 16-bit */
-#define R_TILEPRO_IMM16_X0_LO	25	/* X0 pipe low 16-bit */
-#define R_TILEPRO_IMM16_X1_LO	26	/* X1 pipe low 16-bit */
-#define R_TILEPRO_IMM16_X0_HI	27	/* X0 pipe high 16-bit */
-#define R_TILEPRO_IMM16_X1_HI	28	/* X1 pipe high 16-bit */
-#define R_TILEPRO_IMM16_X0_HA	29	/* X0 pipe high 16-bit, adjusted */
-#define R_TILEPRO_IMM16_X1_HA	30	/* X1 pipe high 16-bit, adjusted */
-#define R_TILEPRO_IMM16_X0_PCREL 31	/* X0 pipe PC relative 16 bit */
-#define R_TILEPRO_IMM16_X1_PCREL 32	/* X1 pipe PC relative 16 bit */
-#define R_TILEPRO_IMM16_X0_LO_PCREL 33	/* X0 pipe PC relative low 16 bit */
-#define R_TILEPRO_IMM16_X1_LO_PCREL 34	/* X1 pipe PC relative low 16 bit */
-#define R_TILEPRO_IMM16_X0_HI_PCREL 35	/* X0 pipe PC relative high 16 bit */
-#define R_TILEPRO_IMM16_X1_HI_PCREL 36	/* X1 pipe PC relative high 16 bit */
-#define R_TILEPRO_IMM16_X0_HA_PCREL 37	/* X0 pipe PC relative ha() 16 bit */
-#define R_TILEPRO_IMM16_X1_HA_PCREL 38	/* X1 pipe PC relative ha() 16 bit */
-#define R_TILEPRO_IMM16_X0_GOT	39	/* X0 pipe 16-bit GOT offset */
-#define R_TILEPRO_IMM16_X1_GOT	40	/* X1 pipe 16-bit GOT offset */
-#define R_TILEPRO_IMM16_X0_GOT_LO 41	/* X0 pipe low 16-bit GOT offset */
-#define R_TILEPRO_IMM16_X1_GOT_LO 42	/* X1 pipe low 16-bit GOT offset */
-#define R_TILEPRO_IMM16_X0_GOT_HI 43	/* X0 pipe high 16-bit GOT offset */
-#define R_TILEPRO_IMM16_X1_GOT_HI 44	/* X1 pipe high 16-bit GOT offset */
-#define R_TILEPRO_IMM16_X0_GOT_HA 45	/* X0 pipe ha() 16-bit GOT offset */
-#define R_TILEPRO_IMM16_X1_GOT_HA 46	/* X1 pipe ha() 16-bit GOT offset */
-#define R_TILEPRO_MMSTART_X0	47	/* X0 pipe mm "start" */
-#define R_TILEPRO_MMEND_X0	48	/* X0 pipe mm "end" */
-#define R_TILEPRO_MMSTART_X1	49	/* X1 pipe mm "start" */
-#define R_TILEPRO_MMEND_X1	50	/* X1 pipe mm "end" */
-#define R_TILEPRO_SHAMT_X0	51	/* X0 pipe shift amount */
-#define R_TILEPRO_SHAMT_X1	52	/* X1 pipe shift amount */
-#define R_TILEPRO_SHAMT_Y0	53	/* Y0 pipe shift amount */
-#define R_TILEPRO_SHAMT_Y1	54	/* Y1 pipe shift amount */
-#define R_TILEPRO_DEST_IMM8_X1	55	/* X1 pipe destination 8-bit */
-/* Relocs 56-59 are currently not defined.  */
-#define R_TILEPRO_TLS_GD_CALL	60	/* "jal" for TLS GD */
-#define R_TILEPRO_IMM8_X0_TLS_GD_ADD 61	/* X0 pipe "addi" for TLS GD */
-#define R_TILEPRO_IMM8_X1_TLS_GD_ADD 62	/* X1 pipe "addi" for TLS GD */
-#define R_TILEPRO_IMM8_Y0_TLS_GD_ADD 63	/* Y0 pipe "addi" for TLS GD */
-#define R_TILEPRO_IMM8_Y1_TLS_GD_ADD 64	/* Y1 pipe "addi" for TLS GD */
-#define R_TILEPRO_TLS_IE_LOAD	65	/* "lw_tls" for TLS IE */
-#define R_TILEPRO_IMM16_X0_TLS_GD 66	/* X0 pipe 16-bit TLS GD offset */
-#define R_TILEPRO_IMM16_X1_TLS_GD 67	/* X1 pipe 16-bit TLS GD offset */
-#define R_TILEPRO_IMM16_X0_TLS_GD_LO 68	/* X0 pipe low 16-bit TLS GD offset */
-#define R_TILEPRO_IMM16_X1_TLS_GD_LO 69	/* X1 pipe low 16-bit TLS GD offset */
-#define R_TILEPRO_IMM16_X0_TLS_GD_HI 70	/* X0 pipe high 16-bit TLS GD offset */
-#define R_TILEPRO_IMM16_X1_TLS_GD_HI 71	/* X1 pipe high 16-bit TLS GD offset */
-#define R_TILEPRO_IMM16_X0_TLS_GD_HA 72	/* X0 pipe ha() 16-bit TLS GD offset */
-#define R_TILEPRO_IMM16_X1_TLS_GD_HA 73	/* X1 pipe ha() 16-bit TLS GD offset */
-#define R_TILEPRO_IMM16_X0_TLS_IE 74	/* X0 pipe 16-bit TLS IE offset */
-#define R_TILEPRO_IMM16_X1_TLS_IE 75	/* X1 pipe 16-bit TLS IE offset */
-#define R_TILEPRO_IMM16_X0_TLS_IE_LO 76	/* X0 pipe low 16-bit TLS IE offset */
-#define R_TILEPRO_IMM16_X1_TLS_IE_LO 77	/* X1 pipe low 16-bit TLS IE offset */
-#define R_TILEPRO_IMM16_X0_TLS_IE_HI 78	/* X0 pipe high 16-bit TLS IE offset */
-#define R_TILEPRO_IMM16_X1_TLS_IE_HI 79	/* X1 pipe high 16-bit TLS IE offset */
-#define R_TILEPRO_IMM16_X0_TLS_IE_HA 80	/* X0 pipe ha() 16-bit TLS IE offset */
-#define R_TILEPRO_IMM16_X1_TLS_IE_HA 81	/* X1 pipe ha() 16-bit TLS IE offset */
-#define R_TILEPRO_TLS_DTPMOD32	82	/* ID of module containing symbol */
-#define R_TILEPRO_TLS_DTPOFF32	83	/* Offset in TLS block */
-#define R_TILEPRO_TLS_TPOFF32	84	/* Offset in static TLS block */
-#define R_TILEPRO_IMM16_X0_TLS_LE 85	/* X0 pipe 16-bit TLS LE offset */
-#define R_TILEPRO_IMM16_X1_TLS_LE 86	/* X1 pipe 16-bit TLS LE offset */
-#define R_TILEPRO_IMM16_X0_TLS_LE_LO 87	/* X0 pipe low 16-bit TLS LE offset */
-#define R_TILEPRO_IMM16_X1_TLS_LE_LO 88	/* X1 pipe low 16-bit TLS LE offset */
-#define R_TILEPRO_IMM16_X0_TLS_LE_HI 89	/* X0 pipe high 16-bit TLS LE offset */
-#define R_TILEPRO_IMM16_X1_TLS_LE_HI 90	/* X1 pipe high 16-bit TLS LE offset */
-#define R_TILEPRO_IMM16_X0_TLS_LE_HA 91	/* X0 pipe ha() 16-bit TLS LE offset */
-#define R_TILEPRO_IMM16_X1_TLS_LE_HA 92	/* X1 pipe ha() 16-bit TLS LE offset */
-
-#define R_TILEPRO_GNU_VTINHERIT	128	/* GNU C++ vtable hierarchy */
-#define R_TILEPRO_GNU_VTENTRY	129	/* GNU C++ vtable member usage */
-
-#define R_TILEPRO_NUM		130
-
-
-/* TILE-Gx relocations.  */
-#define R_TILEGX_NONE		0	/* No reloc */
-#define R_TILEGX_64		1	/* Direct 64 bit */
-#define R_TILEGX_32		2	/* Direct 32 bit */
-#define R_TILEGX_16		3	/* Direct 16 bit */
-#define R_TILEGX_8		4	/* Direct 8 bit */
-#define R_TILEGX_64_PCREL	5	/* PC relative 64 bit */
-#define R_TILEGX_32_PCREL	6	/* PC relative 32 bit */
-#define R_TILEGX_16_PCREL	7	/* PC relative 16 bit */
-#define R_TILEGX_8_PCREL	8	/* PC relative 8 bit */
-#define R_TILEGX_HW0		9	/* hword 0 16-bit */
-#define R_TILEGX_HW1		10	/* hword 1 16-bit */
-#define R_TILEGX_HW2		11	/* hword 2 16-bit */
-#define R_TILEGX_HW3		12	/* hword 3 16-bit */
-#define R_TILEGX_HW0_LAST	13	/* last hword 0 16-bit */
-#define R_TILEGX_HW1_LAST	14	/* last hword 1 16-bit */
-#define R_TILEGX_HW2_LAST	15	/* last hword 2 16-bit */
-#define R_TILEGX_COPY		16	/* Copy relocation */
-#define R_TILEGX_GLOB_DAT	17	/* Create GOT entry */
-#define R_TILEGX_JMP_SLOT	18	/* Create PLT entry */
-#define R_TILEGX_RELATIVE	19	/* Adjust by program base */
-#define R_TILEGX_BROFF_X1	20	/* X1 pipe branch offset */
-#define R_TILEGX_JUMPOFF_X1	21	/* X1 pipe jump offset */
-#define R_TILEGX_JUMPOFF_X1_PLT	22	/* X1 pipe jump offset to PLT */
-#define R_TILEGX_IMM8_X0	23	/* X0 pipe 8-bit */
-#define R_TILEGX_IMM8_Y0	24	/* Y0 pipe 8-bit */
-#define R_TILEGX_IMM8_X1	25	/* X1 pipe 8-bit */
-#define R_TILEGX_IMM8_Y1	26	/* Y1 pipe 8-bit */
-#define R_TILEGX_DEST_IMM8_X1	27	/* X1 pipe destination 8-bit */
-#define R_TILEGX_MT_IMM14_X1	28	/* X1 pipe mtspr */
-#define R_TILEGX_MF_IMM14_X1	29	/* X1 pipe mfspr */
-#define R_TILEGX_MMSTART_X0	30	/* X0 pipe mm "start" */
-#define R_TILEGX_MMEND_X0	31	/* X0 pipe mm "end" */
-#define R_TILEGX_SHAMT_X0	32	/* X0 pipe shift amount */
-#define R_TILEGX_SHAMT_X1	33	/* X1 pipe shift amount */
-#define R_TILEGX_SHAMT_Y0	34	/* Y0 pipe shift amount */
-#define R_TILEGX_SHAMT_Y1	35	/* Y1 pipe shift amount */
-#define R_TILEGX_IMM16_X0_HW0	36	/* X0 pipe hword 0 */
-#define R_TILEGX_IMM16_X1_HW0	37	/* X1 pipe hword 0 */
-#define R_TILEGX_IMM16_X0_HW1	38	/* X0 pipe hword 1 */
-#define R_TILEGX_IMM16_X1_HW1	39	/* X1 pipe hword 1 */
-#define R_TILEGX_IMM16_X0_HW2	40	/* X0 pipe hword 2 */
-#define R_TILEGX_IMM16_X1_HW2	41	/* X1 pipe hword 2 */
-#define R_TILEGX_IMM16_X0_HW3	42	/* X0 pipe hword 3 */
-#define R_TILEGX_IMM16_X1_HW3	43	/* X1 pipe hword 3 */
-#define R_TILEGX_IMM16_X0_HW0_LAST 44	/* X0 pipe last hword 0 */
-#define R_TILEGX_IMM16_X1_HW0_LAST 45	/* X1 pipe last hword 0 */
-#define R_TILEGX_IMM16_X0_HW1_LAST 46	/* X0 pipe last hword 1 */
-#define R_TILEGX_IMM16_X1_HW1_LAST 47	/* X1 pipe last hword 1 */
-#define R_TILEGX_IMM16_X0_HW2_LAST 48	/* X0 pipe last hword 2 */
-#define R_TILEGX_IMM16_X1_HW2_LAST 49	/* X1 pipe last hword 2 */
-#define R_TILEGX_IMM16_X0_HW0_PCREL 50	/* X0 pipe PC relative hword 0 */
-#define R_TILEGX_IMM16_X1_HW0_PCREL 51	/* X1 pipe PC relative hword 0 */
-#define R_TILEGX_IMM16_X0_HW1_PCREL 52	/* X0 pipe PC relative hword 1 */
-#define R_TILEGX_IMM16_X1_HW1_PCREL 53	/* X1 pipe PC relative hword 1 */
-#define R_TILEGX_IMM16_X0_HW2_PCREL 54	/* X0 pipe PC relative hword 2 */
-#define R_TILEGX_IMM16_X1_HW2_PCREL 55	/* X1 pipe PC relative hword 2 */
-#define R_TILEGX_IMM16_X0_HW3_PCREL 56	/* X0 pipe PC relative hword 3 */
-#define R_TILEGX_IMM16_X1_HW3_PCREL 57	/* X1 pipe PC relative hword 3 */
-#define R_TILEGX_IMM16_X0_HW0_LAST_PCREL 58 /* X0 pipe PC-rel last hword 0 */
-#define R_TILEGX_IMM16_X1_HW0_LAST_PCREL 59 /* X1 pipe PC-rel last hword 0 */
-#define R_TILEGX_IMM16_X0_HW1_LAST_PCREL 60 /* X0 pipe PC-rel last hword 1 */
-#define R_TILEGX_IMM16_X1_HW1_LAST_PCREL 61 /* X1 pipe PC-rel last hword 1 */
-#define R_TILEGX_IMM16_X0_HW2_LAST_PCREL 62 /* X0 pipe PC-rel last hword 2 */
-#define R_TILEGX_IMM16_X1_HW2_LAST_PCREL 63 /* X1 pipe PC-rel last hword 2 */
-#define R_TILEGX_IMM16_X0_HW0_GOT 64	/* X0 pipe hword 0 GOT offset */
-#define R_TILEGX_IMM16_X1_HW0_GOT 65	/* X1 pipe hword 0 GOT offset */
-#define R_TILEGX_IMM16_X0_HW0_PLT_PCREL 66 /* X0 pipe PC-rel PLT hword 0 */
-#define R_TILEGX_IMM16_X1_HW0_PLT_PCREL 67 /* X1 pipe PC-rel PLT hword 0 */
-#define R_TILEGX_IMM16_X0_HW1_PLT_PCREL 68 /* X0 pipe PC-rel PLT hword 1 */
-#define R_TILEGX_IMM16_X1_HW1_PLT_PCREL 69 /* X1 pipe PC-rel PLT hword 1 */
-#define R_TILEGX_IMM16_X0_HW2_PLT_PCREL 70 /* X0 pipe PC-rel PLT hword 2 */
-#define R_TILEGX_IMM16_X1_HW2_PLT_PCREL 71 /* X1 pipe PC-rel PLT hword 2 */
-#define R_TILEGX_IMM16_X0_HW0_LAST_GOT 72 /* X0 pipe last hword 0 GOT offset */
-#define R_TILEGX_IMM16_X1_HW0_LAST_GOT 73 /* X1 pipe last hword 0 GOT offset */
-#define R_TILEGX_IMM16_X0_HW1_LAST_GOT 74 /* X0 pipe last hword 1 GOT offset */
-#define R_TILEGX_IMM16_X1_HW1_LAST_GOT 75 /* X1 pipe last hword 1 GOT offset */
-#define R_TILEGX_IMM16_X0_HW3_PLT_PCREL 76 /* X0 pipe PC-rel PLT hword 3 */
-#define R_TILEGX_IMM16_X1_HW3_PLT_PCREL 77 /* X1 pipe PC-rel PLT hword 3 */
-#define R_TILEGX_IMM16_X0_HW0_TLS_GD 78	/* X0 pipe hword 0 TLS GD offset */
-#define R_TILEGX_IMM16_X1_HW0_TLS_GD 79	/* X1 pipe hword 0 TLS GD offset */
-#define R_TILEGX_IMM16_X0_HW0_TLS_LE 80	/* X0 pipe hword 0 TLS LE offset */
-#define R_TILEGX_IMM16_X1_HW0_TLS_LE 81	/* X1 pipe hword 0 TLS LE offset */
-#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_LE 82 /* X0 pipe last hword 0 LE off */
-#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_LE 83 /* X1 pipe last hword 0 LE off */
-#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_LE 84 /* X0 pipe last hword 1 LE off */
-#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_LE 85 /* X1 pipe last hword 1 LE off */
-#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD 86 /* X0 pipe last hword 0 GD off */
-#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD 87 /* X1 pipe last hword 0 GD off */
-#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD 88 /* X0 pipe last hword 1 GD off */
-#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD 89 /* X1 pipe last hword 1 GD off */
-/* Relocs 90-91 are currently not defined.  */
-#define R_TILEGX_IMM16_X0_HW0_TLS_IE 92	/* X0 pipe hword 0 TLS IE offset */
-#define R_TILEGX_IMM16_X1_HW0_TLS_IE 93	/* X1 pipe hword 0 TLS IE offset */
-#define R_TILEGX_IMM16_X0_HW0_LAST_PLT_PCREL 94 /* X0 pipe PC-rel PLT last hword 0 */
-#define R_TILEGX_IMM16_X1_HW0_LAST_PLT_PCREL 95 /* X1 pipe PC-rel PLT last hword 0 */
-#define R_TILEGX_IMM16_X0_HW1_LAST_PLT_PCREL 96 /* X0 pipe PC-rel PLT last hword 1 */
-#define R_TILEGX_IMM16_X1_HW1_LAST_PLT_PCREL 97 /* X1 pipe PC-rel PLT last hword 1 */
-#define R_TILEGX_IMM16_X0_HW2_LAST_PLT_PCREL 98 /* X0 pipe PC-rel PLT last hword 2 */
-#define R_TILEGX_IMM16_X1_HW2_LAST_PLT_PCREL 99 /* X1 pipe PC-rel PLT last hword 2 */
-#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE 100 /* X0 pipe last hword 0 IE off */
-#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE 101 /* X1 pipe last hword 0 IE off */
-#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE 102 /* X0 pipe last hword 1 IE off */
-#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE 103 /* X1 pipe last hword 1 IE off */
-/* Relocs 104-105 are currently not defined.  */
-#define R_TILEGX_TLS_DTPMOD64	106	/* 64-bit ID of symbol's module */
-#define R_TILEGX_TLS_DTPOFF64	107	/* 64-bit offset in TLS block */
-#define R_TILEGX_TLS_TPOFF64	108	/* 64-bit offset in static TLS block */
-#define R_TILEGX_TLS_DTPMOD32	109	/* 32-bit ID of symbol's module */
-#define R_TILEGX_TLS_DTPOFF32	110	/* 32-bit offset in TLS block */
-#define R_TILEGX_TLS_TPOFF32	111	/* 32-bit offset in static TLS block */
-#define R_TILEGX_TLS_GD_CALL	112	/* "jal" for TLS GD */
-#define R_TILEGX_IMM8_X0_TLS_GD_ADD 113	/* X0 pipe "addi" for TLS GD */
-#define R_TILEGX_IMM8_X1_TLS_GD_ADD 114	/* X1 pipe "addi" for TLS GD */
-#define R_TILEGX_IMM8_Y0_TLS_GD_ADD 115	/* Y0 pipe "addi" for TLS GD */
-#define R_TILEGX_IMM8_Y1_TLS_GD_ADD 116	/* Y1 pipe "addi" for TLS GD */
-#define R_TILEGX_TLS_IE_LOAD	117	/* "ld_tls" for TLS IE */
-#define R_TILEGX_IMM8_X0_TLS_ADD 118	/* X0 pipe "addi" for TLS GD/IE */
-#define R_TILEGX_IMM8_X1_TLS_ADD 119	/* X1 pipe "addi" for TLS GD/IE */
-#define R_TILEGX_IMM8_Y0_TLS_ADD 120	/* Y0 pipe "addi" for TLS GD/IE */
-#define R_TILEGX_IMM8_Y1_TLS_ADD 121	/* Y1 pipe "addi" for TLS GD/IE */
-
-#define R_TILEGX_GNU_VTINHERIT	128	/* GNU C++ vtable hierarchy */
-#define R_TILEGX_GNU_VTENTRY	129	/* GNU C++ vtable member usage */
-
-#define R_TILEGX_NUM		130
-
-/* RISC-V ELF Flags */
-#define EF_RISCV_RVC 			0x0001
-#define EF_RISCV_FLOAT_ABI 		0x0006
-#define EF_RISCV_FLOAT_ABI_SOFT 	0x0000
-#define EF_RISCV_FLOAT_ABI_SINGLE 	0x0002
-#define EF_RISCV_FLOAT_ABI_DOUBLE 	0x0004
-#define EF_RISCV_FLOAT_ABI_QUAD 	0x0006
-
-/* RISC-V relocations.  */
-#define R_RISCV_NONE		 0
-#define R_RISCV_32		 1
-#define R_RISCV_64		 2
-#define R_RISCV_RELATIVE	 3
-#define R_RISCV_COPY		 4
-#define R_RISCV_JUMP_SLOT	 5
-#define R_RISCV_TLS_DTPMOD32	 6
-#define R_RISCV_TLS_DTPMOD64	 7
-#define R_RISCV_TLS_DTPREL32	 8
-#define R_RISCV_TLS_DTPREL64	 9
-#define R_RISCV_TLS_TPREL32	10
-#define R_RISCV_TLS_TPREL64	11
-#define R_RISCV_BRANCH		16
-#define R_RISCV_JAL		17
-#define R_RISCV_CALL		18
-#define R_RISCV_CALL_PLT	19
-#define R_RISCV_GOT_HI20	20
-#define R_RISCV_TLS_GOT_HI20	21
-#define R_RISCV_TLS_GD_HI20	22
-#define R_RISCV_PCREL_HI20	23
-#define R_RISCV_PCREL_LO12_I	24
-#define R_RISCV_PCREL_LO12_S	25
-#define R_RISCV_HI20		26
-#define R_RISCV_LO12_I		27
-#define R_RISCV_LO12_S		28
-#define R_RISCV_TPREL_HI20	29
-#define R_RISCV_TPREL_LO12_I	30
-#define R_RISCV_TPREL_LO12_S	31
-#define R_RISCV_TPREL_ADD	32
-#define R_RISCV_ADD8		33
-#define R_RISCV_ADD16		34
-#define R_RISCV_ADD32		35
-#define R_RISCV_ADD64		36
-#define R_RISCV_SUB8		37
-#define R_RISCV_SUB16		38
-#define R_RISCV_SUB32		39
-#define R_RISCV_SUB64		40
-#define R_RISCV_GNU_VTINHERIT	41
-#define R_RISCV_GNU_VTENTRY	42
-#define R_RISCV_ALIGN		43
-#define R_RISCV_RVC_BRANCH	44
-#define R_RISCV_RVC_JUMP	45
-#define R_RISCV_RVC_LUI		46
-#define R_RISCV_GPREL_I		47
-#define R_RISCV_GPREL_S		48
-#define R_RISCV_TPREL_I		49
-#define R_RISCV_TPREL_S		50
-#define R_RISCV_RELAX		51
-#define R_RISCV_SUB6		52
-#define R_RISCV_SET6		53
-#define R_RISCV_SET8		54
-#define R_RISCV_SET16		55
-#define R_RISCV_SET32		56
-#define R_RISCV_32_PCREL	57
-
-#define R_RISCV_NUM		58
-
-/* BPF specific declarations.  */
-
-#define R_BPF_NONE		0	/* No reloc */
-#define R_BPF_64_64		1
-#define R_BPF_64_32		10
-
-/* Imagination Meta specific relocations. */
-
-#define R_METAG_HIADDR16	0
-#define R_METAG_LOADDR16	1
-#define R_METAG_ADDR32		2	/* 32bit absolute address */
-#define R_METAG_NONE		3	/* No reloc */
-#define R_METAG_RELBRANCH	4
-#define R_METAG_GETSETOFF	5
-
-/* Backward compatability */
-#define R_METAG_REG32OP1	6
-#define R_METAG_REG32OP2	7
-#define R_METAG_REG32OP3	8
-#define R_METAG_REG16OP1	9
-#define R_METAG_REG16OP2	10
-#define R_METAG_REG16OP3	11
-#define R_METAG_REG32OP4	12
-
-#define R_METAG_HIOG		13
-#define R_METAG_LOOG		14
-
-#define R_METAG_REL8		15
-#define R_METAG_REL16		16
-
-/* GNU */
-#define R_METAG_GNU_VTINHERIT	30
-#define R_METAG_GNU_VTENTRY	31
-
-/* PIC relocations */
-#define R_METAG_HI16_GOTOFF	32
-#define R_METAG_LO16_GOTOFF	33
-#define R_METAG_GETSET_GOTOFF	34
-#define R_METAG_GETSET_GOT	35
-#define R_METAG_HI16_GOTPC	36
-#define R_METAG_LO16_GOTPC	37
-#define R_METAG_HI16_PLT	38
-#define R_METAG_LO16_PLT	39
-#define R_METAG_RELBRANCH_PLT	40
-#define R_METAG_GOTOFF		41
-#define R_METAG_PLT		42
-#define R_METAG_COPY		43
-#define R_METAG_JMP_SLOT	44
-#define R_METAG_RELATIVE	45
-#define R_METAG_GLOB_DAT	46
-
-/* TLS relocations */
-#define R_METAG_TLS_GD		47
-#define R_METAG_TLS_LDM		48
-#define R_METAG_TLS_LDO_HI16	49
-#define R_METAG_TLS_LDO_LO16	50
-#define R_METAG_TLS_LDO		51
-#define R_METAG_TLS_IE		52
-#define R_METAG_TLS_IENONPIC	53
-#define R_METAG_TLS_IENONPIC_HI16 54
-#define R_METAG_TLS_IENONPIC_LO16 55
-#define R_METAG_TLS_TPOFF	56
-#define R_METAG_TLS_DTPMOD	57
-#define R_METAG_TLS_DTPOFF	58
-#define R_METAG_TLS_LE		59
-#define R_METAG_TLS_LE_HI16	60
-#define R_METAG_TLS_LE_LO16	61
-
-/* NDS32 relocations.  */
-#define R_NDS32_NONE		0
-#define R_NDS32_32_RELA 	20
-#define R_NDS32_COPY		39
-#define R_NDS32_GLOB_DAT	40
-#define R_NDS32_JMP_SLOT	41
-#define R_NDS32_RELATIVE	42
-#define R_NDS32_TLS_TPOFF	102
-#define R_NDS32_TLS_DESC	119
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif	/* elf.h */
diff --git a/extern/crashpad/crashpad/third_party/googletest/BUILD.gn b/extern/crashpad/crashpad/third_party/googletest/BUILD.gn
index de1c84d444..fcf907552f 100644
--- a/extern/crashpad/crashpad/third_party/googletest/BUILD.gn
+++ b/extern/crashpad/crashpad/third_party/googletest/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2017 The Crashpad Authors. All rights reserved.
+# Copyright 2017 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -55,6 +55,7 @@ if (crashpad_is_in_chromium) {
   static_library("googletest") {
     testonly = true
     sources = [
+      "$googletest_dir/googletest/include/gtest/gtest-assertion-result.h",
       "$googletest_dir/googletest/include/gtest/gtest-death-test.h",
       "$googletest_dir/googletest/include/gtest/gtest-matchers.h",
       "$googletest_dir/googletest/include/gtest/gtest-message.h",
@@ -78,6 +79,7 @@ if (crashpad_is_in_chromium) {
       "$googletest_dir/googletest/include/gtest/internal/gtest-string.h",
       "$googletest_dir/googletest/include/gtest/internal/gtest-type-util.h",
       "$googletest_dir/googletest/src/gtest-all.cc",
+      "$googletest_dir/googletest/src/gtest-assertion-result.cc",
       "$googletest_dir/googletest/src/gtest-death-test.cc",
       "$googletest_dir/googletest/src/gtest-filepath.cc",
       "$googletest_dir/googletest/src/gtest-internal-inl.h",
@@ -176,14 +178,6 @@ if (crashpad_is_in_chromium) {
     configs -= [ "$mini_chromium_dir/build/config:Wexit_time_destructors" ]
     configs += [ ":googletest_private_config" ]
     deps = [ ":googletest" ]
-
-    if (crashpad_is_clang) {
-      cflags_cc = [
-        # For googletest/googlemock/test/gmock-matchers_test.cc’s
-        # Unstreamable::value_.
-        "-Wno-unused-private-field",
-      ]
-    }
   }
 
   test("gtest_premature_exit_test") {
@@ -299,7 +293,11 @@ if (crashpad_is_in_chromium) {
       "$googletest_dir/googlemock/test/gmock-cardinalities_test.cc",
       "$googletest_dir/googlemock/test/gmock-function-mocker_test.cc",
       "$googletest_dir/googlemock/test/gmock-internal-utils_test.cc",
-      "$googletest_dir/googlemock/test/gmock-matchers_test.cc",
+      "$googletest_dir/googlemock/test/gmock-matchers-arithmetic_test.cc",
+      "$googletest_dir/googlemock/test/gmock-matchers-comparisons_test.cc",
+      "$googletest_dir/googlemock/test/gmock-matchers-containers_test.cc",
+      "$googletest_dir/googlemock/test/gmock-matchers-misc_test.cc",
+      "$googletest_dir/googlemock/test/gmock-matchers_test.h",
       "$googletest_dir/googlemock/test/gmock-more-actions_test.cc",
       "$googletest_dir/googlemock/test/gmock-nice-strict_test.cc",
       "$googletest_dir/googlemock/test/gmock-port_test.cc",
@@ -324,15 +322,21 @@ if (crashpad_is_in_chromium) {
         # always use the override modifier with MOCK_METHOD.
         "-Wno-inconsistent-missing-override",
 
-        # For googletest/googlemock/test/gmock-matchers_test.cc’s
-        # testing::googlemock_matchers_test::Unprintable::c_.
-        "-Wno-unused-private-field",
+        # For googlemock/test/gmock-matchers-misc_test.cc comparison of
+        # integers of different signs.
+        "-Wno-sign-compare",
       ]
     }
 
     if (crashpad_is_win) {
-      # TODO: Correct SDK in vc\tools\msvc\14.14.26428\include\functional
-      cflags = [ "/wd4789" ]  # VAR of size N bytes will be overrun
+      cflags = [
+        # TODO: Correct SDK in vc\tools\msvc\14.14.26428\include\functional
+        "/wd4789",  # VAR of size N bytes will be overrun
+
+        # For googlemock/test/gmock-matchers-misc_test.cc comparison of
+        # integers of different signs.
+        "/wd4018",
+      ]
     }
   }
 
diff --git a/extern/crashpad/crashpad/third_party/googletest/README.crashpad b/extern/crashpad/crashpad/third_party/googletest/README.crashpad
index 9a6ca6c6bc..ecdce8871b 100644
--- a/extern/crashpad/crashpad/third_party/googletest/README.crashpad
+++ b/extern/crashpad/crashpad/third_party/googletest/README.crashpad
@@ -5,6 +5,7 @@ Revision: See DEPS
 License: BSD 3-clause
 License File: googletest/googletest/LICENSE
 Security Critical: no
+Shipped: no
 
 Description:
 Google Test (Google C++ Testing Framework) is Google’s framework for writing C++
diff --git a/extern/crashpad/crashpad/third_party/gyp/README.crashpad b/extern/crashpad/crashpad/third_party/gyp/README.crashpad
deleted file mode 100644
index 18eb164919..0000000000
--- a/extern/crashpad/crashpad/third_party/gyp/README.crashpad
+++ /dev/null
@@ -1,13 +0,0 @@
-Name: GYP (Generate Your Projects)
-Short Name: gyp
-URL: https://gyp.gsrc.io/
-Revision: See DEPS
-License: BSD 3-clause
-License File: gyp/LICENSE
-Security Critical: no
-
-Description:
-GYP is used to generate build files.
-
-Local Modifications:
-None
diff --git a/extern/crashpad/crashpad/third_party/linux/README.crashpad b/extern/crashpad/crashpad/third_party/linux/README.md
similarity index 100%
rename from extern/crashpad/crashpad/third_party/linux/README.crashpad
rename to extern/crashpad/crashpad/third_party/linux/README.md
diff --git a/extern/crashpad/crashpad/third_party/lss/BUILD.gn b/extern/crashpad/crashpad/third_party/lss/BUILD.gn
index f104825521..027c3a22f6 100644
--- a/extern/crashpad/crashpad/third_party/lss/BUILD.gn
+++ b/extern/crashpad/crashpad/third_party/lss/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2019 The Crashpad Authors. All rights reserved.
+# Copyright 2019 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/third_party/lss/README.crashpad b/extern/crashpad/crashpad/third_party/lss/README.crashpad
index d1ac9913ed..9a12c1c82d 100644
--- a/extern/crashpad/crashpad/third_party/lss/README.crashpad
+++ b/extern/crashpad/crashpad/third_party/lss/README.crashpad
@@ -5,6 +5,7 @@ Revision: See DEPS
 License: BSD 3-clause
 License File: lss/linux_syscall_support.h
 Security Critical: yes
+Shipped: yes
 
 Description:
 Every so often, projects need to directly embed Linux system calls instead of
diff --git a/extern/crashpad/crashpad/third_party/lss/lss.h b/extern/crashpad/crashpad/third_party/lss/lss.h
index 2646b6c008..90cb9bcfe7 100644
--- a/extern/crashpad/crashpad/third_party/lss/lss.h
+++ b/extern/crashpad/crashpad/third_party/lss/lss.h
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 #elif defined(CRASHPAD_LSS_SOURCE_EMBEDDED)
 #include "third_party/lss/lss/linux_syscall_support.h"
 #elif defined(CRASHPAD_LSS_SOURCE_FUCHSIA)
-#include "../../../../third_party/lss/linux_syscall_support.h"
+#include "../../../../../third_party/linux-syscall-support/src/linux_syscall_support.h"
 #else
 #error Unknown lss source
 #endif
diff --git a/extern/crashpad/crashpad/third_party/lss/lss/README.md b/extern/crashpad/crashpad/third_party/lss/lss/README.md
index 70cbc85311..e25abdd218 100644
--- a/extern/crashpad/crashpad/third_party/lss/lss/README.md
+++ b/extern/crashpad/crashpad/third_party/lss/lss/README.md
@@ -39,6 +39,7 @@ the header itself as this list might be out of date.
 * MIPS 32-bit o32 ABI
 * MIPS 32-bit n32 ABI
 * MIPS 64-bit n64 ABI
+* LOONGARCH 64-bit ABI
 
 ## API
 
@@ -130,7 +131,7 @@ It only compiles things (does not execute at all).
 
 If you commit a change to LSS, please also commit a Chromium change to update
 `lss_revision` in
-[Chromium's DEPS](https://chromium.googlesource.com/chromium/src/+/master/DEPS)
+[Chromium's DEPS](https://chromium.googlesource.com/chromium/src/+/HEAD/DEPS)
 file.
 
 This ensures that the LSS change gets tested, so that people who commit later
diff --git a/extern/crashpad/crashpad/third_party/lss/lss/linux_syscall_support.h b/extern/crashpad/crashpad/third_party/lss/lss/linux_syscall_support.h
index a71bea8904..aab95e698d 100644
--- a/extern/crashpad/crashpad/third_party/lss/lss/linux_syscall_support.h
+++ b/extern/crashpad/crashpad/third_party/lss/lss/linux_syscall_support.h
@@ -1,5 +1,4 @@
-/* Copyright (c) 2005-2011, Google Inc.
- * All rights reserved.
+/* Copyright 2005-2011 Google LLC
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -11,7 +10,7 @@
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
- *     * Neither the name of Google Inc. nor the names of its
+ *     * Neither the name of Google LLC nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
  *
@@ -47,7 +46,7 @@
  *   the necessary definitions.
  *
  * SYS_ERRNO:
- *   All system calls will update "errno" unless overriden by setting the
+ *   All system calls will update "errno" unless overridden by setting the
  *   SYS_ERRNO macro prior to including this file. SYS_ERRNO should be
  *   an l-value.
  *
@@ -88,7 +87,8 @@
  */
 #if (defined(__i386__) || defined(__x86_64__) || defined(__ARM_ARCH_3__) ||   \
      defined(__mips__) || defined(__PPC__) || defined(__ARM_EABI__) || \
-     defined(__aarch64__) || defined(__s390__)) \
+     defined(__aarch64__) || defined(__s390__) || defined(__e2k__) ||  \
+     (defined(__riscv) && __riscv_xlen == 64) || defined(__loongarch_lp64))  \
   && (defined(__linux) || defined(__ANDROID__))
 
 #ifndef SYS_CPLUSPLUS
@@ -130,18 +130,25 @@ extern "C" {
 #endif
 #endif
 
-/* The Android NDK's <sys/stat.h> #defines these macros as aliases
- * to their non-64 counterparts. To avoid naming conflict, remove them. */
-#ifdef __ANDROID__
-  /* These are restored by the corresponding #pragma pop_macro near
-   * the end of this file. */
-# pragma push_macro("stat64")
-# pragma push_macro("fstat64")
-# pragma push_macro("lstat64")
-# undef stat64
-# undef fstat64
-# undef lstat64
-#endif
+/* Some libcs, for example Android NDK and musl, #define these
+ * macros as aliases to their non-64 counterparts. To avoid naming
+ * conflict, remove them.
+ *
+ * These are restored by the corresponding #pragma pop_macro near
+ * the end of this file.
+ */
+#pragma push_macro("stat64")
+#pragma push_macro("fstat64")
+#pragma push_macro("lstat64")
+#pragma push_macro("pread64")
+#pragma push_macro("pwrite64")
+#pragma push_macro("getdents64")
+#undef stat64
+#undef fstat64
+#undef lstat64
+#undef pread64
+#undef pwrite64
+#undef getdents64
 
 #if defined(__ANDROID__) && defined(__x86_64__)
 // A number of x86_64 syscalls are blocked by seccomp on recent Android;
@@ -259,6 +266,12 @@ struct kernel_timeval {
   long               tv_usec;
 };
 
+/* include/linux/time.h                                                      */
+struct kernel_itimerval {
+  struct kernel_timeval it_interval;
+  struct kernel_timeval it_value;
+};
+
 /* include/linux/resource.h                                                  */
 struct kernel_rusage {
   struct kernel_timeval ru_utime;
@@ -280,7 +293,8 @@ struct kernel_rusage {
 };
 
 #if defined(__i386__) || defined(__ARM_EABI__) || defined(__ARM_ARCH_3__) \
-  || defined(__PPC__) || (defined(__s390__) && !defined(__s390x__))
+  || defined(__PPC__) || (defined(__s390__) && !defined(__s390x__)) \
+  || defined(__e2k__)
 
 /* include/asm-{arm,i386,mips,ppc}/signal.h                                  */
 struct kernel_old_sigaction {
@@ -294,8 +308,8 @@ struct kernel_old_sigaction {
 } __attribute__((packed,aligned(4)));
 #elif (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32)
   #define kernel_old_sigaction kernel_sigaction
-#elif defined(__aarch64__)
-  // No kernel_old_sigaction defined for arm64.
+#elif defined(__aarch64__) || defined(__riscv) || defined(__loongarch_lp64)
+  // No kernel_old_sigaction defined for arm64 riscv and loongarch64.
 #endif
 
 /* Some kernel functions (e.g. sigaction() in 2.6.23) require that the
@@ -334,7 +348,9 @@ struct kernel_sigaction {
     void             (*sa_sigaction_)(int, siginfo_t *, void *);
   };
   unsigned long      sa_flags;
+#if !defined(__riscv) && !defined(__loongarch_lp64)
   void               (*sa_restorer)(void);
+#endif
   struct kernel_sigset_t sa_mask;
 #endif
 };
@@ -348,6 +364,16 @@ struct kernel_sockaddr {
 /* include/asm-{arm,aarch64,i386,mips,ppc,s390}/stat.h                       */
 #ifdef __mips__
 #if _MIPS_SIM == _MIPS_SIM_ABI64
+typedef unsigned long long kernel_blkcnt_t;
+typedef unsigned kernel_blksize_t;
+typedef unsigned kernel_dev_t;
+typedef unsigned kernel_gid_t;
+typedef unsigned long long kernel_ino_t;
+typedef unsigned kernel_mode_t;
+typedef unsigned kernel_nlink_t;
+typedef long long kernel_off_t;
+typedef unsigned kernel_time_t;
+typedef unsigned kernel_uid_t;
 struct kernel_stat {
 #else
 struct kernel_stat64 {
@@ -394,6 +420,28 @@ struct kernel_stat64 {
   unsigned long      __unused4;
   unsigned long      __unused5;
 };
+#elif defined(__e2k__)
+struct kernel_stat64 {
+  unsigned long long st_dev;
+  unsigned long long st_ino;
+  unsigned int       st_mode;
+  unsigned int       st_nlink;
+  unsigned int       st_uid;
+  unsigned int       st_gid;
+  unsigned long long st_rdev;
+  long long          st_size;
+  int                st_blksize;
+  int                __pad2;
+  unsigned long long st_blocks;
+  int                st_atime_;
+  unsigned int       st_atime_nsec_;
+  int                st_mtime_;
+  unsigned int       st_mtime_nsec_;
+  int                st_ctime_;
+  unsigned int       st_ctime_nsec_;
+  unsigned int       __unused4;
+  unsigned int       __unused5;
+};
 #else
 struct kernel_stat64 {
   unsigned long long st_dev;
@@ -420,165 +468,264 @@ struct kernel_stat64 {
 
 /* include/asm-{arm,aarch64,i386,mips,x86_64,ppc,s390}/stat.h                */
 #if defined(__i386__) || defined(__ARM_ARCH_3__) || defined(__ARM_EABI__)
+typedef unsigned kernel_blkcnt_t;
+typedef unsigned kernel_blksize_t;
+typedef unsigned short kernel_dev_t;
+typedef unsigned short kernel_gid_t;
+typedef unsigned kernel_ino_t;
+typedef unsigned short kernel_mode_t;
+typedef unsigned short kernel_nlink_t;
+typedef unsigned kernel_off_t;
+typedef unsigned kernel_time_t;
+typedef unsigned short kernel_uid_t;
 struct kernel_stat {
   /* The kernel headers suggest that st_dev and st_rdev should be 32bit
    * quantities encoding 12bit major and 20bit minor numbers in an interleaved
    * format. In reality, we do not see useful data in the top bits. So,
    * we'll leave the padding in here, until we find a better solution.
    */
-  unsigned short     st_dev;
+  kernel_dev_t       st_dev;
   short              pad1;
-  unsigned           st_ino;
-  unsigned short     st_mode;
-  unsigned short     st_nlink;
-  unsigned short     st_uid;
-  unsigned short     st_gid;
-  unsigned short     st_rdev;
+  kernel_ino_t       st_ino;
+  kernel_mode_t      st_mode;
+  kernel_nlink_t     st_nlink;
+  kernel_uid_t       st_uid;
+  kernel_gid_t       st_gid;
+  kernel_dev_t       st_rdev;
   short              pad2;
-  unsigned           st_size;
-  unsigned           st_blksize;
-  unsigned           st_blocks;
-  unsigned           st_atime_;
+  kernel_off_t       st_size;
+  kernel_blksize_t   st_blksize;
+  kernel_blkcnt_t    st_blocks;
+  kernel_time_t      st_atime_;
   unsigned           st_atime_nsec_;
-  unsigned           st_mtime_;
+  kernel_time_t      st_mtime_;
   unsigned           st_mtime_nsec_;
-  unsigned           st_ctime_;
+  kernel_time_t      st_ctime_;
   unsigned           st_ctime_nsec_;
   unsigned           __unused4;
   unsigned           __unused5;
 };
 #elif defined(__x86_64__)
+typedef int64_t kernel_blkcnt_t;
+typedef int64_t kernel_blksize_t;
+typedef uint64_t kernel_dev_t;
+typedef unsigned kernel_gid_t;
+typedef uint64_t kernel_ino_t;
+typedef unsigned kernel_mode_t;
+typedef uint64_t kernel_nlink_t;
+typedef int64_t kernel_off_t;
+typedef uint64_t kernel_time_t;
+typedef unsigned kernel_uid_t;
 struct kernel_stat {
-  uint64_t           st_dev;
-  uint64_t           st_ino;
-  uint64_t           st_nlink;
-  unsigned           st_mode;
-  unsigned           st_uid;
-  unsigned           st_gid;
+  kernel_dev_t       st_dev;
+  kernel_ino_t       st_ino;
+  kernel_nlink_t     st_nlink;
+  kernel_mode_t      st_mode;
+  kernel_uid_t       st_uid;
+  kernel_gid_t       st_gid;
   unsigned           __pad0;
-  uint64_t           st_rdev;
-  int64_t            st_size;
-  int64_t            st_blksize;
-  int64_t            st_blocks;
-  uint64_t           st_atime_;
+  kernel_dev_t       st_rdev;
+  kernel_off_t       st_size;
+  kernel_blksize_t   st_blksize;
+  kernel_blkcnt_t    st_blocks;
+  kernel_time_t      st_atime_;
   uint64_t           st_atime_nsec_;
-  uint64_t           st_mtime_;
+  kernel_time_t      st_mtime_;
   uint64_t           st_mtime_nsec_;
-  uint64_t           st_ctime_;
+  kernel_time_t      st_ctime_;
   uint64_t           st_ctime_nsec_;
   int64_t            __unused4[3];
 };
 #elif defined(__PPC__)
+typedef unsigned long kernel_blkcnt_t;
+typedef unsigned long kernel_blksize_t;
+typedef unsigned kernel_dev_t;
+typedef unsigned kernel_gid_t;
+typedef unsigned long kernel_ino_t;
+typedef unsigned long kernel_mode_t;
+typedef unsigned short kernel_nlink_t;
+typedef long kernel_off_t;
+typedef unsigned long kernel_time_t;
+typedef unsigned kernel_uid_t;
 struct kernel_stat {
-  unsigned           st_dev;
-  unsigned long      st_ino;      // ino_t
-  unsigned long      st_mode;     // mode_t
-  unsigned short     st_nlink;    // nlink_t
-  unsigned           st_uid;      // uid_t
-  unsigned           st_gid;      // gid_t
-  unsigned           st_rdev;
-  long               st_size;     // off_t
-  unsigned long      st_blksize;
-  unsigned long      st_blocks;
-  unsigned long      st_atime_;
+  kernel_dev_t       st_dev;
+  kernel_ino_t       st_ino;
+  kernel_mode_t      st_mode;
+  kernel_nlink_t     st_nlink;
+  kernel_gid_t       st_uid;
+  kernel_uid_t       st_gid;
+  kernel_dev_t       st_rdev;
+  kernel_off_t       st_size;
+  kernel_blksize_t   st_blksize;
+  kernel_blkcnt_t    st_blocks;
+  kernel_time_t      st_atime_;
   unsigned long      st_atime_nsec_;
-  unsigned long      st_mtime_;
+  kernel_time_t      st_mtime_;
   unsigned long      st_mtime_nsec_;
-  unsigned long      st_ctime_;
+  kernel_time_t      st_ctime_;
   unsigned long      st_ctime_nsec_;
   unsigned long      __unused4;
   unsigned long      __unused5;
 };
 #elif (defined(__mips__) && _MIPS_SIM != _MIPS_SIM_ABI64)
+typedef int kernel_blkcnt_t;
+typedef int kernel_blksize_t;
+typedef unsigned kernel_dev_t;
+typedef unsigned kernel_gid_t;
+typedef unsigned kernel_ino_t;
+typedef unsigned kernel_mode_t;
+typedef unsigned kernel_nlink_t;
+typedef long kernel_off_t;
+typedef long kernel_time_t;
+typedef unsigned kernel_uid_t;
 struct kernel_stat {
-  unsigned           st_dev;
+  kernel_dev_t       st_dev;
   int                st_pad1[3];
-  unsigned           st_ino;
-  unsigned           st_mode;
-  unsigned           st_nlink;
-  unsigned           st_uid;
-  unsigned           st_gid;
-  unsigned           st_rdev;
+  kernel_ino_t       st_ino;
+  kernel_mode_t      st_mode;
+  kernel_nlink_t     st_nlink;
+  kernel_uid_t       st_uid;
+  kernel_gid_t       st_gid;
+  kernel_dev_t       st_rdev;
   int                st_pad2[2];
-  long               st_size;
+  kernel_off_t       st_size;
   int                st_pad3;
-  long               st_atime_;
+  kernel_time_t      st_atime_;
   long               st_atime_nsec_;
-  long               st_mtime_;
+  kernel_time_t      st_mtime_;
   long               st_mtime_nsec_;
-  long               st_ctime_;
+  kernel_time_t      st_ctime_;
   long               st_ctime_nsec_;
-  int                st_blksize;
-  int                st_blocks;
+  kernel_blksize_t   st_blksize;
+  kernel_blkcnt_t    st_blocks;
   int                st_pad4[14];
 };
-#elif defined(__aarch64__)
+#elif defined(__aarch64__) || defined(__riscv) || defined(__loongarch_lp64)
+typedef long kernel_blkcnt_t;
+typedef int kernel_blksize_t;
+typedef unsigned long kernel_dev_t;
+typedef unsigned int kernel_gid_t;
+typedef unsigned long kernel_ino_t;
+typedef unsigned int kernel_mode_t;
+typedef unsigned int kernel_nlink_t;
+typedef long kernel_off_t;
+typedef long kernel_time_t;
+typedef unsigned int kernel_uid_t;
 struct kernel_stat {
-  unsigned long      st_dev;
-  unsigned long      st_ino;
-  unsigned int       st_mode;
-  unsigned int       st_nlink;
-  unsigned int       st_uid;
-  unsigned int       st_gid;
-  unsigned long      st_rdev;
+  kernel_dev_t       st_dev;
+  kernel_ino_t       st_ino;
+  kernel_mode_t      st_mode;
+  kernel_nlink_t     st_nlink;
+  kernel_uid_t       st_uid;
+  kernel_gid_t       st_gid;
+  kernel_dev_t       st_rdev;
   unsigned long      __pad1;
-  long               st_size;
-  int                st_blksize;
+  kernel_off_t       st_size;
+  kernel_blksize_t   st_blksize;
   int                __pad2;
-  long               st_blocks;
-  long               st_atime_;
+  kernel_blkcnt_t    st_blocks;
+  kernel_time_t      st_atime_;
   unsigned long      st_atime_nsec_;
-  long               st_mtime_;
+  kernel_time_t      st_mtime_;
   unsigned long      st_mtime_nsec_;
-  long               st_ctime_;
+  kernel_time_t      st_ctime_;
   unsigned long      st_ctime_nsec_;
   unsigned int       __unused4;
   unsigned int       __unused5;
 };
 #elif defined(__s390x__)
+typedef long kernel_blkcnt_t;
+typedef unsigned long kernel_blksize_t;
+typedef unsigned long kernel_dev_t;
+typedef unsigned int kernel_gid_t;
+typedef unsigned long kernel_ino_t;
+typedef unsigned int kernel_mode_t;
+typedef unsigned long kernel_nlink_t;
+typedef unsigned long kernel_off_t;
+typedef unsigned long kernel_time_t;
+typedef unsigned int kernel_uid_t;
 struct kernel_stat {
-  unsigned long      st_dev;
-  unsigned long      st_ino;
-  unsigned long      st_nlink;
-  unsigned int       st_mode;
-  unsigned int       st_uid;
-  unsigned int       st_gid;
+  kernel_dev_t       st_dev;
+  kernel_ino_t       st_ino;
+  kernel_nlink_t     st_nlink;
+  kernel_mode_t      st_mode;
+  kernel_uid_t       st_uid;
+  kernel_gid_t       st_gid;
   unsigned int       __pad1;
-  unsigned long      st_rdev;
-  unsigned long      st_size;
-  unsigned long      st_atime_;
+  kernel_dev_t       st_rdev;
+  kernel_off_t       st_size;
+  kernel_time_t      st_atime_;
   unsigned long      st_atime_nsec_;
-  unsigned long      st_mtime_;
+  kernel_time_t      st_mtime_;
   unsigned long      st_mtime_nsec_;
-  unsigned long      st_ctime_;
+  kernel_time_t      st_ctime_;
   unsigned long      st_ctime_nsec_;
-  unsigned long      st_blksize;
-  long               st_blocks;
+  kernel_blksize_t   st_blksize;
+  kernel_blkcnt_t    st_blocks;
   unsigned long      __unused[3];
 };
 #elif defined(__s390__)
+typedef unsigned long kernel_blkcnt_t;
+typedef unsigned long kernel_blksize_t;
+typedef unsigned short kernel_dev_t;
+typedef unsigned short kernel_gid_t;
+typedef unsigned long kernel_ino_t;
+typedef unsigned short kernel_mode_t;
+typedef unsigned short kernel_nlink_t;
+typedef unsigned long kernel_off_t;
+typedef unsigned long kernel_time_t;
+typedef unsigned short kernel_uid_t;
 struct kernel_stat {
-  unsigned short     st_dev;
+  kernel_dev_t       st_dev;
   unsigned short     __pad1;
-  unsigned long      st_ino;
-  unsigned short     st_mode;
-  unsigned short     st_nlink;
-  unsigned short     st_uid;
-  unsigned short     st_gid;
-  unsigned short     st_rdev;
+  kernel_ino_t       st_ino;
+  kernel_mode_t      st_mode;
+  kernel_nlink_t     st_nlink;
+  kernel_uid_t       st_uid;
+  kernel_gid_t       st_gid;
+  kernel_dev_t       st_rdev;
   unsigned short     __pad2;
-  unsigned long      st_size;
-  unsigned long      st_blksize;
-  unsigned long      st_blocks;
-  unsigned long      st_atime_;
+  kernel_off_t       st_size;
+  kernel_blksize_t   st_blksize;
+  kernel_blkcnt_t    st_blocks;
+  kernel_time_t      st_atime_;
   unsigned long      st_atime_nsec_;
-  unsigned long      st_mtime_;
+  kernel_time_t      st_mtime_;
   unsigned long      st_mtime_nsec_;
-  unsigned long      st_ctime_;
+  kernel_time_t      st_ctime_;
   unsigned long      st_ctime_nsec_;
   unsigned long      __unused4;
   unsigned long      __unused5;
 };
+#elif defined(__e2k__)
+typedef unsigned long kernel_blkcnt_t;
+typedef unsigned long kernel_blksize_t;
+typedef unsigned long kernel_dev_t;
+typedef unsigned int kernel_gid_t;
+typedef unsigned long kernel_ino_t;
+typedef unsigned int kernel_mode_t;
+typedef unsigned long kernel_nlink_t;
+typedef unsigned long kernel_off_t;
+typedef unsigned long kernel_time_t;
+typedef unsigned int kernel_uid_t;
+struct kernel_stat {
+  kernel_dev_t       st_dev;
+  kernel_ino_t       st_ino;
+  kernel_mode_t      st_mode;
+  kernel_nlink_t     st_nlink;
+  kernel_uid_t       st_uid;
+  kernel_gid_t       st_gid;
+  kernel_dev_t       st_rdev;
+  kernel_off_t       st_size;
+  kernel_blksize_t   st_blksize;
+  kernel_blkcnt_t    st_blocks;
+  kernel_time_t      st_atime_;
+  unsigned long      st_atime_nsec_;
+  kernel_time_t      st_mtime_;
+  unsigned long      st_mtime_nsec_;
+  kernel_time_t      st_ctime_;
+  unsigned long      st_ctime_nsec_;
+};
 #endif
 
 /* include/asm-{arm,aarch64,i386,mips,x86_64,ppc,s390}/statfs.h              */
@@ -694,6 +841,37 @@ struct kernel_statfs {
 };
 #endif
 
+struct kernel_statx_timestamp {
+  int64_t   tv_sec;
+  uint32_t  tv_nsec;
+  int32_t   __reserved;
+};
+
+struct kernel_statx {
+  uint32_t  stx_mask;
+  uint32_t  stx_blksize;
+  uint64_t  stx_attributes;
+  uint32_t  stx_nlink;
+  uint32_t  stx_uid;
+  uint32_t  stx_gid;
+  uint16_t  stx_mode;
+  uint16_t  __spare0[1];
+  uint64_t  stx_ino;
+  uint64_t  stx_size;
+  uint64_t  stx_blocks;
+  uint64_t  stx_attributes_mask;
+  struct kernel_statx_timestamp  stx_atime;
+  struct kernel_statx_timestamp  stx_btime;
+  struct kernel_statx_timestamp  stx_ctime;
+  struct kernel_statx_timestamp  stx_mtime;
+  uint32_t  stx_rdev_major;
+  uint32_t  stx_rdev_minor;
+  uint32_t  stx_dev_major;
+  uint32_t  stx_dev_minor;
+  uint64_t  stx_mnt_id;
+  uint64_t  __spare2;
+  uint64_t  __spare3[12];
+};
 
 /* Definitions missing from the standard header files                        */
 #ifndef O_DIRECTORY
@@ -730,6 +908,18 @@ struct kernel_statfs {
 #ifndef AT_REMOVEDIR
 #define AT_REMOVEDIR            0x200
 #endif
+#ifndef AT_NO_AUTOMOUNT
+#define AT_NO_AUTOMOUNT         0x800
+#endif
+#ifndef AT_EMPTY_PATH
+#define AT_EMPTY_PATH           0x1000
+#endif
+#ifndef STATX_BASIC_STATS
+#define STATX_BASIC_STATS       0x000007ffU
+#endif
+#ifndef AT_STATX_SYNC_AS_STAT
+#define AT_STATX_SYNC_AS_STAT   0x0000
+#endif
 #ifndef MREMAP_FIXED
 #define MREMAP_FIXED            2
 #endif
@@ -947,6 +1137,9 @@ struct kernel_statfs {
 #ifndef __NR_fallocate
 #define __NR_fallocate          324
 #endif
+#ifndef __NR_getrandom
+#define __NR_getrandom          355
+#endif
 /* End of i386 definitions                                                   */
 #elif defined(__ARM_ARCH_3__) || defined(__ARM_EABI__)
 #ifndef __NR_setresuid
@@ -1045,14 +1238,20 @@ struct kernel_statfs {
 #ifndef __NR_ioprio_get
 #define __NR_ioprio_get         (__NR_SYSCALL_BASE + 315)
 #endif
+#ifndef __NR_fstatat64
+#define __NR_fstatat64          (__NR_SYSCALL_BASE + 327)
+#endif
 #ifndef __NR_move_pages
 #define __NR_move_pages         (__NR_SYSCALL_BASE + 344)
 #endif
 #ifndef __NR_getcpu
 #define __NR_getcpu             (__NR_SYSCALL_BASE + 345)
 #endif
+#ifndef __NR_getrandom
+#define __NR_getrandom          (__NR_SYSCALL_BASE + 384)
+#endif
 /* End of ARM 3/EABI definitions                                             */
-#elif defined(__aarch64__)
+#elif defined(__aarch64__) || defined(__riscv) || defined(__loongarch_lp64)
 #ifndef __NR_setxattr
 #define __NR_setxattr             5
 #endif
@@ -1108,9 +1307,11 @@ struct kernel_statfs {
 #ifndef __NR_readlinkat
 #define __NR_readlinkat          78
 #endif
+#if !defined(__loongarch_lp64)
 #ifndef __NR_newfstatat
 #define __NR_newfstatat          79
 #endif
+#endif
 #ifndef __NR_set_tid_address
 #define __NR_set_tid_address     96
 #endif
@@ -1148,7 +1349,12 @@ struct kernel_statfs {
 #ifndef __NR_move_pages
 #define __NR_move_pages         239
 #endif
-/* End of aarch64 definitions                                                */
+#ifndef __NR_getrandom
+#define __NR_getrandom          278
+#endif
+#ifndef __NR_statx
+#define __NR_statx              291
+#endif
 #elif defined(__x86_64__)
 #ifndef __NR_pread64
 #define __NR_pread64             17
@@ -1239,6 +1445,9 @@ struct kernel_statfs {
 #ifndef __NR_fallocate
 #define __NR_fallocate          285
 #endif
+#ifndef __NR_getrandom
+#define __NR_getrandom          318
+#endif
 /* End of x86-64 definitions                                                 */
 #elif defined(__mips__)
 #if _MIPS_SIM == _MIPS_SIM_ABI32
@@ -1340,6 +1549,9 @@ struct kernel_statfs {
 #ifndef __NR_ioprio_get
 #define __NR_ioprio_get         (__NR_Linux + 315)
 #endif
+#ifndef __NR_getrandom
+#define __NR_getrandom          (__NR_Linux + 353)
+#endif
 /* End of MIPS (old 32bit API) definitions */
 #elif  _MIPS_SIM == _MIPS_SIM_ABI64
 #ifndef __NR_pread64
@@ -1418,6 +1630,9 @@ struct kernel_statfs {
 #ifndef __NR_ioprio_get
 #define __NR_ioprio_get         (__NR_Linux + 274)
 #endif
+#ifndef __NR_getrandom
+#define __NR_getrandom          (__NR_Linux + 313)
+#endif
 /* End of MIPS (64bit API) definitions */
 #else
 #ifndef __NR_setresuid
@@ -1608,7 +1823,7 @@ struct kernel_statfs {
 #ifndef __NR_getcpu
 #define __NR_getcpu             302
 #endif
-/* End of powerpc defininitions                                              */
+/* End of powerpc definitions                                              */
 #elif defined(__s390__)
 #ifndef __NR_quotactl
 #define __NR_quotactl           131
@@ -1854,15 +2069,16 @@ struct kernel_statfs {
   #endif
 
   #undef  LSS_RETURN
-  #if (defined(__i386__) || defined(__x86_64__) || defined(__ARM_ARCH_3__) \
-       || defined(__ARM_EABI__) || defined(__aarch64__) || defined(__s390__))
+  #if defined(__i386__) || defined(__x86_64__) || defined(__ARM_ARCH_3__) \
+       || defined(__ARM_EABI__) || defined(__aarch64__) || defined(__s390__) \
+       || defined(__e2k__) || defined(__riscv) || defined(__loongarch_lp64)
   /* Failing system calls return a negative result in the range of
    * -1..-4095. These are "errno" values with the sign inverted.
    */
   #define LSS_RETURN(type, res)                                               \
     do {                                                                      \
       if ((unsigned long)(res) >= (unsigned long)(-4095)) {                   \
-        LSS_ERRNO = -(res);                                                   \
+        LSS_ERRNO = (int)(-(res));                                            \
         res = -1;                                                             \
       }                                                                       \
       return (type) (res);                                                    \
@@ -1955,7 +2171,7 @@ struct kernel_statfs {
                            LSS_ENTRYPOINT                                     \
                            "pop %%ebx"                                        \
                            args                                               \
-                           : "esp", "memory");                                \
+                           : "memory");                                       \
       LSS_RETURN(type,__res)
     #undef  _syscall0
     #define _syscall0(type,name)                                              \
@@ -2012,7 +2228,7 @@ struct kernel_statfs {
                              : "i" (__NR_##name), "ri" ((long)(arg1)),        \
                                "c" ((long)(arg2)), "d" ((long)(arg3)),        \
                                "S" ((long)(arg4)), "D" ((long)(arg5))         \
-                             : "esp", "memory");                              \
+                             : "memory");                                     \
         LSS_RETURN(type,__res);                                               \
       }
     #undef  _syscall6
@@ -2034,7 +2250,7 @@ struct kernel_statfs {
                              : "i" (__NR_##name),  "0" ((long)(&__s)),        \
                                "c" ((long)(arg2)), "d" ((long)(arg3)),        \
                                "S" ((long)(arg4)), "D" ((long)(arg5))         \
-                             : "esp", "memory");                              \
+                             : "memory");                                     \
         LSS_RETURN(type,__res);                                               \
       }
     LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack,
@@ -2120,7 +2336,7 @@ struct kernel_statfs {
                            : "0"(-EINVAL), "i"(__NR_clone),
                              "m"(fn), "m"(child_stack), "m"(flags), "m"(arg),
                              "m"(parent_tidptr), "m"(newtls), "m"(child_tidptr)
-                           : "esp", "memory", "ecx", "edx", "esi", "edi");
+                           : "memory", "ecx", "edx", "esi", "edi");
       LSS_RETURN(int, __res);
     }
 
@@ -2216,7 +2432,7 @@ struct kernel_statfs {
     #define _LSS_RETURN(type, res, cast)                                      \
       do {                                                                    \
         if ((uint64_t)(res) >= (uint64_t)(-4095)) {                           \
-          LSS_ERRNO = -(res);                                                 \
+          LSS_ERRNO = (int)(-(res));                                          \
           res = -1;                                                           \
         }                                                                     \
         return (type)(cast)(res);                                             \
@@ -2765,7 +2981,7 @@ struct kernel_statfs {
                                    void *newtls, int *child_tidptr) {
       int64_t __res;
       {
-        register uint64_t __flags __asm__("x0") = flags;
+        register uint64_t __flags __asm__("x0") = (uint64_t)flags;
         register void *__stack __asm__("x1") = child_stack;
         register void *__ptid  __asm__("x2") = parent_tidptr;
         register void *__tls   __asm__("x3") = newtls;
@@ -3348,6 +3564,503 @@ struct kernel_statfs {
       }
       LSS_RETURN(int, __ret);
     }
+  #elif defined(__riscv) && __riscv_xlen == 64
+    #undef LSS_REG
+    #define LSS_REG(r,a) register int64_t __r##r __asm__("a"#r) = (int64_t)a
+    #undef  LSS_BODY
+    #define LSS_BODY(type,name,args...)                                       \
+          register int64_t __res_a0 __asm__("a0");                            \
+          register int64_t __a7 __asm__("a7") = __NR_##name;                  \
+          int64_t __res;                                                      \
+          __asm__ __volatile__ ("scall\n"                                     \
+                                : "=r"(__res_a0)                              \
+                                : "r"(__a7) , ## args                         \
+                                : "memory");                                  \
+          __res = __res_a0;                                                   \
+          LSS_RETURN(type, __res)
+    #undef _syscall0
+    #define _syscall0(type, name)                                             \
+      type LSS_NAME(name)(void) {                                             \
+        LSS_BODY(type, name);                                                 \
+      }
+    #undef _syscall1
+    #define _syscall1(type, name, type1, arg1)                                \
+      type LSS_NAME(name)(type1 arg1) {                                       \
+        LSS_REG(0, arg1); LSS_BODY(type, name, "r"(__r0));                    \
+      }
+    #undef _syscall2
+    #define _syscall2(type, name, type1, arg1, type2, arg2)                   \
+      type LSS_NAME(name)(type1 arg1, type2 arg2) {                           \
+        LSS_REG(0, arg1); LSS_REG(1, arg2);                                   \
+        LSS_BODY(type, name, "r"(__r0), "r"(__r1));                           \
+      }
+    #undef _syscall3
+    #define _syscall3(type, name, type1, arg1, type2, arg2, type3, arg3)      \
+      type LSS_NAME(name)(type1 arg1, type2 arg2, type3 arg3) {               \
+        LSS_REG(0, arg1); LSS_REG(1, arg2); LSS_REG(2, arg3);                 \
+        LSS_BODY(type, name, "r"(__r0), "r"(__r1), "r"(__r2));                \
+      }
+    #undef _syscall4
+    #define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4)  \
+      type LSS_NAME(name)(type1 arg1, type2 arg2, type3 arg3, type4 arg4) {   \
+        LSS_REG(0, arg1); LSS_REG(1, arg2); LSS_REG(2, arg3);                 \
+        LSS_REG(3, arg4);                                                     \
+        LSS_BODY(type, name, "r"(__r0), "r"(__r1), "r"(__r2), "r"(__r3));     \
+      }
+    #undef _syscall5
+    #define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,  \
+                      type5,arg5)                                             \
+      type LSS_NAME(name)(type1 arg1, type2 arg2, type3 arg3, type4 arg4,     \
+                          type5 arg5) {                                       \
+        LSS_REG(0, arg1); LSS_REG(1, arg2); LSS_REG(2, arg3);                 \
+        LSS_REG(3, arg4); LSS_REG(4, arg5);                                   \
+        LSS_BODY(type, name, "r"(__r0), "r"(__r1), "r"(__r2), "r"(__r3),      \
+                             "r"(__r4));                                      \
+      }
+    #undef _syscall6
+    #define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,  \
+                      type5,arg5,type6,arg6)                                  \
+      type LSS_NAME(name)(type1 arg1, type2 arg2, type3 arg3, type4 arg4,     \
+                          type5 arg5, type6 arg6) {                           \
+        LSS_REG(0, arg1); LSS_REG(1, arg2); LSS_REG(2, arg3);                 \
+        LSS_REG(3, arg4); LSS_REG(4, arg5); LSS_REG(5, arg6);                 \
+        LSS_BODY(type, name, "r"(__r0), "r"(__r1), "r"(__r2), "r"(__r3),      \
+                             "r"(__r4), "r"(__r5));                           \
+      }
+
+    LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack,
+                                   int flags, void *arg, int *parent_tidptr,
+                                   void *newtls, int *child_tidptr) {
+      int64_t __res;
+      {
+        register int64_t __res_a0 __asm__("a0");
+        register uint64_t __flags __asm__("a0") = flags;
+        register void *__stack __asm__("a1") = child_stack;
+        register void *__ptid  __asm__("a2") = parent_tidptr;
+        register void *__tls   __asm__("a3") = newtls;
+        register int  *__ctid  __asm__("a4") = child_tidptr;
+        __asm__ __volatile__(/* Push "arg" and "fn" onto the stack that will be
+                              * used by the child.
+                              */
+                             "addi    %2,%2,-16\n"
+                             "sd      %1, 0(%2)\n"
+                             "sd      %4, 8(%2)\n"
+
+                             /* %a0 = syscall(%a0 = flags,
+                              *               %a1 = child_stack,
+                              *               %a2 = parent_tidptr,
+                              *               %a3 = newtls,
+                              *               %a4 = child_tidptr)
+                              */
+                             "li      a7, %8\n"
+                             "scall\n"
+
+                             /* if (%a0 != 0)
+                              *   return %a0;
+                              */
+                             "bnez    %0, 1f\n"
+
+                             /* In the child, now. Call "fn(arg)".
+                              */
+                             "ld      a1, 0(sp)\n"
+                             "ld      a0, 8(sp)\n"
+                             "jalr    a1\n"
+
+                             /* Call _exit(%a0).
+                              */
+                             "li      a7, %9\n"
+                             "scall\n"
+                           "1:\n"
+                             : "=r" (__res_a0)
+                             : "r"(fn), "r"(__stack), "r"(__flags), "r"(arg),
+                               "r"(__ptid), "r"(__tls), "r"(__ctid),
+                               "i"(__NR_clone), "i"(__NR_exit)
+                             : "cc", "memory");
+        __res = __res_a0;
+      }
+      LSS_RETURN(int, __res);
+    }
+  #elif defined(__e2k__)
+
+    #undef _LSS_BODY
+    #define _LSS_BODY(nr, type, name, ...)                                    \
+      register unsigned long long __res;                                      \
+      __asm__ __volatile__                                                    \
+      (                                                                       \
+       "{\n\t"                                                                \
+       "  sdisp %%ctpr1, 0x3\n\t"                                             \
+       "  addd, s 0x0, %[sys_num], %%b[0]\n\t"                                \
+       LSS_BODY_ASM##nr                                                       \
+       "}\n\t"                                                                \
+       "{\n\t"                                                                \
+       "  call %%ctpr1, wbs = %#\n\t"                                         \
+       "}\n\t"                                                                \
+       "{\n\t"                                                                \
+       "  addd, s 0x0, %%b[0], %[res]\n\t"                                    \
+       "}\n\t"                                                                \
+       : [res] "=r" (__res)                                                   \
+       :                                                                      \
+       LSS_BODY_ARG##nr(__VA_ARGS__)                                          \
+       [sys_num] "ri" (__NR_##name)                                           \
+       : "ctpr1", "ctpr2", "ctpr3",                                           \
+       "b[0]", "b[1]", "b[2]", "b[3]",                                        \
+       "b[4]", "b[5]", "b[6]", "b[7]"                                         \
+       );                                                                     \
+       LSS_RETURN(type, __res);
+
+    #undef LSS_BODY
+    #define LSS_BODY(nr, type, name, args...) \
+      _LSS_BODY(nr, type, name, ## args)
+
+    #undef LSS_BODY_ASM0
+    #undef LSS_BODY_ASM1
+    #undef LSS_BODY_ASM2
+    #undef LSS_BODY_ASM3
+    #undef LSS_BODY_ASM4
+    #undef LSS_BODY_ASM5
+    #undef LSS_BODY_ASM6
+
+    #define LSS_BODY_ASM0
+    #define LSS_BODY_ASM1 LSS_BODY_ASM0 \
+      "  addd, s 0x0, %[arg1], %%b[1]\n\t"
+    #define LSS_BODY_ASM2 LSS_BODY_ASM1 \
+      "  addd, s 0x0, %[arg2], %%b[2]\n\t"
+    #define LSS_BODY_ASM3 LSS_BODY_ASM2 \
+      "  addd, s 0x0, %[arg3], %%b[3]\n\t"
+    #define LSS_BODY_ASM4 LSS_BODY_ASM3 \
+      "  addd, s 0x0, %[arg4], %%b[4]\n\t"
+    #define LSS_BODY_ASM5 LSS_BODY_ASM4 \
+      "  addd, s 0x0, %[arg5], %%b[5]\n\t"
+    #define LSS_BODY_ASM6 LSS_BODY_ASM5 \
+      "}\n\t" \
+      "{\n\t" \
+      "  addd, s 0x0, %[arg6], %%b[6]\n\t"
+
+    #undef LSS_SYSCALL_ARG
+    #define LSS_SYSCALL_ARG(a) ((unsigned long long)(uintptr_t)(a))
+
+    #undef LSS_BODY_ARG0
+    #undef LSS_BODY_ARG1
+    #undef LSS_BODY_ARG2
+    #undef LSS_BODY_ARG3
+    #undef LSS_BODY_ARG4
+    #undef LSS_BODY_ARG5
+    #undef LSS_BODY_ARG6
+
+    #define LSS_BODY_ARG0()
+    #define LSS_BODY_ARG1(_arg1) \
+      [arg1] "ri" LSS_SYSCALL_ARG(_arg1),
+    #define LSS_BODY_ARG2(_arg1, _arg2) \
+      LSS_BODY_ARG1(_arg1) \
+      [arg2] "ri" LSS_SYSCALL_ARG(_arg2),
+    #define LSS_BODY_ARG3(_arg1, _arg2, _arg3) \
+      LSS_BODY_ARG2(_arg1, _arg2) \
+      [arg3] "ri" LSS_SYSCALL_ARG(_arg3),
+    #define LSS_BODY_ARG4(_arg1, _arg2, _arg3, _arg4) \
+      LSS_BODY_ARG3(_arg1, _arg2, _arg3) \
+      [arg4] "ri" LSS_SYSCALL_ARG(_arg4),
+    #define LSS_BODY_ARG5(_arg1, _arg2, _arg3, _arg4, _arg5) \
+      LSS_BODY_ARG4(_arg1, _arg2, _arg3, _arg4) \
+      [arg5] "ri" LSS_SYSCALL_ARG(_arg5),
+    #define LSS_BODY_ARG6(_arg1, _arg2, _arg3, _arg4, _arg5, _arg6) \
+      LSS_BODY_ARG5(_arg1, _arg2, _arg3, _arg4, _arg5) \
+      [arg6] "ri" LSS_SYSCALL_ARG(_arg6),
+
+    #undef _syscall0
+    #define _syscall0(type, name) \
+      type LSS_NAME(name)(void) { \
+        LSS_BODY(0, type, name);     \
+      }
+
+    #undef _syscall1
+    #define _syscall1(type, name, type1, arg1) \
+      type LSS_NAME(name)(type1 arg1) { \
+         LSS_BODY(1, type, name, arg1) \
+      }
+
+    #undef _syscall2
+    #define _syscall2(type, name, type1, arg1, type2, arg2) \
+      type LSS_NAME(name)(type1 arg1, type2 arg2) { \
+          LSS_BODY(2, type, name, arg1, arg2) \
+      }
+
+    #undef _syscall3
+    #define _syscall3(type, name, type1, arg1, type2, arg2, type3, arg3) \
+      type LSS_NAME(name)(type1 arg1, type2 arg2, type3 arg3) { \
+          LSS_BODY(3, type, name, arg1, arg2, arg3) \
+      }
+
+    #undef _syscall4
+    #define _syscall4(type, name, type1, arg1, type2, arg2, type3, arg3, \
+                      type4, arg4) \
+      type LSS_NAME(name)(type1 arg1, type2 arg2, type3 arg3, type4 arg4) { \
+          LSS_BODY(4, type, name, arg1, arg2, arg3, arg4) \
+      }
+
+    #undef _syscall5
+    #define _syscall5(type, name, type1, arg1, type2, arg2, type3, arg3, \
+                      type4, arg4, type5, arg5) \
+      type LSS_NAME(name)(type1 arg1, type2 arg2, type3 arg3, type4 arg4, \
+                          type5 arg5) { \
+          LSS_BODY(5, type, name, arg1, arg2, arg3, arg4, arg5) \
+      }
+
+    #undef _syscall6
+    #define _syscall6(type, name, type1, arg1, type2, arg2, type3, arg3, \
+                      type4, arg4, type5, arg5, type6, arg6) \
+      type LSS_NAME(name)(type1 arg1, type2 arg2, type3 arg3, type4 arg4, \
+                          type5 arg5, type6 arg6) { \
+          LSS_BODY(6, type, name, arg1, arg2, arg3, arg4, arg5, arg6) \
+      }
+
+    LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack,
+                                   int flags, void *arg, int *parent_tidptr,
+                                   void *newtls, int *child_tidptr) {
+      unsigned long long __res;
+
+      __asm__ __volatile__ (
+                            "{\n\t"
+                            "  addd,s 0x0, %[nr_clone], %%b[0]\n\t"
+                            "  addd,s 0x0, %[flags], %%db[1]\n\t"
+                            "  addd,s 0x0, %[child_stack], %%db[2]\n\t"
+                            "  addd,s 0x0, %[parent_tidptr], %%db[3]\n\t"
+                            "  addd,s 0x0, %[child_tidptr], %%db[4]\n\t"
+                            "  addd,s 0x0, %[newtls], %%db[5]\n\t"
+                            "}\n\t"
+                            /* if (fn == NULL)
+                             *   return -EINVAL;
+                             */
+
+                            "{\n\t"
+                            "  disp %%ctpr1, .L1\n\t"
+                            "}\n\t"
+                            "{\n\t"
+                            "  cmpesb,s 0x0, %[fn], %%pred0\n\t"
+                            "}\n\t"
+                            "{\n\t"
+                            "  ct %%ctpr1 ? %%pred0\n\t"
+                            "}\n\t"
+
+                            /* if (child_stack == NULL)
+                             *   return -EINVAL;
+                             */
+                            "{\n\t"
+                            "  cmpesb,s 0x0, %%db[2], %%pred0\n\t"
+                            "}\n\t"
+                            "{\n\t"
+                            "  ct %%ctpr1 ? %%pred0\n\t"
+                            "}\n\t"
+
+                            /* b[0] = syscall(%b[0] = __NR_clone,
+                             *                %db[1] = flags,
+                             *                %db[2] = child_stack,
+                             *                %db[3] = parent_tidptr,
+                             *                %db[4] = child_tidptr,
+                             *                %db[5] = newtls)
+                             */
+                            "{\n\t"
+                            "  sdisp %%ctpr1, 0x3\n\t"
+                            "}\n\t"
+                            "{\n\t"
+                            "  call %%ctpr1, wbs = %#\n\t"
+                            "}\n\t"
+
+                            /* if (%[b0] != 0)
+                             *   return %b[0];
+                             */
+                            "{\n\t"
+                            "  disp %%ctpr1, .L2\n\t"
+                            "  cmpesb,s 0x0, %%b[0], %%pred0\n\t"
+                            "}\n\t"
+                            "{\n\t"
+                            "  ct %%ctpr1 ? ~%%pred0\n\t"
+                            "}\n\t"
+                            /* In the child, now. Call "fn(arg)".
+                             */
+
+                            "{\n\t"
+                            "  movtd,s %[fn], %%ctpr1\n\t"
+                            "}\n\t"
+                            "{\n\t"
+                            "  addd,s 0x0, %[arg], %%db[0]\n\t"
+                            "}\n\t"
+                            "{\n\t"
+                            "  call %%ctpr1, wbs = %#\n\t"
+                            "}\n\t"
+                            /* Call _exit(%b[0]).
+                             */
+
+                            "{\n\t"
+                            "  sdisp %%ctpr1, 0x3\n\t"
+                            "  addd,s 0x0, %%b[0], %%b[1]\n\t"
+                            "}\n\t"
+                            "{\n\t"
+                            "  addd,s 0x0, %[nr_exit], %%b[0]\n\t"
+                            "}\n\t"
+                            "{\n\t"
+                            "  call %%ctpr1, wbs = %#\n\t"
+                            "}\n\t"
+                            "{\n\t"
+                            "  disp %%ctpr1, .L2\n\t"
+                            "  adds,s 0x0, 0x0, %%b[0]\n\t"
+                            "}\n\t"
+                            "{\n\t"
+                            "  ct %%ctpr1\n\t"
+                            "}\n\t"
+                            ".L1:\n\t"
+                            "{\n\t"
+                            "  addd,s 0x0, %[einval], %%b[0]\n\t"
+                            "}\n\t"
+                            ".L2:\n\t"
+                            "{\n\t"
+                            "  addd,s 0x0, %%b[0], %[res]\n\t"
+                            "}\n\t"
+                            : [res] "=r" LSS_SYSCALL_ARG(__res)
+                            : [nr_clone] "ri" LSS_SYSCALL_ARG(__NR_clone)
+                              [arg] "ri" LSS_SYSCALL_ARG(arg)
+                              [nr_exit] "ri" LSS_SYSCALL_ARG(__NR_exit)
+                              [flags] "ri" LSS_SYSCALL_ARG(flags)
+                              [child_stack] "ri" LSS_SYSCALL_ARG(child_stack)
+                              [parent_tidptr] "ri"
+                              LSS_SYSCALL_ARG(parent_tidptr)
+                              [newtls] "ri" LSS_SYSCALL_ARG(newtls)
+                              [child_tidptr] "ri"
+                              LSS_SYSCALL_ARG(child_tidptr)
+                              [fn] "ri" LSS_SYSCALL_ARG(fn)
+                              [einval] "ri" LSS_SYSCALL_ARG(-EINVAL)
+                            : "ctpr1", "b[0]", "b[1]", "b[2]", "b[3]",
+                              "b[4]", "b[5]", "pred0");
+      LSS_RETURN(int, __res);
+    }
+  #elif defined(__loongarch_lp64)
+    /* Most definitions of _syscallX() neglect to mark "memory" as being
+     * clobbered. This causes problems with compilers, that do a better job
+     * at optimizing across __asm__ calls.
+     * So, we just have to redefine all of the _syscallX() macros.
+     */
+    #undef LSS_REG
+    #define LSS_REG(ar,a) register int64_t __r##ar __asm__("a"#ar) = (int64_t)a
+    /* syscall is like subroutine calls, all caller-saved registers may be
+     * clobbered, we should add them to the |Clobbers| list.
+     * a0 is not included because it's in the output list.
+     */
+    #define LSS_SYSCALL_CLOBBERS "t0", "t1", "t2", "t3", "t4", "t5", "t6",    \
+                                 "t7", "t8", "memory"
+    #undef  LSS_BODY
+    #define LSS_BODY(type,name,args...)                                       \
+          register int64_t __res_a0 __asm__("a0");                            \
+          register int64_t __a7 __asm__("a7") = __NR_##name;                  \
+          int64_t __res;                                                      \
+          __asm__ __volatile__ ("syscall 0x0\n"                               \
+                                : "=r"(__res_a0)                              \
+                                : "r"(__a7), ## args                          \
+                                : LSS_SYSCALL_CLOBBERS);                      \
+          __res = __res_a0;                                                   \
+          LSS_RETURN(type, __res)
+    #undef _syscall0
+    #define _syscall0(type, name)                                             \
+      type LSS_NAME(name)(void) {                                             \
+        LSS_BODY(type, name);                                                 \
+      }
+    #undef _syscall1
+    #define _syscall1(type, name, type1, arg1)                                \
+      type LSS_NAME(name)(type1 arg1) {                                       \
+        LSS_REG(0, arg1); LSS_BODY(type, name, "r"(__r0));                    \
+      }
+    #undef _syscall2
+    #define _syscall2(type, name, type1, arg1, type2, arg2)                   \
+      type LSS_NAME(name)(type1 arg1, type2 arg2) {                           \
+        LSS_REG(0, arg1); LSS_REG(1, arg2);                                   \
+        LSS_BODY(type, name, "r"(__r0), "r"(__r1));                           \
+      }
+    #undef _syscall3
+    #define _syscall3(type, name, type1, arg1, type2, arg2, type3, arg3)      \
+      type LSS_NAME(name)(type1 arg1, type2 arg2, type3 arg3) {               \
+        LSS_REG(0, arg1); LSS_REG(1, arg2); LSS_REG(2, arg3);                 \
+        LSS_BODY(type, name, "r"(__r0), "r"(__r1), "r"(__r2));                \
+      }
+    #undef _syscall4
+    #define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4)  \
+      type LSS_NAME(name)(type1 arg1, type2 arg2, type3 arg3, type4 arg4) {   \
+        LSS_REG(0, arg1); LSS_REG(1, arg2); LSS_REG(2, arg3);                 \
+        LSS_REG(3, arg4);                                                     \
+        LSS_BODY(type, name, "r"(__r0), "r"(__r1), "r"(__r2), "r"(__r3));     \
+      }
+    #undef _syscall5
+    #define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,  \
+                      type5,arg5)                                             \
+      type LSS_NAME(name)(type1 arg1, type2 arg2, type3 arg3, type4 arg4,     \
+                          type5 arg5) {                                       \
+        LSS_REG(0, arg1); LSS_REG(1, arg2); LSS_REG(2, arg3);                 \
+        LSS_REG(3, arg4); LSS_REG(4, arg5);                                   \
+        LSS_BODY(type, name, "r"(__r0), "r"(__r1), "r"(__r2), "r"(__r3),      \
+                             "r"(__r4));                                      \
+      }
+    #undef _syscall6
+    #define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,  \
+                      type5,arg5,type6,arg6)                                  \
+      type LSS_NAME(name)(type1 arg1, type2 arg2, type3 arg3, type4 arg4,     \
+                          type5 arg5, type6 arg6) {                           \
+        LSS_REG(0, arg1); LSS_REG(1, arg2); LSS_REG(2, arg3);                 \
+        LSS_REG(3, arg4); LSS_REG(4, arg5); LSS_REG(5, arg6);                 \
+        LSS_BODY(type, name, "r"(__r0), "r"(__r1), "r"(__r2), "r"(__r3),      \
+                             "r"(__r4), "r"(__r5));                           \
+      }
+
+    LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack,
+                                   int flags, void *arg, int *parent_tidptr,
+                                   void *newtls, int *child_tidptr) {
+      int64_t __res;
+      {
+        register int64_t __res_a0 __asm__("a0");
+        register uint64_t __flags __asm__("a0") = flags;
+        register void *__stack __asm__("a1") = child_stack;
+        register void *__ptid  __asm__("a2") = parent_tidptr;
+        register void *__tls   __asm__("a3") = newtls;
+        register int  *__ctid  __asm__("a4") = child_tidptr;
+        __asm__ __volatile__(/* Push "arg" and "fn" onto the stack that will be
+                              * used by the child.
+                              */
+                             "addi.d  %2, %2, -16\n"
+                             "st.d    %1, %2, 8\n"
+                             "st.d    %4, %2, 0\n"
+
+                             /* %a0 = syscall(%a0 = flags,
+                              *               %a1 = child_stack,
+                              *               %a2 = parent_tidptr,
+                              *               %a3 = newtls,
+                              *               %a4 = child_tidptr)
+                              */
+                             "li.d      $a7, %8\n"
+                             "syscall   0x0\n"
+
+                             /* if (%a0 != 0)
+                              *   return %a0;
+                              */
+                             "bnez    $a0, 1f\n"
+
+                             /* In the child, now. Call "fn(arg)".
+                              */
+                             "ld.d    $a0, $sp, 0\n"
+                             "ld.d    $a1, $sp, 8\n"
+                             "addi.d  $sp, $sp, 16\n"
+                             "jirl    $ra, $a1, 0\n"
+
+                             /* Call _exit(%a0).
+                              */
+                             "li.d     $a7, %9\n"
+                             "syscall  0x0\n"
+                           "1:\n"
+                             : "=r" (__res_a0)
+                             : "r"(fn), "r"(__stack), "r"(__flags), "r"(arg),
+                               "r"(__ptid), "r"(__tls), "r"(__ctid),
+                               "i"(__NR_clone), "i"(__NR_exit)
+                             : "a7", LSS_SYSCALL_CLOBBERS);
+      __res = __res_a0;
+      }
+      LSS_RETURN(int, __res);
+    }
+
   #endif
   #define __NR__exit   __NR_exit
   #define __NR__gettid __NR_gettid
@@ -3378,8 +4091,10 @@ struct kernel_statfs {
     // fork is polyfilled below when not available.
     LSS_INLINE _syscall0(pid_t,   fork)
   #endif
+  #if defined(__NR_fstat)
   LSS_INLINE _syscall2(int,     fstat,           int,         f,
                       struct kernel_stat*,   b)
+  #endif
   LSS_INLINE _syscall2(int,     fstatfs,         int,         f,
                       struct kernel_statfs*, b)
   #if defined(__x86_64__)
@@ -3391,15 +4106,18 @@ struct kernel_statfs {
     LSS_INLINE _syscall2(int, ftruncate,           int,         f,
                          off_t,          l)
   #endif
-  LSS_INLINE _syscall4(int,     futex,           int*,        a,
-                       int,            o, int,    v,
-                      struct kernel_timespec*, t)
+  LSS_INLINE _syscall6(int,     futex,          int*,        u,
+                       int,     o,              int,         v,
+                       struct kernel_timespec*, t,
+                       int*,    u2,             int,         v2)
   LSS_INLINE _syscall3(int,     getdents,        int,         f,
                        struct kernel_dirent*, d, int,    c)
   LSS_INLINE _syscall3(int,     getdents64,      int,         f,
                       struct kernel_dirent64*, d, int,    c)
   LSS_INLINE _syscall0(gid_t,   getegid)
   LSS_INLINE _syscall0(uid_t,   geteuid)
+  LSS_INLINE _syscall2(int,     getitimer,       int,        w,
+                       struct kernel_itimerval*, c)
   #if defined(__NR_getpgrp)
     LSS_INLINE _syscall0(pid_t,   getpgrp)
   #endif
@@ -3411,10 +4129,10 @@ struct kernel_statfs {
                        gid_t *,         e,       gid_t *,     s)
   LSS_INLINE _syscall3(int,     getresuid,       uid_t *,     r,
                        uid_t *,         e,       uid_t *,     s)
-#if !defined(__ARM_EABI__)
+  #if defined(__NR_getrlimit)
   LSS_INLINE _syscall2(int,     getrlimit,       int,         r,
                       struct kernel_rlimit*, l)
-#endif
+  #endif
   LSS_INLINE _syscall1(pid_t,   getsid,          pid_t,       p)
   LSS_INLINE _syscall0(pid_t,   _gettid)
   LSS_INLINE _syscall2(pid_t,   gettimeofday,    struct kernel_timeval*, t,
@@ -3521,6 +4239,9 @@ struct kernel_statfs {
   LSS_INLINE _syscall1(int,     setfsuid,        uid_t,       u)
   LSS_INLINE _syscall1(int,     setuid,          uid_t,       u)
   LSS_INLINE _syscall1(int,     setgid,          gid_t,       g)
+  LSS_INLINE _syscall3(int,     setitimer,       int,         w,
+                       const struct kernel_itimerval*,        n,
+                       struct kernel_itimerval*, o)
   LSS_INLINE _syscall2(int,     setpgid,         pid_t,       p,
                        pid_t,          g)
   LSS_INLINE _syscall3(int,     setpriority,     int,         a,
@@ -3529,8 +4250,10 @@ struct kernel_statfs {
                        gid_t,          e, gid_t,  s)
   LSS_INLINE _syscall3(int,     setresuid,       uid_t,       r,
                        uid_t,          e, uid_t,  s)
+  #if defined(__NR_setrlimit)
   LSS_INLINE _syscall2(int,     setrlimit,       int,         r,
                        const struct kernel_rlimit*, l)
+  #endif
   LSS_INLINE _syscall0(pid_t,    setsid)
   LSS_INLINE _syscall2(int,     sigaltstack,     const stack_t*, s,
                        const stack_t*, o)
@@ -3538,10 +4261,14 @@ struct kernel_statfs {
     LSS_INLINE _syscall1(int,     sigreturn,       unsigned long, u)
   #endif
   #if defined(__NR_stat)
-    // stat is polyfilled below when not available.
+    // stat and lstat are polyfilled below when not available.
     LSS_INLINE _syscall2(int,     stat,            const char*, f,
                         struct kernel_stat*,   b)
   #endif
+  #if defined(__NR_lstat)
+    LSS_INLINE _syscall2(int,     lstat,           const char*, f,
+                         struct kernel_stat*,   b)
+  #endif
   LSS_INLINE _syscall2(int,     statfs,          const char*, f,
                       struct kernel_statfs*, b)
   LSS_INLINE _syscall3(int,     tgkill,          pid_t,       p,
@@ -3560,23 +4287,6 @@ struct kernel_statfs {
     LSS_INLINE _syscall3(long, getcpu, unsigned *, cpu,
                          unsigned *, node, void *, unused)
   #endif
-  #if defined(__x86_64__) ||                                                  \
-     (defined(__mips__) && _MIPS_SIM != _MIPS_SIM_ABI32)
-    LSS_INLINE _syscall3(int, recvmsg,            int,   s,
-                        struct kernel_msghdr*,     m, int, f)
-    LSS_INLINE _syscall3(int, sendmsg,            int,   s,
-                         const struct kernel_msghdr*, m, int, f)
-    LSS_INLINE _syscall6(int, sendto,             int,   s,
-                         const void*,             m, size_t, l,
-                         int,                     f,
-                         const struct kernel_sockaddr*, a, int, t)
-    LSS_INLINE _syscall2(int, shutdown,           int,   s,
-                         int,                     h)
-    LSS_INLINE _syscall3(int, socket,             int,   d,
-                         int,                     t, int,       p)
-    LSS_INLINE _syscall4(int, socketpair,         int,   d,
-                         int,                     t, int,       p, int*, s)
-  #endif
   #if defined(__NR_fadvise64)
     #if defined(__x86_64__)
     /* Need to make sure loff_t isn't truncated to 32-bits under x32.  */
@@ -3650,11 +4360,21 @@ struct kernel_statfs {
                          int, f, int, mode, loff_t, offset, loff_t, len)
     #endif
   #endif
+  #if defined(__NR_getrandom)
+    LSS_INLINE _syscall3(ssize_t, getrandom, void*, buffer, size_t, length,
+                         unsigned int, flags)
+  #endif
   #if defined(__NR_newfstatat)
     LSS_INLINE _syscall4(int, newfstatat,         int,   d,
                          const char *,            p,
                          struct kernel_stat*,     b, int, f)
   #endif
+  #if defined(__NR_statx)
+    LSS_INLINE _syscall5(int, statx,              int,   d,
+                         const char *,            p,
+                         int, f,                  int,   m,
+                         struct kernel_statx*,    b)
+  #endif
   #if defined(__x86_64__) || defined(__s390x__)
     LSS_INLINE int LSS_NAME(getresgid32)(gid_t *rgid,
                                          gid_t *egid,
@@ -3861,43 +4581,43 @@ struct kernel_statfs {
 
   LSS_INLINE int LSS_NAME(sigaddset)(struct kernel_sigset_t *set,
                                      int signum) {
-    if (signum < 1 || signum > (int)(8*sizeof(set->sig))) {
+    if (signum < 1 || (size_t)signum > (8*sizeof(set->sig))) {
       LSS_ERRNO = EINVAL;
       return -1;
     } else {
-      set->sig[(signum - 1)/(8*sizeof(set->sig[0]))]
-          |= 1UL << ((signum - 1) % (8*sizeof(set->sig[0])));
+      set->sig[(size_t)(signum - 1)/(8*sizeof(set->sig[0]))]
+          |= 1UL << ((size_t)(signum - 1) % (8*sizeof(set->sig[0])));
       return 0;
     }
   }
 
   LSS_INLINE int LSS_NAME(sigdelset)(struct kernel_sigset_t *set,
                                         int signum) {
-    if (signum < 1 || signum > (int)(8*sizeof(set->sig))) {
+    if (signum < 1 || (size_t)signum > (8*sizeof(set->sig))) {
       LSS_ERRNO = EINVAL;
       return -1;
     } else {
-      set->sig[(signum - 1)/(8*sizeof(set->sig[0]))]
-          &= ~(1UL << ((signum - 1) % (8*sizeof(set->sig[0]))));
+      set->sig[(size_t)(signum - 1)/(8*sizeof(set->sig[0]))]
+          &= ~(1UL << ((size_t)(signum - 1) % (8*sizeof(set->sig[0]))));
       return 0;
     }
   }
 
   LSS_INLINE int LSS_NAME(sigismember)(struct kernel_sigset_t *set,
                                           int signum) {
-    if (signum < 1 || signum > (int)(8*sizeof(set->sig))) {
+    if (signum < 1 || (size_t)signum > (8*sizeof(set->sig))) {
       LSS_ERRNO = EINVAL;
       return -1;
     } else {
-      return !!(set->sig[(signum - 1)/(8*sizeof(set->sig[0]))] &
-                (1UL << ((signum - 1) % (8*sizeof(set->sig[0])))));
+      return !!(set->sig[(size_t)(signum - 1)/(8*sizeof(set->sig[0]))] &
+                (1UL << ((size_t)(signum - 1) % (8*sizeof(set->sig[0])))));
     }
   }
   #if defined(__i386__) ||                                                    \
       defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) ||                     \
      (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) ||                   \
       defined(__PPC__) ||                                                     \
-     (defined(__s390__) && !defined(__s390x__))
+     (defined(__s390__) && !defined(__s390x__)) || defined(__e2k__)
     #define __NR__sigaction   __NR_sigaction
     #define __NR__sigpending  __NR_sigpending
     #define __NR__sigsuspend  __NR_sigsuspend
@@ -4151,23 +4871,31 @@ struct kernel_statfs {
       LSS_SC_BODY(4, int, 8, d, type, protocol, sv);
     }
   #endif
-  #if defined(__ARM_EABI__) || defined (__aarch64__)
+  #if defined(__NR_recvmsg)
     LSS_INLINE _syscall3(ssize_t, recvmsg, int, s, struct kernel_msghdr*, msg,
                          int, flags)
+  #endif
+  #if defined(__NR_sendmsg)
     LSS_INLINE _syscall3(ssize_t, sendmsg, int, s, const struct kernel_msghdr*,
                          msg, int, flags)
+  #endif
+  #if defined(__NR_sendto)
     LSS_INLINE _syscall6(ssize_t, sendto, int, s, const void*, buf, size_t,len,
                          int, flags, const struct kernel_sockaddr*, to,
                          unsigned int, tolen)
+  #endif
+  #if defined(__NR_shutdown)
     LSS_INLINE _syscall2(int, shutdown, int, s, int, how)
+  #endif
+  #if defined(__NR_socket)
     LSS_INLINE _syscall3(int, socket, int, domain, int, type, int, protocol)
+  #endif
+  #if defined(__NR_socketpair)
     LSS_INLINE _syscall4(int, socketpair, int, d, int, type, int, protocol,
                          int*, sv)
   #endif
-  #if defined(__i386__) || defined(__ARM_ARCH_3__) ||                         \
-      (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) ||                  \
-      defined(__s390__)
-    #define __NR__socketcall  __NR_socketcall
+
+  #if defined(__NR_socketcall)
     LSS_INLINE _syscall2(int,      _socketcall,    int,   c,
                          va_list,                  a)
     LSS_INLINE int LSS_NAME(socketcall)(int op, ...) {
@@ -4179,36 +4907,43 @@ struct kernel_statfs {
       return rc;
     }
 
+  # if !defined(__NR_recvmsg)
     LSS_INLINE ssize_t LSS_NAME(recvmsg)(int s,struct kernel_msghdr *msg,
                                          int flags){
       return (ssize_t)LSS_NAME(socketcall)(17, s, msg, flags);
     }
-
+  # endif
+  # if !defined(__NR_sendmsg)
     LSS_INLINE ssize_t LSS_NAME(sendmsg)(int s,
                                          const struct kernel_msghdr *msg,
                                          int flags) {
       return (ssize_t)LSS_NAME(socketcall)(16, s, msg, flags);
     }
-
+  # endif
+  # if !defined(__NR_sendto)
     LSS_INLINE ssize_t LSS_NAME(sendto)(int s, const void *buf, size_t len,
                                         int flags,
                                         const struct kernel_sockaddr *to,
                                         unsigned int tolen) {
       return (ssize_t)LSS_NAME(socketcall)(11, s, buf, len, flags, to, tolen);
     }
-
+  # endif
+  # if !defined(__NR_shutdown)
     LSS_INLINE int LSS_NAME(shutdown)(int s, int how) {
       return LSS_NAME(socketcall)(13, s, how);
     }
-
+  # endif
+  # if !defined(__NR_socket)
     LSS_INLINE int LSS_NAME(socket)(int domain, int type, int protocol) {
       return LSS_NAME(socketcall)(1, domain, type, protocol);
     }
-
+  # endif
+  # if !defined(__NR_socketpair)
     LSS_INLINE int LSS_NAME(socketpair)(int d, int type, int protocol,
                                         int sv[2]) {
       return LSS_NAME(socketcall)(8, d, type, protocol, sv);
     }
+  # endif
   #endif
   #if defined(__NR_fstatat64)
     LSS_INLINE _syscall4(int,   fstatat64,        int,   d,
@@ -4290,12 +5025,12 @@ struct kernel_statfs {
     va_start(ap, flags);
     new_address = va_arg(ap, void *);
     rc = LSS_NAME(_mremap)(old_address, old_size, new_size,
-                           flags, new_address);
+                           (unsigned long)flags, new_address);
     va_end(ap);
     return rc;
   }
 
-  LSS_INLINE int LSS_NAME(ptrace_detach)(pid_t pid) {
+  LSS_INLINE long LSS_NAME(ptrace_detach)(pid_t pid) {
     /* PTRACE_DETACH can sometimes forget to wake up the tracee and it
      * then sends job control signals to the real parent, rather than to
      * the tracer. We reduce the risk of this happening by starting a
@@ -4306,7 +5041,8 @@ struct kernel_statfs {
      * detached.  Large multi threaded apps can take a long time in the kernel
      * processing SIGCONT.
      */
-    int rc, err;
+    long rc;
+    int err;
     LSS_NAME(sched_yield)();
     rc = LSS_NAME(ptrace)(PTRACE_DETACH, pid, (void *)0, (void *)0);
     err = LSS_ERRNO;
@@ -4339,7 +5075,7 @@ struct kernel_statfs {
                                      LSS_SYSCALL_ARG(c), (uint64_t)(o));
     }
 
-    LSS_INLINE int LSS_NAME(readahead)(int f, loff_t o, unsigned c) {
+    LSS_INLINE int LSS_NAME(readahead)(int f, loff_t o, size_t c) {
       LSS_BODY(3, int, readahead, LSS_SYSCALL_ARG(f), (uint64_t)(o),
                                   LSS_SYSCALL_ARG(c));
     }
@@ -4378,7 +5114,7 @@ struct kernel_statfs {
                            unsigned, o2)
       LSS_INLINE _syscall5(ssize_t, _pwrite64,       int,         f,
                            const void *,   b, size_t, c, unsigned, o1,
-                           long, o2)
+                           unsigned, o2)
       LSS_INLINE _syscall4(int, _readahead,          int,         f,
                            unsigned,       o1, unsigned, o2, size_t, c)
     #endif
@@ -4399,9 +5135,9 @@ struct kernel_statfs {
       return LSS_NAME(_pwrite64)(fd, buf, count,
                                  LSS_LLARG_PAD o.arg[0], o.arg[1]);
     }
-    LSS_INLINE int LSS_NAME(readahead)(int fd, loff_t off, int len) {
+    LSS_INLINE int LSS_NAME(readahead)(int fd, loff_t off, size_t count) {
       union { loff_t off; unsigned arg[2]; } o = { off };
-      return LSS_NAME(_readahead)(fd, LSS_LLARG_PAD o.arg[0], o.arg[1], len);
+      return LSS_NAME(_readahead)(fd, LSS_LLARG_PAD o.arg[0], o.arg[1], count);
     }
   #endif
 #endif
@@ -4456,10 +5192,79 @@ struct kernel_statfs {
   }
 #endif
 
+#if defined(__NR_statx)
+  /* copy the contents of kernel_statx to the kernel_stat structure.  */
+  LSS_INLINE void LSS_NAME(cp_stat_statx)(struct kernel_stat  *to,
+                                          struct kernel_statx *from) {
+    memset(to, 0, sizeof(struct kernel_stat));
+    to->st_dev = (kernel_dev_t)((from->stx_dev_minor & 0xff) |
+                                ((from->stx_dev_major & 0xfff) << 8) |
+                                ((from->stx_dev_minor & ~0xffu) << 12));
+    to->st_rdev = (kernel_dev_t)((from->stx_rdev_minor & 0xff) |
+                                 ((from->stx_rdev_major & 0xfff) << 8) |
+                                 ((from->stx_rdev_minor & ~0xffu) << 12));
+    to->st_ino = (kernel_ino_t)from->stx_ino;
+    to->st_mode = (kernel_mode_t)from->stx_mode;
+    to->st_nlink = (kernel_nlink_t)from->stx_nlink;
+    to->st_uid = (kernel_uid_t)from->stx_uid;
+    to->st_gid = (kernel_gid_t)from->stx_gid;
+    to->st_atime_ = (kernel_time_t)(from->stx_atime.tv_sec);
+    to->st_atime_nsec_ = from->stx_atime.tv_nsec;
+    to->st_mtime_ = (kernel_time_t)(from->stx_mtime.tv_sec);
+    to->st_mtime_nsec_ = from->stx_mtime.tv_nsec;
+    to->st_ctime_ = (kernel_time_t)(from->stx_ctime.tv_sec);
+    to->st_ctime_nsec_ = from->stx_ctime.tv_nsec;
+    to->st_size = (kernel_off_t)(from->stx_size);
+    to->st_blocks = (kernel_blkcnt_t)(from->stx_blocks);
+    to->st_blksize = (kernel_blksize_t)from->stx_blksize;
+  }
+#endif
+
+#if !defined(__NR_fstat)
+  LSS_INLINE int LSS_NAME(fstat)(int fd,
+                                 struct kernel_stat *buf) {
+    #if defined(__NR_newfstatat)
+      return LSS_NAME(newfstatat)(fd, "", buf, AT_EMPTY_PATH);
+    #elif defined(__NR_statx)
+      struct kernel_statx stx;
+      int flags = AT_NO_AUTOMOUNT | AT_EMPTY_PATH;
+      int mask = STATX_BASIC_STATS;
+      int res = LSS_NAME(statx)(fd, "", flags, mask, &stx);
+      LSS_NAME(cp_stat_statx)(buf, &stx);
+      return res;
+    #endif
+  }
+#endif
+
 #if !defined(__NR_stat)
   LSS_INLINE int LSS_NAME(stat)(const char *pathname,
                                 struct kernel_stat *buf) {
-    return LSS_NAME(newfstatat)(AT_FDCWD, pathname, buf, 0);
+    #if defined(__NR_newfstatat)
+      return LSS_NAME(newfstatat)(AT_FDCWD, pathname, buf, 0);
+    #elif defined(__NR_statx)
+      struct kernel_statx stx;
+      int flags = AT_NO_AUTOMOUNT | AT_STATX_SYNC_AS_STAT;
+      int mask = STATX_BASIC_STATS;
+      int res = LSS_NAME(statx)(AT_FDCWD, pathname, flags, mask, &stx);
+      LSS_NAME(cp_stat_statx)(buf, &stx);
+      return res;
+    #endif
+  }
+#endif
+
+#if !defined(__NR_lstat)
+  LSS_INLINE int LSS_NAME(lstat)(const char *pathname,
+                                 struct kernel_stat *buf) {
+    #if defined(__NR_newfstatat)
+      return LSS_NAME(newfstatat)(AT_FDCWD, pathname, buf, AT_SYMLINK_NOFOLLOW);
+    #elif defined(__NR_statx)
+      struct kernel_statx stx;
+      int flags = AT_NO_AUTOMOUNT | AT_SYMLINK_NOFOLLOW;
+      int mask = STATX_BASIC_STATS;
+      int res = LSS_NAME(statx)(AT_FDCWD, pathname, flags, mask, &stx);
+      LSS_NAME(cp_stat_statx)(buf, &stx);
+      return res;
+    #endif
   }
 #endif
 
@@ -4473,7 +5278,7 @@ struct kernel_statfs {
 // TODO: define this in an arch-independant way instead of inlining the clone
 //       syscall body.
 
-# if defined(__aarch64__)
+# if defined(__aarch64__) || defined(__riscv) || defined(__loongarch_lp64)
   LSS_INLINE pid_t LSS_NAME(fork)(void) {
     // No fork syscall on aarch64 - implement by means of the clone syscall.
     // Note that this does not reset glibc's cached view of the PID/TID, so
@@ -4511,13 +5316,14 @@ struct kernel_statfs {
 # endif
 #endif
 
-#ifdef __ANDROID__
-  /* These restore the original values of these macros saved by the
-   * corresponding #pragma push_macro near the top of this file. */
-# pragma pop_macro("stat64")
-# pragma pop_macro("fstat64")
-# pragma pop_macro("lstat64")
-#endif
+/* These restore the original values of these macros saved by the
+ * corresponding #pragma push_macro near the top of this file. */
+#pragma pop_macro("stat64")
+#pragma pop_macro("fstat64")
+#pragma pop_macro("lstat64")
+#pragma pop_macro("pread64")
+#pragma pop_macro("pwrite64")
+#pragma pop_macro("getdents64")
 
 #if defined(__cplusplus) && !defined(SYS_CPLUSPLUS)
 }
diff --git a/extern/crashpad/crashpad/third_party/lss/lss/tests/Makefile b/extern/crashpad/crashpad/third_party/lss/lss/tests/Makefile
index 5e37345f15..a4e2f38739 100644
--- a/extern/crashpad/crashpad/third_party/lss/lss/tests/Makefile
+++ b/extern/crashpad/crashpad/third_party/lss/lss/tests/Makefile
@@ -1,4 +1,4 @@
-# Copyright 2018, Google Inc.  All rights reserved.
+# Copyright 2018 Google LLC
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
@@ -10,7 +10,7 @@
 # copyright notice, this list of conditions and the following disclaimer
 # in the documentation and/or other materials provided with the
 # distribution.
-#     * Neither the name of Google Inc. nor the names of its
+#     * Neither the name of Google LLC nor the names of its
 # contributors may be used to endorse or promote products derived from
 # this software without specific prior written permission.
 #
@@ -41,7 +41,13 @@ LDFLAGS += -static
 
 TESTS = \
 	fallocate \
+	getitimer \
+	getrandom \
+	lstat \
+	setitimer \
+	sigaction \
 	sigtimedwait \
+	stat \
 	unlink \
 
 all: check
@@ -49,22 +55,31 @@ all: check
 %_test: %.c test_skel.h $(top_srcdir)/linux_syscall_support.h
 	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $<
 
+# Force building C as C++ code to improve compile-time coverage.
+%_cc_test: %.c test_skel.h $(top_srcdir)/linux_syscall_support.h
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $<
+
 %_test: %.cc test_skel.h $(top_srcdir)/linux_syscall_support.h
 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $<
 
 %_run: %_test
 	@t=$(@:_run=_test); \
 	echo "./$$t"; \
-	if ! env -i ./$$t; then \
+	env -i ./$$t; \
+	exit_status=$$?; \
+	if [ $$exit_status = 77 ]; then \
+		echo "SKIP: $$t"; \
+	elif [ $$exit_status != 0 ]; then \
+		echo "FAIL: $$t"; \
 		env -i strace -f -v ./$$t; \
 		echo "TRY: gdb -q -ex r -ex bt ./$$t"; \
 		exit 1; \
 	fi
 
-ALL_TEST_TARGETS = $(TESTS:=_test)
+ALL_TEST_TARGETS = $(TESTS:=_test) $(TESTS:=_cc_test)
 compile_tests: $(ALL_TEST_TARGETS)
 
-ALL_RUN_TARGETS = $(TESTS:=_run)
+ALL_RUN_TARGETS = $(TESTS:=_run) $(TESTS:=_cc_run)
 check: $(ALL_RUN_TARGETS)
 
 # The "tempfile" targets are the names we use with temp files.
@@ -105,6 +120,7 @@ cross:
 		"mips64-unknown-linux-gnu-gcc -mabi=n32" \
 		"s390-ibm-linux-gnu-gcc" \
 		"s390x-ibm-linux-gnu-gcc" \
+		"loongarch64-unknown-linux-gnu-gcc" \
 	; do \
 		cxx=`echo "$$cc" | sed 's:-gcc:-g++:'`; \
 		$(MAKE) --no-print-directory CC="$$cc" CXX="$$cxx" cross_compile; \
diff --git a/extern/crashpad/crashpad/third_party/lss/lss/tests/fallocate.c b/extern/crashpad/crashpad/third_party/lss/lss/tests/fallocate.c
index c156e58986..1a26fed55a 100644
--- a/extern/crashpad/crashpad/third_party/lss/lss/tests/fallocate.c
+++ b/extern/crashpad/crashpad/third_party/lss/lss/tests/fallocate.c
@@ -1,4 +1,4 @@
-/* Copyright 2019, Google Inc.  All rights reserved.
+/* Copyright 2019 Google LLC
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -10,7 +10,7 @@
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
- *     * Neither the name of Google Inc. nor the names of its
+ *     * Neither the name of Google LLC nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
  *
@@ -63,5 +63,7 @@ int main(int argc, char *argv[]) {
 #endif
   assert(st.st_size == offset + len);
 
+  sys_unlink(filename);
+
   return 0;
 }
diff --git a/extern/crashpad/crashpad/third_party/lss/lss/tests/sigtimedwait.c b/extern/crashpad/crashpad/third_party/lss/lss/tests/sigtimedwait.c
index ee2f740fe4..d56d304608 100644
--- a/extern/crashpad/crashpad/third_party/lss/lss/tests/sigtimedwait.c
+++ b/extern/crashpad/crashpad/third_party/lss/lss/tests/sigtimedwait.c
@@ -1,4 +1,4 @@
-/* Copyright 2019, Google Inc.  All rights reserved.
+/* Copyright 2019 Google LLC
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -10,7 +10,7 @@
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
- *     * Neither the name of Google Inc. nor the names of its
+ *     * Neither the name of Google LLC nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
  *
diff --git a/extern/crashpad/crashpad/third_party/lss/lss/tests/test_skel.h b/extern/crashpad/crashpad/third_party/lss/lss/tests/test_skel.h
index 9ff0eb3711..89077c95df 100644
--- a/extern/crashpad/crashpad/third_party/lss/lss/tests/test_skel.h
+++ b/extern/crashpad/crashpad/third_party/lss/lss/tests/test_skel.h
@@ -1,4 +1,4 @@
-/* Copyright 2018, Google Inc.  All rights reserved.
+/* Copyright 2018 Google LLC
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -10,7 +10,7 @@
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
- *     * Neither the name of Google Inc. nor the names of its
+ *     * Neither the name of Google LLC nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
  *
@@ -44,19 +44,24 @@
 #include <assert.h>
 #include <fcntl.h>
 #include <sched.h>
+#include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/mman.h>
 #include <sys/prctl.h>
 #include <sys/stat.h>
 #include <sys/vfs.h>
 #include <sys/wait.h>
+#include <unistd.h>
 
 #include <linux/capability.h>
 
 #include "linux_syscall_support.h"
 
+#define SKIP_TEST_EXIT_STATUS 77
+
 void assert_buffers_eq_len(const void *buf1, const void *buf2, size_t len) {
   const uint8_t *u8_1 = (const uint8_t *)buf1;
   const uint8_t *u8_2 = (const uint8_t *)buf2;
@@ -68,3 +73,17 @@ void assert_buffers_eq_len(const void *buf1, const void *buf2, size_t len) {
   }
 }
 #define assert_buffers_eq(obj1, obj2) assert_buffers_eq_len(obj1, obj2, sizeof(*obj1))
+
+// Returns true iff pointed timevals are equal.
+static inline bool kernel_timeval_eq(const struct kernel_timeval* lhs,
+                                     const struct kernel_timeval* rhs) {
+  return (lhs->tv_sec == rhs->tv_sec) && (lhs->tv_usec == rhs->tv_usec);
+}
+
+// Returns true iff pointed itimervals are equal.
+static inline bool kernel_itimerval_eq(const struct kernel_itimerval* lhs,
+                                       const struct kernel_itimerval* rhs) {
+  return kernel_timeval_eq(&lhs->it_interval, &rhs->it_interval) &&
+         kernel_timeval_eq(&lhs->it_value, &rhs->it_value);
+}
+
diff --git a/extern/crashpad/crashpad/third_party/lss/lss/tests/unlink.c b/extern/crashpad/crashpad/third_party/lss/lss/tests/unlink.c
index 70c8bc9a5e..191e367920 100644
--- a/extern/crashpad/crashpad/third_party/lss/lss/tests/unlink.c
+++ b/extern/crashpad/crashpad/third_party/lss/lss/tests/unlink.c
@@ -1,4 +1,4 @@
-/* Copyright 2018, Google Inc.  All rights reserved.
+/* Copyright 2018 Google LLC
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -10,7 +10,7 @@
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
- *     * Neither the name of Google Inc. nor the names of its
+ *     * Neither the name of Google LLC nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
  *
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/BUILD.gn b/extern/crashpad/crashpad/third_party/mini_chromium/BUILD.gn
index ccd70c3d5d..61a60ffac5 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/BUILD.gn
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2017 The Crashpad Authors. All rights reserved.
+# Copyright 2017 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ group("base") {
   } else if (crashpad_is_standalone) {
     public_deps = [ "mini_chromium/base" ]
   } else if (crashpad_is_in_fuchsia) {
-    public_deps = [ "//third_party/mini_chromium/base" ]
+    public_deps = [ mini_chromium_import_root + "/base" ]
   } else if (crashpad_is_external) {
     public_deps = [ "../../../../mini_chromium/mini_chromium/base" ]
   } else if (crashpad_is_in_dart) {
@@ -42,25 +42,10 @@ group("build") {
   } else if (crashpad_is_standalone) {
     public_deps = [ "mini_chromium/build" ]
   } else if (crashpad_is_in_fuchsia) {
-    public_deps = [ "//third_party/mini_chromium/build" ]
+    public_deps = [ mini_chromium_import_root + "/build" ]
   } else if (crashpad_is_external) {
     public_deps = [ "../../../../mini_chromium/mini_chromium/build" ]
   } else if (crashpad_is_in_dart) {
     public_deps = [ "//third_party/mini_chromium/mini_chromium/build" ]
   }
 }
-
-group("chromeos_buildflags") {
-  if (crashpad_is_in_chromium) {
-    public_deps = [ "//build:chromeos_buildflags" ]
-  } else if (crashpad_is_standalone) {
-    public_deps = [ "mini_chromium/build:chromeos_buildflags" ]
-  } else if (crashpad_is_in_fuchsia) {
-    public_deps = [ "//third_party/mini_chromium/build:chromeos_buildflags" ]
-  } else if (crashpad_is_external) {
-    public_deps = [ "../../../../mini_chromium/mini_chromium/build:chromeos_buildflags" ]
-  } else if (crashpad_is_in_dart) {
-    public_deps = [ "//third_party/mini_chromium/mini_chromium/build:chromeos_buildflags" ]
-  }
-}
-
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/README.crashpad b/extern/crashpad/crashpad/third_party/mini_chromium/README.crashpad
index 37d507bf2b..2ebdfffea8 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/README.crashpad
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/README.crashpad
@@ -5,6 +5,7 @@ Revision: See DEPS
 License: BSD 3-clause
 License File: mini_chromium/LICENSE
 Security Critical: yes
+Shipped in Chromium: no
 
 Description:
 mini_chromium is a small collection of useful low-level (“base”) routines from
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/.gitattributes b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/.gitattributes
index c9c89d500c..c74be0ea92 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/.gitattributes
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/.gitattributes
@@ -1,4 +1,4 @@
-# Copyright 2019 The Chromium Authors. All rights reserved.
+# Copyright 2019 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/.gitignore b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/.gitignore
index 7bd9b295cf..f1d08ef25a 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/.gitignore
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/.gitignore
@@ -1,4 +1,4 @@
-# Copyright 2012 The Chromium Authors. All rights reserved.
+# Copyright 2012 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/AUTHORS b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/AUTHORS
index 37d59f20c9..8bd1039f9f 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/AUTHORS
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/AUTHORS
@@ -1,5 +1,5 @@
-# Copyright 2012 The Chromium Authors. All rights reserved.
+# Copyright 2012 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-# See https://chromium.googlesource.com/chromium/chromium/+/trunk/AUTHORS
+# See https://chromium.googlesource.com/chromium/src/+/main/AUTHORS
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/BUILD.gn b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/BUILD.gn
index 226ec832d3..ffbc3409b3 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/BUILD.gn
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
+# Copyright 2016 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/LICENSE b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/LICENSE
index 36980134e0..179bf34452 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/LICENSE
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/LICENSE
@@ -1,4 +1,4 @@
-// Copyright 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright 2006-2008 The Chromium Authors
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/README.md b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/README.md
index 563c1a9f43..b51fe997d0 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/README.md
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/README.md
@@ -1,5 +1,5 @@
 <!--
-// Copyright 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 -->
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/BUILD.gn b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/BUILD.gn
index 997f79d5f0..ba6f6e5746 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/BUILD.gn
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
+# Copyright 2016 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -14,7 +14,10 @@ static_library("base") {
     "check.h",
     "check_op.h",
     "compiler_specific.h",
-    "cxx17_backports.h",
+    "containers/checked_iterators.h",
+    "containers/dynamic_extent.h",
+    "containers/span.h",
+    "containers/util.h",
     "debug/alias.cc",
     "debug/alias.h",
     "files/file_path.cc",
@@ -23,16 +26,19 @@ static_library("base") {
     "files/scoped_file.cc",
     "files/scoped_file.h",
     "format_macros.h",
+    "immediate_crash.h",
     "logging.cc",
     "logging.h",
-    "macros.h",
     "memory/free_deleter.h",
     "memory/page_size.h",
+    "memory/raw_ptr_exclusion.h",
     "memory/scoped_policy.h",
     "metrics/histogram_functions.h",
     "metrics/histogram_macros.h",
     "metrics/persistent_histogram_allocator.h",
     "notreached.h",
+    "numerics/basic_ops_impl.h",
+    "numerics/byte_conversions.h",
     "numerics/checked_math.h",
     "numerics/checked_math_impl.h",
     "numerics/clamped_math.h",
@@ -50,9 +56,13 @@ static_library("base") {
     "rand_util.h",
     "scoped_clear_last_error.h",
     "scoped_generic.h",
+    "strings/pattern.cc",
+    "strings/pattern.h",
+    "strings/strcat.cc",
+    "strings/strcat.h",
+    "strings/strcat_internal.h",
     "strings/string_number_conversions.cc",
     "strings/string_number_conversions.h",
-    "strings/string_piece.h",
     "strings/string_util.h",
     "strings/stringprintf.cc",
     "strings/stringprintf.h",
@@ -71,6 +81,8 @@ static_library("base") {
     "third_party/icu/icu_utf.h",
     "threading/thread_local_storage.cc",
     "threading/thread_local_storage.h",
+    "types/cxx23_to_underlying.h",
+    "types/to_address.h",
   ]
 
   if (mini_chromium_is_posix || mini_chromium_is_fuchsia) {
@@ -87,56 +99,43 @@ static_library("base") {
     ]
   }
 
-  if (mini_chromium_is_mac) {
+  if (mini_chromium_is_apple) {
     sources += [
-      "mac/close_nocancel.cc",
-      "mac/foundation_util.h",
-      "mac/foundation_util.mm",
-      "mac/mach_logging.cc",
-      "mac/mach_logging.h",
-      "mac/scoped_cftyperef.h",
-      "mac/scoped_ioobject.h",
-      "mac/scoped_launch_data.h",
-      "mac/scoped_mach_port.cc",
-      "mac/scoped_mach_port.h",
-      "mac/scoped_mach_vm.cc",
-      "mac/scoped_mach_vm.h",
-      "mac/scoped_nsautorelease_pool.h",
-      "mac/scoped_nsautorelease_pool.mm",
-      "mac/scoped_nsobject.h",
-      "mac/scoped_typeref.h",
+      "apple/bridging.h",
+      "apple/foundation_util.h",
+      "apple/foundation_util.mm",
+      "apple/mach_logging.cc",
+      "apple/mach_logging.h",
+      "apple/scoped_cftyperef.h",
+      "apple/scoped_mach_port.cc",
+      "apple/scoped_mach_port.h",
+      "apple/scoped_mach_vm.cc",
+      "apple/scoped_mach_vm.h",
+      "apple/scoped_nsautorelease_pool.h",
+      "apple/scoped_nsautorelease_pool.mm",
+      "apple/scoped_typeref.h",
       "strings/sys_string_conversions_mac.mm",
     ]
     frameworks = [
-      "ApplicationServices.framework",
       "CoreFoundation.framework",
       "Foundation.framework",
-      "IOKit.framework",
       "Security.framework",
     ]
-  } else if (mini_chromium_is_ios) {
+  }
+  if (mini_chromium_is_mac) {
     sources += [
-      "mac/foundation_util.h",
-      "mac/foundation_util.mm",
-      "mac/mach_logging.cc",
-      "mac/mach_logging.h",
-      "mac/scoped_cftyperef.h",
-      "mac/scoped_mach_port.cc",
-      "mac/scoped_mach_port.h",
-      "mac/scoped_mach_vm.cc",
-      "mac/scoped_mach_vm.h",
-      "mac/scoped_nsautorelease_pool.h",
-      "mac/scoped_nsautorelease_pool.mm",
-      "mac/scoped_nsobject.h",
-      "mac/scoped_typeref.h",
-      "strings/sys_string_conversions_mac.mm",
+      "mac/close_nocancel.cc",
+      "mac/scoped_ioobject.h",
+      "mac/scoped_launch_data.h",
     ]
-    frameworks = [
-      "CoreFoundation.framework",
+    frameworks += [
+      "ApplicationServices.framework",
+      "IOKit.framework",
+    ]
+  } else if (mini_chromium_is_ios) {
+    frameworks += [
       "CoreGraphics.framework",
       "CoreText.framework",
-      "Foundation.framework",
-      "Security.framework",
     ]
   } else if (mini_chromium_is_win) {
     sources += [
@@ -155,9 +154,9 @@ static_library("base") {
     ]
 
     if (defined(is_fuchsia_tree) && is_fuchsia_tree) {
-      deps = [ "//zircon/system/ulib/syslog" ]
+      deps = [ "//sdk/lib/syslog/cpp" ]
     } else {
-      deps = [ "//third_party/fuchsia/sdk/$host_os-amd64/pkg/syslog" ]
+      deps = [ "//third_party/fuchsia/sdk/$host_os-amd64/pkg/syslog_cpp" ]
     }
   }
 
@@ -165,6 +164,10 @@ static_library("base") {
 
   public_deps = [ "../build" ]
 
+  if (mini_chromium_is_apple) {
+    public_configs += [ "../build/config:apple_enable_arc" ]
+  }
+
   if (mini_chromium_is_android) {
     libs = [ "log" ]
   }
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/atomicops.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/atomicops.h
index 422d169175..5ecbac28da 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/atomicops.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/atomicops.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -38,7 +38,7 @@
 
 #include "build/build_config.h"
 
-#if defined(OS_WIN) && defined(ARCH_CPU_64_BITS)
+#if BUILDFLAG(IS_WIN) && defined(ARCH_CPU_64_BITS)
 // windows.h #defines this (only on x64). This causes problems because the
 // public API also uses MemoryBarrier at the public name for this fence. So, on
 // X64, undef it, and call its documented
@@ -54,9 +54,7 @@ typedef int32_t Atomic32;
 #ifdef ARCH_CPU_64_BITS
 // We need to be able to go between Atomic64 and AtomicWord implicitly.  This
 // means Atomic64 and AtomicWord should be the same type on 64-bit.
-#if defined(__ILP32__) || defined(OS_NACL)
-// NaCl's intptr_t is not actually 64-bits on 64-bit!
-// http://code.google.com/p/nativeclient/issues/detail?id=1162
+#if defined(__ILP32__)
 typedef int64_t Atomic64;
 #else
 typedef intptr_t Atomic64;
@@ -89,9 +87,6 @@ Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr, Atomic32 new_value);
 // *ptr with the increment applied.  This routine implies no memory barriers.
 Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr, Atomic32 increment);
 
-Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr,
-                                 Atomic32 increment);
-
 // These following lower-level operations are typically useful only to people
 // implementing higher-level synchronization operations like spinlocks,
 // mutexes, and condition-variables.  They combine CompareAndSwap(), a load, or
@@ -124,7 +119,6 @@ Atomic64 NoBarrier_CompareAndSwap(volatile Atomic64* ptr,
                                   Atomic64 new_value);
 Atomic64 NoBarrier_AtomicExchange(volatile Atomic64* ptr, Atomic64 new_value);
 Atomic64 NoBarrier_AtomicIncrement(volatile Atomic64* ptr, Atomic64 increment);
-Atomic64 Barrier_AtomicIncrement(volatile Atomic64* ptr, Atomic64 increment);
 
 Atomic64 Acquire_CompareAndSwap(volatile Atomic64* ptr,
                                 Atomic64 old_value,
@@ -173,7 +167,7 @@ extern struct AtomicOps_x86CPUFeatureStruct AtomicOps_Internalx86CPUFeatures;
 
 // On some platforms we need additional declarations to make
 // AtomicWord compatible with our other Atomic* types.
-#if defined(OS_APPLE) || defined(OS_OPENBSD)
+#if BUILDFLAG(IS_APPLE)
 #include "base/atomicops_internals_atomicword_compat.h"
 #endif
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/atomicops_internals_atomicword_compat.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/atomicops_internals_atomicword_compat.h
index d5b8caaf61..b5d391b56f 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/atomicops_internals_atomicword_compat.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/atomicops_internals_atomicword_compat.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2011 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -42,12 +42,6 @@ inline AtomicWord NoBarrier_AtomicIncrement(volatile AtomicWord* ptr,
       reinterpret_cast<volatile Atomic32*>(ptr), increment);
 }
 
-inline AtomicWord Barrier_AtomicIncrement(volatile AtomicWord* ptr,
-                                          AtomicWord increment) {
-  return Barrier_AtomicIncrement(
-      reinterpret_cast<volatile Atomic32*>(ptr), increment);
-}
-
 inline AtomicWord Acquire_CompareAndSwap(volatile AtomicWord* ptr,
                                          AtomicWord old_value,
                                          AtomicWord new_value) {
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/atomicops_internals_portable.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/atomicops_internals_portable.h
index db610523c1..a3bda604e6 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/atomicops_internals_portable.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/atomicops_internals_portable.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -51,13 +51,7 @@ static_assert(sizeof(*(AtomicLocation32) nullptr) == sizeof(Atomic32),
               "incompatible 32-bit atomic layout");
 
 inline void MemoryBarrier() {
-#if defined(__GLIBCXX__)
-  // Work around libstdc++ bug 51038 where atomic_thread_fence was declared but
-  // not defined, leading to the linker complaining about undefined references.
-  __atomic_thread_fence(std::memory_order_seq_cst);
-#else
   std::atomic_thread_fence(std::memory_order_seq_cst);
-#endif
 }
 
 inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr,
@@ -84,11 +78,6 @@ inline Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr,
              ->fetch_add(increment, std::memory_order_relaxed);
 }
 
-inline Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr,
-                                        Atomic32 increment) {
-  return increment + ((AtomicLocation32)ptr)->fetch_add(increment);
-}
-
 inline Atomic32 Acquire_CompareAndSwap(volatile Atomic32* ptr,
                                        Atomic32 old_value,
                                        Atomic32 new_value) {
@@ -167,11 +156,6 @@ inline Atomic64 NoBarrier_AtomicIncrement(volatile Atomic64* ptr,
              ->fetch_add(increment, std::memory_order_relaxed);
 }
 
-inline Atomic64 Barrier_AtomicIncrement(volatile Atomic64* ptr,
-                                        Atomic64 increment) {
-  return increment + ((AtomicLocation64)ptr)->fetch_add(increment);
-}
-
 inline Atomic64 Acquire_CompareAndSwap(volatile Atomic64* ptr,
                                        Atomic64 old_value,
                                        Atomic64 new_value) {
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/auto_reset.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/auto_reset.h
index 88ebbddd83..83e004d6f0 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/auto_reset.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/auto_reset.h
@@ -1,4 +1,4 @@
-// Copyright 2009 The Chromium Authors. All rights reserved.
+// Copyright 2009 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/bit_cast.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/bit_cast.h
index a93ba63ef8..b461d7d0b2 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/bit_cast.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/bit_cast.h
@@ -1,98 +1,45 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
+// Copyright 2016 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MINI_CHROMIUM_BASE_BIT_CAST_H_
 #define MINI_CHROMIUM_BASE_BIT_CAST_H_
 
-#include <string.h>
 #include <type_traits>
 
-#include "base/compiler_specific.h"
-#include "build/build_config.h"
+namespace base {
 
-// bit_cast<Dest,Source> is a template function that implements the equivalent
-// of "*reinterpret_cast<Dest*>(&source)".  We need this in very low-level
-// functions like the protobuf library and fast math support.
+// This is an equivalent to C++20's std::bit_cast<>(), but with additional
+// warnings. It morally does what `*reinterpret_cast<Dest*>(&source)` does, but
+// the cast/deref pair is undefined behavior, while bit_cast<>() isn't.
 //
-//   float f = 3.14159265358979;
-//   int i = bit_cast<int32_t>(f);
-//   // i = 0x40490fdb
-//
-// The classical address-casting method is:
-//
-//   // WRONG
-//   float f = 3.14159265358979;            // WRONG
-//   int i = * reinterpret_cast<int*>(&f);  // WRONG
-//
-// The address-casting method actually produces undefined behavior according to
-// the ISO C++98 specification, section 3.10 ("basic.lval"), paragraph 15.
-// (This did not substantially change in C++11.)  Roughly, this section says: if
-// an object in memory has one type, and a program accesses it with a different
-// type, then the result is undefined behavior for most values of "different
-// type".
-//
-// This is true for any cast syntax, either *(int*)&f or
-// *reinterpret_cast<int*>(&f).  And it is particularly true for conversions
-// between integral lvalues and floating-point lvalues.
-//
-// The purpose of this paragraph is to allow optimizing compilers to assume that
-// expressions with different types refer to different memory.  Compilers are
-// known to take advantage of this.  So a non-conforming program quietly
-// produces wildly incorrect output.
-//
-// The problem is not the use of reinterpret_cast.  The problem is type punning:
-// holding an object in memory of one type and reading its bits back using a
-// different type.
-//
-// The C++ standard is more subtle and complex than this, but that is the basic
-// idea.
-//
-// Anyways ...
-//
-// bit_cast<> calls memcpy() which is blessed by the standard, especially by the
-// example in section 3.9 .  Also, of course, bit_cast<> wraps up the nasty
-// logic in one place.
-//
-// Fortunately memcpy() is very fast.  In optimized mode, compilers replace
-// calls to memcpy() with inline object code when the size argument is a
-// compile-time constant.  On a 32-bit system, memcpy(d,s,4) compiles to one
-// load and one store, and memcpy(d,s,8) compiles to two loads and two stores.
+// This is not a magic "get out of UB free" card. This must only be used on
+// values, not on references or pointers. For pointers, use
+// reinterpret_cast<>(), and then look at https://eel.is/c++draft/basic.lval#11
+// as that's probably UB also.
 
 template <class Dest, class Source>
-inline Dest bit_cast(const Source& source) {
-  static_assert(sizeof(Dest) == sizeof(Source),
-                "bit_cast requires source and destination to be the same size");
-
-#if (__GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1) || \
-     defined(_LIBCPP_VERSION))
-  // GCC 5.1 contains the first libstdc++ with is_trivially_copyable.
-  // Assume libc++ Just Works: is_trivially_copyable added on May 13th 2011.
-  static_assert(std::is_trivially_copyable<Dest>::value,
-                "non-trivially-copyable bit_cast is undefined");
-  static_assert(std::is_trivially_copyable<Source>::value,
-                "non-trivially-copyable bit_cast is undefined");
-#elif HAS_FEATURE(is_trivially_copyable)
-  // The compiler supports an equivalent intrinsic.
-  static_assert(__is_trivially_copyable(Dest),
-                "non-trivially-copyable bit_cast is undefined");
-  static_assert(__is_trivially_copyable(Source),
-                "non-trivially-copyable bit_cast is undefined");
-#elif COMPILER_GCC
-  // Fallback to compiler intrinsic on GCC and clang (which pretends to be
-  // GCC). This isn't quite the same as is_trivially_copyable but it'll do for
-  // our purpose.
-  static_assert(__has_trivial_copy(Dest),
-                "non-trivially-copyable bit_cast is undefined");
-  static_assert(__has_trivial_copy(Source),
-                "non-trivially-copyable bit_cast is undefined");
-#else
-  // Do nothing, let the bots handle it.
-#endif
-
-  Dest dest;
-  memcpy(&dest, &source, sizeof(dest));
-  return dest;
+constexpr Dest bit_cast(const Source& source) {
+  static_assert(!std::is_pointer_v<Source>,
+                "bit_cast must not be used on pointer types");
+  static_assert(!std::is_pointer_v<Dest>,
+                "bit_cast must not be used on pointer types");
+  static_assert(!std::is_reference_v<Source>,
+                "bit_cast must not be used on reference types");
+  static_assert(!std::is_reference_v<Dest>,
+                "bit_cast must not be used on reference types");
+  static_assert(
+      sizeof(Dest) == sizeof(Source),
+      "bit_cast requires source and destination types to be the same size");
+  static_assert(std::is_trivially_copyable_v<Source>,
+                "bit_cast requires the source type to be trivially copyable");
+  static_assert(
+      std::is_trivially_copyable_v<Dest>,
+      "bit_cast requires the destination type to be trivially copyable");
+
+  return __builtin_bit_cast(Dest, source);
 }
 
+}  // namespace base
+
 #endif  // MINI_CHROMIUM_BASE_BIT_CAST_H_
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/check.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/check.h
index 90a2c0dc52..d78f70a798 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/check.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/check.h
@@ -1,4 +1,4 @@
-// Copyright 2020 The Chromium Authors. All rights reserved.
+// Copyright 2020 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/check_op.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/check_op.h
index 0f8d85b077..29757e8930 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/check_op.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/check_op.h
@@ -1,10 +1,11 @@
-// Copyright 2020 The Chromium Authors. All rights reserved.
+// Copyright 2020 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MINI_CHROMIUM_BASE_CHECK_OP_H_
 #define MINI_CHROMIUM_BASE_CHECK_OP_H_
 
+#include "base/check.h"
 #include "base/logging.h"
 
 namespace logging {
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/compiler_specific.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/compiler_specific.h
index 25e65b9549..c3eb41acdd 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/compiler_specific.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/compiler_specific.h
@@ -1,4 +1,4 @@
-// Copyright 2008 The Chromium Authors. All rights reserved.
+// Copyright 2008 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,63 +7,178 @@
 
 #include "build/build_config.h"
 
-// Annotate a variable indicating it's ok if the variable is not used.
-// (Typically used to silence a compiler warning when the assignment
-// is important for some other reason.)
-// Use like:
-//   int x = ...;
-//   ALLOW_UNUSED_LOCAL(x);
-#define ALLOW_UNUSED_LOCAL(x) false ? (void)x : (void)0
+// This is a wrapper around `__has_cpp_attribute`, which can be used to test for
+// the presence of an attribute. In case the compiler does not support this
+// macro it will simply evaluate to 0.
+//
+// References:
+// https://wg21.link/sd6#testing-for-the-presence-of-an-attribute-__has_cpp_attribute
+// https://wg21.link/cpp.cond#:__has_cpp_attribute
+#if defined(__has_cpp_attribute)
+#define HAS_CPP_ATTRIBUTE(x) __has_cpp_attribute(x)
+#else
+#define HAS_CPP_ATTRIBUTE(x) 0
+#endif
 
-// Annotate a typedef or function indicating it's ok if it's not used.
-// Use like:
-//   typedef Foo Bar ALLOW_UNUSED_TYPE;
-#if defined(COMPILER_GCC)
-#define ALLOW_UNUSED_TYPE __attribute__((unused))
+// A wrapper around `__has_attribute`, similar to HAS_CPP_ATTRIBUTE.
+#if defined(__has_attribute)
+#define HAS_ATTRIBUTE(x) __has_attribute(x)
 #else
-#define ALLOW_UNUSED_TYPE
+#define HAS_ATTRIBUTE(x) 0
 #endif
 
-// Specify memory alignment for structs, classes, etc.
+// A wrapper around `__has_builtin`, similar to HAS_CPP_ATTRIBUTE.
+#if defined(__has_builtin)
+#define HAS_BUILTIN(x) __has_builtin(x)
+#else
+#define HAS_BUILTIN(x) 0
+#endif
+
+// Annotate a function indicating it should not be inlined.
 // Use like:
-//   class ALIGNAS(16) MyClass { ... }
-//   ALIGNAS(16) int array[4];
-#if defined(COMPILER_MSVC)
-#define ALIGNAS(byte_alignment) __declspec(align(byte_alignment))
-#elif defined(COMPILER_GCC)
-#define ALIGNAS(byte_alignment) __attribute__((aligned(byte_alignment)))
+//   NOINLINE void DoStuff() { ... }
+#if defined(__clang__) && HAS_ATTRIBUTE(noinline)
+#define NOINLINE [[clang::noinline]]
+#elif defined(COMPILER_GCC) && HAS_ATTRIBUTE(noinline)
+#define NOINLINE __attribute__((noinline))
+#elif defined(COMPILER_MSVC)
+#define NOINLINE __declspec(noinline)
+#else
+#define NOINLINE
 #endif
 
-#if defined(COMPILER_MSVC)
-#define WARN_UNUSED_RESULT
+// Annotate a function indicating it should not be optimized.
+#if defined(__clang__) && HAS_ATTRIBUTE(optnone)
+#define NOOPT [[clang::optnone]]
+#elif defined(COMPILER_GCC) && HAS_ATTRIBUTE(optimize)
+#define NOOPT __attribute__((optimize(0)))
 #else
-#define WARN_UNUSED_RESULT __attribute__((warn_unused_result))
+#define NOOPT
 #endif
 
-#if defined(COMPILER_MSVC)
-#define PRINTF_FORMAT(format_param, dots_param)
+#if defined(__clang__) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline)
+#define ALWAYS_INLINE [[clang::always_inline]] inline
+#elif defined(COMPILER_GCC) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline)
+#define ALWAYS_INLINE inline __attribute__((__always_inline__))
+#elif defined(COMPILER_MSVC) && defined(NDEBUG)
+#define ALWAYS_INLINE __forceinline
 #else
+#define ALWAYS_INLINE inline
+#endif
+
+// Annotate a function indicating it should never be tail called. Useful to make
+// sure callers of the annotated function are never omitted from call-stacks.
+// To provide the complementary behavior (prevent the annotated function from
+// being omitted) look at NOINLINE. Also note that this doesn't prevent code
+// folding of multiple identical caller functions into a single signature. To
+// prevent code folding, see NO_CODE_FOLDING() in base/debug/alias.h.
+// Use like:
+//   NOT_TAIL_CALLED void FooBar();
+#if defined(__clang__) && HAS_ATTRIBUTE(not_tail_called)
+#define NOT_TAIL_CALLED [[clang::not_tail_called]]
+#else
+#define NOT_TAIL_CALLED
+#endif
+
+// In case the compiler supports it NO_UNIQUE_ADDRESS evaluates to the C++20
+// attribute [[no_unique_address]]. This allows annotating data members so that
+// they need not have an address distinct from all other non-static data members
+// of its class.
+//
+// References:
+// * https://en.cppreference.com/w/cpp/language/attributes/no_unique_address
+// * https://wg21.link/dcl.attr.nouniqueaddr
+#if defined(COMPILER_MSVC) && HAS_CPP_ATTRIBUTE(msvc::no_unique_address)
+// Unfortunately MSVC ignores [[no_unique_address]] (see
+// https://devblogs.microsoft.com/cppblog/msvc-cpp20-and-the-std-cpp20-switch/#msvc-extensions-and-abi),
+// and clang-cl matches it for ABI compatibility reasons. We need to prefer
+// [[msvc::no_unique_address]] when available if we actually want any effect.
+#define NO_UNIQUE_ADDRESS [[msvc::no_unique_address]]
+#elif HAS_CPP_ATTRIBUTE(no_unique_address)
+#define NO_UNIQUE_ADDRESS [[no_unique_address]]
+#else
+#define NO_UNIQUE_ADDRESS
+#endif
+
+// Tells the compiler a function is using a printf-style format string.
+// |format_param| is the one-based index of the format string parameter;
+// |dots_param| is the one-based index of the "..." parameter.
+// For v*printf functions (which take a va_list), pass 0 for dots_param.
+// (This is undocumented but matches what the system C headers do.)
+// For member functions, the implicit this parameter counts as index 1.
+#if (defined(COMPILER_GCC) || defined(__clang__)) && HAS_ATTRIBUTE(format)
 #define PRINTF_FORMAT(format_param, dots_param) \
-    __attribute__((format(printf, format_param, dots_param)))
+  __attribute__((format(printf, format_param, dots_param)))
+#else
+#define PRINTF_FORMAT(format_param, dots_param)
 #endif
 
 // Sanitizers annotations.
-#if defined(__has_attribute)
-#if __has_attribute(no_sanitize)
+#if HAS_ATTRIBUTE(no_sanitize)
 #define NO_SANITIZE(what) __attribute__((no_sanitize(what)))
 #endif
-#endif
 #if !defined(NO_SANITIZE)
 #define NO_SANITIZE(what)
 #endif
 
+// MemorySanitizer annotations.
+#if defined(MEMORY_SANITIZER)
+#include <sanitizer/msan_interface.h>
+
+// Mark a memory region fully initialized.
+// Use this to annotate code that deliberately reads uninitialized data, for
+// example a GC scavenging root set pointers from the stack.
+#define MSAN_UNPOISON(p, size) __msan_unpoison(p, size)
+
+// Check a memory region for initializedness, as if it was being used here.
+// If any bits are uninitialized, crash with an MSan report.
+// Use this to sanitize data which MSan won't be able to track, e.g. before
+// passing data to another process via shared memory.
+#define MSAN_CHECK_MEM_IS_INITIALIZED(p, size) \
+  __msan_check_mem_is_initialized(p, size)
+#else  // MEMORY_SANITIZER
+#define MSAN_UNPOISON(p, size)
+#define MSAN_CHECK_MEM_IS_INITIALIZED(p, size)
+#endif  // MEMORY_SANITIZER
+
+// DISABLE_CFI_PERF -- Disable Control Flow Integrity for perf reasons.
+#if !defined(DISABLE_CFI_PERF)
+#if defined(__clang__) && defined(OFFICIAL_BUILD)
+#define DISABLE_CFI_PERF NO_SANITIZE("cfi")
+#else
+#define DISABLE_CFI_PERF
+#endif
+#endif
+
 // DISABLE_CFI_ICALL -- Disable Control Flow Integrity indirect call checks.
-#if defined(OS_WIN)
+// Security Note: if you just need to allow calling of dlsym functions use
+// DISABLE_CFI_DLSYM.
+#if !defined(DISABLE_CFI_ICALL)
+#if BUILDFLAG(IS_WIN)
 // Windows also needs __declspec(guard(nocf)).
 #define DISABLE_CFI_ICALL NO_SANITIZE("cfi-icall") __declspec(guard(nocf))
 #else
 #define DISABLE_CFI_ICALL NO_SANITIZE("cfi-icall")
 #endif
+#endif
+#if !defined(DISABLE_CFI_ICALL)
+#define DISABLE_CFI_ICALL
+#endif
+
+// DISABLE_CFI_DLSYM -- applies DISABLE_CFI_ICALL on platforms where dlsym
+// functions must be called. Retains CFI checks on platforms where loaded
+// modules participate in CFI (e.g. Windows).
+#if !defined(DISABLE_CFI_DLSYM)
+#if BUILDFLAG(IS_WIN)
+// Windows modules register functions when loaded so can be checked by CFG.
+#define DISABLE_CFI_DLSYM
+#else
+#define DISABLE_CFI_DLSYM DISABLE_CFI_ICALL
+#endif
+#endif
+#if !defined(DISABLE_CFI_DLSYM)
+#define DISABLE_CFI_DLSYM
+#endif
 
 // Compiler feature-detection.
 // clang.llvm.org/docs/LanguageExtensions.html#has-feature-and-has-extension
@@ -73,13 +188,348 @@
 #define HAS_FEATURE(FEATURE) 0
 #endif
 
-// Macro for telling -Wimplicit-fallthrough that a fallthrough is intentional.
-#if __cplusplus >= 201703L  // C++17
-#define FALLTHROUGH [[fallthrough]]
-#elif defined(__clang__)
-#define FALLTHROUGH [[clang::fallthrough]]
+#if defined(COMPILER_GCC)
+#define PRETTY_FUNCTION __PRETTY_FUNCTION__
+#elif defined(COMPILER_MSVC)
+#define PRETTY_FUNCTION __FUNCSIG__
+#else
+// See https://en.cppreference.com/w/c/language/function_definition#func
+#define PRETTY_FUNCTION __func__
+#endif
+
+#if defined(__clang__) && HAS_ATTRIBUTE(uninitialized)
+// Attribute "uninitialized" disables -ftrivial-auto-var-init=pattern for
+// the specified variable.
+// Library-wide alternative is
+// 'configs -= [ "//build/config/compiler:default_init_stack_vars" ]' in .gn
+// file.
+//
+// See "init_stack_vars" in build/config/compiler/BUILD.gn and
+// http://crbug.com/977230
+// "init_stack_vars" is enabled for non-official builds and we hope to enable it
+// in official build in 2020 as well. The flag writes fixed pattern into
+// uninitialized parts of all local variables. In rare cases such initialization
+// is undesirable and attribute can be used:
+//   1. Degraded performance
+// In most cases compiler is able to remove additional stores. E.g. if memory is
+// never accessed or properly initialized later. Preserved stores mostly will
+// not affect program performance. However if compiler failed on some
+// performance critical code we can get a visible regression in a benchmark.
+//   2. memset, memcpy calls
+// Compiler may replaces some memory writes with memset or memcpy calls. This is
+// not -ftrivial-auto-var-init specific, but it can happen more likely with the
+// flag. It can be a problem if code is not linked with C run-time library.
+//
+// Note: The flag is security risk mitigation feature. So in future the
+// attribute uses should be avoided when possible. However to enable this
+// mitigation on the most of the code we need to be less strict now and minimize
+// number of exceptions later. So if in doubt feel free to use attribute, but
+// please document the problem for someone who is going to cleanup it later.
+// E.g. platform, bot, benchmark or test name in patch description or next to
+// the attribute.
+#define STACK_UNINITIALIZED [[clang::uninitialized]]
+#else
+#define STACK_UNINITIALIZED
+#endif
+
+// Attribute "no_stack_protector" disables -fstack-protector for the specified
+// function.
+//
+// "stack_protector" is enabled on most POSIX builds. The flag adds a canary
+// to each stack frame, which on function return is checked against a reference
+// canary. If the canaries do not match, it's likely that a stack buffer
+// overflow has occurred, so immediately crashing will prevent exploitation in
+// many cases.
+//
+// In some cases it's desirable to remove this, e.g. on hot functions, or if
+// we have purposely changed the reference canary.
+#if defined(COMPILER_GCC) || defined(__clang__)
+#if HAS_ATTRIBUTE(__no_stack_protector__)
+#define NO_STACK_PROTECTOR __attribute__((__no_stack_protector__))
+#else
+#define NO_STACK_PROTECTOR __attribute__((__optimize__("-fno-stack-protector")))
+#endif
+#else
+#define NO_STACK_PROTECTOR
+#endif
+
+// The ANALYZER_ASSUME_TRUE(bool arg) macro adds compiler-specific hints
+// to Clang which control what code paths are statically analyzed,
+// and is meant to be used in conjunction with assert & assert-like functions.
+// The expression is passed straight through if analysis isn't enabled.
+//
+// ANALYZER_SKIP_THIS_PATH() suppresses static analysis for the current
+// codepath and any other branching codepaths that might follow.
+#if defined(__clang_analyzer__)
+
+inline constexpr bool AnalyzerNoReturn() __attribute__((analyzer_noreturn)) {
+  return false;
+}
+
+inline constexpr bool AnalyzerAssumeTrue(bool arg) {
+  // AnalyzerNoReturn() is invoked and analysis is terminated if |arg| is
+  // false.
+  return arg || AnalyzerNoReturn();
+}
+
+#define ANALYZER_ASSUME_TRUE(arg) ::AnalyzerAssumeTrue(!!(arg))
+#define ANALYZER_SKIP_THIS_PATH() static_cast<void>(::AnalyzerNoReturn())
+
+#else  // !defined(__clang_analyzer__)
+
+#define ANALYZER_ASSUME_TRUE(arg) (arg)
+#define ANALYZER_SKIP_THIS_PATH()
+
+#endif  // defined(__clang_analyzer__)
+
+// Use nomerge attribute to disable optimization of merging multiple same calls.
+#if defined(__clang__) && HAS_ATTRIBUTE(nomerge)
+#define NOMERGE [[clang::nomerge]]
+#else
+#define NOMERGE
+#endif
+
+// Marks a type as being eligible for the "trivial" ABI despite having a
+// non-trivial destructor or copy/move constructor. Such types can be relocated
+// after construction by simply copying their memory, which makes them eligible
+// to be passed in registers. The canonical example is std::unique_ptr.
+//
+// Use with caution; this has some subtle effects on constructor/destructor
+// ordering and will be very incorrect if the type relies on its address
+// remaining constant. When used as a function argument (by value), the value
+// may be constructed in the caller's stack frame, passed in a register, and
+// then used and destructed in the callee's stack frame. A similar thing can
+// occur when values are returned.
+//
+// TRIVIAL_ABI is not needed for types which have a trivial destructor and
+// copy/move constructors, such as base::TimeTicks and other POD.
+//
+// It is also not likely to be effective on types too large to be passed in one
+// or two registers on typical target ABIs.
+//
+// See also:
+//   https://clang.llvm.org/docs/AttributeReference.html#trivial-abi
+//   https://libcxx.llvm.org/docs/DesignDocs/UniquePtrTrivialAbi.html
+#if defined(__clang__) && HAS_ATTRIBUTE(trivial_abi)
+#define TRIVIAL_ABI [[clang::trivial_abi]]
+#else
+#define TRIVIAL_ABI
+#endif
+
+// Detect whether a type is trivially relocatable, ie. a move-and-destroy
+// sequence can replaced with memmove(). This can be used to optimise the
+// implementation of containers. This is automatically true for types that were
+// defined with TRIVIAL_ABI such as scoped_refptr.
+//
+// See also:
+//   https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2023/p1144r8.html
+//   https://clang.llvm.org/docs/LanguageExtensions.html#:~:text=__is_trivially_relocatable
+#if defined(__clang__) && HAS_BUILTIN(__is_trivially_relocatable)
+#define IS_TRIVIALLY_RELOCATABLE(t) __is_trivially_relocatable(t)
+#else
+#define IS_TRIVIALLY_RELOCATABLE(t) false
+#endif
+
+// Marks a member function as reinitializing a moved-from variable.
+// See also
+// https://clang.llvm.org/extra/clang-tidy/checks/bugprone/use-after-move.html#reinitialization
+#if defined(__clang__) && HAS_ATTRIBUTE(reinitializes)
+#define REINITIALIZES_AFTER_MOVE [[clang::reinitializes]]
+#else
+#define REINITIALIZES_AFTER_MOVE
+#endif
+
+#if defined(__clang__)
+#define GSL_OWNER [[gsl::Owner]]
+#define GSL_POINTER [[gsl::Pointer]]
+#else
+#define GSL_OWNER
+#define GSL_POINTER
+#endif
+
+// Adds the "logically_const" tag to a symbol's mangled name. The "Mutable
+// Constants" check [1] detects instances of constants that aren't in .rodata,
+// e.g. due to a missing `const`. Using this tag suppresses the check for this
+// symbol, allowing it to live outside .rodata without a warning.
+//
+// [1]:
+// https://crsrc.org/c/docs/speed/binary_size/android_binary_size_trybot.md#Mutable-Constants
+#if defined(COMPILER_GCC) || defined(__clang__)
+#define LOGICALLY_CONST [[gnu::abi_tag("logically_const")]]
+#else
+#define LOGICALLY_CONST
+#endif
+
+// preserve_most clang's calling convention. Reduces register pressure for the
+// caller and as such can be used for cold calls. Support for the
+// "preserve_most" attribute is limited:
+// - 32-bit platforms do not implement it,
+// - component builds fail because _dl_runtime_resolve() clobbers registers,
+// - there are crashes on arm64 on Windows (https://crbug.com/v8/14065), which
+//   can hopefully be fixed in the future.
+// Additionally, the initial implementation in clang <= 16 overwrote the return
+// register(s) in the epilogue of a preserve_most function, so we only use
+// preserve_most in clang >= 17 (see https://reviews.llvm.org/D143425).
+// Clang only supports preserve_most on X86-64 and AArch64 for now.
+// See https://clang.llvm.org/docs/AttributeReference.html#preserve-most for
+// more details.
+#if (defined(ARCH_CPU_ARM64) || defined(ARCH_CPU_X86_64)) && \
+    !(BUILDFLAG(IS_WIN) && defined(ARCH_CPU_ARM64)) &&       \
+    !defined(COMPONENT_BUILD) && defined(__clang__) &&       \
+    __clang_major__ >= 17 && HAS_ATTRIBUTE(preserve_most)
+#define PRESERVE_MOST __attribute__((preserve_most))
+#else
+#define PRESERVE_MOST
+#endif
+
+// Mark parameters or return types as having a lifetime attached to the class.
+//
+// When used to mark a method's pointer/reference parameter, the compiler is
+// made aware that it will be stored internally in the class and the pointee
+// must outlive the class. Typically used on constructor arguments. It should
+// appear to the right of the parameter's variable name.
+//
+// Example:
+// ```
+// struct S {
+//    S(int* p LIFETIME_BOUND) : ptr_(p) {}
+//
+//    int* ptr_;
+// };
+// ```
+//
+// When used on a method with a return value, the compiler is made aware that
+// the returned type is/has a pointer to the internals of the class, and must
+// not outlive the class object. It should appear after any method qualifiers.
+//
+// Example:
+// ```
+// struct S {
+//   int* GetPtr() const LIFETIME_BOUND { return i_; };
+//
+//   int i_;
+// };
+// ```
+//
+// This allows the compiler to warn in (a limited set of) cases where the
+// pointer would otherwise be left dangling, especially in cases where the
+// pointee would be a destroyed temporary.
+//
+// Docs: https://clang.llvm.org/docs/AttributeReference.html#lifetimebound
+#if defined(__clang__)
+#define LIFETIME_BOUND [[clang::lifetimebound]]
+#else
+#define LIFETIME_BOUND
+#endif
+
+// Mark a function as pure, meaning that it does not have side effects, meaning
+// that it does not write anything external to the function's local variables
+// and return value.
+//
+// WARNING: If this attribute is mis-used it will result in UB and
+// miscompilation, as the optimizator may fold multiple calls into one and
+// reorder them inappropriately. This shouldn't appear outside of key vocabulary
+// types. It allows callers to work with the vocab type directly, and call its
+// methods without having to worry about caching things into local variables in
+// hot code.
+//
+// This attribute must not appear on functions that make use of function
+// pointers, virtual methods, or methods of templates (including operators like
+// comparison), as the "pure" function can not know what those functions do and
+// can not guarantee there will never be sideeffects.
+#if defined(COMPILER_GCC) || defined(__clang__)
+#define PURE_FUNCTION [[gnu::pure]]
+#else
+#define PURE_FUNCTION
+#endif
+
+// Functions should be marked with UNSAFE_BUFFER_USAGE when they lead to
+// out-of-bounds bugs when called with incorrect inputs.
+//
+// Ideally such functions should be paired with a safer version that works with
+// safe primitives like `base::span`. Otherwise, another safer coding pattern
+// should be documented along side the use of `UNSAFE_BUFFER_USAGE`.
+//
+// All functions marked with UNSAFE_BUFFER_USAGE should come with a safety
+// comment that explains the requirements of the function to prevent any chance
+// of an out-of-bounds bug. For example:
+// ```
+// // Function to do things between `input` and `end`.
+// //
+// // # Safety
+// // The `input` must point to an array with size at least 5. The `end` must
+// // point within the same allocation of `input` and not come before `input`.
+// ```
+#if defined(__clang__) && HAS_ATTRIBUTE(unsafe_buffer_usage)
+#define UNSAFE_BUFFER_USAGE [[clang::unsafe_buffer_usage]]
+#else
+#define UNSAFE_BUFFER_USAGE
+#endif
+
+// UNSAFE_BUFFERS() wraps code that violates the -Wunsafe-buffer-usage warning,
+// such as:
+// - pointer arithmetic,
+// - pointer subscripting, and
+// - calls to functions annotated with UNSAFE_BUFFER_USAGE.
+//
+// ** USE OF THIS MACRO SHOULD BE VERY RARE.** Reviewers should push back when
+// it is not strictly necessary. Prefer to use `base::span` instead of pointers,
+// or other safer coding patterns (like std containers) that avoid the
+// opportunity for out-of-bounds bugs to creep into the code. Any use of
+// UNSAFE_BUFFERS() can lead to a critical security bug if any assumptions are
+// wrong, or ever become wrong in the future.
+//
+// The macro should be used to wrap the minimum necessary code, to make it clear
+// what is unsafe, and prevent accidentally opting extra things out of the
+// warning.
+//
+// All usage of UNSAFE_BUFFERS() should come with a `// SAFETY: ...` comment
+// that explains how we have guaranteed (ideally directly above, with conditions
+// or CHECKs) that the pointer usage can never go out-of-bounds, or that the
+// requirements of the UNSAFE_BUFFER_USAGE function are met. If the safety
+// explanation requires cooperation of code that is not fully encapsulated close
+// to the UNSAFE_BUFFERS() usage, it should be rejected and replaced with safer
+// coding patterns or stronger guarantees.
+#if defined(__clang__) && HAS_ATTRIBUTE(unsafe_buffer_usage)
+// clang-format off
+// Formatting is off so that we can put each _Pragma on its own line, as
+// recommended by the gcc docs.
+#define UNSAFE_BUFFERS(...)                  \
+  _Pragma("clang unsafe_buffer_usage begin") \
+  __VA_ARGS__                                \
+  _Pragma("clang unsafe_buffer_usage end")
+// clang-format on
+#else
+#define UNSAFE_BUFFERS(...) __VA_ARGS__
+#endif
+
+// Defines a condition for a function to be checked at compile time if the
+// parameter's value is known at compile time. If the condition is failed, the
+// function is omitted from the overload set resolution, much like `requires`.
+//
+// If the parameter is a runtime value, then the condition is unable to be
+// checked and the function will be omitted from the overload set resolution.
+// This ensures the function can only be called with values known at compile
+// time. This is a clang extension.
+//
+// Example:
+// ```
+// void f(int a) ENABLE_IF_ATTR(a > 0) {}
+// f(1);  // Ok.
+// f(0);  // Error: no valid f() found.
+// ```
+//
+// The `ENABLE_IF_ATTR` annotation is preferred over `consteval` with a check
+// that breaks compile because metaprogramming does not observe such checks. So
+// with `consteval`, the function looks callable to concepts/type_traits but is
+// not and will fail to compile even though it reports it's usable. Whereas
+// `ENABLE_IF_ATTR` interacts correctly with metaprogramming. This is especially
+// painful for constructors. See also
+// https://github.com/chromium/subspace/issues/266.
+#if defined(__clang__)
+#define ENABLE_IF_ATTR(cond, msg) __attribute__((enable_if(cond, msg)))
 #else
-#define FALLTHROUGH
+#define ENABLE_IF_ATTR(cond, msg)
 #endif
 
 #endif  // MINI_CHROMIUM_BASE_COMPILER_SPECIFIC_H_
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/cxx17_backports.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/cxx17_backports.h
index 479a219511..e3df0224ed 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/cxx17_backports.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/cxx17_backports.h
@@ -1,4 +1,4 @@
-// Copyright 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright 2006-2008 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/debug/alias.cc b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/debug/alias.cc
index f672d2bbaa..8f61e48dda 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/debug/alias.cc
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/debug/alias.cc
@@ -1,4 +1,4 @@
-// Copyright 2011 The Chromium Authors. All rights reserved.
+// Copyright 2011 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/debug/alias.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/debug/alias.h
index 08d833a48c..5b2c7582dd 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/debug/alias.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/debug/alias.h
@@ -1,4 +1,4 @@
-// Copyright 2011 The Chromium Authors. All rights reserved.
+// Copyright 2011 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/files/file_path.cc b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/files/file_path.cc
index 517ebce5c0..0b1efff791 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/files/file_path.cc
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/files/file_path.cc
@@ -1,4 +1,4 @@
-// Copyright 2008 The Chromium Authors. All rights reserved.
+// Copyright 2008 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -6,9 +6,15 @@
 
 #include <ctype.h>
 
-#include "base/cxx17_backports.h"
+#include <ostream>
+
+#include "base/check.h"
 #include "base/logging.h"
 
+#if defined(FILE_PATH_USES_WIDE_CHARACTERS)
+#include "base/strings/utf_string_conversions.h"
+#endif  // FILE_PATH_USES_WIDE_CHARACTERS
+
 namespace base {
 
 #if defined(FILE_PATH_USES_WIN_SEPARATORS)
@@ -120,7 +126,7 @@ bool FilePath::operator!=(const FilePath& that) const {
 
 // static
 bool FilePath::IsSeparator(CharType character) {
-  for (size_t i = 0; i < size(FilePath::kSeparators) - 1; ++i) {
+  for (size_t i = 0; i < std::size(FilePath::kSeparators) - 1; ++i) {
     if (character == kSeparators[i]) {
       return true;
     }
@@ -143,9 +149,8 @@ FilePath FilePath::DirName() const {
   // resizes below using letter will still be valid.
   StringType::size_type letter = FindDriveLetter(new_path.path_);
 
-  StringType::size_type last_separator =
-      new_path.path_.find_last_of(kSeparators, StringType::npos,
-                                  size(kSeparators) - 1);
+  StringType::size_type last_separator = new_path.path_.find_last_of(
+      kSeparators, StringType::npos, std::size(kSeparators) - 1);
   if (last_separator == StringType::npos) {
     // path_ is in the current directory.
     new_path.path_.resize(letter + 1);
@@ -181,9 +186,8 @@ FilePath FilePath::BaseName() const {
 
   // Keep everything after the final separator, but if the pathname is only
   // one character and it's a separator, leave it alone.
-  StringType::size_type last_separator =
-      new_path.path_.find_last_of(kSeparators, StringType::npos,
-                                  size(kSeparators) - 1);
+  StringType::size_type last_separator = new_path.path_.find_last_of(
+      kSeparators, StringType::npos, std::size(kSeparators) - 1);
   if (last_separator != StringType::npos &&
       last_separator < new_path.path_.length() - 1) {
     new_path.path_.erase(0, last_separator + 1);
@@ -287,6 +291,10 @@ void FilePath::StripTrailingSeparatorsInternal() {
 
 }  // namespace base
 
-void PrintTo(const base::FilePath& path, std::ostream* out) {
-  *out << path.value().c_str();
+std::ostream& operator<<(std::ostream& os, const base::FilePath& file_path) {
+#ifdef FILE_PATH_USES_WIDE_CHARACTERS
+  return os << base::WideToUTF8(file_path.value());
+#else
+  return os << file_path.value();
+#endif
 }
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/files/file_path.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/files/file_path.h
index 0ac91bf873..795558374b 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/files/file_path.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/files/file_path.h
@@ -1,4 +1,4 @@
-// Copyright 2008 The Chromium Authors. All rights reserved.
+// Copyright 2008 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -107,17 +107,17 @@
 #include <iosfwd>
 #include <string>
 
-#include "base/compiler_specific.h"
 #include "build/build_config.h"
 
 // Windows-style drive letter support and pathname separator characters can be
 // enabled and disabled independently, to aid testing.  These #defines are
 // here so that the same setting can be used in both the implementation and
 // in the unit test.
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #define FILE_PATH_USES_DRIVE_LETTERS
 #define FILE_PATH_USES_WIN_SEPARATORS
-#endif  // OS_WIN
+#define FILE_PATH_USES_WIDE_CHARACTERS
+#endif  // BUILDFLAG(IS_WIN)
 
 namespace base {
 
@@ -125,16 +125,16 @@ namespace base {
 // pathnames on different platforms.
 class FilePath {
  public:
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
   // On most platforms, native pathnames are char arrays, and the encoding
   // may or may not be specified.  On Mac OS X, native pathnames are encoded
   // in UTF-8.
   typedef std::string StringType;
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   // On Windows, for Unicode-aware applications, native pathnames are wchar_t
   // arrays encoded in UTF-16.
   typedef std::wstring StringType;
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
 
   typedef StringType::value_type CharType;
 
@@ -182,21 +182,21 @@ class FilePath {
   // only contains one component, returns a FilePath identifying
   // kCurrentDirectory.  If this object already refers to the root directory,
   // returns a FilePath identifying the root directory.
-  FilePath DirName() const WARN_UNUSED_RESULT;
+  [[nodiscard]] FilePath DirName() const;
 
   // Returns a FilePath corresponding to the last path component of this
   // object, either a file or a directory.  If this object already refers to
   // the root directory, returns a FilePath identifying the root directory;
   // this is the only situation in which BaseName will return an absolute path.
-  FilePath BaseName() const WARN_UNUSED_RESULT;
+  [[nodiscard]] FilePath BaseName() const;
 
   // Returns the path's file extension. This does not have a special case for
   // common double extensions, so FinalExtension() of "foo.tar.gz" is simply
   // ".gz". If there is no extension, "" will be returned.
-  StringType FinalExtension() const WARN_UNUSED_RESULT;
+  [[nodiscard]] StringType FinalExtension() const;
 
   // Returns a FilePath with FinalExtension() removed.
-  FilePath RemoveFinalExtension() const WARN_UNUSED_RESULT;
+  [[nodiscard]] FilePath RemoveFinalExtension() const;
 
   // Returns a FilePath by appending a separator and the supplied path
   // component to this object's path.  Append takes care to avoid adding
@@ -204,8 +204,8 @@ class FilePath {
   // If this object's path is kCurrentDirectory, a new FilePath corresponding
   // only to |component| is returned.  |component| must be a relative path;
   // it is an error to pass an absolute path.
-  FilePath Append(const StringType& component) const WARN_UNUSED_RESULT;
-  FilePath Append(const FilePath& component) const WARN_UNUSED_RESULT;
+  [[nodiscard]] FilePath Append(const StringType& component) const;
+  [[nodiscard]] FilePath Append(const FilePath& component) const;
 
   // Returns true if this FilePath contains an absolute path.  On Windows, an
   // absolute path begins with either a drive letter specification followed by
@@ -226,19 +226,22 @@ class FilePath {
 
 }  // namespace base
 
-// This is required by googletest to print a readable output on test failures.
-extern void PrintTo(const base::FilePath& path, std::ostream* out);
+// Streams `file_path`'s value to a byte stream, converting from wide
+// characters if called for. (also lets googletest print a readable output on
+// test failures)
+extern std::ostream& operator<<(std::ostream& os,
+                                const base::FilePath& file_path);
 
 // Macros for string literal initialization of FilePath::CharType[], and for
 // using a FilePath::CharType[] in a printf-style format string.
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 #define FILE_PATH_LITERAL(x) x
 #define PRFilePath "s"
 #define PRFilePathLiteral "%s"
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 #define FILE_PATH_LITERAL(x) L ## x
 #define PRFilePath "ls"
 #define PRFilePathLiteral L"%ls"
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
 
 #endif  // MINI_CHROMIUM_BASE_FILES_FILE_PATH_H_
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/files/file_util.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/files/file_util.h
index 312525176b..eacd561bbd 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/files/file_util.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/files/file_util.h
@@ -1,4 +1,4 @@
-// Copyright 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright 2006-2008 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 
 #include "build/build_config.h"
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 
 #include <sys/types.h>
 
@@ -17,6 +17,6 @@ bool ReadFromFD(int fd, char* buffer, size_t bytes);
 
 }  // namespace base
 
-#endif  // OS_POSIX
+#endif  // BUILDFLAG(IS_POSIX)
 
 #endif  // MINI_CHROMIUM_BASE_FILES_FILE_UTIL_H_
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/files/file_util_posix.cc b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/files/file_util_posix.cc
index 6d3c096c88..4d554e02f0 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/files/file_util_posix.cc
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/files/file_util_posix.cc
@@ -1,4 +1,4 @@
-// Copyright 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright 2006-2008 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/files/scoped_file.cc b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/files/scoped_file.cc
index e7aa07011f..f106e59851 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/files/scoped_file.cc
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/files/scoped_file.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -8,19 +8,21 @@
 
 #include "base/logging.h"
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 #include <unistd.h>
+
+#include "base/check.h"
 #include "base/posix/eintr_wrapper.h"
 #endif
 
 namespace base {
 namespace internal {
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 void ScopedFDCloseTraits::Free(int fd) {
   PCHECK(IGNORE_EINTR(close(fd)) == 0);
 }
-#endif  // OS_POSIX
+#endif  // BUILDFLAG(IS_POSIX)
 
 void ScopedFILECloser::operator()(FILE* file) const {
   if (file) {
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/files/scoped_file.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/files/scoped_file.h
index 462f561386..1ba85ecb0a 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/files/scoped_file.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/files/scoped_file.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -16,14 +16,14 @@ namespace base {
 
 namespace internal {
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 struct ScopedFDCloseTraits {
   static int InvalidValue() {
     return -1;
   }
   static void Free(int fd);
 };
-#endif  // OS_POSIX
+#endif  // BUILDFLAG(IS_POSIX)
 
 struct ScopedFILECloser {
   void operator()(FILE* file) const;
@@ -31,9 +31,9 @@ struct ScopedFILECloser {
 
 }  // namespace internal
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 typedef ScopedGeneric<int, internal::ScopedFDCloseTraits> ScopedFD;
-#endif  // OS_POSIX
+#endif  // BUILDFLAG(IS_POSIX)
 typedef std::unique_ptr<FILE, internal::ScopedFILECloser> ScopedFILE;
 
 }  // namespace base
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/format_macros.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/format_macros.h
index 1ceb0dd311..b273a2eca1 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/format_macros.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/format_macros.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright 2009 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -23,25 +23,18 @@
 
 #include "build/build_config.h"
 
-#if defined(OS_POSIX)
-
-#if (defined(_INTTYPES_H) || defined(_INTTYPES_H_)) && !defined(PRId64)
+#if BUILDFLAG(IS_POSIX) && \
+    (defined(_INTTYPES_H) || defined(_INTTYPES_H_)) && !defined(PRId64)
 #error "inttypes.h has already been included before this header file, but "
 #error "without __STDC_FORMAT_MACROS defined."
 #endif
 
-#if !defined(__STDC_FORMAT_MACROS)
+#if BUILDFLAG(IS_POSIX) && !defined(__STDC_FORMAT_MACROS)
 #define __STDC_FORMAT_MACROS
 #endif
 
 #include <inttypes.h>
 
-// GCC will concatenate wide and narrow strings correctly, so nothing needs to
-// be done here.
-#define WidePRId64 PRId64
-#define WidePRIu64 PRIu64
-#define WidePRIx64 PRIx64
-
 #if !defined(PRIuS)
 #define PRIuS "zu"
 #endif
@@ -50,7 +43,7 @@
 // architectures and Apple does not provides standard format macros and
 // recommends casting. This has many drawbacks, so instead define macros
 // for formatting those types.
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
 #if defined(ARCH_CPU_64_BITS)
 #if !defined(PRIdNS)
 #define PRIdNS "ld"
@@ -72,30 +65,6 @@
 #define PRIxNS "x"
 #endif
 #endif
-#endif  // defined(OS_APPLE)
-
-#else  // OS_WIN
-
-#if !defined(PRId64)
-#define PRId64 "I64d"
-#endif
-
-#if !defined(PRIu64)
-#define PRIu64 "I64u"
-#endif
-
-#if !defined(PRIx64)
-#define PRIx64 "I64x"
-#endif
-
-#define WidePRId64 L"I64d"
-#define WidePRIu64 L"I64u"
-#define WidePRIx64 L"I64x"
-
-#if !defined(PRIuS)
-#define PRIuS "Iu"
-#endif
-
-#endif
+#endif  // BUILDFLAG(IS_APPLE)
 
 #endif  // BASE_FORMAT_MACROS_H_
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/fuchsia/fuchsia_logging.cc b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/fuchsia/fuchsia_logging.cc
index de30a3043c..10d881b2c7 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/fuchsia/fuchsia_logging.cc
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/fuchsia/fuchsia_logging.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Chromium Authors. All rights reserved.
+// Copyright 2017 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -8,6 +8,8 @@
 
 #include <iomanip>
 
+#include "base/immediate_crash.h"
+
 namespace logging {
 
 ZxLogMessage::ZxLogMessage(const char* function,
@@ -18,10 +20,20 @@ ZxLogMessage::ZxLogMessage(const char* function,
     : LogMessage(function, file_path, line, severity), zx_err_(zx_err) {}
 
 ZxLogMessage::~ZxLogMessage() {
+  AppendError();
+}
+
+void ZxLogMessage::AppendError() {
   // zx_status_t error values are negative, so log the numeric version as
   // decimal rather than hex. This is also useful to match zircon/errors.h for
   // grepping.
   stream() << ": " << zx_status_get_string(zx_err_) << " (" << zx_err_ << ")";
 }
 
+ZxLogMessageFatal::~ZxLogMessageFatal() {
+  AppendError();
+  Flush();
+  base::ImmediateCrash();
+}
+
 }  // namespace logging
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/fuchsia/fuchsia_logging.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/fuchsia/fuchsia_logging.h
index 50b4ed70e9..0f1e95dfd5 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/fuchsia/fuchsia_logging.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/fuchsia/fuchsia_logging.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Chromium Authors. All rights reserved.
+// Copyright 2017 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -28,10 +28,19 @@ class ZxLogMessage : public logging::LogMessage {
 
   ~ZxLogMessage();
 
+ protected:
+  void AppendError();
+
  private:
   zx_status_t zx_err_;
 };
 
+class ZxLogMessageFatal final : public ZxLogMessage {
+ public:
+  using ZxLogMessage::ZxLogMessage;
+  [[noreturn]] ~ZxLogMessageFatal() override;
+};
+
 }  // namespace logging
 
 #define ZX_LOG_STREAM(severity, zx_err) \
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/logging.cc b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/logging.cc
index 61d62e064e..7a943d4ae6 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/logging.cc
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/logging.cc
@@ -1,4 +1,4 @@
-// Copyright 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright 2006-2008 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -10,51 +10,31 @@
 #include <iomanip>
 #include <ostream>
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 #include <paths.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <unistd.h>
 #include "base/posix/safe_strerror.h"
-#endif  // OS_POSIX
-
-#if defined(OS_APPLE)
-// In macOS 10.12 and iOS 10.0 and later ASL (Apple System Log) was deprecated
-// in favor of OS_LOG (Unified Logging).
-#include <AvailabilityMacros.h>
-#if defined(OS_IOS)
-#if !defined(__IPHONE_10_0) || __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_10_0
-#define USE_ASL
-#endif
-#else  // !defined(OS_IOS)
-#if !defined(MAC_OS_X_VERSION_10_12) || \
-    MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_12
-#define USE_ASL
-#endif
-#endif  // defined(OS_IOS)
-
-#if defined(USE_ASL)
-#include <asl.h>
-#else
-#include <os/log.h>
-#endif  // USE_ASL
+#endif  // BUILDFLAG(IS_POSIX)
 
+#if BUILDFLAG(IS_APPLE)
 #include <CoreFoundation/CoreFoundation.h>
+#include <os/log.h>
 #include <pthread.h>
-
-#elif defined(OS_LINUX)
+#elif BUILDFLAG(IS_LINUX)
 #include <sys/syscall.h>
 #include <sys/types.h>
-#elif defined(OS_WIN)
-#include <intrin.h>
+#elif BUILDFLAG(IS_WIN)
 #include <windows.h>
-#elif defined(OS_ANDROID)
+#elif BUILDFLAG(IS_ANDROID)
 #include <android/log.h>
-#elif defined(OS_FUCHSIA)
-#include <lib/syslog/global.h>
+#elif BUILDFLAG(IS_FUCHSIA)
+#include <lib/syslog/cpp/log_message_impl.h>
 #endif
 
-#include "base/cxx17_backports.h"
+#include "base/check_op.h"
+#include "base/immediate_crash.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ -92,7 +72,7 @@ LogMessageHandlerFunction GetLogMessageHandler() {
   return g_log_message_handler;
 }
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 std::string SystemErrorCodeToString(unsigned long error_code) {
   wchar_t msgbuf[256];
   DWORD flags = FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS |
@@ -102,7 +82,7 @@ std::string SystemErrorCodeToString(unsigned long error_code) {
                             error_code,
                             0,
                             msgbuf,
-                            static_cast<DWORD>(base::size(msgbuf)),
+                            static_cast<DWORD>(std::size(msgbuf)),
                             nullptr);
   if (len) {
     // Most system messages end in a period and a space. Remove the space if
@@ -110,14 +90,14 @@ std::string SystemErrorCodeToString(unsigned long error_code) {
     if (len >= 1 && msgbuf[len - 1] == ' ') {
       msgbuf[len - 1] = '\0';
     }
-    return base::StringPrintf("%s (%u)",
+    return base::StringPrintf("%s (%lu)",
                               base::WideToUTF8(msgbuf).c_str(), error_code);
   }
-  return base::StringPrintf("Error %u while retrieving error %u",
+  return base::StringPrintf("Error %lu while retrieving error %lu",
                             GetLastError(),
                             error_code);
 }
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
 
 LogMessage::LogMessage(const char* function,
                        const char* file_path,
@@ -146,6 +126,10 @@ LogMessage::LogMessage(const char* function,
 }
 
 LogMessage::~LogMessage() {
+  Flush();
+}
+
+void LogMessage::Flush() {
   stream_ << std::endl;
   std::string str_newline(stream_.str());
 
@@ -161,7 +145,7 @@ LogMessage::~LogMessage() {
   }
 
   if ((g_logging_destination & LOG_TO_SYSTEM_DEBUG_LOG) != 0) {
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
     const bool log_to_system = []() {
       struct stat stderr_stat;
       if (fstat(fileno(stderr), &stderr_stat) == -1) {
@@ -206,76 +190,6 @@ LogMessage::~LogMessage() {
         }
       }
 
-#if defined(USE_ASL)
-      // Use ASL when this might run on pre-10.12 systems. Unified Logging
-      // (os_log) was introduced in 10.12.
-
-      const class ASLClient {
-       public:
-        explicit ASLClient(const char* asl_facility)
-            : client_(asl_open(nullptr, asl_facility, ASL_OPT_NO_DELAY)) {}
-
-        ASLClient(const ASLClient&) = delete;
-        ASLClient& operator=(const ASLClient&) = delete;
-
-        ~ASLClient() { asl_close(client_); }
-
-        aslclient get() const { return client_; }
-
-       private:
-        aslclient client_;
-      } asl_client(main_bundle_id ? main_bundle_id : "com.apple.console");
-
-      const class ASLMessage {
-       public:
-        ASLMessage() : message_(asl_new(ASL_TYPE_MSG)) {}
-
-        ASLMessage(const ASLMessage&) = delete;
-        ASLMessage& operator=(const ASLMessage&) = delete;
-
-        ~ASLMessage() { asl_free(message_); }
-
-        aslmsg get() const { return message_; }
-
-       private:
-        aslmsg message_;
-      } asl_message;
-
-      // By default, messages are only readable by the admin group. Explicitly
-      // make them readable by the user generating the messages.
-      char euid_string[12];
-      snprintf(euid_string, base::size(euid_string), "%d", geteuid());
-      asl_set(asl_message.get(), ASL_KEY_READ_UID, euid_string);
-
-      // Map Chrome log severities to ASL log levels.
-      const char* const asl_level_string = [](LogSeverity severity) {
-#define ASL_LEVEL_STR(level) ASL_LEVEL_STR_X(level)
-#define ASL_LEVEL_STR_X(level) #level
-        switch (severity) {
-          case LOG_INFO:
-            return ASL_LEVEL_STR(ASL_LEVEL_INFO);
-          case LOG_WARNING:
-            return ASL_LEVEL_STR(ASL_LEVEL_WARNING);
-          case LOG_ERROR:
-            return ASL_LEVEL_STR(ASL_LEVEL_ERR);
-          case LOG_FATAL:
-            return ASL_LEVEL_STR(ASL_LEVEL_CRIT);
-          default:
-            return severity < 0 ? ASL_LEVEL_STR(ASL_LEVEL_DEBUG)
-                                : ASL_LEVEL_STR(ASL_LEVEL_NOTICE);
-        }
-#undef ASL_LEVEL_STR
-#undef ASL_LEVEL_STR_X
-      }(severity_);
-      asl_set(asl_message.get(), ASL_KEY_LEVEL, asl_level_string);
-
-      asl_set(asl_message.get(), ASL_KEY_MSG, str_newline.c_str());
-
-      asl_send(asl_client.get(), asl_message.get());
-#else
-      // Use Unified Logging (os_log) when this will only run on 10.12 and
-      // later. ASL is deprecated in 10.12.
-
       const class OSLog {
        public:
         explicit OSLog(const char* subsystem)
@@ -314,11 +228,10 @@ LogMessage::~LogMessage() {
 
       os_log_with_type(
           log.get(), os_log_type, "%{public}s", str_newline.c_str());
-#endif
     }
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
     OutputDebugString(base::UTF8ToWide(str_newline).c_str());
-#elif defined(OS_ANDROID)
+#elif BUILDFLAG(IS_ANDROID)
     android_LogPriority priority =
         (severity_ < 0) ? ANDROID_LOG_VERBOSE : ANDROID_LOG_UNKNOWN;
     switch (severity_) {
@@ -337,62 +250,46 @@ LogMessage::~LogMessage() {
     }
     // The Android system may truncate the string if it's too long.
     __android_log_write(priority, "chromium", str_newline.c_str());
-#elif defined(OS_FUCHSIA)
-  fx_log_severity_t fx_severity;
-  switch (severity_) {
-    case LOG_INFO:
-      fx_severity = FX_LOG_INFO;
-      break;
-    case LOG_WARNING:
-      fx_severity = FX_LOG_WARNING;
-      break;
-    case LOG_ERROR:
-      fx_severity = FX_LOG_ERROR;
-      break;
-    case LOG_FATAL:
-      fx_severity = FX_LOG_FATAL;
-      break;
-    default:
-      fx_severity = FX_LOG_INFO;
-      break;
-  }
-  // Temporarily remove the trailing newline from |str_newline|'s C-string
-  // representation, since fx_logger will add a newline of its own.
-  str_newline.pop_back();
-  // Ideally the tag would be the same as the caller, but this is not supported
-  // right now.
-  fx_logger_log_with_source(fx_log_get_logger(), fx_severity, /*tag=*/nullptr,
-                            file_path_, line_,
-                            str_newline.c_str() + message_start_);
-  str_newline.push_back('\n');
-#endif  // OS_*
+#elif BUILDFLAG(IS_FUCHSIA)
+    fuchsia_logging::LogSeverity fx_severity;
+    switch (severity_) {
+      case LOG_INFO:
+        fx_severity = fuchsia_logging::LogSeverity::Info;
+        break;
+      case LOG_WARNING:
+        fx_severity = fuchsia_logging::LogSeverity::Warn;
+        break;
+      case LOG_ERROR:
+        fx_severity = fuchsia_logging::LogSeverity::Error;
+        break;
+      case LOG_FATAL:
+        fx_severity = fuchsia_logging::LogSeverity::Fatal;
+        break;
+      default:
+        fx_severity = fuchsia_logging::LogSeverity::Info;
+        break;
+    }
+    // Fuchsia's logger doesn't want the trailing newline.
+    std::string_view message(str_newline);
+    message.remove_suffix(1);
+    message.remove_prefix(message_start_);
+    // Ideally the tag would be the same as the caller, but this is not
+    // supported right now.
+    fuchsia_logging::LogMessage(
+        fx_severity, file_path_, line_, nullptr, nullptr)
+            .stream()
+        << message;
+#endif  // BUILDFLAG(IS_*)
   }
 
   if (severity_ == LOG_FATAL) {
-#if defined(COMPILER_MSVC)
-    __debugbreak();
-#if defined(ARCH_CPU_X86_FAMILY)
-    __ud2();
-#elif defined(ARCH_CPU_ARM64)
-    __hlt(0);
-#else
-#error Unsupported Windows Arch
-#endif
-#elif defined(ARCH_CPU_X86_FAMILY)
-    asm("int3; ud2;");
-#elif defined(ARCH_CPU_ARMEL)
-    asm("bkpt #0; udf #0;");
-#elif defined(ARCH_CPU_ARM64)
-    asm("brk #0; hlt #0;");
-#else
-    __builtin_trap();
-#endif
+    base::ImmediateCrash();
   }
 }
 
 void LogMessage::Init(const char* function) {
   std::string file_name(file_path_);
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   size_t last_slash = file_name.find_last_of("\\/");
 #else
   size_t last_slash = file_name.find_last_of('/');
@@ -401,26 +298,26 @@ void LogMessage::Init(const char* function) {
     file_name.assign(file_name.substr(last_slash + 1));
   }
 
-#if defined(OS_POSIX) && !defined(OS_FUCHSIA)
+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_FUCHSIA)
   pid_t pid = getpid();
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   DWORD pid = GetCurrentProcessId();
 #endif
 
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
   uint64_t thread;
   pthread_threadid_np(pthread_self(), &thread);
-#elif defined(OS_ANDROID)
+#elif BUILDFLAG(IS_ANDROID)
   pid_t thread = gettid();
-#elif defined(OS_LINUX)
+#elif BUILDFLAG(IS_LINUX)
   pid_t thread = static_cast<pid_t>(syscall(__NR_gettid));
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   DWORD thread = GetCurrentThreadId();
 #endif
 
   // On Fuchsia, the platform is responsible for adding the process id and
   // thread id, not the process itself.
-#if !defined(OS_FUCHSIA)
+#if !BUILDFLAG(IS_FUCHSIA)
   stream_ << '['
           << pid
           << ':'
@@ -431,7 +328,7 @@ void LogMessage::Init(const char* function) {
 
   // On Fuchsia, the platform is responsible for adding the log timestamp,
   // not the process itself.
-#if defined(OS_POSIX) && !defined(OS_FUCHSIA)
+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_FUCHSIA)
   timeval tv;
   gettimeofday(&tv, nullptr);
   tm local_time;
@@ -446,7 +343,7 @@ void LogMessage::Init(const char* function) {
           << '.'
           << std::setw(6) << tv.tv_usec
           << ':';
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   SYSTEMTIME local_time;
   GetLocalTime(&local_time);
   stream_ << std::setw(4) << local_time.wYear
@@ -465,7 +362,7 @@ void LogMessage::Init(const char* function) {
   // number when LOG_TO_SYSTEM_DEBUG_LOG is enabled, but not on
   // LOG_TO_STDERR so if LOG_TO_STDERR is enabled, print them here with
   // potentially repetition if LOG_TO_SYSTEM_DEBUG_LOG is also enabled.
-#if defined(OS_FUCHSIA)
+#if BUILDFLAG(IS_FUCHSIA)
   if ((g_logging_destination & LOG_TO_STDERR)) {
 #endif
     if (severity_ >= 0) {
@@ -479,14 +376,30 @@ void LogMessage::Init(const char* function) {
             << ':'
             << line_
             << "] ";
-#if defined(OS_FUCHSIA)
+#if BUILDFLAG(IS_FUCHSIA)
   }
 #endif
 
   message_start_ = stream_.str().size();
 }
 
-#if defined(OS_WIN)
+// We intentionally don't return from these destructors. Disable MSVC's warning
+// about the destructor never returning as we do so intentionally here.
+#if defined(_MSC_VER) && !defined(__clang__)
+#pragma warning(push)
+#pragma warning(disable : 4722)
+#endif
+
+LogMessageFatal::~LogMessageFatal() {
+  Flush();
+  base::ImmediateCrash();
+}
+
+#if defined(_MSC_VER) && !defined(__clang__)
+#pragma warning(pop)
+#endif
+
+#if BUILDFLAG(IS_WIN)
 
 unsigned long GetLastSystemErrorCode() {
   return GetLastError();
@@ -501,10 +414,31 @@ Win32ErrorLogMessage::Win32ErrorLogMessage(const char* function,
 }
 
 Win32ErrorLogMessage::~Win32ErrorLogMessage() {
+  AppendError();
+}
+
+void Win32ErrorLogMessage::AppendError() {
   stream() << ": " << SystemErrorCodeToString(err_);
 }
 
-#elif defined(OS_POSIX)
+// We intentionally don't return from these destructors. Disable MSVC's warning
+// about the destructor never returning as we do so intentionally here.
+#if defined(_MSC_VER) && !defined(__clang__)
+#pragma warning(push)
+#pragma warning(disable : 4722)
+#endif
+
+Win32ErrorLogMessageFatal::~Win32ErrorLogMessageFatal() {
+  AppendError();
+  Flush();
+  base::ImmediateCrash();
+}
+
+#if defined(_MSC_VER) && !defined(__clang__)
+#pragma warning(pop)
+#endif
+
+#elif BUILDFLAG(IS_POSIX)
 
 ErrnoLogMessage::ErrnoLogMessage(const char* function,
                                  const char* file_path,
@@ -516,6 +450,10 @@ ErrnoLogMessage::ErrnoLogMessage(const char* function,
 }
 
 ErrnoLogMessage::~ErrnoLogMessage() {
+  AppendError();
+}
+
+void ErrnoLogMessage::AppendError() {
   stream() << ": "
            << base::safe_strerror(err_)
            << " ("
@@ -523,7 +461,13 @@ ErrnoLogMessage::~ErrnoLogMessage() {
            << ")";
 }
 
-#endif  // OS_POSIX
+ErrnoLogMessageFatal::~ErrnoLogMessageFatal() {
+  AppendError();
+  Flush();
+  base::ImmediateCrash();
+}
+
+#endif  // BUILDFLAG(IS_POSIX)
 
 }  // namespace logging
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/logging.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/logging.h
index 1194bc07cc..244d6a9939 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/logging.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/logging.h
@@ -1,21 +1,17 @@
-// Copyright 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright 2006-2008 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MINI_CHROMIUM_BASE_LOGGING_H_
 #define MINI_CHROMIUM_BASE_LOGGING_H_
 
-#include <stdint.h>
-#include <assert.h>
 #include <errno.h>
+#include <stdint.h>
 
 #include <limits>
 #include <sstream>
 #include <string>
 
-#include "base/check.h"
-#include "base/check_op.h"
-#include "base/notreached.h"
 #include "build/build_config.h"
 
 namespace logging {
@@ -35,11 +31,11 @@ enum : LoggingDestination {
 
   LOG_TO_ALL = LOG_TO_FILE | LOG_TO_SYSTEM_DEBUG_LOG | LOG_TO_STDERR,
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   LOG_DEFAULT = LOG_TO_FILE,
-#elif defined(OS_FUCHSIA)
+#elif BUILDFLAG(IS_FUCHSIA)
   LOG_DEFAULT = LOG_TO_SYSTEM_DEBUG_LOG,
-#elif defined(OS_POSIX)
+#elif BUILDFLAG(IS_POSIX)
   LOG_DEFAULT = LOG_TO_SYSTEM_DEBUG_LOG | LOG_TO_STDERR,
 #endif
 };
@@ -85,12 +81,12 @@ static inline int GetVlogLevel(const char*) {
   return std::numeric_limits<int>::max();
 }
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 // This is just ::GetLastError, but out-of-line to avoid including windows.h in
 // such a widely used place.
 unsigned long GetLastSystemErrorCode();
 std::string SystemErrorCodeToString(unsigned long error_code);
-#elif defined(OS_POSIX)
+#elif BUILDFLAG(IS_POSIX)
 static inline int GetLastSystemErrorCode() {
   return errno;
 }
@@ -110,10 +106,13 @@ class LogMessage {
   LogMessage(const LogMessage&) = delete;
   LogMessage& operator=(const LogMessage&) = delete;
 
-  ~LogMessage();
+  virtual ~LogMessage();
 
   std::ostream& stream() { return stream_; }
 
+ protected:
+  void Flush();
+
  private:
   void Init(const char* function);
 
@@ -124,14 +123,13 @@ class LogMessage {
   LogSeverity severity_;
 };
 
-class LogMessageVoidify {
+class LogMessageFatal final : public LogMessage {
  public:
-  LogMessageVoidify() {}
-
-  void operator&(const std::ostream&) const {}
+  using LogMessage::LogMessage;
+  [[noreturn]] ~LogMessageFatal() override;
 };
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 class Win32ErrorLogMessage : public LogMessage {
  public:
   Win32ErrorLogMessage(const char* function,
@@ -145,10 +143,20 @@ class Win32ErrorLogMessage : public LogMessage {
 
   ~Win32ErrorLogMessage();
 
+ protected:
+  void AppendError();
+
  private:
   unsigned long err_;
 };
-#elif defined(OS_POSIX)
+
+class Win32ErrorLogMessageFatal final : public Win32ErrorLogMessage {
+ public:
+  using Win32ErrorLogMessage::Win32ErrorLogMessage;
+  [[noreturn]] ~Win32ErrorLogMessageFatal() override;
+};
+
+#elif BUILDFLAG(IS_POSIX)
 class ErrnoLogMessage : public LogMessage {
  public:
   ErrnoLogMessage(const char* function,
@@ -162,9 +170,18 @@ class ErrnoLogMessage : public LogMessage {
 
   ~ErrnoLogMessage();
 
+ protected:
+  void AppendError();
+
  private:
   int err_;
 };
+
+class ErrnoLogMessageFatal final : public ErrnoLogMessage {
+ public:
+  using ErrnoLogMessage::ErrnoLogMessage;
+  [[noreturn]] ~ErrnoLogMessageFatal() override;
+};
 #endif
 
 }  // namespace logging
@@ -188,8 +205,11 @@ class ErrnoLogMessage : public LogMessage {
     logging::ClassName(FUNCTION_SIGNATURE, __FILE__, __LINE__, \
                        logging::LOG_ERROR_REPORT, ## __VA_ARGS__)
 #define COMPACT_GOOGLE_LOG_EX_FATAL(ClassName, ...) \
-    logging::ClassName(FUNCTION_SIGNATURE, __FILE__, __LINE__, \
-                       logging::LOG_FATAL, ## __VA_ARGS__)
+  logging::ClassName##Fatal(FUNCTION_SIGNATURE,     \
+                            __FILE__,               \
+                            __LINE__,               \
+                            logging::LOG_FATAL,     \
+                            ##__VA_ARGS__)
 #define COMPACT_GOOGLE_LOG_EX_DFATAL(ClassName, ...) \
     logging::ClassName(FUNCTION_SIGNATURE, __FILE__, __LINE__, \
                        logging::LOG_DFATAL, ## __VA_ARGS__)
@@ -202,12 +222,15 @@ class ErrnoLogMessage : public LogMessage {
     COMPACT_GOOGLE_LOG_EX_ERROR(LogMessage)
 #define COMPACT_GOOGLE_LOG_ERROR_REPORT \
     COMPACT_GOOGLE_LOG_EX_ERROR_REPORT(LogMessage)
+// TODO(crbug.com/40254046): Make LOG(FATAL) understood as [[noreturn]]. See
+// Chromium or absl implementations for LogMessageFatal subclasses where the
+// destructor is annotated as [[noreturn]].
 #define COMPACT_GOOGLE_LOG_FATAL \
     COMPACT_GOOGLE_LOG_EX_FATAL(LogMessage)
 #define COMPACT_GOOGLE_LOG_DFATAL \
     COMPACT_GOOGLE_LOG_EX_DFATAL(LogMessage)
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 
 // wingdi.h defines ERROR 0. We don't want to include windows.h here, and we
 // want to allow "LOG(ERROR)", which will expand to LOG_0.
@@ -223,13 +246,22 @@ namespace logging {
 const LogSeverity LOG_0 = LOG_ERROR;
 }  // namespace logging
 
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
 
 #define LAZY_STREAM(stream, condition) \
-    !(condition) ? (void) 0 : ::logging::LogMessageVoidify() & (stream)
-
-#define LOG_IS_ON(severity) \
-    ((::logging::LOG_ ## severity) >= ::logging::GetMinLogLevel())
+  switch (0)                           \
+  case 0:                              \
+  default:                             \
+    if (!(condition))                  \
+      ;                                \
+    else                               \
+      (stream)
+
+// FATAL is always enabled and required to be resolved in compile time for
+// LOG(FATAL) to be properly understood as [[noreturn]].
+#define LOG_IS_ON(severity)                               \
+  ((::logging::LOG_##severity) == ::logging::LOG_FATAL || \
+   (::logging::LOG_##severity) >= ::logging::GetMinLogLevel())
 #define VLOG_IS_ON(verbose_level) \
     ((verbose_level) <= ::logging::GetVlogLevel(__FILE__))
 
@@ -238,14 +270,14 @@ const LogSeverity LOG_0 = LOG_ERROR;
     logging::LogMessage(FUNCTION_SIGNATURE, __FILE__, __LINE__, \
                         -verbose_level).stream()
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #define PLOG_STREAM(severity) COMPACT_GOOGLE_LOG_EX_ ## severity( \
     Win32ErrorLogMessage, ::logging::GetLastSystemErrorCode()).stream()
 #define VPLOG_STREAM(verbose_level)                                       \
     logging::Win32ErrorLogMessage(FUNCTION_SIGNATURE, __FILE__, __LINE__, \
                                   -verbose_level,                         \
                                   ::logging::GetLastSystemErrorCode()).stream()
-#elif defined(OS_POSIX)
+#elif BUILDFLAG(IS_POSIX)
 #define PLOG_STREAM(severity) COMPACT_GOOGLE_LOG_EX_ ## severity( \
     ErrnoLogMessage, ::logging::GetLastSystemErrorCode()).stream()
 #define VPLOG_STREAM(verbose_level) \
@@ -308,9 +340,6 @@ const LogSeverity LOG_0 = LOG_ERROR;
     LAZY_STREAM(VPLOG_STREAM(verbose_level), \
                 DVLOG_IS_ON(verbose_level) && (condition))
 
-#undef assert
-#define assert(condition) DLOG_ASSERT(condition)
-
 namespace std {
 ostream& operator<<(ostream& out, const u16string& str);
 }  // namespace std
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/close_nocancel.cc b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/close_nocancel.cc
index 8971e731c9..bbc255abed 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/close_nocancel.cc
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/close_nocancel.cc
@@ -1,4 +1,4 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/foundation_util.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/foundation_util.h
deleted file mode 100644
index f22cf0ae96..0000000000
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/foundation_util.h
+++ /dev/null
@@ -1,188 +0,0 @@
-// Copyright 2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_MAC_FOUNDATION_UTIL_H_
-#define MINI_CHROMIUM_BASE_MAC_FOUNDATION_UTIL_H_
-
-#include "base/logging.h"
-#include "build/build_config.h"
-
-#if defined(OS_IOS)
-#include <CoreText/CoreText.h>
-#else
-#include <ApplicationServices/ApplicationServices.h>
-#endif
-
-#if defined(__OBJC__)
-#import <Foundation/Foundation.h>
-#else  // defined(__OBJC__)
-#include <CoreFoundation/CoreFoundation.h>
-#endif  // defined(__OBJC__)
-
-#if !defined(__OBJC__)
-#define OBJC_CPP_CLASS_DECL(x) class x;
-#else  // defined(__OBJC__)
-#define OBJC_CPP_CLASS_DECL(x)
-#endif  // defined(__OBJC__)
-
-// Convert toll-free bridged CFTypes to NSTypes and vice-versa. This does not
-// autorelease |cf_val|. This is useful for the case where there is a CFType in
-// a call that expects an NSType and the compiler is complaining about const
-// casting problems.
-// The calls are used like this:
-// NSString *foo = CFToNSCast(CFSTR("Hello"));
-// CFStringRef foo2 = NSToCFCast(@"Hello");
-// The macro magic below is to enforce safe casting. It could possibly have
-// been done using template function specialization, but template function
-// specialization doesn't always work intuitively,
-// (http://www.gotw.ca/publications/mill17.htm) so the trusty combination
-// of macros and function overloading is used instead.
-
-#define CF_TO_NS_CAST_DECL(TypeCF, TypeNS) \
-OBJC_CPP_CLASS_DECL(TypeNS) \
-\
-namespace base { \
-namespace mac { \
-TypeNS* CFToNSCast(TypeCF##Ref cf_val); \
-TypeCF##Ref NSToCFCast(TypeNS* ns_val); \
-} \
-}
-#define CF_TO_NS_MUTABLE_CAST_DECL(name) \
-CF_TO_NS_CAST_DECL(CF##name, NS##name) \
-OBJC_CPP_CLASS_DECL(NSMutable##name) \
-\
-namespace base { \
-namespace mac { \
-NSMutable##name* CFToNSCast(CFMutable##name##Ref cf_val); \
-CFMutable##name##Ref NSToCFCast(NSMutable##name* ns_val); \
-} \
-}
-
-// List of toll-free bridged types taken from:
-// http://www.cocoadev.com/index.pl?TollFreeBridged
-
-CF_TO_NS_MUTABLE_CAST_DECL(Array)
-CF_TO_NS_MUTABLE_CAST_DECL(AttributedString)
-CF_TO_NS_CAST_DECL(CFCalendar, NSCalendar)
-CF_TO_NS_MUTABLE_CAST_DECL(CharacterSet)
-CF_TO_NS_MUTABLE_CAST_DECL(Data)
-CF_TO_NS_CAST_DECL(CFDate, NSDate)
-CF_TO_NS_MUTABLE_CAST_DECL(Dictionary)
-CF_TO_NS_CAST_DECL(CFError, NSError)
-CF_TO_NS_CAST_DECL(CFLocale, NSLocale)
-CF_TO_NS_CAST_DECL(CFNumber, NSNumber)
-CF_TO_NS_CAST_DECL(CFRunLoopTimer, NSTimer)
-CF_TO_NS_CAST_DECL(CFTimeZone, NSTimeZone)
-CF_TO_NS_MUTABLE_CAST_DECL(Set)
-CF_TO_NS_CAST_DECL(CFReadStream, NSInputStream)
-CF_TO_NS_CAST_DECL(CFWriteStream, NSOutputStream)
-CF_TO_NS_MUTABLE_CAST_DECL(String)
-CF_TO_NS_CAST_DECL(CFURL, NSURL)
-
-#undef CF_TO_NS_CAST_DECL
-#undef CF_TO_NS_MUTABLE_CAST_DECL
-#undef OBJC_CPP_CLASS_DECL
-
-namespace base {
-namespace mac {
-
-// CFCast<>() and CFCastStrict<>() cast a basic CFTypeRef to a more
-// specific CoreFoundation type. The compatibility of the passed
-// object is found by comparing its opaque type against the
-// requested type identifier. If the supplied object is not
-// compatible with the requested return type, CFCast<>() returns
-// NULL and CFCastStrict<>() will DCHECK. Providing a NULL pointer
-// to either variant results in NULL being returned without
-// triggering any DCHECK.
-//
-// Example usage:
-// CFNumberRef some_number = base::mac::CFCast<CFNumberRef>(
-//     CFArrayGetValueAtIndex(array, index));
-//
-// CFTypeRef hello = CFSTR("hello world");
-// CFStringRef some_string = base::mac::CFCastStrict<CFStringRef>(hello);
-
-template<typename T>
-T CFCast(const CFTypeRef& cf_val);
-
-template<typename T>
-T CFCastStrict(const CFTypeRef& cf_val);
-
-#define CF_CAST_DECL(TypeCF)                  \
-template<> TypeCF##Ref                        \
-CFCast<TypeCF##Ref>(const CFTypeRef& cf_val); \
-                                              \
-template<> TypeCF##Ref                        \
-CFCastStrict<TypeCF##Ref>(const CFTypeRef& cf_val)
-
-CF_CAST_DECL(CFArray);
-CF_CAST_DECL(CFBag);
-CF_CAST_DECL(CFBoolean);
-CF_CAST_DECL(CFData);
-CF_CAST_DECL(CFDate);
-CF_CAST_DECL(CFDictionary);
-CF_CAST_DECL(CFNull);
-CF_CAST_DECL(CFNumber);
-CF_CAST_DECL(CFSet);
-CF_CAST_DECL(CFString);
-CF_CAST_DECL(CFURL);
-CF_CAST_DECL(CFUUID);
-
-CF_CAST_DECL(CGColor);
-
-CF_CAST_DECL(CTFont);
-CF_CAST_DECL(CTRun);
-
-#if !defined(OS_IOS)
-CF_CAST_DECL(SecACL);
-CF_CAST_DECL(SecTrustedApplication);
-#endif
-
-#undef CF_CAST_DECL
-
-#if defined(__OBJC__)
-
-// ObjCCast<>() and ObjCCastStrict<>() cast a basic id to a more
-// specific (NSObject-derived) type. The compatibility of the passed
-// object is found by checking if it's a kind of the requested type
-// identifier. If the supplied object is not compatible with the
-// requested return type, ObjCCast<>() returns nil and
-// ObjCCastStrict<>() will DCHECK. Providing a nil pointer to either
-// variant results in nil being returned without triggering any DCHECK.
-//
-// The strict variant is useful when retrieving a value from a
-// collection which only has values of a specific type, e.g. an
-// NSArray of NSStrings. The non-strict variant is useful when
-// retrieving values from data that you can't fully control. For
-// example, a plist read from disk may be beyond your exclusive
-// control, so you'd only want to check that the values you retrieve
-// from it are of the expected types, but not crash if they're not.
-//
-// Example usage:
-// NSString* version = base::mac::ObjCCast<NSString>(
-//     [bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"]);
-//
-// NSString* str = base::mac::ObjCCastStrict<NSString>(
-//     [ns_arr_of_ns_strs objectAtIndex:0]);
-template<typename T>
-T* ObjCCast(id objc_val) {
-  if ([objc_val isKindOfClass:[T class]]) {
-    return reinterpret_cast<T*>(objc_val);
-  }
-  return nil;
-}
-
-template<typename T>
-T* ObjCCastStrict(id objc_val) {
-  T* rv = ObjCCast<T>(objc_val);
-  DCHECK(objc_val == nil || rv);
-  return rv;
-}
-
-#endif  // defined(__OBJC__)
-
-}  // namespace mac
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_MAC_FOUNDATION_UTIL_H_
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/foundation_util.mm b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/foundation_util.mm
deleted file mode 100644
index 790a25ae66..0000000000
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/foundation_util.mm
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright 2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/mac/foundation_util.h"
-
-#if !defined(OS_IOS)
-extern "C" {
-CFTypeID SecACLGetTypeID();
-CFTypeID SecTrustedApplicationGetTypeID();
-}  // extern "C"
-#endif
-
-namespace base {
-namespace mac {
-
-// Definitions for the corresponding CF_TO_NS_CAST_DECL macros in
-// foundation_util.h.
-#define CF_TO_NS_CAST_DEFN(TypeCF, TypeNS) \
-\
-TypeNS* CFToNSCast(TypeCF##Ref cf_val) { \
-  DCHECK(!cf_val || TypeCF##GetTypeID() == CFGetTypeID(cf_val)); \
-  TypeNS* ns_val = \
-      const_cast<TypeNS*>(reinterpret_cast<const TypeNS*>(cf_val)); \
-  return ns_val; \
-} \
-\
-TypeCF##Ref NSToCFCast(TypeNS* ns_val) { \
-  TypeCF##Ref cf_val = reinterpret_cast<TypeCF##Ref>(ns_val); \
-  DCHECK(!cf_val || TypeCF##GetTypeID() == CFGetTypeID(cf_val)); \
-  return cf_val; \
-}
-
-#define CF_TO_NS_MUTABLE_CAST_DEFN(name) \
-CF_TO_NS_CAST_DEFN(CF##name, NS##name) \
-\
-NSMutable##name* CFToNSCast(CFMutable##name##Ref cf_val) { \
-  DCHECK(!cf_val || CF##name##GetTypeID() == CFGetTypeID(cf_val)); \
-  NSMutable##name* ns_val = reinterpret_cast<NSMutable##name*>(cf_val); \
-  return ns_val; \
-} \
-\
-CFMutable##name##Ref NSToCFCast(NSMutable##name* ns_val) { \
-  CFMutable##name##Ref cf_val = \
-      reinterpret_cast<CFMutable##name##Ref>(ns_val); \
-  DCHECK(!cf_val || CF##name##GetTypeID() == CFGetTypeID(cf_val)); \
-  return cf_val; \
-}
-
-CF_TO_NS_MUTABLE_CAST_DEFN(Array)
-CF_TO_NS_MUTABLE_CAST_DEFN(AttributedString)
-CF_TO_NS_CAST_DEFN(CFCalendar, NSCalendar)
-CF_TO_NS_MUTABLE_CAST_DEFN(CharacterSet)
-CF_TO_NS_MUTABLE_CAST_DEFN(Data)
-CF_TO_NS_CAST_DEFN(CFDate, NSDate)
-CF_TO_NS_MUTABLE_CAST_DEFN(Dictionary)
-CF_TO_NS_CAST_DEFN(CFError, NSError)
-CF_TO_NS_CAST_DEFN(CFLocale, NSLocale)
-CF_TO_NS_CAST_DEFN(CFNumber, NSNumber)
-CF_TO_NS_CAST_DEFN(CFRunLoopTimer, NSTimer)
-CF_TO_NS_CAST_DEFN(CFTimeZone, NSTimeZone)
-CF_TO_NS_MUTABLE_CAST_DEFN(Set)
-CF_TO_NS_CAST_DEFN(CFReadStream, NSInputStream)
-CF_TO_NS_CAST_DEFN(CFWriteStream, NSOutputStream)
-CF_TO_NS_MUTABLE_CAST_DEFN(String)
-CF_TO_NS_CAST_DEFN(CFURL, NSURL)
-
-#undef CF_TO_NS_CAST_DEFN
-#undef CF_TO_NS_MUTABLE_CAST_DEFN
-
-#define CF_CAST_DEFN(TypeCF) \
-template<> TypeCF##Ref \
-CFCast<TypeCF##Ref>(const CFTypeRef& cf_val) { \
-  if (cf_val == NULL) { \
-    return NULL; \
-  } \
-  if (CFGetTypeID(cf_val) == TypeCF##GetTypeID()) { \
-    return (TypeCF##Ref)(cf_val); \
-  } \
-  return NULL; \
-} \
-\
-template<> TypeCF##Ref \
-CFCastStrict<TypeCF##Ref>(const CFTypeRef& cf_val) { \
-  TypeCF##Ref rv = CFCast<TypeCF##Ref>(cf_val); \
-  DCHECK(cf_val == NULL || rv); \
-  return rv; \
-}
-
-CF_CAST_DEFN(CFArray)
-CF_CAST_DEFN(CFBag)
-CF_CAST_DEFN(CFBoolean)
-CF_CAST_DEFN(CFData)
-CF_CAST_DEFN(CFDate)
-CF_CAST_DEFN(CFDictionary)
-CF_CAST_DEFN(CFNull)
-CF_CAST_DEFN(CFNumber)
-CF_CAST_DEFN(CFSet)
-CF_CAST_DEFN(CFString)
-CF_CAST_DEFN(CFURL)
-CF_CAST_DEFN(CFUUID)
-
-CF_CAST_DEFN(CGColor)
-
-CF_CAST_DEFN(CTFont)
-CF_CAST_DEFN(CTRun)
-
-#if !defined(OS_IOS)
-CF_CAST_DEFN(SecACL)
-CF_CAST_DEFN(SecTrustedApplication)
-#endif
-
-#undef CF_CAST_DEFN
-
-}  // namespace mac
-}  // namespace base
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/mach_logging.cc b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/mach_logging.cc
deleted file mode 100644
index 0411e30700..0000000000
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/mach_logging.cc
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/mac/mach_logging.h"
-
-#include <iomanip>
-#include <string>
-
-#include "base/strings/stringprintf.h"
-
-#if !defined(OS_IOS)
-#include <servers/bootstrap.h>
-#endif  // !OS_IOS
-
-namespace {
-
-std::string FormatMachErrorNumber(mach_error_t mach_err) {
-  // For the os/kern subsystem, give the error number in decimal as in
-  // <mach/kern_return.h>. Otherwise, give it in hexadecimal to make it easier
-  // to visualize the various bits. See <mach/error.h>.
-  if (mach_err >= 0 && mach_err < KERN_RETURN_MAX) {
-    return base::StringPrintf(" (%d)", mach_err);
-  }
-  return base::StringPrintf(" (0x%08x)", mach_err);
-}
-
-}  // namespace
-
-namespace logging {
-
-MachLogMessage::MachLogMessage(const char* function,
-                               const char* file_path,
-                               int line,
-                               LogSeverity severity,
-                               mach_error_t mach_err)
-    : LogMessage(function, file_path, line, severity),
-      mach_err_(mach_err) {
-}
-
-MachLogMessage::~MachLogMessage() {
-  stream() << ": "
-           << mach_error_string(mach_err_)
-           << FormatMachErrorNumber(mach_err_);
-}
-
-#if !defined(OS_IOS)
-
-BootstrapLogMessage::BootstrapLogMessage(const char* function,
-                                         const char* file_path,
-                                         int line,
-                                         LogSeverity severity,
-                                         kern_return_t bootstrap_err)
-    : LogMessage(function, file_path, line, severity),
-      bootstrap_err_(bootstrap_err) {
-}
-
-BootstrapLogMessage::~BootstrapLogMessage() {
-  stream() << ": "
-           << bootstrap_strerror(bootstrap_err_);
-
-  switch (bootstrap_err_) {
-    case BOOTSTRAP_SUCCESS:
-    case BOOTSTRAP_NOT_PRIVILEGED:
-    case BOOTSTRAP_NAME_IN_USE:
-    case BOOTSTRAP_UNKNOWN_SERVICE:
-    case BOOTSTRAP_SERVICE_ACTIVE:
-    case BOOTSTRAP_BAD_COUNT:
-    case BOOTSTRAP_NO_MEMORY:
-    case BOOTSTRAP_NO_CHILDREN: {
-      // Show known bootstrap errors in decimal because that's how they're
-      // defined in <servers/bootstrap.h>.
-      stream() << " (" << bootstrap_err_ << ")";
-      break;
-    }
-
-    default: {
-      // bootstrap_strerror passes unknown errors to mach_error_string, so
-      // format them as they would be if they were handled by
-      // MachErrorMessage.
-      stream() << FormatMachErrorNumber(bootstrap_err_);
-      break;
-    }
-  }
-}
-
-#endif  // !OS_IOS
-
-}  // namespace logging
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/mach_logging.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/mach_logging.h
deleted file mode 100644
index 20c2bb988a..0000000000
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/mach_logging.h
+++ /dev/null
@@ -1,163 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_MAC_MACH_LOGGING_H_
-#define MINI_CHROMIUM_BASE_MAC_MACH_LOGGING_H_
-
-#include <mach/mach.h>
-
-#include "base/logging.h"
-#include "build/build_config.h"
-
-// Use the MACH_LOG family of macros along with a mach_error_t (kern_return_t)
-// containing a Mach error. The error value will be decoded so that logged
-// messages explain the error.
-//
-// Use the BOOTSTRAP_LOG family of macros specifically for errors that occur
-// while interoperating with the bootstrap subsystem. These errors will first
-// be looked up as bootstrap error messages. If no match is found, they will
-// be treated as generic Mach errors, as in MACH_LOG.
-//
-// Examples:
-//
-//   kern_return_t kr = mach_timebase_info(&info);
-//   if (kr != KERN_SUCCESS) {
-//     MACH_LOG(ERROR, kr) << "mach_timebase_info";
-//   }
-//
-//   kr = vm_deallocate(task, address, size);
-//   MACH_DCHECK(kr == KERN_SUCCESS, kr) << "vm_deallocate";
-
-namespace logging {
-
-class MachLogMessage : public logging::LogMessage {
- public:
-  MachLogMessage(const char* function,
-                 const char* file_path,
-                 int line,
-                 LogSeverity severity,
-                 mach_error_t mach_err);
-
-  MachLogMessage(const MachLogMessage&) = delete;
-  MachLogMessage& operator=(const MachLogMessage&) = delete;
-
-  ~MachLogMessage();
-
- private:
-  mach_error_t mach_err_;
-};
-
-}  // namespace logging
-
-#define MACH_LOG_STREAM(severity, mach_err) \
-    COMPACT_GOOGLE_LOG_EX_ ## severity(MachLogMessage, mach_err).stream()
-#define MACH_VLOG_STREAM(verbose_level, mach_err) \
-    logging::MachLogMessage(__PRETTY_FUNCTION__, __FILE__, __LINE__, \
-                            -verbose_level, mach_err).stream()
-
-#define MACH_LOG(severity, mach_err) \
-    LAZY_STREAM(MACH_LOG_STREAM(severity, mach_err), LOG_IS_ON(severity))
-#define MACH_LOG_IF(severity, condition, mach_err) \
-    LAZY_STREAM(MACH_LOG_STREAM(severity, mach_err), \
-                LOG_IS_ON(severity) && (condition))
-
-#define MACH_VLOG(verbose_level, mach_err) \
-    LAZY_STREAM(MACH_VLOG_STREAM(verbose_level, mach_err), \
-                VLOG_IS_ON(verbose_level))
-#define MACH_VLOG_IF(verbose_level, condition, mach_err) \
-    LAZY_STREAM(MACH_VLOG_STREAM(verbose_level, mach_err), \
-                VLOG_IS_ON(verbose_level) && (condition))
-
-#define MACH_CHECK(condition, mach_err) \
-    LAZY_STREAM(MACH_LOG_STREAM(FATAL, mach_err), !(condition)) \
-    << "Check failed: " # condition << ". "
-
-#define MACH_DLOG(severity, mach_err) \
-    LAZY_STREAM(MACH_LOG_STREAM(severity, mach_err), DLOG_IS_ON(severity))
-#define MACH_DLOG_IF(severity, condition, mach_err) \
-    LAZY_STREAM(MACH_LOG_STREAM(severity, mach_err), \
-                DLOG_IS_ON(severity) && (condition))
-
-#define MACH_DVLOG(verbose_level, mach_err) \
-    LAZY_STREAM(MACH_VLOG_STREAM(verbose_level, mach_err), \
-                DVLOG_IS_ON(verbose_level))
-#define MACH_DVLOG_IF(verbose_level, condition, mach_err) \
-    LAZY_STREAM(MACH_VLOG_STREAM(verbose_level, mach_err), \
-                DVLOG_IS_ON(verbose_level) && (condition))
-
-#define MACH_DCHECK(condition, mach_err) \
-    LAZY_STREAM(MACH_LOG_STREAM(FATAL, mach_err), \
-                DCHECK_IS_ON && !(condition)) \
-    << "Check failed: " # condition << ". "
-
-#if !defined(OS_IOS)
-
-namespace logging {
-
-class BootstrapLogMessage : public logging::LogMessage {
- public:
-  BootstrapLogMessage(const char* function,
-                      const char* file_path,
-                      int line,
-                      LogSeverity severity,
-                      kern_return_t bootstrap_err);
-
-  BootstrapLogMessage(const BootstrapLogMessage&) = delete;
-  BootstrapLogMessage& operator=(const BootstrapLogMessage&) = delete;
-
-  ~BootstrapLogMessage();
-
- private:
-  kern_return_t bootstrap_err_;
-};
-
-}  // namespace logging
-
-#define BOOTSTRAP_LOG_STREAM(severity, bootstrap_err) \
-    COMPACT_GOOGLE_LOG_EX_ ## severity(BootstrapLogMessage, \
-                                       bootstrap_err).stream()
-#define BOOTSTRAP_VLOG_STREAM(verbose_level, bootstrap_err) \
-    logging::BootstrapLogMessage(__PRETTY_FUNCTION__, __FILE__, __LINE__, \
-                            -verbose_level, bootstrap_err).stream()
-
-#define BOOTSTRAP_LOG(severity, bootstrap_err) \
-    LAZY_STREAM(BOOTSTRAP_LOG_STREAM(severity, \
-                                     bootstrap_err), LOG_IS_ON(severity))
-#define BOOTSTRAP_LOG_IF(severity, condition, bootstrap_err) \
-    LAZY_STREAM(BOOTSTRAP_LOG_STREAM(severity, bootstrap_err), \
-                LOG_IS_ON(severity) && (condition))
-
-#define BOOTSTRAP_VLOG(verbose_level, bootstrap_err) \
-    LAZY_STREAM(BOOTSTRAP_VLOG_STREAM(verbose_level, bootstrap_err), \
-                VLOG_IS_ON(verbose_level))
-#define BOOTSTRAP_VLOG_IF(verbose_level, condition, bootstrap_err) \
-    LAZY_STREAM(BOOTSTRAP_VLOG_STREAM(verbose_level, bootstrap_err), \
-                VLOG_IS_ON(verbose_level) && (condition))
-
-#define BOOTSTRAP_CHECK(condition, bootstrap_err) \
-    LAZY_STREAM(BOOTSTRAP_LOG_STREAM(FATAL, bootstrap_err), !(condition)) \
-    << "Check failed: " # condition << ". "
-
-#define BOOTSTRAP_DLOG(severity, bootstrap_err) \
-    LAZY_STREAM(BOOTSTRAP_LOG_STREAM(severity, bootstrap_err), \
-                DLOG_IS_ON(severity))
-#define BOOTSTRAP_DLOG_IF(severity, condition, bootstrap_err) \
-    LAZY_STREAM(BOOTSTRAP_LOG_STREAM(severity, bootstrap_err), \
-                DLOG_IS_ON(severity) && (condition))
-
-#define BOOTSTRAP_DVLOG(verbose_level, bootstrap_err) \
-    LAZY_STREAM(BOOTSTRAP_VLOG_STREAM(verbose_level, bootstrap_err), \
-                DVLOG_IS_ON(verbose_level))
-#define BOOTSTRAP_DVLOG_IF(verbose_level, condition, bootstrap_err) \
-    LAZY_STREAM(BOOTSTRAP_VLOG_STREAM(verbose_level, bootstrap_err), \
-                DVLOG_IS_ON(verbose_level) && (condition))
-
-#define BOOTSTRAP_DCHECK(condition, bootstrap_err) \
-    LAZY_STREAM(BOOTSTRAP_LOG_STREAM(FATAL, bootstrap_err), \
-                DCHECK_IS_ON && !(condition)) \
-    << "Check failed: " # condition << ". "
-
-#endif  // !OS_IOS
-
-#endif  // MINI_CHROMIUM_BASE_MAC_MACH_LOGGING_H_
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_cftyperef.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_cftyperef.h
deleted file mode 100644
index 7ea09219ff..0000000000
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_cftyperef.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_MAC_SCOPED_CFTYPEREF_H_
-#define MINI_CHROMIUM_BASE_MAC_SCOPED_CFTYPEREF_H_
-
-#include <CoreFoundation/CoreFoundation.h>
-
-#include "base/mac/scoped_typeref.h"
-
-namespace base {
-
-namespace internal {
-
-template <typename CFT>
-struct ScopedCFTypeRefTraits {
-  static CFT InvalidValue() { return nullptr; }
-  static CFT Retain(CFT object) {
-    CFRetain(object);
-    return object;
-  }
-  static void Release(CFT object) { CFRelease(object); }
-};
-
-}  // namespace internal
-
-template <typename CFT>
-using ScopedCFTypeRef =
-    ScopedTypeRef<CFT, internal::ScopedCFTypeRefTraits<CFT>>;
-
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_MAC_SCOPED_CFTYPEREF_H_
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_ioobject.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_ioobject.h
index e653110a96..71f4b354a8 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_ioobject.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_ioobject.h
@@ -1,4 +1,4 @@
-// Copyright 2010 The Chromium Authors. All rights reserved.
+// Copyright 2010 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 
 #include <IOKit/IOKitLib.h>
 
-#include "base/mac/scoped_typeref.h"
+#include "base/apple/scoped_typeref.h"
 
 namespace base {
 namespace mac {
@@ -27,7 +27,8 @@ struct ScopedIOObjectTraits {
 }  // namespce internal
 
 template <typename IOT>
-using ScopedIOObject = ScopedTypeRef<IOT, internal::ScopedIOObjectTraits<IOT>>;
+using ScopedIOObject =
+    apple::ScopedTypeRef<IOT, internal::ScopedIOObjectTraits<IOT>>;
 
 }  // namespace mac
 }  // namespace base
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_launch_data.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_launch_data.h
index 8f8e759fc2..3961aed1b0 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_launch_data.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_launch_data.h
@@ -1,4 +1,4 @@
-// Copyright 2011 The Chromium Authors. All rights reserved.
+// Copyright 2011 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_mach_port.cc b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_mach_port.cc
deleted file mode 100644
index 4a501da05f..0000000000
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_mach_port.cc
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/mac/scoped_mach_port.h"
-
-#include "base/mac/mach_logging.h"
-
-namespace base {
-namespace mac {
-namespace internal {
-
-void SendRightTraits::Free(mach_port_t port) {
-  kern_return_t kr = mach_port_deallocate(mach_task_self(), port);
-  MACH_LOG_IF(ERROR, kr != KERN_SUCCESS, kr) << "mach_port_deallocate";
-}
-
-void ReceiveRightTraits::Free(mach_port_t port) {
-  kern_return_t kr =
-      mach_port_mod_refs(mach_task_self(), port, MACH_PORT_RIGHT_RECEIVE, -1);
-  MACH_LOG_IF(ERROR, kr != KERN_SUCCESS, kr) << "mach_port_mod_refs";
-}
-
-void PortSetTraits::Free(mach_port_t port) {
-  kern_return_t kr =
-      mach_port_mod_refs(mach_task_self(), port, MACH_PORT_RIGHT_PORT_SET, -1);
-  MACH_LOG_IF(ERROR, kr != KERN_SUCCESS, kr) << "mach_port_mod_refs";
-}
-
-}  // namespace internal
-}  // namespace mac
-}  // namespace base
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_mach_port.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_mach_port.h
deleted file mode 100644
index f7275edb68..0000000000
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_mach_port.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_MAC_SCOPED_MACH_PORT_H_
-#define MINI_CHROMIUM_BASE_MAC_SCOPED_MACH_PORT_H_
-
-#include <mach/mach.h>
-
-#include "base/scoped_generic.h"
-
-namespace base {
-namespace mac {
-
-namespace internal {
-
-struct SendRightTraits {
-  static mach_port_t InvalidValue() {
-    return MACH_PORT_NULL;
-  }
-  static void Free(mach_port_t port);
-};
-
-struct ReceiveRightTraits {
-  static mach_port_t InvalidValue() {
-    return MACH_PORT_NULL;
-  }
-  static void Free(mach_port_t port);
-};
-
-struct PortSetTraits {
-  static mach_port_t InvalidValue() {
-    return MACH_PORT_NULL;
-  }
-  static void Free(mach_port_t port);
-};
-
-}  // namespace internal
-
-using ScopedMachSendRight =
-    ScopedGeneric<mach_port_t, internal::SendRightTraits>;
-using ScopedMachReceiveRight =
-    ScopedGeneric<mach_port_t, internal::ReceiveRightTraits>;
-using ScopedMachPortSet = ScopedGeneric<mach_port_t, internal::PortSetTraits>;
-
-}  // namespace mac
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_MAC_SCOPED_MACH_PORT_H_
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_mach_vm.cc b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_mach_vm.cc
deleted file mode 100644
index 1c28d9c7c4..0000000000
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_mach_vm.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/mac/scoped_mach_vm.h"
-
-namespace base {
-namespace mac {
-
-void ScopedMachVM::reset(vm_address_t address, vm_size_t size) {
-  DCHECK(address % PAGE_SIZE == 0);
-  DCHECK(size % PAGE_SIZE == 0);
-
-  if (size_) {
-    if (address_ < address) {
-      vm_deallocate(mach_task_self(),
-                    address_,
-                    std::min(size_, address - address_));
-    }
-    if (address_ + size_ > address + size) {
-      vm_address_t deallocate_start = std::max(address_, address + size);
-      vm_deallocate(mach_task_self(),
-                    deallocate_start,
-                    address_ + size_ - deallocate_start);
-    }
-  }
-
-  address_ = address;
-  size_ = size;
-}
-
-}  // namespace mac
-}  // namespace base
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_mach_vm.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_mach_vm.h
deleted file mode 100644
index 8464e162c8..0000000000
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_mach_vm.h
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_MAC_SCOPED_MACH_VM_H_
-#define MINI_CHROMIUM_BASE_MAC_SCOPED_MACH_VM_H_
-
-#include <mach/mach.h>
-
-#include <algorithm>
-
-#include "base/logging.h"
-
-// Use ScopedMachVM to supervise ownership of pages in the current process
-// through the Mach VM subsystem. Pages allocated with vm_allocate can be
-// released when exiting a scope with ScopedMachVM.
-//
-// The Mach VM subsystem operates on a page-by-page basis, and a single VM
-// allocation managed by a ScopedMachVM object may span multiple pages. As far
-// as Mach is concerned, allocated pages may be deallocated individually. This
-// is in contrast to higher-level allocators such as malloc, where the base
-// address of an allocation implies the size of an allocated block.
-// Consequently, it is not sufficient to just pass the base address of an
-// allocation to ScopedMachVM, it also needs to know the size of the
-// allocation. To avoid any confusion, both the base address and size must
-// be page-aligned.
-//
-// When dealing with Mach VM, base addresses will naturally be page-aligned,
-// but user-specified sizes may not be. If there's a concern that a size is
-// not page-aligned, use the mach_vm_round_page macro to correct it.
-//
-// Example:
-//
-//   vm_address_t address = 0;
-//   vm_size_t size = 12345;  // This requested size is not page-aligned.
-//   kern_return_t kr =
-//       vm_allocate(mach_task_self(), &address, size, VM_FLAGS_ANYWHERE);
-//   if (kr != KERN_SUCCESS) {
-//     return false;
-//   }
-//   ScopedMachVM vm_owner(address, mach_vm_round_page(size));
-
-namespace base {
-namespace mac {
-
-class ScopedMachVM {
- public:
-  explicit ScopedMachVM(vm_address_t address = 0, vm_size_t size = 0)
-      : address_(address),
-        size_(size) {
-    DCHECK(address % PAGE_SIZE == 0);
-    DCHECK(size % PAGE_SIZE == 0);
-  }
-
-  ScopedMachVM(const ScopedMachVM&) = delete;
-  ScopedMachVM& operator=(const ScopedMachVM&) = delete;
-
-  ~ScopedMachVM() {
-    if (size_) {
-      vm_deallocate(mach_task_self(), address_, size_);
-    }
-  }
-
-  void reset(vm_address_t address = 0, vm_size_t size = 0);
-
-  vm_address_t address() const {
-    return address_;
-  }
-
-  vm_size_t size() const {
-    return size_;
-  }
-
-  void swap(ScopedMachVM& that) {
-    std::swap(address_, that.address_);
-    std::swap(size_, that.size_);
-  }
-
-  void release() {
-    address_ = 0;
-    size_ = 0;
-  }
-
- private:
-  vm_address_t address_;
-  vm_size_t size_;
-};
-
-}  // namespace mac
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_MAC_SCOPED_MACH_VM_H_
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_nsautorelease_pool.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_nsautorelease_pool.h
deleted file mode 100644
index 811d7ff88a..0000000000
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_nsautorelease_pool.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_MAC_SCOPED_NSAUTORELEASE_POOL_H_
-#define MINI_CHROMIUM_BASE_MAC_SCOPED_NSAUTORELEASE_POOL_H_
-
-#include "build/build_config.h"
-
-#if defined(OS_APPLE)
-#if defined(__OBJC__)
-@class NSAutoreleasePool;
-#else  // __OBJC__
-class NSAutoreleasePool;
-#endif  // __OBJC__
-#endif  // OS_APPLE
-
-namespace base {
-namespace mac {
-
-// On the Mac, ScopedNSAutoreleasePool allocates an NSAutoreleasePool when
-// instantiated and sends it a -drain message when destroyed.  This allows an
-// autorelease pool to be maintained in ordinary C++ code without bringing in
-// any direct Objective-C dependency.
-//
-// On other platforms, ScopedNSAutoreleasePool is an empty object with no
-// effects.  This allows it to be used directly in cross-platform code without
-// ugly #ifdefs.
-class ScopedNSAutoreleasePool {
- public:
-#if !defined(OS_APPLE)
-  ScopedNSAutoreleasePool() {}
-  void Recycle() { }
-#else  // OS_APPLE
-  ScopedNSAutoreleasePool();
-
-  ScopedNSAutoreleasePool(const ScopedNSAutoreleasePool&) = delete;
-  ScopedNSAutoreleasePool& operator=(const ScopedNSAutoreleasePool&) = delete;
-
-  ~ScopedNSAutoreleasePool();
-
-  // Clear out the pool in case its position on the stack causes it to be
-  // alive for long periods of time (such as the entire length of the app).
-  // Only use then when you're certain the items currently in the pool are
-  // no longer needed.
-  void Recycle();
- private:
-  NSAutoreleasePool* autorelease_pool_;
-#endif  // OS_APPLE
-};
-
-}  // namespace mac
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_MAC_SCOPED_NSAUTORELEASE_POOL_H_
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_nsautorelease_pool.mm b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_nsautorelease_pool.mm
deleted file mode 100644
index e8ad82cc02..0000000000
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_nsautorelease_pool.mm
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/mac/scoped_nsautorelease_pool.h"
-
-#import <Foundation/Foundation.h>
-
-#include "base/logging.h"
-
-namespace base {
-namespace mac {
-
-ScopedNSAutoreleasePool::ScopedNSAutoreleasePool()
-    : autorelease_pool_([[NSAutoreleasePool alloc] init]) {
-  DCHECK(autorelease_pool_);
-}
-
-ScopedNSAutoreleasePool::~ScopedNSAutoreleasePool() {
-  [autorelease_pool_ drain];
-}
-
-// Cycle the internal pool, allowing everything there to get cleaned up and
-// start anew.
-void ScopedNSAutoreleasePool::Recycle() {
-  [autorelease_pool_ drain];
-  autorelease_pool_ = [[NSAutoreleasePool alloc] init];
-  DCHECK(autorelease_pool_);
-}
-
-}  // namespace mac
-}  // namespace base
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_nsobject.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_nsobject.h
deleted file mode 100644
index 2e157a4a28..0000000000
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_nsobject.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_MAC_SCOPED_NSOBJECT_H_
-#define MINI_CHROMIUM_BASE_MAC_SCOPED_NSOBJECT_H_
-
-#import <Foundation/Foundation.h>
-
-#include <type_traits>
-
-#include "base/compiler_specific.h"
-#include "base/mac/scoped_typeref.h"
-
-namespace base {
-
-namespace internal {
-
-template <typename NST>
-struct ScopedNSProtocolTraits {
-  static NST InvalidValue() { return nil; }
-  static NST Retain(NST nst) { return [nst retain]; }
-  static void Release(NST nst) { [nst release]; }
-};
-
-}  // namespace internal
-
-template <typename NST>
-class scoped_nsprotocol
-    : public ScopedTypeRef<NST, internal::ScopedNSProtocolTraits<NST>> {
- public:
-  using ScopedTypeRef<NST,
-                      internal::ScopedNSProtocolTraits<NST>>::ScopedTypeRef;
-
-  NST autorelease() { return [this->release() autorelease]; }
-};
-
-template <class C>
-void swap(scoped_nsprotocol<C>& p1, scoped_nsprotocol<C>& p2) {
-  p1.swap(p2);
-}
-
-template <class C>
-bool operator==(C p1, const scoped_nsprotocol<C>& p2) {
-  return p1 == p2.get();
-}
-
-template <class C>
-bool operator!=(C p1, const scoped_nsprotocol<C>& p2) {
-  return p1 != p2.get();
-}
-
-template <typename NST>
-class scoped_nsobject : public scoped_nsprotocol<NST*> {
- public:
-  using scoped_nsprotocol<NST*>::scoped_nsprotocol;
-
-  static_assert(std::is_same<NST, NSAutoreleasePool>::value == false,
-                "Use ScopedNSAutoreleasePool instead");
-};
-
-template<>
-class scoped_nsobject<id> : public scoped_nsprotocol<id> {
- public:
-  using scoped_nsprotocol<id>::scoped_nsprotocol;
-};
-
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_MAC_SCOPED_NSOBJECT_H_
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_typeref.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_typeref.h
deleted file mode 100644
index 9f00b1a216..0000000000
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_typeref.h
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_MAC_SCOPED_TYPEREF_H_
-#define MINI_CHROMIUM_BASE_MAC_SCOPED_TYPEREF_H_
-
-#include "base/compiler_specific.h"
-#include "base/logging.h"
-#include "base/memory/scoped_policy.h"
-
-namespace base {
-
-template <typename T>
-struct ScopedTypeRefTraits;
-
-template <typename T, typename Traits = ScopedTypeRefTraits<T>>
-class ScopedTypeRef {
- public:
-  typedef T element_type;
-
-  ScopedTypeRef(
-      T object = Traits::InvalidValue(),
-      base::scoped_policy::OwnershipPolicy policy = base::scoped_policy::ASSUME)
-      : object_(object) {
-    if (object_ && policy == base::scoped_policy::RETAIN)
-      object_ = Traits::Retain(object_);
-  }
-
-  ScopedTypeRef(const ScopedTypeRef<T, Traits>& that) : object_(that.object_) {
-    if (object_)
-      object_ = Traits::Retain(object_);
-  }
-
-  ~ScopedTypeRef() {
-    if (object_)
-      Traits::Release(object_);
-  }
-
-  ScopedTypeRef& operator=(const ScopedTypeRef<T, Traits>& that) {
-    reset(that.get(), base::scoped_policy::RETAIN);
-    return *this;
-  }
-
-  T* InitializeInto() WARN_UNUSED_RESULT {
-    DCHECK(!object_);
-    return &object_;
-  }
-
-  void reset(T object = Traits::InvalidValue(),
-             base::scoped_policy::OwnershipPolicy policy =
-                 base::scoped_policy::ASSUME) {
-    if (object && policy == base::scoped_policy::RETAIN)
-      object = Traits::Retain(object);
-    if (object_)
-      Traits::Release(object_);
-    object_ = object;
-  }
-
-  bool operator==(T that) const { return object_ == that; }
-
-  bool operator!=(T that) const { return object_ != that; }
-
-  operator T() const { return object_; }
-
-  T get() const { return object_; }
-
-  void swap(ScopedTypeRef& that) {
-    T temp = that.object_;
-    that.object_ = object_;
-    object_ = temp;
-  }
-
-  T release() WARN_UNUSED_RESULT {
-    T temp = object_;
-    object_ = Traits::InvalidValue();
-    return temp;
-  }
-
- private:
-  T object_;
-};
-
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_MAC_SCOPED_TYPEREF_H_
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/macros.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/macros.h
deleted file mode 100644
index 7eb22db430..0000000000
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/macros.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_MACROS_H_
-#define MINI_CHROMIUM_BASE_MACROS_H_
-
-#include <string.h>
-#include <sys/types.h>
-
-template<typename T>
-inline void ignore_result(const T&) {
-}
-
-#endif  // MINI_CHROMIUM_BASE_MACROS_H_
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/memory/free_deleter.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/memory/free_deleter.h
index ade7ed59ab..8385581072 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/memory/free_deleter.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/memory/free_deleter.h
@@ -1,4 +1,4 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
+// Copyright 2016 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/memory/page_size.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/memory/page_size.h
index dedf331418..54841753ef 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/memory/page_size.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/memory/page_size.h
@@ -1,4 +1,4 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/memory/page_size_posix.cc b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/memory/page_size_posix.cc
index 6be176618f..eb02cb8b65 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/memory/page_size_posix.cc
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/memory/page_size_posix.cc
@@ -1,4 +1,4 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/memory/page_size_win.cc b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/memory/page_size_win.cc
index 9efd676763..d3ce6ca4e8 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/memory/page_size_win.cc
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/memory/page_size_win.cc
@@ -1,4 +1,4 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/memory/scoped_policy.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/memory/scoped_policy.h
index e86a638ab7..33cb41b513 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/memory/scoped_policy.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/memory/scoped_policy.h
@@ -1,4 +1,4 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/metrics/histogram_functions.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/metrics/histogram_functions.h
index a96cb9dc8d..f41adc4631 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/metrics/histogram_functions.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/metrics/histogram_functions.h
@@ -1,4 +1,4 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
+// Copyright 2016 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/metrics/histogram_macros.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/metrics/histogram_macros.h
index 2c5634058f..fd4f550053 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/metrics/histogram_macros.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/metrics/histogram_macros.h
@@ -1,4 +1,4 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
+// Copyright 2016 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/metrics/persistent_histogram_allocator.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/metrics/persistent_histogram_allocator.h
index 2da582b585..fc34907d50 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/metrics/persistent_histogram_allocator.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/metrics/persistent_histogram_allocator.h
@@ -1,4 +1,4 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
+// Copyright 2016 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -8,8 +8,9 @@
 #include <inttypes.h>
 #include <sys/types.h>
 
+#include <string_view>
+
 #include "base/files/file_path.h"
-#include "base/strings/string_piece.h"
 
 // This file is a non-functional stub of the Chromium base interface to allow
 // Crashpad to set up and tear down histogram storage when built against
@@ -25,11 +26,11 @@ class GlobalHistogramAllocator {
   static bool CreateWithActiveFileInDir(const base::FilePath&,
                                         size_t,
                                         uint64_t,
-                                        base::StringPiece sp) {
+                                        std::string_view sp) {
     return false;
   }
 
-  void CreateTrackingHistograms(base::StringPiece) {}
+  void CreateTrackingHistograms(std::string_view) {}
   void DeletePersistentLocation() {}
 
   static GlobalHistogramAllocator* Get() { return nullptr; }
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/notreached.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/notreached.h
index 3a3aa8c4bf..9c40c1f72b 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/notreached.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/notreached.h
@@ -1,4 +1,4 @@
-// Copyright 2020 The Chromium Authors. All rights reserved.
+// Copyright 2020 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -6,7 +6,8 @@
 #define MINI_CHROMIUM_BASE_NOTREACHED_H_
 
 #include "base/check.h"
+#include "base/logging.h"
 
-#define NOTREACHED() DCHECK(false)
+#define NOTREACHED() LOG(FATAL) << "NOTREACHED hit. "
 
 #endif  // MINI_CHROMIUM_BASE_NOTREACHED_H_
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/checked_math.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/checked_math.h
index 6b918c4277..17352b4f88 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/checked_math.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/checked_math.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Chromium Authors. All rights reserved.
+// Copyright 2017 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -61,13 +61,7 @@ class CheckedNumeric {
   // and is within the range supported by the destination type. Returns true if
   // successful and false otherwise.
   template <typename Dst>
-#if defined(__clang__) || defined(__GNUC__)
-  __attribute__((warn_unused_result))
-#elif defined(_MSC_VER)
-  _Check_return_
-#endif
-  constexpr bool
-  AssignIfValid(Dst* result) const {
+  [[nodiscard]] constexpr bool AssignIfValid(Dst* result) const {
     return BASE_NUMERICS_LIKELY(IsValid<Dst>())
                ? ((*result = static_cast<Dst>(state_.value())), true)
                : false;
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/checked_math_impl.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/checked_math_impl.h
index 6aab501a15..07e88c5b0e 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/checked_math_impl.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/checked_math_impl.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Chromium Authors. All rights reserved.
+// Copyright 2017 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/clamped_math.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/clamped_math.h
index 9a90c4ff9b..8b2c3529fa 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/clamped_math.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/clamped_math.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Chromium Authors. All rights reserved.
+// Copyright 2017 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/clamped_math_impl.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/clamped_math_impl.h
index 747228310e..5f13065881 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/clamped_math_impl.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/clamped_math_impl.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Chromium Authors. All rights reserved.
+// Copyright 2017 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/safe_conversions.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/safe_conversions.h
index fd80392329..1f1c530ca2 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/safe_conversions.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/safe_conversions.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/safe_conversions_arm_impl.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/safe_conversions_arm_impl.h
index 9ead897a78..b5f187ccb1 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/safe_conversions_arm_impl.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/safe_conversions_arm_impl.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Chromium Authors. All rights reserved.
+// Copyright 2017 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/safe_conversions_impl.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/safe_conversions_impl.h
index eeac9eeea0..53292b5640 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/safe_conversions_impl.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/safe_conversions_impl.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -72,8 +72,9 @@ constexpr typename std::make_signed<T>::type ConditionalNegate(
   static_assert(std::is_integral<T>::value, "Type must be integral");
   using SignedT = typename std::make_signed<T>::type;
   using UnsignedT = typename std::make_unsigned<T>::type;
-  return static_cast<SignedT>(
-      (static_cast<UnsignedT>(x) ^ -SignedT(is_negative)) + is_negative);
+  return static_cast<SignedT>((static_cast<UnsignedT>(x) ^
+                               static_cast<UnsignedT>(-SignedT(is_negative))) +
+                              is_negative);
 }
 
 // This performs a safe, absolute value via unsigned overflow.
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/safe_math.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/safe_math.h
index 81667c887b..d0b38e40d0 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/safe_math.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/safe_math.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/safe_math_arm_impl.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/safe_math_arm_impl.h
index 07baa46d83..af9ff95bc3 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/safe_math_arm_impl.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/safe_math_arm_impl.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Chromium Authors. All rights reserved.
+// Copyright 2017 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/safe_math_clang_gcc_impl.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/safe_math_clang_gcc_impl.h
index b5eaffc1cf..d4ecef018b 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/safe_math_clang_gcc_impl.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/safe_math_clang_gcc_impl.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Chromium Authors. All rights reserved.
+// Copyright 2017 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/safe_math_shared_impl.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/safe_math_shared_impl.h
index 86fb9a674d..ce4aada5ed 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/safe_math_shared_impl.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/safe_math_shared_impl.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Chromium Authors. All rights reserved.
+// Copyright 2017 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/posix/eintr_wrapper.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/posix/eintr_wrapper.h
index 3b1d6d3f66..0d54bd0f5b 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/posix/eintr_wrapper.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/posix/eintr_wrapper.h
@@ -1,4 +1,4 @@
-// Copyright 2009 The Chromium Authors. All rights reserved.
+// Copyright 2009 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -13,7 +13,7 @@
 #include "build/build_config.h"
 
 // On Fuchsia, these wrapper macros do nothing because there are no signals.
-#if defined(OS_POSIX) && !defined(OS_FUCHSIA)
+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_FUCHSIA)
 
 #include <errno.h>
 
@@ -41,6 +41,6 @@
 #define HANDLE_EINTR(x) (x)
 #define IGNORE_EINTR(x) (x)
 
-#endif  // OS_POSIX && !OS_FUCHSIA
+#endif  // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_FUCHSIA)
 
 #endif  // MINI_CHROMIUM_BASE_POSIX_EINTR_WRAPPER_H_
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/posix/safe_strerror.cc b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/posix/safe_strerror.cc
index f39495c638..fe4eca69e5 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/posix/safe_strerror.cc
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/posix/safe_strerror.cc
@@ -1,4 +1,4 @@
-// Copyright 2009 The Chromium Authors. All rights reserved.
+// Copyright 2009 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -8,10 +8,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "base/cxx17_backports.h"
 #include "build/build_config.h"
 
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
 #include <android/api-level.h>
 #endif
 
@@ -19,7 +18,7 @@ namespace base {
 
 void safe_strerror_r(int err, char* buf, size_t len) {
 #if defined(__GLIBC__) || \
-   (defined(OS_ANDROID) && defined(_GNU_SOURCE) && __ANDROID_API__ >= 23)
+    (BUILDFLAG(IS_ANDROID) && defined(_GNU_SOURCE) && __ANDROID_API__ >= 23)
   char* ret = strerror_r(err, buf, len);
   if (ret != buf) {
     snprintf(buf, len, "%s", ret);
@@ -38,7 +37,7 @@ void safe_strerror_r(int err, char* buf, size_t len) {
 
 std::string safe_strerror(int err) {
   char buf[256];
-  safe_strerror_r(err, buf, size(buf));
+  safe_strerror_r(err, buf, std::size(buf));
   return std::string(buf);
 }
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/posix/safe_strerror.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/posix/safe_strerror.h
index 206f5e83ee..1846634134 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/posix/safe_strerror.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/posix/safe_strerror.h
@@ -1,4 +1,4 @@
-// Copyright 2009 The Chromium Authors. All rights reserved.
+// Copyright 2009 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/process/memory.cc b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/process/memory.cc
index 4cee1f2d09..54b9fe8874 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/process/memory.cc
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/process/memory.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/process/memory.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/process/memory.h
index fca87456c9..1dc8aeadba 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/process/memory.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/process/memory.h
@@ -1,4 +1,4 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,15 +7,12 @@
 
 #include <stddef.h>
 
-#include "base/compiler_specific.h"
-
 namespace base {
 
 // Special allocator function for callers that want to check for OOM.
 // On success, *result will contain a pointer that should be dallocated with
 // free().
-WARN_UNUSED_RESULT bool UncheckedMalloc(size_t size,
-                                        void** result);
+[[nodiscard]] bool UncheckedMalloc(size_t size, void** result);
 
 }  // namespace base
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/rand_util.cc b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/rand_util.cc
index ae5cdbfb19..08086b6d4c 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/rand_util.cc
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/rand_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2008 The Chromium Authors. All rights reserved.
+// Copyright 2008 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -11,16 +11,16 @@
 #include <cmath>
 #include <limits>
 
+#include "base/check_op.h"
 #include "base/files/file_util.h"
-#include "base/logging.h"
 #include "build/build_config.h"
 
-#if defined(OS_FUCHSIA)
+#if BUILDFLAG(IS_FUCHSIA)
 #include <zircon/syscalls.h>
 #include "base/fuchsia/fuchsia_logging.h"
-#elif defined(OS_POSIX)
+#elif BUILDFLAG(IS_POSIX)
 #include "base/posix/eintr_wrapper.h"
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 #include <windows.h>
 
 // #define needed to link in RtlGenRandom(), a.k.a. SystemFunction036.  See the
@@ -30,9 +30,9 @@
 #include <NTSecAPI.h>
 #undef SystemFunction036
 
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
 
-#if defined(OS_POSIX) && !defined(OS_FUCHSIA)
+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_FUCHSIA)
 
 namespace {
 
@@ -49,13 +49,13 @@ int GetUrandomFD() {
 
 }  // namespace
 
-#endif  // OS_POSIX && !OS_FUCHSIA
+#endif  // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_FUCHSIA)
 
 namespace base {
 
 uint64_t RandUint64() {
   uint64_t number;
-  RandBytes(&number, sizeof(number));
+  RandBytes(byte_span_from_ref(number));
   return number;
 }
 
@@ -104,27 +104,26 @@ double RandDouble() {
   return result;
 }
 
-void RandBytes(void* output, size_t output_length) {
-  if (output_length == 0) {
+void RandBytes(span<uint8_t> output) {
+  if (output.empty()) {
     return;
   }
 
-#if defined(OS_FUCHSIA)
-  zx_cprng_draw(output, output_length);
-#elif defined(OS_POSIX)
+#if BUILDFLAG(IS_FUCHSIA)
+  zx_cprng_draw(output.data(), output.size());
+#elif BUILDFLAG(IS_POSIX)
   int fd = GetUrandomFD();
-  bool success = ReadFromFD(fd, static_cast<char*>(output), output_length);
+  bool success =
+      ReadFromFD(fd, reinterpret_cast<char*>(output.data()), output.size());
   CHECK(success);
-#elif defined(OS_WIN)
-  char* output_ptr = static_cast<char*>(output);
-  while (output_length > 0) {
+#elif BUILDFLAG(IS_WIN)
+  while (!output.empty()) {
     const ULONG output_bytes_this_pass = static_cast<ULONG>(std::min(
-        output_length, static_cast<size_t>(std::numeric_limits<ULONG>::max())));
+        output.size(), static_cast<size_t>(std::numeric_limits<ULONG>::max())));
     const bool success =
-        RtlGenRandom(output_ptr, output_bytes_this_pass) != FALSE;
+        RtlGenRandom(output.data(), output_bytes_this_pass) != FALSE;
     CHECK(success);
-    output_length -= output_bytes_this_pass;
-    output_ptr += output_bytes_this_pass;
+    output = output.subspan(output_bytes_this_pass);
   }
 #endif
 }
@@ -135,7 +134,7 @@ std::string RandBytesAsString(size_t length) {
   }
 
   std::string result(length, std::string::value_type());
-  RandBytes(&result[0], length);
+  RandBytes(as_writable_byte_span(result));
   return result;
 }
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/rand_util.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/rand_util.h
index 21ece1bec6..c4225214d2 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/rand_util.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/rand_util.h
@@ -1,4 +1,4 @@
-// Copyright 2008 The Chromium Authors. All rights reserved.
+// Copyright 2008 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -9,6 +9,8 @@
 
 #include <string>
 
+#include "base/containers/span.h"
+
 namespace base {
 
 uint64_t RandUint64();
@@ -19,7 +21,7 @@ uint64_t RandGenerator(uint64_t range);
 
 double RandDouble();
 
-void RandBytes(void* output, size_t output_length);
+void RandBytes(span<uint8_t> output);
 std::string RandBytesAsString(size_t length);
 
 }  // namespace base
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/scoped_clear_last_error.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/scoped_clear_last_error.h
index acc256844f..ee4ae9fe3d 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/scoped_clear_last_error.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/scoped_clear_last_error.h
@@ -1,4 +1,4 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
+// Copyright 2018 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -24,7 +24,7 @@ class ScopedClearLastErrorBase {
   const int last_errno_;
 };
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 
 class ScopedClearLastError : public ScopedClearLastErrorBase {
  public:
@@ -39,11 +39,11 @@ class ScopedClearLastError : public ScopedClearLastErrorBase {
   const unsigned long last_system_error_;
 };
 
-#elif defined(OS_POSIX) || defined(OS_FUCHSIA)
+#elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
 
 using ScopedClearLastError = ScopedClearLastErrorBase;
 
-#endif  // defined(OS_WIN)
+#endif  // BUILDFLAG(IS_WIN)
 
 }  // namespace base
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/scoped_clear_last_error_win.cc b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/scoped_clear_last_error_win.cc
index 18ebd6997d..c35de6f642 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/scoped_clear_last_error_win.cc
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/scoped_clear_last_error_win.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
+// Copyright 2018 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/scoped_generic.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/scoped_generic.h
index 062ae1b47e..b5e632125b 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/scoped_generic.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/scoped_generic.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -9,8 +9,6 @@
 
 #include <algorithm>
 
-#include "base/compiler_specific.h"
-
 namespace base {
 
 template<typename T, typename Traits>
@@ -63,7 +61,7 @@ class ScopedGeneric {
     swap(data_.generic, other.data_.generic);
   }
 
-  element_type release() WARN_UNUSED_RESULT {
+  [[nodiscard]] element_type release() {
     element_type old_generic = data_.generic;
     data_.generic = traits_type::InvalidValue();
     return old_generic;
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_number_conversions.cc b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_number_conversions.cc
index 30c278ca46..f46f04b03e 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_number_conversions.cc
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_number_conversions.cc
@@ -1,4 +1,4 @@
-// Copyright 2010 The Chromium Authors. All rights reserved.
+// Copyright 2010 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -8,6 +8,7 @@
 #include <stdint.h>
 
 #include <limits>
+#include <string_view>
 
 namespace base {
 
@@ -185,25 +186,27 @@ class BaseIteratorRangeToNumberTraits {
   static constexpr int kBase = BASE;
 };
 
-typedef BaseIteratorRangeToNumberTraits<StringPiece::const_iterator, int, 10>
+typedef BaseIteratorRangeToNumberTraits<std::string_view::const_iterator,
+                                        int,
+                                        10>
     IteratorRangeToIntTraits;
 
-typedef BaseIteratorRangeToNumberTraits<StringPiece::const_iterator,
-                                       unsigned int,
-                                       10>
+typedef BaseIteratorRangeToNumberTraits<std::string_view::const_iterator,
+                                        unsigned int,
+                                        10>
     IteratorRangeToUintTraits;
 
-typedef BaseIteratorRangeToNumberTraits<StringPiece::const_iterator,
+typedef BaseIteratorRangeToNumberTraits<std::string_view::const_iterator,
                                         int64_t,
                                         10>
     IteratorRangeToInt64Traits;
 
-typedef BaseIteratorRangeToNumberTraits<StringPiece::const_iterator,
+typedef BaseIteratorRangeToNumberTraits<std::string_view::const_iterator,
                                         uint64_t,
                                         10>
     IteratorRangeToUint64Traits;
 
-typedef BaseIteratorRangeToNumberTraits<StringPiece::const_iterator,
+typedef BaseIteratorRangeToNumberTraits<std::string_view::const_iterator,
                                         size_t,
                                         10>
     IteratorRangeToSizeTTraits;
@@ -217,39 +220,39 @@ class BaseHexIteratorRangeToIntTraits
   }
 };
 
-typedef BaseHexIteratorRangeToIntTraits<StringPiece::const_iterator>
+typedef BaseHexIteratorRangeToIntTraits<std::string_view::const_iterator>
     HexIteratorRangeToIntTraits;
 
 }  // namespace
 
-bool StringToInt(const StringPiece& input, int* output) {
+bool StringToInt(std::string_view input, int* output) {
   return IteratorRangeToNumber<IteratorRangeToIntTraits>::Invoke(input.begin(),
                                                                  input.end(),
                                                                  output);
 }
 
-bool StringToUint(const StringPiece& input, unsigned int* output) {
+bool StringToUint(std::string_view input, unsigned int* output) {
   return IteratorRangeToNumber<IteratorRangeToUintTraits>::Invoke(input.begin(),
                                                                   input.end(),
                                                                   output);
 }
 
-bool StringToInt64(const StringPiece& input, int64_t* output) {
+bool StringToInt64(std::string_view input, int64_t* output) {
   return IteratorRangeToNumber<IteratorRangeToInt64Traits>::Invoke(
       input.begin(), input.end(), output);
 }
 
-bool StringToUint64(const StringPiece& input, uint64_t* output) {
+bool StringToUint64(std::string_view input, uint64_t* output) {
   return IteratorRangeToNumber<IteratorRangeToUint64Traits>::Invoke(
       input.begin(), input.end(), output);
 }
 
-bool StringToSizeT(const StringPiece& input, size_t* output) {
+bool StringToSizeT(std::string_view input, size_t* output) {
   return IteratorRangeToNumber<IteratorRangeToSizeTTraits>::Invoke(
       input.begin(), input.end(), output);
 }
 
-bool HexStringToInt(const StringPiece& input, int* output) {
+bool HexStringToInt(std::string_view input, int* output) {
   return IteratorRangeToNumber<HexIteratorRangeToIntTraits>::Invoke(
       input.begin(), input.end(), output);
 }
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_number_conversions.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_number_conversions.h
index 8f9911f920..989b7abd06 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_number_conversions.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_number_conversions.h
@@ -1,4 +1,4 @@
-// Copyright 2010 The Chromium Authors. All rights reserved.
+// Copyright 2010 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -8,19 +8,18 @@
 #include <stdint.h>
 
 #include <string>
+#include <string_view>
 #include <vector>
 
-#include "base/strings/string_piece.h"
-
 namespace base {
 
-bool StringToInt(const StringPiece& input, int* output);
-bool StringToUint(const StringPiece& input, unsigned int* output);
-bool StringToInt64(const StringPiece& input, int64_t* output);
-bool StringToUint64(const StringPiece& input, uint64_t* output);
-bool StringToSizeT(const StringPiece& input, size_t* output);
+bool StringToInt(std::string_view input, int* output);
+bool StringToUint(std::string_view input, unsigned int* output);
+bool StringToInt64(std::string_view input, int64_t* output);
+bool StringToUint64(std::string_view input, uint64_t* output);
+bool StringToSizeT(std::string_view input, size_t* output);
 
-bool HexStringToInt(const StringPiece& input, int* output);
+bool HexStringToInt(std::string_view input, int* output);
 bool HexStringToBytes(const std::string& input, std::vector<uint8_t>* output);
 
 }  // namespace base
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_piece.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_piece.h
deleted file mode 100644
index e860effff0..0000000000
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_piece.h
+++ /dev/null
@@ -1,202 +0,0 @@
-// Copyright 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_STRINGS_STRING_PIECE_H_
-#define MINI_CHROMIUM_BASE_STRINGS_STRING_PIECE_H_
-
-#include <algorithm>
-#include <iterator>
-#include <ostream>
-#include <string>
-
-namespace base {
-
-template<typename StringType>
-class BasicStringPiece {
- public:
-  typedef typename StringType::traits_type traits_type;
-  typedef typename StringType::value_type value_type;
-  typedef typename StringType::size_type size_type;
-  typedef typename StringType::difference_type difference_type;
-  typedef const value_type& reference;
-  typedef const value_type& const_reference;
-  typedef const value_type* pointer;
-  typedef const value_type* const_pointer;
-  typedef const value_type* const_iterator;
-  typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-
-  static const size_type npos;
-
-  BasicStringPiece()
-      : pointer_(NULL),
-        length_(0) {
-  }
-
-  BasicStringPiece(const value_type* string)
-      : pointer_(string),
-        length_((string == NULL) ? 0 : traits_type::length(string)) {
-  }
-
-  BasicStringPiece(const StringType& string)
-      : pointer_(string.data()),
-        length_(string.size()) {
-  }
-
-  BasicStringPiece(const value_type* offset, size_type length)
-      : pointer_(offset),
-        length_(length) {
-  }
-
-  BasicStringPiece(const typename StringType::const_iterator& begin,
-                   const typename StringType::const_iterator& end)
-      : pointer_((end > begin) ? &(*begin) : NULL),
-        length_((end > begin) ? static_cast<size_type>(end - begin) : 0) {
-  }
-
-  value_type operator[](size_type index) const { return pointer_[index]; }
-
-  const value_type* data() const { return pointer_; }
-
-  const_iterator begin() const { return pointer_; }
-  const_iterator end() const { return pointer_ + length_; }
-  const_reverse_iterator rbegin() const {
-    return const_reverse_iterator(pointer_ + length_);
-  }
-  const_reverse_iterator rend() const {
-    return const_reverse_iterator(pointer_);
-  }
-
-  bool empty() const { return length_ == 0; }
-  size_type size() const { return length_; }
-  size_type length() const { return length_; }
-  size_type max_size() const { return length_; }
-  size_type capacity() const { return length_; }
-
-  static int wordmemcmp(const value_type* p,
-                        const value_type* p2,
-                        size_type N) {
-    return StringType::traits_type::compare(p, p2, N);
-  }
-
-  void clear() {
-    pointer_ = NULL;
-    length_ = 0;
-  }
-
-  int compare(const BasicStringPiece<StringType>& that) const {
-    int result = traits_type::compare(pointer_,
-                                      that.pointer_,
-                                      (std::min)(length_, that.length_));
-    if (result == 0) {
-      if (length_ < that.length_) {
-        result = -1;
-      } else if (length_ > that.length_) {
-        result = 1;
-      }
-    }
-    return result;
-  }
-
-  BasicStringPiece<StringType> substr(size_type position = 0,
-                                      size_type count = npos) const {
-    position = (std::min)(position, size());
-    count = (std::min)(count, size() - position);
-    return BasicStringPiece<StringType>(data() + position, count);
-  }
-
-  size_type copy(value_type* dest,
-                 size_type count,
-                 size_type position = 0) const {
-    size_type ret = (std::min)(size() - position, count);
-    traits_type::copy(dest, data() + position, ret);
-    return ret;
-  }
-
-  size_type find(const BasicStringPiece<StringType>& str, size_type pos) const {
-    if (pos >= size()) {
-      return npos;
-    }
-    const_iterator result = std::search(begin() + pos,
-                                        end(),
-                                        str.begin(),
-                                        str.end());
-    size_type xpos = static_cast<size_type>(result - begin());
-    return xpos + str.size() <= size() ? xpos : npos;
-  }
-
-  size_type find(value_type c, size_type pos) const {
-    if (pos >= size()) {
-      return npos;
-    }
-    const_iterator result = std::find(begin() + pos, end(), c);
-    return result != end() ? static_cast<size_type>(result - begin()) : npos;
-  }
-
-  void set(const value_type* string) {
-    pointer_ = string;
-    length_ = string ? traits_type::length(string) : 0;
-  }
-
-  StringType as_string() const {
-    return empty() ? StringType() : StringType(data(), size());
-  }
-
- private:
-  const value_type* pointer_;
-  size_type length_;
-};
-
-template <typename StringType>
-const typename BasicStringPiece<StringType>::size_type
-    BasicStringPiece<StringType>::npos = StringType::npos;
-
-template<typename StringType>
-std::ostream& operator<<(std::ostream& ostream,
-                         const BasicStringPiece<StringType>& string_piece) {
-  ostream.write(string_piece.data(), string_piece.size());
-  return ostream;
-}
-
-typedef BasicStringPiece<std::string> StringPiece;
-typedef BasicStringPiece<std::u16string> StringPiece16;
-typedef BasicStringPiece<std::wstring> WStringPiece;
-
-inline bool operator==(const StringPiece& x, const StringPiece& y) {
-  if (x.size() != y.size())
-    return false;
-
-  return StringPiece::wordmemcmp(x.data(), y.data(), x.size()) == 0;
-}
-
-inline bool operator==(const StringPiece16& x, const StringPiece16& y) {
-  if (x.size() != y.size())
-    return false;
-
-  return StringPiece16::wordmemcmp(x.data(), y.data(), x.size()) == 0;
-}
-
-// This is a custom hash function. We don't use the ones already defined for
-// string and std::u16string directly because it would require the string
-// constructors to be called, which we don't want.
-#define HASH_STRING_PIECE(StringPieceType, string_piece)         \
-  std::size_t result = 0;                                        \
-  for (StringPieceType::const_iterator i = string_piece.begin(); \
-       i != string_piece.end(); ++i)                             \
-    result = (result * 131) + *i;                                \
-  return result;
-
-struct StringPieceHash {
-  std::size_t operator()(const StringPiece& sp) const {
-    HASH_STRING_PIECE(StringPiece, sp);
-  }
-};
-struct StringPiece16Hash {
-  std::size_t operator()(const StringPiece16& sp16) const {
-    HASH_STRING_PIECE(StringPiece16, sp16);
-  }
-};
-
-}  // namespace base;
-
-#endif  // MINI_CHROMIUM_BASE_STRINGS_STRING_PIECE_H_
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_util.cc b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_util.cc
index e66eb33ef1..3b843cd45d 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_util.cc
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_util.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_util.h
index 80dd87964f..55cc8e466e 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_util.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_util.h
@@ -1,12 +1,13 @@
-// Copyright 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright 2006-2008 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MINI_CHROMIUM_BASE_STRINGS_STRING_UTIL_H_
 #define MINI_CHROMIUM_BASE_STRINGS_STRING_UTIL_H_
 
+#include "base/check_op.h"
 #include "base/compiler_specific.h"
-#include "base/logging.h"
+#include "build/build_config.h"
 
 namespace base {
 
@@ -16,13 +17,16 @@ int vsnprintf(char* buffer, size_t size, const char* format, va_list arguments)
 size_t strlcpy(char* dst, const char* src, size_t dst_size);
 size_t wcslcpy(wchar_t* dst, const wchar_t* src, size_t dst_size);
 
-}  // namespace base
-
-#if defined(OS_WIN)
-#include "base/strings/string_util_win.h"
-#elif defined(OS_POSIX)
-#include "base/strings/string_util_posix.h"
-#endif
+// Determines the type of ASCII character, independent of locale (the C
+// library versions will change based on locale).
+template <typename Char>
+inline bool IsAsciiWhitespace(Char c) {
+  return c == ' ' || (c >= 0x09 && c <= 0x0d);
+}
+template <typename Char>
+inline bool IsAsciiDigit(Char c) {
+  return c >= '0' && c <= '9';
+}
 
 template <class string_type>
 inline typename string_type::value_type* WriteInto(string_type* str,
@@ -37,4 +41,12 @@ inline typename string_type::value_type* WriteInto(string_type* str,
   return &((*str)[0]);
 }
 
+}  // namespace base
+
+#if BUILDFLAG(IS_WIN)
+#include "base/strings/string_util_win.h"
+#elif BUILDFLAG(IS_POSIX)
+#include "base/strings/string_util_posix.h"
+#endif
+
 #endif  // MINI_CHROMIUM_BASE_STRINGS_STRING_UTIL_H_
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_util_posix.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_util_posix.h
index a3d4cdd05d..5daba8a52b 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_util_posix.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_util_posix.h
@@ -1,12 +1,10 @@
-// Copyright 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright 2006-2008 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MINI_CHROMIUM_BASE_STRINGS_STRING_UTIL_POSIX_H_
 #define MINI_CHROMIUM_BASE_STRINGS_STRING_UTIL_POSIX_H_
 
-#include "base/strings/string_util.h"
-
 #include <stdio.h>
 #include <string.h>
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_util_win.cc b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_util_win.cc
index d14b0b0cf2..a02797fdb3 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_util_win.cc
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_util_win.cc
@@ -1,4 +1,4 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_util_win.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_util_win.h
index 447892b478..87faac994d 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_util_win.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_util_win.h
@@ -1,4 +1,4 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/stringprintf.cc b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/stringprintf.cc
index 627ccb5272..fa3c5c5ae4 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/stringprintf.cc
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/stringprintf.cc
@@ -1,4 +1,4 @@
-// Copyright 2010 The Chromium Authors. All rights reserved.
+// Copyright 2010 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -8,10 +8,10 @@
 
 #include <vector>
 
-#include "base/cxx17_backports.h"
 #include "base/logging.h"
 #include "base/scoped_clear_last_error.h"
 #include "base/strings/string_util.h"
+#include "build/build_config.h"
 
 namespace base {
 
@@ -34,19 +34,19 @@ static void StringAppendVT(StringType* dst,
   va_copy(ap_copy, ap);
 
   ScopedClearLastError clear_errno;
-  int result = vsnprintfT(stack_buf, size(stack_buf), format, ap_copy);
+  int result = vsnprintfT(stack_buf, std::size(stack_buf), format, ap_copy);
   va_end(ap_copy);
 
-  if (result >= 0 && result < static_cast<int>(size(stack_buf))) {
+  if (result >= 0 && result < static_cast<int>(std::size(stack_buf))) {
     dst->append(stack_buf, result);
     return;
   }
 
   // Repeatedly increase buffer size until it fits.
-  size_t mem_length = size(stack_buf);
+  size_t mem_length = std::size(stack_buf);
   while (true) {
     if (result < 0) {
-#if !defined(OS_WIN)
+#if !BUILDFLAG(IS_WIN)
       // On Windows, vsnprintfT always returns the number of characters in a
       // fully-formatted string, so if we reach this point, something else is
       // wrong and no amount of buffer-doubling is going to fix it.
@@ -56,7 +56,7 @@ static void StringAppendVT(StringType* dst,
         DLOG(WARNING) << "Unable to printf the requested string due to error.";
         return;
       }
-#if !defined(OS_WIN)
+#if !BUILDFLAG(IS_WIN)
       // Try doubling the buffer size.
       mem_length *= 2;
 #endif
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/stringprintf.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/stringprintf.h
index 1b1e60be22..3f808e95a3 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/stringprintf.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/stringprintf.h
@@ -1,4 +1,4 @@
-// Copyright 2010 The Chromium Authors. All rights reserved.
+// Copyright 2010 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/sys_string_conversions.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/sys_string_conversions.h
index 154f224a88..f7919e1c5a 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/sys_string_conversions.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/sys_string_conversions.h
@@ -1,4 +1,4 @@
-// Copyright 2008 The Chromium Authors. All rights reserved.
+// Copyright 2008 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 
 #include "build/build_config.h"
 
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
 
 #include <CoreFoundation/CoreFoundation.h>
 
@@ -28,6 +28,6 @@ NSString* SysUTF8ToNSString(const std::string& utf8);
 
 }  // namespace base
 
-#endif  // defined(OS_APPLE)
+#endif  // BUILDFLAG(IS_APPLE)
 
 #endif  // MINI_CHROMIUM_BASE_STRINGS_SYS_STRING_CONVERSIONS_H_
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/sys_string_conversions_mac.mm b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/sys_string_conversions_mac.mm
index 09174dc2e8..87f8725936 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/sys_string_conversions_mac.mm
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/sys_string_conversions_mac.mm
@@ -1,11 +1,11 @@
-// Copyright 2008 The Chromium Authors. All rights reserved.
+// Copyright 2008 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/strings/sys_string_conversions.h"
 
-#include "base/logging.h"
-#include "base/mac/foundation_util.h"
+#include "base/apple/bridging.h"
+#include "base/check_op.h"
 
 namespace base {
 
@@ -83,7 +83,7 @@ static CFStringRef STLStringToCFStringWithEncodingsT(
   if (!nsstring) {
     return std::string();
   }
-  return SysCFStringRefToUTF8(base::mac::NSToCFCast(nsstring));
+  return SysCFStringRefToUTF8(apple::NSToCFPtrCast(nsstring));
 }
 
 CFStringRef SysUTF8ToCFStringRef(const std::string& utf8) {
@@ -91,7 +91,7 @@ CFStringRef SysUTF8ToCFStringRef(const std::string& utf8) {
 }
 
 NSString* SysUTF8ToNSString(const std::string& utf8) {
-  return [base::mac::CFToNSCast(SysUTF8ToCFStringRef(utf8)) autorelease];
+  return base::apple::CFToNSOwnershipCast(SysUTF8ToCFStringRef(utf8));
 }
 
 }  // namespace base
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversion_utils.cc b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversion_utils.cc
index 8a82562cdb..ba51598b46 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversion_utils.cc
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversion_utils.cc
@@ -1,4 +1,4 @@
-// Copyright 2009 The Chromium Authors. All rights reserved.
+// Copyright 2009 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -32,10 +32,13 @@ bool ReadUnicodeCharacter(const char* src,
                           int32_t src_len,
                           int32_t* char_index,
                           uint32_t* code_point_out) {
-  int32_t code_point;
-  CBU8_NEXT(src, *char_index, src_len, code_point);
-  *code_point_out = static_cast<uint32_t>(code_point);
+  base_icu::UChar32 code_point;
+  CBU8_NEXT(reinterpret_cast<const uint8_t*>(src), *char_index, src_len,
+            code_point);
+  *code_point_out = code_point;
 
+  // The ICU macro above moves to the next char, we want to point to the last
+  // char consumed.
   (*char_index)--;
 
   return IsValidCodepoint(code_point);
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversion_utils.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversion_utils.h
index 5c094936a2..99873ee7ba 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversion_utils.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversion_utils.h
@@ -1,13 +1,14 @@
-// Copyright 2009 The Chromium Authors. All rights reserved.
+// Copyright 2009 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MINI_CHROMIUM_BASE_STRINGS_UTF_STRING_CONVERSION_UTILS_H_
 #define MINI_CHROMIUM_BASE_STRINGS_UTF_STRING_CONVERSION_UTILS_H_
 
-#include <string>
 #include <stdint.h>
 
+#include <string>
+
 namespace base {
 
 inline bool IsValidCodepoint(uint32_t code_point) {
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversions.cc b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversions.cc
index b732386195..8a7664c8bb 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversions.cc
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversions.cc
@@ -1,4 +1,4 @@
-// Copyright 2009 The Chromium Authors. All rights reserved.
+// Copyright 2009 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,6 +7,7 @@
 #include <stdint.h>
 
 #include <string>
+#include <string_view>
 
 #include "base/strings/utf_string_conversion_utils.h"
 #include "build/build_config.h"
@@ -41,7 +42,7 @@ bool UTF8ToUTF16(const char* src, size_t src_len, std::u16string* output) {
   return ConvertUnicode(src, src_len, output);
 }
 
-std::u16string UTF8ToUTF16(const StringPiece& utf8) {
+std::u16string UTF8ToUTF16(std::string_view utf8) {
   std::u16string ret;
   UTF8ToUTF16(utf8.data(), utf8.length(), &ret);
   return ret;
@@ -52,25 +53,25 @@ bool UTF16ToUTF8(const char16_t* src, size_t src_len, std::string* output) {
   return ConvertUnicode(src, src_len, output);
 }
 
-std::string UTF16ToUTF8(const StringPiece16& utf16) {
+std::string UTF16ToUTF8(std::u16string_view utf16) {
   std::string ret;
   UTF16ToUTF8(utf16.data(), utf16.length(), &ret);
   return ret;
 }
 
-#if defined(WCHAR_T_IS_UTF16)
-std::string WideToUTF8(WStringPiece wide) {
+#if defined(WCHAR_T_IS_16_BIT)
+std::string WideToUTF8(std::wstring_view wide) {
   std::string ret;
   UTF16ToUTF8(
       reinterpret_cast<const char16_t*>(wide.data()), wide.size(), &ret);
   return ret;
 }
 
-std::wstring UTF8ToWide(StringPiece utf8) {
+std::wstring UTF8ToWide(std::string_view utf8) {
   std::u16string utf16 = UTF8ToUTF16(utf8);
   return std::wstring(reinterpret_cast<const wchar_t*>(utf16.data()),
                       utf16.size());
 }
-#endif  // defined(WCHAR_T_IS_UTF16)
+#endif  // defined(WCHAR_T_IS_16_BIT)
 
 }  // namespace
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversions.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversions.h
index 425f95be02..7de2b819aa 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversions.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversions.h
@@ -1,4 +1,4 @@
-// Copyright 2009 The Chromium Authors. All rights reserved.
+// Copyright 2009 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -6,21 +6,21 @@
 #define MINI_CHROMIUM_BASE_STRINGS_UTF_STRING_CONVERSIONS_H_
 
 #include <string>
+#include <string_view>
 
-#include "base/strings/string_piece.h"
 #include "build/build_config.h"
 
 namespace base {
 
 bool UTF8ToUTF16(const char* src, size_t src_len, std::u16string* output);
-std::u16string UTF8ToUTF16(const StringPiece& utf8);
+std::u16string UTF8ToUTF16(std::string_view utf8);
 bool UTF16ToUTF8(const char16_t* src, size_t src_len, std::string* output);
-std::string UTF16ToUTF8(const StringPiece16& utf16);
+std::string UTF16ToUTF8(std::u16string_view utf16);
 
-#if defined(WCHAR_T_IS_UTF16)
-std::string WideToUTF8(WStringPiece wide);
-std::wstring UTF8ToWide(StringPiece utf8);
-#endif  // defined(WCHAR_T_IS_UTF16)
+#if defined(WCHAR_T_IS_16_BIT)
+std::string WideToUTF8(std::wstring_view wide);
+std::wstring UTF8ToWide(std::string_view utf8);
+#endif  // defined(WCHAR_T_IS_16_BIT)
 
 }  // namespace
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/condition_variable.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/condition_variable.h
index 768d674d0c..e4fc5a910c 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/condition_variable.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/condition_variable.h
@@ -1,4 +1,4 @@
-// Copyright 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright 2006-2008 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/condition_variable_posix.cc b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/condition_variable_posix.cc
index 20af747deb..755e8b6294 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/condition_variable_posix.cc
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/condition_variable_posix.cc
@@ -1,10 +1,10 @@
-// Copyright 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright 2006-2008 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/synchronization/condition_variable.h"
 
-#include "base/logging.h"
+#include "base/check_op.h"
 
 namespace base {
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock.cc b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock.cc
index e94e637991..24830328b0 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock.cc
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock.cc
@@ -1,4 +1,4 @@
-// Copyright 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright 2006-2008 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -8,7 +8,7 @@
 
 #include "base/synchronization/lock.h"
 
-#include "base/logging.h"
+#include "base/check_op.h"
 
 #ifndef NDEBUG
 
@@ -17,9 +17,9 @@ namespace base {
 namespace {
 
 ThreadRefType GetCurrentThreadRef() {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   return GetCurrentThreadId();
-#elif defined(OS_POSIX)
+#elif BUILDFLAG(IS_POSIX)
   return pthread_self();
 #endif
 }
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock.h
index 89f2558c5a..373530c9d1 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock.h
@@ -1,4 +1,4 @@
-// Copyright 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright 2006-2008 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,9 +7,9 @@
 
 #include "build/build_config.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include <windows.h>
-#elif defined(OS_POSIX)
+#elif BUILDFLAG(IS_POSIX)
 #include <pthread.h>
 #endif
 
@@ -17,9 +17,9 @@
 
 namespace base {
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 typedef DWORD ThreadRefType;
-#elif defined(OS_POSIX)
+#elif BUILDFLAG(IS_POSIX)
 typedef pthread_t ThreadRefType;
 #endif
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock_impl.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock_impl.h
index cfd9dcad7a..8f389aa75d 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock_impl.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock_impl.h
@@ -1,4 +1,4 @@
-// Copyright 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright 2006-2008 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,9 +7,9 @@
 
 #include "build/build_config.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include <windows.h>
-#elif defined(OS_POSIX)
+#elif BUILDFLAG(IS_POSIX)
 #include <pthread.h>
 #endif
 
@@ -22,9 +22,9 @@ namespace internal {
 // should instead use Lock.
 class LockImpl {
  public:
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   typedef CRITICAL_SECTION NativeHandle;
-#elif defined(OS_POSIX)
+#elif BUILDFLAG(IS_POSIX)
   typedef pthread_mutex_t NativeHandle;
 #endif
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock_impl_posix.cc b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock_impl_posix.cc
index 27120df422..a8486f2c9b 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock_impl_posix.cc
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock_impl_posix.cc
@@ -1,4 +1,4 @@
-// Copyright 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright 2006-2008 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -6,7 +6,7 @@
 
 #include <errno.h>
 
-#include "base/logging.h"
+#include "base/check_op.h"
 
 namespace base {
 namespace internal {
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock_impl_win.cc b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock_impl_win.cc
index fbae45244b..0b1c4d8db4 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock_impl_win.cc
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock_impl_win.cc
@@ -1,4 +1,4 @@
-// Copyright 2011 The Chromium Authors. All rights reserved.
+// Copyright 2011 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/sys_byteorder.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/sys_byteorder.h
index 0e18e5a9c1..462cc7fa4f 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/sys_byteorder.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/sys_byteorder.h
@@ -1,4 +1,4 @@
-// Copyright 2011 The Chromium Authors. All rights reserved.
+// Copyright 2011 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,9 +7,9 @@
 
 #include "build/build_config.h"
 
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
 #include <libkern/OSByteOrder.h>
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 #include <stdlib.h>
 #else
 #include <byteswap.h>
@@ -18,9 +18,9 @@
 namespace base {
 
 inline uint16_t ByteSwap(uint16_t x) {
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
   return OSSwapInt16(x);
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   return _byteswap_ushort(x);
 #else
   return bswap_16(x);
@@ -28,9 +28,9 @@ inline uint16_t ByteSwap(uint16_t x) {
 }
 
 inline uint32_t ByteSwap(uint32_t x) {
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
   return OSSwapInt32(x);
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   return _byteswap_ulong(x);
 #else
   return bswap_32(x);
@@ -38,9 +38,9 @@ inline uint32_t ByteSwap(uint32_t x) {
 }
 
 inline uint64_t ByteSwap(uint64_t x) {
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
   return OSSwapInt64(x);
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   return _byteswap_uint64(x);
 #else
   return bswap_64(x);
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/template_util.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/template_util.h
index 618a081966..5b6e0d441b 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/template_util.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/template_util.h
@@ -1,4 +1,4 @@
-// Copyright 2011 The Chromium Authors. All rights reserved.
+// Copyright 2011 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,121 +7,48 @@
 
 #include <stddef.h>
 
-#include "build/build_config.h"
+#include <type_traits>
 
 namespace base {
 
-// template definitions from tr1
-
-template<class T, T v>
-struct integral_constant {
-  static const T value = v;
-  typedef T value_type;
-  typedef integral_constant<T, v> type;
-};
-
-template <class T, T v> const T integral_constant<T, v>::value;
-
-typedef integral_constant<bool, true> true_type;
-typedef integral_constant<bool, false> false_type;
-
-template <class T> struct is_pointer : false_type {};
-template <class T> struct is_pointer<T*> : true_type {};
-
-// Member function pointer detection. This is built-in to C++ 11's stdlib, and
-// we can remove this when we switch to it.
-template<typename T>
-struct is_member_function_pointer : false_type {};
-
-template <typename R, typename Z, typename... A>
-struct is_member_function_pointer<R(Z::*)(A...)> : true_type {};
-template <typename R, typename Z, typename... A>
-struct is_member_function_pointer<R(Z::*)(A...) const> : true_type {};
-
-
-template <class T, class U> struct is_same : public false_type {};
-template <class T> struct is_same<T,T> : true_type {};
-
-template<class> struct is_array : public false_type {};
-template<class T, size_t n> struct is_array<T[n]> : public true_type {};
-template<class T> struct is_array<T[]> : public true_type {};
-
-template <class T> struct is_non_const_reference : false_type {};
-template <class T> struct is_non_const_reference<T&> : true_type {};
-template <class T> struct is_non_const_reference<const T&> : false_type {};
-
-template <class T> struct is_const : false_type {};
-template <class T> struct is_const<const T> : true_type {};
-
-template <class T> struct is_void : false_type {};
-template <> struct is_void<void> : true_type {};
-
 namespace internal {
 
-// Types YesType and NoType are guaranteed such that sizeof(YesType) <
-// sizeof(NoType).
-typedef char YesType;
+// Helper to express preferences in an overload set. If more than one overload
+// are available for a given set of parameters the overload with the higher
+// priority will be chosen.
+template <size_t I>
+struct priority_tag : priority_tag<I - 1> {};
 
-struct NoType {
-  YesType dummy[2];
-};
-
-// This class is an implementation detail for is_convertible, and you
-// don't need to know how it works to use is_convertible. For those
-// who care: we declare two different functions, one whose argument is
-// of type To and one with a variadic argument list. We give them
-// return types of different size, so we can use sizeof to trick the
-// compiler into telling us which function it would have chosen if we
-// had called it with an argument of type From.  See Alexandrescu's
-// _Modern C++ Design_ for more details on this sort of trick.
-
-struct ConvertHelper {
-  template <typename To>
-  static YesType Test(To);
-
-  template <typename To>
-  static NoType Test(...);
-
-  template <typename From>
-  static From& Create();
-};
-
-// Used to determine if a type is a struct/union/class. Inspired by Boost's
-// is_class type_trait implementation.
-struct IsClassHelper {
-  template <typename C>
-  static YesType Test(void(C::*)(void));
-
-  template <typename C>
-  static NoType Test(...);
-};
+template <>
+struct priority_tag<0> {};
 
 }  // namespace internal
 
-// Inherits from true_type if From is convertible to To, false_type otherwise.
+// Implementation of C++20's std::remove_cvref.
 //
-// Note that if the type is convertible, this will be a true_type REGARDLESS
-// of whether or not the conversion would emit a warning.
-template <typename From, typename To>
-struct is_convertible
-    : integral_constant<bool,
-                        sizeof(internal::ConvertHelper::Test<To>(
-                                   internal::ConvertHelper::Create<From>())) ==
-                        sizeof(internal::YesType)> {
-};
-
+// References:
+// - https://en.cppreference.com/w/cpp/types/remove_cvref
+// - https://wg21.link/meta.trans.other#lib:remove_cvref
 template <typename T>
-struct is_class
-    : integral_constant<bool,
-                        sizeof(internal::IsClassHelper::Test<T>(0)) ==
-                            sizeof(internal::YesType)> {
+struct remove_cvref {
+  using type = std::remove_cv_t<std::remove_reference_t<T>>;
 };
 
-template<bool B, class T = void>
-struct enable_if {};
+// Implementation of C++20's std::remove_cvref_t.
+//
+// References:
+// - https://en.cppreference.com/w/cpp/types/remove_cvref
+// - https://wg21.link/meta.type.synop#lib:remove_cvref_t
+template <typename T>
+using remove_cvref_t = typename remove_cvref<T>::type;
 
-template<class T>
-struct enable_if<true, T> { typedef T type; };
+// Simplified implementation of C++20's std::iter_reference_t.
+// As opposed to std::iter_reference_t, this implementation does not restrict
+// the type of `Iter`.
+//
+// Reference: https://wg21.link/iterator.synopsis#:~:text=iter_reference_t
+template <typename Iter>
+using iter_reference_t = decltype(*std::declval<Iter&>());
 
 }  // namespace base
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/third_party/icu/icu_utf.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/third_party/icu/icu_utf.h
index 79242c6f90..45ce85d126 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/third_party/icu/icu_utf.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/third_party/icu/icu_utf.h
@@ -72,6 +72,25 @@ typedef int32_t UChar32;
     ((c)>=0xfdd0 && \
      ((c)<=0xfdef || ((c)&0xfffe)==0xfffe) && (c)<=0x10ffff)
 
+/**
+ * \def UPRV_BLOCK_MACRO_BEGIN
+ * Defined as the "do" keyword by default.
+ * @internal
+ */
+#ifndef CBUPRV_BLOCK_MACRO_BEGIN
+#define CBUPRV_BLOCK_MACRO_BEGIN do
+#endif
+
+/**
+ * \def UPRV_BLOCK_MACRO_END
+ * Defined as "while (FALSE)" by default.
+ * @internal
+ */
+#ifndef CBUPRV_BLOCK_MACRO_END
+#define CBUPRV_BLOCK_MACRO_END while (0)
+#endif
+
+
 /**
  * Is c a Unicode code point value (0..U+10ffff)
  * that can be assigned a character?
@@ -230,29 +249,36 @@ utf8_nextCharSafeBody(const uint8_t *s, int32_t *pi, int32_t length, ::base_icu:
  * @see U8_NEXT_UNSAFE
  * @stable ICU 2.4
  */
-#define CBU8_NEXT(s, i, length, c) { \
+#define CBU8_NEXT(s, i, length, c) CBU8_INTERNAL_NEXT_OR_SUB(s, i, length, c, CBU_SENTINEL)
+
+/** @internal */
+#define CBU8_INTERNAL_NEXT_OR_SUB(s, i, length, c, sub) CBUPRV_BLOCK_MACRO_BEGIN { \
     (c)=(uint8_t)(s)[(i)++]; \
     if(!CBU8_IS_SINGLE(c)) { \
-        uint8_t __t1, __t2; \
-        if( /* handle U+0800..U+FFFF inline */ \
-                (0xe0<=(c) && (c)<0xf0) && \
-                (((i)+1)<(length) || (length)<0) && \
-                CBU8_IS_VALID_LEAD3_AND_T1((c), __t1=(s)[i]) && \
-                (__t2=(uint8_t)((s)[(i)+1]-0x80))<=0x3f) { \
-            (c)=(((c)&0xf)<<12)|((__t1&0x3f)<<6)|__t2; \
-            (i)+=2; \
-        } else if( /* handle U+0080..U+07FF inline */ \
-                ((c)<0xe0 && (c)>=0xc2) && \
-                ((i)!=(length)) && \
-                (__t1=(uint8_t)((s)[i]-0x80))<=0x3f) { \
-            (c)=(((c)&0x1f)<<6)|__t1; \
-            ++(i); \
+        uint8_t __t = 0; \
+        if((i)!=(length) && \
+            /* fetch/validate/assemble all but last trail byte */ \
+            ((c)>=0xe0 ? \
+                ((c)<0xf0 ?  /* U+0800..U+FFFF except surrogates */ \
+                    CBU8_LEAD3_T1_BITS[(c)&=0xf]&(1<<((__t=(s)[i])>>5)) && \
+                    (__t&=0x3f, 1) \
+                :  /* U+10000..U+10FFFF */ \
+                    ((c)-=0xf0)<=4 && \
+                    CBU8_LEAD4_T1_BITS[(__t=(s)[i])>>4]&(1<<(c)) && \
+                    ((c)=((c)<<6)|(__t&0x3f), ++(i)!=(length)) && \
+                    (__t=(s)[i]-0x80)<=0x3f) && \
+                /* valid second-to-last trail byte */ \
+                ((c)=((c)<<6)|__t, ++(i)!=(length)) \
+            :  /* U+0080..U+07FF */ \
+                (c)>=0xc2 && ((c)&=0x1f, 1)) && \
+            /* last trail byte */ \
+            (__t=(s)[i]-0x80)<=0x3f && \
+            ((c)=((c)<<6)|__t, ++(i), 1)) { \
         } else { \
-            /* function call for "complicated" and error cases */ \
-            (c)=::base_icu::utf8_nextCharSafeBody((const uint8_t *)s, &(i), (length), c, -1); \
+            (c)=(sub);  /* ill-formed*/ \
         } \
     } \
-}
+} CBUPRV_BLOCK_MACRO_END
 
 /**
  * Append a code point to a string, overwriting 1 to 4 bytes.
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/threading/thread_local_storage.cc b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/threading/thread_local_storage.cc
index 470896ca1e..7ae9b25533 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/threading/thread_local_storage.cc
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/threading/thread_local_storage.cc
@@ -1,4 +1,4 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -6,8 +6,9 @@
 
 #include <string.h>
 
+#include "base/check_op.h"
+#include "base/notreached.h"
 #include "base/atomicops.h"
-#include "base/logging.h"
 
 using base::internal::PlatformThreadLocalStorage;
 
@@ -159,10 +160,8 @@ void OnThreadExitInternal(void* value) {
       // the whole vector again.  This is a pthread standard.
       need_to_scan_destructors = true;
     }
-    if (--remaining_attempts <= 0) {
-      NOTREACHED();  // Destructors might not have been called.
-      break;
-    }
+    // Destructors might not have been called.
+    CHECK_GT(--remaining_attempts, 0);
   }
 
   // Remove our stack allocated vector.
@@ -175,7 +174,7 @@ namespace base {
 
 namespace internal {
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 void PlatformThreadLocalStorage::OnThreadExit() {
   PlatformThreadLocalStorage::TLSKey key =
       base::subtle::NoBarrier_Load(&g_native_tls_key);
@@ -187,11 +186,11 @@ void PlatformThreadLocalStorage::OnThreadExit() {
     return;
   OnThreadExitInternal(tls_data);
 }
-#elif defined(OS_POSIX)
+#elif BUILDFLAG(IS_POSIX)
 void PlatformThreadLocalStorage::OnThreadExit(void* value) {
   OnThreadExitInternal(value);
 }
-#endif  // defined(OS_WIN)
+#endif  // BUILDFLAG(IS_WIN)
 
 }  // namespace internal
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/threading/thread_local_storage.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/threading/thread_local_storage.h
index ec5b191005..9ee4a245a0 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/threading/thread_local_storage.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/threading/thread_local_storage.h
@@ -1,4 +1,4 @@
-// Copyright 2007 The Chromium Authors. All rights reserved.
+// Copyright 2007 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,9 +7,9 @@
 
 #include "build/build_config.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include <windows.h>
-#elif defined(OS_POSIX)
+#elif BUILDFLAG(IS_POSIX)
 #include <pthread.h>
 #endif
 
@@ -22,11 +22,10 @@ namespace internal {
 // interface, you should instead be using ThreadLocalStorage::StaticSlot/Slot.
 class PlatformThreadLocalStorage {
  public:
-
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   typedef unsigned long TLSKey;
   enum { TLS_KEY_OUT_OF_INDEXES = TLS_OUT_OF_INDEXES };
-#elif defined(OS_POSIX)
+#elif BUILDFLAG(IS_POSIX)
   typedef pthread_key_t TLSKey;
   // The following is a "reserved key" which is used in our generic Chromium
   // ThreadLocalStorage implementation.  We expect that an OS will not return
@@ -58,11 +57,11 @@ class PlatformThreadLocalStorage {
   // Destructors may end up being called multiple times on a terminating
   // thread, as other destructors may re-set slots that were previously
   // destroyed.
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   // Since Windows which doesn't support TLS destructor, the implementation
   // should use GetTLSValue() to retrieve the value of TLS slot.
   static void OnThreadExit();
-#elif defined(OS_POSIX)
+#elif BUILDFLAG(IS_POSIX)
   // |Value| is the data stored in TLS slot, The implementation can't use
   // GetTLSValue() to retrieve the value of slot as it has already been reset
   // in Posix.
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/threading/thread_local_storage_posix.cc b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/threading/thread_local_storage_posix.cc
index d5aa33f896..caf1531d42 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/threading/thread_local_storage_posix.cc
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/threading/thread_local_storage_posix.cc
@@ -1,10 +1,10 @@
-// Copyright 2008 The Chromium Authors. All rights reserved.
+// Copyright 2008 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/threading/thread_local_storage.h"
 
-#include "base/logging.h"
+#include "base/check_op.h"
 
 namespace base {
 namespace internal {
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/threading/thread_local_storage_win.cc b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/threading/thread_local_storage_win.cc
index 541e6341f8..f1d16eb02a 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/threading/thread_local_storage_win.cc
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/base/threading/thread_local_storage_win.cc
@@ -1,10 +1,10 @@
-// Copyright 2007 The Chromium Authors. All rights reserved.
+// Copyright 2007 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/threading/thread_local_storage.h"
 
-#include "base/logging.h"
+#include "base/check.h"
 
 namespace base {
 namespace internal {
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/BUILD.gn b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/BUILD.gn
index 561a4bccf8..5deed1e9b1 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/BUILD.gn
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2020 The Crashpad Authors. All rights reserved.
+# Copyright 2020 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -12,13 +12,14 @@ import("./platform.gni")
 config("mini_chromium_config") {
   include_dirs = [
     "..",
-    root_gen_dir
+    root_gen_dir,
   ]
 }
 
 source_set("build") {
   sources = [ "build_config.h" ]
   public_configs = [ ":mini_chromium_config" ]
+  public_deps = [ ":buildflag_header_h" ]
 }
 
 source_set("buildflag_header_h") {
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/build_config.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/build_config.h
index 3d670a90c9..d4921c128a 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/build_config.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/build_config.h
@@ -1,38 +1,87 @@
-// Copyright 2008 The Chromium Authors. All rights reserved.
+// Copyright 2008 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MINI_CHROMIUM_BUILD_BUILD_CONFIG_H_
 #define MINI_CHROMIUM_BUILD_BUILD_CONFIG_H_
 
+#include "build/buildflag.h"
+
 #if defined(__APPLE__)
-#define OS_APPLE 1
+#include <TargetConditionals.h>
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_APPLE() 1
+#if defined(TARGET_OS_OSX) && TARGET_OS_OSX
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_MAC() 1
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_IOS() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_IOS_TVOS() 0
+#elif defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_MAC() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_IOS() 1
+#if defined(TARGET_OS_TV) && TARGET_OS_TV
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_IOS_TVOS() 1
+#else
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_IOS_TVOS() 0
+#endif  // TARGET_OS_TV
+#endif  // TARGET_OS_*
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_ANDROID() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_LINUX() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_CHROMEOS() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_WIN() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_FUCHSIA() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_POSIX() 1
 #elif defined(__ANDROID__)
-#define OS_ANDROID 1
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_APPLE() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_MAC() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_IOS() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_IOS_TVOS() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_ANDROID() 1
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_LINUX() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_CHROMEOS() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_WIN() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_FUCHSIA() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_POSIX() 1
 #elif defined(__linux__)
-#define OS_LINUX 1
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_APPLE() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_MAC() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_IOS() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_IOS_TVOS() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_ANDROID() 0
+#if !defined(OS_CHROMEOS)
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_LINUX() 1
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_CHROMEOS() 0
+#else
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_LINUX() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_CHROMEOS() 1
+#endif
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_WIN() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_FUCHSIA() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_POSIX() 1
 #elif defined(_WIN32)
-#define OS_WIN 1
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_APPLE() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_MAC() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_IOS() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_IOS_TVOS() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_ANDROID() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_LINUX() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_CHROMEOS() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_WIN() 1
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_FUCHSIA() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_POSIX() 0
 #elif defined(__Fuchsia__)
-#define OS_FUCHSIA 1
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_APPLE() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_MAC() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_IOS() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_IOS_TVOS() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_ANDROID() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_LINUX() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_CHROMEOS() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_WIN() 0
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_FUCHSIA() 1
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_POSIX() 1
 #else
 #error Please add support for your platform in build/build_config.h
 #endif
 
-#if defined(OS_APPLE)
-#include <TargetConditionals.h>
-#if defined(TARGET_OS_OSX) && TARGET_OS_OSX
-#define OS_MAC 1
-#elif defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
-#define OS_IOS 1
-#endif  // TARGET_OS_*
-#endif  // defined(OS_APPLE)
-
-#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_ANDROID) || \
-    defined(OS_FUCHSIA)
-#define OS_POSIX 1
-#endif
-
 // Compiler detection.
 #if defined(__GNUC__)
 #define COMPILER_GCC 1
@@ -72,6 +121,11 @@
 #define ARCH_CPU_MIPS64EL 1
 #define ARCH_CPU_64_BITS 1
 #endif
+#elif defined(__riscv) && (__riscv_xlen == 64)
+#define ARCH_CPU_RISCV_FAMILY 1
+#define ARCH_CPU_RISCV64 1
+#define ARCH_CPU_64_BITS 1
+#define ARCH_CPU_LITTLE_ENDIAN 1
 #else
 #error Please add support for your architecture in build/build_config.h
 #endif
@@ -88,14 +142,33 @@
 #endif
 #endif
 
-#if defined(OS_POSIX) && defined(COMPILER_GCC) && \
-    defined(__WCHAR_MAX__) && \
+#if BUILDFLAG(IS_POSIX) && defined(COMPILER_GCC) && defined(__WCHAR_MAX__) && \
     (__WCHAR_MAX__ == 0x7fffffff || __WCHAR_MAX__ == 0xffffffff)
-#define WCHAR_T_IS_UTF32
-#elif defined(OS_WIN)
-#define WCHAR_T_IS_UTF16
+#define WCHAR_T_IS_32_BIT
+#elif BUILDFLAG(IS_WIN)
+#define WCHAR_T_IS_16_BIT
 #else
 #error Please add support for your compiler in build/build_config.h
 #endif
 
+// Architecture-specific feature detection.
+
+#if !defined(CPU_ARM_NEON)
+#if defined(__arm__)
+#if !defined(__ARMEB__) && !defined(__ARM_EABI__) && !defined(__EABI__) && \
+    !defined(__VFP_FP__) && !defined(_WIN32_WCE) && !defined(ANDROID)
+#error Chromium does not support middle endian architecture
+#endif
+#if defined(__ARM_NEON__)
+#define CPU_ARM_NEON 1
+#endif
+#endif  // defined(__arm__)
+#endif  // !defined(CPU_ARM_NEON)
+
+#if !defined(HAVE_MIPS_MSA_INTRINSICS)
+#if defined(__mips_msa) && defined(__mips_isa_rev) && (__mips_isa_rev >= 5)
+#define HAVE_MIPS_MSA_INTRINSICS 1
+#endif
+#endif
+
 #endif  // MINI_CHROMIUM_BUILD_BUILD_CONFIG_H_
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/buildflag.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/buildflag.h
index ca057979c3..889e17b534 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/buildflag.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/buildflag.h
@@ -1,13 +1,16 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
+// Copyright 2015 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef BUILD_BUILDFLAG_H_
 #define BUILD_BUILDFLAG_H_
 
-#define BUILDFLAG_CAT_INDIRECT(a, b) a ## b
-#define BUILDFLAG_CAT(a, b) BUILDFLAG_CAT_INDIRECT(a, b)
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_CAT_INDIRECT(a, b) a##b
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_CAT(a, b) \
+  MINI_CHROMIUM_INTERNAL_BUILDFLAG_CAT_INDIRECT(a, b)
 
-#define BUILDFLAG(flag) (BUILDFLAG_CAT(BUILDFLAG_INTERNAL_, flag)())
+#define BUILDFLAG(flag)                  \
+  (MINI_CHROMIUM_INTERNAL_BUILDFLAG_CAT( \
+      MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_, flag)())
 
 #endif  // BUILD_BUILDFLAG_H_
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/buildflag_header.gni b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/buildflag_header.gni
index 40d2e53554..aa888323e0 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/buildflag_header.gni
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/buildflag_header.gni
@@ -1,4 +1,4 @@
-# Copyright 2015 The Chromium Authors. All rights reserved.
+# Copyright 2015 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/compiler.gni b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/compiler.gni
index 1cf9843ba6..7e2b3ce6b3 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/compiler.gni
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/compiler.gni
@@ -1,7 +1,15 @@
-# Copyright 2017 The Chromium Authors. All rights reserved.
+# Copyright 2017 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("platform.gni")
 
-mini_chromium_is_clang = mini_chromium_is_posix || mini_chromium_is_fuchsia
+if (mini_chromium_is_win) {
+  declare_args() {
+    mini_chromium_is_clang = mini_chromium_is_posix ||
+                             mini_chromium_is_fuchsia || mini_chromium_is_win
+  }
+} else {
+  mini_chromium_is_clang =
+      mini_chromium_is_posix || mini_chromium_is_fuchsia || mini_chromium_is_win
+}
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/config/BUILD.gn b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/config/BUILD.gn
index d6171efad9..1e56da3192 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/config/BUILD.gn
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/config/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
+# Copyright 2016 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -15,7 +15,7 @@ if (mini_chromium_is_mac) {
     # The minimum runtime macOS version that built products are expected to run
     # on. If empty, the toolchain will choose its own default, typically the
     # older of the SDK version and the build host’s OS version.
-    mac_deployment_target = "10.9"
+    mac_deployment_target = "12.0"
   }
 } else if (mini_chromium_is_ios) {
   import("../ios/ios_sdk.gni")
@@ -44,6 +44,9 @@ if (mini_chromium_is_mac) {
     # win_sdk\bin\SetEnv.cmd inside this path will be used to configure the
     # Windows toolchain.
     win_toolchain_path = "<autodetect>"
+
+    # Path to the Clang toolchain.
+    clang_path = "//third_party/windows/clang/" + host_os + "-amd64"
   }
 }
 
@@ -108,19 +111,24 @@ config("release") {
     }
   } else if (mini_chromium_is_win) {
     cflags = [
-      "/GL",  # LTCG.
       "/O2",
       "/Ob2",  # Both explicit and auto inlining.
       "/Oy-",  # Disable omitting frame pointers, must be after /O2.
       "/Zc:inline",  # Remove unreferenced COMDAT (faster links).
-      "/d2Zi+",  # Improve debugging of optimized code.
     ]
     ldflags = [
       "/OPT:ICF",
       "/OPT:REF",
-      "/LTCG",
     ]
-    arflags = [ "/LTCG" ]
+    arflags = []
+    if (!mini_chromium_is_clang) {
+      cflags += [
+        "/GL",  # LTCG.
+        "/d2Zi+",  # Improve debugging of optimized code.
+      ]
+      ldflags += [ "/LTCG" ]
+      arflags += [ "/LTCG" ]
+    }
   }
 }
 
@@ -132,17 +140,8 @@ config("default") {
   if (mini_chromium_is_posix || mini_chromium_is_fuchsia) {
     cflags = [
       "-Wall",
-      "-Wendif-labels",
       "-Werror",
       "-Wextra",
-      "-Wextra-semi",
-      "-Wheader-hygiene",
-      "-Wnewline-eof",
-      "-Wno-missing-field-initializers",
-      "-Wno-unused-parameter",
-      "-Wsign-compare",
-      "-Wstring-conversion",
-      "-Wvla",
       "-fno-exceptions",
       "-fno-rtti",
       "-fno-strict-aliasing",  # See https://crbug.com/32204
@@ -153,7 +152,7 @@ config("default") {
     ]
 
     cflags_c = [ "-std=c11" ]
-    cflags_cc = [ "-std=c++14" ]
+    cflags_cc = [ "-std=c++23" ]
     cflags_objc = cflags_c
     cflags_objcc = cflags_cc
 
@@ -225,11 +224,20 @@ config("default") {
 
   if (mini_chromium_is_ios) {
     if (ios_deployment_target != "") {
-      if (current_cpu == "x64") {
-        common_flags +=
-            [ "-mios-simulator-version-min=" + ios_deployment_target ]
-      } else if (current_cpu == "arm64") {
-        common_flags += [ "-mios-version-min=" + ios_deployment_target ]
+      if (target_platform == "iphoneos") {
+        if (target_environment == "simulator") {
+          common_flags +=
+          [ "-mios-simulator-version-min=" + ios_deployment_target ]
+        } else if (target_environment == "device") {
+          common_flags += [ "-mios-version-min=" + ios_deployment_target ]
+        }
+      } else if (target_platform == "tvos") {
+        if (target_environment == "simulator") {
+          common_flags +=
+          [ "-mtvos-simulator-version-min=" + ios_deployment_target ]
+        } else if (target_environment == "device") {
+          common_flags += [ "-mtvos-version-min=" + ios_deployment_target ]
+        }
       }
     }
   }
@@ -247,14 +255,34 @@ config("default") {
       "/WX",
       "/Zi",
       "/bigobj",  # Support larger number of sections in obj file.
-      "/wd4100",  # Unreferenced formal parameter.
-      "/wd4127",  # Conditional expression is constant.
-      "/wd4324",  # Structure was padded due to alignment specifier.
-      "/wd4351",  # New behavior: elements of array will be default initialized.
-      "/wd4577",  # 'noexcept' used with no exception handling mode specified.
       "/wd4996",  # 'X' was declared deprecated.
     ]
 
+    cflags_cc = [ "/std:c++23preview" ]
+
+    if (mini_chromium_is_clang) {
+      if (current_cpu == "x86") {
+        cflags += [ "--target=i386-pc-windows" ]
+      } else if (current_cpu == "x64") {
+        cflags += [ "--target=x86_64-pc-windows" ]
+      } else if (current_cpu == "arm64") {
+        cflags += [ "--target=aarch64-pc-windows" ]
+      } else {
+        assert(false, "Unsupported architecture")
+      }
+    } else {
+      cflags += [
+        "/wd4100",  # Unreferenced formal parameter.
+        "/wd4127",  # Conditional expression is constant.
+        "/wd4324",  # Structure was padded due to alignment specifier.
+        "/wd4351",  # elements of array will be default initialized.
+        "/wd4577",  # 'noexcept' used with no exception handling mode specified.
+      ]
+
+      # This is the default in clang, no need to pass it there.
+      cflags_cc += [ "/Zc:__cplusplus" ]
+    }
+
     ldflags += [ "/DEBUG" ]
 
     libs = [ "kernel32.lib" ]
@@ -265,13 +293,13 @@ config("default") {
     common_flags += [ "-pthread" ]
 
     if (current_cpu == "x86") {
-      common_flags += [
-        "-m32",
-      ]
+      common_flags += [ "-m32" ]
     } else if (current_cpu == "x64") {
-      common_flags += [
-        "-m64",
-      ]
+      common_flags += [ "-m64" ]
+    } else if (current_cpu == "arm64") {
+      common_flags += [ "--target=aarch64-linux-gnu" ]
+    } else if (current_cpu == "riscv64") {
+      common_flags += [ "--target=riscv64-linux-gnu" ]
     } else {
       assert(false, "Unsupported architecture")
     }
@@ -322,6 +350,34 @@ config("default") {
     ]
   }
 
+  if (mini_chromium_is_posix || mini_chromium_is_fuchsia ||
+      mini_chromium_is_clang) {
+    cflags += [
+      "-Wendif-labels",
+      "-Wextra-semi",
+      "-Wheader-hygiene",
+      "-Wnewline-eof",
+      "-Wno-missing-field-initializers",
+      "-Wno-unused-parameter",
+      "-Wsign-compare",
+      "-Wstring-conversion",
+      "-Wvla",
+    ]
+
+    if (mini_chromium_is_win) {
+      # TODO: These should be cleaned up and enabled.
+      cflags += [
+        "-Wno-cast-function-type-mismatch",  # Currently 22 instances.
+        "-Wno-format",  # Currently 3 instances.
+        "-Wno-microsoft-cast",  # Currently 2 instances.
+        "-Wno-missing-field-initializers",  # Currently 24 instances.
+        "-Wno-sign-compare",  # Currently 6 instances.
+        "-Wno-unused-const-variable",  # Currently 1 instance.
+        "-Wno-unused-function",  # Currently 1 instance.
+      ]
+    }
+  }
+
   if ((mini_chromium_is_posix && !mini_chromium_is_mac &&
        !mini_chromium_is_ios) || mini_chromium_is_fuchsia) {
     cflags += [ "-fPIC" ]
@@ -350,12 +406,13 @@ config("executable") {
   }
 }
 
-config("ios_enable_arc") {
-  if (mini_chromium_is_ios) {
-    common_flags = [ "-fobjc-arc" ]
-    cflags_objc = common_flags
-    cflags_objcc = common_flags
-  }
+config("apple_enable_arc") {
+  common_flags = [
+    "-fobjc-arc",
+    "-fno-objc-arc-exceptions",
+  ]
+  cflags_objc = common_flags
+  cflags_objcc = common_flags
 }
 
 config("Wexit_time_destructors") {
@@ -398,39 +455,49 @@ toolchain("gcc_like_toolchain") {
     ar = rebase_path(clang_path, root_build_dir) + "/bin/llvm-ar"
     ld = cxx
   } else if (mini_chromium_is_android) {
-     assert(android_ndk_root != "", "Android builds must set android_ndk_root")
-
-     if (host_os == "linux") {
-       ndk_host_arch = "linux-x86_64"
-     } else if (host_os == "mac") {
-       ndk_host_arch = "darwin-x86_64"
-     } else if (host_os == "win") {
-       ndk_host_arch = "windows-x86_64"
-     }
-     ndk_bin_dir = string_join("/", [android_ndk_root, "toolchains", "llvm",
-                               "prebuilt", ndk_host_arch, "bin", ""])
-
-     if (target_cpu == "arm") {
-       tool_prefix = "arm-linux-androideabi"
-     } else if (target_cpu == "arm64") {
-       tool_prefix = "aarch64-linux-android"
-     } else if (target_cpu == "x86") {
-       tool_prefix = "i686-linux-android"
-     } else if (target_cpu == "x64") {
-       tool_prefix = "x86_64-linux-android"
-     }
-
-     if (target_cpu == "arm") {
-       clang_prefix = "armv7a-linux-androideabi" + android_api_level
-     } else {
-       clang_prefix = tool_prefix + android_api_level
-     }
-
-     cc = ndk_bin_dir + clang_prefix + "-clang"
-     cxx = ndk_bin_dir + clang_prefix + "-clang++"
-     asm = cxx
-     ld = cxx
-     ar = ndk_bin_dir + tool_prefix + "-ar"
+    assert(android_ndk_root != "", "Android builds must set android_ndk_root")
+
+    if (host_os == "linux") {
+      ndk_host_arch = "linux-x86_64"
+    } else if (host_os == "mac") {
+      ndk_host_arch = "darwin-x86_64"
+    } else if (host_os == "win") {
+      ndk_host_arch = "windows-x86_64"
+    }
+    ndk_bin_dir = string_join("/",
+                              [
+                                android_ndk_root,
+                                "toolchains",
+                                "llvm",
+                                "prebuilt",
+                                ndk_host_arch,
+                                "bin",
+                                "",
+                              ])
+
+    if (target_cpu == "arm") {
+      tool_prefix = "arm-linux-androideabi"
+    } else if (target_cpu == "arm64") {
+      tool_prefix = "aarch64-linux-android"
+    } else if (target_cpu == "x86") {
+      tool_prefix = "i686-linux-android"
+    } else if (target_cpu == "x64") {
+      tool_prefix = "x86_64-linux-android"
+    } else if (target_cpu == "riscv64") {
+      tool_prefix = "riscv64-linux-android"
+    }
+
+    if (target_cpu == "arm") {
+      clang_prefix = "armv7a-linux-androideabi" + android_api_level
+    } else {
+      clang_prefix = tool_prefix + android_api_level
+    }
+
+    cc = ndk_bin_dir + clang_prefix + "-clang"
+    cxx = ndk_bin_dir + clang_prefix + "-clang++"
+    asm = cxx
+    ld = cxx
+    ar = ndk_bin_dir + tool_prefix + "-ar"
   } else {
     cc = "clang"
     cxx = "clang++"
@@ -618,10 +685,17 @@ if (mini_chromium_is_win) {
     toolchain("msvc_toolchain_$target_name") {
       # @rsp files are not used for simplicity, and because mini_chromium and
       # Crashpad shouldn't require them in any configurations.
-      cc = "cl.exe"
-      cxx = "cl.exe"
-      ar = "lib.exe"
-      ld = "link.exe"
+      if (mini_chromium_is_clang) {
+        cc = rebase_path(clang_path, root_build_dir) + "/bin/clang-cl.exe"
+        cxx = rebase_path(clang_path, root_build_dir) + "/bin/clang-cl.exe"
+        ar = rebase_path(clang_path, root_build_dir) + "/bin/lld-link.exe /lib"
+        ld = rebase_path(clang_path, root_build_dir) + "/bin/lld-link.exe"
+      } else {
+        cc = "cl.exe"
+        cxx = "cl.exe"
+        ar = "lib.exe"
+        ld = "link.exe"
+      }
       lib_switch = ""
       lib_dir_switch = "/LIBPATH:"
       env = invoker.environment_file
@@ -665,7 +739,7 @@ if (mini_chromium_is_win) {
       tool("cxx") {
         depfile = "{{output}}.d"
         pdbname = "{{target_out_dir}}/{{label_name}}_cc.pdb"
-        command = "ninja -t msvc -e $env -- $cxx /nologo /showIncludes {{defines}} {{include_dirs}} {{cflags}} {{cflags_c}}${extra_cflags}${extra_cflags_cc} /c {{source}} /Fo{{output}} /Fd\"$pdbname\""
+        command = "ninja -t msvc -e $env -- $cxx /nologo /showIncludes {{defines}} {{include_dirs}} {{cflags}} {{cflags_cc}}${extra_cflags}${extra_cflags_cc} /c {{source}} /Fo{{output}} /Fd\"$pdbname\""
         depsformat = "msvc"
         description = "CXX {{output}}"
         outputs =
@@ -701,17 +775,43 @@ if (mini_chromium_is_win) {
       }
 
       tool("asm") {
-        if (invoker.current_cpu == "arm64") {
-          ml = "armasm64.exe"
-          command = "$python_path $helper_path asm-wrapper $env $ml {{include_dirs}} {{asmflags}} -o {{output}} {{source}}"
+        is_msvc_assembler = true
+
+        if (mini_chromium_is_clang) {
+          if (invoker.current_cpu == "arm64") {
+            ml = "$cc --target=aarch64-pc-windows -o{{output}} /showIncludes"
+            is_msvc_assembler = false
+            depsformat = "msvc"
+          } else {
+            ml = rebase_path(clang_path, root_build_dir) + "/bin/llvm-ml.exe"
+            if (invoker.current_cpu == "x64") {
+              ml += " -m64"
+            } else {
+              ml += " -m32"
+            }
+          }
         } else {
-          if (invoker.current_cpu == "x86") {
+          if (invoker.current_cpu == "arm64") {
+            ml = "armasm64.exe"
+          } else if (invoker.current_cpu == "x64") {
+            ml = "ml64.exe"
+          } else {
             ml = "ml.exe"
+          }
+        }
+
+        if (is_msvc_assembler) {
+          ml += " /nologo /Fo{{output}}"
+
+          if (invoker.current_cpu == "arm64") {
+            command = "\"$python_path\" $helper_path asm-wrapper $env $ml {{include_dirs}} {{asmflags}} {{source}}"
           } else {
-            ml = "ml64.exe"
+            command = "\"$python_path\" $helper_path asm-wrapper $env $ml {{defines}} {{include_dirs}} {{asmflags}} /c {{source}}"
           }
-          command = "$python_path $helper_path asm-wrapper $env $ml {{defines}} {{include_dirs}} {{asmflags}} /c /Fo{{output}} {{source}}"
+        } else {
+          command = "ninja -t msvc -e $env -- $ml {{defines}} {{include_dirs}} {{asmflags}} {{source}}"
         }
+
         description = "ASM {{output}}"
         outputs =
             [ "{{source_out_dir}}/{{label_name}}.{{source_name_part}}.obj" ]
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/find_mac_sdk.py b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/find_mac_sdk.py
index 1c2aace276..6c8b0d3ddd 100755
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/find_mac_sdk.py
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/find_mac_sdk.py
@@ -1,14 +1,13 @@
 #!/usr/bin/env python
 # coding: utf-8
 
-# Copyright 2012 The Chromium Authors. All rights reserved.
+# Copyright 2012 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from __future__ import print_function
 
 import argparse
-import distutils.version
 import os
 import re
 import subprocess
@@ -16,149 +15,157 @@
 import textwrap
 
 
-def _AsVersion(string):
-  return distutils.version.StrictVersion(string)
+def _AsVersion(version_str):
+    return tuple((int(s) for s in re.findall(r'(\d+)', version_str)))
 
 
 def _RunXCRun(args, sdk=None):
-  xcrun_args = ['xcrun']
-  if sdk is not None:
-    xcrun_args.extend(['--sdk', sdk])
-  xcrun_args.extend(args)
-  return subprocess.check_output(xcrun_args).decode('utf-8').rstrip()
+    xcrun_args = ['xcrun']
+    if sdk is not None:
+        xcrun_args.extend(['--sdk', sdk])
+    xcrun_args.extend(args)
+    return subprocess.check_output(xcrun_args).decode('utf-8').rstrip()
 
 
 def _SDKPath(sdk=None):
-  return _RunXCRun(['--show-sdk-path'], sdk)
+    return _RunXCRun(['--show-sdk-path'], sdk)
 
 
 def _SDKVersion(sdk=None):
-  return _AsVersion(_RunXCRun(['--show-sdk-version'], sdk))
+    return _AsVersion(_RunXCRun(['--show-sdk-version'], sdk))
 
 
 class DidNotMeetCriteria(Exception):
-  pass
+    pass
 
 
 def _FindPlatformSDKWithMinimumVersion(platform, minimum_sdk_version_str):
-  minimum_sdk_version = _AsVersion(minimum_sdk_version_str)
-
-  # Try the SDKs that Xcode knows about.
-  xcodebuild_showsdks_subprocess = subprocess.Popen(
-      ['xcodebuild', '-showsdks'],
-      stdout=subprocess.PIPE,
-      stderr=open(os.devnull, 'w'))
-  xcodebuild_showsdks_output = (
-      xcodebuild_showsdks_subprocess.communicate()[0].decode('utf-8'))
-  if xcodebuild_showsdks_subprocess.returncode == 0:
-    # Collect strings instead of version objects to preserve the precise
-    # format used to identify each SDK.
-    sdk_version_strs = []
-    for line in xcodebuild_showsdks_output.splitlines():
-      match = re.match('[ \t].+[ \t]-sdk ' + re.escape(platform) + '(.+)$',
-                       line)
-      if match:
-        sdk_version_str = match.group(1)
-        if _AsVersion(sdk_version_str) >= minimum_sdk_version:
-          sdk_version_strs.append(sdk_version_str)
-
-    if len(sdk_version_strs) == 0:
-      raise DidNotMeetCriteria({'minimum': minimum_sdk_version_str,
-                                'platform': platform})
-    sdk_version_str = sorted(sdk_version_strs, key=_AsVersion)[0]
-    sdk_path = _SDKPath(platform + sdk_version_str)
-    sdk_version = _AsVersion(sdk_version_str)
-  else:
-    # Xcode may not be installed. If the command-line tools are installed, use
-    # the system’s default SDK if it meets the requirements.
-    sdk_path = _SDKPath()
-    sdk_version = _SDKVersion()
-    if sdk_version < minimum_sdk_version:
-      raise DidNotMeetCriteria({'minimum': minimum_sdk_version_str,
-                                'platform': platform,
-                                'sdk_path': sdk_path,
-                                'sdk_version': str(sdk_version)})
-
-  return (sdk_version, sdk_path)
+    minimum_sdk_version = _AsVersion(minimum_sdk_version_str)
+
+    # Try the SDKs that Xcode knows about.
+    xcodebuild_showsdks_subprocess = subprocess.Popen(
+        ['xcodebuild', '-showsdks'],
+        stdout=subprocess.PIPE,
+        stderr=open(os.devnull, 'w'))
+    xcodebuild_showsdks_output = (
+        xcodebuild_showsdks_subprocess.communicate()[0].decode('utf-8'))
+    if xcodebuild_showsdks_subprocess.returncode == 0:
+        # Collect strings instead of version objects to preserve the precise
+        # format used to identify each SDK.
+        sdk_version_strs = []
+        for line in xcodebuild_showsdks_output.splitlines():
+            match = re.match(
+                '[ \t].+[ \t]-sdk ' + re.escape(platform) + '(.+)$', line)
+            if match:
+                sdk_version_str = match.group(1)
+                if _AsVersion(sdk_version_str) >= minimum_sdk_version:
+                    sdk_version_strs.append(sdk_version_str)
+
+        if len(sdk_version_strs) == 0:
+            raise DidNotMeetCriteria({
+                'minimum': minimum_sdk_version_str,
+                'platform': platform
+            })
+        sdk_version_str = sorted(sdk_version_strs, key=_AsVersion)[0]
+        sdk_path = _SDKPath(platform + sdk_version_str)
+        sdk_version = _AsVersion(sdk_version_str)
+    else:
+        # Xcode may not be installed. If the command-line tools are installed,
+        # use the system’s default SDK if it meets the requirements.
+        sdk_path = _SDKPath()
+        sdk_version = _SDKVersion()
+        if sdk_version < minimum_sdk_version:
+            raise DidNotMeetCriteria({
+                'minimum': minimum_sdk_version_str,
+                'platform': platform,
+                'sdk_path': sdk_path,
+                'sdk_version': str(sdk_version)
+            })
+
+    return (sdk_version, sdk_path)
 
 
 def main(args):
-  parser = argparse.ArgumentParser(
-      description='Find an appropriate platform SDK',
-      epilog='Two lines will be written to standard output: the version of the '
-             'selected SDK, and its path.')
-  parser.add_argument('--developer-dir',
-                      help='path to Xcode or Command Line Tools')
-  parser.add_argument('--exact', help='an exact SDK version to find')
-  parser.add_argument('--minimum', help='the minimum SDK version to find')
-  parser.add_argument('--path', help='a known SDK path to validate')
-  parser.add_argument('--platform',
-                      default='macosx',
-                      help='the platform to target')
-  parsed = parser.parse_args(args)
-
-  if parsed.developer_dir is not None:
-    os.environ['DEVELOPER_DIR'] = parsed.developer_dir
-
-  if (os.environ.get('DEVELOPER_DIR') is None and
-      subprocess.call(['xcode-select', '--print-path'],
-                      stdout=open(os.devnull, 'w'),
-                      stderr=open(os.devnull, 'w')) != 0):
-    # This is friendlier than letting the first invocation of xcrun or
-    # xcodebuild show the UI prompting to install developer tools at an
-    # inopportune time.
-    hint = 'Install Xcode and run "sudo xcodebuild -license"'
-    if parsed.platform == 'macosx':
-      hint += ', or install Command Line Tools with "xcode-select --install"'
-    hint += ('. If necessary, run "sudo xcode-select --switch" to select an '
-             'active developer tools installation.')
-    hint = '\n'.join(textwrap.wrap(hint, 80))
-    print(os.path.basename(sys.argv[0]) +
-              ': No developer tools found.\n' +
+    parser = argparse.ArgumentParser(
+        description='Find an appropriate platform SDK',
+        epilog='Two lines will be written to standard output: the version of '
+        'the selected SDK, and its path.')
+    parser.add_argument('--developer-dir',
+                        help='path to Xcode or Command Line Tools')
+    parser.add_argument('--exact', help='an exact SDK version to find')
+    parser.add_argument('--minimum', help='the minimum SDK version to find')
+    parser.add_argument('--path', help='a known SDK path to validate')
+    parser.add_argument('--platform',
+                        default='macosx',
+                        help='the platform to target')
+    parsed = parser.parse_args(args)
+
+    if parsed.developer_dir is not None:
+        os.environ['DEVELOPER_DIR'] = parsed.developer_dir
+
+    if (os.environ.get('DEVELOPER_DIR') is None and
+            subprocess.call(['xcode-select', '--print-path'],
+                            stdout=open(os.devnull, 'w'),
+                            stderr=open(os.devnull, 'w')) != 0):
+        # This is friendlier than letting the first invocation of xcrun or
+        # xcodebuild show the UI prompting to install developer tools at an
+        # inopportune time.
+        hint = 'Install Xcode and run "sudo xcodebuild -license"'
+        if parsed.platform == 'macosx':
+            hint += (
+                ', or install Command Line Tools with "xcode-select --install"')
+        hint += (
+            '. If necessary, run "sudo xcode-select --switch" to select an '
+            'active developer tools installation.')
+        hint = '\n'.join(textwrap.wrap(hint, 80))
+        print(os.path.basename(sys.argv[0]) + ': No developer tools found.\n' +
               hint,
-          file=sys.stderr)
-    return 1
-
-  if parsed.path is not None:
-    # _SDKVersion() doesn’t work with a relative pathname argument or one that’s
-    # a symbolic link. Such paths are suitable for other purposes, like “clang
-    # -isysroot”, so use an absolute non-symbolic link path for _SDKVersion(),
-    # but preserve the user’s path in sdk_path.
-    sdk_version = _SDKVersion(os.path.realpath(parsed.path))
-    sdk_path = parsed.path
-  elif parsed.exact is None and parsed.minimum is None:
-    # Use the platform’s default SDK.
-    sdk_version = _SDKVersion(parsed.platform)
-    sdk_path = _SDKPath(parsed.platform)
-  elif parsed.exact is not None:
-    sdk_version = _SDKVersion(parsed.platform + parsed.exact)
-    sdk_path = _SDKPath(parsed.platform + parsed.exact)
-  else:
-    (sdk_version,
-     sdk_path) = _FindPlatformSDKWithMinimumVersion(parsed.platform,
-                                                    parsed.minimum)
-
-  # These checks may be redundant depending on how the SDK was chosen.
-  if ((parsed.exact is not None and sdk_version != _AsVersion(parsed.exact)) or
-      (parsed.minimum is not None and
-       sdk_version < _AsVersion(parsed.minimum))):
-    raise DidNotMeetCriteria({'developer_dir': parsed.developer_dir,
-                              'exact': parsed.exact,
-                              'minimum': parsed.minimum,
-                              'path': parsed.path,
-                              'platform': parsed.platform,
-                              'sdk_path': sdk_path,
-                              'sdk_version': str(sdk_version)})
-
-  # Nobody wants trailing slashes. This is true even if “/” is the SDK: it’s
-  # better to return an empty string, which will be interpreted as “no sysroot.”
-  sdk_path = sdk_path.rstrip(os.path.sep)
-
-  print(sdk_version)
-  print(sdk_path)
-
-  return 0
+              file=sys.stderr)
+        return 1
+
+    if parsed.path is not None:
+        # _SDKVersion() doesn’t work with a relative pathname argument or one
+        # that’s a symbolic link. Such paths are suitable for other purposes,
+        # like “clang -isysroot”, so use an absolute non-symbolic link path for
+        # _SDKVersion(), but preserve the user’s path in sdk_path.
+        sdk_version = _SDKVersion(os.path.realpath(parsed.path))
+        sdk_path = parsed.path
+    elif parsed.exact is None and parsed.minimum is None:
+        # Use the platform’s default SDK.
+        sdk_version = _SDKVersion(parsed.platform)
+        sdk_path = _SDKPath(parsed.platform)
+    elif parsed.exact is not None:
+        sdk_version = _SDKVersion(parsed.platform + parsed.exact)
+        sdk_path = _SDKPath(parsed.platform + parsed.exact)
+    else:
+        (sdk_version,
+         sdk_path) = _FindPlatformSDKWithMinimumVersion(parsed.platform,
+                                                        parsed.minimum)
+
+    # These checks may be redundant depending on how the SDK was chosen.
+    if ((parsed.exact is not None and sdk_version != _AsVersion(parsed.exact))
+            or (parsed.minimum is not None and
+                sdk_version < _AsVersion(parsed.minimum))):
+        raise DidNotMeetCriteria({
+            'developer_dir': parsed.developer_dir,
+            'exact': parsed.exact,
+            'minimum': parsed.minimum,
+            'path': parsed.path,
+            'platform': parsed.platform,
+            'sdk_path': sdk_path,
+            'sdk_version': str(sdk_version)
+        })
+
+    # Nobody wants trailing slashes. This is true even if “/” is the SDK: it’s
+    # better to return an empty string, which will be interpreted as “no
+    # sysroot.”
+    sdk_path = sdk_path.rstrip(os.path.sep)
+
+    print(sdk_version)
+    print(sdk_path)
+
+    return 0
 
 
 if __name__ == '__main__':
-  sys.exit(main(sys.argv[1:]))
+    sys.exit(main(sys.argv[1:]))
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/BUILD.gn b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/BUILD.gn
index 9643419778..c189fd1e37 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/BUILD.gn
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
+# Copyright 2014 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/BuildInfo.plist b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/BuildInfo.plist
index efd4e67013..6b0ae1f025 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/BuildInfo.plist
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/BuildInfo.plist
@@ -30,6 +30,7 @@
 	<array>
 		<integer>1</integer>
 		<integer>2</integer>
+		<integer>3</integer>
 	</array>
 </dict>
 </plist>
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/XCTRunnerAddition+Info.plist b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/XCTRunnerAddition+Info.plist
index c171601c2b..040d76c372 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/XCTRunnerAddition+Info.plist
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/XCTRunnerAddition+Info.plist
@@ -5,7 +5,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.apple.test.${EXECUTABLE_NAME}</string>
+	<string>${BUNDLE_IDENTIFIER}</string>
 	<key>CFBundleName</key>
 	<string>${PRODUCT_NAME}</string>
 </dict>
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/codesign.py b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/codesign.py
index e812978388..ac05d06f67 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/codesign.py
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/codesign.py
@@ -1,14 +1,15 @@
-#!/usr/bin/env python
-
-# Copyright 2016 The Chromium Authors. All rights reserved.
+# Copyright 2016 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+from __future__ import print_function
+
 import argparse
 import codecs
 import datetime
 import fnmatch
 import glob
+import json
 import os
 import plistlib
 import shutil
@@ -16,522 +17,710 @@
 import sys
 import tempfile
 
+if sys.version_info.major < 3:
+    basestring_compat = basestring
+else:
+    basestring_compat = str
 
-def GetProvisioningProfilesDir():
-  """Returns the location of the installed mobile provisioning profiles.
-
-  Returns:
-    The path to the directory containing the installed mobile provisioning
-    profiles as a string.
-  """
-  return os.path.join(
-      os.environ['HOME'], 'Library', 'MobileDevice', 'Provisioning Profiles')
-
-
-def LoadPlistFile(plist_path):
-  """Loads property list file at |plist_path|.
-
-  Args:
-    plist_path: path to the property list file to load.
-
-  Returns:
-    The content of the property list file as a python object.
-  """
-  return plistlib.readPlistFromString(subprocess.check_output([
-      'xcrun', 'plutil', '-convert', 'xml1', '-o', '-', plist_path]))
-
-
-class Bundle(object):
-  """Wraps a bundle."""
-
-  def __init__(self, bundle_path):
-    """Initializes the Bundle object with data from bundle Info.plist file."""
-    self._path = bundle_path
-    self._data = LoadPlistFile(os.path.join(self._path, 'Info.plist'))
 
-  @property
-  def path(self):
-    return self._path
+def GetProvisioningProfilesDir():
+    """Returns the location of the installed mobile provisioning profiles.
 
-  @property
-  def identifier(self):
-    return self._data['CFBundleIdentifier']
+    Returns:
+        The path to the directory containing the installed mobile provisioning
+        profiles as a string.
+    """
+    return os.path.join(os.environ['HOME'], 'Library', 'MobileDevice',
+                        'Provisioning Profiles')
 
-  @property
-  def binary_path(self):
-    return os.path.join(self._path, self._data['CFBundleExecutable'])
 
-  def Validate(self, expected_mappings):
-    """Checks that keys in the bundle have the expected value.
+def ReadPlistFromString(plist_bytes):
+    """Parse property list from given |plist_bytes|.
 
     Args:
-      expected_mappings: a dictionary of string to object, each mapping will
-      be looked up in the bundle data to check it has the same value (missing
-      values will be ignored)
+        plist_bytes: contents of property list to load. Must be bytes in python
+        3.
 
     Returns:
-      A dictionary of the key with a different value between expected_mappings
-      and the content of the bundle (i.e. errors) so that caller can format the
-      error message. The dictionary will be empty if there are no errors.
+        The contents of property list as a python object.
     """
-    errors = {}
-    for key, expected_value in expected_mappings.iteritems():
-      if key in self._data:
-        value = self._data[key]
-        if value != expected_value:
-          errors[key] = (value, expected_value)
-    return errors
-
-
-class ProvisioningProfile(object):
-  """Wraps a mobile provisioning profile file."""
+    if sys.version_info.major == 2:
+        return plistlib.readPlistFromString(plist_bytes)
+    else:
+        return plistlib.loads(plist_bytes)
 
-  def __init__(self, provisioning_profile_path):
-    """Initializes the ProvisioningProfile with data from profile file."""
-    self._path = provisioning_profile_path
-    self._data = plistlib.readPlistFromString(subprocess.check_output([
-        'xcrun', 'security', 'cms', '-D', '-u', 'certUsageAnyCA',
-        '-i', provisioning_profile_path]))
 
-  @property
-  def path(self):
-    return self._path
+def LoadPlistFile(plist_path):
+    """Loads property list file at |plist_path|.
 
-  @property
-  def application_identifier_pattern(self):
-    return self._data.get('Entitlements', {}).get('application-identifier', '')
+    Args:
+        plist_path: path to the property list file to load.
 
-  @property
-  def team_identifier(self):
-    return self._data.get('TeamIdentifier', [''])[0]
+    Returns:
+        The content of the property list file as a python object.
+    """
+    if sys.version_info.major == 2:
+        return plistlib.readPlistFromString(
+            subprocess.check_output(
+                ['xcrun', 'plutil', '-convert', 'xml1', '-o', '-', plist_path]))
+    else:
+        with open(plist_path, 'rb') as fp:
+            return plistlib.load(fp)
 
-  @property
-  def entitlements(self):
-    return self._data.get('Entitlements', {})
 
-  @property
-  def expiration_date(self):
-    return self._data.get('ExpirationDate', datetime.datetime.now())
+def CreateSymlink(value, location):
+    """Creates symlink with value at location if the target exists."""
+    target = os.path.join(os.path.dirname(location), value)
+    if os.path.exists(location):
+        os.unlink(location)
+    os.symlink(value, location)
 
-  def ValidToSignBundle(self, bundle_identifier):
-    """Checks whether the provisioning profile can sign bundle_identifier.
 
-    Args:
-      bundle_identifier: the identifier of the bundle that needs to be signed.
+class Bundle(object):
+    """Wraps a bundle."""
+
+    def __init__(self, bundle_path, platform):
+        """Initializes the Bundle object with data from bundle Info.plist
+        file."""
+        self._path = bundle_path
+        self._kind = Bundle.Kind(platform, os.path.splitext(bundle_path)[-1])
+        self._data = None
+
+    def Load(self):
+        self._data = LoadPlistFile(self.info_plist_path)
+
+    @staticmethod
+    def Kind(platform, extension):
+        if platform == 'appletvsimulator' or platform == 'appletvos':
+            return 'tvos'
+        if platform == 'iphonesimulator' or platform == 'iphoneos':
+            return 'ios'
+        if platform == 'macosx':
+            if extension == '.framework':
+                return 'mac_framework'
+            return 'mac'
+        raise ValueError('unknown bundle type %s for %s' %
+                         (extension, platform))
+
+    @property
+    def kind(self):
+        return self._kind
+
+    @property
+    def path(self):
+        return self._path
+
+    @property
+    def contents_dir(self):
+        if self._kind == 'mac':
+            return os.path.join(self.path, 'Contents')
+        if self._kind == 'mac_framework':
+            return os.path.join(self.path, 'Versions/A')
+        return self.path
+
+    @property
+    def executable_dir(self):
+        if self._kind == 'mac':
+            return os.path.join(self.contents_dir, 'MacOS')
+        return self.contents_dir
+
+    @property
+    def resources_dir(self):
+        if self._kind == 'mac' or self._kind == 'mac_framework':
+            return os.path.join(self.contents_dir, 'Resources')
+        return self.path
+
+    @property
+    def info_plist_path(self):
+        if self._kind == 'mac_framework':
+            return os.path.join(self.resources_dir, 'Info.plist')
+        return os.path.join(self.contents_dir, 'Info.plist')
+
+    @property
+    def signature_dir(self):
+        return os.path.join(self.contents_dir, '_CodeSignature')
+
+    @property
+    def identifier(self):
+        return self._data['CFBundleIdentifier']
+
+    @property
+    def binary_name(self):
+        return self._data['CFBundleExecutable']
+
+    @property
+    def binary_path(self):
+        return os.path.join(self.executable_dir, self.binary_name)
+
+    def Validate(self, expected_mappings):
+        """Checks that keys in the bundle have the expected value.
+
+        Args:
+            expected_mappings: a dictionary of string to object, each mapping
+            will be looked up in the bundle data to check it has the same value
+            (missing values will be ignored)
+
+        Returns:
+            A dictionary of the key with a different value between
+            expected_mappings and the content of the bundle (i.e. errors) so
+            that caller can format the error message. The dictionary will be
+            empty if there are no errors.
+        """
+        errors = {}
+        for key, expected_value in expected_mappings.items():
+            if key in self._data:
+                value = self._data[key]
+                if value != expected_value:
+                    errors[key] = (value, expected_value)
+        return errors
 
-    Returns:
-      True if the mobile provisioning profile can be used to sign a bundle
-      with the corresponding bundle_identifier, False otherwise.
-    """
-    return fnmatch.fnmatch(
-        '%s.%s' % (self.team_identifier, bundle_identifier),
-        self.application_identifier_pattern)
 
-  def Install(self, installation_path):
-    """Copies mobile provisioning profile info to |installation_path|."""
-    shutil.copy2(self.path, installation_path)
+class ProvisioningProfile(object):
+    """Wraps a mobile provisioning profile file."""
+
+    def __init__(self, provisioning_profile_path):
+        """Initializes the ProvisioningProfile with data from profile file."""
+        self._path = provisioning_profile_path
+        self._data = ReadPlistFromString(
+            subprocess.check_output([
+                'xcrun', 'security', 'cms', '-D', '-u', 'certUsageAnyCA', '-i',
+                provisioning_profile_path
+            ]))
+
+    @property
+    def path(self):
+        return self._path
+
+    @property
+    def team_identifier(self):
+        return self._data.get('TeamIdentifier', [''])[0]
+
+    @property
+    def name(self):
+        return self._data.get('Name', '')
+
+    @property
+    def application_identifier_pattern(self):
+        return self._data.get('Entitlements', {}).get('application-identifier',
+                                                      '')
+
+    @property
+    def application_identifier_prefix(self):
+        return self._data.get('ApplicationIdentifierPrefix', [''])[0]
+
+    @property
+    def entitlements(self):
+        return self._data.get('Entitlements', {})
+
+    @property
+    def expiration_date(self):
+        return self._data.get('ExpirationDate', datetime.datetime.now())
+
+    def ValidToSignBundle(self, bundle_identifier):
+        """Checks whether the provisioning profile can sign bundle_identifier.
+
+        Args:
+            bundle_identifier: the identifier of the bundle that needs to be
+            signed.
+
+        Returns:
+            True if the mobile provisioning profile can be used to sign a bundle
+            with the corresponding bundle_identifier, False otherwise.
+        """
+        return fnmatch.fnmatch(
+            '%s.%s' % (self.application_identifier_prefix, bundle_identifier),
+            self.application_identifier_pattern)
+
+    def Install(self, installation_path):
+        """Copies mobile provisioning profile info to |installation_path|."""
+        shutil.copy2(self.path, installation_path)
 
 
 class Entitlements(object):
-  """Wraps an Entitlement plist file."""
+    """Wraps an Entitlement plist file."""
 
-  def __init__(self, entitlements_path):
-    """Initializes Entitlements object from entitlement file."""
-    self._path = entitlements_path
-    self._data = LoadPlistFile(self._path)
+    def __init__(self, entitlements_path):
+        """Initializes Entitlements object from entitlement file."""
+        self._path = entitlements_path
+        self._data = LoadPlistFile(self._path)
 
-  @property
-  def path(self):
-    return self._path
+    @property
+    def path(self):
+        return self._path
 
-  def ExpandVariables(self, substitutions):
-    self._data = self._ExpandVariables(self._data, substitutions)
+    def ExpandVariables(self, substitutions):
+        self._data = self._ExpandVariables(self._data, substitutions)
 
-  def _ExpandVariables(self, data, substitutions):
-    if isinstance(data, str):
-      for key, substitution in substitutions.iteritems():
-        data = data.replace('$(%s)' % (key,), substitution)
-      return data
+    def _ExpandVariables(self, data, substitutions):
+        if isinstance(data, basestring_compat):
+            for key, substitution in substitutions.items():
+                data = data.replace('$(%s)' % (key,), substitution)
+            return data
 
-    if isinstance(data, dict):
-      for key, value in data.iteritems():
-        data[key] = self._ExpandVariables(value, substitutions)
-      return data
+        if isinstance(data, dict):
+            for key, value in data.items():
+                data[key] = self._ExpandVariables(value, substitutions)
+            return data
 
-    if isinstance(data, list):
-      for i, value in enumerate(data):
-        data[i] = self._ExpandVariables(value, substitutions)
+        if isinstance(data, list):
+            for i, value in enumerate(data):
+                data[i] = self._ExpandVariables(value, substitutions)
 
-    return data
+        return data
 
-  def LoadDefaults(self, defaults):
-    for key, value in defaults.iteritems():
-      if key not in self._data:
-        self._data[key] = value
+    def LoadDefaults(self, defaults):
+        for key, value in defaults.items():
+            if key not in self._data:
+                self._data[key] = value
 
-  def WriteTo(self, target_path):
-    plistlib.writePlist(self._data, target_path)
+    def WriteTo(self, target_path):
+        with open(target_path, 'wb') as fp:
+            if sys.version_info.major == 2:
+                plistlib.writePlist(self._data, fp)
+            else:
+                plistlib.dump(self._data, fp)
 
 
 def FindProvisioningProfile(bundle_identifier, required):
-  """Finds mobile provisioning profile to use to sign bundle.
-
-  Args:
-    bundle_identifier: the identifier of the bundle to sign.
-
-  Returns:
-    The ProvisioningProfile object that can be used to sign the Bundle
-    object or None if no matching provisioning profile was found.
-  """
-  provisioning_profile_paths = glob.glob(
-      os.path.join(GetProvisioningProfilesDir(), '*.mobileprovision'))
-
-  # Iterate over all installed mobile provisioning profiles and filter those
-  # that can be used to sign the bundle, ignoring expired ones.
-  now = datetime.datetime.now()
-  valid_provisioning_profiles = []
-  one_hour = datetime.timedelta(0, 3600)
-  for provisioning_profile_path in provisioning_profile_paths:
-    provisioning_profile = ProvisioningProfile(provisioning_profile_path)
-    if provisioning_profile.expiration_date - now < one_hour:
-      sys.stderr.write(
-          'Warning: ignoring expired provisioning profile: %s.\n' %
-          provisioning_profile_path)
-      continue
-    if provisioning_profile.ValidToSignBundle(bundle_identifier):
-      valid_provisioning_profiles.append(provisioning_profile)
-
-  if not valid_provisioning_profiles:
-    if required:
-      sys.stderr.write(
-          'Error: no mobile provisioning profile found for "%s".\n' %
-          bundle_identifier)
-      sys.exit(1)
-    return None
-
-  # Select the most specific mobile provisioning profile, i.e. the one with
-  # the longest application identifier pattern (prefer the one with the latest
-  # expiration date as a secondary criteria).
-  selected_provisioning_profile = max(
-      valid_provisioning_profiles,
-      key=lambda p: (len(p.application_identifier_pattern), p.expiration_date))
-
-  one_week = datetime.timedelta(7)
-  if selected_provisioning_profile.expiration_date - now < 2 * one_week:
-    sys.stderr.write(
-        'Warning: selected provisioning profile will expire soon: %s' %
-        selected_provisioning_profile.path)
-  return selected_provisioning_profile
+    """Finds mobile provisioning profile to use to sign bundle.
+
+    Args:
+        bundle_identifier: the identifier of the bundle to sign.
+
+    Returns:
+        The ProvisioningProfile object that can be used to sign the Bundle
+        object or None if no matching provisioning profile was found.
+    """
+    provisioning_profile_paths = glob.glob(
+        os.path.join(GetProvisioningProfilesDir(), '*.mobileprovision'))
+
+    # Iterate over all installed mobile provisioning profiles and filter those
+    # that can be used to sign the bundle, ignoring expired ones.
+    now = datetime.datetime.now()
+    valid_provisioning_profiles = []
+    one_hour = datetime.timedelta(0, 3600)
+    for provisioning_profile_path in provisioning_profile_paths:
+        provisioning_profile = ProvisioningProfile(provisioning_profile_path)
+        if provisioning_profile.expiration_date - now < one_hour:
+            sys.stderr.write(
+                'Warning: ignoring expired provisioning profile: %s.\n' %
+                provisioning_profile_path)
+            continue
+        if provisioning_profile.ValidToSignBundle(bundle_identifier):
+            valid_provisioning_profiles.append(provisioning_profile)
+
+    if not valid_provisioning_profiles:
+        if required:
+            sys.stderr.write(
+                'Error: no mobile provisioning profile found for "%s".\n' %
+                bundle_identifier)
+            sys.exit(1)
+        return None
+
+    # Select the most specific mobile provisioning profile, i.e. the one with
+    # the longest application identifier pattern (prefer the one with the latest
+    # expiration date as a secondary criteria).
+    selected_provisioning_profile = max(
+        valid_provisioning_profiles,
+        key=lambda p:
+        (len(p.application_identifier_pattern), p.expiration_date))
+
+    one_week = datetime.timedelta(7)
+    if selected_provisioning_profile.expiration_date - now < 2 * one_week:
+        sys.stderr.write(
+            'Warning: selected provisioning profile will expire soon: %s' %
+            selected_provisioning_profile.path)
+    return selected_provisioning_profile
 
 
 def CodeSignBundle(bundle_path, identity, extra_args):
-  process = subprocess.Popen(['xcrun', 'codesign', '--force', '--sign',
-      identity, '--timestamp=none'] + list(extra_args) + [bundle_path],
-      stderr=subprocess.PIPE)
-  _, stderr = process.communicate()
-  if process.returncode:
-    sys.stderr.write(stderr)
-    sys.exit(process.returncode)
-  for line in stderr.splitlines():
-    if line.endswith(': replacing existing signature'):
-      # Ignore warning about replacing existing signature as this should only
-      # happen when re-signing system frameworks (and then it is expected).
-      continue
-    sys.stderr.write(line)
-    sys.stderr.write('\n')
+    process = subprocess.Popen([
+        'xcrun', 'codesign', '--force', '--sign', identity, '--timestamp=none'
+    ] + list(extra_args) + [bundle_path],
+                               stderr=subprocess.PIPE,
+                               universal_newlines=True)
+    _, stderr = process.communicate()
+    if process.returncode:
+        sys.stderr.write(stderr)
+        sys.exit(process.returncode)
+    for line in stderr.splitlines():
+        if line.endswith(': replacing existing signature'):
+            # Ignore warning about replacing existing signature as this should only
+            # happen when re-signing system frameworks (and then it is expected).
+            continue
+        sys.stderr.write(line)
+        sys.stderr.write('\n')
 
 
 def InstallSystemFramework(framework_path, bundle_path, args):
-  """Install framework from |framework_path| to |bundle| and code-re-sign it."""
-  installed_framework_path = os.path.join(
-      bundle_path, 'Frameworks', os.path.basename(framework_path))
+    """Install framework from |framework_path| to |bundle| and code-re-sign
+    it."""
+    installed_framework_path = os.path.join(bundle_path, 'Frameworks',
+                                            os.path.basename(framework_path))
 
-  if os.path.isfile(framework_path):
-    shutil.copy(framework_path, installed_framework_path)
-  elif os.path.isdir(framework_path):
-    if os.path.exists(installed_framework_path):
-      shutil.rmtree(installed_framework_path)
-    shutil.copytree(framework_path, installed_framework_path)
+    if os.path.isfile(framework_path):
+        shutil.copy(framework_path, installed_framework_path)
+    elif os.path.isdir(framework_path):
+        if os.path.exists(installed_framework_path):
+            shutil.rmtree(installed_framework_path)
+        shutil.copytree(framework_path, installed_framework_path)
 
-  CodeSignBundle(installed_framework_path, args.identity,
-      ['--deep', '--preserve-metadata=identifier,entitlements,flags'])
+    CodeSignBundle(
+        installed_framework_path, args.identity,
+        ['--deep', '--preserve-metadata=identifier,entitlements,flags'])
 
 
 def GenerateEntitlements(path, provisioning_profile, bundle_identifier):
-  """Generates an entitlements file.
-
-  Args:
-    path: path to the entitlements template file
-    provisioning_profile: ProvisioningProfile object to use, may be None
-    bundle_identifier: identifier of the bundle to sign.
-  """
-  entitlements = Entitlements(path)
-  if provisioning_profile:
-    entitlements.LoadDefaults(provisioning_profile.entitlements)
-    app_identifier_prefix = provisioning_profile.team_identifier + '.'
-  else:
-    app_identifier_prefix = '*.'
-  entitlements.ExpandVariables({
-      'CFBundleIdentifier': bundle_identifier,
-      'AppIdentifierPrefix': app_identifier_prefix,
-  })
-  return entitlements
-
-
-def GenerateBundleInfoPlist(bundle_path, plist_compiler, partial_plist):
-  """Generates the bundle Info.plist for a list of partial .plist files.
-
-  Args:
-    bundle_path: path to the bundle
-    plist_compiler: string, path to the Info.plist compiler
-    partial_plist: list of path to partial .plist files to merge
-  """
-
-  # Filter empty partial .plist files (this happens if an application
-  # does not include need to compile any asset catalog, in which case
-  # the partial .plist file from the asset catalog compilation step is
-  # just a stamp file).
-  filtered_partial_plist = []
-  for plist in partial_plist:
-    plist_size = os.stat(plist).st_size
-    if plist_size:
-      filtered_partial_plist.append(plist)
-
-  # Invoke the plist_compiler script. It needs to be a python script.
-  subprocess.check_call([
-      'python', plist_compiler, 'merge', '-f', 'binary1',
-      '-o', os.path.join(bundle_path, 'Info.plist'),
-  ] + filtered_partial_plist)
-
-
-class Action(object):
-  """Class implementing one action supported by the script."""
+    """Generates an entitlements file.
 
-  @classmethod
-  def Register(cls, subparsers):
-    parser = subparsers.add_parser(cls.name, help=cls.help)
-    parser.set_defaults(func=cls._Execute)
-    cls._Register(parser)
-
-
-class CodeSignBundleAction(Action):
-  """Class implementing the code-sign-bundle action."""
-
-  name = 'code-sign-bundle'
-  help = 'perform code signature for a bundle'
-
-  @staticmethod
-  def _Register(parser):
-    parser.add_argument(
-        '--entitlements', '-e', dest='entitlements_path',
-        help='path to the entitlements file to use')
-    parser.add_argument(
-        'path', help='path to the iOS bundle to codesign')
-    parser.add_argument(
-        '--identity', '-i', required=True,
-        help='identity to use to codesign')
-    parser.add_argument(
-        '--binary', '-b', required=True,
-        help='path to the iOS bundle binary')
-    parser.add_argument(
-        '--framework', '-F', action='append', default=[], dest='frameworks',
-        help='install and resign system framework')
-    parser.add_argument(
-        '--disable-code-signature', action='store_true', dest='no_signature',
-        help='disable code signature')
-    parser.add_argument(
-        '--disable-embedded-mobileprovision', action='store_false',
-        default=True, dest='embedded_mobileprovision',
-        help='disable finding and embedding mobileprovision')
-    parser.add_argument(
-        '--platform', '-t', required=True,
-        help='platform the signed bundle is targeting')
-    parser.add_argument(
-        '--partial-info-plist', '-p', action='append', default=[],
-        help='path to partial Info.plist to merge to create bundle Info.plist')
-    parser.add_argument(
-        '--plist-compiler-path', '-P', action='store',
-        help='path to the plist compiler script (for --partial-info-plist)')
-    parser.set_defaults(no_signature=False)
-
-  @staticmethod
-  def _Execute(args):
-    if not args.identity:
-      args.identity = '-'
-
-    if args.partial_info_plist:
-      GenerateBundleInfoPlist(
-          args.path,
-          args.plist_compiler_path,
-          args.partial_info_plist)
-
-    bundle = Bundle(args.path)
-
-    # According to Apple documentation, the application binary must be the same
-    # as the bundle name without the .app suffix. See crbug.com/740476 for more
-    # information on what problem this can cause.
-    #
-    # To prevent this class of error, fail with an error if the binary name is
-    # incorrect in the Info.plist as it is not possible to update the value in
-    # Info.plist at this point (the file has been copied by a different target
-    # and ninja would consider the build dirty if it was updated).
-    #
-    # Also checks that the name of the bundle is correct too (does not cause the
-    # build to be considered dirty, but still terminate the script in case of an
-    # incorrect bundle name).
-    #
-    # Apple documentation is available at:
-    # https://developer.apple.com/library/content/documentation/CoreFoundation/Conceptual/CFBundles/BundleTypes/BundleTypes.html
-    bundle_name = os.path.splitext(os.path.basename(bundle.path))[0]
-    errors = bundle.Validate({
-        'CFBundleName': bundle_name,
-        'CFBundleExecutable': bundle_name,
+    Args:
+        path: path to the entitlements template file
+        provisioning_profile: ProvisioningProfile object to use, may be None
+        bundle_identifier: identifier of the bundle to sign.
+    """
+    entitlements = Entitlements(path)
+    if provisioning_profile:
+        entitlements.LoadDefaults(provisioning_profile.entitlements)
+        app_identifier_prefix = \
+          provisioning_profile.application_identifier_prefix + '.'
+    else:
+        app_identifier_prefix = '*.'
+    entitlements.ExpandVariables({
+        'CFBundleIdentifier': bundle_identifier,
+        'AppIdentifierPrefix': app_identifier_prefix,
     })
-    if errors:
-      for key in sorted(errors):
-        value, expected_value = errors[key]
-        sys.stderr.write('%s: error: %s value incorrect: %s != %s\n' % (
-            bundle.path, key, value, expected_value))
-      sys.stderr.flush()
-      sys.exit(1)
-
-    # Delete existing embedded mobile provisioning.
-    embedded_provisioning_profile = os.path.join(
-        bundle.path, 'embedded.mobileprovision')
-    if os.path.isfile(embedded_provisioning_profile):
-      os.unlink(embedded_provisioning_profile)
-
-    # Delete existing code signature.
-    signature_file = os.path.join(args.path, '_CodeSignature', 'CodeResources')
-    if os.path.isfile(signature_file):
-      shutil.rmtree(os.path.dirname(signature_file))
-
-    # Install system frameworks if requested.
-    for framework_path in args.frameworks:
-      InstallSystemFramework(framework_path, args.path, args)
-
-    # Copy main binary into bundle.
-    if os.path.isfile(bundle.binary_path):
-      os.unlink(bundle.binary_path)
-    shutil.copy(args.binary, bundle.binary_path)
-
-    if args.no_signature:
-      return
-
-    codesign_extra_args = []
-
-    if args.embedded_mobileprovision:
-      # Find mobile provisioning profile and embeds it into the bundle (if a
-      # code signing identify has been provided, fails if no valid mobile
-      # provisioning is found).
-      provisioning_profile_required = args.identity != '-'
-      provisioning_profile = FindProvisioningProfile(
-          bundle.identifier, provisioning_profile_required)
-      if provisioning_profile and args.platform != 'iphonesimulator':
-        provisioning_profile.Install(embedded_provisioning_profile)
-
-        if args.entitlements_path is not None:
-          temporary_entitlements_file = \
-              tempfile.NamedTemporaryFile(suffix='.xcent')
-          codesign_extra_args.extend(
-              ['--entitlements', temporary_entitlements_file.name])
-
-          entitlements = GenerateEntitlements(
-              args.entitlements_path, provisioning_profile, bundle.identifier)
-          entitlements.WriteTo(temporary_entitlements_file.name)
-
-    CodeSignBundle(bundle.path, args.identity, codesign_extra_args)
+    return entitlements
 
 
-class CodeSignFileAction(Action):
-  """Class implementing code signature for a single file."""
+def GenerateBundleInfoPlist(bundle, plist_compiler, partial_plist):
+    """Generates the bundle Info.plist for a list of partial .plist files.
 
-  name = 'code-sign-file'
-  help = 'code-sign a single file'
+    Args:
+        bundle: a Bundle instance
+        plist_compiler: string, path to the Info.plist compiler
+        partial_plist: list of path to partial .plist files to merge
+    """
+
+    # Filter empty partial .plist files (this happens if an application
+    # does not compile any asset catalog, in which case the partial .plist
+    # file from the asset catalog compilation step is just a stamp file).
+    filtered_partial_plist = []
+    for plist in partial_plist:
+        plist_size = os.stat(plist).st_size
+        if plist_size:
+            filtered_partial_plist.append(plist)
+
+    # Invoke the plist_compiler script. It needs to be a python script.
+    subprocess.check_call([
+        'python3',
+        plist_compiler,
+        'merge',
+        '-f',
+        'binary1',
+        '-o',
+        bundle.info_plist_path,
+    ] + filtered_partial_plist)
 
-  @staticmethod
-  def _Register(parser):
-    parser.add_argument(
-        'path', help='path to the file to codesign')
-    parser.add_argument(
-        '--identity', '-i', required=True,
-        help='identity to use to codesign')
-    parser.add_argument(
-        '--output', '-o',
-        help='if specified copy the file to that location before signing it')
-    parser.set_defaults(sign=True)
 
-  @staticmethod
-  def _Execute(args):
-    if not args.identity:
-      args.identity = '-'
+class Action(object):
+    """Class implementing one action supported by the script."""
 
-    install_path = args.path
-    if args.output:
+    @classmethod
+    def Register(cls, subparsers):
+        parser = subparsers.add_parser(cls.name, help=cls.help)
+        parser.set_defaults(func=cls._Execute)
+        cls._Register(parser)
 
-      if os.path.isfile(args.output):
-        os.unlink(args.output)
-      elif os.path.isdir(args.output):
-        shutil.rmtree(args.output)
 
-      if os.path.isfile(args.path):
-        shutil.copy(args.path, args.output)
-      elif os.path.isdir(args.path):
-        shutil.copytree(args.path, args.output)
+class CodeSignBundleAction(Action):
+    """Class implementing the code-sign-bundle action."""
+
+    name = 'code-sign-bundle'
+    help = 'perform code signature for a bundle'
+
+    @staticmethod
+    def _Register(parser):
+        parser.add_argument('--entitlements',
+                            '-e',
+                            dest='entitlements_path',
+                            help='path to the entitlements file to use')
+        parser.add_argument('path', help='path to the iOS bundle to codesign')
+        parser.add_argument('--identity',
+                            '-i',
+                            required=True,
+                            help='identity to use to codesign')
+        parser.add_argument('--binary',
+                            '-b',
+                            required=True,
+                            help='path to the iOS bundle binary')
+        parser.add_argument('--framework',
+                            '-F',
+                            action='append',
+                            default=[],
+                            dest='frameworks',
+                            help='install and resign system framework')
+        parser.add_argument('--disable-code-signature',
+                            action='store_true',
+                            dest='no_signature',
+                            help='disable code signature')
+        parser.add_argument(
+            '--disable-embedded-mobileprovision',
+            action='store_false',
+            default=True,
+            dest='embedded_mobileprovision',
+            help='disable finding and embedding mobileprovision')
+        parser.add_argument('--platform',
+                            '-t',
+                            required=True,
+                            help='platform the signed bundle is targeting')
+        parser.add_argument(
+            '--partial-info-plist',
+            '-p',
+            action='append',
+            default=[],
+            help=
+            'path to partial Info.plist to merge to create bundle Info.plist')
+        parser.add_argument(
+            '--plist-compiler-path',
+            '-P',
+            action='store',
+            help='path to the plist compiler script (for --partial-info-plist)')
+        parser.set_defaults(no_signature=False)
+
+    @staticmethod
+    def _Execute(args):
+        if not args.identity:
+            args.identity = '-'
+
+        bundle = Bundle(args.path, args.platform)
+
+        if args.partial_info_plist:
+            GenerateBundleInfoPlist(bundle, args.plist_compiler_path,
+                                    args.partial_info_plist)
+
+        # The bundle Info.plist may have been updated by
+        # GenerateBundleInfoPlist() above. Load the bundle information from
+        # Info.plist after the modification have been written to disk.
+        bundle.Load()
+
+        # According to Apple documentation, the application binary must be the
+        # same as the bundle name without the .app suffix. See crbug.com/740476
+        # for more information on what problem this can cause.
+        #
+        # To prevent this class of error, fail with an error if the binary name
+        # is incorrect in the Info.plist as it is not possible to update the
+        # value in Info.plist at this point (the file has been copied by a
+        # different target and ninja would consider the build dirty if it was
+        # updated).
+        #
+        # Also checks that the name of the bundle is correct too (does not cause
+        # the build to be considered dirty, but still terminate the script in
+        # case of an incorrect bundle name).
+        #
+        # Apple documentation is available at:
+        # https://developer.apple.com/library/content/documentation/CoreFoundation/Conceptual/CFBundles/BundleTypes/BundleTypes.html
+        bundle_name = os.path.splitext(os.path.basename(bundle.path))[0]
+        errors = bundle.Validate({
+            'CFBundleName': bundle_name,
+            'CFBundleExecutable': bundle_name,
+        })
+        if errors:
+            for key in sorted(errors):
+                value, expected_value = errors[key]
+                sys.stderr.write('%s: error: %s value incorrect: %s != %s\n' %
+                                 (bundle.path, key, value, expected_value))
+            sys.stderr.flush()
+            sys.exit(1)
+
+        # Delete existing embedded mobile provisioning.
+        embedded_provisioning_profile = os.path.join(
+            bundle.path, 'embedded.mobileprovision')
+        if os.path.isfile(embedded_provisioning_profile):
+            os.unlink(embedded_provisioning_profile)
+
+        # Delete existing code signature.
+        if os.path.exists(bundle.signature_dir):
+            shutil.rmtree(bundle.signature_dir)
+
+        # Install system frameworks if requested.
+        for framework_path in args.frameworks:
+            InstallSystemFramework(framework_path, args.path, args)
+
+        # Copy main binary into bundle.
+        if not os.path.isdir(bundle.executable_dir):
+            os.makedirs(bundle.executable_dir)
+        shutil.copy(args.binary, bundle.binary_path)
+
+        if bundle.kind == 'mac_framework':
+            # Create Versions/Current -> Versions/A symlink
+            CreateSymlink('A', os.path.join(bundle.path, 'Versions/Current'))
+
+            # Create $binary_name -> Versions/Current/$binary_name symlink
+            CreateSymlink(os.path.join('Versions/Current', bundle.binary_name),
+                          os.path.join(bundle.path, bundle.binary_name))
+
+            # Create optional symlinks.
+            for name in ('Headers', 'Resources', 'Modules'):
+                target = os.path.join(bundle.path, 'Versions/A', name)
+                if os.path.exists(target):
+                    CreateSymlink(os.path.join('Versions/Current', name),
+                                  os.path.join(bundle.path, name))
+                else:
+                    obsolete_path = os.path.join(bundle.path, name)
+                    if os.path.exists(obsolete_path):
+                        os.unlink(obsolete_path)
+
+        if args.no_signature:
+            return
+
+        codesign_extra_args = []
+
+        if args.embedded_mobileprovision:
+            # Find mobile provisioning profile and embeds it into the bundle (if
+            # a code signing identify has been provided, fails if no valid
+            # mobile provisioning is found).
+            provisioning_profile_required = args.identity != '-'
+            provisioning_profile = FindProvisioningProfile(
+                bundle.identifier, provisioning_profile_required)
+            if provisioning_profile and args.platform != 'iphonesimulator':
+                provisioning_profile.Install(embedded_provisioning_profile)
+
+                if args.entitlements_path is not None:
+                    temporary_entitlements_file = \
+                        tempfile.NamedTemporaryFile(suffix='.xcent')
+                    codesign_extra_args.extend(
+                        ['--entitlements', temporary_entitlements_file.name])
+
+                    entitlements = GenerateEntitlements(args.entitlements_path,
+                                                        provisioning_profile,
+                                                        bundle.identifier)
+                    entitlements.WriteTo(temporary_entitlements_file.name)
+
+        CodeSignBundle(bundle.path, args.identity, codesign_extra_args)
 
-      install_path = args.output
 
-    CodeSignBundle(install_path, args.identity,
-      ['--deep', '--preserve-metadata=identifier,entitlements'])
+class CodeSignFileAction(Action):
+    """Class implementing code signature for a single file."""
+
+    name = 'code-sign-file'
+    help = 'code-sign a single file'
+
+    @staticmethod
+    def _Register(parser):
+        parser.add_argument('path', help='path to the file to codesign')
+        parser.add_argument('--identity',
+                            '-i',
+                            required=True,
+                            help='identity to use to codesign')
+        parser.add_argument(
+            '--output',
+            '-o',
+            help='if specified copy the file to that location before signing it'
+        )
+        parser.set_defaults(sign=True)
+
+    @staticmethod
+    def _Execute(args):
+        if not args.identity:
+            args.identity = '-'
+
+        install_path = args.path
+        if args.output:
+
+            if os.path.isfile(args.output):
+                os.unlink(args.output)
+            elif os.path.isdir(args.output):
+                shutil.rmtree(args.output)
+
+            if os.path.isfile(args.path):
+                shutil.copy(args.path, args.output)
+            elif os.path.isdir(args.path):
+                shutil.copytree(args.path, args.output)
+
+            install_path = args.output
+
+        CodeSignBundle(
+            install_path, args.identity,
+            ['--deep', '--preserve-metadata=identifier,entitlements'])
 
 
 class GenerateEntitlementsAction(Action):
-  """Class implementing the generate-entitlements action."""
-
-  name = 'generate-entitlements'
-  help = 'generate entitlements file'
-
-  @staticmethod
-  def _Register(parser):
-    parser.add_argument(
-        '--entitlements', '-e', dest='entitlements_path',
-        help='path to the entitlements file to use')
-    parser.add_argument(
-        'path', help='path to the entitlements file to generate')
-    parser.add_argument(
-        '--info-plist', '-p', required=True,
-        help='path to the bundle Info.plist')
-
-  @staticmethod
-  def _Execute(args):
-    info_plist = LoadPlistFile(args.info_plist)
-    bundle_identifier = info_plist['CFBundleIdentifier']
-    provisioning_profile = FindProvisioningProfile(bundle_identifier, False)
-    entitlements = GenerateEntitlements(
-        args.entitlements_path, provisioning_profile, bundle_identifier)
-    entitlements.WriteTo(args.path)
+    """Class implementing the generate-entitlements action."""
+
+    name = 'generate-entitlements'
+    help = 'generate entitlements file'
+
+    @staticmethod
+    def _Register(parser):
+        parser.add_argument('--entitlements',
+                            '-e',
+                            dest='entitlements_path',
+                            help='path to the entitlements file to use')
+        parser.add_argument('path',
+                            help='path to the entitlements file to generate')
+        parser.add_argument('--info-plist',
+                            '-p',
+                            required=True,
+                            help='path to the bundle Info.plist')
+
+    @staticmethod
+    def _Execute(args):
+        info_plist = LoadPlistFile(args.info_plist)
+        bundle_identifier = info_plist['CFBundleIdentifier']
+        provisioning_profile = FindProvisioningProfile(bundle_identifier, False)
+        entitlements = GenerateEntitlements(args.entitlements_path,
+                                            provisioning_profile,
+                                            bundle_identifier)
+        entitlements.WriteTo(args.path)
+
+
+class FindProvisioningProfileAction(Action):
+    """Class implementing the find-codesign-identity action."""
+
+    name = 'find-provisioning-profile'
+    help = 'find provisioning profile for use by Xcode project generator'
+
+    @staticmethod
+    def _Register(parser):
+        parser.add_argument('--bundle-id',
+                            '-b',
+                            required=True,
+                            help='bundle identifier')
+
+    @staticmethod
+    def _Execute(args):
+        provisioning_profile_info = {}
+        provisioning_profile = FindProvisioningProfile(args.bundle_id, False)
+        for key in ('team_identifier', 'name'):
+            if provisioning_profile:
+                provisioning_profile_info[key] = getattr(
+                    provisioning_profile, key)
+            else:
+                provisioning_profile_info[key] = ''
+        print(json.dumps(provisioning_profile_info))
 
 
 def Main():
-  # Cache this codec so that plistlib can find it. See
-  # https://crbug.com/999461#c12 for more details.
-  codecs.lookup('utf-8')
+    # Cache this codec so that plistlib can find it. See
+    # https://crbug.com/999461#c12 for more details.
+    codecs.lookup('utf-8')
 
-  parser = argparse.ArgumentParser('codesign iOS bundles')
-  subparsers = parser.add_subparsers()
+    parser = argparse.ArgumentParser('codesign iOS bundles')
+    subparsers = parser.add_subparsers()
 
-  actions = [
-      CodeSignBundleAction,
-      CodeSignFileAction,
-      GenerateEntitlementsAction,
-  ]
+    actions = [
+        CodeSignBundleAction,
+        CodeSignFileAction,
+        GenerateEntitlementsAction,
+        FindProvisioningProfileAction,
+    ]
 
-  for action in actions:
-    action.Register(subparsers)
+    for action in actions:
+        action.Register(subparsers)
 
-  args = parser.parse_args()
-  args.func(args)
+    args = parser.parse_args()
+    args.func(args)
 
 
 if __name__ == '__main__':
-  sys.exit(Main())
+    sys.exit(Main())
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/find_signing_identity.py b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/find_signing_identity.py
index 985281b504..d4e734a9cb 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/find_signing_identity.py
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/find_signing_identity.py
@@ -1,6 +1,4 @@
-#!/usr/bin/env python
-
-# Copyright 2015 The Chromium Authors. All rights reserved.
+# Copyright 2015 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -12,35 +10,83 @@
 import sys
 import re
 
+
+def Redact(value, from_nth_char=5):
+    """Redact value past the N-th character."""
+    return value[:from_nth_char] + '*' * (len(value) - from_nth_char)
+
+
+class Identity(object):
+    """Represents a valid identity."""
+
+    def __init__(self, identifier, name, team):
+        self.identifier = identifier
+        self.name = name
+        self.team = team
+
+    def redacted(self):
+        return Identity(Redact(self.identifier), self.name, Redact(self.team))
+
+    def format(self):
+        return '%s: "%s (%s)"' % (self.identifier, self.name, self.team)
+
+
 def ListIdentities():
-  return subprocess.check_output([
-    'xcrun',
-    'security',
-    'find-identity',
-    '-v',
-    '-p',
-    'codesigning',
-  ])
-
-
-def FindValidIdentity(identity_description):
-  lines = list(map(str.strip, ListIdentities().splitlines()))
-  # Look for something like "2) XYZ "iPhone Developer: Name (ABC)""
-  exp = re.compile('[0-9]+\) ([A-F0-9]+) "([^"]*)"')
-  for line in lines:
-    res = exp.match(line)
-    if res is None:
-      continue
-    if identity_description in res.group(2):
-      yield res.group(1)
+    return subprocess.check_output([
+        'xcrun',
+        'security',
+        'find-identity',
+        '-v',
+        '-p',
+        'codesigning',
+    ]).decode('utf8')
+
+
+def FindValidIdentity(pattern):
+    """Find all identities matching the pattern."""
+    lines = list(l.strip() for l in ListIdentities().splitlines())
+    # Look for something like "2) XYZ "iPhone Developer: Name (ABC)""
+    regex = re.compile('[0-9]+\) ([A-F0-9]+) "([^"(]*) \(([^)"]*)\)"')
+
+    result = []
+    for line in lines:
+        res = regex.match(line)
+        if res is None:
+            continue
+        if pattern is None or pattern in res.group(2):
+            result.append(Identity(*res.groups()))
+    return result
+
+
+def Main(args):
+    parser = argparse.ArgumentParser('codesign iOS bundles')
+    parser.add_argument(
+        '--identity-description',
+        required=True,
+        dest='pattern',
+        help='Text description used to select the code signing identity.')
+    parsed = parser.parse_args(args)
+
+    identities = FindValidIdentity(parsed.pattern)
+    if len(identities) == 1:
+        print(identities[0].identifier, end='')
+        return 0
+
+    all_identities = FindValidIdentity(None)
+
+    print('Automatic code signing identity selection was enabled but could not')
+    print('find exactly one codesigning identity matching "%s".' %
+          parsed.pattern)
+    print('')
+    print('Check that the keychain is accessible and that there is exactly one')
+    print('valid codesigning identity matching the pattern. Here is the parsed')
+    print('output of `xcrun security find-identity -v -p codesigning`:')
+    print()
+    for i, identity in enumerate(all_identities):
+        print('  %d) %s' % (i + 1, identity.redacted().format()))
+    print('    %d valid identities found' % (len(all_identities)))
+    return 1
 
 
 if __name__ == '__main__':
-  parser = argparse.ArgumentParser('codesign iOS bundles')
-  parser.add_argument(
-      '--identity-description', required=True,
-      help='Text description used to select the code signing identity.')
-  args = parser.parse_args()
-
-  for identity in FindValidIdentity(args.identity_description):
-    print(identity)
+    sys.exit(Main(sys.argv[1:]))
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/ios_sdk.gni b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/ios_sdk.gni
index 1aacf49997..dff747f18a 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/ios_sdk.gni
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/ios_sdk.gni
@@ -1,4 +1,4 @@
-# Copyright 2015 The Chromium Authors. All rights reserved.
+# Copyright 2015 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -6,7 +6,7 @@ declare_args() {
   # The minimum runtime iOS version that built products are expected to run
   # on.  If empty, the toolchain will choose its own default, typically the
   # most recent OS version.
-  ios_deployment_target = "12.0"
+  ios_deployment_target = "14.0"
 
   # SDK path to use. When empty this will use the default SDK based on the
   # value of use_ios_simulator.
@@ -21,18 +21,47 @@ declare_args() {
   ios_enable_code_signing = true
   ios_code_signing_identity = ""
   ios_code_signing_identity_description = "Apple Development"
+
+  # Configure the environment for which to build. Could be either "device",
+  # "simulator" or "catalyst". If unspecified, then it will be assumed to be
+  # "simulator" if the target_cpu is "x68" or "x64", "device" otherwise. The
+  # default is only there for compatibility reasons and will be removed (see
+  # crbug.com/1138425 for more details).
+  target_environment = ""
+
+  # The iOS-based platform being targeted. Possible values: "iphoneos", "tvos".
+  # The default is "iphoneos".
+  target_platform = "iphoneos"
+}
+
+if (target_environment == "") {
+  if (current_cpu == "x86" || current_cpu == "x64") {
+    target_environment = "simulator"
+  } else {
+    target_environment = "device"
+  }
 }
 
-use_ios_simulator = current_cpu == "x86" || current_cpu == "x64"
+use_ios_simulator = target_environment == "simulator"
 
 if (ios_sdk_path == "") {
   # Compute default target.
-  if (use_ios_simulator) {
-    ios_sdk_name = "iphonesimulator"
-    ios_sdk_platform = "iPhoneSimulator"
-  } else {
-    ios_sdk_name = "iphoneos"
-    ios_sdk_platform = "iPhoneOS"
+  if (target_platform == "iphoneos") {
+    if (use_ios_simulator) {
+      ios_sdk_name = "iphonesimulator"
+      ios_sdk_platform = "iPhoneSimulator"
+    } else {
+      ios_sdk_name = "iphoneos"
+      ios_sdk_platform = "iPhoneOS"
+    }
+  } else if (target_platform == "tvos") {
+    if (use_ios_simulator) {
+      ios_sdk_name = "appletvsimulator"
+      ios_sdk_platform = "AppleTVSimulator"
+    } else {
+      ios_sdk_name = "appletvos"
+      ios_sdk_platform = "AppleTVOS"
+    }
   }
 
   ios_sdk_info_args = [ "--get_sdk_info" ]
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/plist_util.py b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/plist_util.py
index f908835538..7873a78862 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/plist_util.py
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/plist_util.py
@@ -1,25 +1,27 @@
-#!/usr/bin/env python
-
-# Copyright 2016 The Chromium Authors. All rights reserved.
+# Copyright 2016 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import argparse
+import codecs
 import plistlib
 import os
 import re
 import subprocess
 import sys
 import tempfile
-import shlex
 
+if sys.version_info.major < 3:
+    basestring_compat = basestring
+else:
+    basestring_compat = str
 
 # Xcode substitutes variables like ${PRODUCT_NAME} or $(PRODUCT_NAME) when
-# compiling Info.plist. It also supports supports modifiers like :identifier
-# or :rfc1034identifier. SUBSTITUTION_REGEXP_LIST is a list of regular
-# expressions matching a variable substitution pattern with an optional
-# modifier, while INVALID_CHARACTER_REGEXP matches all characters that are
-# not valid in an "identifier" value (used when applying the modifier).
+# compiling Info.plist. It also supports supports modifiers like :identifier or
+# :rfc1034identifier. SUBSTITUTION_REGEXP_LIST is a list of regular expressions
+# matching a variable substitution pattern with an optional modifier, while
+# INVALID_CHARACTER_REGEXP matches all characters that are not valid in an
+# "identifier" value (used when applying the modifier).
 INVALID_CHARACTER_REGEXP = re.compile(r'[_/\s]')
 SUBSTITUTION_REGEXP_LIST = (
     re.compile(r'\$\{(?P<id>[^}]*?)(?P<modifier>:[^}]*)?\}'),
@@ -28,201 +30,244 @@
 
 
 class SubstitutionError(Exception):
-  def __init__(self, key):
-    super(SubstitutionError, self).__init__()
-    self.key = key
 
-  def __str__(self):
-    return "SubstitutionError: {}".format(self.key)
+    def __init__(self, key):
+        super(SubstitutionError, self).__init__()
+        self.key = key
+
+    def __str__(self):
+        return "SubstitutionError: {}".format(self.key)
 
 
 def InterpolateString(value, substitutions):
-  """Interpolates variable references into |value| using |substitutions|.
-
-  Inputs:
-    value: a string
-    substitutions: a mapping of variable names to values
-
-  Returns:
-    A new string with all variables references ${VARIABLES} replaced by their
-    value in |substitutions|. Raises SubstitutionError if a variable has no
-    substitution.
-  """
-  def repl(match):
-    variable = match.group('id')
-    if variable not in substitutions:
-      raise SubstitutionError(variable)
-    # Some values need to be identifier and thus the variables references may
-    # contains :modifier attributes to indicate how they should be converted
-    # to identifiers ("identifier" replaces all invalid characters by '_' and
-    # "rfc1034identifier" replaces them by "-" to make valid URI too).
-    modifier = match.group('modifier')
-    if modifier == ':identifier':
-      return INVALID_CHARACTER_REGEXP.sub('_', substitutions[variable])
-    elif modifier == ':rfc1034identifier':
-      return INVALID_CHARACTER_REGEXP.sub('-', substitutions[variable])
-    else:
-      return substitutions[variable]
-  for substitution_regexp in SUBSTITUTION_REGEXP_LIST:
-    value = substitution_regexp.sub(repl, value)
-  return value
+    """Interpolates variable references into |value| using |substitutions|.
+
+    Args:
+        value: a string
+        substitutions: a mapping of variable names to values
+
+    Returns:
+        A new string with all variables references ${VARIABLES} replaced by
+        their value in |substitutions|. Raises SubstitutionError if a variable
+        has no substitution.
+    """
+
+    def repl(match):
+        variable = match.group('id')
+        if variable not in substitutions:
+            raise SubstitutionError(variable)
+        # Some values need to be identifier and thus the variables references
+        # may contains :modifier attributes to indicate how they should be
+        # converted to identifiers ("identifier" replaces all invalid characters
+        # by '_' and "rfc1034identifier" replaces them by "-" to make valid URI
+        # too).
+        modifier = match.group('modifier')
+        if modifier == ':identifier':
+            return INVALID_CHARACTER_REGEXP.sub('_', substitutions[variable])
+        elif modifier == ':rfc1034identifier':
+            return INVALID_CHARACTER_REGEXP.sub('-', substitutions[variable])
+        else:
+            return substitutions[variable]
+
+    for substitution_regexp in SUBSTITUTION_REGEXP_LIST:
+        value = substitution_regexp.sub(repl, value)
+    return value
 
 
 def Interpolate(value, substitutions):
-  """Interpolates variable references into |value| using |substitutions|.
-
-  Inputs:
-    value: a value, can be a dictionary, list, string or other
-    substitutions: a mapping of variable names to values
-
-  Returns:
-    A new value with all variables references ${VARIABLES} replaced by their
-    value in |substitutions|. Raises SubstitutionError if a variable has no
-    substitution.
-  """
-  if isinstance(value, dict):
-      return {k: Interpolate(v, substitutions) for k, v in value.iteritems()}
-  if isinstance(value, list):
-    return [Interpolate(v, substitutions) for v in value]
-  if isinstance(value, str):
-    return InterpolateString(value, substitutions)
-  return value
+    """Interpolates variable references into |value| using |substitutions|.
+
+    Args:
+        value: a value, can be a dictionary, list, string or other
+        substitutions: a mapping of variable names to values
+
+    Returns:
+        A new value with all variables references ${VARIABLES} replaced by their
+        value in |substitutions|. Raises SubstitutionError if a variable has no
+        substitution.
+    """
+    if isinstance(value, dict):
+        return {k: Interpolate(v, substitutions) for k, v in value.items()}
+    if isinstance(value, list):
+        return [Interpolate(v, substitutions) for v in value]
+    if isinstance(value, basestring_compat):
+        return InterpolateString(value, substitutions)
+    return value
 
 
 def LoadPList(path):
-  """Loads Plist at |path| and returns it as a dictionary."""
-  fd, name = tempfile.mkstemp()
-  try:
-    subprocess.check_call(['plutil', '-convert', 'xml1', '-o', name, path])
-    with os.fdopen(fd, 'r') as f:
-      return plistlib.readPlist(f)
-  finally:
-    os.unlink(name)
+    """Loads Plist at |path| and returns it as a dictionary."""
+    if sys.version_info.major == 2:
+        fd, name = tempfile.mkstemp()
+        try:
+            subprocess.check_call(
+                ['plutil', '-convert', 'xml1', '-o', name, path])
+            with os.fdopen(fd, 'rb') as f:
+                return plistlib.readPlist(f)
+        finally:
+            os.unlink(name)
+    else:
+        with open(path, 'rb') as f:
+            return plistlib.load(f)
 
 
 def SavePList(path, format, data):
-  """Saves |data| as a Plist to |path| in the specified |format|."""
-  fd, name = tempfile.mkstemp()
-  try:
-    # "plutil" does not replace the destination file but update it in place,
+    """Saves |data| as a Plist to |path| in the specified |format|."""
+    # The below does not replace the destination file but update it in place,
     # so if more than one hardlink points to destination all of them will be
     # modified. This is not what is expected, so delete destination file if
     # it does exist.
     if os.path.exists(path):
-      os.unlink(path)
-    with os.fdopen(fd, 'w') as f:
-      plistlib.writePlist(data, f)
-    subprocess.check_call(['plutil', '-convert', format, '-o', path, name])
-  finally:
-    os.unlink(name)
+        os.unlink(path)
+    if sys.version_info.major == 2:
+        fd, name = tempfile.mkstemp()
+        try:
+            with os.fdopen(fd, 'wb') as f:
+                plistlib.writePlist(data, f)
+            subprocess.check_call(
+                ['plutil', '-convert', format, '-o', path, name])
+        finally:
+            os.unlink(name)
+    else:
+        with open(path, 'wb') as f:
+            plist_format = {
+                'binary1': plistlib.FMT_BINARY,
+                'xml1': plistlib.FMT_XML
+            }
+            plistlib.dump(data, f, fmt=plist_format[format])
 
 
 def MergePList(plist1, plist2):
-  """Merges |plist1| with |plist2| recursively.
-
-  Creates a new dictionary representing a Property List (.plist) files by
-  merging the two dictionary |plist1| and |plist2| recursively (only for
-  dictionary values). List value will be concatenated.
-
-  Args:
-    plist1: a dictionary representing a Property List (.plist) file
-    plist2: a dictionary representing a Property List (.plist) file
-
-  Returns:
-    A new dictionary representing a Property List (.plist) file by merging
-    |plist1| with |plist2|. If any value is a dictionary, they are merged
-    recursively, otherwise |plist2| value is used. If values are list, they
-    are concatenated.
-  """
-  result = plist1.copy()
-  for key, value in plist2.iteritems():
-    if isinstance(value, dict):
-      old_value = result.get(key)
-      if isinstance(old_value, dict):
-        value = MergePList(old_value, value)
-    if isinstance(value, list):
-      value = plist1.get(key, []) + plist2.get(key, [])
-    result[key] = value
-  return result
+    """Merges |plist1| with |plist2| recursively.
+
+    Creates a new dictionary representing a Property List (.plist) files by
+    merging the two dictionary |plist1| and |plist2| recursively (only for
+    dictionary values). List value will be concatenated.
+
+    Args:
+        plist1: a dictionary representing a Property List (.plist) file plist2:
+        a dictionary representing a Property List (.plist) file
+
+    Returns:
+        A new dictionary representing a Property List (.plist) file by merging
+        |plist1| with |plist2|. If any value is a dictionary, they are merged
+        recursively, otherwise |plist2| value is used. If values are list, they
+        are concatenated.
+    """
+    result = plist1.copy()
+    for key, value in plist2.items():
+        if isinstance(value, dict):
+            old_value = result.get(key)
+            if isinstance(old_value, dict):
+                value = MergePList(old_value, value)
+        if isinstance(value, list):
+            value = plist1.get(key, []) + plist2.get(key, [])
+        result[key] = value
+    return result
 
 
 class Action(object):
-  """Class implementing one action supported by the script."""
+    """Class implementing one action supported by the script."""
 
-  @classmethod
-  def Register(cls, subparsers):
-    parser = subparsers.add_parser(cls.name, help=cls.help)
-    parser.set_defaults(func=cls._Execute)
-    cls._Register(parser)
+    @classmethod
+    def Register(cls, subparsers):
+        parser = subparsers.add_parser(cls.name, help=cls.help)
+        parser.set_defaults(func=cls._Execute)
+        cls._Register(parser)
 
 
 class MergeAction(Action):
-  """Class to merge multiple plist files."""
-
-  name = 'merge'
-  help = 'merge multiple plist files'
-
-  @staticmethod
-  def _Register(parser):
-    parser.add_argument(
-        '-o', '--output', required=True,
-        help='path to the output plist file')
-    parser.add_argument(
-        '-f', '--format', required=True, choices=('xml1', 'binary1', 'json'),
-        help='format of the plist file to generate')
-    parser.add_argument(
-          'path', nargs="+",
-          help='path to plist files to merge')
-
-  @staticmethod
-  def _Execute(args):
-    data = {}
-    for filename in args.path:
-      data = MergePList(data, LoadPList(filename))
-    SavePList(args.output, args.format, data)
+    """Class to merge multiple plist files."""
+
+    name = 'merge'
+    help = 'merge multiple plist files'
+
+    @staticmethod
+    def _Register(parser):
+        parser.add_argument('-o',
+                            '--output',
+                            required=True,
+                            help='path to the output plist file')
+        parser.add_argument('-f',
+                            '--format',
+                            required=True,
+                            choices=('xml1', 'binary1'),
+                            help='format of the plist file to generate')
+        parser.add_argument(
+            '-x',
+            '--xcode-version',
+            help='version of Xcode, ignored (can be used to force rebuild)')
+        parser.add_argument('path',
+                            nargs="+",
+                            help='path to plist files to merge')
+
+    @staticmethod
+    def _Execute(args):
+        data = {}
+        for filename in args.path:
+            data = MergePList(data, LoadPList(filename))
+        SavePList(args.output, args.format, data)
 
 
 class SubstituteAction(Action):
-  """Class implementing the variable substitution in a plist file."""
-
-  name = 'substitute'
-  help = 'perform pattern substitution in a plist file'
-
-  @staticmethod
-  def _Register(parser):
-    parser.add_argument(
-        '-o', '--output', required=True,
-        help='path to the output plist file')
-    parser.add_argument(
-        '-t', '--template', required=True,
-        help='path to the template file')
-    parser.add_argument(
-        '-s', '--substitution', action='append', default=[],
-        help='substitution rule in the format key=value')
-    parser.add_argument(
-        '-f', '--format', required=True, choices=('xml1', 'binary1', 'json'),
-        help='format of the plist file to generate')
-
-  @staticmethod
-  def _Execute(args):
-    substitutions = {}
-    for substitution in args.substitution:
-      key, value = substitution.split('=', 1)
-      substitutions[key] = value
-    data = Interpolate(LoadPList(args.template), substitutions)
-    SavePList(args.output, args.format, data)
+    """Class implementing the variable substitution in a plist file."""
+
+    name = 'substitute'
+    help = 'perform pattern substitution in a plist file'
+
+    @staticmethod
+    def _Register(parser):
+        parser.add_argument('-o',
+                            '--output',
+                            required=True,
+                            help='path to the output plist file')
+        parser.add_argument('-t',
+                            '--template',
+                            required=True,
+                            help='path to the template file')
+        parser.add_argument('-s',
+                            '--substitution',
+                            action='append',
+                            default=[],
+                            help='substitution rule in the format key=value')
+        parser.add_argument('-f',
+                            '--format',
+                            required=True,
+                            choices=('xml1', 'binary1'),
+                            help='format of the plist file to generate')
+        parser.add_argument(
+            '-x',
+            '--xcode-version',
+            help='version of Xcode, ignored (can be used to force rebuild)')
+
+    @staticmethod
+    def _Execute(args):
+        substitutions = {}
+        for substitution in args.substitution:
+            key, value = substitution.split('=', 1)
+            substitutions[key] = value
+        data = Interpolate(LoadPList(args.template), substitutions)
+        SavePList(args.output, args.format, data)
 
 
 def Main():
-  parser = argparse.ArgumentParser(description='manipulate plist files')
-  subparsers = parser.add_subparsers()
+    # Cache this codec so that plistlib can find it. See
+    # https://crbug.com/1005190#c2 for more details.
+    codecs.lookup('utf-8')
+
+    parser = argparse.ArgumentParser(description='manipulate plist files')
+    subparsers = parser.add_subparsers()
 
-  for action in [MergeAction, SubstituteAction]:
-    action.Register(subparsers)
+    for action in [MergeAction, SubstituteAction]:
+        action.Register(subparsers)
 
-  args = parser.parse_args()
-  args.func(args)
+    args = parser.parse_args()
+    args.func(args)
 
 
 if __name__ == '__main__':
-  sys.exit(Main())
+    # TODO(https://crbug.com/941669): Temporary workaround until all scripts use
+    # python3 by default.
+    if sys.version_info[0] < 3:
+        os.execvp('python3', ['python3'] + sys.argv)
+    sys.exit(Main())
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/rules.gni b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/rules.gni
index d8667cf52a..1f3019c28c 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/rules.gni
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/rules.gni
@@ -1,4 +1,4 @@
-# Copyright 2015 The Chromium Authors. All rights reserved.
+# Copyright 2015 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -105,15 +105,15 @@ template("create_signed_bundle") {
 
     # Bundle ID should respect rfc1034 and replace _ with -.
     _xcode_product_bundle_id =
-        string_replace("$ios_app_bundle_id_prefix.googletest.$_output_name",
-                       "_",
-                       "-")
+        string_replace("$ios_app_bundle_id_prefix.$_output_name", "_", "-")
 
     xcode_extra_attributes = {
       IPHONEOS_DEPLOYMENT_TARGET = ios_deployment_target
-      CODE_SIGN_STYLE = "Manual"
-      CODE_SIGN_IDENTITY = ""
       PRODUCT_BUNDLE_IDENTIFIER = _xcode_product_bundle_id
+      CODE_SIGNING_REQUIRED = "NO"
+      CODE_SIGNING_ALLOWED = "NO"
+      CODE_SIGN_IDENTITY = ""
+      DONT_GENERATE_INFOPLIST_FILE = "YES"
 
       if (defined(invoker.xcode_extra_attributes)) {
         forward_variables_from(invoker.xcode_extra_attributes, "*")
@@ -220,7 +220,20 @@ template("ios_app_bundle") {
   if (defined(invoker.info_plist)) {
     _plist_templates += [ invoker.info_plist ]
   }
-  _plist_extra_substitutions = []
+
+  if (defined(invoker.bundle_identifier)) {
+    _bundle_identifier = invoker.bundle_identifier
+    assert(_bundle_identifier == string_replace(_bundle_identifier, "_", "-"),
+           "$target_name: bundle_identifier does not respect rfc1034: " +
+               _bundle_identifier)
+  } else {
+    # Bundle identifier should respect rfc1034, so replace "_" with "-".
+    _bundle_identifier = "$ios_app_bundle_id_prefix.googletest." +
+                         string_replace(_output_name, "_", "-")
+  }
+
+  _plist_extra_substitutions = [ "BUNDLE_IDENTIFIER=$_bundle_identifier" ]
+
   if (defined(invoker.extra_substitutions)) {
     _plist_extra_substitutions += invoker.extra_substitutions
   }
@@ -548,6 +561,10 @@ template("ios_xcuitest_test_runner_bundle") {
     ]
   }
 
+  # Bundle identifier should respect rfc1034, so replace "_" with "-".
+  _bundle_identifier = "$ios_app_bundle_id_prefix.chrome." +
+                       string_replace(_output_name, "_", "-")
+
   _info_plist_target = _target_name + "_info_plist"
   _info_plist_bundle = _target_name + "_info_plist_bundle"
   info_plist(_info_plist_target) {
@@ -563,6 +580,7 @@ template("ios_xcuitest_test_runner_bundle") {
       # "CFBundleName".
       "//third_party/mini_chromium/mini_chromium/build/ios/XCTRunnerAddition+Info.plist",
     ]
+    extra_substitutions = [ "BUNDLE_IDENTIFIER=$_bundle_identifier" ]
   }
 
   bundle_data(_info_plist_bundle) {
@@ -604,6 +622,26 @@ template("ios_xcuitest_test_runner_bundle") {
       "$ios_sdk_platform_path/Developer/Library/PrivateFrameworks/XCTAutomationSupport.framework",
     ]
 
+    if (xcode_version_int >= 1300) {
+      extra_system_frameworks += [
+        "$ios_sdk_platform_path/Developer/Library/PrivateFrameworks/XCTestCore.framework",
+        "$ios_sdk_platform_path/Developer/Library/PrivateFrameworks/XCUnit.framework",
+        "$ios_sdk_platform_path/Developer/usr/lib/libXCTestSwiftSupport.dylib",
+      ]
+
+      # Xcode 16.3 moved XCUIAutomation.framework
+      if (xcode_version_int < 1630) {
+        extra_system_frameworks += [ "$ios_sdk_platform_path/Developer/Library/PrivateFrameworks/XCUIAutomation.framework" ]
+      } else {
+        extra_system_frameworks += [ "$ios_sdk_platform_path/Developer/Library/Frameworks/XCUIAutomation.framework" ]
+      }
+    }
+
+    # XCTestSupport framework is required as of Xcode 14.3 or later.
+    if (xcode_version_int >= 1430) {
+      extra_system_frameworks += [ "$ios_sdk_platform_path/Developer/Library/PrivateFrameworks/XCTestSupport.framework" ]
+    }
+
     bundle_deps = []
     if (defined(invoker.bundle_deps)) {
       bundle_deps += invoker.bundle_deps
@@ -653,3 +691,9 @@ template("ios_xcuitest_test") {
     forward_variables_from(invoker, [ "bundle_deps" ])
   }
 }
+
+template("ios_test_runner_xcuitest") {
+  ios_xcuitest_test(target_name) {
+    forward_variables_from(invoker, "*", [ "data_deps" ])
+  }
+}
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/sdk_info.py b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/sdk_info.py
index 26ac8da1a2..1ba489121e 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/sdk_info.py
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/sdk_info.py
@@ -1,6 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
-# Copyright 2014 The Chromium Authors. All rights reserved.
+# Copyright 2014 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -14,103 +14,166 @@
 import subprocess
 import sys
 
-# This script prints information about the build system, the operating
-# system and the iOS or Mac SDK (depending on the platform "iphonesimulator",
+if sys.version_info.major < 3:
+    basestring_compat = basestring
+else:
+    basestring_compat = str
+
+# src directory
+ROOT_SRC_DIR = os.path.dirname(
+    os.path.dirname(os.path.dirname(os.path.dirname(
+        os.path.realpath(__file__)))))
+
+# This script prints information about the build system, the operating system
+# and the iOS or Mac SDK (depending on the platform "iphonesimulator",
 # "iphoneos" or "macosx" generally).
 
+
+def LoadPList(path):
+    """Loads Plist at |path| and returns it as a dictionary."""
+    # Cloned from //build/apple/plist_util.py.
+    if sys.version_info.major == 2:
+        return plistlib.readPlist(path)
+    with open(path, 'rb') as f:
+        return plistlib.load(f)
+
+
 def SplitVersion(version):
-  """Splits the Xcode version to 3 values.
-
-  >>> list(SplitVersion('8.2.1.1'))
-  ['8', '2', '1']
-  >>> list(SplitVersion('9.3'))
-  ['9', '3', '0']
-  >>> list(SplitVersion('10.0'))
-  ['10', '0', '0']
-  """
-  version = version.split('.')
-  return itertools.islice(itertools.chain(version, itertools.repeat('0')), 0, 3)
+    """Splits the Xcode version to 3 values.
+
+    >>> list(SplitVersion('8.2.1.1'))
+    ['8', '2', '1']
+    >>> list(SplitVersion('9.3'))
+    ['9', '3', '0']
+    >>> list(SplitVersion('10.0'))
+    ['10', '0', '0']
+    """
+    version = version.split('.')
+    return itertools.islice(itertools.chain(version, itertools.repeat('0')), 0,
+                            3)
+
 
 def FormatVersion(version):
-  """Converts Xcode version to a format required for DTXcode in Info.plist
-
-  >>> FormatVersion('8.2.1')
-  '0821'
-  >>> FormatVersion('9.3')
-  '0930'
-  >>> FormatVersion('10.0')
-  '1000'
-  """
-  major, minor, patch = SplitVersion(version)
-  return ('%2s%s%s' % (major, minor, patch)).replace(' ', '0')
+    """Converts Xcode version to a format required for DTXcode in Info.plist
+
+    >>> FormatVersion('8.2.1')
+    '0821'
+    >>> FormatVersion('9.3')
+    '0930'
+    >>> FormatVersion('10.0')
+    '1000'
+    """
+    major, minor, patch = SplitVersion(version)
+    return ('%2s%s%s' % (major, minor, patch)).replace(' ', '0')
+
 
 def FillXcodeVersion(settings, developer_dir):
-  """Fills the Xcode version and build number into |settings|."""
-  if developer_dir:
-    xcode_version_plist_path = os.path.join(
-        developer_dir, 'Contents/version.plist')
-    version_plist = plistlib.readPlist(xcode_version_plist_path)
-    settings['xcode_version'] = FormatVersion(
-        version_plist['CFBundleShortVersionString'])
+    """Fills the Xcode version and build number into |settings|."""
+    if developer_dir:
+        xcode_version_plist_path = os.path.join(developer_dir,
+                                                'Contents/version.plist')
+        version_plist = LoadPList(xcode_version_plist_path)
+        settings['xcode_version'] = FormatVersion(
+            version_plist['CFBundleShortVersionString'])
+        settings['xcode_version_int'] = int(settings['xcode_version'], 10)
+        settings['xcode_build'] = version_plist['ProductBuildVersion']
+        return
+
+    lines = subprocess.check_output(['xcodebuild',
+                                     '-version']).decode('UTF-8').splitlines()
+    settings['xcode_version'] = FormatVersion(lines[0].split()[-1])
     settings['xcode_version_int'] = int(settings['xcode_version'], 10)
-    settings['xcode_build'] = version_plist['ProductBuildVersion']
-    return
-
-  lines = subprocess.check_output(['xcodebuild', '-version']).splitlines()
-  settings['xcode_version'] = FormatVersion(lines[0].split()[-1])
-  settings['xcode_version_int'] = int(settings['xcode_version'], 10)
-  settings['xcode_build'] = lines[-1].split()[-1]
+    settings['xcode_build'] = lines[-1].split()[-1]
 
 
 def FillMachineOSBuild(settings):
-  """Fills OS build number into |settings|."""
-  settings['machine_os_build'] = subprocess.check_output(
-      ['sw_vers', '-buildVersion']).strip()
+    """Fills OS build number into |settings|."""
+    machine_os_build = subprocess.check_output(['sw_vers', '-buildVersion'
+                                               ]).decode('UTF-8').strip()
+    settings['machine_os_build'] = machine_os_build
 
 
 def FillSDKPathAndVersion(settings, platform, xcode_version):
-  """Fills the SDK path and version for |platform| into |settings|."""
-  settings['sdk_path'] = subprocess.check_output([
-      'xcrun', '-sdk', platform, '--show-sdk-path']).strip()
-  settings['sdk_version'] = subprocess.check_output([
-      'xcrun', '-sdk', platform, '--show-sdk-version']).strip()
-  settings['sdk_platform_path'] = subprocess.check_output([
-      'xcrun', '-sdk', platform, '--show-sdk-platform-path']).strip()
-  # TODO: unconditionally use --show-sdk-build-version once Xcode 7.2 or
-  # higher is required to build Chrome for iOS or OS X.
-  if xcode_version >= '0720':
-    settings['sdk_build'] = subprocess.check_output([
-        'xcrun', '-sdk', platform, '--show-sdk-build-version']).strip()
-  else:
-    settings['sdk_build'] = settings['sdk_version']
+    """Fills the SDK path and version for |platform| into |settings|."""
+    settings['sdk_path'] = subprocess.check_output(
+        ['xcrun', '-sdk', platform, '--show-sdk-path']).decode('UTF-8').strip()
+    settings['sdk_version'] = subprocess.check_output(
+        ['xcrun', '-sdk', platform,
+         '--show-sdk-version']).decode('UTF-8').strip()
+    settings['sdk_platform_path'] = subprocess.check_output(
+        ['xcrun', '-sdk', platform,
+         '--show-sdk-platform-path']).decode('UTF-8').strip()
+    settings['sdk_build'] = subprocess.check_output(
+        ['xcrun', '-sdk', platform,
+         '--show-sdk-build-version']).decode('UTF-8').strip()
+    settings['toolchains_path'] = os.path.join(
+        subprocess.check_output(['xcode-select',
+                                 '-print-path']).decode('UTF-8').strip(),
+        'Toolchains/XcodeDefault.xctoolchain')
+
+
+def CreateXcodeSymlinkAt(src, dst):
+    """Create symlink to Xcode directory at target location."""
+
+    if not os.path.isdir(dst):
+        os.makedirs(dst)
+
+    dst = os.path.join(dst, os.path.basename(src))
+    updated_value = '//' + os.path.relpath(dst, ROOT_SRC_DIR)
+
+    # Update the symlink only if it is different from the current destination.
+    if os.path.islink(dst):
+        current_src = os.readlink(dst)
+        if current_src == src:
+            return updated_value
+        os.unlink(dst)
+        sys.stderr.write('existing symlink %s points %s; want %s. Removed.' %
+                         (dst, current_src, src))
+    os.symlink(src, dst)
+    return updated_value
 
 
 if __name__ == '__main__':
-  doctest.testmod()
-
-  parser = argparse.ArgumentParser()
-  parser.add_argument("--developer_dir", required=False)
-  parser.add_argument("--get_sdk_info",
-                    action="store_true", dest="get_sdk_info", default=False,
-                    help="Returns SDK info in addition to xcode/machine info.")
-  args, unknownargs = parser.parse_known_args()
-  if args.developer_dir:
-    os.environ['DEVELOPER_DIR'] = args.developer_dir
-
-  if len(unknownargs) != 1:
-    sys.stderr.write(
-        'usage: %s [iphoneos|iphonesimulator|macosx]\n' %
-        os.path.basename(sys.argv[0]))
-    sys.exit(1)
-
-  settings = {}
-  FillMachineOSBuild(settings)
-  FillXcodeVersion(settings, args.developer_dir)
-  if args.get_sdk_info:
-    FillSDKPathAndVersion(settings, unknownargs[0], settings['xcode_version'])
-
-  for key in sorted(settings):
-    value = settings[key]
-    if isinstance(value, str):
-      value = '"%s"' % value
-    print('%s=%s' % (key, value))
+    doctest.testmod()
+
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--developer_dir", dest="developer_dir", required=False)
+    parser.add_argument("--get_sdk_info",
+                        action="store_true",
+                        dest="get_sdk_info",
+                        default=False,
+                        help="Returns SDK info in addition to xcode info.")
+    parser.add_argument("--get_machine_info",
+                        action="store_true",
+                        dest="get_machine_info",
+                        default=False,
+                        help="Returns machine info in addition to xcode info.")
+    parser.add_argument("--create_symlink_at",
+                        action="store",
+                        dest="create_symlink_at",
+                        help="Create symlink of SDK at given location and "
+                        "returns the symlinked paths as SDK info instead "
+                        "of the original location.")
+    args, unknownargs = parser.parse_known_args()
+    if args.developer_dir:
+        os.environ['DEVELOPER_DIR'] = args.developer_dir
+
+    if len(unknownargs) != 1:
+        sys.stderr.write('usage: %s [iphoneos|iphonesimulator|macosx]\n' %
+                         os.path.basename(sys.argv[0]))
+        sys.exit(1)
+
+    settings = {}
+    FillMachineOSBuild(settings)
+    FillXcodeVersion(settings, args.developer_dir)
+    if args.get_sdk_info:
+        FillSDKPathAndVersion(settings, unknownargs[0],
+                              settings['xcode_version'])
+
+    for key in sorted(settings):
+        value = settings[key]
+        if args.create_symlink_at and '_path' in key:
+            value = CreateXcodeSymlinkAt(value, args.create_symlink_at)
+        if isinstance(value, basestring_compat):
+            value = '"%s"' % value
+        print('%s=%s' % (key, value))
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/strip_arm64e.py b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/strip_arm64e.py
index 667cd08a57..f7fe9fafac 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/strip_arm64e.py
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/ios/strip_arm64e.py
@@ -1,6 +1,4 @@
-#!/usr/bin/env python
-
-# Copyright 2020 The Chromium Authors. All rights reserved.
+# Copyright 2020 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -14,59 +12,61 @@
 
 
 def check_output(command):
-  """Returns the output from |command| or propagates error, quitting script."""
-  process = subprocess.Popen(
-      command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-  outs, errs = process.communicate()
-  if process.returncode:
-    sys.stderr.write('error: command failed with retcode %d: %s\n\n' %
-                     (process.returncode, ' '.join(map(repr, command))))
-    sys.stderr.write(errs)
-    sys.exit(process.returncode)
-  return outs
+    """Returns the output from |command| or propagates error, quitting
+    script."""
+    process = subprocess.Popen(command,
+                               stdout=subprocess.PIPE,
+                               stderr=subprocess.PIPE)
+    outs, errs = process.communicate()
+    if process.returncode:
+        sys.stderr.write('error: command failed with retcode %d: %s\n\n' %
+                         (process.returncode, ' '.join(map(repr, command))))
+        sys.stderr.write(errs.decode('UTF-8', errors='ignore'))
+        sys.exit(process.returncode)
+    return outs.decode('UTF-8')
 
 
 def check_call(command):
-  """Invokes |command| or propagates error."""
-  check_output(command)
+    """Invokes |command| or propagates error."""
+    check_output(command)
 
 
 def parse_args(args):
-  """Parses the command-line."""
-  parser = argparse.ArgumentParser()
-  parser.add_argument('--input', required=True, help='Path to input binary')
-  parser.add_argument('--output', required=True, help='Path to output binary')
-  return parser.parse_args(args)
+    """Parses the command-line."""
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--input', required=True, help='Path to input binary')
+    parser.add_argument('--output', required=True, help='Path to output binary')
+    return parser.parse_args(args)
 
 
 def get_archs(path):
-  """Extracts the architectures present in binary at |path|."""
-  outputs = check_output(["xcrun", "lipo", "-info", os.path.abspath(path)])
-  return outputs.split(': ')[-1].split()
+    """Extracts the architectures present in binary at |path|."""
+    outputs = check_output(["xcrun", "lipo", "-info", os.path.abspath(path)])
+    return outputs.split(': ')[-1].split()
 
 
 def main(args):
-  parsed = parse_args(args)
+    parsed = parse_args(args)
 
-  outdir = os.path.dirname(parsed.output)
-  if not os.path.isdir(outdir):
-    os.makedirs(outdir)
+    outdir = os.path.dirname(parsed.output)
+    if not os.path.isdir(outdir):
+        os.makedirs(outdir)
 
-  if os.path.exists(parsed.output):
-    os.unlink(parsed.output)
+    if os.path.exists(parsed.output):
+        os.unlink(parsed.output)
 
-  # As "lipo" fails with an error if asked to remove an architecture that is
-  # not included, only use it if "arm64e" is present in the binary. Otherwise
-  # simply copy the file.
-  if 'arm64e' in get_archs(parsed.input):
-    check_output([
-        "xcrun", "lipo", "-remove", "arm64e", "-output",
-        os.path.abspath(parsed.output),
-        os.path.abspath(parsed.input)
-    ])
-  else:
-    shutil.copy(parsed.input, parsed.output)
+    # As "lipo" fails with an error if asked to remove an architecture that is
+    # not included, only use it if "arm64e" is present in the binary. Otherwise
+    # simply copy the file.
+    if 'arm64e' in get_archs(parsed.input):
+        check_output([
+            "xcrun", "lipo", "-remove", "arm64e", "-output",
+            os.path.abspath(parsed.output),
+            os.path.abspath(parsed.input)
+        ])
+    else:
+        shutil.copy(parsed.input, parsed.output)
 
 
 if __name__ == '__main__':
-  main(sys.argv[1:])
+    main(sys.argv[1:])
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/platform.gni b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/platform.gni
index ecfbc4d798..06d29093d0 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/platform.gni
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/platform.gni
@@ -1,4 +1,4 @@
-# Copyright 2017 The Chromium Authors. All rights reserved.
+# Copyright 2017 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -23,6 +23,7 @@ if (current_os == "mac") {
   mini_chromium_is_fuchsia = true
 }
 
+mini_chromium_is_apple = mini_chromium_is_mac || mini_chromium_is_ios
 mini_chromium_is_posix = mini_chromium_is_mac || mini_chromium_is_ios ||
                          mini_chromium_is_linux || mini_chromium_is_android
 
@@ -34,5 +35,3 @@ declare_args() {
 assert(!mini_chromium_is_chromeos_lacros || !mini_chromium_is_chromeos_ash)
 assert(!(mini_chromium_is_chromeos_lacros || mini_chromium_is_chromeos_ash) ||
        mini_chromium_is_linux)
-
-
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/sysroot.gni b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/sysroot.gni
index ef6703417a..16f68466b7 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/sysroot.gni
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/sysroot.gni
@@ -1,4 +1,4 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
+# Copyright 2014 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -6,13 +6,17 @@ import("platform.gni")
 
 if (mini_chromium_is_posix || mini_chromium_is_fuchsia) {
   declare_args() {
-    # A directory containing the system’s header files and libraries. If empty,
-    # a suitable default will be chosen.
-    target_sysroot = ""
+    # Don't execute if building inside the Fuchsia tree.
+    if (!(defined(is_fuchsia_tree) && is_fuchsia_tree)) {
+      # A directory containing the system’s header files and libraries. If empty,
+      # a suitable default will be chosen.
+      target_sysroot = ""
+    }
   }
 }
 
-if (mini_chromium_is_mac) {
+# Don't execute if building inside the Fuchsia tree.
+if (mini_chromium_is_mac && !(defined(is_fuchsia_tree) && is_fuchsia_tree)) {
   declare_args() {
     # The version of the macOS SDK to use. If |target_sysroot| is empty, this
     # will inform which SDK version will be chosen. If |mac_sdk| is also empty,
@@ -54,12 +58,6 @@ if (mini_chromium_is_mac) {
 } else if (mini_chromium_is_ios) {
   import("ios/ios_sdk.gni")
   target_sysroot = ios_sdk_path
-} else if (mini_chromium_is_fuchsia) {
-  # Declares fuchsia_sdk.
-  import("//third_party/fuchsia/sdk/$host_os-amd64/build/config/config.gni")
-  if (target_sysroot == "") {
-    target_sysroot = fuchsia_sdk + "/arch/$target_cpu/sysroot"
-  }
 }
 
 if ((mini_chromium_is_posix || mini_chromium_is_fuchsia) &&
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/win_helper.py b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/win_helper.py
index 1f6ac3a40b..8f7b891325 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/win_helper.py
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/win_helper.py
@@ -1,10 +1,8 @@
-#!/usr/bin/env python
-
-# Copyright 2017 The Chromium Authors. All rights reserved.
+# Copyright 2017 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import _winreg
+import winreg
 import os
 import re
 import subprocess
@@ -12,209 +10,247 @@
 
 
 def _RegistryGetValue(key, value):
-  """Use the _winreg module to obtain the value of a registry key.
-
-  Args:
-    key: The registry key.
-    value: The particular registry value to read.
-  Return:
-    contents of the registry key's value, or None on failure.
-  """
-  try:
-    root, subkey = key.split('\\', 1)
-    assert root == 'HKLM'  # Only need HKLM for now.
-    with _winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE, subkey) as hkey:
-      return _winreg.QueryValueEx(hkey, value)[0]
-  except WindowsError:
-    return None
+    """Use the winreg module to obtain the value of a registry key.
+
+    Args:
+        key: The registry key.
+        value: The particular registry value to read.
+    Return:
+        contents of the registry key's value, or None on failure.
+    """
+    try:
+        root, subkey = key.split('\\', 1)
+        assert root == 'HKLM'  # Only need HKLM for now.
+        with winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, subkey) as hkey:
+            return winreg.QueryValueEx(hkey, value)[0]
+    except WindowsError:
+        return None
 
 
 def _ExtractImportantEnvironment(output_of_set):
-  """Extracts environment variables required for the toolchain to run from
-  a textual dump output by the cmd.exe 'set' command."""
-  envvars_to_save = (
-      'include',
-      'lib',
-      'libpath',
-      'path',
-      'pathext',
-      'systemroot',
-      'temp',
-      'tmp',
-      )
-  env = {}
-  for line in output_of_set.splitlines():
-    for envvar in envvars_to_save:
-      if re.match(envvar + '=', line.lower()):
-        var, setting = line.split('=', 1)
-        env[var.upper()] = setting
-        break
-  for required in ('SYSTEMROOT', 'TEMP', 'TMP'):
-    if required not in env:
-      raise Exception('Environment variable "%s" '
-                      'required to be set to valid path' % required)
-  return env
+    """Extracts environment variables required for the toolchain to run from
+    a textual dump output by the cmd.exe 'set' command."""
+    envvars_to_save = (
+        'include',
+        'lib',
+        'libpath',
+        'path',
+        'pathext',
+        'systemroot',
+        'temp',
+        'tmp',
+    )
+    env = {}
+    for line in output_of_set.splitlines():
+        line = line.decode("utf-8")
+        for envvar in envvars_to_save:
+            if re.match(envvar + '=', line.lower()):
+                var, setting = line.split('=', 1)
+                env[var.upper()] = setting
+                break
+    for required in ('SYSTEMROOT', 'TEMP', 'TMP'):
+        if required not in env:
+            raise Exception('Environment variable "%s" '
+                            'required to be set to valid path' % required)
+    return env
 
 
 def _FormatAsEnvironmentBlock(envvar_dict):
-  """Format as an 'environment block' directly suitable for CreateProcess.
-  Briefly this is a list of key=value\0, terminated by an additional \0. See
-  CreateProcess() documentation for more details."""
-  block = ''
-  nul = '\0'
-  for key, value in envvar_dict.iteritems():
-    block += key + '=' + value + nul
-  block += nul
-  return block
+    """Format as an 'environment block' directly suitable for CreateProcess.
+    Briefly this is a list of key=value\0, terminated by an additional \0. See
+    CreateProcess() documentation for more details."""
+    block = ''
+    nul = '\0'
+    for key, value in envvar_dict.items():
+        block += key + '=' + value + nul
+    block += nul
+    return block
 
 
 def _GenerateEnvironmentFiles(install_dir, out_dir, script_path):
-  """It's not sufficient to have the absolute path to the compiler, linker, etc.
-  on Windows, as those tools rely on .dlls being in the PATH. We also need to
-  support both x86 and x64 compilers. Different architectures require a
-  different compiler binary, and different supporting environment variables
-  (INCLUDE, LIB, LIBPATH). So, we extract the environment here, wrap all
-  invocations of compiler tools (cl, link, lib, rc, midl, etc.) to set up the
-  environment, and then do not prefix the compiler with an absolute path,
-  instead preferring something like "cl.exe" in the rule which will then run
-  whichever the environment setup has put in the path."""
-  archs = ('x86', 'amd64', 'arm64')
-  result = []
-  for arch in archs:
-    # Extract environment variables for subprocesses.
-    args = [os.path.join(install_dir, script_path)]
-    script_arch_name = arch
-    if script_path.endswith('SetEnv.cmd') and arch == 'amd64':
-      script_arch_name = '/x64'
-    if arch == 'arm64':
-      script_arch_name = 'x86_arm64'
-    args.extend((script_arch_name, '&&', 'set'))
-    popen = subprocess.Popen(
-        args, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-    variables, _ = popen.communicate()
-    if popen.returncode != 0:
-      raise Exception('"%s" failed with error %d' % (args, popen.returncode))
-    env = _ExtractImportantEnvironment(variables)
-
-    env_block = _FormatAsEnvironmentBlock(env)
-    basename = 'environment.' + arch
-    with open(os.path.join(out_dir, basename), 'wb') as f:
-      f.write(env_block)
-    result.append(basename)
-  return result
+    """It's not sufficient to have the absolute path to the compiler, linker,
+    etc. on Windows, as those tools rely on .dlls being in the PATH. We also
+    need to support both x86 and x64 compilers. Different architectures require
+    a different compiler binary, and different supporting environment variables
+    (INCLUDE, LIB, LIBPATH). So, we extract the environment here, wrap all
+    invocations of compiler tools (cl, link, lib, rc, midl, etc.) to set up the
+    environment, and then do not prefix the compiler with an absolute path,
+    instead preferring something like "cl.exe" in the rule which will then run
+    whichever the environment setup has put in the path."""
+    archs = ('x86', 'amd64', 'arm64')
+    result = []
+    for arch in archs:
+        # Extract environment variables for subprocesses.
+        args = [os.path.join(install_dir, script_path)]
+        script_arch_name = arch
+        if script_path.endswith('SetEnv.cmd') and arch == 'amd64':
+            script_arch_name = '/x64'
+        if arch == 'arm64':
+            script_arch_name = 'x86_arm64'
+        args.extend((script_arch_name, '&&', 'set'))
+        popen = subprocess.Popen(args,
+                                 shell=True,
+                                 stdout=subprocess.PIPE,
+                                 stderr=subprocess.STDOUT)
+        variables, _ = popen.communicate()
+        if popen.returncode != 0:
+            raise Exception('"%s" failed with error %d' %
+                            (args, popen.returncode))
+        env = _ExtractImportantEnvironment(variables)
+
+        env_block = _FormatAsEnvironmentBlock(env)
+        basename = 'environment.' + arch
+        with open(os.path.join(out_dir, basename), 'wb') as f:
+            f.write(env_block.encode())
+        result.append(basename)
+    return result
 
 
 def _GetEnvAsDict(arch):
-  """Gets the saved environment from a file for a given architecture."""
-  # The environment is saved as an "environment block" (see CreateProcess()
-  # for details, which is the format required for ninja). We convert to a dict
-  # here. Drop last 2 NULs, one for list terminator, one for trailing vs.
-  # separator.
-  pairs = open(arch).read()[:-2].split('\0')
-  kvs = [item.split('=', 1) for item in pairs]
-  return dict(kvs)
+    """Gets the saved environment from a file for a given architecture."""
+    # The environment is saved as an "environment block" (see CreateProcess()
+    # for details, which is the format required for ninja). We convert to a dict
+    # here. Drop last 2 NULs, one for list terminator, one for trailing vs.
+    # separator.
+    pairs = open(arch).read()[:-2].split('\0')
+    kvs = [item.split('=', 1) for item in pairs]
+    return dict(kvs)
 
 
-class WinTool(object):
-  def Dispatch(self, args):
-    """Dispatches a string command to a method."""
-    if len(args) < 1:
-      raise Exception("Not enough arguments")
-
-    method = "Exec%s" % self._CommandifyName(args[0])
-    return getattr(self, method)(*args[1:])
-
-  def _CommandifyName(self, name_string):
-    """Transforms a tool name like recursive-mirror to RecursiveMirror."""
-    return name_string.title().replace('-', '')
-
-  def ExecLinkWrapper(self, arch, *args):
-    """Filter diagnostic output from link that looks like:
-    '   Creating library ui.dll.lib and object ui.dll.exp'
-    This happens when there are exports from the dll or exe.
-    """
-    env = _GetEnvAsDict(arch)
+def _SlashSlashes(args):
+    """Returns args as list, with backslashes instead of slashes in args[0]."""
     args = list(args)  # *args is a tuple by default, which is read-only.
     args[0] = args[0].replace('/', '\\')
-    link = subprocess.Popen(args, env=env, shell=True, stdout=subprocess.PIPE)
-    out, _ = link.communicate()
-    for line in out.splitlines():
-      if (not line.startswith('   Creating library ') and
-          not line.startswith('Generating code') and
-          not line.startswith('Finished generating code')):
-        print line
-    return link.returncode
-
-  def ExecAsmWrapper(self, arch, *args):
-    """Filter logo banner from invocations of asm.exe."""
-    env = _GetEnvAsDict(arch)
-    popen = subprocess.Popen(args, env=env, shell=True,
-                             stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-    out, _ = popen.communicate()
-    for line in out.splitlines():
-      if (not line.startswith('Copyright (C) Microsoft Corporation') and
-          not line.startswith('Microsoft (R) Macro Assembler') and
-          not line.startswith(' Assembling: ') and
-          line):
-        print line
-    return popen.returncode
-
-  def ExecGetVisualStudioData(self, outdir, toolchain_path):
-    setenv_path = os.path.join('win_sdk', 'bin', 'SetEnv.cmd')
-
-    def explicit():
-      if os.path.exists(os.path.join(toolchain_path, setenv_path)):
-        return toolchain_path, setenv_path
-
-    def env():
-      from_env = os.environ.get('VSINSTALLDIR')
-      if from_env and os.path.exists(os.path.join(from_env, setenv_path)):
-        return from_env, setenv_path
-
-    def autodetect():
-      # Try vswhere, which will find VS2017.2+. Note that earlier VS2017s will
-      # not be found.
-      vswhere_path = os.path.join(os.environ.get('ProgramFiles(x86)'),
-          'Microsoft Visual Studio', 'Installer', 'vswhere.exe')
-      if os.path.exists(vswhere_path):
-        installation_path = subprocess.check_output(
-            [vswhere_path, '-products', '*' ,'-latest', '-property', 'installationPath']).strip()
-        if installation_path:
-          return (installation_path,
-                  os.path.join('VC', 'Auxiliary', 'Build', 'vcvarsall.bat'))
-
-      # Otherwise, try VS2015.
-      version = '14.0'
-      keys = [r'HKLM\Software\Microsoft\VisualStudio\%s' % version,
-              r'HKLM\Software\Wow6432Node\Microsoft\VisualStudio\%s' % version]
-      for key in keys:
-        path = _RegistryGetValue(key, 'InstallDir')
-        if not path:
-          continue
-        return (os.path.normpath(os.path.join(path, os.pardir, os.pardir)),
-                os.path.join('VC', 'vcvarsall.bat'))
-
-    def fail(): raise Exception('Visual Studio installation dir not found')
-
-    # Use an explicitly specified toolchain path, if provided and found.
-    # Otherwise, try using a standard environment variable. Finally, try
-    # autodetecting using vswhere.
-    install_dir, script_path = (explicit() or env() or autodetect() or fail())
-
-    x86_file, x64_file, arm64_file = _GenerateEnvironmentFiles(
-        install_dir, outdir, script_path)
-    result = '''install_dir = "%s"
+    return args
+
+
+class WinTool(object):
+
+    def Dispatch(self, args):
+        """Dispatches a string command to a method."""
+        if len(args) < 1:
+            raise Exception("Not enough arguments")
+
+        method = "Exec%s" % self._CommandifyName(args[0])
+        return getattr(self, method)(*args[1:])
+
+    def _CommandifyName(self, name_string):
+        """Transforms a tool name like recursive-mirror to RecursiveMirror."""
+        return name_string.title().replace('-', '')
+
+    def ExecLinkWrapper(self, arch, *args):
+        """Filter diagnostic output from link that looks like:
+        '   Creating library ui.dll.lib and object ui.dll.exp'
+        This happens when there are exports from the dll or exe.
+        """
+        env = _GetEnvAsDict(arch)
+        args = _SlashSlashes(args)
+        link = subprocess.Popen(args,
+                                env=env,
+                                shell=True,
+                                stdout=subprocess.PIPE)
+        out, _ = link.communicate()
+        for line in out.splitlines():
+            line = line.decode("utf-8")
+            if (not line.startswith('   Creating library ') and
+                    not line.startswith('Generating code') and
+                    not line.startswith('Finished generating code')):
+                print(line)
+        return link.returncode
+
+    def ExecAsmWrapper(self, arch, *args):
+        """Filter logo banner from invocations of asm.exe."""
+        env = _GetEnvAsDict(arch)
+        args = _SlashSlashes(args)
+        popen = subprocess.Popen(args,
+                                 env=env,
+                                 shell=True,
+                                 stdout=subprocess.PIPE,
+                                 stderr=subprocess.STDOUT)
+        out, _ = popen.communicate()
+        for line in out.splitlines():
+            line = line.decode("utf-8")
+            if (not line.startswith('Copyright (C) Microsoft Corporation') and
+                    not line.startswith('Microsoft (R) Macro Assembler') and
+                    not line.startswith(' Assembling: ') and line):
+                print(line)
+        return popen.returncode
+
+    def ExecGetVisualStudioData(self, outdir, toolchain_path):
+        setenv_paths = [
+            # cipd packaged SDKs from 10.0.19041.0 onwards.
+            os.path.join('Windows Kits', '10', 'bin', 'SetEnv.cmd'),
+            # cipd packaged SDKs prior to 10.0.19041.0.
+            os.path.join('win_sdk', 'bin', 'SetEnv.cmd'),
+        ]
+
+        def explicit():
+            for setenv_path in setenv_paths:
+                if os.path.exists(os.path.join(toolchain_path, setenv_path)):
+                    return toolchain_path, setenv_path
+
+        def env():
+            from_env = os.environ.get('VSINSTALLDIR')
+            for setenv_path in setenv_paths:
+                if from_env and os.path.exists(
+                        os.path.join(from_env, setenv_path)):
+                    return from_env, setenv_path
+
+        def autodetect():
+            # Try vswhere, which will find VS2017.2+. Note that earlier VS2017s
+            # will not be found.
+            vswhere_path = os.path.join(os.environ.get('ProgramFiles(x86)'),
+                                        'Microsoft Visual Studio', 'Installer',
+                                        'vswhere.exe')
+            if os.path.exists(vswhere_path):
+                installation_path = subprocess.check_output([
+                    vswhere_path, '-products', '*', '-latest', '-property',
+                    'installationPath'
+                ]).strip()
+                if installation_path:
+                    return (installation_path.decode("utf-8"),
+                            os.path.join('VC', 'Auxiliary', 'Build',
+                                         'vcvarsall.bat'))
+
+            # Otherwise, try VS2015.
+            version = '14.0'
+            keys = [
+                r'HKLM\Software\Microsoft\VisualStudio\%s' % version,
+                r'HKLM\Software\Wow6432Node\Microsoft\VisualStudio\%s' % version
+            ]
+            for key in keys:
+                path = _RegistryGetValue(key, 'InstallDir')
+                if not path:
+                    continue
+                return (os.path.normpath(
+                    os.path.join(path, os.pardir, os.pardir)),
+                        os.path.join('VC', 'vcvarsall.bat'))
+
+        def fail():
+            raise Exception('Visual Studio installation dir not found')
+
+        # Use an explicitly specified toolchain path, if provided and found.
+        # Otherwise, try using a standard environment variable. Finally, try
+        # autodetecting using vswhere.
+        install_dir, script_path = (explicit() or env() or autodetect() or
+                                    fail())
+
+        x86_file, x64_file, arm64_file = _GenerateEnvironmentFiles(
+            install_dir, outdir, script_path)
+        # gn is unhappy with trailing backslashes.
+        install_dir = install_dir.rstrip('\\')
+        result = '''install_dir = "%s"
 x86_environment_file = "%s"
 x64_environment_file = "%s"
 arm64_environment_file = "%s"''' % (install_dir, x86_file, x64_file, arm64_file)
-    print result
-    return 0
+        print(result)
+        return 0
 
-  def ExecStamp(self, path):
-    """Simple stamp command."""
-    open(path, 'w').close()
-    return 0
+    def ExecStamp(self, path):
+        """Simple stamp command."""
+        open(path, 'w').close()
+        return 0
 
 
 if __name__ == '__main__':
-  sys.exit(WinTool().Dispatch(sys.argv[1:]))
+    sys.exit(WinTool().Dispatch(sys.argv[1:]))
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/write_buildflag_header.py b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/write_buildflag_header.py
index f45af6c0d8..5e5792d222 100755
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/write_buildflag_header.py
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/build/write_buildflag_header.py
@@ -1,14 +1,15 @@
 #!/usr/bin/env python
-# Copyright 2015 The Chromium Authors. All rights reserved.
+
+# Copyright 2015 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This writes headers for build flags. See buildflag_header.gni for usage of
 # this system as a whole.
 #
-# The parameters are passed in a response file so we don't have to worry
-# about command line lengths. The name of the response file is passed on the
-# command line.
+# The parameters are passed in a response file so we don't have to worry about
+# command line lengths. The name of the response file is passed on the command
+# line.
 #
 # The format of the response file is:
 #    [--flags <list of one or more flag values>]
@@ -20,79 +21,84 @@
 
 
 class Options:
-  def __init__(self, output, rulename, header_guard, flags):
-    self.output = output
-    self.rulename = rulename
-    self.header_guard = header_guard
-    self.flags = flags
+
+    def __init__(self, output, rulename, header_guard, flags):
+        self.output = output
+        self.rulename = rulename
+        self.header_guard = header_guard
+        self.flags = flags
 
 
 def GetOptions():
-  parser = optparse.OptionParser()
-  parser.add_option('--output', help="Output header name inside --gen-dir.")
-  parser.add_option('--rulename',
-                    help="Helpful name of build rule for including in the " +
-                         "comment at the top of the file.")
-  parser.add_option('--gen-dir',
-                    help="Path to root of generated file directory tree.")
-  parser.add_option('--definitions',
-                    help="Name of the response file containing the flags.")
-  cmdline_options, cmdline_flags = parser.parse_args()
-
-  # Compute header guard by replacing some chars with _ and upper-casing.
-  header_guard = cmdline_options.output.upper()
-  header_guard = \
-      header_guard.replace('/', '_').replace('\\', '_').replace('.', '_')
-  header_guard += '_'
-
-  # The actual output file is inside the gen dir.
-  output = os.path.join(cmdline_options.gen_dir, cmdline_options.output)
-
-  # Definition file in GYP is newline separated, in GN they are shell formatted.
-  # shlex can parse both of these.
-  with open(cmdline_options.definitions, 'r') as def_file:
-    defs = shlex.split(def_file.read())
-  flags_index = defs.index('--flags')
-
-  # Everything after --flags are flags. true/false are remapped to 1/0,
-  # everything else is passed through.
-  flags = []
-  for flag in defs[flags_index + 1 :]:
-    equals_index = flag.index('=')
-    key = flag[:equals_index]
-    value = flag[equals_index + 1:]
-
-    # Canonicalize and validate the value.
-    if value == 'true':
-      value = '1'
-    elif value == 'false':
-      value = '0'
-    flags.append((key, str(value)))
-
-  return Options(output=output,
-                 rulename=cmdline_options.rulename,
-                 header_guard=header_guard,
-                 flags=flags)
+    parser = optparse.OptionParser()
+    parser.add_option('--output', help="Output header name inside --gen-dir.")
+    parser.add_option('--rulename',
+                      help="Helpful name of build rule for including in the " +
+                      "comment at the top of the file.")
+    parser.add_option('--gen-dir',
+                      help="Path to root of generated file directory tree.")
+    parser.add_option('--definitions',
+                      help="Name of the response file containing the flags.")
+    cmdline_options, cmdline_flags = parser.parse_args()
+
+    # Compute header guard by replacing some chars with _ and upper-casing.
+    header_guard = cmdline_options.output.upper()
+    header_guard = \
+        header_guard.replace('/', '_').replace('\\', '_').replace('.', '_')
+    header_guard += '_'
+
+    # The actual output file is inside the gen dir.
+    output = os.path.join(cmdline_options.gen_dir, cmdline_options.output)
+
+    # Definition file in GYP is newline separated, in GN they are shell
+    # formatted. shlex can parse both of these.
+    with open(cmdline_options.definitions, 'r') as def_file:
+        defs = shlex.split(def_file.read())
+    flags_index = defs.index('--flags')
+
+    # Everything after --flags are flags. true/false are remapped to 1/0,
+    # everything else is passed through.
+    flags = []
+    for flag in defs[flags_index + 1:]:
+        equals_index = flag.index('=')
+        key = flag[:equals_index]
+        value = flag[equals_index + 1:]
+
+        # Canonicalize and validate the value.
+        if value == 'true':
+            value = '1'
+        elif value == 'false':
+            value = '0'
+        flags.append((key, str(value)))
+
+    return Options(output=output,
+                   rulename=cmdline_options.rulename,
+                   header_guard=header_guard,
+                   flags=flags)
 
 
 def WriteHeader(options):
-  with open(options.output, 'w') as output_file:
-    output_file.write("// Generated by build/write_buildflag_header.py\n")
-    if options.rulename:
-      output_file.write('// From "' + options.rulename + '"\n')
+    with open(options.output, 'w') as output_file:
+        output_file.write("// Generated by build/write_buildflag_header.py\n")
+        if options.rulename:
+            output_file.write('// From "' + options.rulename + '"\n')
 
-    output_file.write('\n#ifndef %s\n' % options.header_guard)
-    output_file.write('#define %s\n\n' % options.header_guard)
-    output_file.write('#include "build/buildflag.h"\n\n')
+        output_file.write('\n#ifndef %s\n' % options.header_guard)
+        output_file.write('#define %s\n\n' % options.header_guard)
+        output_file.write('#include "build/buildflag.h"\n\n')
 
-    for pair in options.flags:
-      output_file.write('#define BUILDFLAG_INTERNAL_%s() (%s)\n' % pair)
+        for pair in options.flags:
+            output_file.write(
+                '#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_%s() (%s)\n' %
+                pair)
+
+        output_file.write('\n#endif  // %s\n' % options.header_guard)
 
-    output_file.write('\n#endif  // %s\n' % options.header_guard)
 
 def main():
-  options = GetOptions()
-  WriteHeader(options)
+    options = GetOptions()
+    WriteHeader(options)
+
 
 if __name__ == "__main__":
-  sys.exit(main())
+    sys.exit(main())
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/codereview.settings b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/codereview.settings
index 2df18295dc..81af1e1d64 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/codereview.settings
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/codereview.settings
@@ -1,4 +1,4 @@
-# Copyright 2009 The Chromium Authors. All rights reserved.
+# Copyright 2009 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/testing/BUILD.gn b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/testing/BUILD.gn
index 080ecd44e6..fe9adb9fdd 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/testing/BUILD.gn
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/testing/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2020 The Chromium Authors. All rights reserved.
+# Copyright 2020 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
diff --git a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/testing/platform_test.h b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/testing/platform_test.h
index 136eb299e1..213fdeff11 100644
--- a/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/testing/platform_test.h
+++ b/extern/crashpad/crashpad/third_party/mini_chromium/mini_chromium/testing/platform_test.h
@@ -1,4 +1,4 @@
-// Copyright 2020 The Chromium Authors. All rights reserved.
+// Copyright 2020 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -8,8 +8,16 @@
 #include "build/build_config.h"
 #include "gtest/gtest.h"
 
-#if defined(OS_APPLE)
-#import <Foundation/Foundation.h>
+#if BUILDFLAG(IS_APPLE)
+
+// Note that this uses the direct runtime interface to the autorelease pool.
+// https://clang.llvm.org/docs/AutomaticReferenceCounting.html#runtime-support
+// This is so this can work when compiled for ARC.
+
+extern "C" {
+void* objc_autoreleasePoolPush(void);
+void objc_autoreleasePoolPop(void* pool);
+}
 
 // The implementation is in this header because mini_chromium does not directly
 // depend on googletest. Consumers are free to use this interface if they do
@@ -19,21 +27,16 @@ class PlatformTest : public testing::Test {
   PlatformTest(const PlatformTest&) = delete;
   PlatformTest& operator=(const PlatformTest&) = delete;
 
-  ~PlatformTest() override { [pool_ release]; }
+  ~PlatformTest() override { objc_autoreleasePoolPop(autorelease_pool_); }
 
  protected:
-  PlatformTest() : pool_([[NSAutoreleasePool alloc] init]) {}
+  PlatformTest() : autorelease_pool_(objc_autoreleasePoolPush()) {}
 
  private:
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-  using PoolType = NSAutoreleasePool*;
-#else
-  using PoolType = id;
-#endif
-  PoolType pool_;
+  void* autorelease_pool_;
 };
 #else
 using PlatformTest = testing::Test;
-#endif  // OS_APPLE
+#endif  // BUILDFLAG(IS_APPLE)
 
 #endif  // MINI_CHROMIUM_TESTING_PLATFORM_TEST_H_
diff --git a/extern/crashpad/crashpad/third_party/ninja/README.crashpad b/extern/crashpad/crashpad/third_party/ninja/README.crashpad
new file mode 100644
index 0000000000..8a5f1eeba8
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/ninja/README.crashpad
@@ -0,0 +1,18 @@
+Name: ninja
+Short Name: ninja
+URL: https://github.com/ninja-build/ninja
+Revision: See the CIPD version in DEPS
+License: Apache License 2.0
+License File: https://github.com/ninja-build/ninja/blob/master/COPYING
+Security Critical: no
+Shipped: no
+
+Description:
+Ninja is a small build system with a focus on speed, and is used to build
+this project.
+
+The CIPD packages are built using the 3pp pipeline.
+https://chromium.googlesource.com/infra/infra/+/refs/heads/main/3pp/ninja/
+
+Local Modifications:
+None
diff --git a/extern/crashpad/crashpad/third_party/ninja/ninja b/extern/crashpad/crashpad/third_party/ninja/ninja
new file mode 100644
index 0000000000..ca0874608c
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/ninja/ninja
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# Copyright 2022 The Crashpad Authors
+#
+# 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.
+
+set -eu
+
+OS="$(uname -s)"
+THIS_DIR="$(dirname "${0}")"
+
+print_help() {
+cat <<EOF >&2
+No ninja binary is available for this system.
+Try building your own binary by doing:
+  cd ~
+  git clone https://github.com/ninja-build/ninja.git
+  cd ninja && ./configure.py --bootstrap
+Then add ~/ninja/ to your PATH.
+EOF
+}
+
+case "${OS}" in
+  Linux)
+    exec "${THIS_DIR}/linux/ninja" "$@";;
+  Darwin)
+    ARCH="$(uname -m)"
+    case "${ARCH}" in
+      x86_64)
+        exec "${THIS_DIR}/mac-amd64/ninja" "$@";;
+      arm64)
+        exec "${THIS_DIR}/mac-arm64/ninja" "$@";;
+      *)
+        echo "Unsupported architecture ${ARCH}" >&2
+        print_help
+        exit 1;;
+    esac
+    ;;
+  *)
+    echo "Unsupported OS ${OS}" >&2
+    print_help
+    exit 1;;
+esac
diff --git a/extern/crashpad/crashpad/third_party/xnu/BUILD.gn b/extern/crashpad/crashpad/third_party/xnu/BUILD.gn
index 2079ecf00e..6d9f00e9f5 100644
--- a/extern/crashpad/crashpad/third_party/xnu/BUILD.gn
+++ b/extern/crashpad/crashpad/third_party/xnu/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2019 The Crashpad Authors. All rights reserved.
+# Copyright 2019 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/third_party/xnu/EXTERNAL_HEADERS/mach-o/loader.h b/extern/crashpad/crashpad/third_party/xnu/EXTERNAL_HEADERS/mach-o/loader.h
index 72e8c39b61..577c424aca 100644
--- a/extern/crashpad/crashpad/third_party/xnu/EXTERNAL_HEADERS/mach-o/loader.h
+++ b/extern/crashpad/crashpad/third_party/xnu/EXTERNAL_HEADERS/mach-o/loader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2010 Apple Inc.  All Rights Reserved.
+ * Copyright (c) 1999-2019 Apple Inc.  All Rights Reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -120,6 +120,7 @@ struct mach_header_64 {
 #define	MH_DSYM		0xa		/* companion file with only debug */
 					/*  sections */
 #define	MH_KEXT_BUNDLE	0xb		/* x86_64 kexts */
+#define	MH_FILESET	0xc		/* set of mach-o's */
 
 /* Constants for the flags field of the mach_header */
 #define	MH_NOUNDEFS	0x1		/* the object file has no undefined
@@ -322,6 +323,7 @@ struct load_command {
 #define LC_BUILD_VERSION 0x32 /* build for platform min OS version */
 #define LC_DYLD_EXPORTS_TRIE (0x33 | LC_REQ_DYLD) /* used with linkedit_data_command, payload is trie */
 #define LC_DYLD_CHAINED_FIXUPS (0x34 | LC_REQ_DYLD) /* used with linkedit_data_command */
+#define LC_FILESET_ENTRY      (0x35 | LC_REQ_DYLD) /* used with fileset_entry_command */
 
 /*
  * A variable length string in a load command is represented by an lc_str
@@ -622,6 +624,9 @@ struct section_64 { /* for 64-bit architectures */
 					/* option to ld(1) for MH_EXECUTE and */
 					/* FVMLIB file types only */
 
+#define SEG_LINKINFO	"__LINKINFO"	/* the segment overlapping with linkedit */
+					/* containing linking information */
+
 #define SEG_UNIXSTACK	"__UNIXSTACK"	/* the unix stack segment */
 
 #define SEG_IMPORT	"__IMPORT"	/* the segment for the self (dyld) */
@@ -1196,6 +1201,15 @@ struct linkedit_data_command {
     uint32_t	datasize;	/* file size of data in __LINKEDIT segment  */
 };
 
+struct fileset_entry_command {
+    uint32_t        cmd;        /* LC_FILESET_ENTRY */
+    uint32_t        cmdsize;    /* includes id string */
+    uint64_t        vmaddr;     /* memory address of the dylib */
+    uint64_t        fileoff;    /* file offset of the dylib */
+    union lc_str    entry_id;   /* contained entry id */
+    uint32_t        reserved;   /* entry_id is 32-bits long, so this is the reserved padding */
+};
+
 /*
  * The encryption_info_command contains the file offset and size of an
  * of an encrypted segment.
@@ -1264,11 +1278,13 @@ struct build_tool_version {
 #define PLATFORM_TVOS 3
 #define PLATFORM_WATCHOS 4
 #define PLATFORM_BRIDGEOS 5
-#define PLATFORM_IOSMAC 6
+#define PLATFORM_MACCATALYST 6
 #define PLATFORM_IOSSIMULATOR 7
 #define PLATFORM_TVOSSIMULATOR 8
 #define PLATFORM_WATCHOSSIMULATOR 9
 #define PLATFORM_DRIVERKIT 10
+#define PLATFORM_MAX PLATFORM_DRIVERKIT
+/* Addition of simulated platfrom also needs to update proc_is_simulated() */ 
 
 /* Known values for the tool field above. */
 #define TOOL_CLANG 1
diff --git a/extern/crashpad/crashpad/third_party/xnu/README.crashpad b/extern/crashpad/crashpad/third_party/xnu/README.crashpad
index f8471d384b..0a5f2e63da 100644
--- a/extern/crashpad/crashpad/third_party/xnu/README.crashpad
+++ b/extern/crashpad/crashpad/third_party/xnu/README.crashpad
@@ -1,11 +1,12 @@
 Name: XNU
 Short Name: xnu
-URL: https://opensource.apple.com/source/xnu/
-URL: https://opensource.apple.com/tarballs/xnu/
-Version: 6153.11.26 (from macOS 10.15.0)
+URL: https://github.com/apple-oss-distributions/xnu/
+Version: 12377.1.9 (from macOS 26.0)
+Revision: f6217f891ac0bb64f3d375211650a4c1ff8ca1ea
 License: APSL 2.0
 License File: APPLE_LICENSE
 Security Critical: no
+Shipped: yes
 
 Description:
 XNU is the operating system kernel used on macOS and other Apple systems.
diff --git a/extern/crashpad/crashpad/third_party/xnu/osfmk/mach/exc.defs b/extern/crashpad/crashpad/third_party/xnu/osfmk/mach/exc.defs
index 734e7408fe..ee4e8e9264 100644
--- a/extern/crashpad/crashpad/third_party/xnu/osfmk/mach/exc.defs
+++ b/extern/crashpad/crashpad/third_party/xnu/osfmk/mach/exc.defs
@@ -61,10 +61,9 @@
  */
 
 subsystem
-#if	KERNEL_SERVER
-	  KernelServer
-#endif	/* KERNEL_SERVER */
-
+#if	KERNEL_SERVER || KOBJECT_SERVER
+	KernelServer
+#endif	/* KERNEL_SERVER || KOBJECT_SERVER */
 #if	KERNEL_USER
 	  KernelUser
 #endif
diff --git a/extern/crashpad/crashpad/third_party/xnu/osfmk/mach/mach_exc.defs b/extern/crashpad/crashpad/third_party/xnu/osfmk/mach/mach_exc.defs
index 5ce6427bc7..148cdcc62f 100644
--- a/extern/crashpad/crashpad/third_party/xnu/osfmk/mach/mach_exc.defs
+++ b/extern/crashpad/crashpad/third_party/xnu/osfmk/mach/mach_exc.defs
@@ -61,13 +61,12 @@
  */
 
 subsystem
+#if	KERNEL_SERVER || KOBJECT_SERVER
+	KernelServer
+#endif	/* KERNEL_SERVER || KOBJECT_SERVER */
 #if	KERNEL_USER
 	  KernelUser
 #endif
-#if	KERNEL_SERVER
-	  KernelServer
-#endif	/* KERNEL_SERVER */
-
 		     mach_exc 2405;
 
 #include <mach/std_types.defs>
@@ -130,4 +129,70 @@ routine		mach_exception_raise_state_identity(
 #endif
 			);
 
+#if MACH_EXC_SERVER_TASKIDTOKEN || ((KERNEL_USER || KERNEL_SERVER) && !SANDBOX_COMPILER)
+routine		mach_exception_raise_identity_protected(
+			exception_port	: mach_port_t;
+			thread_id	: uint64_t;
+			task_id_token_t	: mach_port_t;
+			exception	: exception_type_t;
+			code		: mach_exception_data_t
+#if MACH_EXC_SERVER_SECTOKEN
+ ;
+ ServerSecToken stoken	: security_token_t
+#endif
+#if MACH_EXC_SERVER_AUDITTOKEN
+ ;
+ ServerAuditToken atoken: audit_token_t
+#endif
+			);
+#else
+	skip;
+#endif /* MACH_EXC_SERVER_TASKIDTOKEN */
+
+#if MACH_EXC_SERVER_BACKTRACE || ((KERNEL_USER || KERNEL_SERVER) && !SANDBOX_COMPILER)
+routine		mach_exception_raise_backtrace(
+			exception_port	: mach_port_t;
+			kcdata_object_t	: mach_port_t;
+			exception	: exception_type_t;
+			code		: mach_exception_data_t
+#if MACH_EXC_SERVER_SECTOKEN
+ ;
+ ServerSecToken stoken	: security_token_t
+#endif
+#if MACH_EXC_SERVER_AUDITTOKEN
+ ;
+ ServerAuditToken atoken: audit_token_t
+#endif
+			);
+#else
+	skip;
+#endif /* MACH_EXC_SERVER_BACKTRACE */
+
+/*
+ * Same as identity_protected above, but also handles an in/out thread_state_t. 
+ */
+#if MACH_EXC_SERVER_TASKIDTOKEN_STATE || ((KERNEL_USER || KERNEL_SERVER) && !SANDBOX_COMPILER)
+routine		mach_exception_raise_state_identity_protected(
+			exception_port	: mach_port_t;
+			thread_id	: uint64_t;
+			task_id_token_t	: mach_port_t;
+			exception	: exception_type_t;
+			code		: mach_exception_data_t;
+			inout flavor    : int;
+			old_state       : thread_state_t;
+		    out new_state   : thread_state_t
+#if MACH_EXC_SERVER_SECTOKEN
+ ;
+ ServerSecToken stoken	: security_token_t
+#endif
+#if MACH_EXC_SERVER_AUDITTOKEN
+ ;
+ ServerAuditToken atoken: audit_token_t
+#endif
+			);
+#else  /* MACH_EXC_SERVER_TASKIDTOKEN_STATE  || ((KERNEL_USER || KERNEL_SERVER) && !SANDBOX_COMPILER) */
+	skip;
+#endif /* MACH_EXC_SERVER_TASKIDTOKEN_STATE  || ((KERNEL_USER || KERNEL_SERVER) && !SANDBOX_COMPILER) */
+
+
 /* vim: set ft=c : */
diff --git a/extern/crashpad/crashpad/third_party/xnu/osfmk/mach/mach_types.defs b/extern/crashpad/crashpad/third_party/xnu/osfmk/mach/mach_types.defs
index d2e9fb0b4e..fe00742b2c 100644
--- a/extern/crashpad/crashpad/third_party/xnu/osfmk/mach/mach_types.defs
+++ b/extern/crashpad/crashpad/third_party/xnu/osfmk/mach/mach_types.defs
@@ -71,8 +71,8 @@
 
 #include <mach/std_types.defs>
 
-type memory_object_offset_t 	= uint64_t;
-type memory_object_size_t 	= uint64_t;
+type memory_object_offset_t 	= uint64_t VM_UNSAFE_TYPE(memory_object_offset_ut);
+type memory_object_size_t 	= uint64_t VM_UNSAFE_TYPE(memory_object_size_ut);
 type memory_object_cluster_size_t = uint32_t;
 type memory_object_fault_info_t = array[16] of integer_t;
 
@@ -119,30 +119,64 @@ type mach_port_info_t		= array[*:17] of integer_t;
 type mach_msg_trailer_type_t = int;
 type mach_msg_trailer_info_t	= array[*:68] of char;
 
+type mach_task_flavor_t = int;
+
+/* Task control, read, inspect, name port. In descending capability. */
 type task_t = mach_port_t
 #if	KERNEL_SERVER
-		intran: task_t convert_port_to_task(mach_port_t)
-		outtran: mach_port_t convert_task_to_port(task_t)
-		destructor: task_deallocate(task_t)
+		intran: task_t convert_port_to_task_mig(mach_port_t)
+		outtran: mach_port_t convert_task_to_port_kernel(task_t)
+		destructor: task_deallocate_mig(task_t)
 #endif	/* KERNEL_SERVER */
 		;
 
-type task_name_t = mach_port_t
+type task_read_t = mach_port_t
 #if	KERNEL_SERVER
-		intran: task_name_t convert_port_to_task_name(mach_port_t)
-		outtran: mach_port_t convert_task_name_to_port(task_name_t)
-		destructor: task_name_deallocate(task_name_t)
+		intran: task_read_t convert_port_to_task_read_mig(mach_port_t)
+		outtran: mach_port_t convert_task_read_to_port_kernel(task_read_t)
+		destructor: task_read_deallocate_mig(task_read_t)
 #endif	/* KERNEL_SERVER */
 		;
 
 type task_inspect_t = mach_port_t
 #if	KERNEL_SERVER
-		intran: task_inspect_t convert_port_to_task_inspect(mach_port_t)
+		intran: task_inspect_t convert_port_to_task_inspect_mig(mach_port_t)
 		outtran: mach_port_t convert_task_inspect_to_port(task_inspect_t)
-		destructor: task_inspect_deallocate(task_inspect_t)
+		destructor: task_inspect_deallocate_mig(task_inspect_t)
+#endif	/* KERNEL_SERVER */
+		;
+
+type task_name_t = mach_port_t
+#if	KERNEL_SERVER
+		intran: task_name_t convert_port_to_task_name_mig(mach_port_t)
+		outtran: mach_port_t convert_task_name_to_port(task_name_t)
+		destructor: task_name_deallocate_mig(task_name_t)
 #endif	/* KERNEL_SERVER */
 		;
 
+type task_policy_set_t = mach_port_t
+#if	KERNEL_SERVER
+		intran: task_policy_set_t convert_port_to_task_policy_set_mig(mach_port_t)
+		destructor: task_policy_set_deallocate_mig(task_policy_set_t)
+#endif	/* KERNEL_SERVER */
+		;
+
+type task_policy_get_t = mach_port_t
+#if	KERNEL_SERVER
+		intran: task_policy_get_t convert_port_to_task_policy_get_mig(mach_port_t)
+		destructor: task_policy_get_deallocate_mig(task_policy_get_t)
+#endif	/* KERNEL_SERVER */
+		;
+
+type task_id_token_t = mach_port_t
+#if KERNEL_SERVER
+		intran: task_id_token_t convert_port_to_task_id_token(mach_port_t)
+		outtran: mach_port_t convert_task_id_token_to_port(task_id_token_t)
+		destructor: task_id_token_release(task_id_token_t)
+#endif	/* KERNEL_SERVER */
+		;
+
+/* Thread control, read, inspect port. In descending capability. */
 type thread_t = mach_port_t
 #if	KERNEL_SERVER
 		intran: thread_t convert_port_to_thread(mach_port_t)
@@ -151,6 +185,14 @@ type thread_t = mach_port_t
 #endif	/* KERNEL_SERVER */
 		;
 
+type thread_read_t = mach_port_t
+#if	KERNEL_SERVER
+		intran: thread_read_t convert_port_to_thread_read(mach_port_t)
+		outtran: mach_port_t convert_thread_read_to_port(thread_read_t)
+		destructor: thread_read_deallocate(thread_read_t)
+#endif	/* KERNEL_SERVER */
+		;
+
 type thread_inspect_t = mach_port_t
 #if	KERNEL_SERVER
 		intran: thread_inspect_t convert_port_to_thread_inspect(mach_port_t)
@@ -196,6 +238,20 @@ type vm_map_t = mach_port_t
 #endif	/* KERNEL_SERVER */
 		;
 
+type vm_map_inspect_t = mach_port_t
+#if	KERNEL_SERVER
+		intran: vm_map_inspect_t convert_port_to_map_inspect(mach_port_t)
+		destructor: vm_map_inspect_deallocate(vm_map_inspect_t)
+#endif	/* KERNEL_SERVER */
+		;
+
+type vm_map_read_t = mach_port_t
+#if	KERNEL_SERVER
+		intran: vm_map_read_t convert_port_to_map_read(mach_port_t)
+		destructor: vm_map_read_deallocate(vm_map_read_t)
+#endif	/* KERNEL_SERVER */
+		;
+
 type vm_task_entry_t = mach_port_t
 		cusertype: vm_map_t
 #if	KERNEL_SERVER
@@ -211,6 +267,13 @@ type ipc_space_t = mach_port_t
 #endif	/* KERNEL_SERVER */
 		;
 
+type ipc_space_read_t = mach_port_t
+#if	KERNEL_SERVER
+		intran: ipc_space_read_t convert_port_to_space_read(mach_port_t)
+		destructor: space_read_deallocate(ipc_space_read_t)
+#endif	/* KERNEL_SERVER */
+		;
+
 type ipc_space_inspect_t = mach_port_t
 #if	KERNEL_SERVER
 		intran: ipc_space_inspect_t convert_port_to_space_inspect(mach_port_t)
@@ -224,11 +287,19 @@ type arcade_register_t = mach_port_t
 #endif	/* KERNEL_SERVER */
 		;
 
-type vm_prot_t = int;
-type vm_inherit_t = int;
+type kcdata_object_t = mach_port_t
+#if KERNEL_SERVER
+		intran: kcdata_object_t convert_port_to_kcdata_object(mach_port_t)
+		outtran: mach_port_t convert_kcdata_object_to_port(kcdata_object_t)
+		destructor: kcdata_object_release(kcdata_object_t)
+#endif	/* KERNEL_SERVER */
+		;
+
+type vm_prot_t = int VM_UNSAFE_TYPE(vm_prot_ut);
+type vm_inherit_t = int VM_UNSAFE_TYPE(vm_inherit_ut);
 type vm_purgable_t = int;
 type xxx_vm_statistics_data_t = struct[13] of integer_t;
-type vm_behavior_t = int;
+type vm_behavior_t = int VM_UNSAFE_TYPE(vm_behavior_ut);
 type vm_statistics_data_t = struct[15] of integer_t;
 type vm_machine_attribute_t = int;
 type vm_machine_attribute_val_t = int;
@@ -264,12 +335,22 @@ type thread_policy_t		= array[*:16] of integer_t;
 		 * task_basic_info_64_2_t
 		 * mach_task_basic_info_t (12 ints)
 		 * task_power_info_t (18 ints)
-		 * task_vm_info_t (87 ints)
+		 * task_vm_info_t (93 ints)
 		 * If other task_info flavors are added, this
 		 * definition may need to be changed. (See
-		 * mach/task_info.h and mach/policy.h) */
+		 * mach/task_info.h and mach/policy.h)
+		 *
+		 * Add at least 1 extra element to allow task_info(TASK_VM_INFO)
+		 * to detect callers that may pass "count" as the number of
+		 * bytes instead of number of integer_t, for example.
+		 * The MIG user stub truncates that number to the maximum
+		 * number of elements in "task_info_t" which currently
+		 * happens to be TASK_VM_INFO_COUNT, making it impossible
+		 * for the kernel to detect the misuse of "count" and
+		 * possibly causing an overflow of the user's buffer.
+		 */
 type task_flavor_t		= int;
-type task_info_t		= array[*:87] of integer_t;
+type task_info_t		= array[*:93+1] of integer_t;
 
 type task_purgable_info_t	= struct[68] of integer_t;
 
@@ -280,6 +361,7 @@ type task_inspect_flavor_t = natural_t;
 type task_inspect_info_t = array[*:4] of integer_t;
 
 type task_exc_guard_behavior_t = uint32_t;
+type task_corpse_forking_behavior_t = uint32_t;
 
 type mem_entry_name_port_t = mach_port_t
 #if     KERNEL_SERVER
@@ -303,21 +385,14 @@ type memory_object_default_t = mach_port_t
 #endif	/* KERNEL_PRIVATE */
 		;
  
-type memory_object_t = mach_port_t
+type memory_object_t = mach_port_t /* obsolete */
 #if	KERNEL_PRIVATE
 		intran: memory_object_t convert_port_to_memory_object(mach_port_t)
 		outtran: mach_port_t convert_memory_object_to_port(memory_object_t)
 #endif	/* KERNEL_PRIVATE */
 		;
 
-
-type memory_object_control_t = mach_port_t
-#if	KERNEL_PRIVATE
-		intran: memory_object_control_t convert_port_to_mo_control(mach_port_t)
-		outtran: mach_port_t convert_mo_control_to_port(memory_object_control_t)
-		destructor: memory_object_control_deallocate(memory_object_control_t)
-#endif	/* KERNEL_PRIVATE */
-		;
+type memory_object_control_t = mach_port_t; /* obsolete */
 
 type memory_object_name_t = mach_port_t
 		ctype: mach_port_t
@@ -343,11 +418,7 @@ type host_priv_t = mach_port_t
 #endif	/* KERNEL_SERVER */
 		;
 
-type host_security_t = mach_port_t
-#if	KERNEL_SERVER
-		intran: host_security_t convert_port_to_host_security(mach_port_t)
-#endif	/* KERNEL_SERVER */
-		;
+type host_security_t = mach_port_t; /* obsolete */
 
 		/* 
 		 * host_info_t: variable-sized inline array that can contain:
@@ -407,7 +478,6 @@ type processor_set_t = mach_port_t
 #if	KERNEL_SERVER
 		intran: processor_set_t convert_port_to_pset(mach_port_t)
 		outtran: mach_port_t convert_pset_to_port(processor_set_t)
-		destructor: pset_deallocate(processor_set_t)
 #endif	/* KERNEL_SERVER */
 		;
 
@@ -417,7 +487,6 @@ type processor_set_name_t = mach_port_t
 #if	KERNEL_SERVER
 		intran: processor_set_name_t convert_port_to_pset_name(mach_port_t)
 		outtran: mach_port_t convert_pset_name_to_port(processor_set_name_t)
-		destructor: pset_deallocate(processor_set_name_t)
 #endif	/* KERNEL_SERVER */
 		;
 
@@ -451,6 +520,8 @@ type mach_port_qos_t = struct[2] of integer_t;
 type mach_port_options_t = struct[3] of uint64_t;
 type mach_port_options_ptr_t = ^ mach_port_options_t;
 
+type mach_service_port_info_data_t = struct[256] of char;
+
 type emulation_vector_t		= ^array[] of vm_offset_t;
 
 type inline_existence_map_t	= array[*:512] of char;
@@ -510,14 +581,22 @@ type vm_read_entry_t = array[512] of vm_offset_t;
 type vm32_read_entry_t = array[512] of vm32_offset_t;
 #endif
 
+type mach_vm_range_flavor_t = uint32_t;
+type mach_vm_range_recipes_raw_t = array[*:1024] of uint8_t;
+
 type exception_mask_t		= int;
 type exception_behavior_t	= int;
 
 type    exception_handler_t = mach_port_t;
 
+type    exception_handler_info_t = struct[2] of natural_t;
+
 type	exception_handler_array_t	=
 			array[*:32] of exception_handler_t;
 
+type    exception_handler_info_array_t =
+			array[*:32] of exception_handler_info_t;
+
 type	exception_behavior_array_t	=
 			array[*:32] of exception_behavior_t;
 
@@ -543,23 +622,50 @@ type semaphore_consume_ref_t = mach_port_move_send_t
 #endif	/* KERNEL_SERVER */
 		;
 
-type lock_set_t = mach_port_t
+#ifndef _MACH_MACH_EVENTLINK_TYPE_DEFS
+#define _MACH_MACH_EVENTLINK_TYPE_DEFS
+
+type eventlink_t = mach_port_t
+		ctype: mach_port_t
 #if	KERNEL_SERVER
-		intran: lock_set_t convert_port_to_lock_set(mach_port_t)
-		outtran: mach_port_t convert_lock_set_to_port(lock_set_t)
-		destructor: lock_set_dereference(lock_set_t)
+		intran: ipc_eventlink_t convert_port_to_eventlink(mach_port_t)
+		destructor: ipc_eventlink_deallocate(ipc_eventlink_t)
 #endif	/* KERNEL_SERVER */
 		;
 
+type eventlink_consume_ref_t = mach_port_move_send_t
+		ctype: mach_port_t
+#if	KERNEL_SERVER
+		intran: ipc_eventlink_t convert_port_to_eventlink(mach_port_t)
+		destructor: ipc_eventlink_deallocate(ipc_eventlink_t)
+#endif	/* KERNEL_SERVER */
+		;
+
+type eventlink_port_pair_t = array[2] of mach_port_t;
+type mach_eventlink_create_option_t = uint32_t;
+type mach_eventlink_associate_option_t = uint32_t;
+type mach_eventlink_disassociate_option_t = uint32_t;
+type mach_eventlink_signal_wait_option_t = uint32_t;
+
+#endif /* _MACH_MACH_EVENTLINK_TYPE_DEFS */
+
+/* obsolete */
+type lock_set_t = mach_port_t;
+
 type task_suspension_token_t = mach_port_move_send_once_t
 #if	KERNEL_SERVER
-		intran: task_suspension_token_t convert_port_to_task_suspension_token(mach_port_t)
-		outtran: mach_port_t convert_task_suspension_token_to_port(task_suspension_token_t)
+		intran: task_suspension_token_t convert_port_to_task_suspension_token_mig(mach_port_t)
+		outtran: mach_port_t convert_task_suspension_token_to_port_mig(task_suspension_token_t)
 #endif	/* KERNEL_SERVER */
 		;
 
 type vfs_path_t = c_string[4096];
-type nspace_path_t = c_string[1024];	/* 1024 == PATH_MAX */
+/*
+ * 8K, c.f. MAXLONGPATHLEN in sys/syslimits.h.
+ * These types should NEVER be allocated on the stack.
+ */
+type nspace_path_t = c_string[8192];
+type nspace_name_t = c_string[8192];
 
 /* public voucher types */
 
@@ -580,13 +686,7 @@ type ipc_voucher_t = mach_port_t
 	        ;
 
 /* IPC voucher attribute control internal object */
-type ipc_voucher_attr_control_t = mach_port_t
-#if	KERNEL_SERVER
-		intran: ipc_voucher_attr_control_t convert_port_to_voucher_attr_control(mach_port_t)
-		outtran: mach_port_t convert_voucher_attr_control_to_port(ipc_voucher_attr_control_t)
-		destructor: ipc_voucher_attr_control_release(ipc_voucher_attr_control_t)
-#endif	/* KERNEL_SERVER */
-                ;
+type ipc_voucher_attr_control_t = mach_port_t; /* obsolete */
 
 type mach_voucher_attr_key_t = uint32_t;
 
@@ -614,7 +714,7 @@ type kmod_control_flavor_t = int;
 type kmod_args_t = ^array[] of MACH_MSG_TYPE_BYTE
 	ctype: kmod_args_t;
 
-type io_master_t = mach_port_t;
+type io_main_t = mach_port_t;
 type UNDServerRef = mach_port_t;
 
 /* These must be kept in sync with definitions in osfmk/mach/dyld_kernel.h */
@@ -622,26 +722,29 @@ type dyld_kernel_image_info_t = struct[40] of MACH_MSG_TYPE_BYTE;
 type dyld_kernel_image_info_array_t = ^array[] of dyld_kernel_image_info_t;
 type dyld_kernel_process_info_t = struct[64] of MACH_MSG_TYPE_BYTE;
 
+type mach_vm_offset_list_t = array[*:512] of mach_vm_offset_t;
+
 #if KERNEL_SERVER
 #ifdef	MACH_KERNEL_PRIVATE
 simport <ipc/ipc_voucher.h>;	/* for voucher conversions */
 simport <kern/ipc_kobject.h>;	/* for null conversion */
-simport <kern/ipc_tt.h>;	/* for task/thread conversion */
-simport <kern/ipc_host.h>;	/* for host/processor/pset conversions */
-simport <kern/ipc_sync.h>;      /* for lock_set and semaphore conversions */
-simport <kern/ledger.h>;	/* for ledger conversions */
-simport <kern/processor.h>;	/* for processor conversions */
-simport <kern/sync_lock.h>;	/* for lock-set conversions */
-simport <kern/sync_sema.h>;	/* for semaphore conversions */
+simport <kern/ipc_tt.h>;	    /* for task/thread conversion */
+simport <kern/ipc_host.h>;	    /* for host/processor/pset conversions */
+simport <kern/ledger.h>;	    /* for ledger conversions */
+simport <kern/processor.h>;	    /* for processor conversions */
+simport <kern/sync_sema.h>;	    /* for semaphore conversions */
+simport <ipc/ipc_eventlink.h>;  /* for eventlink conversions */
 simport <vm/memory_object.h>;	/* for memory object type conversions */
-simport <vm/vm_map.h>;		/* for vm_map conversions */
+simport <vm/vm_map.h>;		    /* for vm_map conversions */
 #if CONFIG_ARCADE
-simport <kern/arcade.h>;    /* for arcade_register conversions */
+simport <kern/arcade.h>;        /* for arcade_register conversions */
 #endif
 #endif	/* MACH_KERNEL_PRIVATE */
 
-simport <kern/ipc_mig.h>;	/* pick up kernel-specific MIG things */
+simport <kern/ipc_mig.h>;	    /* pick up kernel-specific MIG things */
 
+simport <kern/task_ident.h>;    /* for task_id_token conversions */
+simport <kern/kern_cdata.h>;    /* for kcdata_object conversions */
 #endif /* KERNEL_SERVER */
 
 import <mach/mig.h>;
diff --git a/extern/crashpad/crashpad/third_party/xnu/osfmk/mach/machine/machine_types.defs b/extern/crashpad/crashpad/third_party/xnu/osfmk/mach/machine/machine_types.defs
index f481394870..4f3fa07268 100644
--- a/extern/crashpad/crashpad/third_party/xnu/osfmk/mach/machine/machine_types.defs
+++ b/extern/crashpad/crashpad/third_party/xnu/osfmk/mach/machine/machine_types.defs
@@ -43,6 +43,15 @@ type unsigned = uint32_t;
 type float = MACH_MSG_TYPE_REAL_32;
 type double = MACH_MSG_TYPE_REAL_64;
 
+#if VM_KERNEL_SERVER
+#define VM_ADD_CTYPE(type) ctype: type
+#define VM_TYPE_SAFE_UNSAFE(_safe_type, _unsafe_type) ctype: _unsafe_type
+#else /* VM_KERNEL_SERVER */
+#define VM_ADD_CTYPE(type)
+#define VM_TYPE_SAFE_UNSAFE(_safe_type, _unsafe_type) ctype: _safe_type
+#endif /* VM_KERNEL_SERVER */
+
+#define VM_UNSAFE_TYPE(_unsafe_type) VM_ADD_CTYPE(_unsafe_type)
 
 /* from ISO/IEC 988:1999 spec */
 /* 7.18.1.4 Integer types capable of hgolding object pointers */
@@ -86,13 +95,13 @@ type natural_t = uint32_t;
  */
 
 #if defined(__LP64__)
-type vm_address_t = uint64_t;
-type vm_offset_t = uint64_t;
-type vm_size_t = uint64_t;
+type vm_address_t = uint64_t VM_UNSAFE_TYPE(vm_address_ut);
+type vm_offset_t = uint64_t VM_UNSAFE_TYPE(vm_offset_ut);
+type vm_size_t = uint64_t VM_UNSAFE_TYPE(vm_size_ut);
 #else
-type vm_address_t = natural_t;
-type vm_offset_t = natural_t;
-type vm_size_t = natural_t;
+type vm_address_t = natural_t VM_UNSAFE_TYPE(vm_address_ut);
+type vm_offset_t = natural_t VM_UNSAFE_TYPE(vm_offset_ut);
+type vm_size_t = natural_t VM_UNSAFE_TYPE(vm_size_ut);
 #endif
 
 /* This is a bit of a hack for arm.  We implement the backend with a wide type, but present a native-sized type to callers */
@@ -103,17 +112,9 @@ type mach_port_context_t = uint64_t;
  * maximum pointer, offset, etc... supported on the
  * platform.
  */
-type mach_vm_address_t = uint64_t;
-type mach_vm_offset_t = uint64_t;
-type mach_vm_size_t = uint64_t;
-
-#if	MACH_IPC_COMPAT
-/*
- * For the old IPC interface
- */
-#define	MSG_TYPE_PORT_NAME	natural_t
-
-#endif	/* MACH_IPC_COMPAT */
+type mach_vm_address_t = uint64_t VM_UNSAFE_TYPE(mach_vm_address_ut);
+type mach_vm_offset_t = uint64_t VM_UNSAFE_TYPE(mach_vm_offset_ut);
+type mach_vm_size_t = uint64_t VM_UNSAFE_TYPE(mach_vm_size_ut);
 
 /*
  * These are types used internal to Mach to implement the
@@ -121,9 +122,9 @@ type mach_vm_size_t = uint64_t;
  */
 #define	VM32_SUPPORT	1
 
-type vm32_address_t = uint32_t;
-type vm32_offset_t = uint32_t;
-type vm32_size_t = uint32_t;
+type vm32_address_t = uint32_t VM_UNSAFE_TYPE(vm32_address_ut);
+type vm32_offset_t = uint32_t VM_UNSAFE_TYPE(vm32_offset_ut);
+type vm32_size_t = uint32_t VM_UNSAFE_TYPE(vm32_size_ut);
 
 #endif /* _MACH_MACHINE_MACHNINE_TYPES_DEFS */
 
diff --git a/extern/crashpad/crashpad/third_party/xnu/osfmk/mach/std_types.defs b/extern/crashpad/crashpad/third_party/xnu/osfmk/mach/std_types.defs
index 0b483836f3..ae3c1035c5 100644
--- a/extern/crashpad/crashpad/third_party/xnu/osfmk/mach/std_types.defs
+++ b/extern/crashpad/crashpad/third_party/xnu/osfmk/mach/std_types.defs
@@ -62,6 +62,8 @@
 #ifndef	_MACH_STD_TYPES_DEFS_
 #define _MACH_STD_TYPES_DEFS_
 
+import <Availability.h>;
+
 /* from ISO/IEC 988:1999 spec */
 /* 7.18.1.1 Exact-width integer types */
 
@@ -94,8 +96,7 @@ type boolean_t = MACH_MSG_TYPE_BOOLEAN;
 type kern_return_t = int;
 
 type pointer_t = ^array[] of MACH_MSG_TYPE_BYTE
-	ctype: vm_offset_t;
-
+	VM_TYPE_SAFE_UNSAFE(vm_offset_t, pointer_ut);
 
 type mach_port_t = MACH_MSG_TYPE_COPY_SEND;
 type mach_port_array_t = array[] of mach_port_t;
diff --git a/extern/crashpad/crashpad/third_party/zlib/BUILD.gn b/extern/crashpad/crashpad/third_party/zlib/BUILD.gn
index 5cbd865378..9c243979c1 100644
--- a/extern/crashpad/crashpad/third_party/zlib/BUILD.gn
+++ b/extern/crashpad/crashpad/third_party/zlib/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2017 The Crashpad Authors. All rights reserved.
+# Copyright 2017 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -38,6 +38,10 @@ config("zlib_config") {
   }
 }
 
+config("Wno-sign-compare") {
+  cflags = [ "-Wno-sign-compare" ]
+}
+
 if (zlib_source == "external") {
   group("zlib") {
     public_configs = [ ":zlib_config" ]
@@ -99,12 +103,6 @@ if (zlib_source == "external") {
         "/wd4324",  # structure was padded due to alignment specifier
         "/wd4702",  # unreachable code
       ]
-      if (current_cpu == "arm64" && !crashpad_is_clang) {
-        # Select code path for clang in zlib to avoid using MSVC x86/x64
-        # intrinsics for Windows ARM64.
-        # TODO: https://crashpad.chromium.org/bug/267
-        defines += [ "__clang__" ]
-      }
     } else {
       defines += [
         "HAVE_HIDDEN",
@@ -112,6 +110,11 @@ if (zlib_source == "external") {
       ]
     }
 
+    if (crashpad_is_fuchsia) {
+      # Fuchsia build's default warnings include -Wsign-compare (indirectly)
+      configs += [ ":Wno-sign-compare" ]
+    }
+
     if (crashpad_is_standalone) {
       configs -= [ "//third_party/mini_chromium/mini_chromium/build/config:Wimplicit_fallthrough" ]
     } else if (crashpad_is_external) {
@@ -119,14 +122,11 @@ if (zlib_source == "external") {
     }
 
     if (zlib_source == "embedded") {
-      sources += [ "$zlib_dir/names.h" ]
+      sources += [ "$zlib_dir/chromeconf.h" ]
 
       if (current_cpu == "x86" || current_cpu == "x64") {
         sources += [
           "$zlib_dir/crc_folding.c",
-          "$zlib_dir/fill_window_sse.c",
-          "$zlib_dir/x86.c",
-          "$zlib_dir/x86.h",
         ]
         if (!crashpad_is_win || crashpad_is_clang) {
           cflags += [
@@ -137,8 +137,6 @@ if (zlib_source == "external") {
         if (crashpad_is_clang) {
           cflags += [ "-Wno-incompatible-pointer-types" ]
         }
-      } else {
-        sources += [ "$zlib_dir/simd_stub.c" ]
       }
     }
   }
diff --git a/extern/crashpad/crashpad/third_party/zlib/README.crashpad b/extern/crashpad/crashpad/third_party/zlib/README.crashpad
index 8a9533d350..bf3af780a6 100644
--- a/extern/crashpad/crashpad/third_party/zlib/README.crashpad
+++ b/extern/crashpad/crashpad/third_party/zlib/README.crashpad
@@ -5,6 +5,7 @@ Revision: See zlib/README.chromium
 License: zlib
 License File: zlib/LICENSE
 Security Critical: yes
+Shipped: yes
 
 Description:
 “A massively spiffy yet delicately unobtrusive compression library.”
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/BUILD.gn b/extern/crashpad/crashpad/third_party/zlib/zlib/BUILD.gn
index 5086563cf5..8ed0807a99 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/BUILD.gn
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/BUILD.gn
@@ -1,40 +1,286 @@
-# Copyright (c) 2013 The Chromium Authors. All rights reserved.
+# Copyright 2013 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/compiler/compiler.gni")
+
+declare_args() {
+  # Expose zlib's symbols, used by Node.js to provide zlib APIs for its native
+  # modules.
+  zlib_symbols_visible = false
+}
+
+if (build_with_chromium) {
+  import("//testing/test.gni")
+}
+
+if (current_cpu == "arm" || current_cpu == "arm64") {
+  import("//build/config/arm.gni")
+}
+
 config("zlib_config") {
   include_dirs = [ "." ]
+
+  if (zlib_symbols_visible) {
+    defines = [ "ZLIB_DLL" ]
+  }
+}
+
+config("zlib_internal_config") {
+  defines = [ "ZLIB_IMPLEMENTATION" ]
+
+  if (!is_debug) {
+    # Build code using -O3, see: crbug.com/1084371.
+    configs = [ "//build/config/compiler:optimize_speed" ]
+  }
+  if (is_debug || use_fuzzing_engine) {
+    # Enable zlib's asserts in debug and fuzzer builds.
+    defines += [ "ZLIB_DEBUG" ]
+  }
+
+  if (is_win && !is_clang) {
+    # V8 supports building with msvc, these silence some warnings that
+    # causes compilation to fail (https://crbug.com/1255096).
+    cflags = [
+      "/wd4244",
+      "/wd4100",
+      "/wd4702",
+      "/wd4127",
+    ]
+  }
+}
+
+source_set("zlib_common_headers") {
+  visibility = [ ":*" ]
+
+  sources = [
+    "chromeconf.h",
+    "deflate.h",
+    "inffast.h",
+    "inffixed.h",
+    "inflate.h",
+    "inftrees.h",
+    "zconf.h",
+    "zlib.h",
+    "zutil.h",
+  ]
+}
+
+use_arm_neon_optimizations = false
+if ((current_cpu == "arm" || current_cpu == "arm64") &&
+    !(is_win && !is_clang)) {
+  # TODO(richard.townsend@arm.com): Optimizations temporarily disabled for
+  # Windows on Arm MSVC builds, see http://crbug.com/v8/10012.
+  if (arm_use_neon) {
+    use_arm_neon_optimizations = true
+  }
+}
+
+use_x86_x64_optimizations =
+    (current_cpu == "x86" || current_cpu == "x64") && !is_ios
+
+config("zlib_adler32_simd_config") {
+  if (use_x86_x64_optimizations) {
+    defines = [ "ADLER32_SIMD_SSSE3" ]
+    if (is_win) {
+      defines += [ "X86_WINDOWS" ]
+    } else {
+      defines += [ "X86_NOT_WINDOWS" ]
+    }
+  }
+
+  if (use_arm_neon_optimizations) {
+    defines = [ "ADLER32_SIMD_NEON" ]
+  }
 }
 
-static_library("zlib_x86_simd") {
-  if (!is_ios && (current_cpu == "x86" || current_cpu == "x64")) {
+source_set("zlib_adler32_simd") {
+  visibility = [ ":*" ]
+
+  if (use_x86_x64_optimizations) {
     sources = [
+      "adler32_simd.c",
+      "adler32_simd.h",
+    ]
+
+    if (!is_win || is_clang) {
+      cflags = [ "-mssse3" ]
+    }
+  }
+
+  if (use_arm_neon_optimizations) {
+    sources = [
+      "adler32_simd.c",
+      "adler32_simd.h",
+    ]
+  }
+
+  configs += [ ":zlib_internal_config" ]
+
+  public_configs = [ ":zlib_adler32_simd_config" ]
+
+  public_deps = [ ":zlib_common_headers" ]
+}
+
+if (use_arm_neon_optimizations) {
+  config("zlib_arm_crc32_config") {
+    defines = [ "CRC32_ARMV8_CRC32" ]
+    if (is_android) {
+      defines += [ "ARMV8_OS_ANDROID" ]
+    } else if (is_linux || is_chromeos) {
+      defines += [ "ARMV8_OS_LINUX" ]
+    } else if (is_mac) {
+      defines += [ "ARMV8_OS_MACOS" ]
+    } else if (is_ios) {
+      defines += [ "ARMV8_OS_IOS" ]
+    } else if (is_fuchsia) {
+      defines += [ "ARMV8_OS_FUCHSIA" ]
+    } else if (is_win) {
+      defines += [ "ARMV8_OS_WINDOWS" ]
+    } else {
+      assert(false, "Unsupported ARM OS")
+    }
+  }
+
+  source_set("zlib_arm_crc32") {
+    visibility = [ ":*" ]
+
+    include_dirs = [ "." ]
+
+    if (!is_win && !is_clang) {
+      assert(!use_thin_lto,
+             "ThinLTO fails mixing different module-level targets")
+      cflags_c = [ "-march=armv8-a+aes+crc" ]
+    }
+
+    sources = [
+      "crc32_simd.c",
+      "crc32_simd.h",
+    ]
+
+    configs += [ ":zlib_internal_config" ]
+
+    public_configs = [ ":zlib_arm_crc32_config" ]
+
+    public_deps = [ ":zlib_common_headers" ]
+  }
+}
+
+config("zlib_inflate_chunk_simd_config") {
+  if (use_x86_x64_optimizations) {
+    defines = [ "INFLATE_CHUNK_SIMD_SSE2" ]
+
+    if (current_cpu == "x64") {
+      defines += [ "INFLATE_CHUNK_READ_64LE" ]
+    }
+  }
+
+  if (use_arm_neon_optimizations) {
+    defines = [ "INFLATE_CHUNK_SIMD_NEON" ]
+
+    if (current_cpu == "arm64") {
+      defines += [ "INFLATE_CHUNK_READ_64LE" ]
+    }
+  }
+}
+
+source_set("zlib_inflate_chunk_simd") {
+  visibility = [ ":*" ]
+
+  if (use_x86_x64_optimizations || use_arm_neon_optimizations) {
+    include_dirs = [ "." ]
+
+    sources = [
+      "contrib/optimizations/chunkcopy.h",
+      "contrib/optimizations/inffast_chunk.c",
+      "contrib/optimizations/inffast_chunk.h",
+      "contrib/optimizations/inflate.c",
+    ]
+  }
+
+  configs += [ ":zlib_internal_config" ]
+
+  # Needed for MSVC, which is still supported by V8 and PDFium. zlib uses K&R C
+  # style function declarations, which triggers warning C4131.
+  configs -= [ "//build/config/compiler:chromium_code" ]
+  configs += [ "//build/config/compiler:no_chromium_code" ]
+  configs += [ ":zlib_warnings" ]
+
+  public_configs = [ ":zlib_inflate_chunk_simd_config" ]
+
+  public_deps = [ ":zlib_common_headers" ]
+}
+
+config("zlib_crc32_simd_config") {
+  if (use_x86_x64_optimizations) {
+    defines = [ "CRC32_SIMD_SSE42_PCLMUL" ]
+  }
+}
+
+source_set("zlib_crc32_simd") {
+  visibility = [ ":*" ]
+
+  if (use_x86_x64_optimizations) {
+    sources = [
+      "crc32_simd.c",
+      "crc32_simd.h",
       "crc_folding.c",
-      "fill_window_sse.c",
     ]
+
     if (!is_win || is_clang) {
       cflags = [
         "-msse4.2",
         "-mpclmul",
       ]
     }
-  } else {
-    sources = [
-      "simd_stub.c",
-    ]
   }
 
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [ "//build/config/compiler:no_chromium_code" ]
+  configs += [ ":zlib_internal_config" ]
+
+  public_configs = [ ":zlib_crc32_simd_config" ]
+
+  public_deps = [ ":zlib_common_headers" ]
+}
+
+config("zlib_slide_hash_simd_config") {
+  if (use_x86_x64_optimizations) {
+    defines = [ "DEFLATE_SLIDE_HASH_SSE2" ]
+  }
+
+  if (use_arm_neon_optimizations) {
+    defines = [ "DEFLATE_SLIDE_HASH_NEON" ]
+  }
+}
+
+source_set("zlib_slide_hash_simd") {
+  visibility = [ ":*" ]
+
+  if (use_x86_x64_optimizations) {
+    sources = [ "slide_hash_simd.h" ]
+  }
+
+  if (use_arm_neon_optimizations) {
+    sources = [ "slide_hash_simd.h" ]
+  }
+
+  configs += [ ":zlib_internal_config" ]
+
+  public_configs = [ ":zlib_slide_hash_simd_config" ]
+
+  public_deps = [ ":zlib_common_headers" ]
 }
 
 config("zlib_warnings") {
-  if (is_clang && !is_ios && (current_cpu == "x86" || current_cpu == "x64")) {
-    cflags = [ "-Wno-incompatible-pointer-types" ]
+  if (is_clang) {
+    cflags = [
+      "-Wno-deprecated-non-prototype",
+      "-Wno-incompatible-pointer-types",
+      "-Wunused-variable",
+    ]
   }
 }
 
-static_library("zlib") {
+component("zlib") {
   if (!is_win) {
     # Don't stomp on "libzlib" on other platforms.
     output_name = "chrome_zlib"
@@ -42,7 +288,11 @@ static_library("zlib") {
 
   sources = [
     "adler32.c",
+    "chromeconf.h",
     "compress.c",
+    "contrib/optimizations/insert_string.h",
+    "cpu_features.c",
+    "cpu_features.h",
     "crc32.c",
     "crc32.h",
     "deflate.c",
@@ -56,48 +306,90 @@ static_library("zlib") {
     "inffast.c",
     "inffast.h",
     "inffixed.h",
-    "inflate.c",
     "inflate.h",
     "inftrees.c",
     "inftrees.h",
-    "names.h",
     "trees.c",
     "trees.h",
     "uncompr.c",
-    "x86.h",
     "zconf.h",
     "zlib.h",
     "zutil.c",
     "zutil.h",
   ]
 
-  if (!is_ios && (current_cpu == "x86" || current_cpu == "x64")) {
-    sources += [ "x86.c" ]
+  defines = []
+  deps = []
+
+  if (!use_x86_x64_optimizations && !use_arm_neon_optimizations) {
+    # Apparently android_cronet bot builds with NEON disabled and
+    # we also should disable optimizations for iOS@x86 (a.k.a. simulator).
+    defines += [ "CPU_NO_SIMD" ]
+  }
+
+  if (use_x86_x64_optimizations || use_arm_neon_optimizations) {
+    deps += [
+      ":zlib_adler32_simd",
+      ":zlib_inflate_chunk_simd",
+      ":zlib_slide_hash_simd",
+    ]
+
+    if (use_x86_x64_optimizations) {
+      deps += [ ":zlib_crc32_simd" ]
+    } else if (use_arm_neon_optimizations) {
+      deps += [ ":zlib_arm_crc32" ]
+    }
+  } else {
+    sources += [ "inflate.c" ]
+  }
+
+  if (is_android) {
+    import("//build/config/android/config.gni")
+    if (defined(android_ndk_root) && android_ndk_root != "") {
+      deps += [ "//third_party/cpu_features:ndk_compat" ]
+    } else {
+      assert(false, "CPU detection requires the Android NDK")
+    }
   }
 
   configs -= [ "//build/config/compiler:chromium_code" ]
+  configs += [ "//build/config/compiler:no_chromium_code" ]
+
+  if (zlib_symbols_visible) {
+    configs -= [ "//build/config/gcc:symbol_visibility_hidden" ]
+    configs += [ "//build/config/gcc:symbol_visibility_default" ]
+  }
+
+  public_configs = [ ":zlib_config" ]
+
   configs += [
-    "//build/config/compiler:no_chromium_code",
+    ":zlib_internal_config",
 
     # Must be after no_chromium_code for warning flags to be ordered correctly.
     ":zlib_warnings",
   ]
 
-  public_configs = [ ":zlib_config" ]
-  deps = [
-    ":zlib_x86_simd",
-  ]
+  allow_circular_includes_from = deps
 }
 
 config("minizip_warnings") {
   visibility = [ ":*" ]
+
   if (is_clang) {
-    # zlib uses `if ((a == b))` for some reason.
-    cflags = [ "-Wno-parentheses-equality" ]
+    cflags = [
+      # zlib uses `if ((a == b))` for some reason.
+      "-Wno-parentheses-equality",
+      "-Wno-deprecated-non-prototype",
+    ]
   }
 }
 
 static_library("minizip") {
+  include_dirs = [
+    ".",
+    "//third_party/zlib",
+  ]
+
   sources = [
     "contrib/minizip/ioapi.c",
     "contrib/minizip/ioapi.h",
@@ -115,47 +407,126 @@ static_library("minizip") {
       "contrib/minizip/iowin32.h",
     ]
   }
-  if (is_mac || is_ios || is_android) {
+
+  if (is_apple || is_android || is_nacl) {
     # Mac, Android and the BSDs don't have fopen64, ftello64, or fseeko64. We
     # use fopen, ftell, and fseek instead on these systems.
     defines = [ "USE_FILE32API" ]
   }
 
-  deps = [
-    ":zlib",
-  ]
+  deps = [ ":zlib" ]
 
   configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [
-    "//build/config/compiler:no_chromium_code",
+  configs += [ "//build/config/compiler:no_chromium_code" ]
+
+  public_configs = [ ":zlib_config" ]
 
+  configs += [
     # Must be after no_chromium_code for warning flags to be ordered correctly.
     ":minizip_warnings",
   ]
-  public_configs = [ ":zlib_config" ]
 }
 
-static_library("zip") {
-  sources = [
-    "google/zip.cc",
-    "google/zip.h",
-    "google/zip_internal.cc",
-    "google/zip_internal.h",
-    "google/zip_reader.cc",
-    "google/zip_reader.h",
-  ]
-  deps = [
-    ":minizip",
-    "//base",
-  ]
+executable("zlib_bench") {
+  include_dirs = [ "." ]
+
+  sources = [ "contrib/bench/zlib_bench.cc" ]
+  if (!is_debug) {
+    configs -= [ "//build/config/compiler:default_optimization" ]
+    configs += [ "//build/config/compiler:optimize_speed" ]
+  }
+
+  deps = [ ":zlib" ]
+
+  configs -= [ "//build/config/compiler:chromium_code" ]
+  configs += [ "//build/config/compiler:no_chromium_code" ]
 }
 
-static_library("compression_utils") {
-  sources = [
-    "google/compression_utils.cc",
-    "google/compression_utils.h",
-  ]
-  deps = [
-    ":zlib",
-  ]
+if (!is_win || target_os != "winuwp") {
+  executable("minizip_bin") {
+    include_dirs = [ "." ]
+
+    sources = [ "contrib/minizip/minizip.c" ]
+
+    if (is_clang) {
+      cflags = [
+        "-Wno-incompatible-pointer-types-discards-qualifiers",
+
+        "-Wno-deprecated-non-prototype",
+      ]
+    }
+
+    if (!is_debug) {
+      configs -= [ "//build/config/compiler:default_optimization" ]
+      configs += [ "//build/config/compiler:optimize_speed" ]
+    }
+
+    deps = [ ":minizip" ]
+
+    configs -= [ "//build/config/compiler:chromium_code" ]
+    configs += [ "//build/config/compiler:no_chromium_code" ]
+  }
+
+  executable("miniunz_bin") {
+    include_dirs = [ "." ]
+
+    sources = [ "contrib/minizip/miniunz.c" ]
+
+    if (is_clang) {
+      cflags = [
+        "-Wno-incompatible-pointer-types-discards-qualifiers",
+        "-Wno-deprecated-non-prototype",
+      ]
+    }
+
+    if (!is_debug) {
+      configs -= [ "//build/config/compiler:default_optimization" ]
+      configs += [ "//build/config/compiler:optimize_speed" ]
+    }
+
+    deps = [ ":minizip" ]
+
+    configs -= [ "//build/config/compiler:chromium_code" ]
+    configs += [ "//build/config/compiler:no_chromium_code" ]
+  }
+}
+
+if (build_with_chromium) {
+  test("zlib_unittests") {
+    testonly = true
+
+    sources = [
+      "contrib/tests/infcover.cc",
+      "contrib/tests/infcover.h",
+      "contrib/tests/run_all_unittests.cc",
+      "contrib/tests/utils_unittest.cc",
+      "google/compression_utils_unittest.cc",
+      "google/zip_reader_unittest.cc",
+      "google/zip_unittest.cc",
+    ]
+
+    data = [ "google/test/data/" ]
+
+    if (is_ios) {
+      bundle_deps = [ "google:zlib_pak_bundle_data" ]
+    }
+
+    deps = [
+      ":minizip",
+      ":zlib",
+      "google:compression_utils",
+      "google:zip",
+      "//base/test:test_support",
+      "//testing/gtest",
+    ]
+
+    configs -= [ "//build/config/compiler:chromium_code" ]
+    configs += [ "//build/config/compiler:no_chromium_code" ]
+
+    include_dirs = [
+      "//third_party/googletest/src/googletest/include/gtest",
+      ".",
+      "google",
+    ]
+  }
 }
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/CMakeLists.txt b/extern/crashpad/crashpad/third_party/zlib/zlib/CMakeLists.txt
new file mode 100644
index 0000000000..234eab8db4
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/CMakeLists.txt
@@ -0,0 +1,307 @@
+cmake_minimum_required(VERSION 3.0)
+set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
+
+project(zlib C)
+
+set(VERSION "1.2.13.1")
+
+set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
+set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
+set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")
+set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation directory for manual pages")
+set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")
+
+include(CheckTypeSize)
+include(CheckFunctionExists)
+include(CheckIncludeFile)
+include(CheckCSourceCompiles)
+enable_testing()
+
+check_include_file(sys/types.h HAVE_SYS_TYPES_H)
+check_include_file(stdint.h    HAVE_STDINT_H)
+check_include_file(stddef.h    HAVE_STDDEF_H)
+
+option(ENABLE_SIMD_OPTIMIZATIONS "Enable all SIMD optimizations" OFF)
+option(ENABLE_SIMD_AVX512 "Enable SIMD AXV512 optimizations" OFF)
+option(USE_ZLIB_RABIN_KARP_HASH "Enable bitstream compatibility with canonical zlib" OFF)
+option(BUILD_UNITTESTS "Enable standalone unit tests build" OFF)
+
+if (USE_ZLIB_RABIN_KARP_HASH)
+   add_definitions(-DUSE_ZLIB_RABIN_KARP_ROLLING_HASH)
+endif()
+
+# TODO(cavalcantii): add support for other OSes (e.g. Android, fuchsia, osx)
+# and architectures (e.g. Arm).
+if (ENABLE_SIMD_OPTIMIZATIONS)
+   add_definitions(-DINFLATE_CHUNK_SIMD_SSE2)
+   add_definitions(-DADLER32_SIMD_SSSE3)
+   add_definitions(-DINFLATE_CHUNK_READ_64LE)
+   add_definitions(-DCRC32_SIMD_SSE42_PCLMUL)
+   if (ENABLE_SIMD_AVX512)
+    add_definitions(-DCRC32_SIMD_AVX512_PCLMUL)
+    add_compile_options(-mvpclmulqdq -msse2 -mavx512f -mpclmul)
+   else()
+    add_compile_options(-msse4.2 -mpclmul)
+   endif()
+   add_definitions(-DDEFLATE_SLIDE_HASH_SSE2)
+   # Required by CPU features detection code.
+   add_definitions(-DX86_NOT_WINDOWS)
+   # Apparently some environments (e.g. CentOS) require to explicitly link
+   # with pthread and that is required by the CPU features detection code.
+   find_package (Threads REQUIRED)
+   SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")
+   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
+endif()
+
+#
+# Check to see if we have large file support
+#
+set(CMAKE_REQUIRED_DEFINITIONS -D_LARGEFILE64_SOURCE=1)
+# We add these other definitions here because CheckTypeSize.cmake
+# in CMake 2.4.x does not automatically do so and we want
+# compatibility with CMake 2.4.x.
+if(HAVE_SYS_TYPES_H)
+    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_SYS_TYPES_H)
+endif()
+if(HAVE_STDINT_H)
+    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDINT_H)
+endif()
+if(HAVE_STDDEF_H)
+    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDDEF_H)
+endif()
+check_type_size(off64_t OFF64_T)
+if(HAVE_OFF64_T)
+   add_definitions(-D_LARGEFILE64_SOURCE=1)
+endif()
+set(CMAKE_REQUIRED_DEFINITIONS) # clear variable
+
+#
+# Check for fseeko
+#
+check_function_exists(fseeko HAVE_FSEEKO)
+if(NOT HAVE_FSEEKO)
+    add_definitions(-DNO_FSEEKO)
+endif()
+
+#
+# Check for unistd.h
+#
+check_include_file(unistd.h Z_HAVE_UNISTD_H)
+
+if(MSVC)
+    set(CMAKE_DEBUG_POSTFIX "d")
+    add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
+    add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
+    include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+endif()
+
+if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
+    # If we're doing an out of source build and the user has a zconf.h
+    # in their source tree...
+    if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h)
+        message(STATUS "Renaming")
+        message(STATUS "    ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h")
+        message(STATUS "to 'zconf.h.included' because this file is included with zlib")
+        message(STATUS "but CMake generates it automatically in the build directory.")
+        file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.included)
+  endif()
+endif()
+
+set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc)
+configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein
+		${ZLIB_PC} @ONLY)
+configure_file(	${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein
+		${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)
+include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR})
+
+
+#============================================================================
+# zlib
+#============================================================================
+
+set(ZLIB_PUBLIC_HDRS
+    ${CMAKE_CURRENT_BINARY_DIR}/zconf.h
+    zlib.h
+)
+set(ZLIB_PRIVATE_HDRS
+    crc32.h
+    deflate.h
+    gzguts.h
+    inffast.h
+    inffixed.h
+    inflate.h
+    inftrees.h
+    trees.h
+    zutil.h
+)
+set(ZLIB_SRCS
+    adler32.c
+    compress.c
+    crc32.c
+    deflate.c
+    gzclose.c
+    gzlib.c
+    gzread.c
+    gzwrite.c
+    inflate.c
+    infback.c
+    inftrees.c
+    inffast.c
+    trees.c
+    uncompr.c
+    zutil.c
+)
+
+
+#============================================================================
+# Update list of source files if optimizations were enabled
+#============================================================================
+if (ENABLE_SIMD_OPTIMIZATIONS)
+  list(REMOVE_ITEM ZLIB_SRCS inflate.c)
+
+  list(APPEND ZLIB_PRIVATE_HDRS ${CMAKE_CURRENT_SOURCE_DIR}/adler32_simd.h)
+  list(APPEND ZLIB_PRIVATE_HDRS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/optimizations/chunkcopy.h)
+  list(APPEND ZLIB_PRIVATE_HDRS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/optimizations/inffast_chunk.h)
+  list(APPEND ZLIB_PRIVATE_HDRS ${CMAKE_CURRENT_SOURCE_DIR}/cpu_features.h)
+  list(APPEND ZLIB_PRIVATE_HDRS ${CMAKE_CURRENT_SOURCE_DIR}/crc32_simd.h)
+
+  list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/adler32_simd.c)
+  list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/optimizations/inffast_chunk.c)
+  list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/optimizations/inflate.c)
+  list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/cpu_features.c)
+  list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/crc32_simd.c)
+  list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/crc_folding.c)
+endif()
+
+# parse the full version number from zlib.h and include in ZLIB_FULL_VERSION
+file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents)
+string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*"
+    "\\1" ZLIB_FULL_VERSION ${_zlib_h_contents})
+
+if(MINGW)
+    # This gets us DLL resource information when compiling on MinGW.
+    if(NOT CMAKE_RC_COMPILER)
+        set(CMAKE_RC_COMPILER windres.exe)
+    endif()
+
+    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
+                       COMMAND ${CMAKE_RC_COMPILER}
+                            -D GCC_WINDRES
+                            -I ${CMAKE_CURRENT_SOURCE_DIR}
+                            -I ${CMAKE_CURRENT_BINARY_DIR}
+                            -o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
+                            -i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc)
+    set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
+endif(MINGW)
+
+add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
+set_target_properties(zlib PROPERTIES SOVERSION 1)
+
+if(NOT CYGWIN)
+    # This property causes shared libraries on Linux to have the full version
+    # encoded into their final filename.  We disable this on Cygwin because
+    # it causes cygz-${ZLIB_FULL_VERSION}.dll to be created when cygz.dll
+    # seems to be the default.
+    #
+    # This has no effect with MSVC, on that platform the version info for
+    # the DLL comes from the resource file win32/zlib1.rc
+    set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION})
+endif()
+
+if(UNIX)
+    # On unix-like platforms the library is almost always called libz
+   set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
+   if(NOT APPLE)
+     set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
+   endif()
+elseif(BUILD_SHARED_LIBS AND WIN32)
+    # Creates zlib1.dll when building shared library version
+    set_target_properties(zlib PROPERTIES SUFFIX "1.dll")
+endif()
+
+if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
+    install(TARGETS zlib zlibstatic
+        RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
+        ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
+        LIBRARY DESTINATION "${INSTALL_LIB_DIR}" )
+endif()
+if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )
+    install(FILES ${ZLIB_PUBLIC_HDRS} DESTINATION "${INSTALL_INC_DIR}")
+endif()
+if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
+    install(FILES zlib.3 DESTINATION "${INSTALL_MAN_DIR}/man3")
+endif()
+if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
+    install(FILES ${ZLIB_PC} DESTINATION "${INSTALL_PKGCONFIG_DIR}")
+endif()
+
+#============================================================================
+# Benchmarker
+#============================================================================
+enable_language(CXX)
+set(CMAKE_CXX_STANDARD 14) # workaround for older compilers (e.g. g++ 5.4).
+add_executable(zlib_bench contrib/bench/zlib_bench.cc)
+target_link_libraries(zlib_bench zlib)
+
+#============================================================================
+# Unit Tests
+#============================================================================
+if (BUILD_UNITTESTS)
+    include (ExternalProject)
+    set_directory_properties(PROPERTIES EP_PREFIX ${CMAKE_BINARY_DIR}/third_party)
+    ExternalProject_add(
+        googletest
+        GIT_REPOSITORY https://github.com/google/googletest.git
+        GIT_TAG d1467f5813f4d363cfd11aba99c4e9fe47a85e99
+        UPDATE_COMMAND ""
+        INSTALL_COMMAND ""
+        LOG_DOWNLOAD ON
+        LOG_CONFIGURE ON
+        LOG_BUILD ON
+    )
+
+    # gtest includedir
+    ExternalProject_Get_Property(googletest source_dir)
+    set(GTEST_INCLUDE_DIRS
+        ${source_dir}/googletest/include
+        ${source_dir}/googletest/include/gtest
+    )
+
+    # gtest library
+    ExternalProject_Get_Property(googletest binary_dir)
+    set(GTEST_LIBRARY_PATH ${binary_dir}/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gtest.a)
+    set(GTEST_LIBRARY gtest)
+    add_library(${GTEST_LIBRARY} UNKNOWN IMPORTED)
+    set_property(TARGET ${GTEST_LIBRARY} PROPERTY IMPORTED_LOCATION ${GTEST_LIBRARY_PATH})
+    add_dependencies(${GTEST_LIBRARY} googletest)
+
+    set(UTEST_SRC
+        ${CMAKE_CURRENT_SOURCE_DIR}/contrib/tests/infcover.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/contrib/tests/infcover.h
+        ${CMAKE_CURRENT_SOURCE_DIR}/contrib/tests/utils_unittest.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/contrib/tests/standalone_test_runner.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/google/compression_utils_portable.cc
+    )
+
+    add_compile_definitions(CMAKE_STANDALONE_UNITTESTS)
+
+    add_executable(zlib_unittests ${UTEST_SRC})
+    target_include_directories(zlib_unittests PUBLIC ${GTEST_INCLUDE_DIRS})
+    target_include_directories(zlib_unittests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/google)
+
+    target_link_libraries(zlib_unittests ${GTEST_LIBRARY})
+    target_link_libraries(zlib_unittests zlib)
+    # Needed by gtest
+    target_link_libraries(zlib_unittests pthread)
+endif()
+
+#============================================================================
+# Minigzip tool
+#============================================================================
+add_executable(minizip_bin contrib/minizip/minizip.c contrib/minizip/ioapi.c
+contrib/minizip/ioapi.h contrib/minizip/unzip.c
+contrib/minizip/unzip.h contrib/minizip/zip.c contrib/minizip/zip.h
+)
+target_link_libraries(minizip_bin zlib)
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/DIR_METADATA b/extern/crashpad/crashpad/third_party/zlib/zlib/DIR_METADATA
new file mode 100644
index 0000000000..d366dc7321
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail: {
+  component: "Internals"
+}
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/LICENSE b/extern/crashpad/crashpad/third_party/zlib/zlib/LICENSE
index 9f056865b5..8aca25d8c7 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/LICENSE
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/LICENSE
@@ -1,6 +1,6 @@
-version 1.2.11, January 15th, 2017
+version 1.2.12, March 27th, 2022
 
-Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
 
 This software is provided 'as-is', without any express or implied
 warranty.  In no event will the authors be held liable for any damages
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/OWNERS b/extern/crashpad/crashpad/third_party/zlib/zlib/OWNERS
index 6adf9fc8db..3a821578a7 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/OWNERS
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/OWNERS
@@ -1,3 +1,4 @@
 agl@chromium.org
-gavinp@chromium.org
-msarett@chromium.org
+cavalcantii@chromium.org
+cblume@chromium.org
+scroggo@google.com
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/README.chromium b/extern/crashpad/crashpad/third_party/zlib/zlib/README.chromium
index fe6bc105db..1dfb996664 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/README.chromium
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/README.chromium
@@ -1,9 +1,11 @@
 Name: zlib
 Short Name: zlib
 URL: http://zlib.net/
-Version: 1.2.11
+Version: 1.2.13
+CPEPrefix: cpe:/a:zlib:zlib:1.2.13
 Security Critical: yes
-License: Custom license
+Shipped: yes
+License: Zlib
 License File: LICENSE
 License Android Compatible: yes
 
@@ -22,7 +24,10 @@ Local Modifications:
    imported.
  - The contents of the google directory are original Chromium-specific
    additions.
- - google.patch contains changes from the upstream version, mostly related to
-   the build.
- - Intel SIMD optimisations from https://github.com/jtkukunas/zlib/ have been
-   integrated. These changes are reflected in simd.patch.
+ - Added chromeconf.h
+ - Plus the changes in 'patches' folder.
+ - Code in contrib/ other than contrib/minizip was added to match zlib's
+   contributor layout.
+ - In sync with 1.2.13 official release
+ - ZIP reader modified to allow for progress callbacks during extraction.
+ - ZIP reader modified to add detection of AES encrypted content.
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/adler32.c b/extern/crashpad/crashpad/third_party/zlib/zlib/adler32.c
index d0be4380a3..99a294496f 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/adler32.c
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/adler32.c
@@ -7,8 +7,6 @@
 
 #include "zutil.h"
 
-local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
-
 #define BASE 65521U     /* largest prime smaller than 65536 */
 #define NMAX 5552
 /* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
@@ -59,15 +57,24 @@ local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
 #  define MOD63(a) a %= BASE
 #endif
 
+#include "cpu_features.h"
+#if defined(ADLER32_SIMD_SSSE3) || defined(ADLER32_SIMD_NEON)
+#include "adler32_simd.h"
+#endif
+
 /* ========================================================================= */
-uLong ZEXPORT adler32_z(adler, buf, len)
-    uLong adler;
-    const Bytef *buf;
-    z_size_t len;
-{
+uLong ZEXPORT adler32_z(uLong adler, const Bytef *buf, z_size_t len) {
     unsigned long sum2;
     unsigned n;
 
+#if defined(ADLER32_SIMD_SSSE3)
+    if (buf != Z_NULL && len >= 64 && x86_cpu_enable_ssse3)
+        return adler32_simd_(adler, buf, len);
+#elif defined(ADLER32_SIMD_NEON)
+    if (buf != Z_NULL && len >= 64)
+        return adler32_simd_(adler, buf, len);
+#endif
+
     /* split Adler-32 into component sums */
     sum2 = (adler >> 16) & 0xffff;
     adler &= 0xffff;
@@ -83,9 +90,24 @@ uLong ZEXPORT adler32_z(adler, buf, len)
         return adler | (sum2 << 16);
     }
 
+#if defined(ADLER32_SIMD_SSSE3) || defined(ADLER32_SIMD_NEON)
+    /*
+     * Use SIMD to compute the adler32. Since this function can be
+     * freely used, check CPU features here. zlib convention is to
+     * call adler32(0, NULL, 0), before making calls to adler32().
+     * So this is a good early (and infrequent) place to cache CPU
+     * features for those later, more interesting adler32() calls.
+     */
+    if (buf == Z_NULL) {
+        if (!len) /* Assume user is calling adler32(0, NULL, 0); */
+            cpu_check_features();
+        return 1L;
+    }
+#else
     /* initial Adler-32 value (deferred check for len == 1 speed) */
     if (buf == Z_NULL)
         return 1L;
+#endif
 
     /* in case short lengths are provided, keep it somewhat fast */
     if (len < 16) {
@@ -131,20 +153,12 @@ uLong ZEXPORT adler32_z(adler, buf, len)
 }
 
 /* ========================================================================= */
-uLong ZEXPORT adler32(adler, buf, len)
-    uLong adler;
-    const Bytef *buf;
-    uInt len;
-{
+uLong ZEXPORT adler32(uLong adler, const Bytef *buf, uInt len) {
     return adler32_z(adler, buf, len);
 }
 
 /* ========================================================================= */
-local uLong adler32_combine_(adler1, adler2, len2)
-    uLong adler1;
-    uLong adler2;
-    z_off64_t len2;
-{
+local uLong adler32_combine_(uLong adler1, uLong adler2, z_off64_t len2) {
     unsigned long sum1;
     unsigned long sum2;
     unsigned rem;
@@ -169,18 +183,10 @@ local uLong adler32_combine_(adler1, adler2, len2)
 }
 
 /* ========================================================================= */
-uLong ZEXPORT adler32_combine(adler1, adler2, len2)
-    uLong adler1;
-    uLong adler2;
-    z_off_t len2;
-{
+uLong ZEXPORT adler32_combine(uLong adler1, uLong adler2, z_off_t len2) {
     return adler32_combine_(adler1, adler2, len2);
 }
 
-uLong ZEXPORT adler32_combine64(adler1, adler2, len2)
-    uLong adler1;
-    uLong adler2;
-    z_off64_t len2;
-{
+uLong ZEXPORT adler32_combine64(uLong adler1, uLong adler2, z_off64_t len2) {
     return adler32_combine_(adler1, adler2, len2);
 }
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/adler32_simd.c b/extern/crashpad/crashpad/third_party/zlib/zlib/adler32_simd.c
new file mode 100644
index 0000000000..58966eecf0
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/adler32_simd.c
@@ -0,0 +1,366 @@
+/* adler32_simd.c
+ *
+ * Copyright 2017 The Chromium Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the Chromium source repository LICENSE file.
+ *
+ * Per http://en.wikipedia.org/wiki/Adler-32 the adler32 A value (aka s1) is
+ * the sum of N input data bytes D1 ... DN,
+ *
+ *   A = A0 + D1 + D2 + ... + DN
+ *
+ * where A0 is the initial value.
+ *
+ * SSE2 _mm_sad_epu8() can be used for byte sums (see http://bit.ly/2wpUOeD,
+ * for example) and accumulating the byte sums can use SSE shuffle-adds (see
+ * the "Integer" section of http://bit.ly/2erPT8t for details). Arm NEON has
+ * similar instructions.
+ *
+ * The adler32 B value (aka s2) sums the A values from each step:
+ *
+ *   B0 + (A0 + D1) + (A0 + D1 + D2) + ... + (A0 + D1 + D2 + ... + DN) or
+ *
+ *       B0 + N.A0 + N.D1 + (N-1).D2 + (N-2).D3 + ... + (N-(N-1)).DN
+ *
+ * B0 being the initial value. For 32 bytes (ideal for garden-variety SIMD):
+ *
+ *   B = B0 + 32.A0 + [D1 D2 D3 ... D32] x [32 31 30 ... 1].
+ *
+ * Adjacent blocks of 32 input bytes can be iterated with the expressions to
+ * compute the adler32 s1 s2 of M >> 32 input bytes [1].
+ *
+ * As M grows, the s1 s2 sums grow. If left unchecked, they would eventually
+ * overflow the precision of their integer representation (bad). However, s1
+ * and s2 also need to be computed modulo the adler BASE value (reduced). If
+ * at most NMAX bytes are processed before a reduce, s1 s2 _cannot_ overflow
+ * a uint32_t type (the NMAX constraint) [2].
+ *
+ * [1] the iterative equations for s2 contain constant factors; these can be
+ * hoisted from the n-blocks do loop of the SIMD code.
+ *
+ * [2] zlib adler32_z() uses this fact to implement NMAX-block-based updates
+ * of the adler s1 s2 of uint32_t type (see adler32.c).
+ */
+
+#include "adler32_simd.h"
+
+/* Definitions from adler32.c: largest prime smaller than 65536 */
+#define BASE 65521U
+/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
+#define NMAX 5552
+
+#if defined(ADLER32_SIMD_SSSE3)
+
+#include <tmmintrin.h>
+
+uint32_t ZLIB_INTERNAL adler32_simd_(  /* SSSE3 */
+    uint32_t adler,
+    const unsigned char *buf,
+    z_size_t len)
+{
+    /*
+     * Split Adler-32 into component sums.
+     */
+    uint32_t s1 = adler & 0xffff;
+    uint32_t s2 = adler >> 16;
+
+    /*
+     * Process the data in blocks.
+     */
+    const unsigned BLOCK_SIZE = 1 << 5;
+
+    z_size_t blocks = len / BLOCK_SIZE;
+    len -= blocks * BLOCK_SIZE;
+
+    while (blocks)
+    {
+        unsigned n = NMAX / BLOCK_SIZE;  /* The NMAX constraint. */
+        if (n > blocks)
+            n = (unsigned) blocks;
+        blocks -= n;
+
+        const __m128i tap1 =
+            _mm_setr_epi8(32,31,30,29,28,27,26,25,24,23,22,21,20,19,18,17);
+        const __m128i tap2 =
+            _mm_setr_epi8(16,15,14,13,12,11,10, 9, 8, 7, 6, 5, 4, 3, 2, 1);
+        const __m128i zero =
+            _mm_setr_epi8( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+        const __m128i ones =
+            _mm_set_epi16( 1, 1, 1, 1, 1, 1, 1, 1);
+
+        /*
+         * Process n blocks of data. At most NMAX data bytes can be
+         * processed before s2 must be reduced modulo BASE.
+         */
+        __m128i v_ps = _mm_set_epi32(0, 0, 0, s1 * n);
+        __m128i v_s2 = _mm_set_epi32(0, 0, 0, s2);
+        __m128i v_s1 = _mm_set_epi32(0, 0, 0, 0);
+
+        do {
+            /*
+             * Load 32 input bytes.
+             */
+            const __m128i bytes1 = _mm_loadu_si128((__m128i*)(buf));
+            const __m128i bytes2 = _mm_loadu_si128((__m128i*)(buf + 16));
+
+            /*
+             * Add previous block byte sum to v_ps.
+             */
+            v_ps = _mm_add_epi32(v_ps, v_s1);
+
+            /*
+             * Horizontally add the bytes for s1, multiply-adds the
+             * bytes by [ 32, 31, 30, ... ] for s2.
+             */
+            v_s1 = _mm_add_epi32(v_s1, _mm_sad_epu8(bytes1, zero));
+            const __m128i mad1 = _mm_maddubs_epi16(bytes1, tap1);
+            v_s2 = _mm_add_epi32(v_s2, _mm_madd_epi16(mad1, ones));
+
+            v_s1 = _mm_add_epi32(v_s1, _mm_sad_epu8(bytes2, zero));
+            const __m128i mad2 = _mm_maddubs_epi16(bytes2, tap2);
+            v_s2 = _mm_add_epi32(v_s2, _mm_madd_epi16(mad2, ones));
+
+            buf += BLOCK_SIZE;
+
+        } while (--n);
+
+        v_s2 = _mm_add_epi32(v_s2, _mm_slli_epi32(v_ps, 5));
+
+        /*
+         * Sum epi32 ints v_s1(s2) and accumulate in s1(s2).
+         */
+
+#define S23O1 _MM_SHUFFLE(2,3,0,1)  /* A B C D -> B A D C */
+#define S1O32 _MM_SHUFFLE(1,0,3,2)  /* A B C D -> C D A B */
+
+        v_s1 = _mm_add_epi32(v_s1, _mm_shuffle_epi32(v_s1, S23O1));
+        v_s1 = _mm_add_epi32(v_s1, _mm_shuffle_epi32(v_s1, S1O32));
+
+        s1 += _mm_cvtsi128_si32(v_s1);
+
+        v_s2 = _mm_add_epi32(v_s2, _mm_shuffle_epi32(v_s2, S23O1));
+        v_s2 = _mm_add_epi32(v_s2, _mm_shuffle_epi32(v_s2, S1O32));
+
+        s2 = _mm_cvtsi128_si32(v_s2);
+
+#undef S23O1
+#undef S1O32
+
+        /*
+         * Reduce.
+         */
+        s1 %= BASE;
+        s2 %= BASE;
+    }
+
+    /*
+     * Handle leftover data.
+     */
+    if (len) {
+        if (len >= 16) {
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+
+            len -= 16;
+        }
+
+        while (len--) {
+            s2 += (s1 += *buf++);
+        }
+
+        if (s1 >= BASE)
+            s1 -= BASE;
+        s2 %= BASE;
+    }
+
+    /*
+     * Return the recombined sums.
+     */
+    return s1 | (s2 << 16);
+}
+
+#elif defined(ADLER32_SIMD_NEON)
+
+#include <arm_neon.h>
+
+uint32_t ZLIB_INTERNAL adler32_simd_(  /* NEON */
+    uint32_t adler,
+    const unsigned char *buf,
+    z_size_t len)
+{
+    /*
+     * Split Adler-32 into component sums.
+     */
+    uint32_t s1 = adler & 0xffff;
+    uint32_t s2 = adler >> 16;
+
+    /*
+     * Serially compute s1 & s2, until the data is 16-byte aligned.
+     */
+    if ((uintptr_t)buf & 15) {
+        while ((uintptr_t)buf & 15) {
+            s2 += (s1 += *buf++);
+            --len;
+        }
+
+        if (s1 >= BASE)
+            s1 -= BASE;
+        s2 %= BASE;
+    }
+
+    /*
+     * Process the data in blocks.
+     */
+    const unsigned BLOCK_SIZE = 1 << 5;
+
+    z_size_t blocks = len / BLOCK_SIZE;
+    len -= blocks * BLOCK_SIZE;
+
+    while (blocks)
+    {
+        unsigned n = NMAX / BLOCK_SIZE;  /* The NMAX constraint. */
+        if (n > blocks)
+            n = (unsigned) blocks;
+        blocks -= n;
+
+        /*
+         * Process n blocks of data. At most NMAX data bytes can be
+         * processed before s2 must be reduced modulo BASE.
+         */
+        uint32x4_t v_s2 = (uint32x4_t) { 0, 0, 0, s1 * n };
+        uint32x4_t v_s1 = (uint32x4_t) { 0, 0, 0, 0 };
+
+        uint16x8_t v_column_sum_1 = vdupq_n_u16(0);
+        uint16x8_t v_column_sum_2 = vdupq_n_u16(0);
+        uint16x8_t v_column_sum_3 = vdupq_n_u16(0);
+        uint16x8_t v_column_sum_4 = vdupq_n_u16(0);
+
+        do {
+            /*
+             * Load 32 input bytes.
+             */
+            const uint8x16_t bytes1 = vld1q_u8((uint8_t*)(buf));
+            const uint8x16_t bytes2 = vld1q_u8((uint8_t*)(buf + 16));
+
+            /*
+             * Add previous block byte sum to v_s2.
+             */
+            v_s2 = vaddq_u32(v_s2, v_s1);
+
+            /*
+             * Horizontally add the bytes for s1.
+             */
+            v_s1 = vpadalq_u16(v_s1, vpadalq_u8(vpaddlq_u8(bytes1), bytes2));
+
+            /*
+             * Vertically add the bytes for s2.
+             */
+            v_column_sum_1 = vaddw_u8(v_column_sum_1, vget_low_u8 (bytes1));
+            v_column_sum_2 = vaddw_u8(v_column_sum_2, vget_high_u8(bytes1));
+            v_column_sum_3 = vaddw_u8(v_column_sum_3, vget_low_u8 (bytes2));
+            v_column_sum_4 = vaddw_u8(v_column_sum_4, vget_high_u8(bytes2));
+
+            buf += BLOCK_SIZE;
+
+        } while (--n);
+
+        v_s2 = vshlq_n_u32(v_s2, 5);
+
+        /*
+         * Multiply-add bytes by [ 32, 31, 30, ... ] for s2.
+         */
+        v_s2 = vmlal_u16(v_s2, vget_low_u16 (v_column_sum_1),
+            (uint16x4_t) { 32, 31, 30, 29 });
+        v_s2 = vmlal_u16(v_s2, vget_high_u16(v_column_sum_1),
+            (uint16x4_t) { 28, 27, 26, 25 });
+        v_s2 = vmlal_u16(v_s2, vget_low_u16 (v_column_sum_2),
+            (uint16x4_t) { 24, 23, 22, 21 });
+        v_s2 = vmlal_u16(v_s2, vget_high_u16(v_column_sum_2),
+            (uint16x4_t) { 20, 19, 18, 17 });
+        v_s2 = vmlal_u16(v_s2, vget_low_u16 (v_column_sum_3),
+            (uint16x4_t) { 16, 15, 14, 13 });
+        v_s2 = vmlal_u16(v_s2, vget_high_u16(v_column_sum_3),
+            (uint16x4_t) { 12, 11, 10,  9 });
+        v_s2 = vmlal_u16(v_s2, vget_low_u16 (v_column_sum_4),
+            (uint16x4_t) {  8,  7,  6,  5 });
+        v_s2 = vmlal_u16(v_s2, vget_high_u16(v_column_sum_4),
+            (uint16x4_t) {  4,  3,  2,  1 });
+
+        /*
+         * Sum epi32 ints v_s1(s2) and accumulate in s1(s2).
+         */
+        uint32x2_t sum1 = vpadd_u32(vget_low_u32(v_s1), vget_high_u32(v_s1));
+        uint32x2_t sum2 = vpadd_u32(vget_low_u32(v_s2), vget_high_u32(v_s2));
+        uint32x2_t s1s2 = vpadd_u32(sum1, sum2);
+
+        s1 += vget_lane_u32(s1s2, 0);
+        s2 += vget_lane_u32(s1s2, 1);
+
+        /*
+         * Reduce.
+         */
+        s1 %= BASE;
+        s2 %= BASE;
+    }
+
+    /*
+     * Handle leftover data.
+     */
+    if (len) {
+        if (len >= 16) {
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+
+            len -= 16;
+        }
+
+        while (len--) {
+            s2 += (s1 += *buf++);
+        }
+
+        if (s1 >= BASE)
+            s1 -= BASE;
+        s2 %= BASE;
+    }
+
+    /*
+     * Return the recombined sums.
+     */
+    return s1 | (s2 << 16);
+}
+
+#endif  /* ADLER32_SIMD_SSSE3 */
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/adler32_simd.h b/extern/crashpad/crashpad/third_party/zlib/zlib/adler32_simd.h
new file mode 100644
index 0000000000..0b2361a517
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/adler32_simd.h
@@ -0,0 +1,16 @@
+/* adler32_simd.h
+ *
+ * Copyright 2017 The Chromium Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the Chromium source repository LICENSE file.
+ */
+
+#include <stdint.h>
+
+#include "zconf.h"
+#include "zutil.h"
+
+uint32_t ZLIB_INTERNAL adler32_simd_(
+    uint32_t adler,
+    const unsigned char *buf,
+    z_size_t len);
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/names.h b/extern/crashpad/crashpad/third_party/zlib/zlib/chromeconf.h
similarity index 79%
rename from extern/crashpad/crashpad/third_party/zlib/zlib/names.h
rename to extern/crashpad/crashpad/third_party/zlib/zlib/chromeconf.h
index 3436baa4eb..5b91c86442 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/names.h
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/chromeconf.h
@@ -1,9 +1,21 @@
-/* Copyright 2017 The Chromium Authors. All rights reserved.
+/* Copyright 2017 The Chromium Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file. */
 
-#ifndef THIRD_PARTY_ZLIB_NAMES_H_
-#define THIRD_PARTY_ZLIB_NAMES_H_
+#ifndef THIRD_PARTY_ZLIB_CHROMECONF_H_
+#define THIRD_PARTY_ZLIB_CHROMECONF_H_
+
+#if defined(COMPONENT_BUILD)
+#if defined(WIN32)
+#if defined(ZLIB_IMPLEMENTATION)
+#define ZEXTERN __declspec(dllexport)
+#else
+#define ZEXTERN __declspec(dllimport)
+#endif
+#elif defined(ZLIB_IMPLEMENTATION)
+#define ZEXTERN __attribute__((visibility("default")))
+#endif
+#endif
 
 /* Rename all zlib names with a Cr_z_ prefix. This is based on the Z_PREFIX
  * option from zconf.h, but with a custom prefix. Where zconf.h would rename
@@ -37,6 +49,9 @@
 #define crc32 Cr_z_crc32
 #define crc32_combine Cr_z_crc32_combine
 #define crc32_combine64 Cr_z_crc32_combine64
+#define crc32_combine_gen64 Cr_z_crc32_combine_gen64
+#define crc32_combine_gen Cr_z_crc32_combine_gen
+#define crc32_combine_op Cr_z_crc32_combine_op
 #define crc32_z Cr_z_crc32_z
 #define deflate Cr_z_deflate
 #define deflateBound Cr_z_deflateBound
@@ -146,7 +161,7 @@
 #define voidpc Cr_z_voidpc
 #define voidpf Cr_z_voidpf
 #define gz_header_s Cr_z_gz_header_s
-#define internal_state Cr_z_internal_state
+/* #undef internal_state */
 /* #undef z_off64_t */
 
 /* An exported symbol that isn't handled by Z_PREFIX in zconf.h */
@@ -160,8 +175,29 @@
 #define crc_fold_init Cr_z_crc_fold_init
 #define crc_reset Cr_z_crc_reset
 #define fill_window_sse Cr_z_fill_window_sse
-#define read_buf Cr_z_read_buf
+#define deflate_read_buf Cr_z_deflate_read_buf
 #define x86_check_features Cr_z_x86_check_features
 #define x86_cpu_enable_simd Cr_z_x86_cpu_enable_simd
 
-#endif  /* THIRD_PARTY_ZLIB_NAMES_H_ */
+/* Symbols added by adler_simd.c */
+#define adler32_simd_ Cr_z_adler32_simd_
+#define x86_cpu_enable_ssse3 Cr_z_x86_cpu_enable_ssse3
+
+/* Symbols added by contrib/optimizations/inffast_chunk */
+#define inflate_fast_chunk_ Cr_z_inflate_fast_chunk_
+
+/* Symbols added by crc32_simd.c */
+#define crc32_sse42_simd_ Cr_z_crc32_sse42_simd_
+
+/* Symbols added by armv8_crc32 */
+#define arm_cpu_enable_crc32 Cr_z_arm_cpu_enable_crc32
+#define arm_cpu_enable_pmull Cr_z_arm_cpu_enable_pmull
+#define arm_check_features Cr_z_arm_check_features
+#define armv8_crc32_little Cr_z_armv8_crc32_little
+#define armv8_crc32_pmull_little Cr_z_armv8_crc32_pmull_little
+
+/* Symbols added by cpu_features.c */
+#define cpu_check_features Cr_z_cpu_check_features
+#define x86_cpu_enable_sse2 Cr_z_x86_cpu_enable_sse2
+
+#endif /* THIRD_PARTY_ZLIB_CHROMECONF_H_ */
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/compress.c b/extern/crashpad/crashpad/third_party/zlib/zlib/compress.c
index e2db404abf..0f11a27c28 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/compress.c
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/compress.c
@@ -19,13 +19,8 @@
    memory, Z_BUF_ERROR if there was not enough room in the output buffer,
    Z_STREAM_ERROR if the level parameter is invalid.
 */
-int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
-    Bytef *dest;
-    uLongf *destLen;
-    const Bytef *source;
-    uLong sourceLen;
-    int level;
-{
+int ZEXPORT compress2(Bytef *dest, uLongf *destLen, const Bytef *source,
+                      uLong sourceLen, int level) {
     z_stream stream;
     int err;
     const uInt max = (uInt)-1;
@@ -65,12 +60,8 @@ int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
 
 /* ===========================================================================
  */
-int ZEXPORT compress (dest, destLen, source, sourceLen)
-    Bytef *dest;
-    uLongf *destLen;
-    const Bytef *source;
-    uLong sourceLen;
-{
+int ZEXPORT compress(Bytef *dest, uLongf *destLen, const Bytef *source,
+                     uLong sourceLen) {
     return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);
 }
 
@@ -78,9 +69,17 @@ int ZEXPORT compress (dest, destLen, source, sourceLen)
      If the default memLevel or windowBits for deflateInit() is changed, then
    this function needs to be updated.
  */
-uLong ZEXPORT compressBound (sourceLen)
-    uLong sourceLen;
-{
-    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
-           (sourceLen >> 25) + 13;
+uLong ZEXPORT compressBound(uLong sourceLen) {
+    sourceLen = sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
+                (sourceLen >> 25) + 13;
+    /* FIXME(cavalcantii): usage of CRC32 Castagnoli as a hash function
+     * for the hash table of symbols used for compression has a side effect
+     * where for compression level [4, 5] it will increase the output buffer size
+     * by 0.1% (i.e. less than 1%) for a high entropy input (i.e. random data).
+     * To avoid a scenario where client code would fail, for safety we increase
+     * the expected output size by 0.8% (i.e. 8x more than the worst scenario).
+     * See: http://crbug.com/990489
+     */
+    sourceLen += sourceLen >> 7; // Equivalent to 1.0078125
+    return sourceLen;
 }
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/bench/check.sh b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/bench/check.sh
new file mode 100644
index 0000000000..e6934605a4
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/bench/check.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+#
+# Copyright 2022 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the chromium source repository LICENSE file.
+#
+# Given a zlib_bench executable and some data files, run zlib_bench --check
+# over those data files, for all zlib types (gzip|zlib|raw) and compression
+# levels 1..9 for each type. Example:
+#
+#  check.sh ./out/Release/zlib_bench [--check-binary] ~/snappy/testdata/*
+#
+# The --check-binary option modifies --check output: the compressed data is
+# also written to the program output.
+
+ZLIB_BENCH="$1" && shift
+
+CHECK_TYPE="--check"
+if [[ "${1}" == "--check-binary" ]]; then
+  CHECK_TYPE="$1" && shift  # output compressed data too
+fi
+
+DATA_FILES="$*"
+
+echo ${ZLIB_BENCH} | grep -E "/(zlib_bench|a.out)$" > /dev/null
+if [[ $? != 0 ]] || [[ -z "${DATA_FILES}" ]]; then
+  echo "usage: check.sh zlib_bench [--check-binary] files ..." >&2
+  exit 1;
+fi
+
+for type in gzip zlib raw; do
+  for level in $(seq 1 9); do
+    ${ZLIB_BENCH} $type --compression $level ${CHECK_TYPE} ${DATA_FILES}
+  done
+done
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/bench/zlib_bench.cc b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/bench/zlib_bench.cc
new file mode 100644
index 0000000000..b65f9291bf
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/bench/zlib_bench.cc
@@ -0,0 +1,438 @@
+/*
+ * Copyright 2018 The Chromium Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the Chromium source repository LICENSE file.
+ *
+ * A benchmark test harness for measuring decoding performance of gzip or zlib
+ * (deflate) encoded compressed data. Given a file containing any data, encode
+ * (compress) it into gzip or zlib format and then decode (uncompress). Output
+ * the median and maximum encoding and decoding rates in MB/s.
+ *
+ * Raw deflate (no gzip or zlib stream wrapper) mode is also supported. Select
+ * it with the [raw] argument. Use the [gzip] [zlib] arguments to select those
+ * stream wrappers.
+ *
+ * Note this code can be compiled outside of the Chromium build system against
+ * the system zlib (-lz) with g++ or clang++ as follows:
+ *
+ *   g++|clang++ -O3 -Wall -std=c++11 zlib_bench.cc -lstdc++ -lz
+ */
+
+#include <algorithm>
+#include <chrono>
+#include <fstream>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include <memory.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "zlib.h"
+
+void error_exit(const char* error, int code) {
+  fprintf(stderr, "%s (%d)\n", error, code);
+  exit(code);
+}
+
+inline char* string_data(std::string* s) {
+  return s->empty() ? nullptr : &*s->begin();
+}
+
+struct Data {
+  Data(size_t s) { data.reset(new (std::nothrow) char[size = s]); }
+  std::unique_ptr<char[]> data;
+  size_t size;
+  std::string name;
+};
+
+Data read_file_data_or_exit(const char* name) {
+  std::ifstream file(name, std::ios::in | std::ios::binary);
+  if (!file) {
+    perror(name);
+    exit(1);
+  }
+
+  file.seekg(0, std::ios::end);
+  Data data(file.tellg());
+  file.seekg(0, std::ios::beg);
+
+  if (file && data.data)
+    file.read(data.data.get(), data.size);
+
+  if (!file || !data.data || !data.size) {
+    perror((std::string("failed: reading ") + name).c_str());
+    exit(1);
+  }
+
+  data.name = std::string(name);
+  return data;
+}
+
+size_t zlib_estimate_compressed_size(size_t input_size) {
+  return compressBound(input_size);
+}
+
+enum zlib_wrapper {
+  kWrapperNONE,
+  kWrapperZLIB,
+  kWrapperGZIP,
+  kWrapperZRAW,
+};
+
+inline int zlib_stream_wrapper_type(zlib_wrapper type) {
+  if (type == kWrapperZLIB) // zlib DEFLATE stream wrapper
+    return MAX_WBITS;
+  if (type == kWrapperGZIP) // gzip DEFLATE stream wrapper
+    return MAX_WBITS + 16;
+  if (type == kWrapperZRAW) // no wrapper, use raw DEFLATE
+    return -MAX_WBITS;
+  error_exit("bad wrapper type", int(type));
+  return 0;
+}
+
+const char* zlib_wrapper_name(zlib_wrapper type) {
+  if (type == kWrapperZLIB)
+    return "ZLIB";
+  if (type == kWrapperGZIP)
+    return "GZIP";
+  if (type == kWrapperZRAW)
+    return "RAW";
+  error_exit("bad wrapper type", int(type));
+  return nullptr;
+}
+
+static int zlib_strategy = Z_DEFAULT_STRATEGY;
+
+const char* zlib_level_strategy_name(int compression_level) {
+  if (compression_level == 0)
+    return "";  // strategy is meaningless at level 0
+  if (zlib_strategy == Z_HUFFMAN_ONLY)
+    return "huffman ";
+  if (zlib_strategy == Z_RLE)
+    return "rle ";
+  if (zlib_strategy == Z_DEFAULT_STRATEGY)
+    return "";
+  error_exit("bad strategy", zlib_strategy);
+  return nullptr;
+}
+
+static int zlib_compression_level = Z_DEFAULT_COMPRESSION;
+
+void zlib_compress(
+    const zlib_wrapper type,
+    const char* input,
+    const size_t input_size,
+    std::string* output,
+    bool resize_output = false)
+{
+  if (resize_output)
+    output->resize(zlib_estimate_compressed_size(input_size));
+  size_t output_size = output->size();
+
+  z_stream stream;
+  memset(&stream, 0, sizeof(stream));
+
+  int result = deflateInit2(&stream, zlib_compression_level, Z_DEFLATED,
+      zlib_stream_wrapper_type(type), MAX_MEM_LEVEL, zlib_strategy);
+  if (result != Z_OK)
+    error_exit("deflateInit2 failed", result);
+
+  stream.next_out = (Bytef*)string_data(output);
+  stream.avail_out = (uInt)output_size;
+  stream.next_in = (z_const Bytef*)input;
+  stream.avail_in = (uInt)input_size;
+
+  result = deflate(&stream, Z_FINISH);
+  if (stream.avail_in > 0)
+    error_exit("compress: input was not consumed", Z_DATA_ERROR);
+  if (result == Z_STREAM_END)
+    output_size = stream.total_out;
+  result |= deflateEnd(&stream);
+  if (result != Z_STREAM_END)
+    error_exit("compress failed", result);
+
+  if (resize_output)
+    output->resize(output_size);
+}
+
+void zlib_uncompress(
+    const zlib_wrapper type,
+    const std::string& input,
+    const size_t output_size,
+    std::string* output)
+{
+  z_stream stream;
+  memset(&stream, 0, sizeof(stream));
+
+  int result = inflateInit2(&stream, zlib_stream_wrapper_type(type));
+  if (result != Z_OK)
+    error_exit("inflateInit2 failed", result);
+
+  stream.next_out = (Bytef*)string_data(output);
+  stream.avail_out = (uInt)output->size();
+  stream.next_in = (z_const Bytef*)input.data();
+  stream.avail_in = (uInt)input.size();
+
+  result = inflate(&stream, Z_FINISH);
+  if (stream.total_out != output_size)
+    result = Z_DATA_ERROR;
+  result |= inflateEnd(&stream);
+  if (result == Z_STREAM_END)
+    return;
+
+  std::string error("uncompress failed: ");
+  if (stream.msg)
+    error.append(stream.msg);
+  error_exit(error.c_str(), result);
+}
+
+void verify_equal(const char* input, size_t size, std::string* output) {
+  const char* data = string_data(output);
+  if (output->size() == size && !memcmp(data, input, size))
+    return;
+  fprintf(stderr, "uncompressed data does not match the input data\n");
+  exit(3);
+}
+
+void check_file(const Data& file, zlib_wrapper type, int mode) {
+  printf("%s %d %s%s\n", zlib_wrapper_name(type), zlib_compression_level,
+    zlib_level_strategy_name(zlib_compression_level), file.name.c_str());
+
+  // Compress the file data.
+  std::string compressed;
+  zlib_compress(type, file.data.get(), file.size, &compressed, true);
+
+  // Output compressed data integrity check: the data crc32.
+  unsigned long check = crc32_z(0, Z_NULL, 0);
+  const Bytef* data = (const Bytef*)compressed.data();
+  static_assert(sizeof(z_size_t) == sizeof(size_t), "z_size_t size");
+  check = crc32_z(check, data, (z_size_t)compressed.size());
+
+  const size_t compressed_length = compressed.size();
+  printf("data crc32 %.8lx length %zu\n", check, compressed_length);
+
+  // Output gzip or zlib DEFLATE stream internal check data.
+  if (type == kWrapperGZIP) {
+    uint32_t prev_word, last_word;
+    data += compressed_length - 8;
+    prev_word = data[3] << 24 | data[2] << 16 | data[1] << 8 | data[0];
+    data += 4;  // last compressed data word
+    last_word = data[3] << 24 | data[2] << 16 | data[1] << 8 | data[0];
+    printf("gzip crc32 %.8x length %u\n", prev_word, last_word);
+  } else if (type == kWrapperZLIB) {
+    uint32_t last_word;
+    data += compressed_length - 4;
+    last_word = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
+    printf("zlib adler %.8x\n", last_word);
+  }
+
+  if (mode == 2)  // --check-binary: output compressed data.
+    fwrite(compressed.data(), compressed_length, 1, stdout);
+
+  if (fflush(stdout), ferror(stdout))
+    error_exit("check file: error writing output", 3);
+}
+
+void zlib_file(const char* name,
+               zlib_wrapper type,
+               int width,
+               int check,
+               bool output_csv_format) {
+  /*
+   * Read the file data.
+   */
+  struct Data file = read_file_data_or_exit(name);
+  const int length = static_cast<int>(file.size);
+  const char* data = file.data.get();
+
+  /*
+   * Compress file: report output data checks and return.
+   */
+  if (check) {
+    file.name = file.name.substr(file.name.find_last_of("/\\") + 1);
+    check_file(file, type, check);
+    return;
+  }
+
+  /*
+   * Report compression strategy and file name.
+   */
+  const char* strategy = zlib_level_strategy_name(zlib_compression_level);
+  if (!output_csv_format) {
+    printf("%s%-40s :\n", strategy, name);
+  }
+
+  /*
+   * Chop the data into blocks.
+   */
+  const int block_size = 1 << 20;
+  const int blocks = (length + block_size - 1) / block_size;
+
+  std::vector<const char*> input(blocks);
+  std::vector<size_t> input_length(blocks);
+  std::vector<std::string> compressed(blocks);
+  std::vector<std::string> output(blocks);
+
+  for (int b = 0; b < blocks; ++b) {
+    int input_start = b * block_size;
+    int input_limit = std::min<int>((b + 1) * block_size, length);
+    input[b] = data + input_start;
+    input_length[b] = input_limit - input_start;
+  }
+
+  /*
+   * Run the zlib compress/uncompress loop a few times with |repeats| to
+   * process about 10MB of data if the length is small relative to 10MB.
+   * If length is large relative to 10MB, process the data once.
+   */
+  const int mega_byte = 1024 * 1024;
+  const int repeats = (10 * mega_byte + length) / (length + 1);
+  const int runs = 5;
+  double ctime[runs];
+  double utime[runs];
+
+  for (int run = 0; run < runs; ++run) {
+    const auto now = [] { return std::chrono::steady_clock::now(); };
+
+    // Pre-grow the output buffer so we don't measure string resize time.
+    for (int b = 0; b < blocks; ++b)
+      compressed[b].resize(zlib_estimate_compressed_size(block_size));
+
+    auto start = now();
+    for (int b = 0; b < blocks; ++b)
+      for (int r = 0; r < repeats; ++r)
+        zlib_compress(type, input[b], input_length[b], &compressed[b]);
+    ctime[run] = std::chrono::duration<double>(now() - start).count();
+
+    // Compress again, resizing compressed, so we don't leave junk at the
+    // end of the compressed string that could confuse zlib_uncompress().
+    for (int b = 0; b < blocks; ++b)
+      zlib_compress(type, input[b], input_length[b], &compressed[b], true);
+
+    for (int b = 0; b < blocks; ++b)
+      output[b].resize(input_length[b]);
+
+    start = now();
+    for (int r = 0; r < repeats; ++r)
+      for (int b = 0; b < blocks; ++b)
+        zlib_uncompress(type, compressed[b], input_length[b], &output[b]);
+    utime[run] = std::chrono::duration<double>(now() - start).count();
+
+    for (int b = 0; b < blocks; ++b)
+      verify_equal(input[b], input_length[b], &output[b]);
+  }
+
+  /*
+   * Output the median/maximum compress/uncompress rates in MB/s.
+   */
+  size_t output_length = 0;
+  for (size_t i = 0; i < compressed.size(); ++i)
+    output_length += compressed[i].size();
+
+  std::sort(ctime, ctime + runs);
+  std::sort(utime, utime + runs);
+
+  double deflate_rate_med, inflate_rate_med, deflate_rate_max, inflate_rate_max;
+  deflate_rate_med = length * repeats / mega_byte / ctime[runs / 2];
+  inflate_rate_med = length * repeats / mega_byte / utime[runs / 2];
+  deflate_rate_max = length * repeats / mega_byte / ctime[0];
+  inflate_rate_max = length * repeats / mega_byte / utime[0];
+  double compress_ratio = output_length * 100.0 / length;
+
+  if (!output_csv_format) {
+    // type, block size, compression ratio, etc
+    printf("%s: [b %dM] bytes %*d -> %*u %4.2f%%", zlib_wrapper_name(type),
+           block_size / (1 << 20), width, length, width,
+           unsigned(output_length), compress_ratio);
+
+    // compress / uncompress median (max) rates
+    printf(" comp %5.1f (%5.1f) MB/s uncomp %5.1f (%5.1f) MB/s\n",
+           deflate_rate_med, deflate_rate_max, inflate_rate_med,
+           inflate_rate_max);
+  } else {
+    printf("%s\t%.5lf\t%.5lf\t%.5lf\t%.5lf\t%.5lf\n", name, deflate_rate_med,
+           inflate_rate_med, deflate_rate_max, inflate_rate_max,
+           compress_ratio);
+  }
+}
+
+static int argn = 1;
+
+char* get_option(int argc, char* argv[], const char* option) {
+  if (argn < argc)
+    return !strcmp(argv[argn], option) ? argv[argn++] : nullptr;
+  return nullptr;
+}
+
+bool get_compression(int argc, char* argv[], int& value) {
+  if (argn < argc)
+    value = isdigit(argv[argn][0]) ? atoi(argv[argn++]) : -1;
+  return value >= 0 && value <= 9;
+}
+
+void get_field_width(int argc, char* argv[], int& value) {
+  value = atoi(argv[argn++]);
+}
+
+void usage_exit(const char* program) {
+  static auto* options =
+      "gzip|zlib|raw"
+      " [--compression 0:9] [--huffman|--rle] [--field width] [--check]"
+      " [--csv]";
+  printf("usage: %s %s files ...\n", program, options);
+  printf("zlib version: %s\n", ZLIB_VERSION);
+  exit(1);
+}
+
+int main(int argc, char* argv[]) {
+  zlib_wrapper type;
+  if (get_option(argc, argv, "zlib"))
+    type = kWrapperZLIB;
+  else if (get_option(argc, argv, "gzip"))
+    type = kWrapperGZIP;
+  else if (get_option(argc, argv, "raw"))
+    type = kWrapperZRAW;
+  else
+    usage_exit(argv[0]);
+
+  int size_field_width = 0;
+  int file_check = 0;
+  bool output_csv = false;
+  while (argn < argc && argv[argn][0] == '-') {
+    if (get_option(argc, argv, "--compression")) {
+      if (!get_compression(argc, argv, zlib_compression_level))
+        usage_exit(argv[0]);
+    } else if (get_option(argc, argv, "--huffman")) {
+      zlib_strategy = Z_HUFFMAN_ONLY;
+    } else if (get_option(argc, argv, "--rle")) {
+      zlib_strategy = Z_RLE;
+    } else if (get_option(argc, argv, "--check")) {
+      file_check = 1;
+    } else if (get_option(argc, argv, "--check-binary")) {
+      file_check = 2;
+    } else if (get_option(argc, argv, "--field")) {
+      get_field_width(argc, argv, size_field_width);
+    } else if (get_option(argc, argv, "--csv")) {
+      output_csv = true;
+      printf(
+          "filename\tcompression\tdecompression\tcomp_max\t"
+          "decomp_max\tcompress_ratio\n");
+    } else {
+      usage_exit(argv[0]);
+    }
+  }
+
+  if (argn >= argc)
+    usage_exit(argv[0]);
+
+  if (size_field_width < 6)
+    size_field_width = 6;
+  while (argn < argc) {
+    zlib_file(argv[argn++], type, size_field_width, file_check, output_csv);
+  }
+
+  return 0;
+}
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/README.chromium b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/README.chromium
new file mode 100644
index 0000000000..9c780f9468
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/README.chromium
@@ -0,0 +1,20 @@
+Name: ZIP file API for reading file entries in a ZIP archive
+Short Name: minizip
+URL: https://github.com/madler/zlib/tree/master/contrib/minizip
+Version: 1.2.12
+License: Zlib
+License File: //third_party/zlib/LICENSE
+Security Critical: yes
+Shipped: yes
+
+Description:
+Minizip provides API on top of zlib that can enumerate and extract ZIP archive
+files. See minizip.md for chromium build instructions.
+
+Local Modifications:
+- Add parsing of the 'Info-ZIP Unicode Path Extra Field' as described in
+  https://pkware.cachefly.net/webdocs/casestudies/APPNOTE.TXT section 4.6.9.
+  (see crrev.com/1002476)
+
+- Check for overly long filename, comment, or extra field in
+  zipOpenNewFileInZip4_64 (crbug.com/1470539).
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/ioapi.c b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/ioapi.c
index 7f5c191b2a..543910b5e1 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/ioapi.c
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/ioapi.c
@@ -14,7 +14,7 @@
         #define _CRT_SECURE_NO_WARNINGS
 #endif
 
-#if defined(__APPLE__) || defined(IOAPI_NO_64)
+#if defined(__APPLE__) || defined(__Fuchsia__) || defined(IOAPI_NO_64)
 // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
 #define FOPEN_FUNC(filename, mode) fopen(filename, mode)
 #define FTELLO_FUNC(stream) ftello(stream)
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/ioapi.h b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/ioapi.h
index c1b7a54847..8dcbdb06e3 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/ioapi.h
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/ioapi.h
@@ -43,7 +43,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "third_party/zlib/zlib.h"
+#include "zlib.h"
 
 #if defined(USE_FILE32API)
 #define fopen64 fopen
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/iowin32.c b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/iowin32.c
index 246ceb91a1..c6bc314b3c 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/iowin32.c
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/iowin32.c
@@ -31,14 +31,12 @@
 #define _WIN32_WINNT 0x601
 #endif
 
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN8
-// see Include/shared/winapifamily.h in the Windows Kit
-#if defined(WINAPI_FAMILY_PARTITION) && (!(defined(IOWIN32_USING_WINRT_API)))
-#if WINAPI_FAMILY_ONE_PARTITION(WINAPI_FAMILY, WINAPI_PARTITION_APP)
+#if !defined(IOWIN32_USING_WINRT_API)
+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
+// Windows Store or Universal Windows Platform
 #define IOWIN32_USING_WINRT_API 1
 #endif
 #endif
-#endif
 
 voidpf  ZCALLBACK win32_open_file_func  OF((voidpf opaque, const char* filename, int mode));
 uLong   ZCALLBACK win32_read_file_func  OF((voidpf opaque, voidpf stream, void* buf, uLong size));
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/miniunz.c b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/miniunz.c
index 3d65401be5..08737f689a 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/miniunz.c
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/miniunz.c
@@ -12,7 +12,7 @@
          Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
 */
 
-#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
+#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__)) && (!defined(__ANDROID_API__))
         #ifndef __USE_FILE_OFFSET64
                 #define __USE_FILE_OFFSET64
         #endif
@@ -27,7 +27,7 @@
         #endif
 #endif
 
-#ifdef __APPLE__
+#if defined(__APPLE__) || defined(__Fuchsia__) || defined(__ANDROID_API__)
 // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
 #define FOPEN_FUNC(filename, mode) fopen(filename, mode)
 #define FTELLO_FUNC(stream) ftello(stream)
@@ -45,6 +45,7 @@
 #include <time.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <sys/stat.h>
 
 #ifdef _WIN32
 # include <direct.h>
@@ -97,7 +98,7 @@ void change_file_date(filename,dosdate,tmu_date)
   SetFileTime(hFile,&ftm,&ftLastAcc,&ftm);
   CloseHandle(hFile);
 #else
-#ifdef unix || __APPLE__
+#if defined(unix) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__ANDROID_API__)
   struct utimbuf ut;
   struct tm newdate;
   newdate.tm_sec = tmu_date.tm_sec;
@@ -125,11 +126,9 @@ int mymkdir(dirname)
     const char* dirname;
 {
     int ret=0;
-#ifdef _WIN32
+#if defined(_WIN32)
     ret = _mkdir(dirname);
-#elif unix
-    ret = mkdir (dirname,0775);
-#elif __APPLE__
+#elif defined(unix) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__ANDROID_API__)
     ret = mkdir (dirname,0775);
 #endif
     return ret;
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/minizip.c b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/minizip.c
index 4288962ece..b794953c5c 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/minizip.c
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/minizip.c
@@ -12,8 +12,7 @@
          Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
 */
 
-
-#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
+#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__)) && (!defined(__ANDROID_API__))
         #ifndef __USE_FILE_OFFSET64
                 #define __USE_FILE_OFFSET64
         #endif
@@ -28,7 +27,7 @@
         #endif
 #endif
 
-#ifdef __APPLE__
+#if defined(__APPLE__) || defined(__Fuchsia__) || defined(__ANDROID_API__)
 // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
 #define FOPEN_FUNC(filename, mode) fopen(filename, mode)
 #define FTELLO_FUNC(stream) ftello(stream)
@@ -94,7 +93,7 @@ uLong filetime(f, tmzip, dt)
   return ret;
 }
 #else
-#ifdef unix || __APPLE__
+#if defined(unix) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__ANDROID_API__)
 uLong filetime(f, tmzip, dt)
     char *f;               /* name of file to get info on */
     tm_zip *tmzip;         /* return value: access, modific. and creation times */
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/minizip.md b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/minizip.md
new file mode 100644
index 0000000000..9f15dd23de
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/minizip.md
@@ -0,0 +1,9 @@
+Minizip is a library provided by //third_party/zlib [1]. Its zip and unzip
+tools can be built in a developer checkout for testing purposes with:
+
+```shell
+  autoninja -C out/Release minizip_bin
+  autoninja -C out/Release miniunz_bin
+```
+
+[1] Upstream is https://github.com/madler/zlib/tree/master/contrib/minizip
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/mztools.c b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/mztools.c
index 8bf9cca326..96891c2e0b 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/mztools.c
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/mztools.c
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "third_party/zlib/zlib.h"
+#include "zlib.h"
 #include "unzip.h"
 
 #define READ_8(adr)  ((unsigned char)*(adr))
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/mztools.h b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/mztools.h
index f295ffeda6..a49a426ec2 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/mztools.h
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/mztools.h
@@ -12,7 +12,7 @@ extern "C" {
 #endif
 
 #ifndef _ZLIB_H
-#include "third_party/zlib/zlib.h"
+#include "zlib.h"
 #endif
 
 #include "unzip.h"
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/unzip.c b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/unzip.c
index 199b4723fc..4973a4eea9 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/unzip.c
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/unzip.c
@@ -68,11 +68,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifndef NOUNCRYPT
-        #define NOUNCRYPT
-#endif
-
-#include "third_party/zlib/zlib.h"
+#include "zlib.h"
 #include "unzip.h"
 
 #ifdef STDC
@@ -1027,46 +1023,102 @@ local int unz64local_GetCurrentFileInfoInternal (unzFile file,
         while(acc < file_info.size_file_extra)
         {
             uLong headerId;
-                                                uLong dataSize;
+            uLong dataSize;
 
             if (unz64local_getShort(&s->z_filefunc, s->filestream,&headerId) != UNZ_OK)
                 err=UNZ_ERRNO;
 
             if (unz64local_getShort(&s->z_filefunc, s->filestream,&dataSize) != UNZ_OK)
                 err=UNZ_ERRNO;
-
+            
             /* ZIP64 extra fields */
             if (headerId == 0x0001)
             {
-                                                        uLong uL;
-
-                                                                if(file_info.uncompressed_size == MAXU32)
-                                                                {
-                                                                        if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK)
-                                                                                        err=UNZ_ERRNO;
-                                                                }
-
-                                                                if(file_info.compressed_size == MAXU32)
-                                                                {
-                                                                        if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK)
-                                                                                  err=UNZ_ERRNO;
-                                                                }
-
-                                                                if(file_info_internal.offset_curfile == MAXU32)
-                                                                {
-                                                                        /* Relative Header offset */
-                                                                        if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK)
-                                                                                err=UNZ_ERRNO;
-                                                                }
-
-                                                                if(file_info.disk_num_start == MAXU32)
-                                                                {
-                                                                        /* Disk Start Number */
-                                                                        if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
-                                                                                err=UNZ_ERRNO;
-                                                                }
+                uLong uL;
+
+                if(file_info.uncompressed_size == MAXU32)
+                {
+                    if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK)
+                        err=UNZ_ERRNO;
+                }
+
+                if(file_info.compressed_size == MAXU32)
+                {
+                    if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK)
+                        err=UNZ_ERRNO;
+                }
+
+                if(file_info_internal.offset_curfile == MAXU32)
+                {
+                    /* Relative Header offset */
+                    if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK)
+                        err=UNZ_ERRNO;
+                }
+
+                if(file_info.disk_num_start == MAXU32)
+                {
+                    /* Disk Start Number */
+                    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
+                        err=UNZ_ERRNO;
+                }
 
             }
+            else if (headerId == 0x7075) /* Info-ZIP Unicode Path Extra Field */
+            {
+                int version = 0;
+
+                if (unz64local_getByte(&s->z_filefunc, s->filestream, &version) != UNZ_OK)
+                {
+                    err = UNZ_ERRNO;
+                }
+                if (version != 1)
+                {
+                    if (ZSEEK64(s->z_filefunc, s->filestream,dataSize - 1, ZLIB_FILEFUNC_SEEK_CUR) != 0)
+                    {
+                        err = UNZ_ERRNO;
+                    }
+                }
+                else
+                {
+                    uLong uCrc, uHeaderCrc, fileNameSize;
+
+                    if (unz64local_getLong(&s->z_filefunc, s->filestream, &uCrc) != UNZ_OK)
+                    {
+                        err = UNZ_ERRNO;
+                    }
+                    uHeaderCrc = crc32(0, (const unsigned char *)szFileName, file_info.size_filename);
+                    fileNameSize = dataSize - (2 * sizeof (short) + 1);
+                    /* Check CRC against file name in the header. */
+                    if (uHeaderCrc != uCrc)
+                    {
+                        if (ZSEEK64(s->z_filefunc, s->filestream, fileNameSize, ZLIB_FILEFUNC_SEEK_CUR) != 0)
+                        {
+                            err = UNZ_ERRNO;
+                        }
+                    }
+                    else
+                    {
+                        uLong uSizeRead;
+
+                        if (fileNameSize < fileNameBufferSize)
+                        {
+                             *(szFileName + fileNameSize) = '\0';
+                            uSizeRead = fileNameSize;
+                        }
+                        else
+                        {
+                            uSizeRead = fileNameBufferSize;
+                        }
+                        if ((fileNameSize > 0) && (fileNameBufferSize > 0))
+                        {
+                            if (ZREAD64(s->z_filefunc, s->filestream, szFileName, uSizeRead) != uSizeRead)
+                            {
+                                err = UNZ_ERRNO;
+                            }
+                        }
+                    }
+                }
+            }
             else
             {
                 if (ZSEEK64(s->z_filefunc, s->filestream,dataSize,ZLIB_FILEFUNC_SEEK_CUR)!=0)
@@ -1630,6 +1682,7 @@ extern int ZEXPORT unzOpenCurrentFile3 (unzFile file, int* method,
             zdecode(s->keys,s->pcrc_32_tab,source[i]);
 
         s->pfile_in_zip_read->pos_in_zipfile+=12;
+        s->pfile_in_zip_read->rest_read_compressed-=12;
         s->encrypted=1;
     }
 #    endif
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/unzip.h b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/unzip.h
index 3c0143529b..2104e39150 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/unzip.h
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/unzip.h
@@ -48,7 +48,7 @@ extern "C" {
 #endif
 
 #ifndef _ZLIB_H
-#include "third_party/zlib/zlib.h"
+#include "zlib.h"
 #endif
 
 #ifndef  _ZLIBIOAPI_H
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/zip.c b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/zip.c
index 65c0c72518..f21d495428 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/zip.c
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/zip.c
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include "third_party/zlib/zlib.h"
+#include "zlib.h"
 #include "zip.h"
 
 #ifdef STDC
@@ -1083,6 +1083,17 @@ extern int ZEXPORT zipOpenNewFileInZip4_64 (zipFile file, const char* filename,
       return ZIP_PARAMERROR;
 #endif
 
+    // The filename and comment length must fit in 16 bits.
+    if ((filename!=NULL) && (strlen(filename)>0xffff))
+        return ZIP_PARAMERROR;
+    if ((comment!=NULL) && (strlen(comment)>0xffff))
+        return ZIP_PARAMERROR;
+    // The extra field length must fit in 16 bits. If the member also requires
+    // a Zip64 extra block, that will also need to fit within that 16-bit
+    // length, but that will be checked for later.
+    if ((size_extrafield_local>0xffff) || (size_extrafield_global>0xffff))
+        return ZIP_PARAMERROR;
+
     zi = (zip64_internal*)file;
 
     if (zi->in_opened_file_inzip == 1)
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/zip.h b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/zip.h
index 8c06c0aa7b..8aaebb6234 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/zip.h
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/minizip/zip.h
@@ -47,7 +47,7 @@ extern "C" {
 //#define HAVE_BZIP2
 
 #ifndef _ZLIB_H
-#include "third_party/zlib/zlib.h"
+#include "zlib.h"
 #endif
 
 #ifndef _ZLIBIOAPI_H
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/optimizations/chunkcopy.h b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/optimizations/chunkcopy.h
new file mode 100644
index 0000000000..f40546d54d
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/optimizations/chunkcopy.h
@@ -0,0 +1,489 @@
+/* chunkcopy.h -- fast chunk copy and set operations
+ * Copyright (C) 2017 ARM, Inc.
+ * Copyright 2017 The Chromium Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the Chromium source repository LICENSE file.
+ */
+
+#ifndef CHUNKCOPY_H
+#define CHUNKCOPY_H
+
+#include <stdint.h>
+#include "zutil.h"
+
+#define Z_STATIC_ASSERT(name, assert) typedef char name[(assert) ? 1 : -1]
+
+#if __STDC_VERSION__ >= 199901L
+#define Z_RESTRICT restrict
+#else
+#define Z_RESTRICT
+#endif
+
+#if defined(__clang__) || defined(__GNUC__) || defined(__llvm__)
+#define Z_BUILTIN_MEMCPY __builtin_memcpy
+#else
+#define Z_BUILTIN_MEMCPY zmemcpy
+#endif
+
+#if defined(INFLATE_CHUNK_SIMD_NEON)
+#include <arm_neon.h>
+typedef uint8x16_t z_vec128i_t;
+#elif defined(INFLATE_CHUNK_SIMD_SSE2)
+#include <emmintrin.h>
+typedef __m128i z_vec128i_t;
+#else
+#error chunkcopy.h inflate chunk SIMD is not defined for your build target
+#endif
+
+/*
+ * Suppress MSan errors about copying uninitialized bytes (crbug.com/1376033).
+ */
+#define Z_DISABLE_MSAN
+#if defined(__has_feature)
+  #if __has_feature(memory_sanitizer)
+    #undef Z_DISABLE_MSAN
+    #define Z_DISABLE_MSAN __attribute__((no_sanitize("memory")))
+  #endif
+#endif
+
+/*
+ * chunk copy type: the z_vec128i_t type size should be exactly 128-bits
+ * and equal to CHUNKCOPY_CHUNK_SIZE.
+ */
+#define CHUNKCOPY_CHUNK_SIZE sizeof(z_vec128i_t)
+
+Z_STATIC_ASSERT(vector_128_bits_wide,
+                CHUNKCOPY_CHUNK_SIZE == sizeof(int8_t) * 16);
+
+/*
+ * Ask the compiler to perform a wide, unaligned load with a machine
+ * instruction appropriate for the z_vec128i_t type.
+ */
+static inline z_vec128i_t loadchunk(
+    const unsigned char FAR* s) Z_DISABLE_MSAN {
+  z_vec128i_t v;
+  Z_BUILTIN_MEMCPY(&v, s, sizeof(v));
+  return v;
+}
+
+/*
+ * Ask the compiler to perform a wide, unaligned store with a machine
+ * instruction appropriate for the z_vec128i_t type.
+ */
+static inline void storechunk(
+    unsigned char FAR* d,
+    const z_vec128i_t v) {
+  Z_BUILTIN_MEMCPY(d, &v, sizeof(v));
+}
+
+/*
+ * Perform a memcpy-like operation, assuming that length is non-zero and that
+ * it's OK to overwrite at least CHUNKCOPY_CHUNK_SIZE bytes of output even if
+ * the length is shorter than this.
+ *
+ * It also guarantees that it will properly unroll the data if the distance
+ * between `out` and `from` is at least CHUNKCOPY_CHUNK_SIZE, which we rely on
+ * in chunkcopy_relaxed().
+ *
+ * Aside from better memory bus utilisation, this means that short copies
+ * (CHUNKCOPY_CHUNK_SIZE bytes or fewer) will fall straight through the loop
+ * without iteration, which will hopefully make the branch prediction more
+ * reliable.
+ */
+static inline unsigned char FAR* chunkcopy_core(
+    unsigned char FAR* out,
+    const unsigned char FAR* from,
+    unsigned len) Z_DISABLE_MSAN {
+  const int bump = (--len % CHUNKCOPY_CHUNK_SIZE) + 1;
+  storechunk(out, loadchunk(from));
+  out += bump;
+  from += bump;
+  len /= CHUNKCOPY_CHUNK_SIZE;
+  while (len-- > 0) {
+    storechunk(out, loadchunk(from));
+    out += CHUNKCOPY_CHUNK_SIZE;
+    from += CHUNKCOPY_CHUNK_SIZE;
+  }
+  return out;
+}
+
+/*
+ * Like chunkcopy_core(), but avoid writing beyond of legal output.
+ *
+ * Accepts an additional pointer to the end of safe output.  A generic safe
+ * copy would use (out + len), but it's normally the case that the end of the
+ * output buffer is beyond the end of the current copy, and this can still be
+ * exploited.
+ */
+static inline unsigned char FAR* chunkcopy_core_safe(
+    unsigned char FAR* out,
+    const unsigned char FAR* from,
+    unsigned len,
+    unsigned char FAR* limit) {
+  Assert(out + len <= limit, "chunk copy exceeds safety limit");
+  if ((limit - out) < (ptrdiff_t)CHUNKCOPY_CHUNK_SIZE) {
+    const unsigned char FAR* Z_RESTRICT rfrom = from;
+    Assert((uintptr_t)out - (uintptr_t)from >= len,
+           "invalid restrict in chunkcopy_core_safe");
+    Assert((uintptr_t)from - (uintptr_t)out >= len,
+           "invalid restrict in chunkcopy_core_safe");
+    if (len & 8) {
+      Z_BUILTIN_MEMCPY(out, rfrom, 8);
+      out += 8;
+      rfrom += 8;
+    }
+    if (len & 4) {
+      Z_BUILTIN_MEMCPY(out, rfrom, 4);
+      out += 4;
+      rfrom += 4;
+    }
+    if (len & 2) {
+      Z_BUILTIN_MEMCPY(out, rfrom, 2);
+      out += 2;
+      rfrom += 2;
+    }
+    if (len & 1) {
+      *out++ = *rfrom++;
+    }
+    return out;
+  }
+  return chunkcopy_core(out, from, len);
+}
+
+/*
+ * Perform short copies until distance can be rewritten as being at least
+ * CHUNKCOPY_CHUNK_SIZE.
+ *
+ * Assumes it's OK to overwrite at least the first 2*CHUNKCOPY_CHUNK_SIZE
+ * bytes of output even if the copy is shorter than this.  This assumption
+ * holds within zlib inflate_fast(), which starts every iteration with at
+ * least 258 bytes of output space available (258 being the maximum length
+ * output from a single token; see inffast.c).
+ */
+static inline unsigned char FAR* chunkunroll_relaxed(
+    unsigned char FAR* out,
+    unsigned FAR* dist,
+    unsigned FAR* len) Z_DISABLE_MSAN {
+  const unsigned char FAR* from = out - *dist;
+  while (*dist < *len && *dist < CHUNKCOPY_CHUNK_SIZE) {
+    storechunk(out, loadchunk(from));
+    out += *dist;
+    *len -= *dist;
+    *dist += *dist;
+  }
+  return out;
+}
+
+#if defined(INFLATE_CHUNK_SIMD_NEON)
+/*
+ * v_load64_dup(): load *src as an unaligned 64-bit int and duplicate it in
+ * every 64-bit component of the 128-bit result (64-bit int splat).
+ */
+static inline z_vec128i_t v_load64_dup(const void* src) {
+  return vcombine_u8(vld1_u8(src), vld1_u8(src));
+}
+
+/*
+ * v_load32_dup(): load *src as an unaligned 32-bit int and duplicate it in
+ * every 32-bit component of the 128-bit result (32-bit int splat).
+ */
+static inline z_vec128i_t v_load32_dup(const void* src) {
+  int32_t i32;
+  Z_BUILTIN_MEMCPY(&i32, src, sizeof(i32));
+  return vreinterpretq_u8_s32(vdupq_n_s32(i32));
+}
+
+/*
+ * v_load16_dup(): load *src as an unaligned 16-bit int and duplicate it in
+ * every 16-bit component of the 128-bit result (16-bit int splat).
+ */
+static inline z_vec128i_t v_load16_dup(const void* src) {
+  int16_t i16;
+  Z_BUILTIN_MEMCPY(&i16, src, sizeof(i16));
+  return vreinterpretq_u8_s16(vdupq_n_s16(i16));
+}
+
+/*
+ * v_load8_dup(): load the 8-bit int *src and duplicate it in every 8-bit
+ * component of the 128-bit result (8-bit int splat).
+ */
+static inline z_vec128i_t v_load8_dup(const void* src) {
+  return vld1q_dup_u8((const uint8_t*)src);
+}
+
+/*
+ * v_store_128(): store the 128-bit vec in a memory destination (that might
+ * not be 16-byte aligned) void* out.
+ */
+static inline void v_store_128(void* out, const z_vec128i_t vec) {
+  vst1q_u8(out, vec);
+}
+
+#elif defined(INFLATE_CHUNK_SIMD_SSE2)
+/*
+ * v_load64_dup(): load *src as an unaligned 64-bit int and duplicate it in
+ * every 64-bit component of the 128-bit result (64-bit int splat).
+ */
+static inline z_vec128i_t v_load64_dup(const void* src) {
+  int64_t i64;
+  Z_BUILTIN_MEMCPY(&i64, src, sizeof(i64));
+  return _mm_set1_epi64x(i64);
+}
+
+/*
+ * v_load32_dup(): load *src as an unaligned 32-bit int and duplicate it in
+ * every 32-bit component of the 128-bit result (32-bit int splat).
+ */
+static inline z_vec128i_t v_load32_dup(const void* src) {
+  int32_t i32;
+  Z_BUILTIN_MEMCPY(&i32, src, sizeof(i32));
+  return _mm_set1_epi32(i32);
+}
+
+/*
+ * v_load16_dup(): load *src as an unaligned 16-bit int and duplicate it in
+ * every 16-bit component of the 128-bit result (16-bit int splat).
+ */
+static inline z_vec128i_t v_load16_dup(const void* src) {
+  int16_t i16;
+  Z_BUILTIN_MEMCPY(&i16, src, sizeof(i16));
+  return _mm_set1_epi16(i16);
+}
+
+/*
+ * v_load8_dup(): load the 8-bit int *src and duplicate it in every 8-bit
+ * component of the 128-bit result (8-bit int splat).
+ */
+static inline z_vec128i_t v_load8_dup(const void* src) {
+  return _mm_set1_epi8(*(const char*)src);
+}
+
+/*
+ * v_store_128(): store the 128-bit vec in a memory destination (that might
+ * not be 16-byte aligned) void* out.
+ */
+static inline void v_store_128(void* out, const z_vec128i_t vec) {
+  _mm_storeu_si128((__m128i*)out, vec);
+}
+#endif
+
+/*
+ * Perform an overlapping copy which behaves as a memset() operation, but
+ * supporting periods other than one, and assume that length is non-zero and
+ * that it's OK to overwrite at least CHUNKCOPY_CHUNK_SIZE*3 bytes of output
+ * even if the length is shorter than this.
+ */
+static inline unsigned char FAR* chunkset_core(
+    unsigned char FAR* out,
+    unsigned period,
+    unsigned len) {
+  z_vec128i_t v;
+  const int bump = ((len - 1) % sizeof(v)) + 1;
+
+  switch (period) {
+    case 1:
+      v = v_load8_dup(out - 1);
+      v_store_128(out, v);
+      out += bump;
+      len -= bump;
+      while (len > 0) {
+        v_store_128(out, v);
+        out += sizeof(v);
+        len -= sizeof(v);
+      }
+      return out;
+    case 2:
+      v = v_load16_dup(out - 2);
+      v_store_128(out, v);
+      out += bump;
+      len -= bump;
+      if (len > 0) {
+        v = v_load16_dup(out - 2);
+        do {
+          v_store_128(out, v);
+          out += sizeof(v);
+          len -= sizeof(v);
+        } while (len > 0);
+      }
+      return out;
+    case 4:
+      v = v_load32_dup(out - 4);
+      v_store_128(out, v);
+      out += bump;
+      len -= bump;
+      if (len > 0) {
+        v = v_load32_dup(out - 4);
+        do {
+          v_store_128(out, v);
+          out += sizeof(v);
+          len -= sizeof(v);
+        } while (len > 0);
+      }
+      return out;
+    case 8:
+      v = v_load64_dup(out - 8);
+      v_store_128(out, v);
+      out += bump;
+      len -= bump;
+      if (len > 0) {
+        v = v_load64_dup(out - 8);
+        do {
+          v_store_128(out, v);
+          out += sizeof(v);
+          len -= sizeof(v);
+        } while (len > 0);
+      }
+      return out;
+  }
+  out = chunkunroll_relaxed(out, &period, &len);
+  return chunkcopy_core(out, out - period, len);
+}
+
+/*
+ * Perform a memcpy-like operation, but assume that length is non-zero and that
+ * it's OK to overwrite at least CHUNKCOPY_CHUNK_SIZE bytes of output even if
+ * the length is shorter than this.
+ *
+ * Unlike chunkcopy_core() above, no guarantee is made regarding the behaviour
+ * of overlapping buffers, regardless of the distance between the pointers.
+ * This is reflected in the `restrict`-qualified pointers, allowing the
+ * compiler to re-order loads and stores.
+ */
+static inline unsigned char FAR* chunkcopy_relaxed(
+    unsigned char FAR* Z_RESTRICT out,
+    const unsigned char FAR* Z_RESTRICT from,
+    unsigned len) {
+  Assert((uintptr_t)out - (uintptr_t)from >= len,
+         "invalid restrict in chunkcopy_relaxed");
+  Assert((uintptr_t)from - (uintptr_t)out >= len,
+         "invalid restrict in chunkcopy_relaxed");
+  return chunkcopy_core(out, from, len);
+}
+
+/*
+ * Like chunkcopy_relaxed(), but avoid writing beyond of legal output.
+ *
+ * Unlike chunkcopy_core_safe() above, no guarantee is made regarding the
+ * behaviour of overlapping buffers, regardless of the distance between the
+ * pointers.  This is reflected in the `restrict`-qualified pointers, allowing
+ * the compiler to re-order loads and stores.
+ *
+ * Accepts an additional pointer to the end of safe output.  A generic safe
+ * copy would use (out + len), but it's normally the case that the end of the
+ * output buffer is beyond the end of the current copy, and this can still be
+ * exploited.
+ */
+static inline unsigned char FAR* chunkcopy_safe(
+    unsigned char FAR* out,
+    const unsigned char FAR* Z_RESTRICT from,
+    unsigned len,
+    unsigned char FAR* limit) {
+  Assert(out + len <= limit, "chunk copy exceeds safety limit");
+  Assert((uintptr_t)out - (uintptr_t)from >= len,
+         "invalid restrict in chunkcopy_safe");
+  Assert((uintptr_t)from - (uintptr_t)out >= len,
+         "invalid restrict in chunkcopy_safe");
+
+  return chunkcopy_core_safe(out, from, len, limit);
+}
+
+/*
+ * Perform chunky copy within the same buffer, where the source and destination
+ * may potentially overlap.
+ *
+ * Assumes that len > 0 on entry, and that it's safe to write at least
+ * CHUNKCOPY_CHUNK_SIZE*3 bytes to the output.
+ */
+static inline unsigned char FAR* chunkcopy_lapped_relaxed(
+    unsigned char FAR* out,
+    unsigned dist,
+    unsigned len) {
+  if (dist < len && dist < CHUNKCOPY_CHUNK_SIZE) {
+    return chunkset_core(out, dist, len);
+  }
+  return chunkcopy_core(out, out - dist, len);
+}
+
+/*
+ * Behave like chunkcopy_lapped_relaxed(), but avoid writing beyond of legal
+ * output.
+ *
+ * Accepts an additional pointer to the end of safe output.  A generic safe
+ * copy would use (out + len), but it's normally the case that the end of the
+ * output buffer is beyond the end of the current copy, and this can still be
+ * exploited.
+ */
+static inline unsigned char FAR* chunkcopy_lapped_safe(
+    unsigned char FAR* out,
+    unsigned dist,
+    unsigned len,
+    unsigned char FAR* limit) {
+  Assert(out + len <= limit, "chunk copy exceeds safety limit");
+  if ((limit - out) < (ptrdiff_t)(3 * CHUNKCOPY_CHUNK_SIZE)) {
+    /* TODO(cavalcantii): try harder to optimise this */
+    while (len-- > 0) {
+      *out = *(out - dist);
+      out++;
+    }
+    return out;
+  }
+  return chunkcopy_lapped_relaxed(out, dist, len);
+}
+
+/* TODO(cavalcanti): see crbug.com/1110083. */
+static inline unsigned char FAR* chunkcopy_safe_ugly(unsigned char FAR* out,
+                                                     unsigned dist,
+                                                     unsigned len,
+                                                     unsigned char FAR* limit) {
+#if defined(__GNUC__) && !defined(__clang__)
+  /* Speed is the same as using chunkcopy_safe
+     w/ GCC on ARM (tested gcc 6.3 and 7.5) and avoids
+     undefined behavior.
+  */
+  return chunkcopy_core_safe(out, out - dist, len, limit);
+#elif defined(__clang__) && defined(ARMV8_OS_ANDROID) && !defined(__aarch64__)
+  /* Seems to perform better on 32bit (i.e. Android). */
+  return chunkcopy_core_safe(out, out - dist, len, limit);
+#else
+  /* Seems to perform better on 64bit. */
+  return chunkcopy_lapped_safe(out, dist, len, limit);
+#endif
+}
+
+/*
+ * The chunk-copy code above deals with writing the decoded DEFLATE data to
+ * the output with SIMD methods to increase decode speed. Reading the input
+ * to the DEFLATE decoder with a wide, SIMD method can also increase decode
+ * speed. This option is supported on little endian machines, and reads the
+ * input data in 64-bit (8 byte) chunks.
+ */
+
+#ifdef INFLATE_CHUNK_READ_64LE
+/*
+ * Buffer the input in a uint64_t (8 bytes) in the wide input reading case.
+ */
+typedef uint64_t inflate_holder_t;
+
+/*
+ * Ask the compiler to perform a wide, unaligned load of a uint64_t using a
+ * machine instruction appropriate for the uint64_t type.
+ */
+static inline inflate_holder_t read64le(const unsigned char FAR *in) {
+    inflate_holder_t input;
+    Z_BUILTIN_MEMCPY(&input, in, sizeof(input));
+    return input;
+}
+#else
+/*
+ * Otherwise, buffer the input bits using zlib's default input buffer type.
+ */
+typedef unsigned long inflate_holder_t;
+
+#endif /* INFLATE_CHUNK_READ_64LE */
+
+#undef Z_STATIC_ASSERT
+#undef Z_RESTRICT
+#undef Z_BUILTIN_MEMCPY
+#undef Z_DISABLE_MSAN
+
+#endif /* CHUNKCOPY_H */
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/optimizations/inffast_chunk.c b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/optimizations/inffast_chunk.c
new file mode 100644
index 0000000000..b1db452c2e
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/optimizations/inffast_chunk.c
@@ -0,0 +1,376 @@
+/* inffast_chunk.c -- fast decoding
+ * Copyright (C) 1995-2017 Mark Adler
+ * Copyright 2023 The Chromium Authors
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+#include "inflate.h"
+#include "contrib/optimizations/inffast_chunk.h"
+#include "contrib/optimizations/chunkcopy.h"
+
+#ifdef ASMINF
+#  pragma message("Assembler code may have bugs -- use at your own risk")
+#else
+
+/*
+   Decode literal, length, and distance codes and write out the resulting
+   literal and match bytes until either not enough input or output is
+   available, an end-of-block is encountered, or a data error is encountered.
+   When large enough input and output buffers are supplied to inflate(), for
+   example, a 16K input buffer and a 64K output buffer, more than 95% of the
+   inflate() execution time is spent in this routine.
+
+   Entry assumptions:
+
+        state->mode == LEN
+        strm->avail_in >= INFLATE_FAST_MIN_INPUT (6 or 8 bytes + 7 bytes)
+        strm->avail_out >= INFLATE_FAST_MIN_OUTPUT (258 bytes + 2 bytes)
+        start >= strm->avail_out
+        state->bits < 8
+        (state->hold >> state->bits) == 0
+        strm->next_out[0..strm->avail_out] does not overlap with
+              strm->next_in[0..strm->avail_in]
+        strm->state->window is allocated with an additional
+              CHUNKCOPY_CHUNK_SIZE-1 bytes of padding beyond strm->state->wsize
+
+   On return, state->mode is one of:
+
+        LEN -- ran out of enough output space or enough available input
+        TYPE -- reached end of block code, inflate() to interpret next block
+        BAD -- error in block data
+
+   Notes:
+
+    INFLATE_FAST_MIN_INPUT: 6 or 8 bytes + 7 bytes
+
+    - The maximum input bits used by a length/distance pair is 15 bits for the
+      length code, 5 bits for the length extra, 15 bits for the distance code,
+      and 13 bits for the distance extra.  This totals 48 bits, or six bytes.
+      Therefore if strm->avail_in >= 6, then there is enough input to avoid
+      checking for available input while decoding.
+
+    - The wide input data reading option reads 64 input bits at a time. Thus,
+      if strm->avail_in >= 8, then there is enough input to avoid checking for
+      available input while decoding. Reading consumes the input with:
+
+          hold |= read64le(in) << bits;
+          in += 6;
+          bits += 48;
+
+      reporting 6 bytes of new input because |bits| is 0..15 (2 bytes rounded
+      up, worst case) and 6 bytes is enough to decode as noted above. At exit,
+      hold &= (1U << bits) - 1 drops excess input to keep the invariant:
+
+          (state->hold >> state->bits) == 0
+
+    INFLATE_FAST_MIN_OUTPUT: 258 bytes + 2 bytes for literals = 260 bytes
+
+    - The maximum bytes that a single length/distance pair can output is 258
+      bytes, which is the maximum length that can be coded.  inflate_fast()
+      requires strm->avail_out >= 260 for each loop to avoid checking for
+      available output space while decoding.
+ */
+void ZLIB_INTERNAL inflate_fast_chunk_(z_streamp strm, unsigned start) {
+    struct inflate_state FAR *state;
+    z_const unsigned char FAR *in;      /* local strm->next_in */
+    z_const unsigned char FAR *last;    /* have enough input while in < last */
+    unsigned char FAR *out;     /* local strm->next_out */
+    unsigned char FAR *beg;     /* inflate()'s initial strm->next_out */
+    unsigned char FAR *end;     /* while out < end, enough space available */
+    unsigned char FAR *limit;   /* safety limit for chunky copies */
+#ifdef INFLATE_STRICT
+    unsigned dmax;              /* maximum distance from zlib header */
+#endif
+    unsigned wsize;             /* window size or zero if not using window */
+    unsigned whave;             /* valid bytes in the window */
+    unsigned wnext;             /* window write index */
+    unsigned char FAR *window;  /* allocated sliding window, if wsize != 0 */
+    inflate_holder_t hold;      /* local strm->hold */
+    unsigned bits;              /* local strm->bits */
+    code const FAR *lcode;      /* local strm->lencode */
+    code const FAR *dcode;      /* local strm->distcode */
+    unsigned lmask;             /* mask for first level of length codes */
+    unsigned dmask;             /* mask for first level of distance codes */
+    code const *here;           /* retrieved table entry */
+    unsigned op;                /* code bits, operation, extra bits, or */
+                                /*  window position, window bytes to copy */
+    unsigned len;               /* match length, unused bytes */
+    unsigned dist;              /* match distance */
+    unsigned char FAR *from;    /* where to copy match from */
+
+    /* copy state to local variables */
+    state = (struct inflate_state FAR *)strm->state;
+    in = strm->next_in;
+    last = in + (strm->avail_in - (INFLATE_FAST_MIN_INPUT - 1));
+    out = strm->next_out;
+    beg = out - (start - strm->avail_out);
+    end = out + (strm->avail_out - (INFLATE_FAST_MIN_OUTPUT - 1));
+    limit = out + strm->avail_out;
+#ifdef INFLATE_STRICT
+    dmax = state->dmax;
+#endif
+    wsize = state->wsize;
+    whave = state->whave;
+    wnext = (state->wnext == 0 && whave >= wsize) ? wsize : state->wnext;
+    window = state->window;
+    hold = state->hold;
+    bits = state->bits;
+    lcode = state->lencode;
+    dcode = state->distcode;
+    lmask = (1U << state->lenbits) - 1;
+    dmask = (1U << state->distbits) - 1;
+
+#ifdef INFLATE_CHUNK_READ_64LE
+#define REFILL() do { \
+        Assert(bits < 64, "### Too many bits in inflate_fast."); \
+        hold |= read64le(in) << bits; \
+        in += 7; \
+        in -= bits >> 3; \
+        bits |= 56; \
+    } while (0)
+#endif
+
+    /* decode literals and length/distances until end-of-block or not enough
+       input data or output space */
+    do {
+#ifdef INFLATE_CHUNK_READ_64LE
+        REFILL();
+#else
+        if (bits < 15) {
+            hold += (unsigned long)(*in++) << bits;
+            bits += 8;
+            hold += (unsigned long)(*in++) << bits;
+            bits += 8;
+        }
+#endif
+        here = lcode + (hold & lmask);
+#ifdef INFLATE_CHUNK_READ_64LE
+        if (here->op == 0) {                    /* literal */
+            Tracevv((stderr, here->val >= 0x20 && here->val < 0x7f ?
+                    "inflate:         literal '%c'\n" :
+                    "inflate:         literal 0x%02x\n", here->val));
+            *out++ = (unsigned char)(here->val);
+            hold >>= here->bits;
+            bits -= here->bits;
+            here = lcode + (hold & lmask);
+            if (here->op == 0) {                /* literal */
+                Tracevv((stderr, here->val >= 0x20 && here->val < 0x7f ?
+                        "inflate:    2nd  literal '%c'\n" :
+                        "inflate:    2nd  literal 0x%02x\n", here->val));
+                *out++ = (unsigned char)(here->val);
+                hold >>= here->bits;
+                bits -= here->bits;
+                here = lcode + (hold & lmask);
+            }
+        }
+#endif
+      dolen:
+        op = (unsigned)(here->bits);
+        hold >>= op;
+        bits -= op;
+        op = (unsigned)(here->op);
+        if (op == 0) {                          /* literal */
+            Tracevv((stderr, here->val >= 0x20 && here->val < 0x7f ?
+                    "inflate:         literal '%c'\n" :
+                    "inflate:         literal 0x%02x\n", here->val));
+            *out++ = (unsigned char)(here->val);
+        }
+        else if (op & 16) {                     /* length base */
+            len = (unsigned)(here->val);
+            op &= 15;                           /* number of extra bits */
+            if (op) {
+#ifndef INFLATE_CHUNK_READ_64LE
+                if (bits < op) {
+                    hold += (unsigned long)(*in++) << bits;
+                    bits += 8;
+                }
+#endif
+                len += (unsigned)hold & ((1U << op) - 1);
+                hold >>= op;
+                bits -= op;
+            }
+            Tracevv((stderr, "inflate:         length %u\n", len));
+#ifndef INFLATE_CHUNK_READ_64LE
+            if (bits < 15) {
+                hold += (unsigned long)(*in++) << bits;
+                bits += 8;
+                hold += (unsigned long)(*in++) << bits;
+                bits += 8;
+            }
+#endif
+            here = dcode + (hold & dmask);
+          dodist:
+            op = (unsigned)(here->bits);
+            hold >>= op;
+            bits -= op;
+            op = (unsigned)(here->op);
+            if (op & 16) {                      /* distance base */
+                dist = (unsigned)(here->val);
+                op &= 15;                       /* number of extra bits */
+                /* we have two fast-path loads: 10+10 + 15+5 + 15 = 55,
+                   but we may need to refill here in the worst case */
+                if (bits < op) {
+#ifdef INFLATE_CHUNK_READ_64LE
+                    REFILL();
+#else
+                    hold += (unsigned long)(*in++) << bits;
+                    bits += 8;
+                    if (bits < op) {
+                        hold += (unsigned long)(*in++) << bits;
+                        bits += 8;
+                    }
+#endif
+                }
+                dist += (unsigned)hold & ((1U << op) - 1);
+#ifdef INFLATE_STRICT
+                if (dist > dmax) {
+                    strm->msg = (char *)"invalid distance too far back";
+                    state->mode = BAD;
+                    break;
+                }
+#endif
+                hold >>= op;
+                bits -= op;
+                Tracevv((stderr, "inflate:         distance %u\n", dist));
+                op = (unsigned)(out - beg);     /* max distance in output */
+                if (dist > op) {                /* see if copy from window */
+                    op = dist - op;             /* distance back in window */
+                    if (op > whave) {
+                        if (state->sane) {
+                            strm->msg =
+                                (char *)"invalid distance too far back";
+                            state->mode = BAD;
+                            break;
+                        }
+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+                        if (len <= op - whave) {
+                            do {
+                                *out++ = 0;
+                            } while (--len);
+                            continue;
+                        }
+                        len -= op - whave;
+                        do {
+                            *out++ = 0;
+                        } while (--op > whave);
+                        if (op == 0) {
+                            from = out - dist;
+                            do {
+                                *out++ = *from++;
+                            } while (--len);
+                            continue;
+                        }
+#endif
+                    }
+                    from = window;
+                    if (wnext >= op) {          /* contiguous in window */
+                        from += wnext - op;
+                    }
+                    else {                      /* wrap around window */
+                        op -= wnext;
+                        from += wsize - op;
+                        if (op < len) {         /* some from end of window */
+                            len -= op;
+                            out = chunkcopy_safe(out, from, op, limit);
+                            from = window;      /* more from start of window */
+                            op = wnext;
+                            /* This (rare) case can create a situation where
+                               the first chunkcopy below must be checked.
+                             */
+                        }
+                    }
+                    if (op < len) {             /* still need some from output */
+                        out = chunkcopy_safe(out, from, op, limit);
+                        len -= op;
+                        /* When dist is small the amount of data that can be
+                           copied from the window is also small, and progress
+                           towards the dangerous end of the output buffer is
+                           also small.  This means that for trivial memsets and
+                           for chunkunroll_relaxed() a safety check is
+                           unnecessary.  However, these conditions may not be
+                           entered at all, and in that case it's possible that
+                           the main copy is near the end.
+                          */
+                        out = chunkunroll_relaxed(out, &dist, &len);
+                        out = chunkcopy_safe_ugly(out, dist, len, limit);
+                    } else {
+                        /* from points to window, so there is no risk of
+                           overlapping pointers requiring memset-like behaviour
+                         */
+                        out = chunkcopy_safe(out, from, len, limit);
+                    }
+                }
+                else {
+                    /* Whole reference is in range of current output.  No
+                       range checks are necessary because we start with room
+                       for at least 258 bytes of output, so unroll and roundoff
+                       operations can write beyond `out+len` so long as they
+                       stay within 258 bytes of `out`.
+                     */
+                    out = chunkcopy_lapped_relaxed(out, dist, len);
+                }
+            }
+            else if ((op & 64) == 0) {          /* 2nd level distance code */
+                here = dcode + here->val + (hold & ((1U << op) - 1));
+                goto dodist;
+            }
+            else {
+                strm->msg = (char *)"invalid distance code";
+                state->mode = BAD;
+                break;
+            }
+        }
+        else if ((op & 64) == 0) {              /* 2nd level length code */
+            here = lcode + here->val + (hold & ((1U << op) - 1));
+            goto dolen;
+        }
+        else if (op & 32) {                     /* end-of-block */
+            Tracevv((stderr, "inflate:         end of block\n"));
+            state->mode = TYPE;
+            break;
+        }
+        else {
+            strm->msg = (char *)"invalid literal/length code";
+            state->mode = BAD;
+            break;
+        }
+    } while (in < last && out < end);
+
+    /* return unused bytes (on entry, bits < 8, so in won't go too far back) */
+    len = bits >> 3;
+    in -= len;
+    bits -= len << 3;
+    hold &= (1U << bits) - 1;
+
+    /* update state and return */
+    strm->next_in = in;
+    strm->next_out = out;
+    strm->avail_in = (unsigned)(in < last ?
+        (INFLATE_FAST_MIN_INPUT - 1) + (last - in) :
+        (INFLATE_FAST_MIN_INPUT - 1) - (in - last));
+    strm->avail_out = (unsigned)(out < end ?
+        (INFLATE_FAST_MIN_OUTPUT - 1) + (end - out) :
+        (INFLATE_FAST_MIN_OUTPUT - 1) - (out - end));
+    state->hold = hold;
+    state->bits = bits;
+
+    Assert((state->hold >> state->bits) == 0, "invalid input data state");
+}
+
+/*
+   inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe):
+   - Using bit fields for code structure
+   - Different op definition to avoid & for extra bits (do & for table bits)
+   - Three separate decoding do-loops for direct, window, and wnext == 0
+   - Special case for distance > 1 copies to do overlapped load and store copy
+   - Explicit branch predictions (based on measured branch probabilities)
+   - Deferring match copy and interspersed it with decoding subsequent codes
+   - Swapping literal/length else
+   - Swapping window/direct else
+   - Larger unrolled copy loops (three is about right)
+   - Moving len -= 3 statement into middle of loop
+ */
+
+#endif /* !ASMINF */
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/optimizations/inffast_chunk.h b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/optimizations/inffast_chunk.h
new file mode 100644
index 0000000000..e75ee5e915
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/optimizations/inffast_chunk.h
@@ -0,0 +1,42 @@
+/* inffast_chunk.h -- header to use inffast_chunk.c
+ * Copyright (C) 1995-2003, 2010 Mark Adler
+ * Copyright (C) 2017 ARM, Inc.
+ * Copyright 2023 The Chromium Authors
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+#include "inffast.h"
+
+/* INFLATE_FAST_MIN_INPUT:
+   The minimum number of input bytes needed so that we can safely call
+   inflate_fast() with only one up-front bounds check. One
+   length/distance code pair (15 bits for the length code, 5 bits for length
+   extra, 15 bits for the distance code, 13 bits for distance extra) requires
+   reading up to 48 input bits. Additionally, in the same iteraction, we may
+   decode two literals from the root-table (requiring MIN_OUTPUT = 258 + 2).
+
+   Each root-table entry is up to 10 bits, for a total of 68 input bits each
+   iteraction.
+
+   The refill variant reads 8 bytes from the buffer at a time, and advances
+   the input pointer by up to 7 bytes, ensuring there are at least 56-bits
+   available in the bit-buffer. The technique was documented by Fabian Giesen
+   on his blog as variant 4 in the article 'Reading bits in far too many ways':
+   https://fgiesen.wordpress.com/2018/02/20/
+
+   In the worst case, we may refill twice in the same iteraction, requiring
+   MIN_INPUT = 8 + 7.
+*/
+#ifdef INFLATE_CHUNK_READ_64LE
+#undef INFLATE_FAST_MIN_INPUT
+#define INFLATE_FAST_MIN_INPUT 15
+#undef INFLATE_FAST_MIN_OUTPUT
+#define INFLATE_FAST_MIN_OUTPUT 260
+#endif
+
+void ZLIB_INTERNAL inflate_fast_chunk_(z_streamp strm, unsigned start);
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/optimizations/inflate.c b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/optimizations/inflate.c
new file mode 100644
index 0000000000..2a8e0ef76d
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/optimizations/inflate.c
@@ -0,0 +1,1562 @@
+/* inflate.c -- zlib decompression
+ * Copyright (C) 1995-2022 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+ * Change history:
+ *
+ * 1.2.beta0    24 Nov 2002
+ * - First version -- complete rewrite of inflate to simplify code, avoid
+ *   creation of window when not needed, minimize use of window when it is
+ *   needed, make inffast.c even faster, implement gzip decoding, and to
+ *   improve code readability and style over the previous zlib inflate code
+ *
+ * 1.2.beta1    25 Nov 2002
+ * - Use pointers for available input and output checking in inffast.c
+ * - Remove input and output counters in inffast.c
+ * - Change inffast.c entry and loop from avail_in >= 7 to >= 6
+ * - Remove unnecessary second byte pull from length extra in inffast.c
+ * - Unroll direct copy to three copies per loop in inffast.c
+ *
+ * 1.2.beta2    4 Dec 2002
+ * - Change external routine names to reduce potential conflicts
+ * - Correct filename to inffixed.h for fixed tables in inflate.c
+ * - Make hbuf[] unsigned char to match parameter type in inflate.c
+ * - Change strm->next_out[-state->offset] to *(strm->next_out - state->offset)
+ *   to avoid negation problem on Alphas (64 bit) in inflate.c
+ *
+ * 1.2.beta3    22 Dec 2002
+ * - Add comments on state->bits assertion in inffast.c
+ * - Add comments on op field in inftrees.h
+ * - Fix bug in reuse of allocated window after inflateReset()
+ * - Remove bit fields--back to byte structure for speed
+ * - Remove distance extra == 0 check in inflate_fast()--only helps for lengths
+ * - Change post-increments to pre-increments in inflate_fast(), PPC biased?
+ * - Add compile time option, POSTINC, to use post-increments instead (Intel?)
+ * - Make MATCH copy in inflate() much faster for when inflate_fast() not used
+ * - Use local copies of stream next and avail values, as well as local bit
+ *   buffer and bit count in inflate()--for speed when inflate_fast() not used
+ *
+ * 1.2.beta4    1 Jan 2003
+ * - Split ptr - 257 statements in inflate_table() to avoid compiler warnings
+ * - Move a comment on output buffer sizes from inffast.c to inflate.c
+ * - Add comments in inffast.c to introduce the inflate_fast() routine
+ * - Rearrange window copies in inflate_fast() for speed and simplification
+ * - Unroll last copy for window match in inflate_fast()
+ * - Use local copies of window variables in inflate_fast() for speed
+ * - Pull out common wnext == 0 case for speed in inflate_fast()
+ * - Make op and len in inflate_fast() unsigned for consistency
+ * - Add FAR to lcode and dcode declarations in inflate_fast()
+ * - Simplified bad distance check in inflate_fast()
+ * - Added inflateBackInit(), inflateBack(), and inflateBackEnd() in new
+ *   source file infback.c to provide a call-back interface to inflate for
+ *   programs like gzip and unzip -- uses window as output buffer to avoid
+ *   window copying
+ *
+ * 1.2.beta5    1 Jan 2003
+ * - Improved inflateBack() interface to allow the caller to provide initial
+ *   input in strm.
+ * - Fixed stored blocks bug in inflateBack()
+ *
+ * 1.2.beta6    4 Jan 2003
+ * - Added comments in inffast.c on effectiveness of POSTINC
+ * - Typecasting all around to reduce compiler warnings
+ * - Changed loops from while (1) or do {} while (1) to for (;;), again to
+ *   make compilers happy
+ * - Changed type of window in inflateBackInit() to unsigned char *
+ *
+ * 1.2.beta7    27 Jan 2003
+ * - Changed many types to unsigned or unsigned short to avoid warnings
+ * - Added inflateCopy() function
+ *
+ * 1.2.0        9 Mar 2003
+ * - Changed inflateBack() interface to provide separate opaque descriptors
+ *   for the in() and out() functions
+ * - Changed inflateBack() argument and in_func typedef to swap the length
+ *   and buffer address return values for the input function
+ * - Check next_in and next_out for Z_NULL on entry to inflate()
+ *
+ * The history for versions after 1.2.0 are in ChangeLog in zlib distribution.
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+#include "inflate.h"
+#include "contrib/optimizations/inffast_chunk.h"
+#include "contrib/optimizations/chunkcopy.h"
+
+#ifdef MAKEFIXED
+#  ifndef BUILDFIXED
+#    define BUILDFIXED
+#  endif
+#endif
+
+local int inflateStateCheck(z_streamp strm) {
+    struct inflate_state FAR *state;
+    if (strm == Z_NULL ||
+        strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0)
+        return 1;
+    state = (struct inflate_state FAR *)strm->state;
+    if (state == Z_NULL || state->strm != strm ||
+        state->mode < HEAD || state->mode > SYNC)
+        return 1;
+    return 0;
+}
+
+int ZEXPORT inflateResetKeep(z_streamp strm) {
+    struct inflate_state FAR *state;
+
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    strm->total_in = strm->total_out = state->total = 0;
+    strm->msg = Z_NULL;
+    if (state->wrap)        /* to support ill-conceived Java test suite */
+        strm->adler = state->wrap & 1;
+    state->mode = HEAD;
+    state->last = 0;
+    state->havedict = 0;
+    state->flags = -1;
+    state->dmax = 32768U;
+    state->head = Z_NULL;
+    state->hold = 0;
+    state->bits = 0;
+    state->lencode = state->distcode = state->next = state->codes;
+    state->sane = 1;
+    state->back = -1;
+    Tracev((stderr, "inflate: reset\n"));
+    return Z_OK;
+}
+
+int ZEXPORT inflateReset(z_streamp strm) {
+    struct inflate_state FAR *state;
+
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    state->wsize = 0;
+    state->whave = 0;
+    state->wnext = 0;
+    return inflateResetKeep(strm);
+}
+
+int ZEXPORT inflateReset2(z_streamp strm, int windowBits) {
+    int wrap;
+    struct inflate_state FAR *state;
+
+    /* get the state */
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+
+    /* extract wrap request from windowBits parameter */
+    if (windowBits < 0) {
+        if (windowBits < -15)
+            return Z_STREAM_ERROR;
+        wrap = 0;
+        windowBits = -windowBits;
+    }
+    else {
+        wrap = (windowBits >> 4) + 5;
+#ifdef GUNZIP
+        if (windowBits < 48)
+            windowBits &= 15;
+#endif
+    }
+
+    /* set number of window bits, free window if different */
+    if (windowBits && (windowBits < 8 || windowBits > 15))
+        return Z_STREAM_ERROR;
+    if (state->window != Z_NULL && state->wbits != (unsigned)windowBits) {
+        ZFREE(strm, state->window);
+        state->window = Z_NULL;
+    }
+
+    /* update state and reset the rest of it */
+    state->wrap = wrap;
+    state->wbits = (unsigned)windowBits;
+    return inflateReset(strm);
+}
+
+int ZEXPORT inflateInit2_(z_streamp strm, int windowBits,
+                          const char *version, int stream_size) {
+    int ret;
+    struct inflate_state FAR *state;
+
+    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
+        stream_size != (int)(sizeof(z_stream)))
+        return Z_VERSION_ERROR;
+    if (strm == Z_NULL) return Z_STREAM_ERROR;
+    strm->msg = Z_NULL;                 /* in case we return an error */
+    if (strm->zalloc == (alloc_func)0) {
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+        strm->zalloc = zcalloc;
+        strm->opaque = (voidpf)0;
+#endif
+    }
+    if (strm->zfree == (free_func)0)
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+        strm->zfree = zcfree;
+#endif
+    state = (struct inflate_state FAR *)
+            ZALLOC(strm, 1, sizeof(struct inflate_state));
+    if (state == Z_NULL) return Z_MEM_ERROR;
+    Tracev((stderr, "inflate: allocated\n"));
+    strm->state = (struct internal_state FAR *)state;
+    state->strm = strm;
+    state->window = Z_NULL;
+    state->mode = HEAD;     /* to pass state test in inflateReset2() */
+    state->check = 1L;      /* 1L is the result of adler32() zero length data */
+    ret = inflateReset2(strm, windowBits);
+    if (ret != Z_OK) {
+        ZFREE(strm, state);
+        strm->state = Z_NULL;
+    }
+    return ret;
+}
+
+int ZEXPORT inflateInit_(z_streamp strm, const char *version,
+                         int stream_size) {
+    return inflateInit2_(strm, DEF_WBITS, version, stream_size);
+}
+
+int ZEXPORT inflatePrime(z_streamp strm, int bits, int value) {
+    struct inflate_state FAR *state;
+
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    if (bits == 0)
+        return Z_OK;
+    state = (struct inflate_state FAR *)strm->state;
+    if (bits < 0) {
+        state->hold = 0;
+        state->bits = 0;
+        return Z_OK;
+    }
+    if (bits > 16 || state->bits + (uInt)bits > 32) return Z_STREAM_ERROR;
+    value &= (1L << bits) - 1;
+    state->hold += (unsigned)value << state->bits;
+    state->bits += (uInt)bits;
+    return Z_OK;
+}
+
+/*
+   Return state with length and distance decoding tables and index sizes set to
+   fixed code decoding.  Normally this returns fixed tables from inffixed.h.
+   If BUILDFIXED is defined, then instead this routine builds the tables the
+   first time it's called, and returns those tables the first time and
+   thereafter.  This reduces the size of the code by about 2K bytes, in
+   exchange for a little execution time.  However, BUILDFIXED should not be
+   used for threaded applications, since the rewriting of the tables and virgin
+   may not be thread-safe.
+ */
+local void fixedtables(struct inflate_state FAR *state) {
+#ifdef BUILDFIXED
+    static int virgin = 1;
+    static code *lenfix, *distfix;
+    static code fixed[544];
+
+    /* build fixed huffman tables if first call (may not be thread safe) */
+    if (virgin) {
+        unsigned sym, bits;
+        static code *next;
+
+        /* literal/length table */
+        sym = 0;
+        while (sym < 144) state->lens[sym++] = 8;
+        while (sym < 256) state->lens[sym++] = 9;
+        while (sym < 280) state->lens[sym++] = 7;
+        while (sym < 288) state->lens[sym++] = 8;
+        next = fixed;
+        lenfix = next;
+        bits = 9;
+        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
+
+        /* distance table */
+        sym = 0;
+        while (sym < 32) state->lens[sym++] = 5;
+        distfix = next;
+        bits = 5;
+        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
+
+        /* do this just once */
+        virgin = 0;
+    }
+#else /* !BUILDFIXED */
+#   include "inffixed.h"
+#endif /* BUILDFIXED */
+    state->lencode = lenfix;
+    state->lenbits = 9;
+    state->distcode = distfix;
+    state->distbits = 5;
+}
+
+#ifdef MAKEFIXED
+#include <stdio.h>
+
+/*
+   Write out the inffixed.h that is #include'd above.  Defining MAKEFIXED also
+   defines BUILDFIXED, so the tables are built on the fly.  makefixed() writes
+   those tables to stdout, which would be piped to inffixed.h.  A small program
+   can simply call makefixed to do this:
+
+    void makefixed(void);
+
+    int main(void)
+    {
+        makefixed();
+        return 0;
+    }
+
+   Then that can be linked with zlib built with MAKEFIXED defined and run:
+
+    a.out > inffixed.h
+ */
+void makefixed(void)
+{
+    unsigned low, size;
+    struct inflate_state state;
+
+    fixedtables(&state);
+    puts("    /* inffixed.h -- table for decoding fixed codes");
+    puts("     * Generated automatically by makefixed().");
+    puts("     */");
+    puts("");
+    puts("    /* WARNING: this file should *not* be used by applications.");
+    puts("       It is part of the implementation of this library and is");
+    puts("       subject to change. Applications should only use zlib.h.");
+    puts("     */");
+    puts("");
+    size = 1U << 9;
+    printf("    static const code lenfix[%u] = {", size);
+    low = 0;
+    for (;;) {
+        if ((low % 7) == 0) printf("\n        ");
+        printf("{%u,%u,%d}", (low & 127) == 99 ? 64 : state.lencode[low].op,
+               state.lencode[low].bits, state.lencode[low].val);
+        if (++low == size) break;
+        putchar(',');
+    }
+    puts("\n    };");
+    size = 1U << 5;
+    printf("\n    static const code distfix[%u] = {", size);
+    low = 0;
+    for (;;) {
+        if ((low % 6) == 0) printf("\n        ");
+        printf("{%u,%u,%d}", state.distcode[low].op, state.distcode[low].bits,
+               state.distcode[low].val);
+        if (++low == size) break;
+        putchar(',');
+    }
+    puts("\n    };");
+}
+#endif /* MAKEFIXED */
+
+/*
+   Update the window with the last wsize (normally 32K) bytes written before
+   returning.  If window does not exist yet, create it.  This is only called
+   when a window is already in use, or when output has been written during this
+   inflate call, but the end of the deflate stream has not been reached yet.
+   It is also called to create a window for dictionary data when a dictionary
+   is loaded.
+
+   Providing output buffers larger than 32K to inflate() should provide a speed
+   advantage, since only the last 32K of output is copied to the sliding window
+   upon return from inflate(), and since all distances after the first 32K of
+   output will fall in the output data, making match copies simpler and faster.
+   The advantage may be dependent on the size of the processor's data caches.
+ */
+local int updatewindow(z_streamp strm, const Bytef *end, unsigned copy) {
+    struct inflate_state FAR *state;
+    unsigned dist;
+
+    state = (struct inflate_state FAR *)strm->state;
+
+    /* if it hasn't been done already, allocate space for the window */
+    if (state->window == Z_NULL) {
+        unsigned wsize = 1U << state->wbits;
+        state->window = (unsigned char FAR *)
+                        ZALLOC(strm, wsize + CHUNKCOPY_CHUNK_SIZE,
+                               sizeof(unsigned char));
+        if (state->window == Z_NULL) return 1;
+#ifdef INFLATE_CLEAR_UNUSED_UNDEFINED
+        /* Copies from the overflow portion of this buffer are undefined and
+           may cause analysis tools to raise a warning if we don't initialize
+           it.  However, this undefined data overwrites other undefined data
+           and is subsequently either overwritten or left deliberately
+           undefined at the end of decode; so there's really no point.
+         */
+        zmemzero(state->window + wsize, CHUNKCOPY_CHUNK_SIZE);
+#endif
+    }
+
+    /* if window not in use yet, initialize */
+    if (state->wsize == 0) {
+        state->wsize = 1U << state->wbits;
+        state->wnext = 0;
+        state->whave = 0;
+    }
+
+    /* copy state->wsize or less output bytes into the circular window */
+    if (copy >= state->wsize) {
+        zmemcpy(state->window, end - state->wsize, state->wsize);
+        state->wnext = 0;
+        state->whave = state->wsize;
+    }
+    else {
+        dist = state->wsize - state->wnext;
+        if (dist > copy) dist = copy;
+        zmemcpy(state->window + state->wnext, end - copy, dist);
+        copy -= dist;
+        if (copy) {
+            zmemcpy(state->window, end - copy, copy);
+            state->wnext = copy;
+            state->whave = state->wsize;
+        }
+        else {
+            state->wnext += dist;
+            if (state->wnext == state->wsize) state->wnext = 0;
+            if (state->whave < state->wsize) state->whave += dist;
+        }
+    }
+    return 0;
+}
+
+/* Macros for inflate(): */
+
+/* check function to use adler32() for zlib or crc32() for gzip */
+#ifdef GUNZIP
+#  define UPDATE_CHECK(check, buf, len) \
+    (state->flags ? crc32(check, buf, len) : adler32(check, buf, len))
+#else
+#  define UPDATE_CHECK(check, buf, len) adler32(check, buf, len)
+#endif
+
+/* check macros for header crc */
+#ifdef GUNZIP
+#  define CRC2(check, word) \
+    do { \
+        hbuf[0] = (unsigned char)(word); \
+        hbuf[1] = (unsigned char)((word) >> 8); \
+        check = crc32(check, hbuf, 2); \
+    } while (0)
+
+#  define CRC4(check, word) \
+    do { \
+        hbuf[0] = (unsigned char)(word); \
+        hbuf[1] = (unsigned char)((word) >> 8); \
+        hbuf[2] = (unsigned char)((word) >> 16); \
+        hbuf[3] = (unsigned char)((word) >> 24); \
+        check = crc32(check, hbuf, 4); \
+    } while (0)
+#endif
+
+/* Load registers with state in inflate() for speed */
+#define LOAD() \
+    do { \
+        put = strm->next_out; \
+        left = strm->avail_out; \
+        next = strm->next_in; \
+        have = strm->avail_in; \
+        hold = state->hold; \
+        bits = state->bits; \
+    } while (0)
+
+/* Restore state from registers in inflate() */
+#define RESTORE() \
+    do { \
+        strm->next_out = put; \
+        strm->avail_out = left; \
+        strm->next_in = next; \
+        strm->avail_in = have; \
+        state->hold = hold; \
+        state->bits = bits; \
+    } while (0)
+
+/* Clear the input bit accumulator */
+#define INITBITS() \
+    do { \
+        hold = 0; \
+        bits = 0; \
+    } while (0)
+
+/* Get a byte of input into the bit accumulator, or return from inflate()
+   if there is no input available. */
+#define PULLBYTE() \
+    do { \
+        if (have == 0) goto inf_leave; \
+        have--; \
+        hold += (unsigned long)(*next++) << bits; \
+        bits += 8; \
+    } while (0)
+
+/* Assure that there are at least n bits in the bit accumulator.  If there is
+   not enough available input to do that, then return from inflate(). */
+#define NEEDBITS(n) \
+    do { \
+        while (bits < (unsigned)(n)) \
+            PULLBYTE(); \
+    } while (0)
+
+/* Return the low n bits of the bit accumulator (n < 16) */
+#define BITS(n) \
+    ((unsigned)hold & ((1U << (n)) - 1))
+
+/* Remove n bits from the bit accumulator */
+#define DROPBITS(n) \
+    do { \
+        hold >>= (n); \
+        bits -= (unsigned)(n); \
+    } while (0)
+
+/* Remove zero to seven bits as needed to go to a byte boundary */
+#define BYTEBITS() \
+    do { \
+        hold >>= bits & 7; \
+        bits -= bits & 7; \
+    } while (0)
+
+/*
+   inflate() uses a state machine to process as much input data and generate as
+   much output data as possible before returning.  The state machine is
+   structured roughly as follows:
+
+    for (;;) switch (state) {
+    ...
+    case STATEn:
+        if (not enough input data or output space to make progress)
+            return;
+        ... make progress ...
+        state = STATEm;
+        break;
+    ...
+    }
+
+   so when inflate() is called again, the same case is attempted again, and
+   if the appropriate resources are provided, the machine proceeds to the
+   next state.  The NEEDBITS() macro is usually the way the state evaluates
+   whether it can proceed or should return.  NEEDBITS() does the return if
+   the requested bits are not available.  The typical use of the BITS macros
+   is:
+
+        NEEDBITS(n);
+        ... do something with BITS(n) ...
+        DROPBITS(n);
+
+   where NEEDBITS(n) either returns from inflate() if there isn't enough
+   input left to load n bits into the accumulator, or it continues.  BITS(n)
+   gives the low n bits in the accumulator.  When done, DROPBITS(n) drops
+   the low n bits off the accumulator.  INITBITS() clears the accumulator
+   and sets the number of available bits to zero.  BYTEBITS() discards just
+   enough bits to put the accumulator on a byte boundary.  After BYTEBITS()
+   and a NEEDBITS(8), then BITS(8) would return the next byte in the stream.
+
+   NEEDBITS(n) uses PULLBYTE() to get an available byte of input, or to return
+   if there is no input available.  The decoding of variable length codes uses
+   PULLBYTE() directly in order to pull just enough bytes to decode the next
+   code, and no more.
+
+   Some states loop until they get enough input, making sure that enough
+   state information is maintained to continue the loop where it left off
+   if NEEDBITS() returns in the loop.  For example, want, need, and keep
+   would all have to actually be part of the saved state in case NEEDBITS()
+   returns:
+
+    case STATEw:
+        while (want < need) {
+            NEEDBITS(n);
+            keep[want++] = BITS(n);
+            DROPBITS(n);
+        }
+        state = STATEx;
+    case STATEx:
+
+   As shown above, if the next state is also the next case, then the break
+   is omitted.
+
+   A state may also return if there is not enough output space available to
+   complete that state.  Those states are copying stored data, writing a
+   literal byte, and copying a matching string.
+
+   When returning, a "goto inf_leave" is used to update the total counters,
+   update the check value, and determine whether any progress has been made
+   during that inflate() call in order to return the proper return code.
+   Progress is defined as a change in either strm->avail_in or strm->avail_out.
+   When there is a window, goto inf_leave will update the window with the last
+   output written.  If a goto inf_leave occurs in the middle of decompression
+   and there is no window currently, goto inf_leave will create one and copy
+   output to the window for the next call of inflate().
+
+   In this implementation, the flush parameter of inflate() only affects the
+   return code (per zlib.h).  inflate() always writes as much as possible to
+   strm->next_out, given the space available and the provided input--the effect
+   documented in zlib.h of Z_SYNC_FLUSH.  Furthermore, inflate() always defers
+   the allocation of and copying into a sliding window until necessary, which
+   provides the effect documented in zlib.h for Z_FINISH when the entire input
+   stream available.  So the only thing the flush parameter actually does is:
+   when flush is set to Z_FINISH, inflate() cannot return Z_OK.  Instead it
+   will return Z_BUF_ERROR if it has not reached the end of the stream.
+ */
+
+int ZEXPORT inflate(z_streamp strm, int flush) {
+    struct inflate_state FAR *state;
+    z_const unsigned char FAR *next;    /* next input */
+    unsigned char FAR *put;     /* next output */
+    unsigned have, left;        /* available input and output */
+    unsigned long hold;         /* bit buffer */
+    unsigned bits;              /* bits in bit buffer */
+    unsigned in, out;           /* save starting available input and output */
+    unsigned copy;              /* number of stored or match bytes to copy */
+    unsigned char FAR *from;    /* where to copy match bytes from */
+    code here;                  /* current decoding table entry */
+    code last;                  /* parent table entry */
+    unsigned len;               /* length to copy for repeats, bits to drop */
+    int ret;                    /* return code */
+#ifdef GUNZIP
+    unsigned char hbuf[4];      /* buffer for gzip header crc calculation */
+#endif
+    static const unsigned short order[19] = /* permutation of code lengths */
+        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
+
+    if (inflateStateCheck(strm) || strm->next_out == Z_NULL ||
+        (strm->next_in == Z_NULL && strm->avail_in != 0))
+        return Z_STREAM_ERROR;
+
+    state = (struct inflate_state FAR *)strm->state;
+    if (state->mode == TYPE) state->mode = TYPEDO;      /* skip check */
+    LOAD();
+    in = have;
+    out = left;
+    ret = Z_OK;
+    for (;;)
+        switch (state->mode) {
+        case HEAD:
+            if (state->wrap == 0) {
+                state->mode = TYPEDO;
+                break;
+            }
+            NEEDBITS(16);
+#ifdef GUNZIP
+            if ((state->wrap & 2) && hold == 0x8b1f) {  /* gzip header */
+                if (state->wbits == 0)
+                    state->wbits = 15;
+                state->check = crc32(0L, Z_NULL, 0);
+                CRC2(state->check, hold);
+                INITBITS();
+                state->mode = FLAGS;
+                break;
+            }
+            if (state->head != Z_NULL)
+                state->head->done = -1;
+            if (!(state->wrap & 1) ||   /* check if zlib header allowed */
+#else
+            if (
+#endif
+                ((BITS(8) << 8) + (hold >> 8)) % 31) {
+                strm->msg = (char *)"incorrect header check";
+                state->mode = BAD;
+                break;
+            }
+            if (BITS(4) != Z_DEFLATED) {
+                strm->msg = (char *)"unknown compression method";
+                state->mode = BAD;
+                break;
+            }
+            DROPBITS(4);
+            len = BITS(4) + 8;
+            if (state->wbits == 0)
+                state->wbits = len;
+            if (len > 15 || len > state->wbits) {
+                strm->msg = (char *)"invalid window size";
+                state->mode = BAD;
+                break;
+            }
+            state->dmax = 1U << len;
+            state->flags = 0;               /* indicate zlib header */
+            Tracev((stderr, "inflate:   zlib header ok\n"));
+            strm->adler = state->check = adler32(0L, Z_NULL, 0);
+            state->mode = hold & 0x200 ? DICTID : TYPE;
+            INITBITS();
+            break;
+#ifdef GUNZIP
+        case FLAGS:
+            NEEDBITS(16);
+            state->flags = (int)(hold);
+            if ((state->flags & 0xff) != Z_DEFLATED) {
+                strm->msg = (char *)"unknown compression method";
+                state->mode = BAD;
+                break;
+            }
+            if (state->flags & 0xe000) {
+                strm->msg = (char *)"unknown header flags set";
+                state->mode = BAD;
+                break;
+            }
+            if (state->head != Z_NULL)
+                state->head->text = (int)((hold >> 8) & 1);
+            if ((state->flags & 0x0200) && (state->wrap & 4))
+                CRC2(state->check, hold);
+            INITBITS();
+            state->mode = TIME;
+                /* fallthrough */
+        case TIME:
+            NEEDBITS(32);
+            if (state->head != Z_NULL)
+                state->head->time = hold;
+            if ((state->flags & 0x0200) && (state->wrap & 4))
+                CRC4(state->check, hold);
+            INITBITS();
+            state->mode = OS;
+                /* fallthrough */
+        case OS:
+            NEEDBITS(16);
+            if (state->head != Z_NULL) {
+                state->head->xflags = (int)(hold & 0xff);
+                state->head->os = (int)(hold >> 8);
+            }
+            if ((state->flags & 0x0200) && (state->wrap & 4))
+                CRC2(state->check, hold);
+            INITBITS();
+            state->mode = EXLEN;
+                /* fallthrough */
+        case EXLEN:
+            if (state->flags & 0x0400) {
+                NEEDBITS(16);
+                state->length = (unsigned)(hold);
+                if (state->head != Z_NULL)
+                    state->head->extra_len = (unsigned)hold;
+                if ((state->flags & 0x0200) && (state->wrap & 4))
+                    CRC2(state->check, hold);
+                INITBITS();
+            }
+            else if (state->head != Z_NULL)
+                state->head->extra = Z_NULL;
+            state->mode = EXTRA;
+                /* fallthrough */
+        case EXTRA:
+            if (state->flags & 0x0400) {
+                copy = state->length;
+                if (copy > have) copy = have;
+                if (copy) {
+                    if (state->head != Z_NULL &&
+                        state->head->extra != Z_NULL &&
+                        (len = state->head->extra_len - state->length) <
+                            state->head->extra_max) {
+                        zmemcpy(state->head->extra + len, next,
+                                len + copy > state->head->extra_max ?
+                                state->head->extra_max - len : copy);
+                    }
+                    if ((state->flags & 0x0200) && (state->wrap & 4))
+                        state->check = crc32(state->check, next, copy);
+                    have -= copy;
+                    next += copy;
+                    state->length -= copy;
+                }
+                if (state->length) goto inf_leave;
+            }
+            state->length = 0;
+            state->mode = NAME;
+                /* fallthrough */
+        case NAME:
+            if (state->flags & 0x0800) {
+                if (have == 0) goto inf_leave;
+                copy = 0;
+                do {
+                    len = (unsigned)(next[copy++]);
+                    if (state->head != Z_NULL &&
+                            state->head->name != Z_NULL &&
+                            state->length < state->head->name_max)
+                        state->head->name[state->length++] = (Bytef)len;
+                } while (len && copy < have);
+                if ((state->flags & 0x0200) && (state->wrap & 4))
+                    state->check = crc32(state->check, next, copy);
+                have -= copy;
+                next += copy;
+                if (len) goto inf_leave;
+            }
+            else if (state->head != Z_NULL)
+                state->head->name = Z_NULL;
+            state->length = 0;
+            state->mode = COMMENT;
+                /* fallthrough */
+        case COMMENT:
+            if (state->flags & 0x1000) {
+                if (have == 0) goto inf_leave;
+                copy = 0;
+                do {
+                    len = (unsigned)(next[copy++]);
+                    if (state->head != Z_NULL &&
+                            state->head->comment != Z_NULL &&
+                            state->length < state->head->comm_max)
+                        state->head->comment[state->length++] = (Bytef)len;
+                } while (len && copy < have);
+                if ((state->flags & 0x0200) && (state->wrap & 4))
+                    state->check = crc32(state->check, next, copy);
+                have -= copy;
+                next += copy;
+                if (len) goto inf_leave;
+            }
+            else if (state->head != Z_NULL)
+                state->head->comment = Z_NULL;
+            state->mode = HCRC;
+                /* fallthrough */
+        case HCRC:
+            if (state->flags & 0x0200) {
+                NEEDBITS(16);
+                if ((state->wrap & 4) && hold != (state->check & 0xffff)) {
+                    strm->msg = (char *)"header crc mismatch";
+                    state->mode = BAD;
+                    break;
+                }
+                INITBITS();
+            }
+            if (state->head != Z_NULL) {
+                state->head->hcrc = (int)((state->flags >> 9) & 1);
+                state->head->done = 1;
+            }
+            strm->adler = state->check = crc32(0L, Z_NULL, 0);
+            state->mode = TYPE;
+            break;
+#endif
+        case DICTID:
+            NEEDBITS(32);
+            strm->adler = state->check = ZSWAP32(hold);
+            INITBITS();
+            state->mode = DICT;
+                /* fallthrough */
+        case DICT:
+            if (state->havedict == 0) {
+                RESTORE();
+                return Z_NEED_DICT;
+            }
+            strm->adler = state->check = adler32(0L, Z_NULL, 0);
+            state->mode = TYPE;
+                /* fallthrough */
+        case TYPE:
+            if (flush == Z_BLOCK || flush == Z_TREES) goto inf_leave;
+                /* fallthrough */
+        case TYPEDO:
+            if (state->last) {
+                BYTEBITS();
+                state->mode = CHECK;
+                break;
+            }
+            NEEDBITS(3);
+            state->last = BITS(1);
+            DROPBITS(1);
+            switch (BITS(2)) {
+            case 0:                             /* stored block */
+                Tracev((stderr, "inflate:     stored block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = STORED;
+                break;
+            case 1:                             /* fixed block */
+                fixedtables(state);
+                Tracev((stderr, "inflate:     fixed codes block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = LEN_;             /* decode codes */
+                if (flush == Z_TREES) {
+                    DROPBITS(2);
+                    goto inf_leave;
+                }
+                break;
+            case 2:                             /* dynamic block */
+                Tracev((stderr, "inflate:     dynamic codes block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = TABLE;
+                break;
+            case 3:
+                strm->msg = (char *)"invalid block type";
+                state->mode = BAD;
+            }
+            DROPBITS(2);
+            break;
+        case STORED:
+            BYTEBITS();                         /* go to byte boundary */
+            NEEDBITS(32);
+            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
+                strm->msg = (char *)"invalid stored block lengths";
+                state->mode = BAD;
+                break;
+            }
+            state->length = (unsigned)hold & 0xffff;
+            Tracev((stderr, "inflate:       stored length %u\n",
+                    state->length));
+            INITBITS();
+            state->mode = COPY_;
+            if (flush == Z_TREES) goto inf_leave;
+                /* fallthrough */
+        case COPY_:
+            state->mode = COPY;
+                /* fallthrough */
+        case COPY:
+            copy = state->length;
+            if (copy) {
+                if (copy > have) copy = have;
+                if (copy > left) copy = left;
+                if (copy == 0) goto inf_leave;
+                zmemcpy(put, next, copy);
+                have -= copy;
+                next += copy;
+                left -= copy;
+                put += copy;
+                state->length -= copy;
+                break;
+            }
+            Tracev((stderr, "inflate:       stored end\n"));
+            state->mode = TYPE;
+            break;
+        case TABLE:
+            NEEDBITS(14);
+            state->nlen = BITS(5) + 257;
+            DROPBITS(5);
+            state->ndist = BITS(5) + 1;
+            DROPBITS(5);
+            state->ncode = BITS(4) + 4;
+            DROPBITS(4);
+#ifndef PKZIP_BUG_WORKAROUND
+            if (state->nlen > 286 || state->ndist > 30) {
+                strm->msg = (char *)"too many length or distance symbols";
+                state->mode = BAD;
+                break;
+            }
+#endif
+            Tracev((stderr, "inflate:       table sizes ok\n"));
+            state->have = 0;
+            state->mode = LENLENS;
+                /* fallthrough */
+        case LENLENS:
+            while (state->have < state->ncode) {
+                NEEDBITS(3);
+                state->lens[order[state->have++]] = (unsigned short)BITS(3);
+                DROPBITS(3);
+            }
+            while (state->have < 19)
+                state->lens[order[state->have++]] = 0;
+            state->next = state->codes;
+            state->lencode = (const code FAR *)(state->next);
+            state->lenbits = 7;
+            ret = inflate_table(CODES, state->lens, 19, &(state->next),
+                                &(state->lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid code lengths set";
+                state->mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       code lengths ok\n"));
+            state->have = 0;
+            state->mode = CODELENS;
+                /* fallthrough */
+        case CODELENS:
+            while (state->have < state->nlen + state->ndist) {
+                for (;;) {
+                    here = state->lencode[BITS(state->lenbits)];
+                    if ((unsigned)(here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                if (here.val < 16) {
+                    DROPBITS(here.bits);
+                    state->lens[state->have++] = here.val;
+                }
+                else {
+                    if (here.val == 16) {
+                        NEEDBITS(here.bits + 2);
+                        DROPBITS(here.bits);
+                        if (state->have == 0) {
+                            strm->msg = (char *)"invalid bit length repeat";
+                            state->mode = BAD;
+                            break;
+                        }
+                        len = state->lens[state->have - 1];
+                        copy = 3 + BITS(2);
+                        DROPBITS(2);
+                    }
+                    else if (here.val == 17) {
+                        NEEDBITS(here.bits + 3);
+                        DROPBITS(here.bits);
+                        len = 0;
+                        copy = 3 + BITS(3);
+                        DROPBITS(3);
+                    }
+                    else {
+                        NEEDBITS(here.bits + 7);
+                        DROPBITS(here.bits);
+                        len = 0;
+                        copy = 11 + BITS(7);
+                        DROPBITS(7);
+                    }
+                    if (state->have + copy > state->nlen + state->ndist) {
+                        strm->msg = (char *)"invalid bit length repeat";
+                        state->mode = BAD;
+                        break;
+                    }
+                    while (copy--)
+                        state->lens[state->have++] = (unsigned short)len;
+                }
+            }
+
+            /* handle error breaks in while */
+            if (state->mode == BAD) break;
+
+            /* check for end-of-block code (better have one) */
+            if (state->lens[256] == 0) {
+                strm->msg = (char *)"invalid code -- missing end-of-block";
+                state->mode = BAD;
+                break;
+            }
+
+            /* build code tables -- note: do not change the lenbits or distbits
+               values here (10 and 9) without reading the comments in inftrees.h
+               concerning the ENOUGH constants, which depend on those values */
+            state->next = state->codes;
+            state->lencode = (const code FAR *)(state->next);
+            state->lenbits = 10;
+            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
+                                &(state->lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid literal/lengths set";
+                state->mode = BAD;
+                break;
+            }
+            state->distcode = (const code FAR *)(state->next);
+            state->distbits = 9;
+            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
+                            &(state->next), &(state->distbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid distances set";
+                state->mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       codes ok\n"));
+            state->mode = LEN_;
+            if (flush == Z_TREES) goto inf_leave;
+                /* fallthrough */
+        case LEN_:
+            state->mode = LEN;
+                /* fallthrough */
+        case LEN:
+            if (have >= INFLATE_FAST_MIN_INPUT &&
+                left >= INFLATE_FAST_MIN_OUTPUT) {
+                RESTORE();
+                inflate_fast_chunk_(strm, out);
+                LOAD();
+                if (state->mode == TYPE)
+                    state->back = -1;
+                break;
+            }
+            state->back = 0;
+            for (;;) {
+                here = state->lencode[BITS(state->lenbits)];
+                if ((unsigned)(here.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if (here.op && (here.op & 0xf0) == 0) {
+                last = here;
+                for (;;) {
+                    here = state->lencode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+                state->back += last.bits;
+            }
+            DROPBITS(here.bits);
+            state->back += here.bits;
+            state->length = (unsigned)here.val;
+            if ((int)(here.op) == 0) {
+                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
+                        "inflate:         literal '%c'\n" :
+                        "inflate:         literal 0x%02x\n", here.val));
+                state->mode = LIT;
+                break;
+            }
+            if (here.op & 32) {
+                Tracevv((stderr, "inflate:         end of block\n"));
+                state->back = -1;
+                state->mode = TYPE;
+                break;
+            }
+            if (here.op & 64) {
+                strm->msg = (char *)"invalid literal/length code";
+                state->mode = BAD;
+                break;
+            }
+            state->extra = (unsigned)(here.op) & 15;
+            state->mode = LENEXT;
+                /* fallthrough */
+        case LENEXT:
+            if (state->extra) {
+                NEEDBITS(state->extra);
+                state->length += BITS(state->extra);
+                DROPBITS(state->extra);
+                state->back += state->extra;
+            }
+            Tracevv((stderr, "inflate:         length %u\n", state->length));
+            state->was = state->length;
+            state->mode = DIST;
+                /* fallthrough */
+        case DIST:
+            for (;;) {
+                here = state->distcode[BITS(state->distbits)];
+                if ((unsigned)(here.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if ((here.op & 0xf0) == 0) {
+                last = here;
+                for (;;) {
+                    here = state->distcode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+                state->back += last.bits;
+            }
+            DROPBITS(here.bits);
+            state->back += here.bits;
+            if (here.op & 64) {
+                strm->msg = (char *)"invalid distance code";
+                state->mode = BAD;
+                break;
+            }
+            state->offset = (unsigned)here.val;
+            state->extra = (unsigned)(here.op) & 15;
+            state->mode = DISTEXT;
+                /* fallthrough */
+        case DISTEXT:
+            if (state->extra) {
+                NEEDBITS(state->extra);
+                state->offset += BITS(state->extra);
+                DROPBITS(state->extra);
+                state->back += state->extra;
+            }
+#ifdef INFLATE_STRICT
+            if (state->offset > state->dmax) {
+                strm->msg = (char *)"invalid distance too far back";
+                state->mode = BAD;
+                break;
+            }
+#endif
+            Tracevv((stderr, "inflate:         distance %u\n", state->offset));
+            state->mode = MATCH;
+                /* fallthrough */
+        case MATCH:
+            if (left == 0) goto inf_leave;
+            copy = out - left;
+            if (state->offset > copy) {         /* copy from window */
+                copy = state->offset - copy;
+                if (copy > state->whave) {
+                    if (state->sane) {
+                        strm->msg = (char *)"invalid distance too far back";
+                        state->mode = BAD;
+                        break;
+                    }
+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+                    Trace((stderr, "inflate.c too far\n"));
+                    copy -= state->whave;
+                    if (copy > state->length) copy = state->length;
+                    if (copy > left) copy = left;
+                    left -= copy;
+                    state->length -= copy;
+                    do {
+                        *put++ = 0;
+                    } while (--copy);
+                    if (state->length == 0) state->mode = LEN;
+                    break;
+#endif
+                }
+                if (copy > state->wnext) {
+                    copy -= state->wnext;
+                    from = state->window + (state->wsize - copy);
+                }
+                else
+                    from = state->window + (state->wnext - copy);
+                if (copy > state->length) copy = state->length;
+                if (copy > left) copy = left;
+                put = chunkcopy_safe(put, from, copy, put + left);
+            }
+            else {                              /* copy from output */
+                copy = state->length;
+                if (copy > left) copy = left;
+                put = chunkcopy_lapped_safe(put, state->offset, copy, put + left);
+            }
+            left -= copy;
+            state->length -= copy;
+            if (state->length == 0) state->mode = LEN;
+            break;
+        case LIT:
+            if (left == 0) goto inf_leave;
+            *put++ = (unsigned char)(state->length);
+            left--;
+            state->mode = LEN;
+            break;
+        case CHECK:
+            if (state->wrap) {
+                NEEDBITS(32);
+                out -= left;
+                strm->total_out += out;
+                state->total += out;
+                if ((state->wrap & 4) && out)
+                    strm->adler = state->check =
+                        UPDATE_CHECK(state->check, put - out, out);
+                out = left;
+                if ((state->wrap & 4) && (
+#ifdef GUNZIP
+                     state->flags ? hold :
+#endif
+                     ZSWAP32(hold)) != state->check) {
+                    strm->msg = (char *)"incorrect data check";
+                    state->mode = BAD;
+                    break;
+                }
+                INITBITS();
+                Tracev((stderr, "inflate:   check matches trailer\n"));
+            }
+#ifdef GUNZIP
+            state->mode = LENGTH;
+                /* fallthrough */
+        case LENGTH:
+            if (state->wrap && state->flags) {
+                NEEDBITS(32);
+                if ((state->wrap & 4) && hold != (state->total & 0xffffffff)) {
+                    strm->msg = (char *)"incorrect length check";
+                    state->mode = BAD;
+                    break;
+                }
+                INITBITS();
+                Tracev((stderr, "inflate:   length matches trailer\n"));
+            }
+#endif
+            state->mode = DONE;
+                /* fallthrough */
+        case DONE:
+            ret = Z_STREAM_END;
+            goto inf_leave;
+        case BAD:
+            ret = Z_DATA_ERROR;
+            goto inf_leave;
+        case MEM:
+            return Z_MEM_ERROR;
+        case SYNC:
+                /* fallthrough */
+        default:
+            return Z_STREAM_ERROR;
+        }
+
+    /*
+       Return from inflate(), updating the total counts and the check value.
+       If there was no progress during the inflate() call, return a buffer
+       error.  Call updatewindow() to create and/or update the window state.
+       Note: a memory error from inflate() is non-recoverable.
+     */
+  inf_leave:
+#if defined(ZLIB_DEBUG)
+   /* XXX(cavalcantii): I put this in place back in 2017 to help debug faulty
+    * client code relying on undefined behavior when chunk_copy first landed.
+    *
+    * It is save to say after all these years that Chromium code is well
+    * behaved and works fine with the optimization, therefore we can enable
+    * this only for DEBUG builds.
+    *
+    * We write a defined value in the unused space to help mark
+    * where the stream has ended. We don't use zeros as that can
+    * mislead clients relying on undefined behavior (i.e. assuming
+    * that the data is over when the buffer has a zero/null value).
+    *
+    * The basic idea is that if client code is not relying on the zlib context
+    * to inform the amount of decompressed data, but instead reads the output
+    * buffer until a zero/null is found, it will fail faster and harder
+    * when the remaining of the buffer is marked with a symbol (e.g. 0x55).
+    */
+   if (left >= CHUNKCOPY_CHUNK_SIZE)
+      memset(put, 0x55, CHUNKCOPY_CHUNK_SIZE);
+   else
+      memset(put, 0x55, left);
+#endif
+    RESTORE();
+    if (state->wsize || (out != strm->avail_out && state->mode < BAD &&
+            (state->mode < CHECK || flush != Z_FINISH)))
+        if (updatewindow(strm, strm->next_out, out - strm->avail_out)) {
+            state->mode = MEM;
+            return Z_MEM_ERROR;
+        }
+    in -= strm->avail_in;
+    out -= strm->avail_out;
+    strm->total_in += in;
+    strm->total_out += out;
+    state->total += out;
+    if ((state->wrap & 4) && out)
+        strm->adler = state->check =
+            UPDATE_CHECK(state->check, strm->next_out - out, out);
+    strm->data_type = (int)state->bits + (state->last ? 64 : 0) +
+                      (state->mode == TYPE ? 128 : 0) +
+                      (state->mode == LEN_ || state->mode == COPY_ ? 256 : 0);
+    if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK)
+        ret = Z_BUF_ERROR;
+    return ret;
+}
+
+int ZEXPORT inflateEnd(z_streamp strm) {
+    struct inflate_state FAR *state;
+    if (inflateStateCheck(strm))
+        return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (state->window != Z_NULL) ZFREE(strm, state->window);
+    ZFREE(strm, strm->state);
+    strm->state = Z_NULL;
+    Tracev((stderr, "inflate: end\n"));
+    return Z_OK;
+}
+
+int ZEXPORT inflateGetDictionary(z_streamp strm, Bytef *dictionary,
+                                 uInt *dictLength) {
+    struct inflate_state FAR *state;
+
+    /* check state */
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+
+    /* copy dictionary */
+    if (state->whave && dictionary != Z_NULL) {
+        zmemcpy(dictionary, state->window + state->wnext,
+                state->whave - state->wnext);
+        zmemcpy(dictionary + state->whave - state->wnext,
+                state->window, state->wnext);
+    }
+    if (dictLength != Z_NULL)
+        *dictLength = state->whave;
+    return Z_OK;
+}
+
+int ZEXPORT inflateSetDictionary(z_streamp strm, const Bytef *dictionary,
+                                 uInt dictLength) {
+    struct inflate_state FAR *state;
+    unsigned long dictid;
+    int ret;
+
+    /* check state */
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (state->wrap != 0 && state->mode != DICT)
+        return Z_STREAM_ERROR;
+
+    /* check for correct dictionary identifier */
+    if (state->mode == DICT) {
+        dictid = adler32(0L, Z_NULL, 0);
+        dictid = adler32(dictid, dictionary, dictLength);
+        if (dictid != state->check)
+            return Z_DATA_ERROR;
+    }
+
+    /* copy dictionary to window using updatewindow(), which will amend the
+       existing dictionary if appropriate */
+    ret = updatewindow(strm, dictionary + dictLength, dictLength);
+    if (ret) {
+        state->mode = MEM;
+        return Z_MEM_ERROR;
+    }
+    state->havedict = 1;
+    Tracev((stderr, "inflate:   dictionary set\n"));
+    return Z_OK;
+}
+
+int ZEXPORT inflateGetHeader(z_streamp strm, gz_headerp head) {
+    struct inflate_state FAR *state;
+
+    /* check state */
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if ((state->wrap & 2) == 0) return Z_STREAM_ERROR;
+
+    /* save header structure */
+    state->head = head;
+    head->done = 0;
+    return Z_OK;
+}
+
+/*
+   Search buf[0..len-1] for the pattern: 0, 0, 0xff, 0xff.  Return when found
+   or when out of input.  When called, *have is the number of pattern bytes
+   found in order so far, in 0..3.  On return *have is updated to the new
+   state.  If on return *have equals four, then the pattern was found and the
+   return value is how many bytes were read including the last byte of the
+   pattern.  If *have is less than four, then the pattern has not been found
+   yet and the return value is len.  In the latter case, syncsearch() can be
+   called again with more data and the *have state.  *have is initialized to
+   zero for the first call.
+ */
+local unsigned syncsearch(unsigned FAR *have, const unsigned char FAR *buf,
+                          unsigned len) {
+    unsigned got;
+    unsigned next;
+
+    got = *have;
+    next = 0;
+    while (next < len && got < 4) {
+        if ((int)(buf[next]) == (got < 2 ? 0 : 0xff))
+            got++;
+        else if (buf[next])
+            got = 0;
+        else
+            got = 4 - got;
+        next++;
+    }
+    *have = got;
+    return next;
+}
+
+int ZEXPORT inflateSync(z_streamp strm) {
+    unsigned len;               /* number of bytes to look at or looked at */
+    int flags;                  /* temporary to save header status */
+    unsigned long in, out;      /* temporary to save total_in and total_out */
+    unsigned char buf[4];       /* to restore bit buffer to byte string */
+    struct inflate_state FAR *state;
+
+    /* check parameters */
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR;
+
+    /* if first time, start search in bit buffer */
+    if (state->mode != SYNC) {
+        state->mode = SYNC;
+        state->hold <<= state->bits & 7;
+        state->bits -= state->bits & 7;
+        len = 0;
+        while (state->bits >= 8) {
+            buf[len++] = (unsigned char)(state->hold);
+            state->hold >>= 8;
+            state->bits -= 8;
+        }
+        state->have = 0;
+        syncsearch(&(state->have), buf, len);
+    }
+
+    /* search available input */
+    len = syncsearch(&(state->have), strm->next_in, strm->avail_in);
+    strm->avail_in -= len;
+    strm->next_in += len;
+    strm->total_in += len;
+
+    /* return no joy or set up to restart inflate() on a new block */
+    if (state->have != 4) return Z_DATA_ERROR;
+    if (state->flags == -1)
+        state->wrap = 0;    /* if no header yet, treat as raw */
+    else
+        state->wrap &= ~4;  /* no point in computing a check value now */
+    flags = state->flags;
+    in = strm->total_in;  out = strm->total_out;
+    inflateReset(strm);
+    strm->total_in = in;  strm->total_out = out;
+    state->flags = flags;
+    state->mode = TYPE;
+    return Z_OK;
+}
+
+/*
+   Returns true if inflate is currently at the end of a block generated by
+   Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP
+   implementation to provide an additional safety check. PPP uses
+   Z_SYNC_FLUSH but removes the length bytes of the resulting empty stored
+   block. When decompressing, PPP checks that at the end of input packet,
+   inflate is waiting for these length bytes.
+ */
+int ZEXPORT inflateSyncPoint(z_streamp strm) {
+    struct inflate_state FAR *state;
+
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    return state->mode == STORED && state->bits == 0;
+}
+
+int ZEXPORT inflateCopy(z_streamp dest, z_streamp source) {
+    struct inflate_state FAR *state;
+    struct inflate_state FAR *copy;
+    unsigned char FAR *window;
+    unsigned wsize;
+
+    /* check input */
+    if (inflateStateCheck(source) || dest == Z_NULL)
+        return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)source->state;
+
+    /* allocate space */
+    copy = (struct inflate_state FAR *)
+           ZALLOC(source, 1, sizeof(struct inflate_state));
+    if (copy == Z_NULL) return Z_MEM_ERROR;
+    window = Z_NULL;
+    if (state->window != Z_NULL) {
+        window = (unsigned char FAR *)ZALLOC(
+            source, (1U << state->wbits) + CHUNKCOPY_CHUNK_SIZE,
+            sizeof(unsigned char));
+        if (window == Z_NULL) {
+            ZFREE(source, copy);
+            return Z_MEM_ERROR;
+        }
+    }
+
+    /* copy state */
+    zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
+    zmemcpy((voidpf)copy, (voidpf)state, sizeof(struct inflate_state));
+    copy->strm = dest;
+    if (state->lencode >= state->codes &&
+        state->lencode <= state->codes + ENOUGH - 1) {
+        copy->lencode = copy->codes + (state->lencode - state->codes);
+        copy->distcode = copy->codes + (state->distcode - state->codes);
+    }
+    copy->next = copy->codes + (state->next - state->codes);
+    if (window != Z_NULL) {
+        wsize = 1U << state->wbits;
+        zmemcpy(window, state->window, wsize);
+    }
+    copy->window = window;
+    dest->state = (struct internal_state FAR *)copy;
+    return Z_OK;
+}
+
+int ZEXPORT inflateUndermine(z_streamp strm, int subvert) {
+    struct inflate_state FAR *state;
+
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+    state->sane = !subvert;
+    return Z_OK;
+#else
+    (void)subvert;
+    state->sane = 1;
+    return Z_DATA_ERROR;
+#endif
+}
+
+int ZEXPORT inflateValidate(z_streamp strm, int check) {
+    struct inflate_state FAR *state;
+
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (check && state->wrap)
+        state->wrap |= 4;
+    else
+        state->wrap &= ~4;
+    return Z_OK;
+}
+
+long ZEXPORT inflateMark(z_streamp strm) {
+    struct inflate_state FAR *state;
+
+    if (inflateStateCheck(strm))
+        return -(1L << 16);
+    state = (struct inflate_state FAR *)strm->state;
+    return (long)(((unsigned long)((long)state->back)) << 16) +
+        (state->mode == COPY ? state->length :
+            (state->mode == MATCH ? state->was - state->length : 0));
+}
+
+unsigned long ZEXPORT inflateCodesUsed(z_streamp strm) {
+    struct inflate_state FAR *state;
+    if (inflateStateCheck(strm)) return (unsigned long)-1;
+    state = (struct inflate_state FAR *)strm->state;
+    return (unsigned long)(state->next - state->codes);
+}
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/optimizations/insert_string.h b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/optimizations/insert_string.h
new file mode 100644
index 0000000000..260b826802
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/optimizations/insert_string.h
@@ -0,0 +1,80 @@
+/* insert_string.h
+ *
+ * Copyright 2019 The Chromium Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the Chromium source repository LICENSE file.
+ */
+
+#ifndef INSERT_STRING_H
+#define INSERT_STRING_H
+
+#ifndef INLINE
+#if defined(_MSC_VER) && !defined(__clang__)
+#define INLINE __inline
+#else
+#define INLINE inline
+#endif
+#endif
+
+#include <stdint.h>
+
+/**
+ * Some applications need to match zlib DEFLATE output exactly [3]. Use the
+ * canonical zlib Rabin-Karp rolling hash [1,2] in that case.
+ *
+ *  [1] For a description of the Rabin and Karp algorithm, see "Algorithms"
+ *      book by R. Sedgewick, Addison-Wesley, p252.
+ *  [2] https://www.euccas.me/zlib/#zlib_rabin_karp and also "rolling hash"
+ *      https://en.wikipedia.org/wiki/Rolling_hash
+ *  [3] crbug.com/1316541 AOSP incremental client APK package OTA upgrades.
+ */
+#ifdef CHROMIUM_ZLIB_NO_CASTAGNOLI
+#define USE_ZLIB_RABIN_KARP_ROLLING_HASH
+#endif
+
+/* ===========================================================================
+ * Update a hash value with the given input byte (Rabin-Karp rolling hash).
+ * IN  assertion: all calls to UPDATE_HASH are made with consecutive input
+ *    characters, so that a running hash key can be computed from the previous
+ *    key instead of complete recalculation each time.
+ */
+#define UPDATE_HASH(s, h, c) (h = (((h) << s->hash_shift) ^ (c)) & s->hash_mask)
+
+/* ===========================================================================
+ * Insert string str in the dictionary and set match_head to the previous head
+ * of the hash chain (the most recent string with same hash key). Return
+ * the previous length of the hash chain.
+ * If this file is compiled with -DFASTEST, the compression level is forced
+ * to 1, and no hash chains are maintained.
+ * IN  assertion: all calls to INSERT_STRING are made with consecutive input
+ *    characters and the first MIN_MATCH bytes of str are valid (except for
+ *    the last MIN_MATCH-1 bytes of the input file).
+ */
+local INLINE Pos insert_string(deflate_state* const s, const Pos str) {
+  Pos ret;
+/* insert_string dictionary insertion: ANZAC++ hasher
+ * significantly improves data compression speed.
+ *
+ * Note: the generated compressed output is a valid DEFLATE stream, but will
+ * differ from canonical zlib output.
+ */
+#if defined(USE_ZLIB_RABIN_KARP_ROLLING_HASH)
+  UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH - 1)]);
+#else
+  uint32_t value;
+  // Validated for little endian archs (i.e. x86, Arm). YMMV for big endian.
+  zmemcpy(&value, &s->window[str], sizeof(value));
+  s->ins_h = ((value * 66521 + 66521) >> 16) & s->hash_mask;
+#endif
+
+#ifdef FASTEST
+  ret = s->head[s->ins_h];
+#else
+  ret = s->prev[str & s->w_mask] = s->head[s->ins_h];
+#endif
+  s->head[s->ins_h] = str;
+
+  return ret;
+}
+
+#endif /* INSERT_STRING_H */
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/DEPS b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/DEPS
new file mode 100644
index 0000000000..67973613c7
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/DEPS
@@ -0,0 +1,5 @@
+include_rules = [
+    "+testing/gtest",
+    "+third_party/zlib/contrib/minizip",
+    "+base",
+]
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/OWNERS b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/OWNERS
new file mode 100644
index 0000000000..aa6a2d1bb3
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/OWNERS
@@ -0,0 +1,2 @@
+cblume@chromium.org
+cavalcantii@chromium.org
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/BUILD.gn b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/BUILD.gn
new file mode 100644
index 0000000000..16e918a720
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/BUILD.gn
@@ -0,0 +1,40 @@
+# Copyright 2017 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//testing/libfuzzer/fuzzer_test.gni")
+
+# root BUILD depends on this target. Needed for package discovery
+group("fuzzers") {
+}
+
+fuzzer_test("zlib_uncompress_fuzzer") {
+  sources = [ "uncompress_fuzzer.cc" ]
+  deps = [ "../../../:zlib" ]
+}
+
+fuzzer_test("zlib_inflate_fuzzer") {
+  sources = [ "inflate_fuzzer.cc" ]
+  deps = [ "../../../:zlib" ]
+}
+
+fuzzer_test("zlib_inflate_with_header_fuzzer") {
+  sources = [ "inflate_with_header_fuzzer.cc" ]
+  deps = [ "../../../:zlib" ]
+}
+
+fuzzer_test("zlib_streaming_inflate_fuzzer") {
+  sources = [ "streaming_inflate_fuzzer.cc" ]
+  deps = [ "../../../:zlib" ]
+  libfuzzer_options = [ "max_len=256000" ]
+}
+
+fuzzer_test("zlib_deflate_set_dictionary_fuzzer") {
+  sources = [ "deflate_set_dictionary_fuzzer.cc" ]
+  deps = [ "../../../:zlib" ]
+}
+
+fuzzer_test("zlib_deflate_fuzzer") {
+  sources = [ "deflate_fuzzer.cc" ]
+  deps = [ "../../../:zlib" ]
+}
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/OWNERS b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/OWNERS
new file mode 100644
index 0000000000..ff32561990
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/OWNERS
@@ -0,0 +1,2 @@
+cblume@chromium.org
+hans@chromium.org
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/deflate_fuzzer.cc b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/deflate_fuzzer.cc
new file mode 100644
index 0000000000..64892bc553
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/deflate_fuzzer.cc
@@ -0,0 +1,80 @@
+// Copyright 2017 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <fuzzer/FuzzedDataProvider.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <vector>
+
+#include "zlib.h"
+
+// Fuzzer builds often have NDEBUG set, so roll our own assert macro.
+#define ASSERT(cond)                                                           \
+  do {                                                                         \
+    if (!(cond)) {                                                             \
+      fprintf(stderr, "%s:%d Assert failed: %s\n", __FILE__, __LINE__, #cond); \
+      exit(1);                                                                 \
+    }                                                                          \
+  } while (0)
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
+  FuzzedDataProvider fdp(data, size);
+  int level = fdp.PickValueInArray({0, 1, 2, 3, 4, 5, 6, 7, 8, 9});
+  int windowBits = fdp.PickValueInArray({9, 10, 11, 12, 13, 14, 15});
+  int memLevel = fdp.PickValueInArray({1, 2, 3, 4, 5, 6, 7, 8, 9});
+  int strategy = fdp.PickValueInArray(
+      {Z_DEFAULT_STRATEGY, Z_FILTERED, Z_HUFFMAN_ONLY, Z_RLE, Z_FIXED});
+  std::vector<uint8_t> src = fdp.ConsumeRemainingBytes<uint8_t>();
+
+  z_stream stream;
+  stream.zalloc = Z_NULL;
+  stream.zfree = Z_NULL;
+
+  // Compress the data one byte at a time to exercise the streaming code.
+  int ret =
+      deflateInit2(&stream, level, Z_DEFLATED, windowBits, memLevel, strategy);
+  ASSERT(ret == Z_OK);
+
+  size_t deflate_bound = deflateBound(&stream, src.size());
+
+  std::vector<uint8_t> compressed(src.size() * 2 + 1000);
+  stream.next_out = compressed.data();
+  stream.avail_out = compressed.size();
+  for (uint8_t b : src) {
+    stream.next_in = &b;
+    stream.avail_in = 1;
+    ret = deflate(&stream, Z_NO_FLUSH);
+    ASSERT(ret == Z_OK);
+  }
+  stream.next_in = Z_NULL;
+  stream.avail_in = 0;
+  ret = deflate(&stream, Z_FINISH);
+  ASSERT(ret == Z_STREAM_END);
+  compressed.resize(compressed.size() - stream.avail_out);
+  deflateEnd(&stream);
+
+  // Check that the bound was correct.
+  ASSERT(compressed.size() <= deflate_bound);
+
+  // Verify that the data decompresses correctly.
+  ret = inflateInit2(&stream, windowBits);
+  ASSERT(ret == Z_OK);
+  // Make room for at least one byte so it's never empty.
+  std::vector<uint8_t> decompressed(src.size() + 1);
+  stream.next_in = compressed.data();
+  stream.avail_in = compressed.size();
+  stream.next_out = decompressed.data();
+  stream.avail_out = decompressed.size();
+  ret = inflate(&stream, Z_FINISH);
+  ASSERT(ret == Z_STREAM_END);
+  decompressed.resize(decompressed.size() - stream.avail_out);
+  inflateEnd(&stream);
+
+  ASSERT(decompressed == src);
+
+  return 0;
+}
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/deflate_set_dictionary_fuzzer.cc b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/deflate_set_dictionary_fuzzer.cc
new file mode 100644
index 0000000000..96778209f7
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/deflate_set_dictionary_fuzzer.cc
@@ -0,0 +1,43 @@
+// Copyright 2017 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <stddef.h>
+#include <stdint.h>
+#include <cassert>
+#include <vector>
+
+#include "zlib.h"
+
+static Bytef buffer[256 * 1024] = {0};
+
+// Entry point for LibFuzzer.
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
+  // We need to strip the 'const' for zlib.
+  std::vector<unsigned char> input_buffer{data, data + size};
+
+  uLongf buffer_length = static_cast<uLongf>(sizeof(buffer));
+
+  z_stream stream;
+  stream.next_in = input_buffer.data();
+  stream.avail_in = size;
+  stream.total_in = size;
+  stream.next_out = buffer;
+  stream.avail_out = buffer_length;
+  stream.total_out = buffer_length;
+  stream.zalloc = Z_NULL;
+  stream.zfree = Z_NULL;
+
+  if (Z_OK != deflateInit(&stream, Z_DEFAULT_COMPRESSION)) {
+    deflateEnd(&stream);
+    assert(false);
+  }
+
+  auto deflate_set_dictionary_result =
+      deflateSetDictionary(&stream, data, size);
+  deflateEnd(&stream);
+  if (Z_OK != deflate_set_dictionary_result)
+    assert(false);
+
+  return 0;
+}
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/inflate_fuzzer.cc b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/inflate_fuzzer.cc
new file mode 100644
index 0000000000..d9d62026e4
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/inflate_fuzzer.cc
@@ -0,0 +1,41 @@
+// Copyright 2017 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+#include <cassert>
+#include <vector>
+
+#include "zlib.h"
+
+static Bytef buffer[256 * 1024] = {0};
+
+// Entry point for LibFuzzer.
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
+  // We need to strip the 'const' for zlib
+  std::vector<unsigned char> input_buffer{data, data+size};
+
+  uLongf buffer_length = static_cast<uLongf>(sizeof(buffer));
+
+  z_stream stream;
+  stream.next_in = input_buffer.data();
+  stream.avail_in = size;
+  stream.total_in = size;
+  stream.next_out = buffer;
+  stream.avail_out = buffer_length;
+  stream.total_out = buffer_length;
+  stream.zalloc = Z_NULL;
+  stream.zfree = Z_NULL;
+
+  if (Z_OK != inflateInit(&stream)) {
+    inflateEnd(&stream);
+    assert(false);
+  }
+
+  inflate(&stream, Z_NO_FLUSH);
+  inflateEnd(&stream);
+
+  return 0;
+}
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/inflate_with_header_fuzzer.cc b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/inflate_with_header_fuzzer.cc
new file mode 100644
index 0000000000..dfb5b39a7a
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/inflate_with_header_fuzzer.cc
@@ -0,0 +1,95 @@
+// Copyright 2022 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <algorithm>
+#include <memory>
+
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <fuzzer/FuzzedDataProvider.h>
+
+#include "zlib.h"
+
+// Fuzzer builds often have NDEBUG set, so roll our own assert macro.
+#define ASSERT(cond)                                                           \
+  do {                                                                         \
+    if (!(cond)) {                                                             \
+      fprintf(stderr, "%s:%d Assert failed: %s\n", __FILE__, __LINE__, #cond); \
+      exit(1);                                                                 \
+    }                                                                          \
+  } while (0)
+
+static void chunked_inflate(gz_header* header,
+                            uint8_t* data,
+                            size_t size,
+                            size_t in_chunk_size,
+                            size_t out_chunk_size) {
+  z_stream stream;
+  stream.next_in = data;
+  stream.avail_in = 0;
+  stream.zalloc = Z_NULL;
+  stream.zfree = Z_NULL;
+
+  static const int kDefaultWindowBits = MAX_WBITS;
+  static const int kGzipOrZlibHeader = 32;
+  ASSERT(inflateInit2(&stream, kDefaultWindowBits + kGzipOrZlibHeader) == Z_OK);
+  ASSERT(inflateGetHeader(&stream, header) == Z_OK);
+
+  auto out_buffer = std::make_unique<uint8_t[]>(out_chunk_size);
+  while (true) {
+    stream.next_in = &data[stream.total_in];
+    stream.avail_in =
+        std::min(in_chunk_size, size - static_cast<size_t>(stream.total_in));
+    stream.next_out = out_buffer.get();
+    stream.avail_out = out_chunk_size;
+
+    if (inflate(&stream, stream.avail_in == 0 ? Z_SYNC_FLUSH : Z_NO_FLUSH) !=
+        Z_OK) {
+      break;
+    }
+  }
+
+  inflateEnd(&stream);
+}
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
+  if (size > 250 * 1024) {
+    // Cap the input size so the fuzzer doesn't time out. For example,
+    // crbug.com/1362206 saw timeouts with 450 KB input, so use a limit that's
+    // well below that but still large enough to hit most code.
+    return 0;
+  }
+
+  FuzzedDataProvider fdp(data, size);
+
+  // Fuzz zlib's inflate() with inflateGetHeader() enabled, various sizes for
+  // the gz_header field sizes, and various-sized chunks for input/output. This
+  // would have found CVE-2022-37434 which was a heap buffer read overflow when
+  // filling in gz_header's extra field.
+
+  gz_header header;
+  header.extra_max = fdp.ConsumeIntegralInRange(0, 100000);
+  header.name_max = fdp.ConsumeIntegralInRange(0, 100000);
+  header.comm_max = fdp.ConsumeIntegralInRange(0, 100000);
+
+  auto extra_buf = std::make_unique<uint8_t[]>(header.extra_max);
+  auto name_buf = std::make_unique<uint8_t[]>(header.name_max);
+  auto comment_buf = std::make_unique<uint8_t[]>(header.comm_max);
+
+  header.extra = extra_buf.get();
+  header.name = name_buf.get();
+  header.comment = comment_buf.get();
+
+  size_t in_chunk_size = fdp.ConsumeIntegralInRange(1, 4097);
+  size_t out_chunk_size = fdp.ConsumeIntegralInRange(1, 4097);
+  std::vector<uint8_t> remaining_data = fdp.ConsumeRemainingBytes<uint8_t>();
+
+  chunked_inflate(&header, remaining_data.data(), remaining_data.size(),
+                  in_chunk_size, out_chunk_size);
+
+  return 0;
+}
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/streaming_inflate_fuzzer.cc b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/streaming_inflate_fuzzer.cc
new file mode 100644
index 0000000000..dac170a0fc
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/streaming_inflate_fuzzer.cc
@@ -0,0 +1,74 @@
+// Copyright 2020 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "zlib.h"
+
+// Fuzzer builds often have NDEBUG set, so roll our own assert macro.
+#define ASSERT(cond)                                                           \
+  do {                                                                         \
+    if (!(cond)) {                                                             \
+      fprintf(stderr, "%s:%d Assert failed: %s\n", __FILE__, __LINE__, #cond); \
+      exit(1);                                                                 \
+    }                                                                          \
+  } while (0)
+
+// Entry point for LibFuzzer.
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
+  // Deflate data.
+  z_stream comp_strm;
+  comp_strm.zalloc = Z_NULL;
+  comp_strm.zfree = Z_NULL;
+  comp_strm.opaque = Z_NULL;
+  int ret = deflateInit(&comp_strm, Z_DEFAULT_COMPRESSION);
+  ASSERT(ret == Z_OK);
+
+  size_t comp_buf_cap = deflateBound(&comp_strm, size);
+  uint8_t* comp_buf = (uint8_t*)malloc(comp_buf_cap);
+  ASSERT(comp_buf != nullptr);
+  comp_strm.next_out = comp_buf;
+  comp_strm.avail_out = comp_buf_cap;
+  comp_strm.next_in = (unsigned char*)data;
+  comp_strm.avail_in = size;
+  ret = deflate(&comp_strm, Z_FINISH);
+  ASSERT(ret == Z_STREAM_END);
+  size_t comp_sz = comp_buf_cap - comp_strm.avail_out;
+
+  // Inflate comp_buf one chunk at a time.
+  z_stream decomp_strm;
+  decomp_strm.zalloc = Z_NULL;
+  decomp_strm.zfree = Z_NULL;
+  decomp_strm.opaque = Z_NULL;
+  ret = inflateInit(&decomp_strm);
+  ASSERT(ret == Z_OK);
+  decomp_strm.next_in = comp_buf;
+  decomp_strm.avail_in = comp_sz;
+
+  while (decomp_strm.avail_in > 0) {
+    uint8_t decomp_buf[1024];
+    decomp_strm.next_out = decomp_buf;
+    decomp_strm.avail_out = sizeof(decomp_buf);
+    ret = inflate(&decomp_strm, Z_FINISH);
+    ASSERT(ret == Z_OK || ret == Z_STREAM_END || ret == Z_BUF_ERROR);
+
+    // Verify the output bytes.
+    size_t num_out = sizeof(decomp_buf) - decomp_strm.avail_out;
+    for (size_t i = 0; i < num_out; i++) {
+      ASSERT(decomp_buf[i] == data[decomp_strm.total_out - num_out + i]);
+    }
+  }
+
+  ret = deflateEnd(&comp_strm);
+  ASSERT(ret == Z_OK);
+  free(comp_buf);
+
+  inflateEnd(&decomp_strm);
+  ASSERT(ret == Z_OK);
+
+  return 0;
+}
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/uncompress_fuzzer.cc b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/uncompress_fuzzer.cc
new file mode 100644
index 0000000000..e63a8c0582
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/uncompress_fuzzer.cc
@@ -0,0 +1,21 @@
+// Copyright 2015 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+
+#include "zlib.h"
+
+static Bytef buffer[256 * 1024] = {0};
+
+// Entry point for LibFuzzer.
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
+  uLongf buffer_length = static_cast<uLongf>(sizeof(buffer));
+  if (Z_OK !=
+      uncompress(buffer, &buffer_length, data, static_cast<uLong>(size))) {
+    return 0;
+  }
+  return 0;
+}
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/infcover.cc b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/infcover.cc
new file mode 100644
index 0000000000..4c55d5d7d5
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/infcover.cc
@@ -0,0 +1,745 @@
+/* infcover.c -- test zlib's inflate routines with full code coverage
+ * Copyright (C) 2011, 2016 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* to use, do: ./configure --cover && make cover */
+// clang-format off
+#include "infcover.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "zlib.h"
+
+/* get definition of internal structure so we can mess with it (see pull()),
+   and so we can call inflate_trees() (see cover5()) */
+#define ZLIB_INTERNAL
+#include "inftrees.h"
+#include "inflate.h"
+
+/* XXX: use C++ streams instead of printf/fputs/etc due to portability
+ * as type sizes can vary between platforms.
+ */
+#include <iostream>
+#define local static
+
+/* XXX: hacking C assert and plugging into GTest. */
+#include "gtest.h"
+#if defined(assert)
+#undef assert
+#define assert EXPECT_TRUE
+#endif
+
+/* XXX: handle what is a reserved word in C++. */
+#define try try_f
+
+/* -- memory tracking routines -- */
+
+/*
+   These memory tracking routines are provided to zlib and track all of zlib's
+   allocations and deallocations, check for LIFO operations, keep a current
+   and high water mark of total bytes requested, optionally set a limit on the
+   total memory that can be allocated, and when done check for memory leaks.
+
+   They are used as follows:
+
+   z_stream strm;
+   mem_setup(&strm)         initializes the memory tracking and sets the
+                            zalloc, zfree, and opaque members of strm to use
+                            memory tracking for all zlib operations on strm
+   mem_limit(&strm, limit)  sets a limit on the total bytes requested -- a
+                            request that exceeds this limit will result in an
+                            allocation failure (returns NULL) -- setting the
+                            limit to zero means no limit, which is the default
+                            after mem_setup()
+   mem_used(&strm, "msg")   prints to stderr "msg" and the total bytes used
+   mem_high(&strm, "msg")   prints to stderr "msg" and the high water mark
+   mem_done(&strm, "msg")   ends memory tracking, releases all allocations
+                            for the tracking as well as leaked zlib blocks, if
+                            any.  If there was anything unusual, such as leaked
+                            blocks, non-FIFO frees, or frees of addresses not
+                            allocated, then "msg" and information about the
+                            problem is printed to stderr.  If everything is
+                            normal, nothing is printed. mem_done resets the
+                            strm members to Z_NULL to use the default memory
+                            allocation routines on the next zlib initialization
+                            using strm.
+ */
+
+/* these items are strung together in a linked list, one for each allocation */
+struct mem_item {
+    void *ptr;                  /* pointer to allocated memory */
+    size_t size;                /* requested size of allocation */
+    struct mem_item *next;      /* pointer to next item in list, or NULL */
+};
+
+/* this structure is at the root of the linked list, and tracks statistics */
+struct mem_zone {
+    struct mem_item *first;     /* pointer to first item in list, or NULL */
+    size_t total, highwater;    /* total allocations, and largest total */
+    size_t limit;               /* memory allocation limit, or 0 if no limit */
+    int notlifo, rogue;         /* counts of non-LIFO frees and rogue frees */
+};
+
+/* memory allocation routine to pass to zlib */
+local void *mem_alloc(void *mem, unsigned count, unsigned size)
+{
+    void *ptr;
+    struct mem_item *item;
+    struct mem_zone *zone = static_cast<struct mem_zone *>(mem);
+    size_t len = count * (size_t)size;
+
+    /* induced allocation failure */
+    if (zone == NULL || (zone->limit && zone->total + len > zone->limit))
+        return NULL;
+
+    /* perform allocation using the standard library, fill memory with a
+       non-zero value to make sure that the code isn't depending on zeros */
+    ptr = malloc(len);
+    if (ptr == NULL)
+        return NULL;
+    memset(ptr, 0xa5, len);
+
+    /* create a new item for the list */
+    item = static_cast<struct mem_item *>(malloc(sizeof(struct mem_item)));
+    if (item == NULL) {
+        free(ptr);
+        return NULL;
+    }
+    item->ptr = ptr;
+    item->size = len;
+
+    /* insert item at the beginning of the list */
+    item->next = zone->first;
+    zone->first = item;
+
+    /* update the statistics */
+    zone->total += item->size;
+    if (zone->total > zone->highwater)
+        zone->highwater = zone->total;
+
+    /* return the allocated memory */
+    return ptr;
+}
+
+/* memory free routine to pass to zlib */
+local void mem_free(void *mem, void *ptr)
+{
+    struct mem_item *item, *next;
+    struct mem_zone *zone = static_cast<struct mem_zone *>(mem);
+
+    /* if no zone, just do a free */
+    if (zone == NULL) {
+        free(ptr);
+        return;
+    }
+
+    /* point next to the item that matches ptr, or NULL if not found -- remove
+       the item from the linked list if found */
+    next = zone->first;
+    if (next) {
+        if (next->ptr == ptr)
+            zone->first = next->next;   /* first one is it, remove from list */
+        else {
+            do {                        /* search the linked list */
+                item = next;
+                next = item->next;
+            } while (next != NULL && next->ptr != ptr);
+            if (next) {                 /* if found, remove from linked list */
+                item->next = next->next;
+                zone->notlifo++;        /* not a LIFO free */
+            }
+
+        }
+    }
+
+    /* if found, update the statistics and free the item */
+    if (next) {
+        zone->total -= next->size;
+        free(next);
+    }
+
+    /* if not found, update the rogue count */
+    else
+        zone->rogue++;
+
+    /* in any case, do the requested free with the standard library function */
+    free(ptr);
+}
+
+/* set up a controlled memory allocation space for monitoring, set the stream
+   parameters to the controlled routines, with opaque pointing to the space */
+local void mem_setup(z_stream *strm)
+{
+    struct mem_zone *zone;
+
+    zone = static_cast<struct mem_zone *>(malloc(sizeof(struct mem_zone)));
+    assert(zone != NULL);
+    zone->first = NULL;
+    zone->total = 0;
+    zone->highwater = 0;
+    zone->limit = 0;
+    zone->notlifo = 0;
+    zone->rogue = 0;
+    strm->opaque = zone;
+    strm->zalloc = mem_alloc;
+    strm->zfree = mem_free;
+}
+
+/* set a limit on the total memory allocation, or 0 to remove the limit */
+local void mem_limit(z_stream *strm, size_t limit)
+{
+    struct mem_zone *zone = static_cast<struct mem_zone *>(strm->opaque);
+
+    zone->limit = limit;
+}
+
+/* show the current total requested allocations in bytes */
+local void mem_used(z_stream *strm, const char *prefix)
+{
+    struct mem_zone *zone = static_cast<struct mem_zone *>(strm->opaque);
+
+    std::cout << prefix << ": " << zone->total << " allocated" << std::endl;
+}
+
+/* show the high water allocation in bytes */
+local void mem_high(z_stream *strm, const char *prefix)
+{
+    struct mem_zone *zone = static_cast<struct mem_zone *>(strm->opaque);
+
+    std::cout << prefix << ": " << zone->highwater << " high water mark" << std::endl;
+}
+
+/* release the memory allocation zone -- if there are any surprises, notify */
+local void mem_done(z_stream *strm, const char *prefix)
+{
+    int count = 0;
+    struct mem_item *item, *next;
+    struct mem_zone *zone = static_cast<struct mem_zone *>(strm->opaque);
+
+    /* show high water mark */
+    mem_high(strm, prefix);
+
+    /* free leftover allocations and item structures, if any */
+    item = zone->first;
+    while (item != NULL) {
+        free(item->ptr);
+        next = item->next;
+        free(item);
+        item = next;
+        count++;
+    }
+
+    /* issue alerts about anything unexpected */
+    if (count || zone->total)
+        std::cout << "** " << prefix << ": "
+                  << zone->total << " bytes in "
+                  << count << " blocks not freed"
+                  << std::endl;
+
+    if (zone->notlifo)
+        std::cout << "** " << prefix << ": "
+                  << zone->notlifo << " frees not LIFO"
+                  << std::endl;
+
+    if (zone->rogue)
+        std::cout << "** " << prefix << ": "
+                  << zone->rogue << " frees not recognized"
+                  << std::endl;
+
+    /* free the zone and delete from the stream */
+    free(zone);
+    strm->opaque = Z_NULL;
+    strm->zalloc = Z_NULL;
+    strm->zfree = Z_NULL;
+}
+
+/* -- inflate test routines -- */
+
+/* Decode a hexadecimal string, set *len to length, in[] to the bytes.  This
+   decodes liberally, in that hex digits can be adjacent, in which case two in
+   a row writes a byte.  Or they can be delimited by any non-hex character,
+   where the delimiters are ignored except when a single hex digit is followed
+   by a delimiter, where that single digit writes a byte.  The returned data is
+   allocated and must eventually be freed.  NULL is returned if out of memory.
+   If the length is not needed, then len can be NULL. */
+local unsigned char *h2b(const char *hex, unsigned *len)
+{
+    unsigned char *in, *re;
+    unsigned next, val;
+
+    in = static_cast<unsigned char *>(malloc((strlen(hex) + 1) >> 1));
+    if (in == NULL)
+        return NULL;
+    next = 0;
+    val = 1;
+    do {
+        if (*hex >= '0' && *hex <= '9')
+            val = (val << 4) + *hex - '0';
+        else if (*hex >= 'A' && *hex <= 'F')
+            val = (val << 4) + *hex - 'A' + 10;
+        else if (*hex >= 'a' && *hex <= 'f')
+            val = (val << 4) + *hex - 'a' + 10;
+        else if (val != 1 && val < 32)  /* one digit followed by delimiter */
+            val += 240;                 /* make it look like two digits */
+        if (val > 255) {                /* have two digits */
+            in[next++] = val & 0xff;    /* save the decoded byte */
+            val = 1;                    /* start over */
+        }
+    } while (*hex++);       /* go through the loop with the terminating null */
+    if (len != NULL)
+        *len = next;
+    re = static_cast<unsigned char *>(realloc(in, next));
+    return re == NULL ? in : re;
+}
+
+/* generic inflate() run, where hex is the hexadecimal input data, what is the
+   text to include in an error message, step is how much input data to feed
+   inflate() on each call, or zero to feed it all, win is the window bits
+   parameter to inflateInit2(), len is the size of the output buffer, and err
+   is the error code expected from the first inflate() call (the second
+   inflate() call is expected to return Z_STREAM_END).  If win is 47, then
+   header information is collected with inflateGetHeader().  If a zlib stream
+   is looking for a dictionary, then an empty dictionary is provided.
+   inflate() is run until all of the input data is consumed. */
+local void inf(const char *hex, const char *what, unsigned step, int win, unsigned len,
+               int err)
+{
+    int ret;
+    unsigned have;
+    unsigned char *in, *out;
+    z_stream strm, copy;
+    gz_header head;
+
+    mem_setup(&strm);
+    strm.avail_in = 0;
+    strm.next_in = Z_NULL;
+    ret = inflateInit2(&strm, win);
+    if (ret != Z_OK) {
+        mem_done(&strm, what);
+        return;
+    }
+    out = static_cast<unsigned char *>(malloc(len));                          assert(out != NULL);
+    if (win == 47) {
+        head.extra = out;
+        head.extra_max = len;
+        head.name = out;
+        head.name_max = len;
+        head.comment = out;
+        head.comm_max = len;
+        ret = inflateGetHeader(&strm, &head);   assert(ret == Z_OK);
+    }
+    in = h2b(hex, &have);                       assert(in != NULL);
+    if (step == 0 || step > have)
+        step = have;
+    strm.avail_in = step;
+    have -= step;
+    strm.next_in = in;
+    do {
+        strm.avail_out = len;
+        strm.next_out = out;
+        ret = inflate(&strm, Z_NO_FLUSH);       assert(err == 9 || ret == err);
+        if (ret != Z_OK && ret != Z_BUF_ERROR && ret != Z_NEED_DICT)
+            break;
+        if (ret == Z_NEED_DICT) {
+            ret = inflateSetDictionary(&strm, in, 1);
+                                                assert(ret == Z_DATA_ERROR);
+            mem_limit(&strm, 1);
+            ret = inflateSetDictionary(&strm, out, 0);
+                                                assert(ret == Z_MEM_ERROR);
+            mem_limit(&strm, 0);
+            ((struct inflate_state *)strm.state)->mode = DICT;
+            ret = inflateSetDictionary(&strm, out, 0);
+                                                assert(ret == Z_OK);
+            ret = inflate(&strm, Z_NO_FLUSH);   assert(ret == Z_BUF_ERROR);
+        }
+        ret = inflateCopy(&copy, &strm);        assert(ret == Z_OK);
+        ret = inflateEnd(&copy);                assert(ret == Z_OK);
+        err = 9;                        /* don't care next time around */
+        have += strm.avail_in;
+        strm.avail_in = step > have ? have : step;
+        have -= strm.avail_in;
+    } while (strm.avail_in);
+    free(in);
+    free(out);
+    ret = inflateReset2(&strm, -8);             assert(ret == Z_OK);
+    ret = inflateEnd(&strm);                    assert(ret == Z_OK);
+    mem_done(&strm, what);
+}
+
+/* cover all of the lines in inflate.c up to inflate() */
+void cover_support(void)
+{
+    int ret;
+    z_stream strm;
+
+    mem_setup(&strm);
+    strm.avail_in = 0;
+    strm.next_in = Z_NULL;
+    ret = inflateInit(&strm);                   assert(ret == Z_OK);
+    mem_used(&strm, "inflate init");
+    ret = inflatePrime(&strm, 5, 31);           assert(ret == Z_OK);
+    ret = inflatePrime(&strm, -1, 0);           assert(ret == Z_OK);
+    ret = inflateSetDictionary(&strm, Z_NULL, 0);
+                                                assert(ret == Z_STREAM_ERROR);
+    ret = inflateEnd(&strm);                    assert(ret == Z_OK);
+    mem_done(&strm, "prime");
+
+    inf("63 0", "force window allocation", 0, -15, 1, Z_OK);
+    inf("63 18 5", "force window replacement", 0, -8, 259, Z_OK);
+    inf("63 18 68 30 d0 0 0", "force split window update", 4, -8, 259, Z_OK);
+    inf("3 0", "use fixed blocks", 0, -15, 1, Z_STREAM_END);
+    inf("", "bad window size", 0, 1, 0, Z_STREAM_ERROR);
+
+    mem_setup(&strm);
+    strm.avail_in = 0;
+    strm.next_in = Z_NULL;
+    ret = inflateInit_(&strm, "!", (int)sizeof(z_stream));
+                                                assert(ret == Z_VERSION_ERROR);
+    mem_done(&strm, "wrong version");
+
+    strm.avail_in = 0;
+    strm.next_in = Z_NULL;
+    ret = inflateInit(&strm);                   assert(ret == Z_OK);
+    ret = inflateEnd(&strm);                    assert(ret == Z_OK);
+    std::cout << "inflate built-in memory routines" << std::endl;;
+}
+
+/* cover all inflate() header and trailer cases and code after inflate() */
+void cover_wrap(void)
+{
+    int ret;
+    z_stream strm, copy;
+    unsigned char dict[257];
+
+    ret = inflate(Z_NULL, 0);                   assert(ret == Z_STREAM_ERROR);
+    ret = inflateEnd(Z_NULL);                   assert(ret == Z_STREAM_ERROR);
+    ret = inflateCopy(Z_NULL, Z_NULL);          assert(ret == Z_STREAM_ERROR);
+    std::cout << "inflate bad parameters" << std::endl;
+
+    inf("1f 8b 0 0", "bad gzip method", 0, 31, 0, Z_DATA_ERROR);
+    inf("1f 8b 8 80", "bad gzip flags", 0, 31, 0, Z_DATA_ERROR);
+    inf("77 85", "bad zlib method", 0, 15, 0, Z_DATA_ERROR);
+    inf("8 99", "set window size from header", 0, 0, 0, Z_OK);
+    inf("78 9c", "bad zlib window size", 0, 8, 0, Z_DATA_ERROR);
+    inf("78 9c 63 0 0 0 1 0 1", "check adler32", 0, 15, 1, Z_STREAM_END);
+    inf("1f 8b 8 1e 0 0 0 0 0 0 1 0 0 0 0 0 0", "bad header crc", 0, 47, 1,
+        Z_DATA_ERROR);
+    inf("1f 8b 8 2 0 0 0 0 0 0 1d 26 3 0 0 0 0 0 0 0 0 0", "check gzip length",
+        0, 47, 0, Z_STREAM_END);
+    inf("78 90", "bad zlib header check", 0, 47, 0, Z_DATA_ERROR);
+    inf("8 b8 0 0 0 1", "need dictionary", 0, 8, 0, Z_NEED_DICT);
+    inf("78 9c 63 0", "compute adler32", 0, 15, 1, Z_OK);
+
+    mem_setup(&strm);
+    strm.avail_in = 0;
+    strm.next_in = Z_NULL;
+    ret = inflateInit2(&strm, -8);
+    strm.avail_in = 2;
+    strm.next_in = (Bytef *)"\x63";
+    strm.avail_out = 1;
+    strm.next_out = (Bytef *)&ret;
+    mem_limit(&strm, 1);
+    ret = inflate(&strm, Z_NO_FLUSH);           assert(ret == Z_MEM_ERROR);
+    ret = inflate(&strm, Z_NO_FLUSH);           assert(ret == Z_MEM_ERROR);
+    mem_limit(&strm, 0);
+    memset(dict, 0, 257);
+    ret = inflateSetDictionary(&strm, dict, 257);
+                                                assert(ret == Z_OK);
+    mem_limit(&strm, (sizeof(struct inflate_state) << 1) + 256);
+    ret = inflatePrime(&strm, 16, 0);           assert(ret == Z_OK);
+    strm.avail_in = 2;
+    strm.next_in = (Bytef *)"\x80";
+    ret = inflateSync(&strm);                   assert(ret == Z_DATA_ERROR);
+    ret = inflate(&strm, Z_NO_FLUSH);           assert(ret == Z_STREAM_ERROR);
+    strm.avail_in = 4;
+    strm.next_in = (Bytef *)"\0\0\xff\xff";
+    ret = inflateSync(&strm);                   assert(ret == Z_OK);
+    (void)inflateSyncPoint(&strm);
+    ret = inflateCopy(&copy, &strm);            assert(ret == Z_MEM_ERROR);
+    mem_limit(&strm, 0);
+    ret = inflateUndermine(&strm, 1);           assert(ret == Z_DATA_ERROR);
+    (void)inflateMark(&strm);
+    ret = inflateEnd(&strm);                    assert(ret == Z_OK);
+    mem_done(&strm, "miscellaneous, force memory errors");
+}
+
+/* input and output functions for inflateBack() */
+local unsigned pull(void *desc, unsigned char **buf)
+{
+    static unsigned int next = 0;
+    static unsigned char dat[] = {0x63, 0, 2, 0};
+    struct inflate_state *state;
+
+    if (desc == Z_NULL) {
+        next = 0;
+        return 0;   /* no input (already provided at next_in) */
+    }
+    state = reinterpret_cast<struct inflate_state *>(((z_stream *)desc)->state);
+    if (state != Z_NULL)
+        state->mode = SYNC;     /* force an otherwise impossible situation */
+    return next < sizeof(dat) ? (*buf = dat + next++, 1) : 0;
+}
+
+local int push(void *desc, unsigned char *buf, unsigned len)
+{
+    (void)buf;
+    (void)len;
+    return desc != Z_NULL;      /* force error if desc not null */
+}
+
+/* cover inflateBack() up to common deflate data cases and after those */
+void cover_back(void)
+{
+    int ret;
+    z_stream strm;
+    unsigned char win[32768];
+
+    ret = inflateBackInit_(Z_NULL, 0, win, 0, 0);
+                                                assert(ret == Z_VERSION_ERROR);
+    ret = inflateBackInit(Z_NULL, 0, win);      assert(ret == Z_STREAM_ERROR);
+    ret = inflateBack(Z_NULL, Z_NULL, Z_NULL, Z_NULL, Z_NULL);
+                                                assert(ret == Z_STREAM_ERROR);
+    ret = inflateBackEnd(Z_NULL);               assert(ret == Z_STREAM_ERROR);
+    std::cout << "inflateBack bad parameters" << std::endl;;
+
+    mem_setup(&strm);
+    ret = inflateBackInit(&strm, 15, win);      assert(ret == Z_OK);
+    strm.avail_in = 2;
+    strm.next_in = (Bytef *)"\x03";
+    ret = inflateBack(&strm, pull, Z_NULL, push, Z_NULL);
+                                                assert(ret == Z_STREAM_END);
+        /* force output error */
+    strm.avail_in = 3;
+    strm.next_in = (Bytef *)"\x63\x00";
+    ret = inflateBack(&strm, pull, Z_NULL, push, &strm);
+                                                assert(ret == Z_BUF_ERROR);
+        /* force mode error by mucking with state */
+    ret = inflateBack(&strm, pull, &strm, push, Z_NULL);
+                                                assert(ret == Z_STREAM_ERROR);
+    ret = inflateBackEnd(&strm);                assert(ret == Z_OK);
+    mem_done(&strm, "inflateBack bad state");
+
+    ret = inflateBackInit(&strm, 15, win);      assert(ret == Z_OK);
+    ret = inflateBackEnd(&strm);                assert(ret == Z_OK);
+    std::cout << "inflateBack built-in memory routines" << std::endl;;
+}
+
+/* do a raw inflate of data in hexadecimal with both inflate and inflateBack */
+local int try(const char *hex, const char *id, int err)
+{
+    int ret;
+    unsigned len, size;
+    unsigned char *in, *out, *win;
+    char *prefix;
+    z_stream strm;
+
+    /* convert to hex */
+    in = h2b(hex, &len);
+    assert(in != NULL);
+
+    /* allocate work areas */
+    size = len << 3;
+    out = static_cast<unsigned char *>(malloc(size));
+    assert(out != NULL);
+    win = static_cast<unsigned char *>(malloc(32768));
+    assert(win != NULL);
+    prefix = static_cast<char *>(malloc(strlen(id) + 6));
+    assert(prefix != NULL);
+
+    /* first with inflate */
+    strcpy(prefix, id);
+    strcat(prefix, "-late");
+    mem_setup(&strm);
+    strm.avail_in = 0;
+    strm.next_in = Z_NULL;
+    ret = inflateInit2(&strm, err < 0 ? 47 : -15);
+    assert(ret == Z_OK);
+    strm.avail_in = len;
+    strm.next_in = in;
+    do {
+        strm.avail_out = size;
+        strm.next_out = out;
+        ret = inflate(&strm, Z_TREES);
+        assert(ret != Z_STREAM_ERROR && ret != Z_MEM_ERROR);
+        if (ret == Z_DATA_ERROR || ret == Z_NEED_DICT)
+            break;
+    } while (strm.avail_in || strm.avail_out == 0);
+    if (err) {
+        assert(ret == Z_DATA_ERROR);
+        assert(strcmp(id, strm.msg) == 0);
+    }
+    inflateEnd(&strm);
+    mem_done(&strm, prefix);
+
+    /* then with inflateBack */
+    if (err >= 0) {
+        strcpy(prefix, id);
+        strcat(prefix, "-back");
+        mem_setup(&strm);
+        ret = inflateBackInit(&strm, 15, win);
+        assert(ret == Z_OK);
+        strm.avail_in = len;
+        strm.next_in = in;
+        ret = inflateBack(&strm, pull, Z_NULL, push, Z_NULL);
+        assert(ret != Z_STREAM_ERROR);
+        if (err) {
+            assert(ret == Z_DATA_ERROR);
+            assert(strcmp(id, strm.msg) == 0);
+        }
+        inflateBackEnd(&strm);
+        mem_done(&strm, prefix);
+    }
+
+    /* clean up */
+    free(prefix);
+    free(win);
+    free(out);
+    free(in);
+    return ret;
+}
+
+/* cover deflate data cases in both inflate() and inflateBack() */
+void cover_inflate(void)
+{
+    try("0 0 0 0 0", "invalid stored block lengths", 1);
+    try("3 0", "fixed", 0);
+    try("6", "invalid block type", 1);
+    try("1 1 0 fe ff 0", "stored", 0);
+    try("fc 0 0", "too many length or distance symbols", 1);
+    try("4 0 fe ff", "invalid code lengths set", 1);
+    try("4 0 24 49 0", "invalid bit length repeat", 1);
+    try("4 0 24 e9 ff ff", "invalid bit length repeat", 1);
+    try("4 0 24 e9 ff 6d", "invalid code -- missing end-of-block", 1);
+    try("4 80 49 92 24 49 92 24 71 ff ff 93 11 0",
+        "invalid literal/lengths set", 1);
+    try("4 80 49 92 24 49 92 24 f b4 ff ff c3 84", "invalid distances set", 1);
+    try("4 c0 81 8 0 0 0 0 20 7f eb b 0 0", "invalid literal/length code", 1);
+    try("2 7e ff ff", "invalid distance code", 1);
+    try("c c0 81 0 0 0 0 0 90 ff 6b 4 0", "invalid distance too far back", 1);
+
+    /* also trailer mismatch just in inflate() */
+    try("1f 8b 8 0 0 0 0 0 0 0 3 0 0 0 0 1", "incorrect data check", -1);
+    try("1f 8b 8 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 1",
+        "incorrect length check", -1);
+    try("5 c0 21 d 0 0 0 80 b0 fe 6d 2f 91 6c", "pull 17", 0);
+    try("5 e0 81 91 24 cb b2 2c 49 e2 f 2e 8b 9a 47 56 9f fb fe ec d2 ff 1f",
+        "long code", 0);
+    try("ed c0 1 1 0 0 0 40 20 ff 57 1b 42 2c 4f", "length extra", 0);
+    try("ed cf c1 b1 2c 47 10 c4 30 fa 6f 35 1d 1 82 59 3d fb be 2e 2a fc f c",
+        "long distance and extra", 0);
+    try("ed c0 81 0 0 0 0 80 a0 fd a9 17 a9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "
+        "0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6", "window end", 0);
+    inf("2 8 20 80 0 3 0", "inflate_fast TYPE return", 0, -15, 258,
+        Z_STREAM_END);
+    inf("63 18 5 40 c 0", "window wrap", 3, -8, 300, Z_OK);
+}
+
+/* XXX(cavalcantii): fix linking error due inflate_table. */
+/* cover remaining lines in inftrees.c */
+/* void cover_trees(void) */
+/* { */
+/*     int ret; */
+/*     unsigned bits; */
+/*     unsigned short lens[16], work[16]; */
+/*     code *next, table[ENOUGH_DISTS]; */
+
+/*     /\* we need to call inflate_table() directly in order to manifest not- */
+/*        enough errors, since zlib insures that enough is always enough *\/ */
+/*     for (bits = 0; bits < 15; bits++) */
+/*         lens[bits] = (unsigned short)(bits + 1); */
+/*     lens[15] = 15; */
+/*     next = table; */
+/*     bits = 15; */
+/*     ret = inflate_table(DISTS, lens, 16, &next, &bits, work); */
+/*                                                 assert(ret == 1); */
+/*     next = table; */
+/*     bits = 1; */
+/*     ret = inflate_table(DISTS, lens, 16, &next, &bits, work); */
+/*                                                 assert(ret == 1); */
+/*     fputs("inflate_table not enough errors\n", stderr); */
+/* } */
+
+/* cover remaining inffast.c decoding and window copying */
+void cover_fast(void)
+{
+    inf("e5 e0 81 ad 6d cb b2 2c c9 01 1e 59 63 ae 7d ee fb 4d fd b5 35 41 68"
+        " ff 7f 0f 0 0 0", "fast length extra bits", 0, -8, 258, Z_DATA_ERROR);
+    inf("25 fd 81 b5 6d 59 b6 6a 49 ea af 35 6 34 eb 8c b9 f6 b9 1e ef 67 49"
+        " 50 fe ff ff 3f 0 0", "fast distance extra bits", 0, -8, 258,
+        Z_DATA_ERROR);
+    inf("3 7e 0 0 0 0 0", "fast invalid distance code", 0, -8, 258,
+        Z_DATA_ERROR);
+    inf("1b 7 0 0 0 0 0", "fast invalid literal/length code", 0, -8, 258,
+        Z_DATA_ERROR);
+    inf("d c7 1 ae eb 38 c 4 41 a0 87 72 de df fb 1f b8 36 b1 38 5d ff ff 0",
+        "fast 2nd level codes and too far back", 0, -8, 258, Z_DATA_ERROR);
+    inf("63 18 5 8c 10 8 0 0 0 0", "very common case", 0, -8, 259, Z_OK);
+    inf("63 60 60 18 c9 0 8 18 18 18 26 c0 28 0 29 0 0 0",
+        "contiguous and wrap around window", 6, -8, 259, Z_OK);
+    inf("63 0 3 0 0 0 0 0", "copy direct from output", 0, -8, 259,
+        Z_STREAM_END);
+}
+
+/* Adapted from Evgeny Legerov PoC (https://github.com/ivd38/zlib_overflow)
+ * this test case crashes in ASAN builds with the correct payload.
+ */
+local void inf_cve_2022_37434(char *hex, char *what, unsigned step, int win, unsigned len,
+                              int err)
+{
+    int ret;
+    unsigned have;
+    unsigned char *in, *out;
+    z_stream strm, copy;
+    gz_header head;
+
+    mem_setup(&strm);
+    strm.avail_in = 0;
+    strm.next_in = Z_NULL;
+    ret = inflateInit2(&strm, win);
+    if (ret != Z_OK) {
+        mem_done(&strm, what);
+        return;
+    }
+    out = static_cast<unsigned char *>(malloc(len));                          assert(out != NULL);
+    if (win == 47) {
+        head.extra = out;
+        head.extra_max = len;
+        head.name = out;
+        head.name_max = len;
+        head.comment = out;
+        head.comm_max = len;
+        ret = inflateGetHeader(&strm, &head);   assert(ret == Z_OK);
+    }
+    in = h2b(hex, &have);                       assert(in != NULL);
+    if (step == 0 || step > have)
+        step = have;
+    strm.avail_in = step;
+    have -= step;
+    strm.next_in = in;
+    do {
+        strm.avail_out = len;
+        strm.next_out = out;
+        ret = inflate(&strm, Z_NO_FLUSH);
+        if (ret != Z_OK && ret != Z_BUF_ERROR && ret != Z_NEED_DICT)
+            break;
+        have += strm.avail_in;
+        strm.avail_in = step > have ? have : step;
+        have -= strm.avail_in;
+    } while (strm.avail_in);
+    free(in);
+    free(out);
+    ret = inflateReset2(&strm, -8);
+    ret = inflateEnd(&strm);
+    mem_done(&strm, what);
+}
+
+void cover_CVE_2022_37434(void)
+{
+    char payload[] = "1f 8b 08 04 61 62 63 64 61 62 52 51 1f 8b 08 04 61 62 63 64 61 62 52 51 1f 8b 08 04 61 62 63 64 61 62 52 51 1f 8b 08 04 61 62 63 64 61 62 52 51";
+    char cve[] = "wtf";
+    inf_cve_2022_37434(payload, cve, 13, 47, 12, Z_OK);
+}
+
+// clang-format on
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/infcover.h b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/infcover.h
new file mode 100644
index 0000000000..dbf67d7b4d
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/infcover.h
@@ -0,0 +1,12 @@
+#ifndef __INF_COVER_H__
+#define __INF_COVER_H__
+
+void cover_support(void);
+void cover_wrap(void);
+void cover_back(void);
+void cover_inflate(void);
+void cover_trees(void);
+void cover_fast(void);
+
+void cover_CVE_2022_37434(void);
+#endif
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/run_all_unittests.cc b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/run_all_unittests.cc
new file mode 100644
index 0000000000..4b6115b074
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/run_all_unittests.cc
@@ -0,0 +1,14 @@
+// Copyright 2020 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "base/functional/bind.h"
+#include "base/test/launcher/unit_test_launcher.h"
+#include "base/test/test_suite.h"
+
+int main(int argc, char** argv) {
+  base::TestSuite test_suite(argc, argv);
+  return base::LaunchUnitTests(
+      argc, argv,
+      base::BindOnce(&base::TestSuite::Run, base::Unretained(&test_suite)));
+}
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/standalone_test_runner.cc b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/standalone_test_runner.cc
new file mode 100644
index 0000000000..1ec9c30bac
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/standalone_test_runner.cc
@@ -0,0 +1,9 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the Chromium source repository LICENSE file.
+#include <gtest/gtest.h>
+
+int main(int argc, char** argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/utils_unittest.cc b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/utils_unittest.cc
new file mode 100644
index 0000000000..d06dbc9812
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/contrib/tests/utils_unittest.cc
@@ -0,0 +1,1150 @@
+// Copyright 2020 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the Chromium source repository LICENSE file.
+
+#include "infcover.h"
+
+#include <cstddef>
+#include <vector>
+
+#include "compression_utils_portable.h"
+#include "gtest.h"
+
+#if !defined(CMAKE_STANDALONE_UNITTESTS)
+#include "base/files/file_path.h"
+#include "base/files/scoped_temp_dir.h"
+
+#include "third_party/zlib/contrib/minizip/unzip.h"
+#include "third_party/zlib/contrib/minizip/zip.h"
+#endif
+
+#include "zlib.h"
+
+void TestPayloads(size_t input_size, zlib_internal::WrapperType type) {
+  std::vector<unsigned char> input;
+  input.reserve(input_size);
+  for (size_t i = 1; i <= input_size; ++i)
+    input.push_back(i & 0xff);
+
+  // If it is big enough for GZIP, will work for other wrappers.
+  std::vector<unsigned char> compressed(
+      zlib_internal::GzipExpectedCompressedSize(input.size()));
+  std::vector<unsigned char> decompressed(input.size());
+
+  // Libcores's java/util/zip/Deflater default settings: ZLIB,
+  // DEFAULT_COMPRESSION and DEFAULT_STRATEGY.
+  unsigned long compressed_size = static_cast<unsigned long>(compressed.size());
+  int result = zlib_internal::CompressHelper(
+      type, compressed.data(), &compressed_size, input.data(), input.size(),
+      Z_DEFAULT_COMPRESSION, nullptr, nullptr);
+  ASSERT_EQ(result, Z_OK);
+
+  unsigned long decompressed_size =
+      static_cast<unsigned long>(decompressed.size());
+  result = zlib_internal::UncompressHelper(type, decompressed.data(),
+                                           &decompressed_size,
+                                           compressed.data(), compressed_size);
+  ASSERT_EQ(result, Z_OK);
+  EXPECT_EQ(input, decompressed);
+}
+
+TEST(ZlibTest, ZlibWrapper) {
+  // Minimal ZLIB wrapped short stream size is about 8 bytes.
+  for (size_t i = 1; i < 1024; ++i)
+    TestPayloads(i, zlib_internal::WrapperType::ZLIB);
+}
+
+TEST(ZlibTest, GzipWrapper) {
+  // GZIP should be 12 bytes bigger than ZLIB wrapper.
+  for (size_t i = 1; i < 1024; ++i)
+    TestPayloads(i, zlib_internal::WrapperType::GZIP);
+}
+
+TEST(ZlibTest, RawWrapper) {
+  // RAW has no wrapper (V8 Blobs is a known user), size
+  // should be payload_size + 2 for short payloads.
+  for (size_t i = 1; i < 1024; ++i)
+    TestPayloads(i, zlib_internal::WrapperType::ZRAW);
+}
+
+TEST(ZlibTest, InflateCover) {
+  cover_support();
+  cover_wrap();
+  cover_back();
+  cover_inflate();
+  // TODO(cavalcantii): enable this last test.
+  // cover_trees();
+  cover_fast();
+}
+
+TEST(ZlibTest, InflateCVE) {
+  cover_CVE_2022_37434();
+}
+
+TEST(ZlibTest, DeflateStored) {
+  const int no_compression = 0;
+  const zlib_internal::WrapperType type = zlib_internal::WrapperType::GZIP;
+  std::vector<unsigned char> input(1 << 10, 42);
+  std::vector<unsigned char> compressed(
+      zlib_internal::GzipExpectedCompressedSize(input.size()));
+  std::vector<unsigned char> decompressed(input.size());
+  unsigned long compressed_size = static_cast<unsigned long>(compressed.size());
+  int result = zlib_internal::CompressHelper(
+      type, compressed.data(), &compressed_size, input.data(), input.size(),
+      no_compression, nullptr, nullptr);
+  ASSERT_EQ(result, Z_OK);
+
+  unsigned long decompressed_size =
+      static_cast<unsigned long>(decompressed.size());
+  result = zlib_internal::UncompressHelper(type, decompressed.data(),
+                                           &decompressed_size,
+                                           compressed.data(), compressed_size);
+  ASSERT_EQ(result, Z_OK);
+  EXPECT_EQ(input, decompressed);
+}
+
+TEST(ZlibTest, StreamingInflate) {
+  uint8_t comp_buf[4096], decomp_buf[4096];
+  z_stream comp_strm, decomp_strm;
+  int ret;
+
+  std::vector<uint8_t> src;
+  for (size_t i = 0; i < 1000; i++) {
+    for (size_t j = 0; j < 40; j++) {
+      src.push_back(j);
+    }
+  }
+
+  // Deflate src into comp_buf.
+  comp_strm.zalloc = Z_NULL;
+  comp_strm.zfree = Z_NULL;
+  comp_strm.opaque = Z_NULL;
+  ret = deflateInit(&comp_strm, Z_BEST_COMPRESSION);
+  ASSERT_EQ(ret, Z_OK);
+  comp_strm.next_out = comp_buf;
+  comp_strm.avail_out = sizeof(comp_buf);
+  comp_strm.next_in = src.data();
+  comp_strm.avail_in = src.size();
+  ret = deflate(&comp_strm, Z_FINISH);
+  ASSERT_EQ(ret, Z_STREAM_END);
+  size_t comp_sz = sizeof(comp_buf) - comp_strm.avail_out;
+
+  // Inflate comp_buf one 4096-byte buffer at a time.
+  decomp_strm.zalloc = Z_NULL;
+  decomp_strm.zfree = Z_NULL;
+  decomp_strm.opaque = Z_NULL;
+  ret = inflateInit(&decomp_strm);
+  ASSERT_EQ(ret, Z_OK);
+  decomp_strm.next_in = comp_buf;
+  decomp_strm.avail_in = comp_sz;
+
+  while (decomp_strm.avail_in > 0) {
+    decomp_strm.next_out = decomp_buf;
+    decomp_strm.avail_out = sizeof(decomp_buf);
+    ret = inflate(&decomp_strm, Z_FINISH);
+    ASSERT_TRUE(ret == Z_OK || ret == Z_STREAM_END || ret == Z_BUF_ERROR);
+
+    // Verify the output bytes.
+    size_t num_out = sizeof(decomp_buf) - decomp_strm.avail_out;
+    for (size_t i = 0; i < num_out; i++) {
+      EXPECT_EQ(decomp_buf[i], src[decomp_strm.total_out - num_out + i]);
+    }
+  }
+
+  // Cleanup memory (i.e. makes ASAN bot happy).
+  ret = deflateEnd(&comp_strm);
+  EXPECT_EQ(ret, Z_OK);
+  ret = inflateEnd(&decomp_strm);
+  EXPECT_EQ(ret, Z_OK);
+}
+
+TEST(ZlibTest, CRCHashBitsCollision) {
+  // The CRC32c of the hex sequences 2a,14,14,14 and 2a,14,db,14 have the same
+  // lower 9 bits. Since longest_match doesn't check match[2], a bad match could
+  // be chosen when the number of hash bits is <= 9. For this reason, the number
+  // of hash bits must be set higher, regardless of the memlevel parameter, when
+  // using CRC32c hashing for string matching. See https://crbug.com/1113596
+
+  std::vector<uint8_t> src = {
+      // Random byte; zlib doesn't match at offset 0.
+      123,
+
+      // This will look like 5-byte match.
+      0x2a,
+      0x14,
+      0xdb,
+      0x14,
+      0x15,
+
+      // Offer a 4-byte match to bump the next expected match length to 5.
+      0x2a,
+      0x14,
+      0x14,
+      0x14,
+
+      0x2a,
+      0x14,
+      0x14,
+      0x14,
+      0x15,
+  };
+
+  z_stream stream;
+  stream.zalloc = nullptr;
+  stream.zfree = nullptr;
+
+  // Using a low memlevel to try to reduce the number of hash bits. Negative
+  // windowbits means raw deflate, i.e. without the zlib header.
+  int ret = deflateInit2(&stream, /*comp level*/ 2, /*method*/ Z_DEFLATED,
+                         /*windowbits*/ -15, /*memlevel*/ 2,
+                         /*strategy*/ Z_DEFAULT_STRATEGY);
+  ASSERT_EQ(ret, Z_OK);
+  std::vector<uint8_t> compressed(100, '\0');
+  stream.next_out = compressed.data();
+  stream.avail_out = compressed.size();
+  stream.next_in = src.data();
+  stream.avail_in = src.size();
+  ret = deflate(&stream, Z_FINISH);
+  ASSERT_EQ(ret, Z_STREAM_END);
+  compressed.resize(compressed.size() - stream.avail_out);
+  deflateEnd(&stream);
+
+  ret = inflateInit2(&stream, /*windowbits*/ -15);
+  ASSERT_EQ(ret, Z_OK);
+  std::vector<uint8_t> decompressed(src.size(), '\0');
+  stream.next_in = compressed.data();
+  stream.avail_in = compressed.size();
+  stream.next_out = decompressed.data();
+  stream.avail_out = decompressed.size();
+  ret = inflate(&stream, Z_FINISH);
+  ASSERT_EQ(ret, Z_STREAM_END);
+  EXPECT_EQ(0U, stream.avail_out);
+  inflateEnd(&stream);
+
+  EXPECT_EQ(src, decompressed);
+}
+
+TEST(ZlibTest, CRCHashAssert) {
+  // The CRC32c of the hex sequences ff,ff,5e,6f and ff,ff,13,ff have the same
+  // lower 15 bits. This means longest_match's assert that match[2] == scan[2]
+  // won't hold. However, such hash collisions are only possible when one of the
+  // other four bytes also mismatch. This tests that zlib's assert handles this
+  // case.
+
+  std::vector<uint8_t> src = {
+      // Random byte; zlib doesn't match at offset 0.
+      123,
+
+      // This has the same hash as the last byte sequence, and the first two and
+      // last two bytes match; though the third and the fourth don't.
+      0xff,
+      0xff,
+      0x5e,
+      0x6f,
+      0x12,
+      0x34,
+
+      // Offer a 5-byte match to bump the next expected match length to 6
+      // (because the two first and two last bytes need to match).
+      0xff,
+      0xff,
+      0x13,
+      0xff,
+      0x12,
+
+      0xff,
+      0xff,
+      0x13,
+      0xff,
+      0x12,
+      0x34,
+  };
+
+  z_stream stream;
+  stream.zalloc = nullptr;
+  stream.zfree = nullptr;
+
+  int ret = deflateInit2(&stream, /*comp level*/ 5, /*method*/ Z_DEFLATED,
+                         /*windowbits*/ -15, /*memlevel*/ 8,
+                         /*strategy*/ Z_DEFAULT_STRATEGY);
+  ASSERT_EQ(ret, Z_OK);
+  std::vector<uint8_t> compressed(100, '\0');
+  stream.next_out = compressed.data();
+  stream.avail_out = compressed.size();
+  stream.next_in = src.data();
+  stream.avail_in = src.size();
+  ret = deflate(&stream, Z_FINISH);
+  ASSERT_EQ(ret, Z_STREAM_END);
+  compressed.resize(compressed.size() - stream.avail_out);
+  deflateEnd(&stream);
+
+  ret = inflateInit2(&stream, /*windowbits*/ -15);
+  ASSERT_EQ(ret, Z_OK);
+  std::vector<uint8_t> decompressed(src.size(), '\0');
+  stream.next_in = compressed.data();
+  stream.avail_in = compressed.size();
+  stream.next_out = decompressed.data();
+  stream.avail_out = decompressed.size();
+  ret = inflate(&stream, Z_FINISH);
+  ASSERT_EQ(ret, Z_STREAM_END);
+  EXPECT_EQ(0U, stream.avail_out);
+  inflateEnd(&stream);
+
+  EXPECT_EQ(src, decompressed);
+}
+
+// Fuzzer generated.
+static const uint8_t checkMatchCrashData[] = {
+    0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc5, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x00,
+    0x6e, 0x6e, 0x6e, 0x00, 0x00, 0x00, 0x00, 0x6e, 0x01, 0x39, 0x6e, 0x6e,
+    0x00, 0x00, 0x00, 0x00, 0xf7, 0xff, 0x00, 0x00, 0x00, 0x00, 0x6e, 0x6e,
+    0x00, 0x00, 0x0a, 0x9a, 0x00, 0x00, 0x6e, 0x6e, 0x6e, 0x2a, 0x00, 0x00,
+    0x00, 0xd5, 0xf0, 0x00, 0x81, 0x02, 0xf3, 0xfd, 0xff, 0xab, 0xf3, 0x6e,
+    0x7e, 0x04, 0x5b, 0xf6, 0x2a, 0x2c, 0xf8, 0x00, 0x54, 0xf3, 0xa5, 0x0e,
+    0xfd, 0x6e, 0xff, 0x00, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0xa4, 0x0b, 0xa5, 0x2a, 0x0d, 0x10, 0x01, 0x26, 0xf6, 0x04, 0x0e,
+    0xff, 0x6e, 0x6e, 0x6e, 0x76, 0x00, 0x00, 0x87, 0x01, 0xfe, 0x0d, 0xb6,
+    0x6e, 0x6e, 0xf7, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0xfd, 0x00, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x29, 0x00, 0x9b,
+    0x02, 0x00, 0x00, 0x00, 0x00, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a,
+    0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x6e, 0xff, 0xff, 0x00,
+    0x00, 0xd5, 0xf0, 0x00, 0xff, 0x40, 0x7e, 0x0b, 0xa5, 0x10, 0x67, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x40, 0x7e, 0x0b, 0xa5, 0x10, 0x67,
+    0x7e, 0x32, 0x6e, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x40, 0x0b, 0xa5,
+    0x10, 0x67, 0x01, 0xfe, 0x0d, 0xb6, 0x2a, 0x00, 0x00, 0x58, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x6e, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x3d, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3d, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xd6, 0x2d, 0x2d, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a,
+    0x8a, 0x8a, 0x8a, 0x8a, 0x66, 0x8a, 0x8a, 0x8a, 0xee, 0x1d, 0x00, 0x00,
+    0x00, 0x02, 0x00, 0x00, 0x00, 0xee, 0x0a, 0x00, 0x00, 0x00, 0x54, 0x40,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0xf3, 0x00, 0x00, 0xff, 0xff, 0x23, 0x7e, 0x00, 0x1e,
+    0x00, 0x00, 0xd5, 0xf0, 0x00, 0xff, 0x40, 0x0b, 0xa5, 0x10, 0x67, 0x01,
+    0xfe, 0x0d, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a,
+    0x8a, 0x8a, 0x8a, 0x2d, 0x6e, 0x2d, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x0e,
+    0xfb, 0x00, 0x10, 0x24, 0x00, 0x00, 0xfb, 0xff, 0x00, 0x00, 0xff, 0x1f,
+    0xb3, 0x00, 0x04, 0x3d, 0x00, 0xee, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3d, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x3d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00,
+    0x01, 0x45, 0x3d, 0x00, 0x00, 0x00, 0xfd, 0x00, 0x11, 0x21, 0x00, 0x1e,
+    0x00, 0x0c, 0xb3, 0xfe, 0x0e, 0xee, 0x02, 0x00, 0x1d, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x6e, 0x6e, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x6e, 0x00,
+    0x00, 0x87, 0x00, 0x33, 0x38, 0x6e, 0x6e, 0x6e, 0x6e, 0x6e, 0x00, 0x00,
+    0x00, 0x38, 0x00, 0x00, 0xff, 0xff, 0xff, 0x04, 0x3f, 0xff, 0xff, 0xff,
+    0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0xff, 0x00, 0x31, 0x13, 0x13, 0x13,
+    0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xab, 0x30, 0x83, 0x33,
+    0x00, 0x00, 0x01, 0x05, 0x00, 0x00, 0xff, 0xff, 0x7d, 0xff, 0x00, 0x01,
+    0x10, 0x0d, 0x2a, 0xa5, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfd, 0x00, 0x11,
+    0x21, 0x00, 0xa5, 0x00, 0x68, 0x68, 0x68, 0x67, 0x00, 0x00, 0xff, 0xff,
+    0x02, 0x00, 0x00, 0x68, 0x68, 0x68, 0x68, 0x00, 0x00, 0xfa, 0xff, 0xff,
+    0x03, 0x01, 0xff, 0x02, 0x00, 0x00, 0x68, 0x68, 0x68, 0x68, 0x0a, 0x10,
+    0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff,
+    0x06, 0x00, 0x00, 0x2b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0xfa, 0xff, 0xff, 0x08, 0xff, 0xff, 0xff, 0x00, 0x06, 0x04,
+    0x00, 0xf8, 0xff, 0xff, 0x00, 0x01, 0x00, 0x00, 0x25, 0x00, 0x00, 0x00,
+    0x00, 0xff, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x78, 0x00, 0x00, 0x01, 0x00, 0xff, 0xff, 0xff, 0x00, 0x06, 0x04, 0x6e,
+    0x7e, 0x87, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3d, 0x00, 0x00,
+    0x00, 0x6e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x87, 0x6e, 0x6e, 0x6e,
+    0x00, 0x01, 0x38, 0xd5, 0xf0, 0x00, 0x00, 0x2a, 0xfe, 0x04, 0x5b, 0x0d,
+    0xfd, 0x6e, 0x92, 0x28, 0xf9, 0xfb, 0xff, 0x07, 0xd2, 0xd6, 0x2d, 0x2d,
+    0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a,
+    0x8a, 0x8a, 0xc2, 0x91, 0x00, 0x5b, 0xef, 0xde, 0xf2, 0x6e, 0x6e, 0xfd,
+    0x0c, 0x02, 0x91, 0x62, 0x91, 0xfd, 0x6e, 0x6e, 0xd3, 0x06, 0x00, 0x00,
+    0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00,
+    0xd5, 0xf0, 0x00, 0xff, 0x00, 0x00, 0x31, 0x13, 0x13, 0x13, 0x04, 0x00,
+    0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x04, 0x00, 0x13, 0x0a, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x6e, 0x00, 0x00, 0x01,
+    0x00, 0x00, 0x09, 0x00, 0x6a, 0x24, 0x26, 0x30, 0x01, 0x2e, 0x2a, 0xfe,
+    0x04, 0x5b, 0x0d, 0xfd, 0x6e, 0x6e, 0xd7, 0x06, 0x6e, 0x6e, 0x6e, 0x00,
+    0x00, 0xb1, 0xb1, 0xb1, 0xb1, 0x00, 0x00, 0x00, 0x6e, 0x5b, 0x00, 0x00,
+    0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x01, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x1e, 0x00, 0x00, 0x00, 0x87, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6b, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x0b,
+    0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x24, 0x2a, 0x6e, 0x5c, 0x24,
+    0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x87, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xeb,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x40, 0x00, 0x40, 0x00, 0x00, 0x00, 0x58, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+    0x05, 0x00, 0x00, 0x00, 0x5d, 0x10, 0x6e, 0x6e, 0xa5, 0x2f, 0x00, 0x00,
+    0x95, 0x87, 0x00, 0x6e};
+
+TEST(ZlibTest, CheckMatchCrash) {
+  // See https://crbug.com/1113142.
+  z_stream stream;
+  stream.zalloc = nullptr;
+  stream.zfree = nullptr;
+
+  // Low windowbits to hit window sliding also with a relatively small input.
+  int ret = deflateInit2(&stream, /*comp level*/ 5, /*method*/ Z_DEFLATED,
+                         /*windowbits*/ -9, /*memlevel*/ 8,
+                         /*strategy*/ Z_DEFAULT_STRATEGY);
+  ASSERT_EQ(ret, Z_OK);
+
+  uint8_t compressed[sizeof(checkMatchCrashData) * 2];
+  stream.next_out = compressed;
+  stream.avail_out = sizeof(compressed);
+
+  for (size_t i = 0; i < sizeof(checkMatchCrashData); i++) {
+    ASSERT_GT(stream.avail_out, 0U);
+    stream.next_in = (uint8_t*)&checkMatchCrashData[i];
+    stream.avail_in = 1;
+    ret = deflate(&stream, Z_NO_FLUSH);
+    ASSERT_EQ(ret, Z_OK);
+  }
+
+  stream.next_in = nullptr;
+  stream.avail_in = 0;
+  ASSERT_GT(stream.avail_out, 0U);
+  ret = deflate(&stream, Z_FINISH);
+  ASSERT_EQ(ret, Z_STREAM_END);
+  size_t compressed_sz = sizeof(compressed) - stream.avail_out;
+  deflateEnd(&stream);
+
+  uint8_t decompressed[sizeof(checkMatchCrashData)];
+  ret = inflateInit2(&stream, -15);
+  ASSERT_EQ(ret, Z_OK);
+  stream.next_in = compressed;
+  stream.avail_in = compressed_sz;
+  stream.next_out = decompressed;
+  stream.avail_out = sizeof(decompressed);
+  ret = inflate(&stream, Z_FINISH);
+  ASSERT_EQ(ret, Z_STREAM_END);
+  inflateEnd(&stream);
+  ASSERT_EQ(
+      memcmp(checkMatchCrashData, decompressed, sizeof(checkMatchCrashData)),
+      0);
+}
+
+TEST(ZlibTest, DeflateRLEUninitUse) {
+  // MSan would complain about use of uninitialized values in deflate_rle if the
+  // window isn't zero-initialized. See crbug.com/1137613. Similar problems
+  // exist in other places in zlib, e.g. longest_match (crbug.com/1144420) but
+  // we don't have as nice test cases.
+
+  int level = 9;
+  int windowBits = 9;
+  int memLevel = 8;
+  int strategy = Z_RLE;
+  const std::vector<uint8_t> src{
+      0x31, 0x64, 0x38, 0x32, 0x30, 0x32, 0x30, 0x36, 0x65, 0x35, 0x38, 0x35,
+      0x32, 0x61, 0x30, 0x36, 0x65, 0x35, 0x32, 0x66, 0x30, 0x34, 0x38, 0x37,
+      0x61, 0x31, 0x38, 0x36, 0x37, 0x37, 0x31, 0x39, 0x0a, 0x65, 0x62, 0x00,
+      0x9f, 0xff, 0xc6, 0xc6, 0xc6, 0xff, 0x09, 0x00, 0x62, 0x00, 0x9f, 0xff,
+      0xc6, 0xc6, 0xc6, 0xff, 0x09, 0x00, 0x62, 0x00, 0x9f, 0xff, 0xc6, 0xc6,
+      0xc6, 0xff, 0x09, 0x00, 0x62, 0x00, 0x9f, 0xff, 0xc6, 0xc6, 0xc6, 0x95,
+      0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x0e, 0x0a, 0x54, 0x52,
+      0x58, 0x56, 0xab, 0x26, 0x13, 0x53, 0x5a, 0xb5, 0x30, 0xbb, 0x96, 0x44,
+      0x80, 0xe6, 0xc5, 0x0a, 0xd0, 0x47, 0x7a, 0xa0, 0x4e, 0xbe, 0x30, 0xdc,
+      0xa1, 0x08, 0x54, 0xe1, 0x51, 0xd1, 0xea, 0xef, 0xdb, 0xa1, 0x2d, 0xb4,
+      0xb9, 0x58, 0xb1, 0x2f, 0xf0, 0xae, 0xbc, 0x07, 0xd1, 0xba, 0x7f, 0x14,
+      0xa4, 0xde, 0x99, 0x7f, 0x4d, 0x3e, 0x25, 0xd9, 0xef, 0xee, 0x4f, 0x38,
+      0x7b, 0xaf, 0x3f, 0x6b, 0x53, 0x5a, 0xcb, 0x1f, 0x97, 0xb5, 0x43, 0xa3,
+      0xe8, 0xff, 0x09, 0x00, 0x62, 0x00, 0x9f, 0xff, 0xc6, 0xc6, 0xc6, 0xff,
+      0x09, 0x00, 0x62, 0x00, 0x9f, 0xff, 0xc6, 0xc6, 0xc6, 0xff, 0x09, 0x00,
+      0x62, 0x00, 0x9f, 0xff, 0xc6, 0xc6, 0xc6, 0xff, 0x09, 0x00, 0x62, 0x00,
+      0x9f, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x3c,
+      0x73, 0x70, 0x23, 0x87, 0xec, 0xf8, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0xc1, 0x00, 0x00, 0x9f, 0xc6, 0xc6, 0xff, 0x09, 0x00, 0x62, 0x00, 0x9f,
+      0xff, 0xc6, 0xc6, 0xc6, 0xff, 0x09, 0x00, 0x62, 0x00, 0x9f, 0xff, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00,
+  };
+
+  z_stream stream;
+  stream.zalloc = Z_NULL;
+  stream.zfree = Z_NULL;
+
+  // Compress the data one byte at a time to exercise the streaming code.
+  int ret =
+      deflateInit2(&stream, level, Z_DEFLATED, windowBits, memLevel, strategy);
+  ASSERT_EQ(ret, Z_OK);
+  std::vector<uint8_t> compressed(src.size() * 2 + 1000);
+  stream.next_out = compressed.data();
+  stream.avail_out = compressed.size();
+  for (uint8_t b : src) {
+    stream.next_in = &b;
+    stream.avail_in = 1;
+    ret = deflate(&stream, Z_NO_FLUSH);
+    ASSERT_EQ(ret, Z_OK);
+  }
+  stream.next_in = Z_NULL;
+  stream.avail_in = 0;
+  ret = deflate(&stream, Z_FINISH);
+  ASSERT_EQ(ret, Z_STREAM_END);
+  deflateEnd(&stream);
+}
+
+static const char zFixedCorruptionData[] =
+    "AAABAACAADAAEAAFAAGAAHAAIAAJAAKAALAAMAANAAOAAPAAQAARAASAATAAUAAVAAWAAXAAYA"
+    "AZABBABCABDABEABFABGABHABIABJABKABLABMABNABOABPABQABRABSABTABUABVABWABXABY"
+    "ABZACBACCACDACEACFACGACHACIACJACKACLACMACNACOACPACQACRACSACTACUACVACWACXAC"
+    "YACZADBADCADDADEADFADGADHADIADJADKADLADMADNADOADPADQADRADSADTADUADVADWADXA"
+    "DYADZAEBAECAEDAEEAEFAEGAEHAEIAEJAEKAELAEMAENAEOAEPAEQAERAESAETAEUAEVAEWAEX"
+    "AEYAEZAFBAFCAFDAFEAFFAFGAFHAFIAFJAFKAFLAFMAFNAFOAFPAFQAFRAFSAFTAFUAFVAFWAF"
+    "XAFYAFZAGBAGCAGDAGEAGFAGGAGHAGIAGJAGKAGLAGMAGNAGOAGPAGQAGRAGSAGTAGUAGVAGWA"
+    "GXAGYAGZAHBAHCAHDAHEAHFAHGAHHAHIAHJAHKAHLAHMAHNAHOAHPAHQAHRAHSAHTAHUAHVAHW"
+    "AHXAHYAHZAIBAICAIDAIEAIFAIGAIHAIIAIJAIKAILAIMAINAIOAIPAIQAIRAISAITAIUAIVAI"
+    "WAIXAIYAIZAJBAJCAJDAJEAJFAJGAJHAJIAJJAJKAJLAJMAJNAJOAJPAJQAJRAJSAJTAJUAJVA"
+    "JWAJXAJYAJZAKBAKCAKDAKEAKFAKGAKHAKIAKJAKKAKLAKMAKNAKOAKPAKQAKRAKSAKTAKUAKV"
+    "AKWAKXAKYAKZALBALCALDALEALFALGALHALIALJALKALLALMALNALOALPALQALRALSALTALUAL"
+    "VALWALXALYALZAMBAMCAMDAMEAMFAMGAMHAMIAMJAMKAMLAMMAMNAMOAMPAMQAMRAMSAMTAMUA"
+    "MVAMWAMXAMYAMZANBANCANDANEANFANGANHANIANJANKANLANMANNANOANPANQANRANSANTANU"
+    "ANVANWANXANYANZAOBAOCAODAOEAOFAOGAOHAOIAOJAOKAOLAOMAONAOOAOPAOQAORAOSAOTAO"
+    "UAOVAOWAOXAOYAOZAPBAPCAPDAPEAPFAPGAPHAPIAPJAPKAPLAPMAPNAPOAPPAPQAPRAPSAPTA"
+    "PUAPVAPWAPXAPYAPZAQBAQCAQDAQEAQFAQGAQHAQIAQJAQKAQLAQMAQNAQOAQPAQQAQRAQSAQT"
+    "AQUAQVAQWAQXAQYAQZARBARCARDAREARFARGARHARIARJARKARLARMARNAROARPARQARRARSAR"
+    "TARUARVARWARXARYARZASBASCASDASEASFASGASHASIASJASKASLASMASNASOASPASQASRASSA"
+    "STASUASVASWASXASYASZATBATCATDATEATFATGATHATIATJATKATLATMATNATOATPATQATRATS"
+    "ATTATUATVATWATXATYATZAUBAUCAUDAUEAUFAUGAUHAUIAUJAUKAULAUMAUNAUOAUPAUQAURAU"
+    "SAUTAUUAUVAUWAUXAUYAUZAVBAVCAVDAVEAVFAVGAVHAVIAVJAVKAVLAVMAVNAVOAVPAVQAVRA"
+    "VSAVTAVUAVVAVWAVXAVYAVZAWBAWCAWDAWEAWFAWGAWHAWIAWJAWKAWLAWMAWNAWOAWPAWQAWR"
+    "AWSAWTAWUAWVAWWAWXAWYAWZAXBAXCAXDAXEAXFAXGAXHAXIAXJAXKAXLAXMAXNAXOAXPAXQAX"
+    "RAXSAXTAXUAXVAXWAXXAXYAXZAYBAYCAYDAYEAYFAYGAYHAYIAYJAYKAYLAYMAYNAYOAYPAYQA"
+    "YRAYSAYTAYUAYVAYWAYXAYYAYZAZBAZCAZDAZEAZFAZGAZHAZIAZJAZKAZLAZMAZNAZOAZPAZQ"
+    "AZRAZSAZTAZUAZVAZWAZXAZYAZZBBBCBBDBBEBBFBBGBBHBBIBBJBBKBBLBBMBBNBBOBBPBBQB"
+    "BRBBSBBTBBUBBVBBWBBXBBYBBZBCCBCDBCEBCFBCGBCHBCIBCJBCKBCLBCMBCNBCOBCPBCQBCR"
+    "BCSBCTBCUBCVBCWBCXBCYBCZBDCBDDBDEBDFBDGBDHBDIBDJBDKBDLBDMBDNBDOBDPBDQBDRBD"
+    "SBDTBDUBDVBDWBDXBDYBDZBECBEDBEEBEFBEGBEHBEIBEJBEKBELBEMBENBEOBEPBEQBERBESB"
+    "ETBEUBEVBEWBEXBEYBEZBFCBFDBFEBFFBFGBFHBFIBFJBFKBFLBFMBFNBFOBFPBFQBFRBFSBFT"
+    "BFUBFVBFWBFXBFYBFZBGCBGDBGEBGFBGGBGHBGIBGJBGKBGLBGMBGNBGOBGPBGQBGRBGSBGTBG"
+    "UBGVBGWBGXBGYBGZBHCBHDBHEBHFBHGBHHBHIBHJBHKBHLBHMBHNBHOBHPBHQBHRBHSBHTBHUB"
+    "HVBHWBHXBHYBHZBICBIDBIEBIFBIGBIHBIIBIJBIKBILBIMBINBIOBIPBIQBIRBISBITBIUBIV"
+    "BIWBIXBIYBIZBJCBJDBJEBJFBJGBJHBJIBJJBJKBJLBJMBJNBJOBJPBJQBJRBJSBJTBJUBJVBJ"
+    "WBJXBJYBJZBKCBKDBKEBKFBKGBKHBKIBKJBKKBKLBKMBKNBKOBKPBKQBKRBKSBKTBKUBKVBKWB"
+    "KXBKYBKZBLCBLDBLEBLFBLGBLHBLIBLJBLKBLLBLMBLNBLOBLPBLQBLRBLSBLTBLUBLVBLWBLX"
+    "BLYBLZBMCBMDBMEBMFBMGBMHBMIBMJBMKBMLBMMBMNBMOBMPBMQBMRBMSBMTBMUBMVBMWBMXBM"
+    "YBMZBNCBNDBNEBNFBNGBNHBNIBNJBNKBNLBNMBNNBNOBNPBNQBNRBNSBNTBNUBNVBNWBNXBNYB"
+    "NZBOCBODBOEBOFBOGBOHBOIBOJBOKBOLBOMBONBOOBOPBOQBORBOSBOTBOUBOVBOWBOXBOYBOZ"
+    "BPCBPDBPEBPFBPGBPHBPIBPJBPKBPLBPMBPNBPOBPPBPQBPRBPSBPTBPUBPVBPWBPXBPYBPZBQ"
+    "CBQDBQEBQFBQGBQHBQIBQJBQKBQLBQMBQNBQOBQPBQQBQRBQSBQTBQUBQVBQWBQXBQYBQZBRCB"
+    "RDBREBRFBRGBRHBRIBRJBRKBRLBRMBRNBROBRPBRQBRRBRSBRTBRUBRVBRWBRXBRYBRZBSCBSD"
+    "BSEBSFBSGBSHBSIBSJBSKBSLBSMBSNBSOBSPBSQBSRBSSBSTBSUBSVBSWBSXBSYBSZBTCBTDBT"
+    "EBTFBTGBTHBTIBTJBTKBTLBTMBTNBTOBTPBTQBTRBTSBTTBTUBTVBTWBTXBTYBTZBUCBUDBUEB"
+    "UFBUGBUHBUIBUJBUKBULBUMBUNBUOBUPBUQBURBUSBUTBUUBUVBUWBUXBUYBUZBVCBVDBVEBVF"
+    "BVGBVHBVIBVJBVKBVLBVMBVNBVOBVPBVQBVRBVSBVTBVUBVVBVWBVXBVYBVZBWCBWDBWEBWFBW"
+    "GBWHBWIBWJBWKBWLBWMBWNBWOBWPBWQBWRBWSBWTBWUBWVBWWBWXBWYBWZBXCBXDBXEBXFBXGB"
+    "XHBXIBXJBXKBXLBXMBXNBXOBXPBXQBXRBXSBXTBXUBXVBXWBXXBXYBXZBYCBYDBYEBYFBYGBYH"
+    "BYIBYJBYKBYLBYMBYNBYOBYPBYQBYRBYSBYTBYUBYVBYWBYXBYYBYZBZCBZDBZEBZFBZGBZHBZ"
+    "IBZJBZKBZLBZMBZNBZOBZPBZQBZRBZSBZTBZUBZVBZWBZXBZYBZZCCCDCCECCFCCGCCHCCICCJ"
+    "CCKCCLCCMCCNCCOCCPCCQCCRCCSCCTCCUCCVCCWCCXCCYCCZCDDCDECDFCDGCDHCDICDJCDKCD"
+    "LCDMCDNCDOCDPCDQCDRCDSCDTCDUCDVCDWCDXCDYCDZCEDCEECEFCEGCEHCEICEJCEKCELCEMC"
+    "ENCEOCEPCEQCERCESCETCEUCEVCEWCEXCEYCEZCFDCFECFFCFGCFHCFICFJCFKCFLCFMCFNCFO"
+    "CFPCFQCFRCFSCFTCFUCFVCFWCFXCFYCFZCGDCGECGFCGGCGHCGICGJCGKCGLCGMCGNCGOCGPCG"
+    "QCGRCGSCGTCGUCGVCGWCGXCGYCGZCHDCHECHFCHGCHHCHICHJCHKCHLCHMCHNCHOCHPCHQCHRC"
+    "HSCHTCHUCHVCHWCHXCHYCHZCIDCIECIFCIGCIHCIICIJCIKCILCIMCINCIOCIPCIQCIRCISCIT"
+    "CIUCIVCIWCIXCIYCIZCJDCJECJFCJGCJHCJICJJCJKCJLCJMCJNCJOCJPCJQCJRCJSCJTCJUCJ"
+    "VCJWCJXCJYCJZCKDCKECKFCKGCKHCKICKJCKKCKLCKMCKNCKOCKPCKQCKRCKSCKTCKUCKVCKWC"
+    "KXCKYCKZCLDCLECLFCLGCLHCLICLJCLKCLLCLMCLNCLOCLPCLQCLRCLSCLTCLUCLVCLWCLXCLY"
+    "CLZCMDCMECMFCMGCMHCMICMJCMKCMLCMMCMNCMOCMPCMQCMRCMSCMTCMUCMVCMWCMXCMYCMZCN"
+    "DCNECNFCNGCNHCNICNJCNKCNLCNMCNNCNOCNPCNQCNRCNSCNTCNUCNVCNWCNXCNYCNZCODCOEC"
+    "OFCOGCOHCOICOJCOKCOLCOMCONCOOCOPCOQCORCOSCOTCOUCOVCOWCOXCOYCOZCPDCPECPFCPG"
+    "CPHCPICPJCPKCPLCPMCPNCPOCPPCPQCPRCPSCPTCPUCPVCPWCPXCPYCPZCQDCQECQFCQGCQHCQ"
+    "ICQJCQKCQLCQMCQNCQOCQPCQQCQRCQSCQTCQUCQVCQWCQXCQYCQZCRDCRECRFCRGCRHCRICRJC"
+    "RKCRLCRMCRNCROCRPCRQCRRCRSCRTCRUCRVCRWCRXCRYCRZCSDCSECSFCSGCSHCSICSJCSKCSL"
+    "CSMCSNCSOCSPCSQCSRCSSCSTCSUCSVCSWCSXCSYCSZCTDCTECTFCTGCTHCTICTJCTKCTLCTMCT"
+    "NCTOCTPCTQCTRCTSCTTCTUCTVCTWCTXCTYCTZCUDCUECUFCUGCUHCUICUJCUKCULCUMCUNCUOC"
+    "UPCUQCURCUSCUTCUUCUVCUWCUXCUYCUZCVDCVECVFCVGCVHCVICVJCVKCVLCVMCVNCVOCVPCVQ"
+    "CVRCVSCVTCVUCVVCVWCVXCVYCVZCWDCWECWFCWGCWHCWICWJCWKCWLCWMCWNCWOCWPCWQCWRCW"
+    "SCWTCWUCWVCWWCWXCWYCWZCXDCXECXFCXGCXHCXICXJCXKCXLCXMCXNCXOCXPCXQCXRCXSCXTC"
+    "XUCXVCXWCXXCXYCXZCYDCYECYFCYGCYHCYICYJCYKCYLCYMCYNCYOCYPCYQCYRCYSCYTCYUCYV"
+    "CYWCYXCYYCYZCZDCZECZFCZGCZHCZICZJCZKCZLCZMCZNCZOCZPCZQCZRCZSCZTCZUCZVCZWCZ"
+    "XCZYCZZDDDEDDFDDGDDHDDIDDJDDKDDLDDMDDNDDODDPDDQDDRDDSDDTDDUDDVDDWDDXDDYDDZ"
+    "DEEDEFDEGDEHDEIDEJDEKDELDEMDENDEODEPDEQDERDESDETDEUDEVDEWDEXDEYDEZDFEDFFDF"
+    "GDFHDFIDFJDFKDFLDFMDFNDFODFPDFQDFRDFSDFTDFUDFVDFWDFXDFYDFZDGEDGFDGGDGHDGID"
+    "GJDGKDGLDGMDGNDGODGPDGQDGRDGSDGTDGUDGVDGWDGXDGYDGZDHEDHFDHGDHHDHIDHJDHKDHL"
+    "DHMDHNDHODHPDHQDHRDHSDHTDHUDHVDHWDHXDHYDHZDIEDIFDIGDIHDIIDIJDIKDILDIMDINDI"
+    "ODIPDIQDIRDISDITDIUDIVDIWDIXDIYDIZDJEDJFDJGDJHDJIDJJDJKDJLDJMDJNDJODJPDJQD"
+    "JRDJSDJTDJUDJVDJWDJXDJYDJZDKEDKFDKGDKHDKIDKJDKKDKLDKMDKNDKODKPDKQDKRDKSDKT"
+    "DKUDKVDKWDKXDKYDKZDLEDLFDLGDLHDLIDLJDLKDLLDLMDLNDLODLPDLQDLRDLSDLTDLUDLVDL"
+    "WDLXDLYDLZDMEDMFDMGDMHDMIDMJDMKDMLDMMDMNDMODMPDMQDMRDMSDMTDMUDMVDMWDMXDMYD"
+    "MZDNEDNFDNGDNHDNIDNJDNKDNLDNMDNNDNODNPDNQDNRDNSDNTDNUDNVDNWDNXDNYDNZDOEDOF"
+    "DOGDOHDOIDOJDOKDOLDOMDONDOODOPDOQDORDOSDOTDOUDOVDOWDOXDOYDOZDPEDPFDPGDPHDP"
+    "IDPJDPKDPLDPMDPNDPODPPDPQDPRDPSDPTDPUDPVDPWDPXDPYDPZDQEDQFDQGDQHDQIDQJDQKD"
+    "QLDQMDQNDQODQPDQQDQRDQSDQTDQUDQVDQWDQXDQYDQZDREDRFDRGDRHDRIDRJDRKDRLDRMDRN"
+    "DRODRPDRQDRRDRSDRTDRUDRVDRWDRXDRYDRZDSEDSFDSGDSHDSIDSJDSKDSLDSMDSNDSODSPDS"
+    "QDSRDSSDSTDSUDSVDSWDSXDSYDSZDTEDTFDTGDTHDTIDTJDTKDTLDTMDTNDTODTPDTQDTRDTSD"
+    "TTDTUDTVDTWDTXDTYDTZDUEDUFDUGDUHDUIDUJDUKDULDUMDUNDUODUPDUQDURDUSDUTDUUDUV"
+    "DUWDUXDUYDUZDVEDVFDVGDVHDVIDVJDVKDVLDVMDVNDVODVPDVQDVRDVSDVTDVUDVVDVWDVXDV"
+    "YDVZDWEDWFDWGDWHDWIDWJDWKDWLDWMDWNDWODWPDWQDWRDWSDWTDWUDWVDWWDWXDWYDWZDXED"
+    "XFDXGDXHDXIDXJDXKDXLDXMDXNDXODXPDXQDXRDXSDXTDXUDXVDXWDXXDXYDXZDYEDYFDYGDYH"
+    "DYIDYJDYKDYLDYMDYNDYODYPDYQDYRDYSDYTDYUDYVDYWDYXDYYDYZDZEDZFDZGDZHDZIDZJDZ"
+    "KDZLDZMDZNDZODZPDZQDZRDZSDZTDZUDZVDZWDZXDZYDZZEEEFEEGEEHEEIEEJEEKEELEEMEEN"
+    "EEOEEPEEQEEREESEETEEUEEVEEWEEXEEYEEZEFFEFGEFHEFIEFJEFKEFLEFMEFNEFOEFPEFQEF"
+    "REFSEFTEFUEFVEFWEFXEFYEFZEGFEGGEGHEGIEGJEGKEGLEGMEGNEGOEGPEGQEGREGSEGTEGUE"
+    "GVEGWEGXEGYEGZEHFEHGEHHEHIEHJEHKEHLEHMEHNEHOEHPEHQEHREHSEHTEHUEHVEHWEHXEHY"
+    "EHZEIFEIGEIHEIIEIJEIKEILEIMEINEIOEIPEIQEIREISEITEIUEIVEIWEIXEIYEIZEJFEJGEJ"
+    "HEJIEJJEJKEJLEJMEJNEJOEJPEJQEJREJSEJTEJUEJVEJWEJXEJYEJZEKFEKGEKHEKIEKJEKKE"
+    "KLEKMEKNEKOEKPEKQEKREKSEKTEKUEKVEKWEKXEKYEKZELFELGELHELIELJELKELLELMELNELO"
+    "ELPELQELRELSELTELUELVELWELXELYELZEMFEMGEMHEMIEMJEMKEMLEMMEMNEMOEMPEMQEMREM"
+    "SEMTEMUEMVEMWEMXEMYEMZENFENGENHENIENJENKENLENMENNENOENPENQENRENSENTENUENVE"
+    "NWENXENYENZEOFEOGEOHEOIEOJEOKEOLEOMEONEOOEOPEOQEOREOSEOTEOUEOVEOWEOXEOYEOZ"
+    "EPFEPGEPHEPIEPJEPKEPLEPMEPNEPOEPPEPQEPREPSEPTEPUEPVEPWEPXEPYEPZEQFEQGEQHEQ"
+    "IEQJEQKEQLEQMEQNEQOEQPEQQEQREQSEQTEQUEQVEQWEQXEQYEQZERFERGERHERIERJERKERLE"
+    "RMERNEROERPERQERRERSERTERUERVERWERXERYERZESFESGESHESIESJESKESLESMESNESOESP"
+    "ESQESRESSESTESUESVESWESXESYESZETFETGETHETIETJETKETLETMETNETOETPETQETRETSET"
+    "TETUETVETWETXETYETZEUFEUGEUHEUIEUJEUKEULEUMEUNEUOEUPEUQEUREUSEUTEUUEUVEUWE"
+    "UXEUYEUZEVFEVGEVHEVIEVJEVKEVLEVMEVNEVOEVPEVQEVREVSEVTEVUEVVEVWEVXEVYEVZEWF"
+    "EWGEWHEWIEWJEWKEWLEWMEWNEWOEWPEWQEWREWSEWTEWUEWVEWWEWXEWYEWZEXFEXGEXHEXIEX"
+    "JEXKEXLEXMEXNEXOEXPEXQEXREXSEXTEXUEXVEXWEXXEXYEXZEYFEYGEYHEYIEYJEYKEYLEYME"
+    "YNEYOEYPEYQEYREYSEYTEYUEYVEYWEYXEYYEYZEZFEZGEZHEZIEZJEZKEZLEZMEZNEZOEZPEZQ"
+    "EZREZSEZTEZUEZVEZWEZXEZYEZZFFFGFFHFFIFFJFFKFFLFFMFFNFFOFFPFFQFFRFFSFFTFFUF"
+    "FVFFWFFXFFYFFZFGGFGHFGIFGJFGKFGLFGMFGNFGOFGPFGQFGRFGSFGTFGUFGVFGWFGXFGYFGZ"
+    "FHGFHHFHIFHJFHKFHLFHMFHNFHOFHPFHQFHRFHSFHTFHUFHVFHWFHXFHYFHZFIGFIHFIIFIJFI"
+    "KFILFIMFINFIOFIPFIQFIRFISFITFIUFIVFIWFIXFIYFIZFJGFJHFJIFJJFJKFJLFJMFJNFJOF"
+    "JPFJQFJRFJSFJTFJUFJVFJWFJXFJYFJZFKGFKHFKIFKJFKKFKLFKMFKNFKOFKPFKQFKRFKSFKT"
+    "FKUFKVFKWFKXFKYFKZFLGFLHFLIFLJFLKFLLFLMFLNFLOFLPFLQFLRFLSFLTFLUFLVFLWFLXFL"
+    "YFLZFMGFMHFMIFMJFMKFMLFMMFMNFMOFMPFMQFMRFMSFMTFMUFMVFMWFMXFMYFMZFNGFNHFNIF"
+    "NJFNKFNLFNMFNNFNOFNPFNQFNRFNSFNTFNUFNVFNWFNXFNYFNZFOGFOHFOIFOJFOKFOLFOMFON"
+    "FOOFOPFOQFORFOSFOTFOUFOVFOWFOXFOYFOZFPGFPHFPIFPJFPKFPLFPMFPNFPOFPPFPQFPRFP"
+    "SFPTFPUFPVFPWFPXFPYFPZFQGFQHFQIFQJFQKFQLFQMFQNFQOFQPFQQFQRFQSFQTFQUFQVFQWF"
+    "QXFQYFQZFRGFRHFRIFRJFRKFRLFRMFRNFROFRPFRQFRRFRSFRTFRUFRVFRWFRXFRYFRZFSGFSH"
+    "FSIFSJFSKFSLFSMFSNFSOFSPFSQFSRFSSFSTFSUFSVFSWFSXFSYFSZFTGFTHFTIFTJFTKFTLFT"
+    "MFTNFTOFTPFTQFTRFTSFTTFTUFTVFTWFTXFTYFTZFUGFUHFUIFUJFUKFULFUMFUNFUOFUPFUQF"
+    "URFUSFUTFUUFUVFUWFUXFUYFUZFVGFVHFVIFVJFVKFVLFVMFVNFVOFVPFVQFVRFVSFVTFVUFVV"
+    "FVWFVXFVYFVZFWGFWHFWIFWJFWKFWLFWMFWNFWOFWPFWQFWRFWSFWTFWUFWVFWWFWXFWYFWZFX"
+    "GFXHFXIFXJFXKFXLFXMFXNFXOFXPFXQFXRFXSFXTFXUFXVFXWFXXFXYFXZFYGFYHFYIFYJFYKF"
+    "YLFYMFYNFYOFYPFYQFYRFYSFYTFYUFYVFYWFYXFYYFYZFZGFZHFZIFZJFZKFZLFZMFZNFZOFZP"
+    "FZQFZRFZSFZTFZUFZVFZWFZXFZYFZZGGGHGGIGGJGGKGGLGGMGGNGGOGGPGGQGGRGGSGGTGGUG"
+    "GVGGWGGXGGYGGZGHHGHIGHJGHKGHLGHMGHNGHOGHPGHQGHRGHSGHTGHUGHVGHWGHXGHYGHZGIH"
+    "GIIGIJGIKGILGIMGINGIOGIPGIQGIRGISGITGIUGIVGIWGIXGIYGIZGJHGJIGJJGJKGJLGJMGJ"
+    "NGJOGJPGJQGJRGJSGJTGJUGJVGJWGJXGJYGJZGKHGKIGKJGKKGKLGKMGKNGKOGKPGKQGKRGKSG"
+    "KTGKUGKVGKWGKXGKYGKZGLHGLIGLJGLKGLLGLMGLNGLOGLPGLQGLRGLSGLTGLUGLVGLWGLXGLY"
+    "GLZGMHGMIGMJGMKGMLGMMGMNGMOGMPGMQGMRGMSGMTGMUGMVGMWGMXGMYGMZGNHGNIGNJGNKGN"
+    "LGNMGNNGNOGNPGNQGNRGNSGNTGNUGNVGNWGNXGNYGNZGOHGOIGOJGOKGOLGOMGONGOOGOPGOQG"
+    "ORGOSGOTGOUGOVGOWGOXGOYGOZGPHGPIGPJGPKGPLGPMGPNGPOGPPGPQGPRGPSGPTGPUGPVGPW"
+    "GPXGPYGPZGQHGQIGQJGQKGQLGQMGQNGQOGQPGQQGQRGQSGQTGQUGQVGQWGQXGQYGQZGRHGRIGR"
+    "JGRKGRLGRMGRNGROGRPGRQGRRGRSGRTGRUGRVGRWGRXGRYGRZGSHGSIGSJGSKGSLGSMGSNGSOG"
+    "SPGSQGSRGSSGSTGSUGSVGSWGSXGSYGSZGTHGTIGTJGTKGTLGTMGTNGTOGTPGTQGTRGTSGTTGTU"
+    "GTVGTWGTXGTYGTZGUHGUIGUJGUKGULGUMGUNGUOGUPGUQGURGUSGUTGUUGUVGUWGUXGUYGUZGV"
+    "HGVIGVJGVKGVLGVMGVNGVOGVPGVQGVRGVSGVTGVUGVVGVWGVXGVYGVZGWHGWIGWJGWKGWLGWMG"
+    "WNGWOGWPGWQGWRGWSGWTGWUGWVGWWGWXGWYGWZGXHGXIGXJGXKGXLGXMGXNGXOGXPGXQGXRGXS"
+    "GXTGXUGXVGXWGXXGXYGXZGYHGYIGYJGYKGYLGYMGYNGYOGYPGYQGYRGYSGYTGYUGYVGYWGYXGY"
+    "YGYZGZHGZIGZJGZKGZLGZMGZNGZOGZPGZQGZRGZSGZTGZUGZVGZWGZXGZYGZZHHHIHHJHHKHHL"
+    "HHMHHNHHOHHPHHQHHRHHSHHTHHUHHVHHWHHXHHYHHZHIIHIJHIKHILHIMHINHIOHIPHIQHIRHI"
+    "SHITHIUHIVHIWHIXHIYHIZHJIHJJHJKHJLHJMHJNHJOHJPHJQHJRHJSHJTHJUHJVHJWHJXHJYH"
+    "JZHKIHKJHKKHKLHKMHKNHKOHKPHKQHKRHKSHKTHKUHKVHKWHKXHKYHKZHLIHLJHLKHLLHLMHLN"
+    "HLOHLPHLQHLRHLSHLTHLUHLVHLWHLXHLYHLZHMIHMJHMKHMLHMMHMNHMOHMPHMQHMRHMSHMTHM"
+    "UHMVHMWHMXHMYHMZHNIHNJHNKHNLHNMHNNHNOHNPHNQHNRHNSHNTHNUHNVHNWHNXHNYHNZHOIH"
+    "OJHOKHOLHOMHONHOOHOPHOQHORHOSHOTHOUHOVHOWHOXHOYHOZHPIHPJHPKHPLHPMHPNHPOHPP"
+    "HPQHPRHPSHPTHPUHPVHPWHPXHPYHPZHQIHQJHQKHQLHQMHQNHQOHQPHQQHQRHQSHQTHQUHQVHQ"
+    "WHQXHQYHQZHRIHRJHRKHRLHRMHRNHROHRPHRQHRRHRSHRTHRUHRVHRWHRXHRYHRZHSIHSJHSKH"
+    "SLHSMHSNHSOHSPHSQHSRHSSHSTHSUHSVHSWHSXHSYHSZHTIHTJHTKHTLHTMHTNHTOHTPHTQHTR"
+    "HTSHTTHTUHTVHTWHTXHTYHTZHUIHUJHUKHULHUMHUNHUOHUPHUQHURHUSHUTHUUHUVHUWHUXHU"
+    "YHUZHVIHVJHVKHVLHVMHVNHVOHVPHVQHVRHVSHVTHVUHVVHVWHVXHVYHVZHWIHWJHWKHWLHWMH"
+    "WNHWOHWPHWQHWRHWSHWTHWUHWVHWWHWXHWYHWZHXIHXJHXKHXLHXMHXNHXOHXPHXQHXRHXSHXT"
+    "HXUHXVHXWHXXHXYHXZHYIHYJHYKHYLHYMHYNHYOHYPHYQHYRHYSHYTHYUHYVHYWHYXHYYHYZHZ"
+    "IHZJHZKHZLHZMHZNHZOHZPHZQHZRHZSHZTHZUHZVHZWHZXHZYHZZIIIJIIKIILIIMIINIIOIIP"
+    "IIQIIRIISIITIIUIIVIIWIIXIIYIIZIJJIJKIJLIJMIJNIJOIJPIJQIJRIJSIJTIJUIJVIJWIJ"
+    "XIJYIJZIKJIKKIKLIKMIKNIKOIKPIKQIKRIKSIKTIKUIKVIKWIKXIKYIKZILJILKILLILMILNI"
+    "LOILPILQILRILSILTILUILVILWILXILYILZIMJIMKIMLIMMIMNIMOIMPIMQIMRIMSIMTIMUIMV"
+    "IMWIMXIMYIMZINJINKINLINMINNINOINPINQINRINSINTINUINVINWINXINYINZIOJIOKIOLIO"
+    "MIONIOOIOPIOQIORIOSIOTIOUIOVIOWIOXIOYIOZIPJIPKIPLIPMIPNIPOIPPIPQIPRIPSIPTI"
+    "PUIPVIPWIPXIPYIPZIQJIQKIQLIQMIQNIQOIQPIQQIQRIQSIQTIQUIQVIQWIQXIQYIQZIRJIRK"
+    "IRLIRMIRNIROIRPIRQIRRIRSIRTIRUIRVIRWIRXIRYIRZISJISKISLISMISNISOISPISQISRIS"
+    "SISTISUISVISWISXISYISZITJITKITLITMITNITOITPITQITRITSITTITUITVITWITXITYITZI"
+    "UJIUKIULIUMIUNIUOIUPIUQIURIUSIUTIUUIUVIUWIUXIUYIUZIVJIVKIVLIVMIVNIVOIVPIVQ"
+    "IVRIVSIVTIVUIVVIVWIVXIVYIVZIWJIWKIWLIWMIWNIWOIWPIWQIWRIWSIWTIWUIWVIWWIWXIW"
+    "YIWZIXJIXKIXLIXMIXNIXOIXPIXQIXRIXSIXTIXUIXVIXWIXXIXYIXZIYJIYKIYLIYMIYNIYOI"
+    "YPIYQIYRIYSIYTIYUIYVIYWIYXIYYIYZIZJIZKIZLIZMIZNIZOIZPIZQIZRIZSIZTIZUIZVIZW"
+    "IZXIZYIZZJJJKJJLJJMJJNJJOJJPJJQJJRJJSJJTJJUJJVJJWJJXJJYJJZJKKJKLJKMJKNJKOJ"
+    "KPJKQJKRJKSJKTJKUJKVJKWJKXJKYJKZJLKJLLJLMJLNJLOJLPJLQJLRJLSJLTJLUJLVJLWJLX"
+    "JLYJLZJMKJMLJMMJMNJMOJMPJMQJMRJMSJMTJMUJMVJMWJMXJMYJMZJNKJNLJNMJNNJNOJNPJN"
+    "QJNRJNSJNTJNUJNVJNWJNXJNYJNZJOKJOLJOMJONJOOJOPJOQJORJOSJOTJOUJOVJOWJOXJOYJ"
+    "OZJPKJPLJPMJPNJPOJPPJPQJPRJPSJPTJPUJPVJPWJPXJPYJPZJQKJQLJQMJQNJQOJQPJQQJQR"
+    "JQSJQTJQUJQVJQWJQXJQYJQZJRKJRLJRMJRNJROJRPJRQJRRJRSJRTJRUJRVJRWJRXJRYJRZJS"
+    "KJSLJSMJSNJSOJSPJSQJSRJSSJSTJSUJSVJSWJSXJSYJSZJTKJTLJTMJTNJTOJTPJTQJTRJTSJ"
+    "TTJTUJTVJTWJTXJTYJTZJUKJULJUMJUNJUOJUPJUQJURJUSJUTJUUJUVJUWJUXJUYJUZJVKJVL"
+    "JVMJVNJVOJVPJVQJVRJVSJVTJVUJVVJVWJVXJVYJVZJWKJWLJWMJWNJWOJWPJWQJWRJWSJWTJW"
+    "UJWVJWWJWXJWYJWZJXKJXLJXMJXNJXOJXPJXQJXRJXSJXTJXUJXVJXWJXXJXYJXZJYKJYLJYMJ"
+    "YNJYOJYPJYQJYRJYSJYTJYUJYVJYWJYXJYYJYZJZKJZLJZMJZNJZOJZPJZQJZRJZSJZTJZUJZV"
+    "JZWJZXJZYJZZKKKLKKMKKNKKOKKPKKQKKRKKSKKTKKUKKVKKWKKXKKYKKZKLLKLMKLNKLOKLPK"
+    "LQKLRKLSKLTKLUKLVKLWKLXKLYKLZKMLKMMKMNKMOKMPKMQKMRKMSKMTKMUKMVKMWKMXKMYKMZ"
+    "KNLKNMKNNKNOKNPKNQKNRKNSKNTKNUKNVKNWKNXKNYKNZKOLKOMKONKOOKOPKOQKORKOSKOTKO"
+    "UKOVKOWKOXKOYKOZKPLKPMKPNKPOKPPKPQKPRKPSKPTKPUKPVKPWKPXKPYKPZKQLKQMKQNKQOK"
+    "QPKQQKQRKQSKQTKQUKQVKQWKQXKQYKQZKRLKRMKRNKROKRPKRQKRRKRSKRTKRUKRVKRWKRXKRY"
+    "KRZKSLKSMKSNKSOKSPKSQKSRKSSKSTKSUKSVKSWKSXKSYKSZKTLKTMKTNKTOKTPKTQKTRKTSKT"
+    "TKTUKTVKTWKTXKTYKTZKULKUMKUNKUOKUPKUQKURKUSKUTKUUKUVKUWKUXKUYKUZKVLKVMKVNK"
+    "VOKVPKVQKVRKVSKVTKVUKVVKVWKVXKVYKVZKWLKWMKWNKWOKWPKWQKWRKWSKWTKWUKWVKWWKWX"
+    "KWYKWZKXLKXMKXNKXOKXPKXQKXRKXSKXTKXUKXVKXWKXXKXYKXZKYLKYMKYNKYOKYPKYQKYRKY"
+    "SKYTKYUKYVKYWKYXKYYKYZKZLKZMKZNKZOKZPKZQKZRKZSKZTKZUKZVKZWKZXKZYKZZLLLMLLN"
+    "LLOLLPLLQLLRLLSLLTLLULLVLLWLLXLLYLLZLMMLMNLMOLMPLMQLMRLMSLMTLMULMVLMWLMXLM"
+    "YLMZLNMLNNLNOLNPLNQLNRLNSLNTLNULNVLNWLNXLNYLNZLOMLONLOOLOPLOQLORLOSLOTLOUL"
+    "OVLOWLOXLOYLOZLPMLPNLPOLPPLPQLPRLPSLPTLPULPVLPWLPXLPYLPZLQMLQNLQOLQPLQQLQR"
+    "LQSLQTLQULQVLQWLQXLQYLQZLRMLRNLROLRPLRQLRRLRSLRTLRULRVLRWLRXLRYLRZLSMLSNLS"
+    "OLSPLSQLSRLSSLSTLSULSVLSWLSXLSYLSZLTMLTNLTOLTPLTQLTRLTSLTTLTULTVLTWLTXLTYL"
+    "TZLUMLUNLUOLUPLUQLURLUSLUTLUULUVLUWLUXLUYLUZLVMLVNLVOLVPLVQLVRLVSLVTLVULVV"
+    "LVWLVXLVYLVZLWMLWNLWOLWPLWQLWRLWSLWTLWULWVLWWLWXLWYLWZLXMLXNLXOLXPLXQLXRLX"
+    "SLXTLXULXVLXWLXXLXYLXZLYMLYNLYOLYPLYQLYRLYSLYTLYULYVLYWLYXLYYLYZLZMLZNLZOL"
+    "ZPLZQLZRLZSLZTLZULZVLZWLZXLZYLZZMMMNMMOMMPMMQMMRMMSMMTMMUMMVMMWMMXMMYMMZMN"
+    "NMNOMNPMNQMNRMNSMNTMNUMNVMNWMNXMNYMNZMONMOOMOPMOQMORMOSMOTMOUMOVMOWMOXMOYM"
+    "OZMPNMPOMPPMPQMPRMPSMPTMPUMPVMPWMPXMPYMPZMQNMQOMQPMQQMQRMQSMQTMQUMQVMQWMQX"
+    "MQYMQZMRNMROMRPMRQMRRMRSMRTMRUMRVMRWMRXMRYMRZMSNMSOMSPMSQMSRMSSMSTMSUMSVMS"
+    "WMSXMSYMSZMTNMTOMTPMTQMTRMTSMTTMTUMTVMTWMTXMTYMTZMUNMUOMUPMUQMURMUSMUTMUUM"
+    "UVMUWMUXMUYMUZMVNMVOMVPMVQMVRMVSMVTMVUMVVMVWMVXMVYMVZMWNMWOMWPMWQMWRMWSMWT"
+    "MWUMWVMWWMWXMWYMWZMXNMXOMXPMXQMXRMXSMXTMXUMXVMXWMXXMXYMXZMYNMYOMYPMYQMYRMY"
+    "SMYTMYUMYVMYWMYXMYYMYZMZNMZOMZPMZQMZRMZSMZTMZUMZVMZWMZXMZYMZZNNNONNPNNQNNR"
+    "NNSNNTNNUNNVNNWNNXNNYNNZNOONOPNOQNORNOSNOTNOUNOVNOWNOXNOYNOZNPONPPNPQNPRNP"
+    "SNPTNPUNPVNPWNPXNPYNPZNQONQPNQQNQRNQSNQTNQUNQVNQWNQXNQYNQZNRONRPNRQNRRNRSN"
+    "RTNRUNRVNRWNRXNRYNRZNSONSPNSQNSRNSSNSTNSUNSVNSWNSXNSYNSZNTONTPNTQNTRNTSNTT"
+    "NTUNTVNTWNTXNTYNTZNUONUPNUQNURNUSNUTNUUNUVNUWNUXNUYNUZNVONVPNVQNVRNVSNVTNV"
+    "UNVVNVWNVXNVYNVZNWONWPNWQNWRNWSNWTNWUNWVNWWNWXNWYNWZNXONXPNXQNXRNXSNXTNXUN"
+    "XVNXWNXXNXYNXZNYONYPNYQNYRNYSNYTNYUNYVNYWNYXNYYNYZNZONZPNZQNZRNZSNZTNZUNZV"
+    "NZWNZXNZYNZZOOOPOOQOOROOSOOTOOUOOVOOWOOXOOYOOZOPPOPQOPROPSOPTOPUOPVOPWOPXO"
+    "PYOPZOQPOQQOQROQSOQTOQUOQVOQWOQXOQYOQZORPORQORRORSORTORUORVORWORXORYORZOSP"
+    "OSQOSROSSOSTOSUOSVOSWOSXOSYOSZOTPOTQOTROTSOTTOTUOTVOTWOTXOTYOTZOUPOUQOUROU"
+    "SOUTOUUOUVOUWOUXOUYOUZOVPOVQOVROVSOVTOVUOVVOVWOVXOVYOVZOWPOWQOWROWSOWTOWUO"
+    "WVOWWOWXOWYOWZOXPOXQOXROXSOXTOXUOXVOXWOXXOXYOXZOYPOYQOYROYSOYTOYUOYVOYWOYX"
+    "OYYOYZOZPOZQOZROZSOZTOZUOZVOZWOZXOZYOZZPPPQPPRPPSPPTPPUPPVPPWPPXPPYPPZPQQP"
+    "QRPQSPQTPQUPQVPQWPQXPQYPQZPRQPRRPRSPRTPRUPRVPRWPRXPRYPRZPSQPSRPSSPSTPSUPSV"
+    "PSWPSXPSYPSZPTQPTRPTSPTTPTUPTVTABUABVABWABXABYABZACBACCACDACEACFACGACHACIA"
+    "CJACKACLACMACNACOACPACQACRACSACTACUACVACWACXACYACZADBADCADDADEADFADGADHADI"
+    "ADJADKADLADMADAAABAACAADAAEAAFAAGAAHAAIAAJAAKAALAAMAANAAOAAPAAQAARAASAATAA"
+    "UAAVAAWAAXAAYAAZABBABCABDABEABFABGABHABIABJABKABLABMABNABOABPABQABRABSABHA"
+    "FIAFJAFKAFLAFMAFNAFOAFPAFQAFRAFSAFTAFUAFVAFWAFXAFYAFZAGBAGCAGDAGEAGFAGGAGH"
+    "AGIAGJAGKAGLAGMAGNAGOAGPAGQAGRAGSAGTAGUAGVAGWAGXAGYAGZAHNADOADPADQADRADSAD"
+    "TADUADVADWADXADYADZAEBAECAEDAEEAEFAEGAEHAEIAEJAEKAELAEMAENAEOAEPAEQAERAESA"
+    "ETAEUAEVAEWAEXAEYAEZAFBAFCAFDAFEAFFAFGAFUAIVAIWAIXAIYAIZAJBAJCAJDAJEAJFAJG"
+    "AJHAJIAJJAJKAJLAJMAJNAJOAJPAJQAJRAJSAJTAJUAJVAJWAJXAJYAJZAKBAKCAKDAKEAKFAK"
+    "GAKHAKIAKJAKKAKLAKMAKNAKBAHCAHDAHEAHFAHGAHHAHIAHJAHKAHLAHMAHNAHOAHPAHQAHRA"
+    "HSAHTAHUAHVAHWAHXAHYAHZAIBAICAIDAIEAIFAIGAIHAIIAIJAIKAILAIMAINAIOAIPAIQAIR"
+    "AISAITAIIAMJAMKAMLAMMAMNAMOAMPAMQAMRAMSAMTAMUAMVAMWAMXAMYAMZANBANCANDANEAN"
+    "FANGANHANIANJANKANLANMANNANOANPANQANRANSANTANUANVANWANXANYANZAOBAOOAKPAKQA"
+    "KRAKSAKTAKUAKVAKWAKXAKYAKZALBALCALDALEALFALGALHALIALJALKALLALMALNALOALPALQ"
+    "ALRALSALTALUALVALWALXALYALZAMBAMCAMDAMEAMFAMGAMHAMVAPWAPXAPYAPZAQBAQCAQDAQ"
+    "EAQFAQGAQHAQIAQJAQKAQLAQMAQNAQOAQPAQQAQRAQSAQTAQUAQVAQWAQXAQYAQZARBARCARDA"
+    "REARFARGARHARIARJARKARLARMARNAROARCAODAOEAOFAOGAOHAOIAOJAOKAOLAOMAONAOOAOP"
+    "AOQAORAOSAOTAOUAOVAOWAOXAOYAOZAPBAPCAPDAPEAPFAPGAPHAPIAPJAPKAPLAPMAPNAPOAP"
+    "PAPQAPRAPSAPTAPUAPJATKATLATMATNATOATPATQATRATSATTATUATVATWATXATYATZAUBAUCA"
+    "UDAUEAUFAUGAUHAUIAUJAUKAULAUMAUNAUOAUPAUQAURAUSAUTAUUAUVAUWAUXAUYAUZAVBAVC"
+    "AVPARQARRARSARTARUARVARWARXARYARZASBASCASDASEASFASGASHASIASJASKASLASMASNAS"
+    "OASPASQASRASSASTASUASVASWASXASYASZATBATCATDATEATFATGATHATIATWAWXAWYAWZAXBA"
+    "XCAXDAXEAXFAXGAXHAXIAXJAXKAXLAXMAXNAXOAXPAXQAXRAXSAXTAXUAXVAXWAXXAXYAXZAYB"
+    "AYCAYDAYEAYFAYGAYHAYIAYJAYKAYLAYMAYNAYOAYPAYDAVEAVFAVGAVHAVIAVJAVKAVLAVMAV"
+    "NAVOAVPAVQAVRAVSAVTAVUAVVAVWAVXAVYAVZAWBAWCAWDAWEAWFAWGAWHAWIAWJAWKAWLAWMA"
+    "WNAWOAWPAWQAWRAWSAWTAWUAWVAWBLBBMBBNBBOBBPBBQBBRBBSBBTBBUBBVBBWBBXBBYBBZBC"
+    "CBCDBCEBCFBCGBCHBCIBCJBCKBCLBCMBCNBCOBCPBCQBCRBCSBCTBCUBCVBCWBCXBCYBCZBDCB"
+    "DDBDEBDFBDGBQAYRAYSAYTAYUAYVAYWAYXAYYAYZAZBAZCAZDAZEAZFAZGAZHAZIAZJAZKAZLA"
+    "ZMAZNAZOAZPAZQAZRAZSAZTAZUAZVAZWAZXAZYAZZBBBCBBDBBEBBFBBGBBHBBIBBJBBKBFDBF"
+    "EBFFBFGBFHBFIBFJBFKBFLBFMBFNBFOBFPBFQBFRBFSBFTBFUBFVBFWBFXBFYBFZBGCBGDBGEB"
+    "GFBGGBGHBGIBGJBGKBGLBGMBGNBGOBGPBGQBGRBGSBGTBGUBGVBGWBDHBDIBDJBDKBDLBDMBDN"
+    "BDOBDPBDQBDRBDSBDTBDUBDVBDWBDXBDYBDZBECBEDBEEBEFBEGBEHBEIBEJBEKBELBEMBENBE"
+    "OBEPBEQBERBESBETBEUBEVBEWBEXBEYBEZBFCBITBIUBIVBIWBIXBIYBIZBJCBJDBJEBJFBJGB"
+    "JHBJIBJJBJKBJLBJMBJNBJOBJPBJQBJRBJSBJTBJUBJVBJWBJXBJYBJZBKCBKDBKEBKFBKGBKH"
+    "BKIBKJBKKBKLBKMBKNBKOBGXBGYBGZBHCBHDBHEBHFBHGBHHBHIBHJBHKBHLBHMBHNBHOBHPBH"
+    "QBHRBHSBHTBHUBHVBHWBHXBHYBHZBICBIDBIEBIFBIGBIHBIIBIJBIKBILBIMBINBIOBIPBIQB"
+    "IRBISBMLBMMBMNBMOBMPBMQBMRBMSBMTBMUBMVBMWBMXBMYBMZBNCBNDBNEBNFBNGBNHBNIBNJ"
+    "BNKBNLBNMBNNBNOBNPBNQBNRBNSBNTBNUBNVBNWBNXBNYBNZBOCBODBOEBOFBOGBKPBKQBKRBK"
+    "SBKTBKUBKVBKWBKXBKYBKZBLCBLDBLEBLFBLGBLHBLIBLJBLKBLLBLMBLNBLOBLPBLQBLRBLSB"
+    "LTBLUBLVBLWBLXBLYBLZBMCBMDBMEBMFBMGBMHBMIBMJBMKBQDBQEBQFBQGBQHBQIBQJBQKBQL"
+    "BQMBQNBQOBQPBQQBQRBQSBQTBQUBQVBQWBQXBQYBQZBRCBRDBREBRFBRGBRHBRIBRJBRKBRLBR"
+    "MBRNBROBRPBRQBRRBRSBRTBRUBRVBRWBOHBOIBOJBOKBOLBOMBONBOOBOPBOQBORBOSBOTBOUB"
+    "OVBOWBOXBOYBOZBPCBPDBPEBPFBPGBPHBPIBPJBPKBPLBPMBPNBPOBPPBPQBPRBPSBPTBPUBPV"
+    "BPWBPXBPYBPZBQCBTTBTUBTVBTWBTXBTYBTZBUCBUDBUEBUFBUGBUHBUIBUJBUKBULBUMBUNBU"
+    "OBUPBUQBURBUSBUTBUUBUVBUWBUXBUYBUZBVCBVDBVEBVFBVGBVHBVIBVJBVKBVLBVMBVNBVOB"
+    "RXBRYBRZBSCBSDBSEBSFBSGBSHBSIBSJBSKBSLBSMBSNBSOBSPBSQBSRBSSBSTBSUBSVBSWBSX"
+    "BSYBSZBTCBTDBTEBTFBTGBTHBTIBTJBTKBTLBTMBTNBTOBTPBTQBTRBTSBXLBXMBXNBXOBXPBX"
+    "QBXRBXSBXTBXUBXVBXWBXXBXYBXZBYCBYDBYEBYFBYGBYHBYIBYJBYKBYLBYMBYNBYOBYPBYQB"
+    "YRBYSBYTBYUBYVBYWBYXBYYBYZBZCBZDBZEBZFBZGBVPBVQBVRBVSBVTBVUBVVBVWBVXBVYBVZ"
+    "BWCBWDBWEBWFBWGBWHBWIBWJBWKBWLBWMBWNBWOBWPBWQBWRBWSBWTBWUBWVBWWBWXBWYBWZBX"
+    "CBXDBXEBXFBXGBXHBXIBXJBXKBCDFCDGCDHCDICDJCDKCDLCDMCDNCDOCDPCDQCDRCDSCDTCDU"
+    "CDVCDWCDXCDYCDZCEDCEECEFCEGCEHCEICEJCEKCELCEMCENCEOCEPCEQCERCESCETCEUCEVCE"
+    "WCEXCEYCEZZHBZIBZJBZKBZLBZMBZNBZOBZPBZQBZRBZSBZTBZUBZVBZWBZXBZYBZZCCCDCCEC"
+    "CFCCGCCHCCICCJCCKCCLCCMCCNCCOCCPCCQCCRCCSCCTCCUCCVCCWCCXCCYCCZCDDCDECGYCGZ"
+    "CHDCHECHFCHGCHHCHICHJCHKCHLCHMCHNCHOCHPCHQCHRCHSCHTCHUCHVCHWCHXCHYCHZCIDCI"
+    "ECIFCIGCIHCIICIJCIKCILCIMCINCIOCIPCIQCIRCISCITCIUCIVCFDCFECFFCFGCFHCFICFJC"
+    "FKCFLCFMCFNCFOCFPCFQCFRCFSCFTCFUCFVCFWCFXCFYCFZCGDCGECGFCGGCGHCGICGJCGKCGL"
+    "CGMCGNCGOCGPCGQCGRCGSCGTCGUCGVCGWCGXCKUCKVCKWCKXCKYCKZCLDCLECLFCLGCLHCLICL"
+    "JCLKCLLCLMCLNCLOCLPCLQCLRCLSCLTCLUCLVCLWCLXCLYCLZCMDCMECMFCMGCMHCMICMJCMKC"
+    "MLCMMCMNCMOCMPCMQCMRCIWCIXCIYCIZCJDCJECJFCJGCJHCJICJJCJKCJLCJMCJNCJOCJPCJQ"
+    "CJRCJSCJTCJUCJVCJWCJXCJYCJZCKDCKECKFCKGCKHCKICKJCKKCKLCKMCKNCKOCKPCKQCKRCK"
+    "SCKTCOQCORCOSCOTCOUCOVCOWCOXCOYCOZCPDCPECPFCPGCPHCPICPJCPKCPLCPMCPNCPOCPPC"
+    "PQCPRCPSCPTCPUCPVCPWCPXCPYCPZCQDCQECQFCQGCQHCQICQJCQKCQLCQMCQNCMSCMTCMUCMV"
+    "CMWCMXCMYCMZCNDCNECNFCNGCNHCNICNJCNKCNLCNMCNNCNOCNPCNQCNRCNSCNTCNUCNVCNWCN"
+    "XCNYCNZCODCOECOFCOGCOHCOICOJCOKCOLCOMCONCOOCOPCSMCSNCSOCSPCSQCSRCSSCSTCSUC"
+    "SVCSWCSXCSYCSZCTDCTECTFCTGCTHCTICTJCTKCTLCTMCTNCTOCTPCTQCTRCTSCTTCTUCTVCTW"
+    "CTXCTYCTZCUDCUECUFCUGCUHCUICUJCQOCQPCQQCQRCQSCQTCQUCQVCQWCQXCQYCQZCRDCRECR"
+    "FCRGCRHCRICRJCRKCRLCRMCRNCROCRPCRQCRRCRSCRTCRUCRVCRWCRXCRYCRZCSDCSECSFCSGC"
+    "SHCSICSJCSKCSLCWICWJCWKCWLCWMCWNCWOCWPCWQCWRCWSCWTCWUCWVCWWCWXCWYCWZCXDCXE"
+    "CXFCXGCXHCXICXJCXKCXLCXMCXNCXOCXPCXQCXRCXSCXTCXUCXVCXWCXXCXYCXZCYDCYECYFCU"
+    "KCULCUMCUNCUOCUPCUQCURCUSCUTCUUCUVCUWCUXCUYCUZCVDCVECVFCVGCVHCVICVJCVKCVLC"
+    "VMCVNCVOCVPCVQCVRCVSCVTCVUCVVCVWCVXCVYCVZCWDCWECWFCWGCWHEDDFDDGDDHDDIDDJDD"
+    "KDDLDDMDDNDDODDPDDQDDRDDSDDTDDUDDVDDWDDXDDYDDZDEEDEFDEGDEHDEIDEJDEKDELDEMD"
+    "ENDEODEPDEQDERDESDETDEUDEVDEWDEXDEYDEZDFCYGCYHCYICYJCYKCYLCYMCYNCYOCYPCYQC"
+    "YRCYSCYTCYUCYVCYWCYXCYYCYZCZDCZECZFCZGCZHCZICZJCZKCZLCZMCZNCZOCZPCZQCZRCZS"
+    "CZTCZUCZVCZWCZXCZYCZZDDDEDHFDHGDHHDHIDHJDHKDHLDHMDHNDHODHPDHQDHRDHSDHTDHUD"
+    "HVDHWDHXDHYDHZDIEDIFDIGDIHDIIDIJDIKDILDIMDINDIODIPDIQDIRDISDITDIUDIVDIWDIX"
+    "DIYDIZDJEDFFDFGDFHDFIDFJDFKDFLDFMDFNDFODFPDFQDFRDFSDFTDFUDFVDFWDFXDFYDFZDG"
+    "EDGFDGGDGHDGIDGJDGKDGLDGMDGNDGODGPDGQDGRDGSDGTDGUDGVDGWDGXDGYDGZDHEDLFDLGD"
+    "LHDLIDLJDLKDLLDLMDLNDLODLPDLQDLRDLSDLTDLUDLVDLWDLXDLYDLZDMEDMFDMGDMHDMIDMJ"
+    "DMKDMLDMMDMNDMODMPDMQDMRDMSDMTDMUDMVDMWDMXDMYDMZDNEDJFDJGDJHDJIDJJDJKDJLDJ"
+    "MDJNDJODJPDJQDJRDJSDJTDJUDJVDJWDJXDJYDJZDKEDKFDKGDKHDKIDKJDKKDKLDKMDKNDKOD"
+    "KPDKQDKRDKSDKTDKUDKVDKWDKXDKYDKZDLEDPFDPGDPHDPIDPJDPKDPLDPMDPNDPODPPDPQDPR"
+    "DPSDPTDPUDPVDPWDPXDPYDPZDQEDQFDQGDQHDQIDQJDQKDQLDQMDQNDQODQPDQQDQRDQSDQTDQ"
+    "UDQVDQWDQXDQYDQZDREDNFDNGDNHDNIDNJDNKDNLDNMDNNDNODNPDNQDNRDNSDNTDNUDNVDNWD"
+    "NXDNYDNZDOEDOFDOGDOHDOIDOJDOKDOLDOMDONDOODOPDOQDORDOSDOTDOUDOVDOWDOXDOYDOZ"
+    "DPEDTFDTGDTHDTIDTJDTKDTLDTMDTNDTODTPDTQDTRDTSDTTDTUDTVDTWDTXDTYDTZDUEDUFDU"
+    "GDUHDUIDUJDUKDULDUMDUNDUODUPDUQDURDUSDUTDUUDUVDUWDUXDUYDUZDVEDRFDRGDRHDRID"
+    "RJDRKDRLDRMDRNDRODRPDRQDRRDRSDRTDRUDRVDRWDRXDRYDRZDSEDSFDSGDSHDSIDSJDSKDSL"
+    "DSMDSNDSODSPDSQDSRDSSDSTDSUDSVDSWDSXDSYDSZDTEDXFDXGDXHDXIDXJDXKDXLDXMDXNDX"
+    "ODXPDXQDXRDXSDXTDXUDXVDXWDXXDXYDXZDYEDYFDYGDYHDYIDYJDYKDYLDYMDYNDYODYPDYQD"
+    "YRDYSDYTDYUDYVDYWDYXDYYDYZDZEDVFDVGDVHDVIDVJDVKDVLDVMDVNDVODVPDVQDVRDVSDVT"
+    "DVUDVVDVWDVXDVYDVZDWEDWFDWGDWHDWIDWJDWKDWLDWMDWNDWODWPDWQDWRDWSDWTDWUDWVDW"
+    "WDWXDWYDWZDXFGEFHEFIEFJEFKEFLEFMEFNEFOEFPEFQEFREFSEFTEFUEFVEFWEFXEFYEFZEGF"
+    "EGGEGHEGIEGJEGKEGLEGMEGNEGOEGPEGQEGREGSEGTEGUEGVEGWEGXEGYEGZEHFEHGEHHEEDZF"
+    "DZGDZHDZIDZJDZKDZLDZMDZNDZODZPDZQDZRDZSDZTDZUDZVDZWDZXDZYDZZEEEFEEGEEHEEIE"
+    "EJEEKEELEEMEENEEOEEPEEQEEREESEETEEUEEVEEWEEXEEYEEZEFFEJKEJLEJMEJNEJOEJPEJQ"
+    "EJREJSEJTEJUEJVEJWEJXEJYEJZEKFEKGEKHEKIEKJEKKEKLEKMEKNEKOEKPEKQEKREKSEKTEK"
+    "UEKVEKWEKXEKYEKZELFELGELHELIELJELKELLEHIEHJEHKEHLEHMEHNEHOEHPEHQEHREHSEHTE"
+    "HUEHVEHWEHXEHYEHZEIFEIGEIHEIIEIJEIKEILEIMEINEIOEIPEIQEIREISEITEIUEIVEIWEIX"
+    "EIYEIZEJFEJGEJHEJIEJJENOENPENQENRENSENTENUENVENWENXENYENZEOFEOGEOHEOIEOJEO"
+    "KEOLEOMEONEOOEOPEOQEOREOSEOTEOUEOVEOWEOXEOYEOZEPFEPGEPHEPIEPJEPKEPLEPMEPNE"
+    "POEPPELMELNELOELPELQELRELSELTELUELVELWELXELYELZEMFEMGEMHEMIEMJEMKEMLEMMEMN"
+    "EMOEMPEMQEMREMSEMTEMUEMVEMWEMXEMYEMZENFENGENHENIENJENKENLENMENNERSERTERUER"
+    "VERWERXERYERZESFESGESHESIESJESKESLESMESNESOESPESQESRESSESTESUESVESWESXESYE"
+    "SZETFETGETHETIETJETKETLETMETNETOETPETQETRETSETTEPQEPREPSEPTEPUEPVEPWEPXEPY"
+    "EPZEQFEQGEQHEQIEQJEQKEQLEQMEQNEQOEQPEQQEQREQSEQTEQUEQVEQWEQXEQYEQZERFERGER"
+    "HERIERJERKERLERMERNEROERPERQERREVWEVXEVYEVZEWFEWGEWHEWIEWJEWKEWLEWMEWNEWOE"
+    "WPEWQEWREWSEWTEWUEWVEWWEWXEWYEWZEXFEXGEXHEXIEXJEXKEXLEXMEXNEXOEXPEXQEXREXS"
+    "EXTEXUEXVEXWEXXETUETVETWETXETYETZEUFEUGEUHEUIEUJEUKEULEUMEUNEUOEUPEUQEUREU"
+    "SEUTEUUEUVEUWEUXEUYEUZEVFEVGEVHEVIEVJEVKEVLEVMEVNEVOEVPEVQEVREVSEVTEVUEVVE"
+    "FFGFFHFFIFFJFFKFFLFFMFFNFFOFFPFFQFFRFFSFFTFFUFFVFFWFFXFFYFFZFGGFGHFGIFGJFG"
+    "KFGLFGMFGNFGOFGPFGQFGRFGSFGTFGUFGVFGWFGXFGYFGZFHGFHHFHIFHJXYEXZEYFEYGEYHEY"
+    "IEYJEYKEYLEYMEYNEYOEYPEYQEYREYSEYTEYUEYVEYWEYXEYYEYZEZFEZGEZHEZIEZJEZKEZLE"
+    "ZMEZNEZOEZPEZQEZREZSEZTEZUEZVEZWEZXEZYEZZFFJOFJPFJQFJRFJSFJTFJUFJVFJWFJXFJ"
+    "YFJZFKGFKHFKIFKJFKKFKLFKMFKNFKOFKPFKQFKRFKSFKTFKUFKVFKWFKXFKYFKZFLGFLHFLIF"
+    "LJFLKFLLFLMFLNFLOFLPFLQFLRFHKFHLFHMFHNFHOFHPFHQFHRFHSFHTFHUFHVFHWFHXFHYFHZ"
+    "FIGFIHFIIFIJFIKFILFIMFINFIOFIPFIQFIRFISFITFIUFIVFIWFIXFIYFIZFJGFJHFJIFJJFJ"
+    "KFJLFJMFJNFNWFNXFNYFNZFOGFOHFOIFOJFOKFOLFOMFONFOOFOPFOQFORFOSFOTFOUFOVFOWF"
+    "OXFOYFOZFPGFPHFPIFPJFPKFPLFPMFPNFPOFPPFPQFPRFPSFPTFPUFPVFPWFPXFPYFPZFLSFLT"
+    "FLUFLVFLWFLXFLYFLZFMGFMHFMIFMJFMKFMLFMMFMNFMOFMPFMQFMRFMSFMTFMUFMVFMWFMXFM"
+    "YFMZFNGFNHFNIFNJFNKFNLFNMFNNFNOFNPFNQFNRFNSFNTFNUFNVFSKFSLFSMFSNFSOFSPFSQF"
+    "SRFSSFSTFSUFSVFSWFSXFSYFSZFTGFTHFTIFTJFTKFTLFTMFTNFTOFTPFTQFTRFTSFTTFTUFTV"
+    "FTWFTXFTYFTZFUGFUHFUIFUJFUKFULFUMFUNFQGFQHFQIFQJFQKFQLFQMFQNFQOFQPFQQFQRFQ"
+    "SFQTFQUFQVFQWFQXFQYFQZFRGFRHFRIFRJFRKFRLFRMFRNFROFRPFRQFRRFRSFRTFRUFRVFRWF"
+    "RXFRYFRZFSGFSHFSIFSJFWSFWTFWUFWVFWWFWXFWYFWZFXGFXHFXIFXJFXKFXLFXMFXNFXOFXP"
+    "FXQFXRFXSFXTFXUFXVFXWFXXFXYFXZFYGFYHFYIFYJFYKFYLFYMFYNFYOFYPFYQFYRFYSFYTFY"
+    "UFYVFUOFUPFUQFURFUSFUTFUUFUVFUWFUXFUYFUZFVGFVHFVIFVJFVKFVLFVMFVNFVOFVPFVQF"
+    "VRFVSFVTFVUFVVFVWFVXFVYFVZFWGFWHFWIFWJFWKFWLFWMFWNFWOFWPFWQFWRHGHIGHJGHKGH"
+    "LGHMGHNGHOGHPGHQGHRGHSGHTGHUGHVGHWGHXGHYGHZGIHGIIGIJGIKGILGIMGINGIOGIPGIQG"
+    "IRGISGITGIUGIVGIWGIXGIYGIZGJHGJIGJJGJKGJLGJMGJFYWFYXFYYFYZFZGFZHFZIFZJFZKF"
+    "ZLFZMFZNFZOFZPFZQFZRFZSFZTFZUFZVFZWFZXFZYFZZGGGHGGIGGJGGKGGLGGMGGNGGOGGPGG"
+    "QGGRGGSGGTGGUGGVGGWGGXGGYGGZGHTGLUGLVGLWGLXGLYGLZGMHGMIGMJGMKGMLGMMGMNGMOG"
+    "MPGMQGMRGMSGMTGMUGMVGMWGMXGMYGMZGNHGNIGNJGNKGNLGNMGNNGNOGNPGNQGNRGNSGNTGNU"
+    "GNVGNWGNXGNYGNNGJOGJPGJQGJRGJSGJTGJUGJVGJWGJXGJYGJZGKHGKIGKJGKKGKLGKMGKNGK"
+    "OGKPGKQGKRGKSGKTGKUGKVGKWGKXGKYGKZGLHGLIGLJGLKGLLGLMGLNGLOGLPGLQGLRGLSGLMG"
+    "QNGQOGQPGQQGQRGQSGQTGQUGQVGQWGQXGQYGQZGRHGRIGRJGRKGRLGRMGRNGROGRPGRQGRRGRS"
+    "GRTGRUGRVGRWGRXGRYGRZGSHGSIGSJGSKGSLGSMGSNGSOGSPGSQGSRGSZGOHGOIGOJGOKGOLGO"
+    "MGONGOOGOPGOQGORGOSGOTGOUGOVGOWGOXGOYGOZGPHGPIGPJGPKGPLGPMGPNGPOGPPGPQGPRG"
+    "PSGPTGPUGPVGPWGPXGPYGPZGQHGQIGQJGQKGQLGQYGUZGVHGVIGVJGVKGVLGVMGVNGVOGVPGVQ"
+    "GVRGVSGVTGVUGVVGVWGVXGVYGVZGWHGWIGWJGWKGWLGWMGWNGWOGWPGWQGWRGWSGWTGWUGWVGW"
+    "WGWXGWYGWZGXHGXIGXJGXKGXSGSTGSUGSVGSWGSXGSYGSZGTHGTIGTJGTKGTLGTMGTNGTOGTPG"
+    "TQGTRGTSGTTGTUGTVGTWGTXGTYGTZGUHGUIGUJGUKGULGUMGUNGUOGUPGUQGURGUSGUTGUUGUV"
+    "GUWGUXGURGZSGZTGZUGZVGZWGZXGZYGZZHHHIHHJHHKHHLHHMHHNHHOHHPHHQHHRHHSHHTHHUH"
+    "HVHHWHHXHHYHHZHIIHIJHIKHILHIMHINHIOHIPHIQHIRHISHITHIUHIVHIWHIXHIYHLGXMGXNG"
+    "XOGXPGXQGXRGXSGXTGXUGXVGXWGXXGXYGXZGYHGYIGYJGYKGYLGYMGYNGYOGYPGYQGYRGYSGYT"
+    "GYUGYVGYWGYXGYYGYZGZHGZIGZJGZKGZLGZMGZNGZOGZPGZQGZLPHLQHLRHLSHLTHLUHLVHLWH"
+    "LXHLYHLZHMIHMJHMKHMLHMMHMNHMOHMPHMQHMRHMSHMTHMUHMVHMWHMXHMYHMZHNIHNJHNKHNL"
+    "HNMHNNHNOHNPHNQHNRHNSHNTHNUHNVHNWHIZHJIHJJHJKHJLHJMHJNHJOHJPHJQHJRHJSHJTHJ"
+    "UHJVHJWHJXHJYHJZHKIHKJHKKHKLHKMHKNHKOHKPHKQHKRHKSHKTHKUHKVHKWHKXHKYHKZHLIH"
+    "LJHLKHLLHLMHLNHLOHQNHQOHQPHQQHQRHQSHQTHQUHQVHQWHQXHQYHQZHRIHRJHRKHRLHRMHRN"
+    "HROHRPHRQHRRHRSHRTHRUHRVHRWHRXHRYHRZHSIHSJHSKHSLHSMHSNHSOHSPHSQHSRHSSHSTHS"
+    "UHNXHNYHNZHOIHOJHOKHOLHOMHONHOOHOPHOQHORHOSHOTHOUHOVHOWHOXHOYHOZHPIHPJHPKH"
+    "PLHPMHPNHPOHPPHPQHPRHPSHPTHPUHPVHPWHPXHPYHPZHQIHQJHQKHQLHQMHVLHVMHVNHVOHVP"
+    "HVQHVRHVSHVTHVUHVVHVWHVXHVYHVZHWIHWJHWKHWLHWMHWNHWOHWPHWQHWRHWSHWTHWUHWVHW"
+    "WHWXHWYHWZHXIHXJHXKHXLHXMHXNHXOHXPHXQHXRHXSHSVHSWHSXHSYHSZHTIHTJHTKHTLHTMH"
+    "TNHTOHTPHTQHTRHTSHTTHTUHTVHTWHTXHTYHTZHUIHUJHUKHULHUMHUNHUOHUPHUQHURHUSHUT"
+    "HUUHUVHUWHUXHUYHUZHVIHVJHVKHIIKIILIIMIINIIOIIPIIQIIRIISIITIIUIIVIIWIIXIIYI"
+    "IZIJJIJKIJLIJMIJNIJOIJPIJQIJRIJSIJTIJUIJVIJWIJXIJYIJZIKJIKKIKLIKMIKNIKOIKP"
+    "IKQIKRIKSIKTXTHXUHXVHXWHXXHXYHXZHYIHYJHYKHYLHYMHYNHYOHYPHYQHYRHYSHYTHYUHYV"
+    "HYWHYXHYYHYZHZIHZJHZKHZLHZMHZNHZOHZPHZQHZRHZSHZTHZUHZVHZWHZXHZYHZZIIIJINNI"
+    "NOINPINQINRINSINTINUINVINWINXINYINZIOJIOKIOLIOMIONIOOIOPIOQIORIOSIOTIOUIOV"
+    "IOWIOXIOYIOZIPJIPKIPLIPMIPNIPOIPPIPQIPRIPSIPTIPUIPVIPWIKUIKVIKWIKXIKYIKZIL"
+    "JILKILLILMILNILOILPILQILRILSILTILUILVILWILXILYILZIMJIMKIMLIMMIMNIMOIMPIMQI"
+    "MRIMSIMTIMUIMVIMWIMXIMYIMZINJINKINLINMISQISRISSISTISUISVISWISXISYISZITJITK"
+    "ITLITMITNITOITPITQITRITSITTITUITVITWITXITYITZIUJIUKIULIUMIUNIUOIUPIUQIURIU"
+    "SIUTIUUIUVIUWIUXIUYIUZIPXIPYIPZIQJIQKIQLIQMIQNIQOIQPIQQIQRIQSIQTIQUIQVIQWI"
+    "QXIQYIQZIRJIRKIRLIRMIRNIROIRPIRQIRRIRSIRTIRUIRVIRWIRXIRYIRZISJISKISLISMISN"
+    "ISOISPIXTIXUIXVIXWIXXIXYIXZIYJIYKIYLIYMIYNIYOIYPIYQIYRIYSIYTIYUIYVIYWIYXIY"
+    "YIYZIZJIZKIZLIZMIZNIZOIZPIZQIZRIZSIZTIZUIZVIZWIZXIZYIZZJJJKJJLJJIVJIVKIVLI"
+    "VMIVNIVOIVPIVQIVRIVSIVTIVUIVVIVWIVXIVYIVZIWJIWKIWLIWMIWNIWOIWPIWQIWRIWSIWT"
+    "IWUIWVIWWIWXIWYIWZIXJIXKIXLIXMIXNIXOIXPIXQIXRIXSYJLZJMKJMLJMMJMNJMOJMPJMQJ"
+    "MRJMSJMTJMUJMVJMWJMXJMYJMZJNKJNLJNMJNNJNOJNPJNQJNRJNSJNTJNUJNVJNWJNXJNYJNZ"
+    "JOKJOLJOMJONJOOJOPJOQJORJOSJOTJOMJJNJJOJJPJJQJJRJJSJJTJJUJJVJJWJJXJJYJJZJK"
+    "KJKLJKMJKNJKOJKPJKQJKRJKSJKTJKUJKVJKWJKXJKYJKZJLKJLLJLMJLNJLOJLPJLQJLRJLSJ"
+    "LTJLUJLVJLWJLXJLQJRRJRSJRTJRUJRVJRWJRXJRYJRZJSKJSLJSMJSNJSOJSPJSQJSRJSSJST"
+    "JSUJSVJSWJSXJSYJSZJTKJTLJTMJTNJTOJTPJTQJTRJTSJTTJTUJTVJTWJTXJTYJTZJUKJULJU"
+    "UJOVJOWJOXJOYJOZJPKJPLJPMJPNJPOJPPJPQJPRJPSJPTJPUJPVJPWJPXJPYJPZJQKJQLJQMJ"
+    "QNJQOJQPJQQJQRJQSJQTJQUJQVJQWJQXJQYJQZJRKJRLJRMJRNJROJRPJRYJWZJXKJXLJXMJXN"
+    "JXOJXPJXQJXRJXSJXTJXUJXVJXWJXXJXYJXZJYKJYLJYMJYNJYOJYPJYQJYRJYSJYTJYUJYVJY"
+    "WJYXJYYJYZJZKJZLJZMJZNJZOJZPJZQJZRJZSJZTJZMJUNJUOJUPJUQJURJUSJUTJUUJUVJUWJ"
+    "UXJUYJUZJVKJVLJVMJVNJVOJVPJVQJVRJVSJVTJVUJVVJVWJVXJVYJVZJWKJWLJWMJWNJWOJWP"
+    "JWQJWRJWSJWTJWUJWVJWWJWXJWMTKMUKMVKMWKMXKMYKMZKNLKNMKNNKNOKNPKNQKNRKNSKNTK"
+    "NUKNVKNWKNXKNYKNZKOLKOMKONKOOKOPKOQKORKOSKOTKOUKOVKOWKOXKOYKOZKPLKPMKPNKPO"
+    "KPPKPQKPRKUJZVJZWJZXJZYJZZKKKLKKMKKNKKOKKPKKQKKRKKSKKTKKUKKVKKWKKXKKYKKZKL"
+    "LKLMKLNKLOKLPKLQKLRKLSKLTKLUKLVKLWKLXKLYKLZKMLKMMKMNKMOKMPKMQKMRKMSKSRKSSK"
+    "STKSUKSVKSWKSXKSYKSZKTLKTMKTNKTOKTPKTQKTRKTSKTTKTUKTVKTWKTXKTYKTZKULKUMKUN"
+    "KUOKUPKUQKURKUSKUTKUUKUVKUWKUXKUYKUZKVLKVMKVNKVOKVPKPSKPTKPUKPVKPWKPXKPYKP"
+    "ZKQLKQMKQNKQOKQPKQQKQRKQSKQTKQUKQVKQWKQXKQYKQZKRLKRMKRNKROKRPKRQKRRKRSKRTK"
+    "RUKRVKRWKRXKRYKRZKSLKSMKSNKSOKSPKSQKYPKYQKYRKYSKYTKYUKYVKYWKYXKYYKYZKZLKZM"
+    "KZNKZOKZPKZQKZRKZSKZTKZUKZVKZWKZXKZYKZZLLLMLLNLLOLLPLLQLLRLLSLLTLLULLVLLWL"
+    "LXLLYLLZLMMLMNLMOLMPVQKVRKVSKVTKVUKVVKVWKVXKVYKVZKWLKWMKWNKWOKWPKWQKWRKWSK"
+    "WTKWUKWVKWWKWXKWYKWZKXLKXMKXNKXOKXPKXQKXRKXSKXTKXUKXVKXWKXXKXYKXZKYLKYMKYN"
+    "KYOKLPSLPTLPULPVLPWLPXLPYLPZLQMLQNLQOLQPLQQLQRLQSLQTLQULQVLQWLQXLQYLQZLRML"
+    "RNLROLRPLRQLRRLRSLRTLRULRVLRWLRXLRYLRZLSMLSNLSOLSPLSQLSRLSSLSTLMQLMRLMSLMT"
+    "LMULMVLMWLMXLMYLMZLNMLNNLNOLNPLNQLNRLNSLNTLNULNVLNWLNXLNYLNZLOMLONLOOLOPLO"
+    "QLORLOSLOTLOULOVLOWLOXLOYLOZLPMLPNLPOLPPLPQLPRLVWLVXLVYLVZLWMLWNLWOLWPLWQL"
+    "WRLWSLWTLWULWVLWWLWXLWYLWZLXMLXNLXOLXPLXQLXRLXSLXTLXULXVLXWLXXLXYLXZLYMLYN"
+    "LYOLYPLYQLYRLYSLYTLYULYVLYWLYXLSULSVLSWLSXLSYLSZLTMLTNLTOLTPLTQLTRLTSLTTLT"
+    "ULTVLTWLTXLTYLTZLUMLUNLUOLUPLUQLURLUSLUTLUULUVLUWLUXLUYLUZLVMLVNLVOLVPLVQL"
+    "VRLVSLVTLVULVVOMOPMOQMORMOSMOTMOUMOVMOWMOXMOYMOZMPNMPOMPPMPQMPRMPSMPTMPUMP"
+    "VMPWMPXMPYMPZMQNMQOMQPMQQMQRMQSMQTMQUMQVMQWMQXMQYMQZMRNMROMRPMRQMRRMRSMRLY"
+    "YLYZLZMLZNLZOLZPLZQLZRLZSLZTLZULZVLZWLZXLZYLZZMMMNMMOMMPMMQMMRMMSMMTMMUMMV"
+    "MMWMMXMMYMMZMNNMNOMNPMNQMNRMNSMNTMNUMNVMNWMNXMNYMNZMONMOYMUZMVNMVOMVPMVQMV"
+    "RMVSMVTMVUMVVMVWMVXMVYMVZMWNMWOMWPMWQMWRMWSMWTMWUMWVMWWMWXMWYMWZMXNMXOMXPM"
+    "XQMXRMXSMXTMXUMXVMXWMXXMXYMXZMYNMYOMYPMYTMRUMRVMRWMRXMRYMRZMSNMSOMSPMSQMSR"
+    "MSSMSTMSUMSVMSWMSXMSYMSZMTNMTOMTPMTQMTRMTSMTTMTUMTVMTWMTXMTYMTZMUNMUOMUPMU"
+    "QMURMUSMUTMUUMUVMUWMUXMUOXNOYNOZNPONPPNPQNPRNPSNPTNPUNPVNPWNPXNPYNPZNQONQP"
+    "NQQNQRNQSNQTNQUNQVNQWNQXNQYNQZNRONRPNRQNRRNRSNRTNRUNRVNRWNRXNRYNRZNSONSPNS"
+    "QNSRNSSNQMYRMYSMYTMYUMYVMYWMYXMYYMYZMZNMZOMZPMZQMZRMZSMZTMZUMZVMZWMZXMZYMZ"
+    "ZNNNONNPNNQNNRNNSNNTNNUNNVNNWNNXNNYNNZNOONOPNOQNORNOSNOTNOUNOVNOWNWPNWQNWR"
+    "NWSNWTNWUNWVNWWNWXNWYNWZNXONXPNXQNXRNXSNXTNXUNXVNXWNXXNXYNXZNYONYPNYQNYRNY"
+    "SNYTNYUNYVNYWNYXNYYNYZNZONZPNZQNZRNZSNZTNZUNZVNZWNSTNSUNSVNSWNSXNSYNSZNTON"
+    "TPNTQNTRNTSNTTNTUNTVNTWNTXNTYNTZNUONUPNUQNURNUSNUTNUUNUVNUWNUXNUYNUZNVONVP"
+    "NVQNVRNVSNVTNVUNVVNVWNVXNVYNVZNWONORXORYORZOSPOSQOSROSSOSTOSUOSVOSWOSXOSYO"
+    "SZOTPOTQOTROTSOTTOTUOTVOTWOTXOTYOTZOUPOUQOUROUSOUTOUUOUVOUWOUXOUYOUZOVPOVQ"
+    "OVROVSOVTOVUOVVOVWZXNZYNZZOOOPOOQOOROOSOOTOOUOOVOOWOOXOOYOOZOPPOPQOPROPSOP"
+    "TOPUOPVOPWOPXOPYOPZOQPOQQOQROQSOQTOQUOQVOQWOQXOQYOQZORPORQORRORSORTORUORVO"
+    "RWOZXOZYOZZPPPQPPRPPSPPTPPUPPVPPWPPXPPYPPZPQQPQRPQSPQTPQUPQVPQWPQXPQYPQZPR"
+    "QPRRPRSPRTPRUPRVPRWPRXPRYPRZPSQPSRPSSPSTPSUPSVPSWPSXPSYPSZPTOVXOVYOVZOWPOW"
+    "QOWROWSOWTOWUOWVOWWOWXOWYOWZOXPOXQOXROXSOXTOXUOXVOXWOXXOXYOXZOYPOYQOYROYSO"
+    "YTOYUOYVOYWOYXOYYOYZOZPOZQOZROZSOZTOZUOZVOZWQPTRPTSPTTPTUPTV";
+
+TEST(ZlibTest, DeflateZFixedCorruption) {
+  // Tavis's test case from
+  // https://www.openwall.com/lists/oss-security/2022/03/26/1
+  // The upstream fix,
+  // https://github.com/madler/zlib/commit/5c44459c3b28a9bd3283aaceab7c615f8020c531,
+  // was merged in Chromium in #583975.
+
+  z_stream stream;
+  stream.zalloc = Z_NULL;
+  stream.zfree = Z_NULL;
+
+  int level = Z_DEFAULT_COMPRESSION;
+  int windowBits = 15;
+  int memLevel = 1;
+  int strategy = Z_FIXED;
+
+  int ret =
+      deflateInit2(&stream, level, Z_DEFLATED, windowBits, memLevel, strategy);
+  ASSERT_EQ(ret, Z_OK);
+  std::vector<uint8_t> compressed(
+      deflateBound(&stream, strlen(zFixedCorruptionData)));
+  stream.next_out = compressed.data();
+  stream.avail_out = compressed.size();
+  stream.next_in = (uint8_t*)zFixedCorruptionData;
+  stream.avail_in = strlen(zFixedCorruptionData);
+  ret = deflate(&stream, Z_FINISH);
+  ASSERT_EQ(ret, Z_STREAM_END);
+  size_t compressed_sz = compressed.size() - stream.avail_out;
+  deflateEnd(&stream);
+
+  std::vector<uint8_t> decompressed(strlen(zFixedCorruptionData));
+  ret = inflateInit2(&stream, windowBits);
+  ASSERT_EQ(ret, Z_OK);
+  stream.next_in = compressed.data();
+  stream.avail_in = compressed_sz;
+  stream.next_out = decompressed.data();
+  stream.avail_out = decompressed.size();
+  ret = inflate(&stream, Z_FINISH);
+  ASSERT_EQ(ret, Z_STREAM_END);
+  inflateEnd(&stream);
+
+  EXPECT_EQ(decompressed.size(), strlen(zFixedCorruptionData));
+  EXPECT_EQ(
+      memcmp(zFixedCorruptionData, decompressed.data(), decompressed.size()),
+      0);
+}
+
+// TODO(gustavoa): make these tests run standalone.
+#ifndef CMAKE_STANDALONE_UNITTESTS
+
+TEST(ZlibTest, ZipFilenameCommentSize) {
+  // Check that minizip rejects zip member filenames or comments longer than
+  // the zip format can represent.
+
+  base::ScopedTempDir temp_dir;
+  ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
+  base::FilePath zip_file = temp_dir.GetPath().AppendASCII("crbug1470539.zip");
+
+  zipFile zf = zipOpen(zip_file.AsUTF8Unsafe().c_str(), APPEND_STATUS_CREATE);
+  ASSERT_NE(zf, nullptr);
+
+  // Adding a member with 2^16 byte filename is okay.
+  std::string long_filename(UINT16_MAX, 'a');
+  EXPECT_EQ(zipOpenNewFileInZip(zf, long_filename.c_str(), nullptr, nullptr, 0,
+                                nullptr, 0, nullptr, Z_DEFLATED,
+                                Z_DEFAULT_COMPRESSION),
+            ZIP_OK);
+  EXPECT_EQ(zipWriteInFileInZip(zf, "1", 1), ZIP_OK);
+  EXPECT_EQ(zipCloseFileInZip(zf), ZIP_OK);
+
+  // Adding a member with 2^16+1 byte filename is NOT okay.
+  std::string too_long_filename = long_filename + 'a';
+  EXPECT_EQ(zipOpenNewFileInZip(zf, too_long_filename.c_str(), nullptr, nullptr,
+                                0, nullptr, 0, nullptr, Z_DEFLATED,
+                                Z_DEFAULT_COMPRESSION),
+            ZIP_PARAMERROR);
+
+  // Adding a member with 2^16 byte comment is okay.
+  std::string long_comment(UINT16_MAX, 'x');
+  EXPECT_EQ(zipOpenNewFileInZip(zf, "x", nullptr, nullptr, 0, nullptr, 0,
+                                long_comment.c_str(), Z_DEFLATED,
+                                Z_DEFAULT_COMPRESSION),
+            ZIP_OK);
+  EXPECT_EQ(zipCloseFileInZip(zf), ZIP_OK);
+
+  // Adding a member with 2^16+1 byte comment is NOT okay.
+  std::string too_long_comment = long_comment + 'x';
+  EXPECT_EQ(zipOpenNewFileInZip(zf, "x", nullptr, nullptr, 0, nullptr, 0,
+                                too_long_comment.c_str(), Z_DEFLATED,
+                                Z_DEFAULT_COMPRESSION),
+            ZIP_PARAMERROR);
+
+  EXPECT_EQ(zipClose(zf, nullptr), ZIP_OK);
+
+  // Check that the long filename and comment members were successfully added.
+  unzFile uzf = unzOpen(zip_file.AsUTF8Unsafe().c_str());
+  ASSERT_NE(uzf, nullptr);
+  char buf[UINT16_MAX + 2];
+
+  ASSERT_EQ(unzGoToFirstFile(uzf), UNZ_OK);
+  ASSERT_EQ(unzGetCurrentFileInfo(uzf, nullptr, buf, sizeof(buf), nullptr, 0,
+                                  nullptr, 0),
+            UNZ_OK);
+  EXPECT_EQ(std::string(buf), long_filename);
+
+  ASSERT_EQ(unzGoToNextFile(uzf), UNZ_OK);
+  ASSERT_EQ(unzGetCurrentFileInfo(uzf, nullptr, nullptr, 0, nullptr, 0, buf,
+                                  sizeof(buf)),
+            UNZ_OK);
+  EXPECT_EQ(std::string(buf), long_comment);
+
+  EXPECT_EQ(unzGoToNextFile(uzf), UNZ_END_OF_LIST_OF_FILE);
+  EXPECT_EQ(unzClose(uzf), UNZ_OK);
+}
+
+TEST(ZlibTest, ZipExtraFieldSize) {
+  // Check that minizip rejects zip members with too large extra fields.
+
+  std::string extra_field;
+  extra_field.append("\x12\x34");  // Header ID.
+  extra_field.append("\xfb\xff");  // Data size (not including the header).
+  extra_field.append(UINT16_MAX - 4, 'a');
+
+  base::ScopedTempDir temp_dir;
+  ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
+  base::FilePath zip_file = temp_dir.GetPath().AppendASCII("extrafield.zip");
+
+  zipFile zf = zipOpen(zip_file.AsUTF8Unsafe().c_str(), APPEND_STATUS_CREATE);
+  ASSERT_NE(zf, nullptr);
+
+  // Adding a member with 2^16 byte extra field should work.
+  EXPECT_EQ(zipOpenNewFileInZip(zf, "a", nullptr, extra_field.data(),
+                                extra_field.size(), extra_field.data(),
+                                extra_field.size(), nullptr, Z_DEFLATED,
+                                Z_DEFAULT_COMPRESSION),
+            ZIP_OK);
+  EXPECT_EQ(zipWriteInFileInZip(zf, "1", 1), ZIP_OK);
+  EXPECT_EQ(zipCloseFileInZip(zf), ZIP_OK);
+
+  // More then 2^16 bytes doesn't work. Neither for size_extrafield_local, nor
+  // size_extrafield_global.
+  std::string extra_field_long = extra_field + 'x';
+  EXPECT_EQ(
+      zipOpenNewFileInZip(zf, "b", nullptr, nullptr, 0, extra_field_long.data(),
+                          extra_field_long.size(), nullptr, Z_DEFLATED,
+                          Z_DEFAULT_COMPRESSION),
+      ZIP_PARAMERROR);
+  EXPECT_EQ(zipOpenNewFileInZip(zf, "b", nullptr, extra_field_long.data(),
+                                extra_field_long.size(), nullptr, 0, nullptr,
+                                Z_DEFLATED, Z_DEFAULT_COMPRESSION),
+            ZIP_PARAMERROR);
+
+  EXPECT_EQ(zipClose(zf, nullptr), ZIP_OK);
+
+  // Check that the data can be read back.
+  unzFile uzf = unzOpen(zip_file.AsUTF8Unsafe().c_str());
+  ASSERT_NE(uzf, nullptr);
+  char buf[UINT16_MAX + 1] = {0};
+
+  ASSERT_EQ(unzGoToFirstFile(uzf), UNZ_OK);
+  ASSERT_EQ(unzGetCurrentFileInfo(uzf, nullptr, nullptr, 0, buf,
+                                  sizeof(buf) - 1, nullptr, 0),
+            UNZ_OK);
+  EXPECT_EQ(std::string(buf), extra_field);
+
+  EXPECT_EQ(unzGoToNextFile(uzf), UNZ_END_OF_LIST_OF_FILE);
+  EXPECT_EQ(unzClose(uzf), UNZ_OK);
+}
+
+#endif
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/cpu_features.c b/extern/crashpad/crashpad/third_party/zlib/zlib/cpu_features.c
new file mode 100644
index 0000000000..64e0428cd2
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/cpu_features.c
@@ -0,0 +1,189 @@
+/* cpu_features.c -- Processor features detection.
+ *
+ * Copyright 2018 The Chromium Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the Chromium source repository LICENSE file.
+ */
+
+#include "cpu_features.h"
+#include "zutil.h"
+
+#include <stdint.h>
+#if defined(_MSC_VER)
+#include <intrin.h>
+#elif defined(ADLER32_SIMD_SSSE3)
+#include <cpuid.h>
+#endif
+
+/* TODO(cavalcantii): remove checks for x86_flags on deflate.
+ */
+#if defined(ARMV8_OS_MACOS)
+/* Crypto extensions (crc32/pmull) are a baseline feature in ARMv8.1-A, and
+ * OSX running on arm64 is new enough that these can be assumed without
+ * runtime detection.
+ */
+int ZLIB_INTERNAL arm_cpu_enable_crc32 = 1;
+int ZLIB_INTERNAL arm_cpu_enable_pmull = 1;
+#else
+int ZLIB_INTERNAL arm_cpu_enable_crc32 = 0;
+int ZLIB_INTERNAL arm_cpu_enable_pmull = 0;
+#endif
+int ZLIB_INTERNAL x86_cpu_enable_sse2 = 0;
+int ZLIB_INTERNAL x86_cpu_enable_ssse3 = 0;
+int ZLIB_INTERNAL x86_cpu_enable_simd = 0;
+int ZLIB_INTERNAL x86_cpu_enable_avx512 = 0;
+
+#ifndef CPU_NO_SIMD
+
+#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_FUCHSIA) || defined(ARMV8_OS_IOS)
+#include <pthread.h>
+#endif
+
+#if defined(ARMV8_OS_ANDROID)
+#include <cpu-features.h>
+#elif defined(ARMV8_OS_LINUX)
+#include <asm/hwcap.h>
+#include <sys/auxv.h>
+#elif defined(ARMV8_OS_FUCHSIA)
+#include <zircon/features.h>
+#include <zircon/syscalls.h>
+#include <zircon/types.h>
+#elif defined(ARMV8_OS_WINDOWS) || defined(X86_WINDOWS)
+#include <windows.h>
+#elif defined(ARMV8_OS_IOS)
+#include <sys/sysctl.h>
+#elif !defined(_MSC_VER)
+#include <pthread.h>
+#else
+#error cpu_features.c CPU feature detection in not defined for your platform
+#endif
+
+#if !defined(CPU_NO_SIMD) && !defined(ARMV8_OS_MACOS)
+static void _cpu_check_features(void);
+#endif
+
+#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_MACOS) || defined(ARMV8_OS_FUCHSIA) || defined(X86_NOT_WINDOWS) || defined(ARMV8_OS_IOS)
+#if !defined(ARMV8_OS_MACOS)
+// _cpu_check_features() doesn't need to do anything on mac/arm since all
+// features are known at build time, so don't call it.
+// Do provide cpu_check_features() (with a no-op implementation) so that we
+// don't have to make all callers of it check for mac/arm.
+static pthread_once_t cpu_check_inited_once = PTHREAD_ONCE_INIT;
+#endif
+void ZLIB_INTERNAL cpu_check_features(void)
+{
+#if !defined(ARMV8_OS_MACOS)
+    pthread_once(&cpu_check_inited_once, _cpu_check_features);
+#endif
+}
+#elif defined(ARMV8_OS_WINDOWS) || defined(X86_WINDOWS)
+static INIT_ONCE cpu_check_inited_once = INIT_ONCE_STATIC_INIT;
+static BOOL CALLBACK _cpu_check_features_forwarder(PINIT_ONCE once, PVOID param, PVOID* context)
+{
+    _cpu_check_features();
+    return TRUE;
+}
+void ZLIB_INTERNAL cpu_check_features(void)
+{
+    InitOnceExecuteOnce(&cpu_check_inited_once, _cpu_check_features_forwarder,
+                        NULL, NULL);
+}
+#endif
+
+#if (defined(__ARM_NEON__) || defined(__ARM_NEON))
+#if !defined(ARMV8_OS_MACOS)
+/*
+ * See http://bit.ly/2CcoEsr for run-time detection of ARM features and also
+ * crbug.com/931275 for android_getCpuFeatures() use in the Android sandbox.
+ */
+static void _cpu_check_features(void)
+{
+#if defined(ARMV8_OS_ANDROID) && defined(__aarch64__)
+    uint64_t features = android_getCpuFeatures();
+    arm_cpu_enable_crc32 = !!(features & ANDROID_CPU_ARM64_FEATURE_CRC32);
+    arm_cpu_enable_pmull = !!(features & ANDROID_CPU_ARM64_FEATURE_PMULL);
+#elif defined(ARMV8_OS_ANDROID) /* aarch32 */
+    uint64_t features = android_getCpuFeatures();
+    arm_cpu_enable_crc32 = !!(features & ANDROID_CPU_ARM_FEATURE_CRC32);
+    arm_cpu_enable_pmull = !!(features & ANDROID_CPU_ARM_FEATURE_PMULL);
+#elif defined(ARMV8_OS_LINUX) && defined(__aarch64__)
+    unsigned long features = getauxval(AT_HWCAP);
+    arm_cpu_enable_crc32 = !!(features & HWCAP_CRC32);
+    arm_cpu_enable_pmull = !!(features & HWCAP_PMULL);
+#elif defined(ARMV8_OS_LINUX) && (defined(__ARM_NEON) || defined(__ARM_NEON__))
+    /* Query HWCAP2 for ARMV8-A SoCs running in aarch32 mode */
+    unsigned long features = getauxval(AT_HWCAP2);
+    arm_cpu_enable_crc32 = !!(features & HWCAP2_CRC32);
+    arm_cpu_enable_pmull = !!(features & HWCAP2_PMULL);
+#elif defined(ARMV8_OS_FUCHSIA)
+    uint32_t features;
+    zx_status_t rc = zx_system_get_features(ZX_FEATURE_KIND_CPU, &features);
+    if (rc != ZX_OK || (features & ZX_ARM64_FEATURE_ISA_ASIMD) == 0)
+        return;  /* Report nothing if ASIMD(NEON) is missing */
+    arm_cpu_enable_crc32 = !!(features & ZX_ARM64_FEATURE_ISA_CRC32);
+    arm_cpu_enable_pmull = !!(features & ZX_ARM64_FEATURE_ISA_PMULL);
+#elif defined(ARMV8_OS_WINDOWS)
+    arm_cpu_enable_crc32 = IsProcessorFeaturePresent(PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE);
+    arm_cpu_enable_pmull = IsProcessorFeaturePresent(PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE);
+#elif defined(ARMV8_OS_IOS)
+    // Determine what features are supported dynamically. This code is applicable to macOS
+    // as well if we wish to do that dynamically on that platform in the future.
+    // See https://developer.apple.com/documentation/kernel/1387446-sysctlbyname/determining_instruction_set_characteristics
+    int val = 0;
+    size_t len = sizeof(val);
+    arm_cpu_enable_crc32 = sysctlbyname("hw.optional.armv8_crc32", &val, &len, 0, 0) == 0
+               && val != 0;
+    val = 0;
+    len = sizeof(val);
+    arm_cpu_enable_pmull = sysctlbyname("hw.optional.arm.FEAT_PMULL", &val, &len, 0, 0) == 0
+               && val != 0;
+#endif
+}
+#endif
+#elif defined(X86_NOT_WINDOWS) || defined(X86_WINDOWS)
+/*
+ * iOS@x86 (i.e. emulator) is another special case where we disable
+ * SIMD optimizations.
+ */
+#ifndef CPU_NO_SIMD
+/* On x86 we simply use a instruction to check the CPU features.
+ * (i.e. CPUID).
+ */
+#ifdef CRC32_SIMD_AVX512_PCLMUL
+#include <immintrin.h>
+#include <xsaveintrin.h>
+#endif
+static void _cpu_check_features(void)
+{
+    int x86_cpu_has_sse2;
+    int x86_cpu_has_ssse3;
+    int x86_cpu_has_sse42;
+    int x86_cpu_has_pclmulqdq;
+    int abcd[4];
+
+#ifdef _MSC_VER
+    __cpuid(abcd, 1);
+#else
+    __cpuid(1, abcd[0], abcd[1], abcd[2], abcd[3]);
+#endif
+
+    x86_cpu_has_sse2 = abcd[3] & 0x4000000;
+    x86_cpu_has_ssse3 = abcd[2] & 0x000200;
+    x86_cpu_has_sse42 = abcd[2] & 0x100000;
+    x86_cpu_has_pclmulqdq = abcd[2] & 0x2;
+
+    x86_cpu_enable_sse2 = x86_cpu_has_sse2;
+
+    x86_cpu_enable_ssse3 = x86_cpu_has_ssse3;
+
+    x86_cpu_enable_simd = x86_cpu_has_sse2 &&
+                          x86_cpu_has_sse42 &&
+                          x86_cpu_has_pclmulqdq;
+
+#ifdef CRC32_SIMD_AVX512_PCLMUL
+    x86_cpu_enable_avx512 = _xgetbv(0) & 0x00000040;
+#endif
+}
+#endif
+#endif
+#endif
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/cpu_features.h b/extern/crashpad/crashpad/third_party/zlib/zlib/cpu_features.h
new file mode 100644
index 0000000000..aed3e834c5
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/cpu_features.h
@@ -0,0 +1,19 @@
+/* cpu_features.h -- Processor features detection.
+ *
+ * Copyright 2018 The Chromium Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the Chromium source repository LICENSE file.
+ */
+
+#include "zlib.h"
+
+/* TODO(cavalcantii): remove checks for x86_flags on deflate.
+ */
+extern int arm_cpu_enable_crc32;
+extern int arm_cpu_enable_pmull;
+extern int x86_cpu_enable_sse2;
+extern int x86_cpu_enable_ssse3;
+extern int x86_cpu_enable_simd;
+extern int x86_cpu_enable_avx512;
+
+void cpu_check_features(void);
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/crc32.c b/extern/crashpad/crashpad/third_party/zlib/zlib/crc32.c
index 9162429cc7..1e1a57519c 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/crc32.c
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/crc32.c
@@ -1,12 +1,10 @@
 /* crc32.c -- compute the CRC-32 of a data stream
- * Copyright (C) 1995-2006, 2010, 2011, 2012, 2016 Mark Adler
+ * Copyright (C) 1995-2022 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  *
- * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
- * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing
- * tables for updating the shift register in one step with three exclusive-ors
- * instead of four steps with four exclusive-ors.  This results in about a
- * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3.
+ * This interleaved implementation of a CRC makes use of pipelined multiple
+ * arithmetic-logic units, commonly found in modern CPU cores. It is due to
+ * Kadatch and Jenkins (2010). See doc/crc-doc.1.0.pdf in this distribution.
  */
 
 /* @(#) $Id$ */
@@ -14,11 +12,12 @@
 /*
   Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore
   protection on the static variables used to control the first-use generation
-  of the crc tables.  Therefore, if you #define DYNAMIC_CRC_TABLE, you should
+  of the crc tables. Therefore, if you #define DYNAMIC_CRC_TABLE, you should
   first call get_crc_table() to initialize the tables before allowing more than
   one thread to use crc32().
 
-  DYNAMIC_CRC_TABLE and MAKECRCH can be #defined to write out crc32.h.
+  MAKECRCH can be #defined to write out crc32.h. A main() routine is also
+  produced, so that this one source file can be compiled to an executable.
  */
 
 #ifdef MAKECRCH
@@ -29,441 +28,1155 @@
 #endif /* MAKECRCH */
 
 #include "deflate.h"
-#include "x86.h"
-#include "zutil.h"      /* for STDC and FAR definitions */
-
-/* Definitions for doing the crc four data bytes at a time. */
-#if !defined(NOBYFOUR) && defined(Z_U4)
-#  define BYFOUR
-#endif
-#ifdef BYFOUR
-   local unsigned long crc32_little OF((unsigned long,
-                        const unsigned char FAR *, z_size_t));
-   local unsigned long crc32_big OF((unsigned long,
-                        const unsigned char FAR *, z_size_t));
-#  define TBLS 8
+#include "cpu_features.h"
+#include "zutil.h"      /* for Z_U4, Z_U8, z_crc_t, and FAR definitions */
+
+#if defined(CRC32_SIMD_SSE42_PCLMUL) || defined(CRC32_ARMV8_CRC32)
+#include "crc32_simd.h"
+#endif
+
+ /*
+  A CRC of a message is computed on N braids of words in the message, where
+  each word consists of W bytes (4 or 8). If N is 3, for example, then three
+  running sparse CRCs are calculated respectively on each braid, at these
+  indices in the array of words: 0, 3, 6, ..., 1, 4, 7, ..., and 2, 5, 8, ...
+  This is done starting at a word boundary, and continues until as many blocks
+  of N * W bytes as are available have been processed. The results are combined
+  into a single CRC at the end. For this code, N must be in the range 1..6 and
+  W must be 4 or 8. The upper limit on N can be increased if desired by adding
+  more #if blocks, extending the patterns apparent in the code. In addition,
+  crc32.h would need to be regenerated, if the maximum N value is increased.
+
+  N and W are chosen empirically by benchmarking the execution time on a given
+  processor. The choices for N and W below were based on testing on Intel Kaby
+  Lake i7, AMD Ryzen 7, ARM Cortex-A57, Sparc64-VII, PowerPC POWER9, and MIPS64
+  Octeon II processors. The Intel, AMD, and ARM processors were all fastest
+  with N=5, W=8. The Sparc, PowerPC, and MIPS64 were all fastest at N=5, W=4.
+  They were all tested with either gcc or clang, all using the -O3 optimization
+  level. Your mileage may vary.
+ */
+
+/* Define N */
+#ifdef Z_TESTN
+#  define N Z_TESTN
+#else
+#  define N 5
+#endif
+#if N < 1 || N > 6
+#  error N must be in 1..6
+#endif
+
+/*
+  z_crc_t must be at least 32 bits. z_word_t must be at least as long as
+  z_crc_t. It is assumed here that z_word_t is either 32 bits or 64 bits, and
+  that bytes are eight bits.
+ */
+
+/*
+  Define W and the associated z_word_t type. If W is not defined, then a
+  braided calculation is not used, and the associated tables and code are not
+  compiled.
+ */
+#ifdef Z_TESTW
+#  if Z_TESTW-1 != -1
+#    define W Z_TESTW
+#  endif
 #else
-#  define TBLS 1
-#endif /* BYFOUR */
+#  ifdef MAKECRCH
+#    define W 8         /* required for MAKECRCH */
+#  else
+#    if defined(__x86_64__) || defined(__aarch64__)
+#      define W 8
+#    else
+#      define W 4
+#    endif
+#  endif
+#endif
+#ifdef W
+#  if W == 8 && defined(Z_U8)
+     typedef Z_U8 z_word_t;
+#  elif defined(Z_U4)
+#    undef W
+#    define W 4
+     typedef Z_U4 z_word_t;
+#  else
+#    undef W
+#  endif
+#endif
 
-/* Local functions for crc concatenation */
-local unsigned long gf2_matrix_times OF((unsigned long *mat,
-                                         unsigned long vec));
-local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat));
-local uLong crc32_combine_ OF((uLong crc1, uLong crc2, z_off64_t len2));
+/* If available, use the ARM processor CRC32 instruction. */
+#if defined(__aarch64__) && defined(__ARM_FEATURE_CRC32) && W == 8 \
+    && defined(USE_CANONICAL_ARMV8_CRC32)
+#  define ARMCRC32_CANONICAL_ZLIB
+#endif
 
+#if defined(W) && (!defined(ARMCRC32_CANONICAL_ZLIB) || defined(DYNAMIC_CRC_TABLE))
+/*
+  Swap the bytes in a z_word_t to convert between little and big endian. Any
+  self-respecting compiler will optimize this to a single machine byte-swap
+  instruction, if one is available. This assumes that word_t is either 32 bits
+  or 64 bits.
+ */
+local z_word_t byte_swap(z_word_t word) {
+#  if W == 8
+    return
+        (word & 0xff00000000000000) >> 56 |
+        (word & 0xff000000000000) >> 40 |
+        (word & 0xff0000000000) >> 24 |
+        (word & 0xff00000000) >> 8 |
+        (word & 0xff000000) << 8 |
+        (word & 0xff0000) << 24 |
+        (word & 0xff00) << 40 |
+        (word & 0xff) << 56;
+#  else   /* W == 4 */
+    return
+        (word & 0xff000000) >> 24 |
+        (word & 0xff0000) >> 8 |
+        (word & 0xff00) << 8 |
+        (word & 0xff) << 24;
+#  endif
+}
+#endif
 
 #ifdef DYNAMIC_CRC_TABLE
+/* =========================================================================
+ * Table of powers of x for combining CRC-32s, filled in by make_crc_table()
+ * below.
+ */
+   local z_crc_t FAR x2n_table[32];
+#else
+/* =========================================================================
+ * Tables for byte-wise and braided CRC-32 calculations, and a table of powers
+ * of x for combining CRC-32s, all made by make_crc_table().
+ */
+#  include "crc32.h"
+#endif
+
+/* CRC polynomial. */
+#define POLY 0xedb88320         /* p(x) reflected, with x^32 implied */
+
+/*
+  Return a(x) multiplied by b(x) modulo p(x), where p(x) is the CRC polynomial,
+  reflected. For speed, this requires that a not be zero.
+ */
+local z_crc_t multmodp(z_crc_t a, z_crc_t b) {
+    z_crc_t m, p;
+
+    m = (z_crc_t)1 << 31;
+    p = 0;
+    for (;;) {
+        if (a & m) {
+            p ^= b;
+            if ((a & (m - 1)) == 0)
+                break;
+        }
+        m >>= 1;
+        b = b & 1 ? (b >> 1) ^ POLY : b >> 1;
+    }
+    return p;
+}
 
-local volatile int crc_table_empty = 1;
-local z_crc_t FAR crc_table[TBLS][256];
-local void make_crc_table OF((void));
+/*
+  Return x^(n * 2^k) modulo p(x). Requires that x2n_table[] has been
+  initialized.
+ */
+local z_crc_t x2nmodp(z_off64_t n, unsigned k) {
+    z_crc_t p;
+
+    p = (z_crc_t)1 << 31;           /* x^0 == 1 */
+    while (n) {
+        if (n & 1)
+            p = multmodp(x2n_table[k & 31], p);
+        n >>= 1;
+        k++;
+    }
+    return p;
+}
+
+#ifdef DYNAMIC_CRC_TABLE
+/* =========================================================================
+ * Build the tables for byte-wise and braided CRC-32 calculations, and a table
+ * of powers of x for combining CRC-32s.
+ */
+local z_crc_t FAR crc_table[256];
+#ifdef W
+   local z_word_t FAR crc_big_table[256];
+   local z_crc_t FAR crc_braid_table[W][256];
+   local z_word_t FAR crc_braid_big_table[W][256];
+   local void braid(z_crc_t [][256], z_word_t [][256], int, int);
+#endif
 #ifdef MAKECRCH
-   local void write_table OF((FILE *, const z_crc_t FAR *));
+   local void write_table(FILE *, const z_crc_t FAR *, int);
+   local void write_table32hi(FILE *, const z_word_t FAR *, int);
+   local void write_table64(FILE *, const z_word_t FAR *, int);
 #endif /* MAKECRCH */
+
+/*
+  Define a once() function depending on the availability of atomics. If this is
+  compiled with DYNAMIC_CRC_TABLE defined, and if CRCs will be computed in
+  multiple threads, and if atomics are not available, then get_crc_table() must
+  be called to initialize the tables and must return before any threads are
+  allowed to compute or combine CRCs.
+ */
+
+/* Definition of once functionality. */
+typedef struct once_s once_t;
+
+/* Check for the availability of atomics. */
+#if defined(__STDC__) && __STDC_VERSION__ >= 201112L && \
+    !defined(__STDC_NO_ATOMICS__)
+
+#include <stdatomic.h>
+
+/* Structure for once(), which must be initialized with ONCE_INIT. */
+struct once_s {
+    atomic_flag begun;
+    atomic_int done;
+};
+#define ONCE_INIT {ATOMIC_FLAG_INIT, 0}
+
+/*
+  Run the provided init() function exactly once, even if multiple threads
+  invoke once() at the same time. The state must be a once_t initialized with
+  ONCE_INIT.
+ */
+local void once(once_t *state, void (*init)(void)) {
+    if (!atomic_load(&state->done)) {
+        if (atomic_flag_test_and_set(&state->begun))
+            while (!atomic_load(&state->done))
+                ;
+        else {
+            init();
+            atomic_store(&state->done, 1);
+        }
+    }
+}
+
+#else   /* no atomics */
+
+/* Structure for once(), which must be initialized with ONCE_INIT. */
+struct once_s {
+    volatile int begun;
+    volatile int done;
+};
+#define ONCE_INIT {0, 0}
+
+/* Test and set. Alas, not atomic, but tries to minimize the period of
+   vulnerability. */
+local int test_and_set(int volatile *flag) {
+    int was;
+
+    was = *flag;
+    *flag = 1;
+    return was;
+}
+
+/* Run the provided init() function once. This is not thread-safe. */
+local void once(once_t *state, void (*init)(void)) {
+    if (!state->done) {
+        if (test_and_set(&state->begun))
+            while (!state->done)
+                ;
+        else {
+            init();
+            state->done = 1;
+        }
+    }
+}
+
+#endif
+
+/* State for once(). */
+local once_t made = ONCE_INIT;
+
 /*
   Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:
   x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.
 
   Polynomials over GF(2) are represented in binary, one bit per coefficient,
-  with the lowest powers in the most significant bit.  Then adding polynomials
+  with the lowest powers in the most significant bit. Then adding polynomials
   is just exclusive-or, and multiplying a polynomial by x is a right shift by
-  one.  If we call the above polynomial p, and represent a byte as the
+  one. If we call the above polynomial p, and represent a byte as the
   polynomial q, also with the lowest power in the most significant bit (so the
-  byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p,
+  byte 0xb1 is the polynomial x^7+x^3+x^2+1), then the CRC is (q*x^32) mod p,
   where a mod b means the remainder after dividing a by b.
 
   This calculation is done using the shift-register method of multiplying and
-  taking the remainder.  The register is initialized to zero, and for each
+  taking the remainder. The register is initialized to zero, and for each
   incoming bit, x^32 is added mod p to the register if the bit is a one (where
-  x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by
-  x (which is shifting right by one and adding x^32 mod p if the bit shifted
-  out is a one).  We start with the highest power (least significant bit) of
-  q and repeat for all eight bits of q.
-
-  The first table is simply the CRC of all possible eight bit values.  This is
-  all the information needed to generate CRCs on data a byte at a time for all
-  combinations of CRC register values and incoming bytes.  The remaining tables
-  allow for word-at-a-time CRC calculation for both big-endian and little-
-  endian machines, where a word is four bytes.
-*/
-local void make_crc_table()
-{
-    z_crc_t c;
-    int n, k;
-    z_crc_t poly;                       /* polynomial exclusive-or pattern */
-    /* terms of polynomial defining this crc (except x^32): */
-    static volatile int first = 1;      /* flag to limit concurrent making */
-    static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
-
-    /* See if another task is already doing this (not thread-safe, but better
-       than nothing -- significantly reduces duration of vulnerability in
-       case the advice about DYNAMIC_CRC_TABLE is ignored) */
-    if (first) {
-        first = 0;
-
-        /* make exclusive-or pattern from polynomial (0xedb88320UL) */
-        poly = 0;
-        for (n = 0; n < (int)(sizeof(p)/sizeof(unsigned char)); n++)
-            poly |= (z_crc_t)1 << (31 - p[n]);
-
-        /* generate a crc for every 8-bit value */
-        for (n = 0; n < 256; n++) {
-            c = (z_crc_t)n;
-            for (k = 0; k < 8; k++)
-                c = c & 1 ? poly ^ (c >> 1) : c >> 1;
-            crc_table[0][n] = c;
-        }
+  x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by x
+  (which is shifting right by one and adding x^32 mod p if the bit shifted out
+  is a one). We start with the highest power (least significant bit) of q and
+  repeat for all eight bits of q.
 
-#ifdef BYFOUR
-        /* generate crc for each value followed by one, two, and three zeros,
-           and then the byte reversal of those as well as the first table */
-        for (n = 0; n < 256; n++) {
-            c = crc_table[0][n];
-            crc_table[4][n] = ZSWAP32(c);
-            for (k = 1; k < 4; k++) {
-                c = crc_table[0][c & 0xff] ^ (c >> 8);
-                crc_table[k][n] = c;
-                crc_table[k + 4][n] = ZSWAP32(c);
-            }
-        }
-#endif /* BYFOUR */
+  The table is simply the CRC of all possible eight bit values. This is all the
+  information needed to generate CRCs on data a byte at a time for all
+  combinations of CRC register values and incoming bytes.
+ */
+local void make_crc_table(void)
+{
+    unsigned i, j, n;
+    z_crc_t p;
 
-        crc_table_empty = 0;
-    }
-    else {      /* not first */
-        /* wait for the other guy to finish (not efficient, but rare) */
-        while (crc_table_empty)
-            ;
+    /* initialize the CRC of bytes tables */
+    for (i = 0; i < 256; i++) {
+        p = i;
+        for (j = 0; j < 8; j++)
+            p = p & 1 ? (p >> 1) ^ POLY : p >> 1;
+        crc_table[i] = p;
+#ifdef W
+        crc_big_table[i] = byte_swap(p);
+#endif
     }
 
+    /* initialize the x^2^n mod p(x) table */
+    p = (z_crc_t)1 << 30;         /* x^1 */
+    x2n_table[0] = p;
+    for (n = 1; n < 32; n++)
+        x2n_table[n] = p = multmodp(p, p);
+
+#ifdef W
+    /* initialize the braiding tables -- needs x2n_table[] */
+    braid(crc_braid_table, crc_braid_big_table, N, W);
+#endif
+
 #ifdef MAKECRCH
-    /* write out CRC tables to crc32.h */
     {
+        /*
+          The crc32.h header file contains tables for both 32-bit and 64-bit
+          z_word_t's, and so requires a 64-bit type be available. In that case,
+          z_word_t must be defined to be 64-bits. This code then also generates
+          and writes out the tables for the case that z_word_t is 32 bits.
+         */
+#if !defined(W) || W != 8
+#  error Need a 64-bit integer type in order to generate crc32.h.
+#endif
         FILE *out;
+        int k, n;
+        z_crc_t ltl[8][256];
+        z_word_t big[8][256];
 
         out = fopen("crc32.h", "w");
         if (out == NULL) return;
-        fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n");
-        fprintf(out, " * Generated automatically by crc32.c\n */\n\n");
-        fprintf(out, "local const z_crc_t FAR ");
-        fprintf(out, "crc_table[TBLS][256] =\n{\n  {\n");
-        write_table(out, crc_table[0]);
-#  ifdef BYFOUR
-        fprintf(out, "#ifdef BYFOUR\n");
-        for (k = 1; k < 8; k++) {
-            fprintf(out, "  },\n  {\n");
-            write_table(out, crc_table[k]);
+
+        /* write out little-endian CRC table to crc32.h */
+        fprintf(out,
+            "/* crc32.h -- tables for rapid CRC calculation\n"
+            " * Generated automatically by crc32.c\n */\n"
+            "\n"
+            "local const z_crc_t FAR crc_table[] = {\n"
+            "    ");
+        write_table(out, crc_table, 256);
+        fprintf(out,
+            "};\n");
+
+        /* write out big-endian CRC table for 64-bit z_word_t to crc32.h */
+        fprintf(out,
+            "\n"
+            "#ifdef W\n"
+            "\n"
+            "#if W == 8\n"
+            "\n"
+            "local const z_word_t FAR crc_big_table[] = {\n"
+            "    ");
+        write_table64(out, crc_big_table, 256);
+        fprintf(out,
+            "};\n");
+
+        /* write out big-endian CRC table for 32-bit z_word_t to crc32.h */
+        fprintf(out,
+            "\n"
+            "#else /* W == 4 */\n"
+            "\n"
+            "local const z_word_t FAR crc_big_table[] = {\n"
+            "    ");
+        write_table32hi(out, crc_big_table, 256);
+        fprintf(out,
+            "};\n"
+            "\n"
+            "#endif\n");
+
+        /* write out braid tables for each value of N */
+        for (n = 1; n <= 6; n++) {
+            fprintf(out,
+            "\n"
+            "#if N == %d\n", n);
+
+            /* compute braid tables for this N and 64-bit word_t */
+            braid(ltl, big, n, 8);
+
+            /* write out braid tables for 64-bit z_word_t to crc32.h */
+            fprintf(out,
+            "\n"
+            "#if W == 8\n"
+            "\n"
+            "local const z_crc_t FAR crc_braid_table[][256] = {\n");
+            for (k = 0; k < 8; k++) {
+                fprintf(out, "   {");
+                write_table(out, ltl[k], 256);
+                fprintf(out, "}%s", k < 7 ? ",\n" : "");
+            }
+            fprintf(out,
+            "};\n"
+            "\n"
+            "local const z_word_t FAR crc_braid_big_table[][256] = {\n");
+            for (k = 0; k < 8; k++) {
+                fprintf(out, "   {");
+                write_table64(out, big[k], 256);
+                fprintf(out, "}%s", k < 7 ? ",\n" : "");
+            }
+            fprintf(out,
+            "};\n");
+
+            /* compute braid tables for this N and 32-bit word_t */
+            braid(ltl, big, n, 4);
+
+            /* write out braid tables for 32-bit z_word_t to crc32.h */
+            fprintf(out,
+            "\n"
+            "#else /* W == 4 */\n"
+            "\n"
+            "local const z_crc_t FAR crc_braid_table[][256] = {\n");
+            for (k = 0; k < 4; k++) {
+                fprintf(out, "   {");
+                write_table(out, ltl[k], 256);
+                fprintf(out, "}%s", k < 3 ? ",\n" : "");
+            }
+            fprintf(out,
+            "};\n"
+            "\n"
+            "local const z_word_t FAR crc_braid_big_table[][256] = {\n");
+            for (k = 0; k < 4; k++) {
+                fprintf(out, "   {");
+                write_table32hi(out, big[k], 256);
+                fprintf(out, "}%s", k < 3 ? ",\n" : "");
+            }
+            fprintf(out,
+            "};\n"
+            "\n"
+            "#endif\n"
+            "\n"
+            "#endif\n");
         }
-        fprintf(out, "#endif\n");
-#  endif /* BYFOUR */
-        fprintf(out, "  }\n};\n");
+        fprintf(out,
+            "\n"
+            "#endif\n");
+
+        /* write out zeros operator table to crc32.h */
+        fprintf(out,
+            "\n"
+            "local const z_crc_t FAR x2n_table[] = {\n"
+            "    ");
+        write_table(out, x2n_table, 32);
+        fprintf(out,
+            "};\n");
         fclose(out);
     }
 #endif /* MAKECRCH */
 }
 
 #ifdef MAKECRCH
-local void write_table(out, table)
-    FILE *out;
-    const z_crc_t FAR *table;
-{
+
+/*
+   Write the 32-bit values in table[0..k-1] to out, five per line in
+   hexadecimal separated by commas.
+ */
+local void write_table(FILE *out, const z_crc_t FAR *table, int k) {
     int n;
 
-    for (n = 0; n < 256; n++)
-        fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : "    ",
+    for (n = 0; n < k; n++)
+        fprintf(out, "%s0x%08lx%s", n == 0 || n % 5 ? "" : "    ",
                 (unsigned long)(table[n]),
-                n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", "));
+                n == k - 1 ? "" : (n % 5 == 4 ? ",\n" : ", "));
+}
+
+/*
+   Write the high 32-bits of each value in table[0..k-1] to out, five per line
+   in hexadecimal separated by commas.
+ */
+local void write_table32hi(FILE *out, const z_word_t FAR *table, int k) {
+    int n;
+
+    for (n = 0; n < k; n++)
+        fprintf(out, "%s0x%08lx%s", n == 0 || n % 5 ? "" : "    ",
+                (unsigned long)(table[n] >> 32),
+                n == k - 1 ? "" : (n % 5 == 4 ? ",\n" : ", "));
 }
+
+/*
+  Write the 64-bit values in table[0..k-1] to out, three per line in
+  hexadecimal separated by commas. This assumes that if there is a 64-bit
+  type, then there is also a long long integer type, and it is at least 64
+  bits. If not, then the type cast and format string can be adjusted
+  accordingly.
+ */
+local void write_table64(FILE *out, const z_word_t FAR *table, int k) {
+    int n;
+
+    for (n = 0; n < k; n++)
+        fprintf(out, "%s0x%016llx%s", n == 0 || n % 3 ? "" : "    ",
+                (unsigned long long)(table[n]),
+                n == k - 1 ? "" : (n % 3 == 2 ? ",\n" : ", "));
+}
+
+/* Actually do the deed. */
+int main(void) {
+    make_crc_table();
+    return 0;
+}
+
 #endif /* MAKECRCH */
 
-#else /* !DYNAMIC_CRC_TABLE */
-/* ========================================================================
- * Tables of CRC-32s of all single-byte values, made by make_crc_table().
+#ifdef W
+/*
+  Generate the little and big-endian braid tables for the given n and z_word_t
+  size w. Each array must have room for w blocks of 256 elements.
  */
-#include "crc32.h"
+local void braid(z_crc_t ltl[][256], z_word_t big[][256], int n, int w) {
+    int k;
+    z_crc_t i, p, q;
+    for (k = 0; k < w; k++) {
+        p = x2nmodp((n * w + 3 - k) << 3, 0);
+        ltl[k][0] = 0;
+        big[w - 1 - k][0] = 0;
+        for (i = 1; i < 256; i++) {
+            ltl[k][i] = q = multmodp(i << 24, p);
+            big[w - 1 - k][i] = byte_swap(q);
+        }
+    }
+}
+#endif
+
 #endif /* DYNAMIC_CRC_TABLE */
 
 /* =========================================================================
- * This function can be used by asm versions of crc32()
+ * This function can be used by asm versions of crc32(), and to force the
+ * generation of the CRC tables in a threaded application.
  */
-const z_crc_t FAR * ZEXPORT get_crc_table()
-{
+const z_crc_t FAR * ZEXPORT get_crc_table(void) {
 #ifdef DYNAMIC_CRC_TABLE
-    if (crc_table_empty)
-        make_crc_table();
+    once(&made, make_crc_table);
 #endif /* DYNAMIC_CRC_TABLE */
     return (const z_crc_t FAR *)crc_table;
 }
 
-/* ========================================================================= */
-#define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8)
-#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
+/* =========================================================================
+ * Use ARM machine instructions if available. This will compute the CRC about
+ * ten times faster than the braided calculation. This code does not check for
+ * the presence of the CRC instruction at run time. __ARM_FEATURE_CRC32 will
+ * only be defined if the compilation specifies an ARM processor architecture
+ * that has the instructions. For example, compiling with -march=armv8.1-a or
+ * -march=armv8-a+crc, or -march=native if the compile machine has the crc32
+ * instructions.
+ */
+#if ARMCRC32_CANONICAL_ZLIB
 
-/* ========================================================================= */
-unsigned long ZEXPORT crc32_z(crc, buf, len)
-    unsigned long crc;
-    const unsigned char FAR *buf;
-    z_size_t len;
-{
-    if (buf == Z_NULL) return 0UL;
+/*
+   Constants empirically determined to maximize speed. These values are from
+   measurements on a Cortex-A57. Your mileage may vary.
+ */
+#define Z_BATCH 3990                /* number of words in a batch */
+#define Z_BATCH_ZEROS 0xa10d3d0c    /* computed from Z_BATCH = 3990 */
+#define Z_BATCH_MIN 800             /* fewest words in a final batch */
+
+unsigned long ZEXPORT crc32_z(unsigned long crc, const unsigned char FAR *buf,
+                              z_size_t len) {
+    z_crc_t val;
+    z_word_t crc1, crc2;
+    const z_word_t *word;
+    z_word_t val0, val1, val2;
+    z_size_t last, last2, i;
+    z_size_t num;
+
+    /* Return initial CRC, if requested. */
+    if (buf == Z_NULL) return 0;
 
 #ifdef DYNAMIC_CRC_TABLE
-    if (crc_table_empty)
-        make_crc_table();
+    once(&made, make_crc_table);
 #endif /* DYNAMIC_CRC_TABLE */
 
-#ifdef BYFOUR
-    if (sizeof(void *) == sizeof(ptrdiff_t)) {
-        z_crc_t endian;
+    /* Pre-condition the CRC */
+    crc = (~crc) & 0xffffffff;
 
-        endian = 1;
-        if (*((unsigned char *)(&endian)))
-            return crc32_little(crc, buf, len);
-        else
-            return crc32_big(crc, buf, len);
+    /* Compute the CRC up to a word boundary. */
+    while (len && ((z_size_t)buf & 7) != 0) {
+        len--;
+        val = *buf++;
+        __asm__ volatile("crc32b %w0, %w0, %w1" : "+r"(crc) : "r"(val));
     }
-#endif /* BYFOUR */
-    crc = crc ^ 0xffffffffUL;
-    while (len >= 8) {
-        DO8;
-        len -= 8;
+
+    /* Prepare to compute the CRC on full 64-bit words word[0..num-1]. */
+    word = (z_word_t const *)buf;
+    num = len >> 3;
+    len &= 7;
+
+    /* Do three interleaved CRCs to realize the throughput of one crc32x
+       instruction per cycle. Each CRC is calculated on Z_BATCH words. The
+       three CRCs are combined into a single CRC after each set of batches. */
+    while (num >= 3 * Z_BATCH) {
+        crc1 = 0;
+        crc2 = 0;
+        for (i = 0; i < Z_BATCH; i++) {
+            val0 = word[i];
+            val1 = word[i + Z_BATCH];
+            val2 = word[i + 2 * Z_BATCH];
+            __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc) : "r"(val0));
+            __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc1) : "r"(val1));
+            __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc2) : "r"(val2));
+        }
+        word += 3 * Z_BATCH;
+        num -= 3 * Z_BATCH;
+        crc = multmodp(Z_BATCH_ZEROS, crc) ^ crc1;
+        crc = multmodp(Z_BATCH_ZEROS, crc) ^ crc2;
     }
-    if (len) do {
-        DO1;
-    } while (--len);
-    return crc ^ 0xffffffffUL;
-}
 
-/* ========================================================================= */
-unsigned long ZEXPORT crc32(crc, buf, len)
-    unsigned long crc;
-    const unsigned char FAR *buf;
-    uInt len;
-{
-    return crc32_z(crc, buf, len);
+    /* Do one last smaller batch with the remaining words, if there are enough
+       to pay for the combination of CRCs. */
+    last = num / 3;
+    if (last >= Z_BATCH_MIN) {
+        last2 = last << 1;
+        crc1 = 0;
+        crc2 = 0;
+        for (i = 0; i < last; i++) {
+            val0 = word[i];
+            val1 = word[i + last];
+            val2 = word[i + last2];
+            __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc) : "r"(val0));
+            __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc1) : "r"(val1));
+            __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc2) : "r"(val2));
+        }
+        word += 3 * last;
+        num -= 3 * last;
+        val = x2nmodp(last, 6);
+        crc = multmodp(val, crc) ^ crc1;
+        crc = multmodp(val, crc) ^ crc2;
+    }
+
+    /* Compute the CRC on any remaining words. */
+    for (i = 0; i < num; i++) {
+        val0 = word[i];
+        __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc) : "r"(val0));
+    }
+    word += num;
+
+    /* Complete the CRC on any remaining bytes. */
+    buf = (const unsigned char FAR *)word;
+    while (len) {
+        len--;
+        val = *buf++;
+        __asm__ volatile("crc32b %w0, %w0, %w1" : "+r"(crc) : "r"(val));
+    }
+
+    /* Return the CRC, post-conditioned. */
+    return crc ^ 0xffffffff;
 }
 
-#ifdef BYFOUR
+#else
+
+#ifdef W
 
 /*
-   This BYFOUR code accesses the passed unsigned char * buffer with a 32-bit
-   integer pointer type. This violates the strict aliasing rule, where a
-   compiler can assume, for optimization purposes, that two pointers to
-   fundamentally different types won't ever point to the same memory. This can
-   manifest as a problem only if one of the pointers is written to. This code
-   only reads from those pointers. So long as this code remains isolated in
-   this compilation unit, there won't be a problem. For this reason, this code
-   should not be copied and pasted into a compilation unit in which other code
-   writes to the buffer that is passed to these routines.
+  Return the CRC of the W bytes in the word_t data, taking the
+  least-significant byte of the word as the first byte of data, without any pre
+  or post conditioning. This is used to combine the CRCs of each braid.
  */
+local z_crc_t crc_word(z_word_t data) {
+    int k;
+    for (k = 0; k < W; k++)
+        data = (data >> 8) ^ crc_table[data & 0xff];
+    return (z_crc_t)data;
+}
 
-/* ========================================================================= */
-#define DOLIT4 c ^= *buf4++; \
-        c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \
-            crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24]
-#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4
+local z_word_t crc_word_big(z_word_t data) {
+    int k;
+    for (k = 0; k < W; k++)
+        data = (data << 8) ^
+            crc_big_table[(data >> ((W - 1) << 3)) & 0xff];
+    return data;
+}
+
+#endif
 
 /* ========================================================================= */
-local unsigned long crc32_little(crc, buf, len)
-    unsigned long crc;
-    const unsigned char FAR *buf;
-    z_size_t len;
-{
-    register z_crc_t c;
-    register const z_crc_t FAR *buf4;
+unsigned long ZEXPORT crc32_z(unsigned long crc, const unsigned char FAR *buf,
+                              z_size_t len) {
+    /*
+     * zlib convention is to call crc32(0, NULL, 0); before making
+     * calls to crc32(). So this is a good, early (and infrequent)
+     * place to cache CPU features if needed for those later, more
+     * interesting crc32() calls.
+     */
+#if defined(CRC32_SIMD_SSE42_PCLMUL) || defined(CRC32_ARMV8_CRC32)
+    /*
+     * Since this routine can be freely used, check CPU features here.
+     */
+    if (buf == Z_NULL) {
+        if (!len) /* Assume user is calling crc32(0, NULL, 0); */
+            cpu_check_features();
+        return 0UL;
+    }
 
-    c = (z_crc_t)crc;
-    c = ~c;
-    while (len && ((ptrdiff_t)buf & 3)) {
-        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
-        len--;
+#endif
+#if defined(CRC32_SIMD_AVX512_PCLMUL)
+    if (x86_cpu_enable_avx512 && len >= Z_CRC32_AVX512_MINIMUM_LENGTH) {
+        /* crc32 64-byte chunks */
+        z_size_t chunk_size = len & ~Z_CRC32_AVX512_CHUNKSIZE_MASK;
+        crc = ~crc32_avx512_simd_(buf, chunk_size, ~(uint32_t)crc);
+        /* check remaining data */
+        len -= chunk_size;
+        if (!len)
+            return crc;
+        /* Fall into the default crc32 for the remaining data. */
+        buf += chunk_size;
+    }
+#elif defined(CRC32_SIMD_SSE42_PCLMUL)
+    if (x86_cpu_enable_simd && len >= Z_CRC32_SSE42_MINIMUM_LENGTH) {
+        /* crc32 16-byte chunks */
+        z_size_t chunk_size = len & ~Z_CRC32_SSE42_CHUNKSIZE_MASK;
+        crc = ~crc32_sse42_simd_(buf, chunk_size, ~(uint32_t)crc);
+        /* check remaining data */
+        len -= chunk_size;
+        if (!len)
+            return crc;
+        /* Fall into the default crc32 for the remaining data. */
+        buf += chunk_size;
     }
+#elif defined(CRC32_ARMV8_CRC32)
+    if (arm_cpu_enable_crc32) {
+#if defined(__aarch64__)
+        /* PMULL is 64bit only, plus code needs at least a 64 bytes buffer. */
+        if (arm_cpu_enable_pmull && (len > Z_CRC32_PMULL_MINIMUM_LENGTH)) {
+            const size_t chunk_size = len & ~Z_CRC32_PMULL_CHUNKSIZE_MASK;
+            crc = ~armv8_crc32_pmull_little(buf, chunk_size, ~(uint32_t)crc);
+            /* Check remaining data. */
+            len -= chunk_size;
+            if (!len)
+                return crc;
 
-    buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
-    while (len >= 32) {
-        DOLIT32;
-        len -= 32;
+            /* Fall through for the remaining data. */
+            buf += chunk_size;
+        }
+#endif
+        return armv8_crc32_little(buf, len, crc); /* Armv8@32bit or tail. */
     }
-    while (len >= 4) {
-        DOLIT4;
-        len -= 4;
+#else
+    if (buf == Z_NULL) {
+        return 0UL;
     }
-    buf = (const unsigned char FAR *)buf4;
+#endif /* CRC32_SIMD */
 
-    if (len) do {
-        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
-    } while (--len);
-    c = ~c;
-    return (unsigned long)c;
-}
+#ifdef DYNAMIC_CRC_TABLE
+    once(&made, make_crc_table);
+#endif /* DYNAMIC_CRC_TABLE */
+    /* Pre-condition the CRC */
+    crc = (~crc) & 0xffffffff;
 
-/* ========================================================================= */
-#define DOBIG4 c ^= *buf4++; \
-        c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \
-            crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24]
-#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
+#ifdef W
 
-/* ========================================================================= */
-local unsigned long crc32_big(crc, buf, len)
-    unsigned long crc;
-    const unsigned char FAR *buf;
-    z_size_t len;
-{
-    register z_crc_t c;
-    register const z_crc_t FAR *buf4;
+    /* If provided enough bytes, do a braided CRC calculation. */
+    if (len >= N * W + W - 1) {
+        z_size_t blks;
+        z_word_t const *words;
+        unsigned endian;
+        int k;
 
-    c = ZSWAP32((z_crc_t)crc);
-    c = ~c;
-    while (len && ((ptrdiff_t)buf & 3)) {
-        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
-        len--;
+        /* Compute the CRC up to a z_word_t boundary. */
+        while (len && ((z_size_t)buf & (W - 1)) != 0) {
+            len--;
+            crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        }
+
+        /* Compute the CRC on as many N z_word_t blocks as are available. */
+        blks = len / (N * W);
+        len -= blks * N * W;
+        words = (z_word_t const *)buf;
+
+        /* Do endian check at execution time instead of compile time, since ARM
+           processors can change the endianess at execution time. If the
+           compiler knows what the endianess will be, it can optimize out the
+           check and the unused branch. */
+        endian = 1;
+        if (*(unsigned char *)&endian) {
+            /* Little endian. */
+
+            z_crc_t crc0;
+            z_word_t word0;
+#if N > 1
+            z_crc_t crc1;
+            z_word_t word1;
+#if N > 2
+            z_crc_t crc2;
+            z_word_t word2;
+#if N > 3
+            z_crc_t crc3;
+            z_word_t word3;
+#if N > 4
+            z_crc_t crc4;
+            z_word_t word4;
+#if N > 5
+            z_crc_t crc5;
+            z_word_t word5;
+#endif
+#endif
+#endif
+#endif
+#endif
+
+            /* Initialize the CRC for each braid. */
+            crc0 = crc;
+#if N > 1
+            crc1 = 0;
+#if N > 2
+            crc2 = 0;
+#if N > 3
+            crc3 = 0;
+#if N > 4
+            crc4 = 0;
+#if N > 5
+            crc5 = 0;
+#endif
+#endif
+#endif
+#endif
+#endif
+
+            /*
+              Process the first blks-1 blocks, computing the CRCs on each braid
+              independently.
+             */
+            while (--blks) {
+                /* Load the word for each braid into registers. */
+                word0 = crc0 ^ words[0];
+#if N > 1
+                word1 = crc1 ^ words[1];
+#if N > 2
+                word2 = crc2 ^ words[2];
+#if N > 3
+                word3 = crc3 ^ words[3];
+#if N > 4
+                word4 = crc4 ^ words[4];
+#if N > 5
+                word5 = crc5 ^ words[5];
+#endif
+#endif
+#endif
+#endif
+#endif
+                words += N;
+
+                /* Compute and update the CRC for each word. The loop should
+                   get unrolled. */
+                crc0 = crc_braid_table[0][word0 & 0xff];
+#if N > 1
+                crc1 = crc_braid_table[0][word1 & 0xff];
+#if N > 2
+                crc2 = crc_braid_table[0][word2 & 0xff];
+#if N > 3
+                crc3 = crc_braid_table[0][word3 & 0xff];
+#if N > 4
+                crc4 = crc_braid_table[0][word4 & 0xff];
+#if N > 5
+                crc5 = crc_braid_table[0][word5 & 0xff];
+#endif
+#endif
+#endif
+#endif
+#endif
+                for (k = 1; k < W; k++) {
+                    crc0 ^= crc_braid_table[k][(word0 >> (k << 3)) & 0xff];
+#if N > 1
+                    crc1 ^= crc_braid_table[k][(word1 >> (k << 3)) & 0xff];
+#if N > 2
+                    crc2 ^= crc_braid_table[k][(word2 >> (k << 3)) & 0xff];
+#if N > 3
+                    crc3 ^= crc_braid_table[k][(word3 >> (k << 3)) & 0xff];
+#if N > 4
+                    crc4 ^= crc_braid_table[k][(word4 >> (k << 3)) & 0xff];
+#if N > 5
+                    crc5 ^= crc_braid_table[k][(word5 >> (k << 3)) & 0xff];
+#endif
+#endif
+#endif
+#endif
+#endif
+                }
+            }
+
+            /*
+              Process the last block, combining the CRCs of the N braids at the
+              same time.
+             */
+            crc = crc_word(crc0 ^ words[0]);
+#if N > 1
+            crc = crc_word(crc1 ^ words[1] ^ crc);
+#if N > 2
+            crc = crc_word(crc2 ^ words[2] ^ crc);
+#if N > 3
+            crc = crc_word(crc3 ^ words[3] ^ crc);
+#if N > 4
+            crc = crc_word(crc4 ^ words[4] ^ crc);
+#if N > 5
+            crc = crc_word(crc5 ^ words[5] ^ crc);
+#endif
+#endif
+#endif
+#endif
+#endif
+            words += N;
+        }
+        else {
+            /* Big endian. */
+
+            z_word_t crc0, word0, comb;
+#if N > 1
+            z_word_t crc1, word1;
+#if N > 2
+            z_word_t crc2, word2;
+#if N > 3
+            z_word_t crc3, word3;
+#if N > 4
+            z_word_t crc4, word4;
+#if N > 5
+            z_word_t crc5, word5;
+#endif
+#endif
+#endif
+#endif
+#endif
+
+            /* Initialize the CRC for each braid. */
+            crc0 = byte_swap(crc);
+#if N > 1
+            crc1 = 0;
+#if N > 2
+            crc2 = 0;
+#if N > 3
+            crc3 = 0;
+#if N > 4
+            crc4 = 0;
+#if N > 5
+            crc5 = 0;
+#endif
+#endif
+#endif
+#endif
+#endif
+
+            /*
+              Process the first blks-1 blocks, computing the CRCs on each braid
+              independently.
+             */
+            while (--blks) {
+                /* Load the word for each braid into registers. */
+                word0 = crc0 ^ words[0];
+#if N > 1
+                word1 = crc1 ^ words[1];
+#if N > 2
+                word2 = crc2 ^ words[2];
+#if N > 3
+                word3 = crc3 ^ words[3];
+#if N > 4
+                word4 = crc4 ^ words[4];
+#if N > 5
+                word5 = crc5 ^ words[5];
+#endif
+#endif
+#endif
+#endif
+#endif
+                words += N;
+
+                /* Compute and update the CRC for each word. The loop should
+                   get unrolled. */
+                crc0 = crc_braid_big_table[0][word0 & 0xff];
+#if N > 1
+                crc1 = crc_braid_big_table[0][word1 & 0xff];
+#if N > 2
+                crc2 = crc_braid_big_table[0][word2 & 0xff];
+#if N > 3
+                crc3 = crc_braid_big_table[0][word3 & 0xff];
+#if N > 4
+                crc4 = crc_braid_big_table[0][word4 & 0xff];
+#if N > 5
+                crc5 = crc_braid_big_table[0][word5 & 0xff];
+#endif
+#endif
+#endif
+#endif
+#endif
+                for (k = 1; k < W; k++) {
+                    crc0 ^= crc_braid_big_table[k][(word0 >> (k << 3)) & 0xff];
+#if N > 1
+                    crc1 ^= crc_braid_big_table[k][(word1 >> (k << 3)) & 0xff];
+#if N > 2
+                    crc2 ^= crc_braid_big_table[k][(word2 >> (k << 3)) & 0xff];
+#if N > 3
+                    crc3 ^= crc_braid_big_table[k][(word3 >> (k << 3)) & 0xff];
+#if N > 4
+                    crc4 ^= crc_braid_big_table[k][(word4 >> (k << 3)) & 0xff];
+#if N > 5
+                    crc5 ^= crc_braid_big_table[k][(word5 >> (k << 3)) & 0xff];
+#endif
+#endif
+#endif
+#endif
+#endif
+                }
+            }
+
+            /*
+              Process the last block, combining the CRCs of the N braids at the
+              same time.
+             */
+            comb = crc_word_big(crc0 ^ words[0]);
+#if N > 1
+            comb = crc_word_big(crc1 ^ words[1] ^ comb);
+#if N > 2
+            comb = crc_word_big(crc2 ^ words[2] ^ comb);
+#if N > 3
+            comb = crc_word_big(crc3 ^ words[3] ^ comb);
+#if N > 4
+            comb = crc_word_big(crc4 ^ words[4] ^ comb);
+#if N > 5
+            comb = crc_word_big(crc5 ^ words[5] ^ comb);
+#endif
+#endif
+#endif
+#endif
+#endif
+            words += N;
+            crc = byte_swap(comb);
+        }
+
+        /*
+          Update the pointer to the remaining bytes to process.
+         */
+        buf = (unsigned char const *)words;
     }
 
-    buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
-    while (len >= 32) {
-        DOBIG32;
-        len -= 32;
+#endif /* W */
+
+    /* Complete the computation of the CRC on any remaining bytes. */
+    while (len >= 8) {
+        len -= 8;
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
     }
-    while (len >= 4) {
-        DOBIG4;
-        len -= 4;
+    while (len) {
+        len--;
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
     }
-    buf = (const unsigned char FAR *)buf4;
 
-    if (len) do {
-        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
-    } while (--len);
-    c = ~c;
-    return (unsigned long)(ZSWAP32(c));
+    /* Return the CRC, post-conditioned. */
+    return crc ^ 0xffffffff;
 }
 
-#endif /* BYFOUR */
-
-#define GF2_DIM 32      /* dimension of GF(2) vectors (length of CRC) */
+#endif
 
 /* ========================================================================= */
-local unsigned long gf2_matrix_times(mat, vec)
-    unsigned long *mat;
-    unsigned long vec;
-{
-    unsigned long sum;
-
-    sum = 0;
-    while (vec) {
-        if (vec & 1)
-            sum ^= *mat;
-        vec >>= 1;
-        mat++;
+unsigned long ZEXPORT crc32(unsigned long crc, const unsigned char FAR *buf,
+                            uInt len) {
+    /* Some bots compile with optimizations disabled, others will emulate
+     * ARM on x86 and other weird combinations.
+     */
+#if defined(CRC32_SIMD_SSE42_PCLMUL) || defined(CRC32_ARMV8_CRC32)
+    /* We got to verify CPU features, so exploit the common usage pattern
+     * of calling this function with Z_NULL for an initial valid crc value.
+     * This allows to cache the result of the feature check and avoid extraneous
+     * function calls.
+     */
+    if (buf == Z_NULL) {
+        if (!len) /* Assume user is calling crc32(0, NULL, 0); */
+            cpu_check_features();
+        return 0UL;
     }
-    return sum;
-}
+#endif
 
-/* ========================================================================= */
-local void gf2_matrix_square(square, mat)
-    unsigned long *square;
-    unsigned long *mat;
-{
-    int n;
+#if defined(CRC32_ARMV8_CRC32)
+    if (arm_cpu_enable_crc32) {
+#if defined(__aarch64__)
+        /* PMULL is 64bit only, plus code needs at least a 64 bytes buffer. */
+        if (arm_cpu_enable_pmull && (len > Z_CRC32_PMULL_MINIMUM_LENGTH)) {
+            const size_t chunk_size = len & ~Z_CRC32_PMULL_CHUNKSIZE_MASK;
+            crc = ~armv8_crc32_pmull_little(buf, chunk_size, ~(uint32_t)crc);
+            /* Check remaining data. */
+            len -= chunk_size;
+            if (!len)
+                return crc;
 
-    for (n = 0; n < GF2_DIM; n++)
-        square[n] = gf2_matrix_times(mat, mat[n]);
+            /* Fall through for the remaining data. */
+            buf += chunk_size;
+        }
+#endif
+        return armv8_crc32_little(buf, len, crc); /* Armv8@32bit or tail. */
+    }
+#endif
+    return crc32_z(crc, buf, len); /* Armv7 or Armv8 w/o crypto extensions. */
 }
 
 /* ========================================================================= */
-local uLong crc32_combine_(crc1, crc2, len2)
-    uLong crc1;
-    uLong crc2;
-    z_off64_t len2;
-{
-    int n;
-    unsigned long row;
-    unsigned long even[GF2_DIM];    /* even-power-of-two zeros operator */
-    unsigned long odd[GF2_DIM];     /* odd-power-of-two zeros operator */
-
-    /* degenerate case (also disallow negative lengths) */
-    if (len2 <= 0)
-        return crc1;
-
-    /* put operator for one zero bit in odd */
-    odd[0] = 0xedb88320UL;          /* CRC-32 polynomial */
-    row = 1;
-    for (n = 1; n < GF2_DIM; n++) {
-        odd[n] = row;
-        row <<= 1;
-    }
+uLong ZEXPORT crc32_combine64(uLong crc1, uLong crc2, z_off64_t len2) {
+#ifdef DYNAMIC_CRC_TABLE
+    once(&made, make_crc_table);
+#endif /* DYNAMIC_CRC_TABLE */
+    return multmodp(x2nmodp(len2, 3), crc1) ^ (crc2 & 0xffffffff);
+}
 
-    /* put operator for two zero bits in even */
-    gf2_matrix_square(even, odd);
-
-    /* put operator for four zero bits in odd */
-    gf2_matrix_square(odd, even);
-
-    /* apply len2 zeros to crc1 (first square will put the operator for one
-       zero byte, eight zero bits, in even) */
-    do {
-        /* apply zeros operator for this bit of len2 */
-        gf2_matrix_square(even, odd);
-        if (len2 & 1)
-            crc1 = gf2_matrix_times(even, crc1);
-        len2 >>= 1;
-
-        /* if no more bits set, then done */
-        if (len2 == 0)
-            break;
-
-        /* another iteration of the loop with odd and even swapped */
-        gf2_matrix_square(odd, even);
-        if (len2 & 1)
-            crc1 = gf2_matrix_times(odd, crc1);
-        len2 >>= 1;
-
-        /* if no more bits set, then done */
-    } while (len2 != 0);
-
-    /* return combined crc */
-    crc1 ^= crc2;
-    return crc1;
+/* ========================================================================= */
+uLong ZEXPORT crc32_combine(uLong crc1, uLong crc2, z_off_t len2) {
+    return crc32_combine64(crc1, crc2, (z_off64_t)len2);
+}
+/* ========================================================================= */
+uLong ZEXPORT crc32_combine_gen64(z_off64_t len2) {
+#ifdef DYNAMIC_CRC_TABLE
+    once(&made, make_crc_table);
+#endif /* DYNAMIC_CRC_TABLE */
+    return x2nmodp(len2, 3);
 }
 
 /* ========================================================================= */
-uLong ZEXPORT crc32_combine(crc1, crc2, len2)
-    uLong crc1;
-    uLong crc2;
-    z_off_t len2;
-{
-    return crc32_combine_(crc1, crc2, len2);
+uLong ZEXPORT crc32_combine_gen(z_off_t len2) {
+    return crc32_combine_gen64((z_off64_t)len2);
 }
 
-uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
-    uLong crc1;
-    uLong crc2;
-    z_off64_t len2;
-{
-    return crc32_combine_(crc1, crc2, len2);
+/* ========================================================================= */
+uLong ZEXPORT crc32_combine_op(uLong crc1, uLong crc2, uLong op) {
+    return multmodp(op, crc1) ^ (crc2 & 0xffffffff);
 }
 
 ZLIB_INTERNAL void crc_reset(deflate_state *const s)
 {
+#ifdef CRC32_SIMD_SSE42_PCLMUL
     if (x86_cpu_enable_simd) {
         crc_fold_init(s);
         return;
     }
+#endif
     s->strm->adler = crc32(0L, Z_NULL, 0);
 }
 
 ZLIB_INTERNAL void crc_finalize(deflate_state *const s)
 {
+#ifdef CRC32_SIMD_SSE42_PCLMUL
     if (x86_cpu_enable_simd)
         s->strm->adler = crc_fold_512to32(s);
+#endif
 }
 
 ZLIB_INTERNAL void copy_with_crc(z_streamp strm, Bytef *dst, long size)
 {
+#ifdef CRC32_SIMD_SSE42_PCLMUL
     if (x86_cpu_enable_simd) {
         crc_fold_copy(strm->state, dst, strm->next_in, size);
         return;
     }
+#endif
     zmemcpy(dst, strm->next_in, size);
     strm->adler = crc32(strm->adler, dst, size);
 }
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/crc32.h b/extern/crashpad/crashpad/third_party/zlib/zlib/crc32.h
index 9e0c778102..137df68d61 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/crc32.h
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/crc32.h
@@ -2,440 +2,9445 @@
  * Generated automatically by crc32.c
  */
 
-local const z_crc_t FAR crc_table[TBLS][256] =
-{
-  {
-    0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,
-    0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL,
-    0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL,
-    0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL,
-    0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL,
-    0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL,
-    0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL,
-    0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL,
-    0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL,
-    0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL,
-    0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL,
-    0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL,
-    0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL,
-    0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL,
-    0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL,
-    0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL,
-    0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL,
-    0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL,
-    0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL,
-    0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL,
-    0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL,
-    0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL,
-    0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL,
-    0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL,
-    0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL,
-    0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL,
-    0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL,
-    0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL,
-    0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL,
-    0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL,
-    0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL,
-    0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL,
-    0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL,
-    0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL,
-    0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL,
-    0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL,
-    0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL,
-    0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL,
-    0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL,
-    0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL,
-    0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL,
-    0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL,
-    0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL,
-    0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL,
-    0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL,
-    0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL,
-    0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL,
-    0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL,
-    0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL,
-    0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
-    0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
-    0x2d02ef8dUL
-#ifdef BYFOUR
-  },
-  {
-    0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL,
-    0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL,
-    0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL,
-    0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL,
-    0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL,
-    0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL,
-    0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL,
-    0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL,
-    0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL,
-    0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL,
-    0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL,
-    0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL,
-    0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL,
-    0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL,
-    0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL,
-    0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL,
-    0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL,
-    0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL,
-    0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL,
-    0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL,
-    0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL,
-    0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL,
-    0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL,
-    0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL,
-    0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL,
-    0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL,
-    0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL,
-    0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL,
-    0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL,
-    0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL,
-    0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL,
-    0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL,
-    0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL,
-    0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL,
-    0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL,
-    0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL,
-    0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL,
-    0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL,
-    0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL,
-    0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL,
-    0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL,
-    0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL,
-    0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL,
-    0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL,
-    0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL,
-    0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL,
-    0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL,
-    0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL,
-    0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL,
-    0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL,
-    0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL,
-    0x9324fd72UL
-  },
-  {
-    0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL,
-    0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL,
-    0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL,
-    0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL,
-    0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL,
-    0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL,
-    0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL,
-    0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL,
-    0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL,
-    0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL,
-    0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL,
-    0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL,
-    0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL,
-    0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL,
-    0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL,
-    0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL,
-    0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL,
-    0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL,
-    0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL,
-    0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL,
-    0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL,
-    0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL,
-    0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL,
-    0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL,
-    0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL,
-    0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL,
-    0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL,
-    0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL,
-    0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL,
-    0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL,
-    0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL,
-    0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL,
-    0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL,
-    0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL,
-    0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL,
-    0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL,
-    0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL,
-    0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL,
-    0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL,
-    0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL,
-    0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL,
-    0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL,
-    0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL,
-    0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL,
-    0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL,
-    0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL,
-    0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL,
-    0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL,
-    0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL,
-    0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL,
-    0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL,
-    0xbe9834edUL
-  },
-  {
-    0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL,
-    0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL,
-    0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL,
-    0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL,
-    0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL,
-    0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL,
-    0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL,
-    0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL,
-    0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL,
-    0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL,
-    0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL,
-    0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL,
-    0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL,
-    0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL,
-    0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL,
-    0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL,
-    0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL,
-    0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL,
-    0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL,
-    0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL,
-    0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL,
-    0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL,
-    0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL,
-    0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL,
-    0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL,
-    0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL,
-    0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL,
-    0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL,
-    0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL,
-    0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL,
-    0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL,
-    0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL,
-    0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL,
-    0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL,
-    0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL,
-    0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL,
-    0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL,
-    0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL,
-    0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL,
-    0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL,
-    0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL,
-    0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL,
-    0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL,
-    0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL,
-    0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL,
-    0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL,
-    0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL,
-    0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL,
-    0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL,
-    0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL,
-    0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL,
-    0xde0506f1UL
-  },
-  {
-    0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL,
-    0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL,
-    0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL,
-    0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL,
-    0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL,
-    0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL,
-    0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL,
-    0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL,
-    0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL,
-    0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL,
-    0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL,
-    0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL,
-    0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL,
-    0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL,
-    0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL,
-    0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL,
-    0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL,
-    0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL,
-    0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL,
-    0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL,
-    0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL,
-    0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL,
-    0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL,
-    0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL,
-    0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL,
-    0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL,
-    0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL,
-    0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL,
-    0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL,
-    0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL,
-    0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL,
-    0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL,
-    0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL,
-    0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL,
-    0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL,
-    0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL,
-    0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL,
-    0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL,
-    0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL,
-    0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL,
-    0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL,
-    0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL,
-    0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL,
-    0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL,
-    0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL,
-    0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL,
-    0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL,
-    0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL,
-    0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL,
-    0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL,
-    0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL,
-    0x8def022dUL
-  },
-  {
-    0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL,
-    0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL,
-    0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL,
-    0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL,
-    0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL,
-    0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL,
-    0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL,
-    0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL,
-    0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL,
-    0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL,
-    0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL,
-    0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL,
-    0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL,
-    0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL,
-    0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL,
-    0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL,
-    0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL,
-    0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL,
-    0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL,
-    0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL,
-    0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL,
-    0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL,
-    0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL,
-    0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL,
-    0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL,
-    0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL,
-    0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL,
-    0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL,
-    0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL,
-    0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL,
-    0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL,
-    0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL,
-    0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL,
-    0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL,
-    0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL,
-    0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL,
-    0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL,
-    0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL,
-    0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL,
-    0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL,
-    0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL,
-    0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL,
-    0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL,
-    0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL,
-    0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL,
-    0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL,
-    0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL,
-    0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL,
-    0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL,
-    0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL,
-    0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL,
-    0x72fd2493UL
-  },
-  {
-    0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL,
-    0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL,
-    0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL,
-    0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL,
-    0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL,
-    0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL,
-    0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL,
-    0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL,
-    0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL,
-    0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL,
-    0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL,
-    0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL,
-    0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL,
-    0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL,
-    0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL,
-    0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL,
-    0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL,
-    0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL,
-    0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL,
-    0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL,
-    0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL,
-    0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL,
-    0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL,
-    0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL,
-    0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL,
-    0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL,
-    0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL,
-    0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL,
-    0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL,
-    0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL,
-    0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL,
-    0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL,
-    0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL,
-    0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL,
-    0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL,
-    0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL,
-    0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL,
-    0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL,
-    0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL,
-    0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL,
-    0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL,
-    0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL,
-    0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL,
-    0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL,
-    0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL,
-    0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL,
-    0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL,
-    0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL,
-    0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL,
-    0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL,
-    0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL,
-    0xed3498beUL
-  },
-  {
-    0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL,
-    0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL,
-    0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL,
-    0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL,
-    0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL,
-    0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL,
-    0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL,
-    0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL,
-    0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL,
-    0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL,
-    0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL,
-    0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL,
-    0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL,
-    0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL,
-    0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL,
-    0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL,
-    0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL,
-    0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL,
-    0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL,
-    0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL,
-    0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL,
-    0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL,
-    0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL,
-    0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL,
-    0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL,
-    0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL,
-    0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL,
-    0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL,
-    0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL,
-    0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL,
-    0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL,
-    0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL,
-    0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL,
-    0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL,
-    0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL,
-    0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL,
-    0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL,
-    0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL,
-    0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL,
-    0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL,
-    0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL,
-    0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL,
-    0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL,
-    0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL,
-    0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL,
-    0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL,
-    0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL,
-    0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL,
-    0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL,
-    0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL,
-    0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL,
-    0xf10605deUL
+local const z_crc_t FAR crc_table[] = {
+    0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419,
+    0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4,
+    0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07,
+    0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
+    0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856,
+    0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
+    0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4,
+    0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
+    0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3,
+    0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a,
+    0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599,
+    0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+    0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190,
+    0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f,
+    0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e,
+    0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
+    0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed,
+    0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
+    0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3,
+    0xfbd44c65, 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
+    0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a,
+    0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5,
+    0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010,
+    0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+    0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17,
+    0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6,
+    0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615,
+    0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
+    0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344,
+    0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
+    0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a,
+    0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
+    0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1,
+    0xa6bc5767, 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c,
+    0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef,
+    0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+    0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe,
+    0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31,
+    0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c,
+    0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
+    0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b,
+    0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
+    0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1,
+    0x18b74777, 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
+    0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278,
+    0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7,
+    0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66,
+    0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+    0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605,
+    0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8,
+    0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b,
+    0x2d02ef8d};
+
+#ifdef W
+
+#if W == 8
+
+local const z_word_t FAR crc_big_table[] = {
+    0x0000000000000000, 0x9630077700000000, 0x2c610eee00000000,
+    0xba51099900000000, 0x19c46d0700000000, 0x8ff46a7000000000,
+    0x35a563e900000000, 0xa395649e00000000, 0x3288db0e00000000,
+    0xa4b8dc7900000000, 0x1ee9d5e000000000, 0x88d9d29700000000,
+    0x2b4cb60900000000, 0xbd7cb17e00000000, 0x072db8e700000000,
+    0x911dbf9000000000, 0x6410b71d00000000, 0xf220b06a00000000,
+    0x4871b9f300000000, 0xde41be8400000000, 0x7dd4da1a00000000,
+    0xebe4dd6d00000000, 0x51b5d4f400000000, 0xc785d38300000000,
+    0x56986c1300000000, 0xc0a86b6400000000, 0x7af962fd00000000,
+    0xecc9658a00000000, 0x4f5c011400000000, 0xd96c066300000000,
+    0x633d0ffa00000000, 0xf50d088d00000000, 0xc8206e3b00000000,
+    0x5e10694c00000000, 0xe44160d500000000, 0x727167a200000000,
+    0xd1e4033c00000000, 0x47d4044b00000000, 0xfd850dd200000000,
+    0x6bb50aa500000000, 0xfaa8b53500000000, 0x6c98b24200000000,
+    0xd6c9bbdb00000000, 0x40f9bcac00000000, 0xe36cd83200000000,
+    0x755cdf4500000000, 0xcf0dd6dc00000000, 0x593dd1ab00000000,
+    0xac30d92600000000, 0x3a00de5100000000, 0x8051d7c800000000,
+    0x1661d0bf00000000, 0xb5f4b42100000000, 0x23c4b35600000000,
+    0x9995bacf00000000, 0x0fa5bdb800000000, 0x9eb8022800000000,
+    0x0888055f00000000, 0xb2d90cc600000000, 0x24e90bb100000000,
+    0x877c6f2f00000000, 0x114c685800000000, 0xab1d61c100000000,
+    0x3d2d66b600000000, 0x9041dc7600000000, 0x0671db0100000000,
+    0xbc20d29800000000, 0x2a10d5ef00000000, 0x8985b17100000000,
+    0x1fb5b60600000000, 0xa5e4bf9f00000000, 0x33d4b8e800000000,
+    0xa2c9077800000000, 0x34f9000f00000000, 0x8ea8099600000000,
+    0x18980ee100000000, 0xbb0d6a7f00000000, 0x2d3d6d0800000000,
+    0x976c649100000000, 0x015c63e600000000, 0xf4516b6b00000000,
+    0x62616c1c00000000, 0xd830658500000000, 0x4e0062f200000000,
+    0xed95066c00000000, 0x7ba5011b00000000, 0xc1f4088200000000,
+    0x57c40ff500000000, 0xc6d9b06500000000, 0x50e9b71200000000,
+    0xeab8be8b00000000, 0x7c88b9fc00000000, 0xdf1ddd6200000000,
+    0x492dda1500000000, 0xf37cd38c00000000, 0x654cd4fb00000000,
+    0x5861b24d00000000, 0xce51b53a00000000, 0x7400bca300000000,
+    0xe230bbd400000000, 0x41a5df4a00000000, 0xd795d83d00000000,
+    0x6dc4d1a400000000, 0xfbf4d6d300000000, 0x6ae9694300000000,
+    0xfcd96e3400000000, 0x468867ad00000000, 0xd0b860da00000000,
+    0x732d044400000000, 0xe51d033300000000, 0x5f4c0aaa00000000,
+    0xc97c0ddd00000000, 0x3c71055000000000, 0xaa41022700000000,
+    0x10100bbe00000000, 0x86200cc900000000, 0x25b5685700000000,
+    0xb3856f2000000000, 0x09d466b900000000, 0x9fe461ce00000000,
+    0x0ef9de5e00000000, 0x98c9d92900000000, 0x2298d0b000000000,
+    0xb4a8d7c700000000, 0x173db35900000000, 0x810db42e00000000,
+    0x3b5cbdb700000000, 0xad6cbac000000000, 0x2083b8ed00000000,
+    0xb6b3bf9a00000000, 0x0ce2b60300000000, 0x9ad2b17400000000,
+    0x3947d5ea00000000, 0xaf77d29d00000000, 0x1526db0400000000,
+    0x8316dc7300000000, 0x120b63e300000000, 0x843b649400000000,
+    0x3e6a6d0d00000000, 0xa85a6a7a00000000, 0x0bcf0ee400000000,
+    0x9dff099300000000, 0x27ae000a00000000, 0xb19e077d00000000,
+    0x44930ff000000000, 0xd2a3088700000000, 0x68f2011e00000000,
+    0xfec2066900000000, 0x5d5762f700000000, 0xcb67658000000000,
+    0x71366c1900000000, 0xe7066b6e00000000, 0x761bd4fe00000000,
+    0xe02bd38900000000, 0x5a7ada1000000000, 0xcc4add6700000000,
+    0x6fdfb9f900000000, 0xf9efbe8e00000000, 0x43beb71700000000,
+    0xd58eb06000000000, 0xe8a3d6d600000000, 0x7e93d1a100000000,
+    0xc4c2d83800000000, 0x52f2df4f00000000, 0xf167bbd100000000,
+    0x6757bca600000000, 0xdd06b53f00000000, 0x4b36b24800000000,
+    0xda2b0dd800000000, 0x4c1b0aaf00000000, 0xf64a033600000000,
+    0x607a044100000000, 0xc3ef60df00000000, 0x55df67a800000000,
+    0xef8e6e3100000000, 0x79be694600000000, 0x8cb361cb00000000,
+    0x1a8366bc00000000, 0xa0d26f2500000000, 0x36e2685200000000,
+    0x95770ccc00000000, 0x03470bbb00000000, 0xb916022200000000,
+    0x2f26055500000000, 0xbe3bbac500000000, 0x280bbdb200000000,
+    0x925ab42b00000000, 0x046ab35c00000000, 0xa7ffd7c200000000,
+    0x31cfd0b500000000, 0x8b9ed92c00000000, 0x1daede5b00000000,
+    0xb0c2649b00000000, 0x26f263ec00000000, 0x9ca36a7500000000,
+    0x0a936d0200000000, 0xa906099c00000000, 0x3f360eeb00000000,
+    0x8567077200000000, 0x1357000500000000, 0x824abf9500000000,
+    0x147ab8e200000000, 0xae2bb17b00000000, 0x381bb60c00000000,
+    0x9b8ed29200000000, 0x0dbed5e500000000, 0xb7efdc7c00000000,
+    0x21dfdb0b00000000, 0xd4d2d38600000000, 0x42e2d4f100000000,
+    0xf8b3dd6800000000, 0x6e83da1f00000000, 0xcd16be8100000000,
+    0x5b26b9f600000000, 0xe177b06f00000000, 0x7747b71800000000,
+    0xe65a088800000000, 0x706a0fff00000000, 0xca3b066600000000,
+    0x5c0b011100000000, 0xff9e658f00000000, 0x69ae62f800000000,
+    0xd3ff6b6100000000, 0x45cf6c1600000000, 0x78e20aa000000000,
+    0xeed20dd700000000, 0x5483044e00000000, 0xc2b3033900000000,
+    0x612667a700000000, 0xf71660d000000000, 0x4d47694900000000,
+    0xdb776e3e00000000, 0x4a6ad1ae00000000, 0xdc5ad6d900000000,
+    0x660bdf4000000000, 0xf03bd83700000000, 0x53aebca900000000,
+    0xc59ebbde00000000, 0x7fcfb24700000000, 0xe9ffb53000000000,
+    0x1cf2bdbd00000000, 0x8ac2baca00000000, 0x3093b35300000000,
+    0xa6a3b42400000000, 0x0536d0ba00000000, 0x9306d7cd00000000,
+    0x2957de5400000000, 0xbf67d92300000000, 0x2e7a66b300000000,
+    0xb84a61c400000000, 0x021b685d00000000, 0x942b6f2a00000000,
+    0x37be0bb400000000, 0xa18e0cc300000000, 0x1bdf055a00000000,
+    0x8def022d00000000};
+
+#else /* W == 4 */
+
+local const z_word_t FAR crc_big_table[] = {
+    0x00000000, 0x96300777, 0x2c610eee, 0xba510999, 0x19c46d07,
+    0x8ff46a70, 0x35a563e9, 0xa395649e, 0x3288db0e, 0xa4b8dc79,
+    0x1ee9d5e0, 0x88d9d297, 0x2b4cb609, 0xbd7cb17e, 0x072db8e7,
+    0x911dbf90, 0x6410b71d, 0xf220b06a, 0x4871b9f3, 0xde41be84,
+    0x7dd4da1a, 0xebe4dd6d, 0x51b5d4f4, 0xc785d383, 0x56986c13,
+    0xc0a86b64, 0x7af962fd, 0xecc9658a, 0x4f5c0114, 0xd96c0663,
+    0x633d0ffa, 0xf50d088d, 0xc8206e3b, 0x5e10694c, 0xe44160d5,
+    0x727167a2, 0xd1e4033c, 0x47d4044b, 0xfd850dd2, 0x6bb50aa5,
+    0xfaa8b535, 0x6c98b242, 0xd6c9bbdb, 0x40f9bcac, 0xe36cd832,
+    0x755cdf45, 0xcf0dd6dc, 0x593dd1ab, 0xac30d926, 0x3a00de51,
+    0x8051d7c8, 0x1661d0bf, 0xb5f4b421, 0x23c4b356, 0x9995bacf,
+    0x0fa5bdb8, 0x9eb80228, 0x0888055f, 0xb2d90cc6, 0x24e90bb1,
+    0x877c6f2f, 0x114c6858, 0xab1d61c1, 0x3d2d66b6, 0x9041dc76,
+    0x0671db01, 0xbc20d298, 0x2a10d5ef, 0x8985b171, 0x1fb5b606,
+    0xa5e4bf9f, 0x33d4b8e8, 0xa2c90778, 0x34f9000f, 0x8ea80996,
+    0x18980ee1, 0xbb0d6a7f, 0x2d3d6d08, 0x976c6491, 0x015c63e6,
+    0xf4516b6b, 0x62616c1c, 0xd8306585, 0x4e0062f2, 0xed95066c,
+    0x7ba5011b, 0xc1f40882, 0x57c40ff5, 0xc6d9b065, 0x50e9b712,
+    0xeab8be8b, 0x7c88b9fc, 0xdf1ddd62, 0x492dda15, 0xf37cd38c,
+    0x654cd4fb, 0x5861b24d, 0xce51b53a, 0x7400bca3, 0xe230bbd4,
+    0x41a5df4a, 0xd795d83d, 0x6dc4d1a4, 0xfbf4d6d3, 0x6ae96943,
+    0xfcd96e34, 0x468867ad, 0xd0b860da, 0x732d0444, 0xe51d0333,
+    0x5f4c0aaa, 0xc97c0ddd, 0x3c710550, 0xaa410227, 0x10100bbe,
+    0x86200cc9, 0x25b56857, 0xb3856f20, 0x09d466b9, 0x9fe461ce,
+    0x0ef9de5e, 0x98c9d929, 0x2298d0b0, 0xb4a8d7c7, 0x173db359,
+    0x810db42e, 0x3b5cbdb7, 0xad6cbac0, 0x2083b8ed, 0xb6b3bf9a,
+    0x0ce2b603, 0x9ad2b174, 0x3947d5ea, 0xaf77d29d, 0x1526db04,
+    0x8316dc73, 0x120b63e3, 0x843b6494, 0x3e6a6d0d, 0xa85a6a7a,
+    0x0bcf0ee4, 0x9dff0993, 0x27ae000a, 0xb19e077d, 0x44930ff0,
+    0xd2a30887, 0x68f2011e, 0xfec20669, 0x5d5762f7, 0xcb676580,
+    0x71366c19, 0xe7066b6e, 0x761bd4fe, 0xe02bd389, 0x5a7ada10,
+    0xcc4add67, 0x6fdfb9f9, 0xf9efbe8e, 0x43beb717, 0xd58eb060,
+    0xe8a3d6d6, 0x7e93d1a1, 0xc4c2d838, 0x52f2df4f, 0xf167bbd1,
+    0x6757bca6, 0xdd06b53f, 0x4b36b248, 0xda2b0dd8, 0x4c1b0aaf,
+    0xf64a0336, 0x607a0441, 0xc3ef60df, 0x55df67a8, 0xef8e6e31,
+    0x79be6946, 0x8cb361cb, 0x1a8366bc, 0xa0d26f25, 0x36e26852,
+    0x95770ccc, 0x03470bbb, 0xb9160222, 0x2f260555, 0xbe3bbac5,
+    0x280bbdb2, 0x925ab42b, 0x046ab35c, 0xa7ffd7c2, 0x31cfd0b5,
+    0x8b9ed92c, 0x1daede5b, 0xb0c2649b, 0x26f263ec, 0x9ca36a75,
+    0x0a936d02, 0xa906099c, 0x3f360eeb, 0x85670772, 0x13570005,
+    0x824abf95, 0x147ab8e2, 0xae2bb17b, 0x381bb60c, 0x9b8ed292,
+    0x0dbed5e5, 0xb7efdc7c, 0x21dfdb0b, 0xd4d2d386, 0x42e2d4f1,
+    0xf8b3dd68, 0x6e83da1f, 0xcd16be81, 0x5b26b9f6, 0xe177b06f,
+    0x7747b718, 0xe65a0888, 0x706a0fff, 0xca3b0666, 0x5c0b0111,
+    0xff9e658f, 0x69ae62f8, 0xd3ff6b61, 0x45cf6c16, 0x78e20aa0,
+    0xeed20dd7, 0x5483044e, 0xc2b30339, 0x612667a7, 0xf71660d0,
+    0x4d476949, 0xdb776e3e, 0x4a6ad1ae, 0xdc5ad6d9, 0x660bdf40,
+    0xf03bd837, 0x53aebca9, 0xc59ebbde, 0x7fcfb247, 0xe9ffb530,
+    0x1cf2bdbd, 0x8ac2baca, 0x3093b353, 0xa6a3b424, 0x0536d0ba,
+    0x9306d7cd, 0x2957de54, 0xbf67d923, 0x2e7a66b3, 0xb84a61c4,
+    0x021b685d, 0x942b6f2a, 0x37be0bb4, 0xa18e0cc3, 0x1bdf055a,
+    0x8def022d};
+
+#endif
+
+#if N == 1
+
+#if W == 8
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0xccaa009e, 0x4225077d, 0x8e8f07e3, 0x844a0efa,
+    0x48e00e64, 0xc66f0987, 0x0ac50919, 0xd3e51bb5, 0x1f4f1b2b,
+    0x91c01cc8, 0x5d6a1c56, 0x57af154f, 0x9b0515d1, 0x158a1232,
+    0xd92012ac, 0x7cbb312b, 0xb01131b5, 0x3e9e3656, 0xf23436c8,
+    0xf8f13fd1, 0x345b3f4f, 0xbad438ac, 0x767e3832, 0xaf5e2a9e,
+    0x63f42a00, 0xed7b2de3, 0x21d12d7d, 0x2b142464, 0xe7be24fa,
+    0x69312319, 0xa59b2387, 0xf9766256, 0x35dc62c8, 0xbb53652b,
+    0x77f965b5, 0x7d3c6cac, 0xb1966c32, 0x3f196bd1, 0xf3b36b4f,
+    0x2a9379e3, 0xe639797d, 0x68b67e9e, 0xa41c7e00, 0xaed97719,
+    0x62737787, 0xecfc7064, 0x205670fa, 0x85cd537d, 0x496753e3,
+    0xc7e85400, 0x0b42549e, 0x01875d87, 0xcd2d5d19, 0x43a25afa,
+    0x8f085a64, 0x562848c8, 0x9a824856, 0x140d4fb5, 0xd8a74f2b,
+    0xd2624632, 0x1ec846ac, 0x9047414f, 0x5ced41d1, 0x299dc2ed,
+    0xe537c273, 0x6bb8c590, 0xa712c50e, 0xadd7cc17, 0x617dcc89,
+    0xeff2cb6a, 0x2358cbf4, 0xfa78d958, 0x36d2d9c6, 0xb85dde25,
+    0x74f7debb, 0x7e32d7a2, 0xb298d73c, 0x3c17d0df, 0xf0bdd041,
+    0x5526f3c6, 0x998cf358, 0x1703f4bb, 0xdba9f425, 0xd16cfd3c,
+    0x1dc6fda2, 0x9349fa41, 0x5fe3fadf, 0x86c3e873, 0x4a69e8ed,
+    0xc4e6ef0e, 0x084cef90, 0x0289e689, 0xce23e617, 0x40ace1f4,
+    0x8c06e16a, 0xd0eba0bb, 0x1c41a025, 0x92cea7c6, 0x5e64a758,
+    0x54a1ae41, 0x980baedf, 0x1684a93c, 0xda2ea9a2, 0x030ebb0e,
+    0xcfa4bb90, 0x412bbc73, 0x8d81bced, 0x8744b5f4, 0x4beeb56a,
+    0xc561b289, 0x09cbb217, 0xac509190, 0x60fa910e, 0xee7596ed,
+    0x22df9673, 0x281a9f6a, 0xe4b09ff4, 0x6a3f9817, 0xa6959889,
+    0x7fb58a25, 0xb31f8abb, 0x3d908d58, 0xf13a8dc6, 0xfbff84df,
+    0x37558441, 0xb9da83a2, 0x7570833c, 0x533b85da, 0x9f918544,
+    0x111e82a7, 0xddb48239, 0xd7718b20, 0x1bdb8bbe, 0x95548c5d,
+    0x59fe8cc3, 0x80de9e6f, 0x4c749ef1, 0xc2fb9912, 0x0e51998c,
+    0x04949095, 0xc83e900b, 0x46b197e8, 0x8a1b9776, 0x2f80b4f1,
+    0xe32ab46f, 0x6da5b38c, 0xa10fb312, 0xabcaba0b, 0x6760ba95,
+    0xe9efbd76, 0x2545bde8, 0xfc65af44, 0x30cfafda, 0xbe40a839,
+    0x72eaa8a7, 0x782fa1be, 0xb485a120, 0x3a0aa6c3, 0xf6a0a65d,
+    0xaa4de78c, 0x66e7e712, 0xe868e0f1, 0x24c2e06f, 0x2e07e976,
+    0xe2ade9e8, 0x6c22ee0b, 0xa088ee95, 0x79a8fc39, 0xb502fca7,
+    0x3b8dfb44, 0xf727fbda, 0xfde2f2c3, 0x3148f25d, 0xbfc7f5be,
+    0x736df520, 0xd6f6d6a7, 0x1a5cd639, 0x94d3d1da, 0x5879d144,
+    0x52bcd85d, 0x9e16d8c3, 0x1099df20, 0xdc33dfbe, 0x0513cd12,
+    0xc9b9cd8c, 0x4736ca6f, 0x8b9ccaf1, 0x8159c3e8, 0x4df3c376,
+    0xc37cc495, 0x0fd6c40b, 0x7aa64737, 0xb60c47a9, 0x3883404a,
+    0xf42940d4, 0xfeec49cd, 0x32464953, 0xbcc94eb0, 0x70634e2e,
+    0xa9435c82, 0x65e95c1c, 0xeb665bff, 0x27cc5b61, 0x2d095278,
+    0xe1a352e6, 0x6f2c5505, 0xa386559b, 0x061d761c, 0xcab77682,
+    0x44387161, 0x889271ff, 0x825778e6, 0x4efd7878, 0xc0727f9b,
+    0x0cd87f05, 0xd5f86da9, 0x19526d37, 0x97dd6ad4, 0x5b776a4a,
+    0x51b26353, 0x9d1863cd, 0x1397642e, 0xdf3d64b0, 0x83d02561,
+    0x4f7a25ff, 0xc1f5221c, 0x0d5f2282, 0x079a2b9b, 0xcb302b05,
+    0x45bf2ce6, 0x89152c78, 0x50353ed4, 0x9c9f3e4a, 0x121039a9,
+    0xdeba3937, 0xd47f302e, 0x18d530b0, 0x965a3753, 0x5af037cd,
+    0xff6b144a, 0x33c114d4, 0xbd4e1337, 0x71e413a9, 0x7b211ab0,
+    0xb78b1a2e, 0x39041dcd, 0xf5ae1d53, 0x2c8e0fff, 0xe0240f61,
+    0x6eab0882, 0xa201081c, 0xa8c40105, 0x646e019b, 0xeae10678,
+    0x264b06e6},
+   {0x00000000, 0xa6770bb4, 0x979f1129, 0x31e81a9d, 0xf44f2413,
+    0x52382fa7, 0x63d0353a, 0xc5a73e8e, 0x33ef4e67, 0x959845d3,
+    0xa4705f4e, 0x020754fa, 0xc7a06a74, 0x61d761c0, 0x503f7b5d,
+    0xf64870e9, 0x67de9cce, 0xc1a9977a, 0xf0418de7, 0x56368653,
+    0x9391b8dd, 0x35e6b369, 0x040ea9f4, 0xa279a240, 0x5431d2a9,
+    0xf246d91d, 0xc3aec380, 0x65d9c834, 0xa07ef6ba, 0x0609fd0e,
+    0x37e1e793, 0x9196ec27, 0xcfbd399c, 0x69ca3228, 0x582228b5,
+    0xfe552301, 0x3bf21d8f, 0x9d85163b, 0xac6d0ca6, 0x0a1a0712,
+    0xfc5277fb, 0x5a257c4f, 0x6bcd66d2, 0xcdba6d66, 0x081d53e8,
+    0xae6a585c, 0x9f8242c1, 0x39f54975, 0xa863a552, 0x0e14aee6,
+    0x3ffcb47b, 0x998bbfcf, 0x5c2c8141, 0xfa5b8af5, 0xcbb39068,
+    0x6dc49bdc, 0x9b8ceb35, 0x3dfbe081, 0x0c13fa1c, 0xaa64f1a8,
+    0x6fc3cf26, 0xc9b4c492, 0xf85cde0f, 0x5e2bd5bb, 0x440b7579,
+    0xe27c7ecd, 0xd3946450, 0x75e36fe4, 0xb044516a, 0x16335ade,
+    0x27db4043, 0x81ac4bf7, 0x77e43b1e, 0xd19330aa, 0xe07b2a37,
+    0x460c2183, 0x83ab1f0d, 0x25dc14b9, 0x14340e24, 0xb2430590,
+    0x23d5e9b7, 0x85a2e203, 0xb44af89e, 0x123df32a, 0xd79acda4,
+    0x71edc610, 0x4005dc8d, 0xe672d739, 0x103aa7d0, 0xb64dac64,
+    0x87a5b6f9, 0x21d2bd4d, 0xe47583c3, 0x42028877, 0x73ea92ea,
+    0xd59d995e, 0x8bb64ce5, 0x2dc14751, 0x1c295dcc, 0xba5e5678,
+    0x7ff968f6, 0xd98e6342, 0xe86679df, 0x4e11726b, 0xb8590282,
+    0x1e2e0936, 0x2fc613ab, 0x89b1181f, 0x4c162691, 0xea612d25,
+    0xdb8937b8, 0x7dfe3c0c, 0xec68d02b, 0x4a1fdb9f, 0x7bf7c102,
+    0xdd80cab6, 0x1827f438, 0xbe50ff8c, 0x8fb8e511, 0x29cfeea5,
+    0xdf879e4c, 0x79f095f8, 0x48188f65, 0xee6f84d1, 0x2bc8ba5f,
+    0x8dbfb1eb, 0xbc57ab76, 0x1a20a0c2, 0x8816eaf2, 0x2e61e146,
+    0x1f89fbdb, 0xb9fef06f, 0x7c59cee1, 0xda2ec555, 0xebc6dfc8,
+    0x4db1d47c, 0xbbf9a495, 0x1d8eaf21, 0x2c66b5bc, 0x8a11be08,
+    0x4fb68086, 0xe9c18b32, 0xd82991af, 0x7e5e9a1b, 0xefc8763c,
+    0x49bf7d88, 0x78576715, 0xde206ca1, 0x1b87522f, 0xbdf0599b,
+    0x8c184306, 0x2a6f48b2, 0xdc27385b, 0x7a5033ef, 0x4bb82972,
+    0xedcf22c6, 0x28681c48, 0x8e1f17fc, 0xbff70d61, 0x198006d5,
+    0x47abd36e, 0xe1dcd8da, 0xd034c247, 0x7643c9f3, 0xb3e4f77d,
+    0x1593fcc9, 0x247be654, 0x820cede0, 0x74449d09, 0xd23396bd,
+    0xe3db8c20, 0x45ac8794, 0x800bb91a, 0x267cb2ae, 0x1794a833,
+    0xb1e3a387, 0x20754fa0, 0x86024414, 0xb7ea5e89, 0x119d553d,
+    0xd43a6bb3, 0x724d6007, 0x43a57a9a, 0xe5d2712e, 0x139a01c7,
+    0xb5ed0a73, 0x840510ee, 0x22721b5a, 0xe7d525d4, 0x41a22e60,
+    0x704a34fd, 0xd63d3f49, 0xcc1d9f8b, 0x6a6a943f, 0x5b828ea2,
+    0xfdf58516, 0x3852bb98, 0x9e25b02c, 0xafcdaab1, 0x09baa105,
+    0xfff2d1ec, 0x5985da58, 0x686dc0c5, 0xce1acb71, 0x0bbdf5ff,
+    0xadcafe4b, 0x9c22e4d6, 0x3a55ef62, 0xabc30345, 0x0db408f1,
+    0x3c5c126c, 0x9a2b19d8, 0x5f8c2756, 0xf9fb2ce2, 0xc813367f,
+    0x6e643dcb, 0x982c4d22, 0x3e5b4696, 0x0fb35c0b, 0xa9c457bf,
+    0x6c636931, 0xca146285, 0xfbfc7818, 0x5d8b73ac, 0x03a0a617,
+    0xa5d7ada3, 0x943fb73e, 0x3248bc8a, 0xf7ef8204, 0x519889b0,
+    0x6070932d, 0xc6079899, 0x304fe870, 0x9638e3c4, 0xa7d0f959,
+    0x01a7f2ed, 0xc400cc63, 0x6277c7d7, 0x539fdd4a, 0xf5e8d6fe,
+    0x647e3ad9, 0xc209316d, 0xf3e12bf0, 0x55962044, 0x90311eca,
+    0x3646157e, 0x07ae0fe3, 0xa1d90457, 0x579174be, 0xf1e67f0a,
+    0xc00e6597, 0x66796e23, 0xa3de50ad, 0x05a95b19, 0x34414184,
+    0x92364a30},
+   {0x00000000, 0xcb5cd3a5, 0x4dc8a10b, 0x869472ae, 0x9b914216,
+    0x50cd91b3, 0xd659e31d, 0x1d0530b8, 0xec53826d, 0x270f51c8,
+    0xa19b2366, 0x6ac7f0c3, 0x77c2c07b, 0xbc9e13de, 0x3a0a6170,
+    0xf156b2d5, 0x03d6029b, 0xc88ad13e, 0x4e1ea390, 0x85427035,
+    0x9847408d, 0x531b9328, 0xd58fe186, 0x1ed33223, 0xef8580f6,
+    0x24d95353, 0xa24d21fd, 0x6911f258, 0x7414c2e0, 0xbf481145,
+    0x39dc63eb, 0xf280b04e, 0x07ac0536, 0xccf0d693, 0x4a64a43d,
+    0x81387798, 0x9c3d4720, 0x57619485, 0xd1f5e62b, 0x1aa9358e,
+    0xebff875b, 0x20a354fe, 0xa6372650, 0x6d6bf5f5, 0x706ec54d,
+    0xbb3216e8, 0x3da66446, 0xf6fab7e3, 0x047a07ad, 0xcf26d408,
+    0x49b2a6a6, 0x82ee7503, 0x9feb45bb, 0x54b7961e, 0xd223e4b0,
+    0x197f3715, 0xe82985c0, 0x23755665, 0xa5e124cb, 0x6ebdf76e,
+    0x73b8c7d6, 0xb8e41473, 0x3e7066dd, 0xf52cb578, 0x0f580a6c,
+    0xc404d9c9, 0x4290ab67, 0x89cc78c2, 0x94c9487a, 0x5f959bdf,
+    0xd901e971, 0x125d3ad4, 0xe30b8801, 0x28575ba4, 0xaec3290a,
+    0x659ffaaf, 0x789aca17, 0xb3c619b2, 0x35526b1c, 0xfe0eb8b9,
+    0x0c8e08f7, 0xc7d2db52, 0x4146a9fc, 0x8a1a7a59, 0x971f4ae1,
+    0x5c439944, 0xdad7ebea, 0x118b384f, 0xe0dd8a9a, 0x2b81593f,
+    0xad152b91, 0x6649f834, 0x7b4cc88c, 0xb0101b29, 0x36846987,
+    0xfdd8ba22, 0x08f40f5a, 0xc3a8dcff, 0x453cae51, 0x8e607df4,
+    0x93654d4c, 0x58399ee9, 0xdeadec47, 0x15f13fe2, 0xe4a78d37,
+    0x2ffb5e92, 0xa96f2c3c, 0x6233ff99, 0x7f36cf21, 0xb46a1c84,
+    0x32fe6e2a, 0xf9a2bd8f, 0x0b220dc1, 0xc07ede64, 0x46eaacca,
+    0x8db67f6f, 0x90b34fd7, 0x5bef9c72, 0xdd7beedc, 0x16273d79,
+    0xe7718fac, 0x2c2d5c09, 0xaab92ea7, 0x61e5fd02, 0x7ce0cdba,
+    0xb7bc1e1f, 0x31286cb1, 0xfa74bf14, 0x1eb014d8, 0xd5ecc77d,
+    0x5378b5d3, 0x98246676, 0x852156ce, 0x4e7d856b, 0xc8e9f7c5,
+    0x03b52460, 0xf2e396b5, 0x39bf4510, 0xbf2b37be, 0x7477e41b,
+    0x6972d4a3, 0xa22e0706, 0x24ba75a8, 0xefe6a60d, 0x1d661643,
+    0xd63ac5e6, 0x50aeb748, 0x9bf264ed, 0x86f75455, 0x4dab87f0,
+    0xcb3ff55e, 0x006326fb, 0xf135942e, 0x3a69478b, 0xbcfd3525,
+    0x77a1e680, 0x6aa4d638, 0xa1f8059d, 0x276c7733, 0xec30a496,
+    0x191c11ee, 0xd240c24b, 0x54d4b0e5, 0x9f886340, 0x828d53f8,
+    0x49d1805d, 0xcf45f2f3, 0x04192156, 0xf54f9383, 0x3e134026,
+    0xb8873288, 0x73dbe12d, 0x6eded195, 0xa5820230, 0x2316709e,
+    0xe84aa33b, 0x1aca1375, 0xd196c0d0, 0x5702b27e, 0x9c5e61db,
+    0x815b5163, 0x4a0782c6, 0xcc93f068, 0x07cf23cd, 0xf6999118,
+    0x3dc542bd, 0xbb513013, 0x700de3b6, 0x6d08d30e, 0xa65400ab,
+    0x20c07205, 0xeb9ca1a0, 0x11e81eb4, 0xdab4cd11, 0x5c20bfbf,
+    0x977c6c1a, 0x8a795ca2, 0x41258f07, 0xc7b1fda9, 0x0ced2e0c,
+    0xfdbb9cd9, 0x36e74f7c, 0xb0733dd2, 0x7b2fee77, 0x662adecf,
+    0xad760d6a, 0x2be27fc4, 0xe0beac61, 0x123e1c2f, 0xd962cf8a,
+    0x5ff6bd24, 0x94aa6e81, 0x89af5e39, 0x42f38d9c, 0xc467ff32,
+    0x0f3b2c97, 0xfe6d9e42, 0x35314de7, 0xb3a53f49, 0x78f9ecec,
+    0x65fcdc54, 0xaea00ff1, 0x28347d5f, 0xe368aefa, 0x16441b82,
+    0xdd18c827, 0x5b8cba89, 0x90d0692c, 0x8dd55994, 0x46898a31,
+    0xc01df89f, 0x0b412b3a, 0xfa1799ef, 0x314b4a4a, 0xb7df38e4,
+    0x7c83eb41, 0x6186dbf9, 0xaada085c, 0x2c4e7af2, 0xe712a957,
+    0x15921919, 0xdececabc, 0x585ab812, 0x93066bb7, 0x8e035b0f,
+    0x455f88aa, 0xc3cbfa04, 0x089729a1, 0xf9c19b74, 0x329d48d1,
+    0xb4093a7f, 0x7f55e9da, 0x6250d962, 0xa90c0ac7, 0x2f987869,
+    0xe4c4abcc},
+   {0x00000000, 0x3d6029b0, 0x7ac05360, 0x47a07ad0, 0xf580a6c0,
+    0xc8e08f70, 0x8f40f5a0, 0xb220dc10, 0x30704bc1, 0x0d106271,
+    0x4ab018a1, 0x77d03111, 0xc5f0ed01, 0xf890c4b1, 0xbf30be61,
+    0x825097d1, 0x60e09782, 0x5d80be32, 0x1a20c4e2, 0x2740ed52,
+    0x95603142, 0xa80018f2, 0xefa06222, 0xd2c04b92, 0x5090dc43,
+    0x6df0f5f3, 0x2a508f23, 0x1730a693, 0xa5107a83, 0x98705333,
+    0xdfd029e3, 0xe2b00053, 0xc1c12f04, 0xfca106b4, 0xbb017c64,
+    0x866155d4, 0x344189c4, 0x0921a074, 0x4e81daa4, 0x73e1f314,
+    0xf1b164c5, 0xccd14d75, 0x8b7137a5, 0xb6111e15, 0x0431c205,
+    0x3951ebb5, 0x7ef19165, 0x4391b8d5, 0xa121b886, 0x9c419136,
+    0xdbe1ebe6, 0xe681c256, 0x54a11e46, 0x69c137f6, 0x2e614d26,
+    0x13016496, 0x9151f347, 0xac31daf7, 0xeb91a027, 0xd6f18997,
+    0x64d15587, 0x59b17c37, 0x1e1106e7, 0x23712f57, 0x58f35849,
+    0x659371f9, 0x22330b29, 0x1f532299, 0xad73fe89, 0x9013d739,
+    0xd7b3ade9, 0xead38459, 0x68831388, 0x55e33a38, 0x124340e8,
+    0x2f236958, 0x9d03b548, 0xa0639cf8, 0xe7c3e628, 0xdaa3cf98,
+    0x3813cfcb, 0x0573e67b, 0x42d39cab, 0x7fb3b51b, 0xcd93690b,
+    0xf0f340bb, 0xb7533a6b, 0x8a3313db, 0x0863840a, 0x3503adba,
+    0x72a3d76a, 0x4fc3feda, 0xfde322ca, 0xc0830b7a, 0x872371aa,
+    0xba43581a, 0x9932774d, 0xa4525efd, 0xe3f2242d, 0xde920d9d,
+    0x6cb2d18d, 0x51d2f83d, 0x167282ed, 0x2b12ab5d, 0xa9423c8c,
+    0x9422153c, 0xd3826fec, 0xeee2465c, 0x5cc29a4c, 0x61a2b3fc,
+    0x2602c92c, 0x1b62e09c, 0xf9d2e0cf, 0xc4b2c97f, 0x8312b3af,
+    0xbe729a1f, 0x0c52460f, 0x31326fbf, 0x7692156f, 0x4bf23cdf,
+    0xc9a2ab0e, 0xf4c282be, 0xb362f86e, 0x8e02d1de, 0x3c220dce,
+    0x0142247e, 0x46e25eae, 0x7b82771e, 0xb1e6b092, 0x8c869922,
+    0xcb26e3f2, 0xf646ca42, 0x44661652, 0x79063fe2, 0x3ea64532,
+    0x03c66c82, 0x8196fb53, 0xbcf6d2e3, 0xfb56a833, 0xc6368183,
+    0x74165d93, 0x49767423, 0x0ed60ef3, 0x33b62743, 0xd1062710,
+    0xec660ea0, 0xabc67470, 0x96a65dc0, 0x248681d0, 0x19e6a860,
+    0x5e46d2b0, 0x6326fb00, 0xe1766cd1, 0xdc164561, 0x9bb63fb1,
+    0xa6d61601, 0x14f6ca11, 0x2996e3a1, 0x6e369971, 0x5356b0c1,
+    0x70279f96, 0x4d47b626, 0x0ae7ccf6, 0x3787e546, 0x85a73956,
+    0xb8c710e6, 0xff676a36, 0xc2074386, 0x4057d457, 0x7d37fde7,
+    0x3a978737, 0x07f7ae87, 0xb5d77297, 0x88b75b27, 0xcf1721f7,
+    0xf2770847, 0x10c70814, 0x2da721a4, 0x6a075b74, 0x576772c4,
+    0xe547aed4, 0xd8278764, 0x9f87fdb4, 0xa2e7d404, 0x20b743d5,
+    0x1dd76a65, 0x5a7710b5, 0x67173905, 0xd537e515, 0xe857cca5,
+    0xaff7b675, 0x92979fc5, 0xe915e8db, 0xd475c16b, 0x93d5bbbb,
+    0xaeb5920b, 0x1c954e1b, 0x21f567ab, 0x66551d7b, 0x5b3534cb,
+    0xd965a31a, 0xe4058aaa, 0xa3a5f07a, 0x9ec5d9ca, 0x2ce505da,
+    0x11852c6a, 0x562556ba, 0x6b457f0a, 0x89f57f59, 0xb49556e9,
+    0xf3352c39, 0xce550589, 0x7c75d999, 0x4115f029, 0x06b58af9,
+    0x3bd5a349, 0xb9853498, 0x84e51d28, 0xc34567f8, 0xfe254e48,
+    0x4c059258, 0x7165bbe8, 0x36c5c138, 0x0ba5e888, 0x28d4c7df,
+    0x15b4ee6f, 0x521494bf, 0x6f74bd0f, 0xdd54611f, 0xe03448af,
+    0xa794327f, 0x9af41bcf, 0x18a48c1e, 0x25c4a5ae, 0x6264df7e,
+    0x5f04f6ce, 0xed242ade, 0xd044036e, 0x97e479be, 0xaa84500e,
+    0x4834505d, 0x755479ed, 0x32f4033d, 0x0f942a8d, 0xbdb4f69d,
+    0x80d4df2d, 0xc774a5fd, 0xfa148c4d, 0x78441b9c, 0x4524322c,
+    0x028448fc, 0x3fe4614c, 0x8dc4bd5c, 0xb0a494ec, 0xf704ee3c,
+    0xca64c78c},
+   {0x00000000, 0xb8bc6765, 0xaa09c88b, 0x12b5afee, 0x8f629757,
+    0x37def032, 0x256b5fdc, 0x9dd738b9, 0xc5b428ef, 0x7d084f8a,
+    0x6fbde064, 0xd7018701, 0x4ad6bfb8, 0xf26ad8dd, 0xe0df7733,
+    0x58631056, 0x5019579f, 0xe8a530fa, 0xfa109f14, 0x42acf871,
+    0xdf7bc0c8, 0x67c7a7ad, 0x75720843, 0xcdce6f26, 0x95ad7f70,
+    0x2d111815, 0x3fa4b7fb, 0x8718d09e, 0x1acfe827, 0xa2738f42,
+    0xb0c620ac, 0x087a47c9, 0xa032af3e, 0x188ec85b, 0x0a3b67b5,
+    0xb28700d0, 0x2f503869, 0x97ec5f0c, 0x8559f0e2, 0x3de59787,
+    0x658687d1, 0xdd3ae0b4, 0xcf8f4f5a, 0x7733283f, 0xeae41086,
+    0x525877e3, 0x40edd80d, 0xf851bf68, 0xf02bf8a1, 0x48979fc4,
+    0x5a22302a, 0xe29e574f, 0x7f496ff6, 0xc7f50893, 0xd540a77d,
+    0x6dfcc018, 0x359fd04e, 0x8d23b72b, 0x9f9618c5, 0x272a7fa0,
+    0xbafd4719, 0x0241207c, 0x10f48f92, 0xa848e8f7, 0x9b14583d,
+    0x23a83f58, 0x311d90b6, 0x89a1f7d3, 0x1476cf6a, 0xaccaa80f,
+    0xbe7f07e1, 0x06c36084, 0x5ea070d2, 0xe61c17b7, 0xf4a9b859,
+    0x4c15df3c, 0xd1c2e785, 0x697e80e0, 0x7bcb2f0e, 0xc377486b,
+    0xcb0d0fa2, 0x73b168c7, 0x6104c729, 0xd9b8a04c, 0x446f98f5,
+    0xfcd3ff90, 0xee66507e, 0x56da371b, 0x0eb9274d, 0xb6054028,
+    0xa4b0efc6, 0x1c0c88a3, 0x81dbb01a, 0x3967d77f, 0x2bd27891,
+    0x936e1ff4, 0x3b26f703, 0x839a9066, 0x912f3f88, 0x299358ed,
+    0xb4446054, 0x0cf80731, 0x1e4da8df, 0xa6f1cfba, 0xfe92dfec,
+    0x462eb889, 0x549b1767, 0xec277002, 0x71f048bb, 0xc94c2fde,
+    0xdbf98030, 0x6345e755, 0x6b3fa09c, 0xd383c7f9, 0xc1366817,
+    0x798a0f72, 0xe45d37cb, 0x5ce150ae, 0x4e54ff40, 0xf6e89825,
+    0xae8b8873, 0x1637ef16, 0x048240f8, 0xbc3e279d, 0x21e91f24,
+    0x99557841, 0x8be0d7af, 0x335cb0ca, 0xed59b63b, 0x55e5d15e,
+    0x47507eb0, 0xffec19d5, 0x623b216c, 0xda874609, 0xc832e9e7,
+    0x708e8e82, 0x28ed9ed4, 0x9051f9b1, 0x82e4565f, 0x3a58313a,
+    0xa78f0983, 0x1f336ee6, 0x0d86c108, 0xb53aa66d, 0xbd40e1a4,
+    0x05fc86c1, 0x1749292f, 0xaff54e4a, 0x322276f3, 0x8a9e1196,
+    0x982bbe78, 0x2097d91d, 0x78f4c94b, 0xc048ae2e, 0xd2fd01c0,
+    0x6a4166a5, 0xf7965e1c, 0x4f2a3979, 0x5d9f9697, 0xe523f1f2,
+    0x4d6b1905, 0xf5d77e60, 0xe762d18e, 0x5fdeb6eb, 0xc2098e52,
+    0x7ab5e937, 0x680046d9, 0xd0bc21bc, 0x88df31ea, 0x3063568f,
+    0x22d6f961, 0x9a6a9e04, 0x07bda6bd, 0xbf01c1d8, 0xadb46e36,
+    0x15080953, 0x1d724e9a, 0xa5ce29ff, 0xb77b8611, 0x0fc7e174,
+    0x9210d9cd, 0x2aacbea8, 0x38191146, 0x80a57623, 0xd8c66675,
+    0x607a0110, 0x72cfaefe, 0xca73c99b, 0x57a4f122, 0xef189647,
+    0xfdad39a9, 0x45115ecc, 0x764dee06, 0xcef18963, 0xdc44268d,
+    0x64f841e8, 0xf92f7951, 0x41931e34, 0x5326b1da, 0xeb9ad6bf,
+    0xb3f9c6e9, 0x0b45a18c, 0x19f00e62, 0xa14c6907, 0x3c9b51be,
+    0x842736db, 0x96929935, 0x2e2efe50, 0x2654b999, 0x9ee8defc,
+    0x8c5d7112, 0x34e11677, 0xa9362ece, 0x118a49ab, 0x033fe645,
+    0xbb838120, 0xe3e09176, 0x5b5cf613, 0x49e959fd, 0xf1553e98,
+    0x6c820621, 0xd43e6144, 0xc68bceaa, 0x7e37a9cf, 0xd67f4138,
+    0x6ec3265d, 0x7c7689b3, 0xc4caeed6, 0x591dd66f, 0xe1a1b10a,
+    0xf3141ee4, 0x4ba87981, 0x13cb69d7, 0xab770eb2, 0xb9c2a15c,
+    0x017ec639, 0x9ca9fe80, 0x241599e5, 0x36a0360b, 0x8e1c516e,
+    0x866616a7, 0x3eda71c2, 0x2c6fde2c, 0x94d3b949, 0x090481f0,
+    0xb1b8e695, 0xa30d497b, 0x1bb12e1e, 0x43d23e48, 0xfb6e592d,
+    0xe9dbf6c3, 0x516791a6, 0xccb0a91f, 0x740cce7a, 0x66b96194,
+    0xde0506f1},
+   {0x00000000, 0x01c26a37, 0x0384d46e, 0x0246be59, 0x0709a8dc,
+    0x06cbc2eb, 0x048d7cb2, 0x054f1685, 0x0e1351b8, 0x0fd13b8f,
+    0x0d9785d6, 0x0c55efe1, 0x091af964, 0x08d89353, 0x0a9e2d0a,
+    0x0b5c473d, 0x1c26a370, 0x1de4c947, 0x1fa2771e, 0x1e601d29,
+    0x1b2f0bac, 0x1aed619b, 0x18abdfc2, 0x1969b5f5, 0x1235f2c8,
+    0x13f798ff, 0x11b126a6, 0x10734c91, 0x153c5a14, 0x14fe3023,
+    0x16b88e7a, 0x177ae44d, 0x384d46e0, 0x398f2cd7, 0x3bc9928e,
+    0x3a0bf8b9, 0x3f44ee3c, 0x3e86840b, 0x3cc03a52, 0x3d025065,
+    0x365e1758, 0x379c7d6f, 0x35dac336, 0x3418a901, 0x3157bf84,
+    0x3095d5b3, 0x32d36bea, 0x331101dd, 0x246be590, 0x25a98fa7,
+    0x27ef31fe, 0x262d5bc9, 0x23624d4c, 0x22a0277b, 0x20e69922,
+    0x2124f315, 0x2a78b428, 0x2bbade1f, 0x29fc6046, 0x283e0a71,
+    0x2d711cf4, 0x2cb376c3, 0x2ef5c89a, 0x2f37a2ad, 0x709a8dc0,
+    0x7158e7f7, 0x731e59ae, 0x72dc3399, 0x7793251c, 0x76514f2b,
+    0x7417f172, 0x75d59b45, 0x7e89dc78, 0x7f4bb64f, 0x7d0d0816,
+    0x7ccf6221, 0x798074a4, 0x78421e93, 0x7a04a0ca, 0x7bc6cafd,
+    0x6cbc2eb0, 0x6d7e4487, 0x6f38fade, 0x6efa90e9, 0x6bb5866c,
+    0x6a77ec5b, 0x68315202, 0x69f33835, 0x62af7f08, 0x636d153f,
+    0x612bab66, 0x60e9c151, 0x65a6d7d4, 0x6464bde3, 0x662203ba,
+    0x67e0698d, 0x48d7cb20, 0x4915a117, 0x4b531f4e, 0x4a917579,
+    0x4fde63fc, 0x4e1c09cb, 0x4c5ab792, 0x4d98dda5, 0x46c49a98,
+    0x4706f0af, 0x45404ef6, 0x448224c1, 0x41cd3244, 0x400f5873,
+    0x4249e62a, 0x438b8c1d, 0x54f16850, 0x55330267, 0x5775bc3e,
+    0x56b7d609, 0x53f8c08c, 0x523aaabb, 0x507c14e2, 0x51be7ed5,
+    0x5ae239e8, 0x5b2053df, 0x5966ed86, 0x58a487b1, 0x5deb9134,
+    0x5c29fb03, 0x5e6f455a, 0x5fad2f6d, 0xe1351b80, 0xe0f771b7,
+    0xe2b1cfee, 0xe373a5d9, 0xe63cb35c, 0xe7fed96b, 0xe5b86732,
+    0xe47a0d05, 0xef264a38, 0xeee4200f, 0xeca29e56, 0xed60f461,
+    0xe82fe2e4, 0xe9ed88d3, 0xebab368a, 0xea695cbd, 0xfd13b8f0,
+    0xfcd1d2c7, 0xfe976c9e, 0xff5506a9, 0xfa1a102c, 0xfbd87a1b,
+    0xf99ec442, 0xf85cae75, 0xf300e948, 0xf2c2837f, 0xf0843d26,
+    0xf1465711, 0xf4094194, 0xf5cb2ba3, 0xf78d95fa, 0xf64fffcd,
+    0xd9785d60, 0xd8ba3757, 0xdafc890e, 0xdb3ee339, 0xde71f5bc,
+    0xdfb39f8b, 0xddf521d2, 0xdc374be5, 0xd76b0cd8, 0xd6a966ef,
+    0xd4efd8b6, 0xd52db281, 0xd062a404, 0xd1a0ce33, 0xd3e6706a,
+    0xd2241a5d, 0xc55efe10, 0xc49c9427, 0xc6da2a7e, 0xc7184049,
+    0xc25756cc, 0xc3953cfb, 0xc1d382a2, 0xc011e895, 0xcb4dafa8,
+    0xca8fc59f, 0xc8c97bc6, 0xc90b11f1, 0xcc440774, 0xcd866d43,
+    0xcfc0d31a, 0xce02b92d, 0x91af9640, 0x906dfc77, 0x922b422e,
+    0x93e92819, 0x96a63e9c, 0x976454ab, 0x9522eaf2, 0x94e080c5,
+    0x9fbcc7f8, 0x9e7eadcf, 0x9c381396, 0x9dfa79a1, 0x98b56f24,
+    0x99770513, 0x9b31bb4a, 0x9af3d17d, 0x8d893530, 0x8c4b5f07,
+    0x8e0de15e, 0x8fcf8b69, 0x8a809dec, 0x8b42f7db, 0x89044982,
+    0x88c623b5, 0x839a6488, 0x82580ebf, 0x801eb0e6, 0x81dcdad1,
+    0x8493cc54, 0x8551a663, 0x8717183a, 0x86d5720d, 0xa9e2d0a0,
+    0xa820ba97, 0xaa6604ce, 0xaba46ef9, 0xaeeb787c, 0xaf29124b,
+    0xad6fac12, 0xacadc625, 0xa7f18118, 0xa633eb2f, 0xa4755576,
+    0xa5b73f41, 0xa0f829c4, 0xa13a43f3, 0xa37cfdaa, 0xa2be979d,
+    0xb5c473d0, 0xb40619e7, 0xb640a7be, 0xb782cd89, 0xb2cddb0c,
+    0xb30fb13b, 0xb1490f62, 0xb08b6555, 0xbbd72268, 0xba15485f,
+    0xb853f606, 0xb9919c31, 0xbcde8ab4, 0xbd1ce083, 0xbf5a5eda,
+    0xbe9834ed},
+   {0x00000000, 0x191b3141, 0x32366282, 0x2b2d53c3, 0x646cc504,
+    0x7d77f445, 0x565aa786, 0x4f4196c7, 0xc8d98a08, 0xd1c2bb49,
+    0xfaefe88a, 0xe3f4d9cb, 0xacb54f0c, 0xb5ae7e4d, 0x9e832d8e,
+    0x87981ccf, 0x4ac21251, 0x53d92310, 0x78f470d3, 0x61ef4192,
+    0x2eaed755, 0x37b5e614, 0x1c98b5d7, 0x05838496, 0x821b9859,
+    0x9b00a918, 0xb02dfadb, 0xa936cb9a, 0xe6775d5d, 0xff6c6c1c,
+    0xd4413fdf, 0xcd5a0e9e, 0x958424a2, 0x8c9f15e3, 0xa7b24620,
+    0xbea97761, 0xf1e8e1a6, 0xe8f3d0e7, 0xc3de8324, 0xdac5b265,
+    0x5d5daeaa, 0x44469feb, 0x6f6bcc28, 0x7670fd69, 0x39316bae,
+    0x202a5aef, 0x0b07092c, 0x121c386d, 0xdf4636f3, 0xc65d07b2,
+    0xed705471, 0xf46b6530, 0xbb2af3f7, 0xa231c2b6, 0x891c9175,
+    0x9007a034, 0x179fbcfb, 0x0e848dba, 0x25a9de79, 0x3cb2ef38,
+    0x73f379ff, 0x6ae848be, 0x41c51b7d, 0x58de2a3c, 0xf0794f05,
+    0xe9627e44, 0xc24f2d87, 0xdb541cc6, 0x94158a01, 0x8d0ebb40,
+    0xa623e883, 0xbf38d9c2, 0x38a0c50d, 0x21bbf44c, 0x0a96a78f,
+    0x138d96ce, 0x5ccc0009, 0x45d73148, 0x6efa628b, 0x77e153ca,
+    0xbabb5d54, 0xa3a06c15, 0x888d3fd6, 0x91960e97, 0xded79850,
+    0xc7cca911, 0xece1fad2, 0xf5facb93, 0x7262d75c, 0x6b79e61d,
+    0x4054b5de, 0x594f849f, 0x160e1258, 0x0f152319, 0x243870da,
+    0x3d23419b, 0x65fd6ba7, 0x7ce65ae6, 0x57cb0925, 0x4ed03864,
+    0x0191aea3, 0x188a9fe2, 0x33a7cc21, 0x2abcfd60, 0xad24e1af,
+    0xb43fd0ee, 0x9f12832d, 0x8609b26c, 0xc94824ab, 0xd05315ea,
+    0xfb7e4629, 0xe2657768, 0x2f3f79f6, 0x362448b7, 0x1d091b74,
+    0x04122a35, 0x4b53bcf2, 0x52488db3, 0x7965de70, 0x607eef31,
+    0xe7e6f3fe, 0xfefdc2bf, 0xd5d0917c, 0xcccba03d, 0x838a36fa,
+    0x9a9107bb, 0xb1bc5478, 0xa8a76539, 0x3b83984b, 0x2298a90a,
+    0x09b5fac9, 0x10aecb88, 0x5fef5d4f, 0x46f46c0e, 0x6dd93fcd,
+    0x74c20e8c, 0xf35a1243, 0xea412302, 0xc16c70c1, 0xd8774180,
+    0x9736d747, 0x8e2de606, 0xa500b5c5, 0xbc1b8484, 0x71418a1a,
+    0x685abb5b, 0x4377e898, 0x5a6cd9d9, 0x152d4f1e, 0x0c367e5f,
+    0x271b2d9c, 0x3e001cdd, 0xb9980012, 0xa0833153, 0x8bae6290,
+    0x92b553d1, 0xddf4c516, 0xc4eff457, 0xefc2a794, 0xf6d996d5,
+    0xae07bce9, 0xb71c8da8, 0x9c31de6b, 0x852aef2a, 0xca6b79ed,
+    0xd37048ac, 0xf85d1b6f, 0xe1462a2e, 0x66de36e1, 0x7fc507a0,
+    0x54e85463, 0x4df36522, 0x02b2f3e5, 0x1ba9c2a4, 0x30849167,
+    0x299fa026, 0xe4c5aeb8, 0xfdde9ff9, 0xd6f3cc3a, 0xcfe8fd7b,
+    0x80a96bbc, 0x99b25afd, 0xb29f093e, 0xab84387f, 0x2c1c24b0,
+    0x350715f1, 0x1e2a4632, 0x07317773, 0x4870e1b4, 0x516bd0f5,
+    0x7a468336, 0x635db277, 0xcbfad74e, 0xd2e1e60f, 0xf9ccb5cc,
+    0xe0d7848d, 0xaf96124a, 0xb68d230b, 0x9da070c8, 0x84bb4189,
+    0x03235d46, 0x1a386c07, 0x31153fc4, 0x280e0e85, 0x674f9842,
+    0x7e54a903, 0x5579fac0, 0x4c62cb81, 0x8138c51f, 0x9823f45e,
+    0xb30ea79d, 0xaa1596dc, 0xe554001b, 0xfc4f315a, 0xd7626299,
+    0xce7953d8, 0x49e14f17, 0x50fa7e56, 0x7bd72d95, 0x62cc1cd4,
+    0x2d8d8a13, 0x3496bb52, 0x1fbbe891, 0x06a0d9d0, 0x5e7ef3ec,
+    0x4765c2ad, 0x6c48916e, 0x7553a02f, 0x3a1236e8, 0x230907a9,
+    0x0824546a, 0x113f652b, 0x96a779e4, 0x8fbc48a5, 0xa4911b66,
+    0xbd8a2a27, 0xf2cbbce0, 0xebd08da1, 0xc0fdde62, 0xd9e6ef23,
+    0x14bce1bd, 0x0da7d0fc, 0x268a833f, 0x3f91b27e, 0x70d024b9,
+    0x69cb15f8, 0x42e6463b, 0x5bfd777a, 0xdc656bb5, 0xc57e5af4,
+    0xee530937, 0xf7483876, 0xb809aeb1, 0xa1129ff0, 0x8a3fcc33,
+    0x9324fd72},
+   {0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419,
+    0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4,
+    0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07,
+    0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
+    0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856,
+    0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
+    0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4,
+    0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
+    0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3,
+    0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a,
+    0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599,
+    0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+    0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190,
+    0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f,
+    0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e,
+    0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
+    0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed,
+    0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
+    0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3,
+    0xfbd44c65, 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
+    0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a,
+    0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5,
+    0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010,
+    0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+    0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17,
+    0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6,
+    0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615,
+    0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
+    0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344,
+    0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
+    0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a,
+    0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
+    0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1,
+    0xa6bc5767, 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c,
+    0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef,
+    0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+    0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe,
+    0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31,
+    0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c,
+    0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
+    0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b,
+    0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
+    0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1,
+    0x18b74777, 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
+    0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278,
+    0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7,
+    0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66,
+    0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+    0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605,
+    0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8,
+    0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b,
+    0x2d02ef8d}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x0000000000000000, 0x9630077700000000, 0x2c610eee00000000,
+    0xba51099900000000, 0x19c46d0700000000, 0x8ff46a7000000000,
+    0x35a563e900000000, 0xa395649e00000000, 0x3288db0e00000000,
+    0xa4b8dc7900000000, 0x1ee9d5e000000000, 0x88d9d29700000000,
+    0x2b4cb60900000000, 0xbd7cb17e00000000, 0x072db8e700000000,
+    0x911dbf9000000000, 0x6410b71d00000000, 0xf220b06a00000000,
+    0x4871b9f300000000, 0xde41be8400000000, 0x7dd4da1a00000000,
+    0xebe4dd6d00000000, 0x51b5d4f400000000, 0xc785d38300000000,
+    0x56986c1300000000, 0xc0a86b6400000000, 0x7af962fd00000000,
+    0xecc9658a00000000, 0x4f5c011400000000, 0xd96c066300000000,
+    0x633d0ffa00000000, 0xf50d088d00000000, 0xc8206e3b00000000,
+    0x5e10694c00000000, 0xe44160d500000000, 0x727167a200000000,
+    0xd1e4033c00000000, 0x47d4044b00000000, 0xfd850dd200000000,
+    0x6bb50aa500000000, 0xfaa8b53500000000, 0x6c98b24200000000,
+    0xd6c9bbdb00000000, 0x40f9bcac00000000, 0xe36cd83200000000,
+    0x755cdf4500000000, 0xcf0dd6dc00000000, 0x593dd1ab00000000,
+    0xac30d92600000000, 0x3a00de5100000000, 0x8051d7c800000000,
+    0x1661d0bf00000000, 0xb5f4b42100000000, 0x23c4b35600000000,
+    0x9995bacf00000000, 0x0fa5bdb800000000, 0x9eb8022800000000,
+    0x0888055f00000000, 0xb2d90cc600000000, 0x24e90bb100000000,
+    0x877c6f2f00000000, 0x114c685800000000, 0xab1d61c100000000,
+    0x3d2d66b600000000, 0x9041dc7600000000, 0x0671db0100000000,
+    0xbc20d29800000000, 0x2a10d5ef00000000, 0x8985b17100000000,
+    0x1fb5b60600000000, 0xa5e4bf9f00000000, 0x33d4b8e800000000,
+    0xa2c9077800000000, 0x34f9000f00000000, 0x8ea8099600000000,
+    0x18980ee100000000, 0xbb0d6a7f00000000, 0x2d3d6d0800000000,
+    0x976c649100000000, 0x015c63e600000000, 0xf4516b6b00000000,
+    0x62616c1c00000000, 0xd830658500000000, 0x4e0062f200000000,
+    0xed95066c00000000, 0x7ba5011b00000000, 0xc1f4088200000000,
+    0x57c40ff500000000, 0xc6d9b06500000000, 0x50e9b71200000000,
+    0xeab8be8b00000000, 0x7c88b9fc00000000, 0xdf1ddd6200000000,
+    0x492dda1500000000, 0xf37cd38c00000000, 0x654cd4fb00000000,
+    0x5861b24d00000000, 0xce51b53a00000000, 0x7400bca300000000,
+    0xe230bbd400000000, 0x41a5df4a00000000, 0xd795d83d00000000,
+    0x6dc4d1a400000000, 0xfbf4d6d300000000, 0x6ae9694300000000,
+    0xfcd96e3400000000, 0x468867ad00000000, 0xd0b860da00000000,
+    0x732d044400000000, 0xe51d033300000000, 0x5f4c0aaa00000000,
+    0xc97c0ddd00000000, 0x3c71055000000000, 0xaa41022700000000,
+    0x10100bbe00000000, 0x86200cc900000000, 0x25b5685700000000,
+    0xb3856f2000000000, 0x09d466b900000000, 0x9fe461ce00000000,
+    0x0ef9de5e00000000, 0x98c9d92900000000, 0x2298d0b000000000,
+    0xb4a8d7c700000000, 0x173db35900000000, 0x810db42e00000000,
+    0x3b5cbdb700000000, 0xad6cbac000000000, 0x2083b8ed00000000,
+    0xb6b3bf9a00000000, 0x0ce2b60300000000, 0x9ad2b17400000000,
+    0x3947d5ea00000000, 0xaf77d29d00000000, 0x1526db0400000000,
+    0x8316dc7300000000, 0x120b63e300000000, 0x843b649400000000,
+    0x3e6a6d0d00000000, 0xa85a6a7a00000000, 0x0bcf0ee400000000,
+    0x9dff099300000000, 0x27ae000a00000000, 0xb19e077d00000000,
+    0x44930ff000000000, 0xd2a3088700000000, 0x68f2011e00000000,
+    0xfec2066900000000, 0x5d5762f700000000, 0xcb67658000000000,
+    0x71366c1900000000, 0xe7066b6e00000000, 0x761bd4fe00000000,
+    0xe02bd38900000000, 0x5a7ada1000000000, 0xcc4add6700000000,
+    0x6fdfb9f900000000, 0xf9efbe8e00000000, 0x43beb71700000000,
+    0xd58eb06000000000, 0xe8a3d6d600000000, 0x7e93d1a100000000,
+    0xc4c2d83800000000, 0x52f2df4f00000000, 0xf167bbd100000000,
+    0x6757bca600000000, 0xdd06b53f00000000, 0x4b36b24800000000,
+    0xda2b0dd800000000, 0x4c1b0aaf00000000, 0xf64a033600000000,
+    0x607a044100000000, 0xc3ef60df00000000, 0x55df67a800000000,
+    0xef8e6e3100000000, 0x79be694600000000, 0x8cb361cb00000000,
+    0x1a8366bc00000000, 0xa0d26f2500000000, 0x36e2685200000000,
+    0x95770ccc00000000, 0x03470bbb00000000, 0xb916022200000000,
+    0x2f26055500000000, 0xbe3bbac500000000, 0x280bbdb200000000,
+    0x925ab42b00000000, 0x046ab35c00000000, 0xa7ffd7c200000000,
+    0x31cfd0b500000000, 0x8b9ed92c00000000, 0x1daede5b00000000,
+    0xb0c2649b00000000, 0x26f263ec00000000, 0x9ca36a7500000000,
+    0x0a936d0200000000, 0xa906099c00000000, 0x3f360eeb00000000,
+    0x8567077200000000, 0x1357000500000000, 0x824abf9500000000,
+    0x147ab8e200000000, 0xae2bb17b00000000, 0x381bb60c00000000,
+    0x9b8ed29200000000, 0x0dbed5e500000000, 0xb7efdc7c00000000,
+    0x21dfdb0b00000000, 0xd4d2d38600000000, 0x42e2d4f100000000,
+    0xf8b3dd6800000000, 0x6e83da1f00000000, 0xcd16be8100000000,
+    0x5b26b9f600000000, 0xe177b06f00000000, 0x7747b71800000000,
+    0xe65a088800000000, 0x706a0fff00000000, 0xca3b066600000000,
+    0x5c0b011100000000, 0xff9e658f00000000, 0x69ae62f800000000,
+    0xd3ff6b6100000000, 0x45cf6c1600000000, 0x78e20aa000000000,
+    0xeed20dd700000000, 0x5483044e00000000, 0xc2b3033900000000,
+    0x612667a700000000, 0xf71660d000000000, 0x4d47694900000000,
+    0xdb776e3e00000000, 0x4a6ad1ae00000000, 0xdc5ad6d900000000,
+    0x660bdf4000000000, 0xf03bd83700000000, 0x53aebca900000000,
+    0xc59ebbde00000000, 0x7fcfb24700000000, 0xe9ffb53000000000,
+    0x1cf2bdbd00000000, 0x8ac2baca00000000, 0x3093b35300000000,
+    0xa6a3b42400000000, 0x0536d0ba00000000, 0x9306d7cd00000000,
+    0x2957de5400000000, 0xbf67d92300000000, 0x2e7a66b300000000,
+    0xb84a61c400000000, 0x021b685d00000000, 0x942b6f2a00000000,
+    0x37be0bb400000000, 0xa18e0cc300000000, 0x1bdf055a00000000,
+    0x8def022d00000000},
+   {0x0000000000000000, 0x41311b1900000000, 0x8262363200000000,
+    0xc3532d2b00000000, 0x04c56c6400000000, 0x45f4777d00000000,
+    0x86a75a5600000000, 0xc796414f00000000, 0x088ad9c800000000,
+    0x49bbc2d100000000, 0x8ae8effa00000000, 0xcbd9f4e300000000,
+    0x0c4fb5ac00000000, 0x4d7eaeb500000000, 0x8e2d839e00000000,
+    0xcf1c988700000000, 0x5112c24a00000000, 0x1023d95300000000,
+    0xd370f47800000000, 0x9241ef6100000000, 0x55d7ae2e00000000,
+    0x14e6b53700000000, 0xd7b5981c00000000, 0x9684830500000000,
+    0x59981b8200000000, 0x18a9009b00000000, 0xdbfa2db000000000,
+    0x9acb36a900000000, 0x5d5d77e600000000, 0x1c6c6cff00000000,
+    0xdf3f41d400000000, 0x9e0e5acd00000000, 0xa224849500000000,
+    0xe3159f8c00000000, 0x2046b2a700000000, 0x6177a9be00000000,
+    0xa6e1e8f100000000, 0xe7d0f3e800000000, 0x2483dec300000000,
+    0x65b2c5da00000000, 0xaaae5d5d00000000, 0xeb9f464400000000,
+    0x28cc6b6f00000000, 0x69fd707600000000, 0xae6b313900000000,
+    0xef5a2a2000000000, 0x2c09070b00000000, 0x6d381c1200000000,
+    0xf33646df00000000, 0xb2075dc600000000, 0x715470ed00000000,
+    0x30656bf400000000, 0xf7f32abb00000000, 0xb6c231a200000000,
+    0x75911c8900000000, 0x34a0079000000000, 0xfbbc9f1700000000,
+    0xba8d840e00000000, 0x79dea92500000000, 0x38efb23c00000000,
+    0xff79f37300000000, 0xbe48e86a00000000, 0x7d1bc54100000000,
+    0x3c2ade5800000000, 0x054f79f000000000, 0x447e62e900000000,
+    0x872d4fc200000000, 0xc61c54db00000000, 0x018a159400000000,
+    0x40bb0e8d00000000, 0x83e823a600000000, 0xc2d938bf00000000,
+    0x0dc5a03800000000, 0x4cf4bb2100000000, 0x8fa7960a00000000,
+    0xce968d1300000000, 0x0900cc5c00000000, 0x4831d74500000000,
+    0x8b62fa6e00000000, 0xca53e17700000000, 0x545dbbba00000000,
+    0x156ca0a300000000, 0xd63f8d8800000000, 0x970e969100000000,
+    0x5098d7de00000000, 0x11a9ccc700000000, 0xd2fae1ec00000000,
+    0x93cbfaf500000000, 0x5cd7627200000000, 0x1de6796b00000000,
+    0xdeb5544000000000, 0x9f844f5900000000, 0x58120e1600000000,
+    0x1923150f00000000, 0xda70382400000000, 0x9b41233d00000000,
+    0xa76bfd6500000000, 0xe65ae67c00000000, 0x2509cb5700000000,
+    0x6438d04e00000000, 0xa3ae910100000000, 0xe29f8a1800000000,
+    0x21cca73300000000, 0x60fdbc2a00000000, 0xafe124ad00000000,
+    0xeed03fb400000000, 0x2d83129f00000000, 0x6cb2098600000000,
+    0xab2448c900000000, 0xea1553d000000000, 0x29467efb00000000,
+    0x687765e200000000, 0xf6793f2f00000000, 0xb748243600000000,
+    0x741b091d00000000, 0x352a120400000000, 0xf2bc534b00000000,
+    0xb38d485200000000, 0x70de657900000000, 0x31ef7e6000000000,
+    0xfef3e6e700000000, 0xbfc2fdfe00000000, 0x7c91d0d500000000,
+    0x3da0cbcc00000000, 0xfa368a8300000000, 0xbb07919a00000000,
+    0x7854bcb100000000, 0x3965a7a800000000, 0x4b98833b00000000,
+    0x0aa9982200000000, 0xc9fab50900000000, 0x88cbae1000000000,
+    0x4f5def5f00000000, 0x0e6cf44600000000, 0xcd3fd96d00000000,
+    0x8c0ec27400000000, 0x43125af300000000, 0x022341ea00000000,
+    0xc1706cc100000000, 0x804177d800000000, 0x47d7369700000000,
+    0x06e62d8e00000000, 0xc5b500a500000000, 0x84841bbc00000000,
+    0x1a8a417100000000, 0x5bbb5a6800000000, 0x98e8774300000000,
+    0xd9d96c5a00000000, 0x1e4f2d1500000000, 0x5f7e360c00000000,
+    0x9c2d1b2700000000, 0xdd1c003e00000000, 0x120098b900000000,
+    0x533183a000000000, 0x9062ae8b00000000, 0xd153b59200000000,
+    0x16c5f4dd00000000, 0x57f4efc400000000, 0x94a7c2ef00000000,
+    0xd596d9f600000000, 0xe9bc07ae00000000, 0xa88d1cb700000000,
+    0x6bde319c00000000, 0x2aef2a8500000000, 0xed796bca00000000,
+    0xac4870d300000000, 0x6f1b5df800000000, 0x2e2a46e100000000,
+    0xe136de6600000000, 0xa007c57f00000000, 0x6354e85400000000,
+    0x2265f34d00000000, 0xe5f3b20200000000, 0xa4c2a91b00000000,
+    0x6791843000000000, 0x26a09f2900000000, 0xb8aec5e400000000,
+    0xf99fdefd00000000, 0x3accf3d600000000, 0x7bfde8cf00000000,
+    0xbc6ba98000000000, 0xfd5ab29900000000, 0x3e099fb200000000,
+    0x7f3884ab00000000, 0xb0241c2c00000000, 0xf115073500000000,
+    0x32462a1e00000000, 0x7377310700000000, 0xb4e1704800000000,
+    0xf5d06b5100000000, 0x3683467a00000000, 0x77b25d6300000000,
+    0x4ed7facb00000000, 0x0fe6e1d200000000, 0xccb5ccf900000000,
+    0x8d84d7e000000000, 0x4a1296af00000000, 0x0b238db600000000,
+    0xc870a09d00000000, 0x8941bb8400000000, 0x465d230300000000,
+    0x076c381a00000000, 0xc43f153100000000, 0x850e0e2800000000,
+    0x42984f6700000000, 0x03a9547e00000000, 0xc0fa795500000000,
+    0x81cb624c00000000, 0x1fc5388100000000, 0x5ef4239800000000,
+    0x9da70eb300000000, 0xdc9615aa00000000, 0x1b0054e500000000,
+    0x5a314ffc00000000, 0x996262d700000000, 0xd85379ce00000000,
+    0x174fe14900000000, 0x567efa5000000000, 0x952dd77b00000000,
+    0xd41ccc6200000000, 0x138a8d2d00000000, 0x52bb963400000000,
+    0x91e8bb1f00000000, 0xd0d9a00600000000, 0xecf37e5e00000000,
+    0xadc2654700000000, 0x6e91486c00000000, 0x2fa0537500000000,
+    0xe836123a00000000, 0xa907092300000000, 0x6a54240800000000,
+    0x2b653f1100000000, 0xe479a79600000000, 0xa548bc8f00000000,
+    0x661b91a400000000, 0x272a8abd00000000, 0xe0bccbf200000000,
+    0xa18dd0eb00000000, 0x62defdc000000000, 0x23efe6d900000000,
+    0xbde1bc1400000000, 0xfcd0a70d00000000, 0x3f838a2600000000,
+    0x7eb2913f00000000, 0xb924d07000000000, 0xf815cb6900000000,
+    0x3b46e64200000000, 0x7a77fd5b00000000, 0xb56b65dc00000000,
+    0xf45a7ec500000000, 0x370953ee00000000, 0x763848f700000000,
+    0xb1ae09b800000000, 0xf09f12a100000000, 0x33cc3f8a00000000,
+    0x72fd249300000000},
+   {0x0000000000000000, 0x376ac20100000000, 0x6ed4840300000000,
+    0x59be460200000000, 0xdca8090700000000, 0xebc2cb0600000000,
+    0xb27c8d0400000000, 0x85164f0500000000, 0xb851130e00000000,
+    0x8f3bd10f00000000, 0xd685970d00000000, 0xe1ef550c00000000,
+    0x64f91a0900000000, 0x5393d80800000000, 0x0a2d9e0a00000000,
+    0x3d475c0b00000000, 0x70a3261c00000000, 0x47c9e41d00000000,
+    0x1e77a21f00000000, 0x291d601e00000000, 0xac0b2f1b00000000,
+    0x9b61ed1a00000000, 0xc2dfab1800000000, 0xf5b5691900000000,
+    0xc8f2351200000000, 0xff98f71300000000, 0xa626b11100000000,
+    0x914c731000000000, 0x145a3c1500000000, 0x2330fe1400000000,
+    0x7a8eb81600000000, 0x4de47a1700000000, 0xe0464d3800000000,
+    0xd72c8f3900000000, 0x8e92c93b00000000, 0xb9f80b3a00000000,
+    0x3cee443f00000000, 0x0b84863e00000000, 0x523ac03c00000000,
+    0x6550023d00000000, 0x58175e3600000000, 0x6f7d9c3700000000,
+    0x36c3da3500000000, 0x01a9183400000000, 0x84bf573100000000,
+    0xb3d5953000000000, 0xea6bd33200000000, 0xdd01113300000000,
+    0x90e56b2400000000, 0xa78fa92500000000, 0xfe31ef2700000000,
+    0xc95b2d2600000000, 0x4c4d622300000000, 0x7b27a02200000000,
+    0x2299e62000000000, 0x15f3242100000000, 0x28b4782a00000000,
+    0x1fdeba2b00000000, 0x4660fc2900000000, 0x710a3e2800000000,
+    0xf41c712d00000000, 0xc376b32c00000000, 0x9ac8f52e00000000,
+    0xada2372f00000000, 0xc08d9a7000000000, 0xf7e7587100000000,
+    0xae591e7300000000, 0x9933dc7200000000, 0x1c25937700000000,
+    0x2b4f517600000000, 0x72f1177400000000, 0x459bd57500000000,
+    0x78dc897e00000000, 0x4fb64b7f00000000, 0x16080d7d00000000,
+    0x2162cf7c00000000, 0xa474807900000000, 0x931e427800000000,
+    0xcaa0047a00000000, 0xfdcac67b00000000, 0xb02ebc6c00000000,
+    0x87447e6d00000000, 0xdefa386f00000000, 0xe990fa6e00000000,
+    0x6c86b56b00000000, 0x5bec776a00000000, 0x0252316800000000,
+    0x3538f36900000000, 0x087faf6200000000, 0x3f156d6300000000,
+    0x66ab2b6100000000, 0x51c1e96000000000, 0xd4d7a66500000000,
+    0xe3bd646400000000, 0xba03226600000000, 0x8d69e06700000000,
+    0x20cbd74800000000, 0x17a1154900000000, 0x4e1f534b00000000,
+    0x7975914a00000000, 0xfc63de4f00000000, 0xcb091c4e00000000,
+    0x92b75a4c00000000, 0xa5dd984d00000000, 0x989ac44600000000,
+    0xaff0064700000000, 0xf64e404500000000, 0xc124824400000000,
+    0x4432cd4100000000, 0x73580f4000000000, 0x2ae6494200000000,
+    0x1d8c8b4300000000, 0x5068f15400000000, 0x6702335500000000,
+    0x3ebc755700000000, 0x09d6b75600000000, 0x8cc0f85300000000,
+    0xbbaa3a5200000000, 0xe2147c5000000000, 0xd57ebe5100000000,
+    0xe839e25a00000000, 0xdf53205b00000000, 0x86ed665900000000,
+    0xb187a45800000000, 0x3491eb5d00000000, 0x03fb295c00000000,
+    0x5a456f5e00000000, 0x6d2fad5f00000000, 0x801b35e100000000,
+    0xb771f7e000000000, 0xeecfb1e200000000, 0xd9a573e300000000,
+    0x5cb33ce600000000, 0x6bd9fee700000000, 0x3267b8e500000000,
+    0x050d7ae400000000, 0x384a26ef00000000, 0x0f20e4ee00000000,
+    0x569ea2ec00000000, 0x61f460ed00000000, 0xe4e22fe800000000,
+    0xd388ede900000000, 0x8a36abeb00000000, 0xbd5c69ea00000000,
+    0xf0b813fd00000000, 0xc7d2d1fc00000000, 0x9e6c97fe00000000,
+    0xa90655ff00000000, 0x2c101afa00000000, 0x1b7ad8fb00000000,
+    0x42c49ef900000000, 0x75ae5cf800000000, 0x48e900f300000000,
+    0x7f83c2f200000000, 0x263d84f000000000, 0x115746f100000000,
+    0x944109f400000000, 0xa32bcbf500000000, 0xfa958df700000000,
+    0xcdff4ff600000000, 0x605d78d900000000, 0x5737bad800000000,
+    0x0e89fcda00000000, 0x39e33edb00000000, 0xbcf571de00000000,
+    0x8b9fb3df00000000, 0xd221f5dd00000000, 0xe54b37dc00000000,
+    0xd80c6bd700000000, 0xef66a9d600000000, 0xb6d8efd400000000,
+    0x81b22dd500000000, 0x04a462d000000000, 0x33cea0d100000000,
+    0x6a70e6d300000000, 0x5d1a24d200000000, 0x10fe5ec500000000,
+    0x27949cc400000000, 0x7e2adac600000000, 0x494018c700000000,
+    0xcc5657c200000000, 0xfb3c95c300000000, 0xa282d3c100000000,
+    0x95e811c000000000, 0xa8af4dcb00000000, 0x9fc58fca00000000,
+    0xc67bc9c800000000, 0xf1110bc900000000, 0x740744cc00000000,
+    0x436d86cd00000000, 0x1ad3c0cf00000000, 0x2db902ce00000000,
+    0x4096af9100000000, 0x77fc6d9000000000, 0x2e422b9200000000,
+    0x1928e99300000000, 0x9c3ea69600000000, 0xab54649700000000,
+    0xf2ea229500000000, 0xc580e09400000000, 0xf8c7bc9f00000000,
+    0xcfad7e9e00000000, 0x9613389c00000000, 0xa179fa9d00000000,
+    0x246fb59800000000, 0x1305779900000000, 0x4abb319b00000000,
+    0x7dd1f39a00000000, 0x3035898d00000000, 0x075f4b8c00000000,
+    0x5ee10d8e00000000, 0x698bcf8f00000000, 0xec9d808a00000000,
+    0xdbf7428b00000000, 0x8249048900000000, 0xb523c68800000000,
+    0x88649a8300000000, 0xbf0e588200000000, 0xe6b01e8000000000,
+    0xd1dadc8100000000, 0x54cc938400000000, 0x63a6518500000000,
+    0x3a18178700000000, 0x0d72d58600000000, 0xa0d0e2a900000000,
+    0x97ba20a800000000, 0xce0466aa00000000, 0xf96ea4ab00000000,
+    0x7c78ebae00000000, 0x4b1229af00000000, 0x12ac6fad00000000,
+    0x25c6adac00000000, 0x1881f1a700000000, 0x2feb33a600000000,
+    0x765575a400000000, 0x413fb7a500000000, 0xc429f8a000000000,
+    0xf3433aa100000000, 0xaafd7ca300000000, 0x9d97bea200000000,
+    0xd073c4b500000000, 0xe71906b400000000, 0xbea740b600000000,
+    0x89cd82b700000000, 0x0cdbcdb200000000, 0x3bb10fb300000000,
+    0x620f49b100000000, 0x55658bb000000000, 0x6822d7bb00000000,
+    0x5f4815ba00000000, 0x06f653b800000000, 0x319c91b900000000,
+    0xb48adebc00000000, 0x83e01cbd00000000, 0xda5e5abf00000000,
+    0xed3498be00000000},
+   {0x0000000000000000, 0x6567bcb800000000, 0x8bc809aa00000000,
+    0xeeafb51200000000, 0x5797628f00000000, 0x32f0de3700000000,
+    0xdc5f6b2500000000, 0xb938d79d00000000, 0xef28b4c500000000,
+    0x8a4f087d00000000, 0x64e0bd6f00000000, 0x018701d700000000,
+    0xb8bfd64a00000000, 0xddd86af200000000, 0x3377dfe000000000,
+    0x5610635800000000, 0x9f57195000000000, 0xfa30a5e800000000,
+    0x149f10fa00000000, 0x71f8ac4200000000, 0xc8c07bdf00000000,
+    0xada7c76700000000, 0x4308727500000000, 0x266fcecd00000000,
+    0x707fad9500000000, 0x1518112d00000000, 0xfbb7a43f00000000,
+    0x9ed0188700000000, 0x27e8cf1a00000000, 0x428f73a200000000,
+    0xac20c6b000000000, 0xc9477a0800000000, 0x3eaf32a000000000,
+    0x5bc88e1800000000, 0xb5673b0a00000000, 0xd00087b200000000,
+    0x6938502f00000000, 0x0c5fec9700000000, 0xe2f0598500000000,
+    0x8797e53d00000000, 0xd187866500000000, 0xb4e03add00000000,
+    0x5a4f8fcf00000000, 0x3f28337700000000, 0x8610e4ea00000000,
+    0xe377585200000000, 0x0dd8ed4000000000, 0x68bf51f800000000,
+    0xa1f82bf000000000, 0xc49f974800000000, 0x2a30225a00000000,
+    0x4f579ee200000000, 0xf66f497f00000000, 0x9308f5c700000000,
+    0x7da740d500000000, 0x18c0fc6d00000000, 0x4ed09f3500000000,
+    0x2bb7238d00000000, 0xc518969f00000000, 0xa07f2a2700000000,
+    0x1947fdba00000000, 0x7c20410200000000, 0x928ff41000000000,
+    0xf7e848a800000000, 0x3d58149b00000000, 0x583fa82300000000,
+    0xb6901d3100000000, 0xd3f7a18900000000, 0x6acf761400000000,
+    0x0fa8caac00000000, 0xe1077fbe00000000, 0x8460c30600000000,
+    0xd270a05e00000000, 0xb7171ce600000000, 0x59b8a9f400000000,
+    0x3cdf154c00000000, 0x85e7c2d100000000, 0xe0807e6900000000,
+    0x0e2fcb7b00000000, 0x6b4877c300000000, 0xa20f0dcb00000000,
+    0xc768b17300000000, 0x29c7046100000000, 0x4ca0b8d900000000,
+    0xf5986f4400000000, 0x90ffd3fc00000000, 0x7e5066ee00000000,
+    0x1b37da5600000000, 0x4d27b90e00000000, 0x284005b600000000,
+    0xc6efb0a400000000, 0xa3880c1c00000000, 0x1ab0db8100000000,
+    0x7fd7673900000000, 0x9178d22b00000000, 0xf41f6e9300000000,
+    0x03f7263b00000000, 0x66909a8300000000, 0x883f2f9100000000,
+    0xed58932900000000, 0x546044b400000000, 0x3107f80c00000000,
+    0xdfa84d1e00000000, 0xbacff1a600000000, 0xecdf92fe00000000,
+    0x89b82e4600000000, 0x67179b5400000000, 0x027027ec00000000,
+    0xbb48f07100000000, 0xde2f4cc900000000, 0x3080f9db00000000,
+    0x55e7456300000000, 0x9ca03f6b00000000, 0xf9c783d300000000,
+    0x176836c100000000, 0x720f8a7900000000, 0xcb375de400000000,
+    0xae50e15c00000000, 0x40ff544e00000000, 0x2598e8f600000000,
+    0x73888bae00000000, 0x16ef371600000000, 0xf840820400000000,
+    0x9d273ebc00000000, 0x241fe92100000000, 0x4178559900000000,
+    0xafd7e08b00000000, 0xcab05c3300000000, 0x3bb659ed00000000,
+    0x5ed1e55500000000, 0xb07e504700000000, 0xd519ecff00000000,
+    0x6c213b6200000000, 0x094687da00000000, 0xe7e932c800000000,
+    0x828e8e7000000000, 0xd49eed2800000000, 0xb1f9519000000000,
+    0x5f56e48200000000, 0x3a31583a00000000, 0x83098fa700000000,
+    0xe66e331f00000000, 0x08c1860d00000000, 0x6da63ab500000000,
+    0xa4e140bd00000000, 0xc186fc0500000000, 0x2f29491700000000,
+    0x4a4ef5af00000000, 0xf376223200000000, 0x96119e8a00000000,
+    0x78be2b9800000000, 0x1dd9972000000000, 0x4bc9f47800000000,
+    0x2eae48c000000000, 0xc001fdd200000000, 0xa566416a00000000,
+    0x1c5e96f700000000, 0x79392a4f00000000, 0x97969f5d00000000,
+    0xf2f123e500000000, 0x05196b4d00000000, 0x607ed7f500000000,
+    0x8ed162e700000000, 0xebb6de5f00000000, 0x528e09c200000000,
+    0x37e9b57a00000000, 0xd946006800000000, 0xbc21bcd000000000,
+    0xea31df8800000000, 0x8f56633000000000, 0x61f9d62200000000,
+    0x049e6a9a00000000, 0xbda6bd0700000000, 0xd8c101bf00000000,
+    0x366eb4ad00000000, 0x5309081500000000, 0x9a4e721d00000000,
+    0xff29cea500000000, 0x11867bb700000000, 0x74e1c70f00000000,
+    0xcdd9109200000000, 0xa8beac2a00000000, 0x4611193800000000,
+    0x2376a58000000000, 0x7566c6d800000000, 0x10017a6000000000,
+    0xfeaecf7200000000, 0x9bc973ca00000000, 0x22f1a45700000000,
+    0x479618ef00000000, 0xa939adfd00000000, 0xcc5e114500000000,
+    0x06ee4d7600000000, 0x6389f1ce00000000, 0x8d2644dc00000000,
+    0xe841f86400000000, 0x51792ff900000000, 0x341e934100000000,
+    0xdab1265300000000, 0xbfd69aeb00000000, 0xe9c6f9b300000000,
+    0x8ca1450b00000000, 0x620ef01900000000, 0x07694ca100000000,
+    0xbe519b3c00000000, 0xdb36278400000000, 0x3599929600000000,
+    0x50fe2e2e00000000, 0x99b9542600000000, 0xfcdee89e00000000,
+    0x12715d8c00000000, 0x7716e13400000000, 0xce2e36a900000000,
+    0xab498a1100000000, 0x45e63f0300000000, 0x208183bb00000000,
+    0x7691e0e300000000, 0x13f65c5b00000000, 0xfd59e94900000000,
+    0x983e55f100000000, 0x2106826c00000000, 0x44613ed400000000,
+    0xaace8bc600000000, 0xcfa9377e00000000, 0x38417fd600000000,
+    0x5d26c36e00000000, 0xb389767c00000000, 0xd6eecac400000000,
+    0x6fd61d5900000000, 0x0ab1a1e100000000, 0xe41e14f300000000,
+    0x8179a84b00000000, 0xd769cb1300000000, 0xb20e77ab00000000,
+    0x5ca1c2b900000000, 0x39c67e0100000000, 0x80fea99c00000000,
+    0xe599152400000000, 0x0b36a03600000000, 0x6e511c8e00000000,
+    0xa716668600000000, 0xc271da3e00000000, 0x2cde6f2c00000000,
+    0x49b9d39400000000, 0xf081040900000000, 0x95e6b8b100000000,
+    0x7b490da300000000, 0x1e2eb11b00000000, 0x483ed24300000000,
+    0x2d596efb00000000, 0xc3f6dbe900000000, 0xa691675100000000,
+    0x1fa9b0cc00000000, 0x7ace0c7400000000, 0x9461b96600000000,
+    0xf10605de00000000},
+   {0x0000000000000000, 0xb029603d00000000, 0x6053c07a00000000,
+    0xd07aa04700000000, 0xc0a680f500000000, 0x708fe0c800000000,
+    0xa0f5408f00000000, 0x10dc20b200000000, 0xc14b703000000000,
+    0x7162100d00000000, 0xa118b04a00000000, 0x1131d07700000000,
+    0x01edf0c500000000, 0xb1c490f800000000, 0x61be30bf00000000,
+    0xd197508200000000, 0x8297e06000000000, 0x32be805d00000000,
+    0xe2c4201a00000000, 0x52ed402700000000, 0x4231609500000000,
+    0xf21800a800000000, 0x2262a0ef00000000, 0x924bc0d200000000,
+    0x43dc905000000000, 0xf3f5f06d00000000, 0x238f502a00000000,
+    0x93a6301700000000, 0x837a10a500000000, 0x3353709800000000,
+    0xe329d0df00000000, 0x5300b0e200000000, 0x042fc1c100000000,
+    0xb406a1fc00000000, 0x647c01bb00000000, 0xd455618600000000,
+    0xc489413400000000, 0x74a0210900000000, 0xa4da814e00000000,
+    0x14f3e17300000000, 0xc564b1f100000000, 0x754dd1cc00000000,
+    0xa537718b00000000, 0x151e11b600000000, 0x05c2310400000000,
+    0xb5eb513900000000, 0x6591f17e00000000, 0xd5b8914300000000,
+    0x86b821a100000000, 0x3691419c00000000, 0xe6ebe1db00000000,
+    0x56c281e600000000, 0x461ea15400000000, 0xf637c16900000000,
+    0x264d612e00000000, 0x9664011300000000, 0x47f3519100000000,
+    0xf7da31ac00000000, 0x27a091eb00000000, 0x9789f1d600000000,
+    0x8755d16400000000, 0x377cb15900000000, 0xe706111e00000000,
+    0x572f712300000000, 0x4958f35800000000, 0xf971936500000000,
+    0x290b332200000000, 0x9922531f00000000, 0x89fe73ad00000000,
+    0x39d7139000000000, 0xe9adb3d700000000, 0x5984d3ea00000000,
+    0x8813836800000000, 0x383ae35500000000, 0xe840431200000000,
+    0x5869232f00000000, 0x48b5039d00000000, 0xf89c63a000000000,
+    0x28e6c3e700000000, 0x98cfa3da00000000, 0xcbcf133800000000,
+    0x7be6730500000000, 0xab9cd34200000000, 0x1bb5b37f00000000,
+    0x0b6993cd00000000, 0xbb40f3f000000000, 0x6b3a53b700000000,
+    0xdb13338a00000000, 0x0a84630800000000, 0xbaad033500000000,
+    0x6ad7a37200000000, 0xdafec34f00000000, 0xca22e3fd00000000,
+    0x7a0b83c000000000, 0xaa71238700000000, 0x1a5843ba00000000,
+    0x4d77329900000000, 0xfd5e52a400000000, 0x2d24f2e300000000,
+    0x9d0d92de00000000, 0x8dd1b26c00000000, 0x3df8d25100000000,
+    0xed82721600000000, 0x5dab122b00000000, 0x8c3c42a900000000,
+    0x3c15229400000000, 0xec6f82d300000000, 0x5c46e2ee00000000,
+    0x4c9ac25c00000000, 0xfcb3a26100000000, 0x2cc9022600000000,
+    0x9ce0621b00000000, 0xcfe0d2f900000000, 0x7fc9b2c400000000,
+    0xafb3128300000000, 0x1f9a72be00000000, 0x0f46520c00000000,
+    0xbf6f323100000000, 0x6f15927600000000, 0xdf3cf24b00000000,
+    0x0eaba2c900000000, 0xbe82c2f400000000, 0x6ef862b300000000,
+    0xded1028e00000000, 0xce0d223c00000000, 0x7e24420100000000,
+    0xae5ee24600000000, 0x1e77827b00000000, 0x92b0e6b100000000,
+    0x2299868c00000000, 0xf2e326cb00000000, 0x42ca46f600000000,
+    0x5216664400000000, 0xe23f067900000000, 0x3245a63e00000000,
+    0x826cc60300000000, 0x53fb968100000000, 0xe3d2f6bc00000000,
+    0x33a856fb00000000, 0x838136c600000000, 0x935d167400000000,
+    0x2374764900000000, 0xf30ed60e00000000, 0x4327b63300000000,
+    0x102706d100000000, 0xa00e66ec00000000, 0x7074c6ab00000000,
+    0xc05da69600000000, 0xd081862400000000, 0x60a8e61900000000,
+    0xb0d2465e00000000, 0x00fb266300000000, 0xd16c76e100000000,
+    0x614516dc00000000, 0xb13fb69b00000000, 0x0116d6a600000000,
+    0x11caf61400000000, 0xa1e3962900000000, 0x7199366e00000000,
+    0xc1b0565300000000, 0x969f277000000000, 0x26b6474d00000000,
+    0xf6cce70a00000000, 0x46e5873700000000, 0x5639a78500000000,
+    0xe610c7b800000000, 0x366a67ff00000000, 0x864307c200000000,
+    0x57d4574000000000, 0xe7fd377d00000000, 0x3787973a00000000,
+    0x87aef70700000000, 0x9772d7b500000000, 0x275bb78800000000,
+    0xf72117cf00000000, 0x470877f200000000, 0x1408c71000000000,
+    0xa421a72d00000000, 0x745b076a00000000, 0xc472675700000000,
+    0xd4ae47e500000000, 0x648727d800000000, 0xb4fd879f00000000,
+    0x04d4e7a200000000, 0xd543b72000000000, 0x656ad71d00000000,
+    0xb510775a00000000, 0x0539176700000000, 0x15e537d500000000,
+    0xa5cc57e800000000, 0x75b6f7af00000000, 0xc59f979200000000,
+    0xdbe815e900000000, 0x6bc175d400000000, 0xbbbbd59300000000,
+    0x0b92b5ae00000000, 0x1b4e951c00000000, 0xab67f52100000000,
+    0x7b1d556600000000, 0xcb34355b00000000, 0x1aa365d900000000,
+    0xaa8a05e400000000, 0x7af0a5a300000000, 0xcad9c59e00000000,
+    0xda05e52c00000000, 0x6a2c851100000000, 0xba56255600000000,
+    0x0a7f456b00000000, 0x597ff58900000000, 0xe95695b400000000,
+    0x392c35f300000000, 0x890555ce00000000, 0x99d9757c00000000,
+    0x29f0154100000000, 0xf98ab50600000000, 0x49a3d53b00000000,
+    0x983485b900000000, 0x281de58400000000, 0xf86745c300000000,
+    0x484e25fe00000000, 0x5892054c00000000, 0xe8bb657100000000,
+    0x38c1c53600000000, 0x88e8a50b00000000, 0xdfc7d42800000000,
+    0x6feeb41500000000, 0xbf94145200000000, 0x0fbd746f00000000,
+    0x1f6154dd00000000, 0xaf4834e000000000, 0x7f3294a700000000,
+    0xcf1bf49a00000000, 0x1e8ca41800000000, 0xaea5c42500000000,
+    0x7edf646200000000, 0xcef6045f00000000, 0xde2a24ed00000000,
+    0x6e0344d000000000, 0xbe79e49700000000, 0x0e5084aa00000000,
+    0x5d50344800000000, 0xed79547500000000, 0x3d03f43200000000,
+    0x8d2a940f00000000, 0x9df6b4bd00000000, 0x2ddfd48000000000,
+    0xfda574c700000000, 0x4d8c14fa00000000, 0x9c1b447800000000,
+    0x2c32244500000000, 0xfc48840200000000, 0x4c61e43f00000000,
+    0x5cbdc48d00000000, 0xec94a4b000000000, 0x3cee04f700000000,
+    0x8cc764ca00000000},
+   {0x0000000000000000, 0xa5d35ccb00000000, 0x0ba1c84d00000000,
+    0xae72948600000000, 0x1642919b00000000, 0xb391cd5000000000,
+    0x1de359d600000000, 0xb830051d00000000, 0x6d8253ec00000000,
+    0xc8510f2700000000, 0x66239ba100000000, 0xc3f0c76a00000000,
+    0x7bc0c27700000000, 0xde139ebc00000000, 0x70610a3a00000000,
+    0xd5b256f100000000, 0x9b02d60300000000, 0x3ed18ac800000000,
+    0x90a31e4e00000000, 0x3570428500000000, 0x8d40479800000000,
+    0x28931b5300000000, 0x86e18fd500000000, 0x2332d31e00000000,
+    0xf68085ef00000000, 0x5353d92400000000, 0xfd214da200000000,
+    0x58f2116900000000, 0xe0c2147400000000, 0x451148bf00000000,
+    0xeb63dc3900000000, 0x4eb080f200000000, 0x3605ac0700000000,
+    0x93d6f0cc00000000, 0x3da4644a00000000, 0x9877388100000000,
+    0x20473d9c00000000, 0x8594615700000000, 0x2be6f5d100000000,
+    0x8e35a91a00000000, 0x5b87ffeb00000000, 0xfe54a32000000000,
+    0x502637a600000000, 0xf5f56b6d00000000, 0x4dc56e7000000000,
+    0xe81632bb00000000, 0x4664a63d00000000, 0xe3b7faf600000000,
+    0xad077a0400000000, 0x08d426cf00000000, 0xa6a6b24900000000,
+    0x0375ee8200000000, 0xbb45eb9f00000000, 0x1e96b75400000000,
+    0xb0e423d200000000, 0x15377f1900000000, 0xc08529e800000000,
+    0x6556752300000000, 0xcb24e1a500000000, 0x6ef7bd6e00000000,
+    0xd6c7b87300000000, 0x7314e4b800000000, 0xdd66703e00000000,
+    0x78b52cf500000000, 0x6c0a580f00000000, 0xc9d904c400000000,
+    0x67ab904200000000, 0xc278cc8900000000, 0x7a48c99400000000,
+    0xdf9b955f00000000, 0x71e901d900000000, 0xd43a5d1200000000,
+    0x01880be300000000, 0xa45b572800000000, 0x0a29c3ae00000000,
+    0xaffa9f6500000000, 0x17ca9a7800000000, 0xb219c6b300000000,
+    0x1c6b523500000000, 0xb9b80efe00000000, 0xf7088e0c00000000,
+    0x52dbd2c700000000, 0xfca9464100000000, 0x597a1a8a00000000,
+    0xe14a1f9700000000, 0x4499435c00000000, 0xeaebd7da00000000,
+    0x4f388b1100000000, 0x9a8adde000000000, 0x3f59812b00000000,
+    0x912b15ad00000000, 0x34f8496600000000, 0x8cc84c7b00000000,
+    0x291b10b000000000, 0x8769843600000000, 0x22bad8fd00000000,
+    0x5a0ff40800000000, 0xffdca8c300000000, 0x51ae3c4500000000,
+    0xf47d608e00000000, 0x4c4d659300000000, 0xe99e395800000000,
+    0x47ecadde00000000, 0xe23ff11500000000, 0x378da7e400000000,
+    0x925efb2f00000000, 0x3c2c6fa900000000, 0x99ff336200000000,
+    0x21cf367f00000000, 0x841c6ab400000000, 0x2a6efe3200000000,
+    0x8fbda2f900000000, 0xc10d220b00000000, 0x64de7ec000000000,
+    0xcaacea4600000000, 0x6f7fb68d00000000, 0xd74fb39000000000,
+    0x729cef5b00000000, 0xdcee7bdd00000000, 0x793d271600000000,
+    0xac8f71e700000000, 0x095c2d2c00000000, 0xa72eb9aa00000000,
+    0x02fde56100000000, 0xbacde07c00000000, 0x1f1ebcb700000000,
+    0xb16c283100000000, 0x14bf74fa00000000, 0xd814b01e00000000,
+    0x7dc7ecd500000000, 0xd3b5785300000000, 0x7666249800000000,
+    0xce56218500000000, 0x6b857d4e00000000, 0xc5f7e9c800000000,
+    0x6024b50300000000, 0xb596e3f200000000, 0x1045bf3900000000,
+    0xbe372bbf00000000, 0x1be4777400000000, 0xa3d4726900000000,
+    0x06072ea200000000, 0xa875ba2400000000, 0x0da6e6ef00000000,
+    0x4316661d00000000, 0xe6c53ad600000000, 0x48b7ae5000000000,
+    0xed64f29b00000000, 0x5554f78600000000, 0xf087ab4d00000000,
+    0x5ef53fcb00000000, 0xfb26630000000000, 0x2e9435f100000000,
+    0x8b47693a00000000, 0x2535fdbc00000000, 0x80e6a17700000000,
+    0x38d6a46a00000000, 0x9d05f8a100000000, 0x33776c2700000000,
+    0x96a430ec00000000, 0xee111c1900000000, 0x4bc240d200000000,
+    0xe5b0d45400000000, 0x4063889f00000000, 0xf8538d8200000000,
+    0x5d80d14900000000, 0xf3f245cf00000000, 0x5621190400000000,
+    0x83934ff500000000, 0x2640133e00000000, 0x883287b800000000,
+    0x2de1db7300000000, 0x95d1de6e00000000, 0x300282a500000000,
+    0x9e70162300000000, 0x3ba34ae800000000, 0x7513ca1a00000000,
+    0xd0c096d100000000, 0x7eb2025700000000, 0xdb615e9c00000000,
+    0x63515b8100000000, 0xc682074a00000000, 0x68f093cc00000000,
+    0xcd23cf0700000000, 0x189199f600000000, 0xbd42c53d00000000,
+    0x133051bb00000000, 0xb6e30d7000000000, 0x0ed3086d00000000,
+    0xab0054a600000000, 0x0572c02000000000, 0xa0a19ceb00000000,
+    0xb41ee81100000000, 0x11cdb4da00000000, 0xbfbf205c00000000,
+    0x1a6c7c9700000000, 0xa25c798a00000000, 0x078f254100000000,
+    0xa9fdb1c700000000, 0x0c2eed0c00000000, 0xd99cbbfd00000000,
+    0x7c4fe73600000000, 0xd23d73b000000000, 0x77ee2f7b00000000,
+    0xcfde2a6600000000, 0x6a0d76ad00000000, 0xc47fe22b00000000,
+    0x61acbee000000000, 0x2f1c3e1200000000, 0x8acf62d900000000,
+    0x24bdf65f00000000, 0x816eaa9400000000, 0x395eaf8900000000,
+    0x9c8df34200000000, 0x32ff67c400000000, 0x972c3b0f00000000,
+    0x429e6dfe00000000, 0xe74d313500000000, 0x493fa5b300000000,
+    0xececf97800000000, 0x54dcfc6500000000, 0xf10fa0ae00000000,
+    0x5f7d342800000000, 0xfaae68e300000000, 0x821b441600000000,
+    0x27c818dd00000000, 0x89ba8c5b00000000, 0x2c69d09000000000,
+    0x9459d58d00000000, 0x318a894600000000, 0x9ff81dc000000000,
+    0x3a2b410b00000000, 0xef9917fa00000000, 0x4a4a4b3100000000,
+    0xe438dfb700000000, 0x41eb837c00000000, 0xf9db866100000000,
+    0x5c08daaa00000000, 0xf27a4e2c00000000, 0x57a912e700000000,
+    0x1919921500000000, 0xbccacede00000000, 0x12b85a5800000000,
+    0xb76b069300000000, 0x0f5b038e00000000, 0xaa885f4500000000,
+    0x04facbc300000000, 0xa129970800000000, 0x749bc1f900000000,
+    0xd1489d3200000000, 0x7f3a09b400000000, 0xdae9557f00000000,
+    0x62d9506200000000, 0xc70a0ca900000000, 0x6978982f00000000,
+    0xccabc4e400000000},
+   {0x0000000000000000, 0xb40b77a600000000, 0x29119f9700000000,
+    0x9d1ae83100000000, 0x13244ff400000000, 0xa72f385200000000,
+    0x3a35d06300000000, 0x8e3ea7c500000000, 0x674eef3300000000,
+    0xd345989500000000, 0x4e5f70a400000000, 0xfa54070200000000,
+    0x746aa0c700000000, 0xc061d76100000000, 0x5d7b3f5000000000,
+    0xe97048f600000000, 0xce9cde6700000000, 0x7a97a9c100000000,
+    0xe78d41f000000000, 0x5386365600000000, 0xddb8919300000000,
+    0x69b3e63500000000, 0xf4a90e0400000000, 0x40a279a200000000,
+    0xa9d2315400000000, 0x1dd946f200000000, 0x80c3aec300000000,
+    0x34c8d96500000000, 0xbaf67ea000000000, 0x0efd090600000000,
+    0x93e7e13700000000, 0x27ec969100000000, 0x9c39bdcf00000000,
+    0x2832ca6900000000, 0xb528225800000000, 0x012355fe00000000,
+    0x8f1df23b00000000, 0x3b16859d00000000, 0xa60c6dac00000000,
+    0x12071a0a00000000, 0xfb7752fc00000000, 0x4f7c255a00000000,
+    0xd266cd6b00000000, 0x666dbacd00000000, 0xe8531d0800000000,
+    0x5c586aae00000000, 0xc142829f00000000, 0x7549f53900000000,
+    0x52a563a800000000, 0xe6ae140e00000000, 0x7bb4fc3f00000000,
+    0xcfbf8b9900000000, 0x41812c5c00000000, 0xf58a5bfa00000000,
+    0x6890b3cb00000000, 0xdc9bc46d00000000, 0x35eb8c9b00000000,
+    0x81e0fb3d00000000, 0x1cfa130c00000000, 0xa8f164aa00000000,
+    0x26cfc36f00000000, 0x92c4b4c900000000, 0x0fde5cf800000000,
+    0xbbd52b5e00000000, 0x79750b4400000000, 0xcd7e7ce200000000,
+    0x506494d300000000, 0xe46fe37500000000, 0x6a5144b000000000,
+    0xde5a331600000000, 0x4340db2700000000, 0xf74bac8100000000,
+    0x1e3be47700000000, 0xaa3093d100000000, 0x372a7be000000000,
+    0x83210c4600000000, 0x0d1fab8300000000, 0xb914dc2500000000,
+    0x240e341400000000, 0x900543b200000000, 0xb7e9d52300000000,
+    0x03e2a28500000000, 0x9ef84ab400000000, 0x2af33d1200000000,
+    0xa4cd9ad700000000, 0x10c6ed7100000000, 0x8ddc054000000000,
+    0x39d772e600000000, 0xd0a73a1000000000, 0x64ac4db600000000,
+    0xf9b6a58700000000, 0x4dbdd22100000000, 0xc38375e400000000,
+    0x7788024200000000, 0xea92ea7300000000, 0x5e999dd500000000,
+    0xe54cb68b00000000, 0x5147c12d00000000, 0xcc5d291c00000000,
+    0x78565eba00000000, 0xf668f97f00000000, 0x42638ed900000000,
+    0xdf7966e800000000, 0x6b72114e00000000, 0x820259b800000000,
+    0x36092e1e00000000, 0xab13c62f00000000, 0x1f18b18900000000,
+    0x9126164c00000000, 0x252d61ea00000000, 0xb83789db00000000,
+    0x0c3cfe7d00000000, 0x2bd068ec00000000, 0x9fdb1f4a00000000,
+    0x02c1f77b00000000, 0xb6ca80dd00000000, 0x38f4271800000000,
+    0x8cff50be00000000, 0x11e5b88f00000000, 0xa5eecf2900000000,
+    0x4c9e87df00000000, 0xf895f07900000000, 0x658f184800000000,
+    0xd1846fee00000000, 0x5fbac82b00000000, 0xebb1bf8d00000000,
+    0x76ab57bc00000000, 0xc2a0201a00000000, 0xf2ea168800000000,
+    0x46e1612e00000000, 0xdbfb891f00000000, 0x6ff0feb900000000,
+    0xe1ce597c00000000, 0x55c52eda00000000, 0xc8dfc6eb00000000,
+    0x7cd4b14d00000000, 0x95a4f9bb00000000, 0x21af8e1d00000000,
+    0xbcb5662c00000000, 0x08be118a00000000, 0x8680b64f00000000,
+    0x328bc1e900000000, 0xaf9129d800000000, 0x1b9a5e7e00000000,
+    0x3c76c8ef00000000, 0x887dbf4900000000, 0x1567577800000000,
+    0xa16c20de00000000, 0x2f52871b00000000, 0x9b59f0bd00000000,
+    0x0643188c00000000, 0xb2486f2a00000000, 0x5b3827dc00000000,
+    0xef33507a00000000, 0x7229b84b00000000, 0xc622cfed00000000,
+    0x481c682800000000, 0xfc171f8e00000000, 0x610df7bf00000000,
+    0xd506801900000000, 0x6ed3ab4700000000, 0xdad8dce100000000,
+    0x47c234d000000000, 0xf3c9437600000000, 0x7df7e4b300000000,
+    0xc9fc931500000000, 0x54e67b2400000000, 0xe0ed0c8200000000,
+    0x099d447400000000, 0xbd9633d200000000, 0x208cdbe300000000,
+    0x9487ac4500000000, 0x1ab90b8000000000, 0xaeb27c2600000000,
+    0x33a8941700000000, 0x87a3e3b100000000, 0xa04f752000000000,
+    0x1444028600000000, 0x895eeab700000000, 0x3d559d1100000000,
+    0xb36b3ad400000000, 0x07604d7200000000, 0x9a7aa54300000000,
+    0x2e71d2e500000000, 0xc7019a1300000000, 0x730aedb500000000,
+    0xee10058400000000, 0x5a1b722200000000, 0xd425d5e700000000,
+    0x602ea24100000000, 0xfd344a7000000000, 0x493f3dd600000000,
+    0x8b9f1dcc00000000, 0x3f946a6a00000000, 0xa28e825b00000000,
+    0x1685f5fd00000000, 0x98bb523800000000, 0x2cb0259e00000000,
+    0xb1aacdaf00000000, 0x05a1ba0900000000, 0xecd1f2ff00000000,
+    0x58da855900000000, 0xc5c06d6800000000, 0x71cb1ace00000000,
+    0xfff5bd0b00000000, 0x4bfecaad00000000, 0xd6e4229c00000000,
+    0x62ef553a00000000, 0x4503c3ab00000000, 0xf108b40d00000000,
+    0x6c125c3c00000000, 0xd8192b9a00000000, 0x56278c5f00000000,
+    0xe22cfbf900000000, 0x7f3613c800000000, 0xcb3d646e00000000,
+    0x224d2c9800000000, 0x96465b3e00000000, 0x0b5cb30f00000000,
+    0xbf57c4a900000000, 0x3169636c00000000, 0x856214ca00000000,
+    0x1878fcfb00000000, 0xac738b5d00000000, 0x17a6a00300000000,
+    0xa3add7a500000000, 0x3eb73f9400000000, 0x8abc483200000000,
+    0x0482eff700000000, 0xb089985100000000, 0x2d93706000000000,
+    0x999807c600000000, 0x70e84f3000000000, 0xc4e3389600000000,
+    0x59f9d0a700000000, 0xedf2a70100000000, 0x63cc00c400000000,
+    0xd7c7776200000000, 0x4add9f5300000000, 0xfed6e8f500000000,
+    0xd93a7e6400000000, 0x6d3109c200000000, 0xf02be1f300000000,
+    0x4420965500000000, 0xca1e319000000000, 0x7e15463600000000,
+    0xe30fae0700000000, 0x5704d9a100000000, 0xbe74915700000000,
+    0x0a7fe6f100000000, 0x97650ec000000000, 0x236e796600000000,
+    0xad50dea300000000, 0x195ba90500000000, 0x8441413400000000,
+    0x304a369200000000},
+   {0x0000000000000000, 0x9e00aacc00000000, 0x7d07254200000000,
+    0xe3078f8e00000000, 0xfa0e4a8400000000, 0x640ee04800000000,
+    0x87096fc600000000, 0x1909c50a00000000, 0xb51be5d300000000,
+    0x2b1b4f1f00000000, 0xc81cc09100000000, 0x561c6a5d00000000,
+    0x4f15af5700000000, 0xd115059b00000000, 0x32128a1500000000,
+    0xac1220d900000000, 0x2b31bb7c00000000, 0xb53111b000000000,
+    0x56369e3e00000000, 0xc83634f200000000, 0xd13ff1f800000000,
+    0x4f3f5b3400000000, 0xac38d4ba00000000, 0x32387e7600000000,
+    0x9e2a5eaf00000000, 0x002af46300000000, 0xe32d7bed00000000,
+    0x7d2dd12100000000, 0x6424142b00000000, 0xfa24bee700000000,
+    0x1923316900000000, 0x87239ba500000000, 0x566276f900000000,
+    0xc862dc3500000000, 0x2b6553bb00000000, 0xb565f97700000000,
+    0xac6c3c7d00000000, 0x326c96b100000000, 0xd16b193f00000000,
+    0x4f6bb3f300000000, 0xe379932a00000000, 0x7d7939e600000000,
+    0x9e7eb66800000000, 0x007e1ca400000000, 0x1977d9ae00000000,
+    0x8777736200000000, 0x6470fcec00000000, 0xfa70562000000000,
+    0x7d53cd8500000000, 0xe353674900000000, 0x0054e8c700000000,
+    0x9e54420b00000000, 0x875d870100000000, 0x195d2dcd00000000,
+    0xfa5aa24300000000, 0x645a088f00000000, 0xc848285600000000,
+    0x5648829a00000000, 0xb54f0d1400000000, 0x2b4fa7d800000000,
+    0x324662d200000000, 0xac46c81e00000000, 0x4f41479000000000,
+    0xd141ed5c00000000, 0xedc29d2900000000, 0x73c237e500000000,
+    0x90c5b86b00000000, 0x0ec512a700000000, 0x17ccd7ad00000000,
+    0x89cc7d6100000000, 0x6acbf2ef00000000, 0xf4cb582300000000,
+    0x58d978fa00000000, 0xc6d9d23600000000, 0x25de5db800000000,
+    0xbbdef77400000000, 0xa2d7327e00000000, 0x3cd798b200000000,
+    0xdfd0173c00000000, 0x41d0bdf000000000, 0xc6f3265500000000,
+    0x58f38c9900000000, 0xbbf4031700000000, 0x25f4a9db00000000,
+    0x3cfd6cd100000000, 0xa2fdc61d00000000, 0x41fa499300000000,
+    0xdffae35f00000000, 0x73e8c38600000000, 0xede8694a00000000,
+    0x0eefe6c400000000, 0x90ef4c0800000000, 0x89e6890200000000,
+    0x17e623ce00000000, 0xf4e1ac4000000000, 0x6ae1068c00000000,
+    0xbba0ebd000000000, 0x25a0411c00000000, 0xc6a7ce9200000000,
+    0x58a7645e00000000, 0x41aea15400000000, 0xdfae0b9800000000,
+    0x3ca9841600000000, 0xa2a92eda00000000, 0x0ebb0e0300000000,
+    0x90bba4cf00000000, 0x73bc2b4100000000, 0xedbc818d00000000,
+    0xf4b5448700000000, 0x6ab5ee4b00000000, 0x89b261c500000000,
+    0x17b2cb0900000000, 0x909150ac00000000, 0x0e91fa6000000000,
+    0xed9675ee00000000, 0x7396df2200000000, 0x6a9f1a2800000000,
+    0xf49fb0e400000000, 0x17983f6a00000000, 0x899895a600000000,
+    0x258ab57f00000000, 0xbb8a1fb300000000, 0x588d903d00000000,
+    0xc68d3af100000000, 0xdf84fffb00000000, 0x4184553700000000,
+    0xa283dab900000000, 0x3c83707500000000, 0xda853b5300000000,
+    0x4485919f00000000, 0xa7821e1100000000, 0x3982b4dd00000000,
+    0x208b71d700000000, 0xbe8bdb1b00000000, 0x5d8c549500000000,
+    0xc38cfe5900000000, 0x6f9ede8000000000, 0xf19e744c00000000,
+    0x1299fbc200000000, 0x8c99510e00000000, 0x9590940400000000,
+    0x0b903ec800000000, 0xe897b14600000000, 0x76971b8a00000000,
+    0xf1b4802f00000000, 0x6fb42ae300000000, 0x8cb3a56d00000000,
+    0x12b30fa100000000, 0x0bbacaab00000000, 0x95ba606700000000,
+    0x76bdefe900000000, 0xe8bd452500000000, 0x44af65fc00000000,
+    0xdaafcf3000000000, 0x39a840be00000000, 0xa7a8ea7200000000,
+    0xbea12f7800000000, 0x20a185b400000000, 0xc3a60a3a00000000,
+    0x5da6a0f600000000, 0x8ce74daa00000000, 0x12e7e76600000000,
+    0xf1e068e800000000, 0x6fe0c22400000000, 0x76e9072e00000000,
+    0xe8e9ade200000000, 0x0bee226c00000000, 0x95ee88a000000000,
+    0x39fca87900000000, 0xa7fc02b500000000, 0x44fb8d3b00000000,
+    0xdafb27f700000000, 0xc3f2e2fd00000000, 0x5df2483100000000,
+    0xbef5c7bf00000000, 0x20f56d7300000000, 0xa7d6f6d600000000,
+    0x39d65c1a00000000, 0xdad1d39400000000, 0x44d1795800000000,
+    0x5dd8bc5200000000, 0xc3d8169e00000000, 0x20df991000000000,
+    0xbedf33dc00000000, 0x12cd130500000000, 0x8ccdb9c900000000,
+    0x6fca364700000000, 0xf1ca9c8b00000000, 0xe8c3598100000000,
+    0x76c3f34d00000000, 0x95c47cc300000000, 0x0bc4d60f00000000,
+    0x3747a67a00000000, 0xa9470cb600000000, 0x4a40833800000000,
+    0xd44029f400000000, 0xcd49ecfe00000000, 0x5349463200000000,
+    0xb04ec9bc00000000, 0x2e4e637000000000, 0x825c43a900000000,
+    0x1c5ce96500000000, 0xff5b66eb00000000, 0x615bcc2700000000,
+    0x7852092d00000000, 0xe652a3e100000000, 0x05552c6f00000000,
+    0x9b5586a300000000, 0x1c761d0600000000, 0x8276b7ca00000000,
+    0x6171384400000000, 0xff71928800000000, 0xe678578200000000,
+    0x7878fd4e00000000, 0x9b7f72c000000000, 0x057fd80c00000000,
+    0xa96df8d500000000, 0x376d521900000000, 0xd46add9700000000,
+    0x4a6a775b00000000, 0x5363b25100000000, 0xcd63189d00000000,
+    0x2e64971300000000, 0xb0643ddf00000000, 0x6125d08300000000,
+    0xff257a4f00000000, 0x1c22f5c100000000, 0x82225f0d00000000,
+    0x9b2b9a0700000000, 0x052b30cb00000000, 0xe62cbf4500000000,
+    0x782c158900000000, 0xd43e355000000000, 0x4a3e9f9c00000000,
+    0xa939101200000000, 0x3739bade00000000, 0x2e307fd400000000,
+    0xb030d51800000000, 0x53375a9600000000, 0xcd37f05a00000000,
+    0x4a146bff00000000, 0xd414c13300000000, 0x37134ebd00000000,
+    0xa913e47100000000, 0xb01a217b00000000, 0x2e1a8bb700000000,
+    0xcd1d043900000000, 0x531daef500000000, 0xff0f8e2c00000000,
+    0x610f24e000000000, 0x8208ab6e00000000, 0x1c0801a200000000,
+    0x0501c4a800000000, 0x9b016e6400000000, 0x7806e1ea00000000,
+    0xe6064b2600000000}};
+
+#else /* W == 4 */
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0xb8bc6765, 0xaa09c88b, 0x12b5afee, 0x8f629757,
+    0x37def032, 0x256b5fdc, 0x9dd738b9, 0xc5b428ef, 0x7d084f8a,
+    0x6fbde064, 0xd7018701, 0x4ad6bfb8, 0xf26ad8dd, 0xe0df7733,
+    0x58631056, 0x5019579f, 0xe8a530fa, 0xfa109f14, 0x42acf871,
+    0xdf7bc0c8, 0x67c7a7ad, 0x75720843, 0xcdce6f26, 0x95ad7f70,
+    0x2d111815, 0x3fa4b7fb, 0x8718d09e, 0x1acfe827, 0xa2738f42,
+    0xb0c620ac, 0x087a47c9, 0xa032af3e, 0x188ec85b, 0x0a3b67b5,
+    0xb28700d0, 0x2f503869, 0x97ec5f0c, 0x8559f0e2, 0x3de59787,
+    0x658687d1, 0xdd3ae0b4, 0xcf8f4f5a, 0x7733283f, 0xeae41086,
+    0x525877e3, 0x40edd80d, 0xf851bf68, 0xf02bf8a1, 0x48979fc4,
+    0x5a22302a, 0xe29e574f, 0x7f496ff6, 0xc7f50893, 0xd540a77d,
+    0x6dfcc018, 0x359fd04e, 0x8d23b72b, 0x9f9618c5, 0x272a7fa0,
+    0xbafd4719, 0x0241207c, 0x10f48f92, 0xa848e8f7, 0x9b14583d,
+    0x23a83f58, 0x311d90b6, 0x89a1f7d3, 0x1476cf6a, 0xaccaa80f,
+    0xbe7f07e1, 0x06c36084, 0x5ea070d2, 0xe61c17b7, 0xf4a9b859,
+    0x4c15df3c, 0xd1c2e785, 0x697e80e0, 0x7bcb2f0e, 0xc377486b,
+    0xcb0d0fa2, 0x73b168c7, 0x6104c729, 0xd9b8a04c, 0x446f98f5,
+    0xfcd3ff90, 0xee66507e, 0x56da371b, 0x0eb9274d, 0xb6054028,
+    0xa4b0efc6, 0x1c0c88a3, 0x81dbb01a, 0x3967d77f, 0x2bd27891,
+    0x936e1ff4, 0x3b26f703, 0x839a9066, 0x912f3f88, 0x299358ed,
+    0xb4446054, 0x0cf80731, 0x1e4da8df, 0xa6f1cfba, 0xfe92dfec,
+    0x462eb889, 0x549b1767, 0xec277002, 0x71f048bb, 0xc94c2fde,
+    0xdbf98030, 0x6345e755, 0x6b3fa09c, 0xd383c7f9, 0xc1366817,
+    0x798a0f72, 0xe45d37cb, 0x5ce150ae, 0x4e54ff40, 0xf6e89825,
+    0xae8b8873, 0x1637ef16, 0x048240f8, 0xbc3e279d, 0x21e91f24,
+    0x99557841, 0x8be0d7af, 0x335cb0ca, 0xed59b63b, 0x55e5d15e,
+    0x47507eb0, 0xffec19d5, 0x623b216c, 0xda874609, 0xc832e9e7,
+    0x708e8e82, 0x28ed9ed4, 0x9051f9b1, 0x82e4565f, 0x3a58313a,
+    0xa78f0983, 0x1f336ee6, 0x0d86c108, 0xb53aa66d, 0xbd40e1a4,
+    0x05fc86c1, 0x1749292f, 0xaff54e4a, 0x322276f3, 0x8a9e1196,
+    0x982bbe78, 0x2097d91d, 0x78f4c94b, 0xc048ae2e, 0xd2fd01c0,
+    0x6a4166a5, 0xf7965e1c, 0x4f2a3979, 0x5d9f9697, 0xe523f1f2,
+    0x4d6b1905, 0xf5d77e60, 0xe762d18e, 0x5fdeb6eb, 0xc2098e52,
+    0x7ab5e937, 0x680046d9, 0xd0bc21bc, 0x88df31ea, 0x3063568f,
+    0x22d6f961, 0x9a6a9e04, 0x07bda6bd, 0xbf01c1d8, 0xadb46e36,
+    0x15080953, 0x1d724e9a, 0xa5ce29ff, 0xb77b8611, 0x0fc7e174,
+    0x9210d9cd, 0x2aacbea8, 0x38191146, 0x80a57623, 0xd8c66675,
+    0x607a0110, 0x72cfaefe, 0xca73c99b, 0x57a4f122, 0xef189647,
+    0xfdad39a9, 0x45115ecc, 0x764dee06, 0xcef18963, 0xdc44268d,
+    0x64f841e8, 0xf92f7951, 0x41931e34, 0x5326b1da, 0xeb9ad6bf,
+    0xb3f9c6e9, 0x0b45a18c, 0x19f00e62, 0xa14c6907, 0x3c9b51be,
+    0x842736db, 0x96929935, 0x2e2efe50, 0x2654b999, 0x9ee8defc,
+    0x8c5d7112, 0x34e11677, 0xa9362ece, 0x118a49ab, 0x033fe645,
+    0xbb838120, 0xe3e09176, 0x5b5cf613, 0x49e959fd, 0xf1553e98,
+    0x6c820621, 0xd43e6144, 0xc68bceaa, 0x7e37a9cf, 0xd67f4138,
+    0x6ec3265d, 0x7c7689b3, 0xc4caeed6, 0x591dd66f, 0xe1a1b10a,
+    0xf3141ee4, 0x4ba87981, 0x13cb69d7, 0xab770eb2, 0xb9c2a15c,
+    0x017ec639, 0x9ca9fe80, 0x241599e5, 0x36a0360b, 0x8e1c516e,
+    0x866616a7, 0x3eda71c2, 0x2c6fde2c, 0x94d3b949, 0x090481f0,
+    0xb1b8e695, 0xa30d497b, 0x1bb12e1e, 0x43d23e48, 0xfb6e592d,
+    0xe9dbf6c3, 0x516791a6, 0xccb0a91f, 0x740cce7a, 0x66b96194,
+    0xde0506f1},
+   {0x00000000, 0x01c26a37, 0x0384d46e, 0x0246be59, 0x0709a8dc,
+    0x06cbc2eb, 0x048d7cb2, 0x054f1685, 0x0e1351b8, 0x0fd13b8f,
+    0x0d9785d6, 0x0c55efe1, 0x091af964, 0x08d89353, 0x0a9e2d0a,
+    0x0b5c473d, 0x1c26a370, 0x1de4c947, 0x1fa2771e, 0x1e601d29,
+    0x1b2f0bac, 0x1aed619b, 0x18abdfc2, 0x1969b5f5, 0x1235f2c8,
+    0x13f798ff, 0x11b126a6, 0x10734c91, 0x153c5a14, 0x14fe3023,
+    0x16b88e7a, 0x177ae44d, 0x384d46e0, 0x398f2cd7, 0x3bc9928e,
+    0x3a0bf8b9, 0x3f44ee3c, 0x3e86840b, 0x3cc03a52, 0x3d025065,
+    0x365e1758, 0x379c7d6f, 0x35dac336, 0x3418a901, 0x3157bf84,
+    0x3095d5b3, 0x32d36bea, 0x331101dd, 0x246be590, 0x25a98fa7,
+    0x27ef31fe, 0x262d5bc9, 0x23624d4c, 0x22a0277b, 0x20e69922,
+    0x2124f315, 0x2a78b428, 0x2bbade1f, 0x29fc6046, 0x283e0a71,
+    0x2d711cf4, 0x2cb376c3, 0x2ef5c89a, 0x2f37a2ad, 0x709a8dc0,
+    0x7158e7f7, 0x731e59ae, 0x72dc3399, 0x7793251c, 0x76514f2b,
+    0x7417f172, 0x75d59b45, 0x7e89dc78, 0x7f4bb64f, 0x7d0d0816,
+    0x7ccf6221, 0x798074a4, 0x78421e93, 0x7a04a0ca, 0x7bc6cafd,
+    0x6cbc2eb0, 0x6d7e4487, 0x6f38fade, 0x6efa90e9, 0x6bb5866c,
+    0x6a77ec5b, 0x68315202, 0x69f33835, 0x62af7f08, 0x636d153f,
+    0x612bab66, 0x60e9c151, 0x65a6d7d4, 0x6464bde3, 0x662203ba,
+    0x67e0698d, 0x48d7cb20, 0x4915a117, 0x4b531f4e, 0x4a917579,
+    0x4fde63fc, 0x4e1c09cb, 0x4c5ab792, 0x4d98dda5, 0x46c49a98,
+    0x4706f0af, 0x45404ef6, 0x448224c1, 0x41cd3244, 0x400f5873,
+    0x4249e62a, 0x438b8c1d, 0x54f16850, 0x55330267, 0x5775bc3e,
+    0x56b7d609, 0x53f8c08c, 0x523aaabb, 0x507c14e2, 0x51be7ed5,
+    0x5ae239e8, 0x5b2053df, 0x5966ed86, 0x58a487b1, 0x5deb9134,
+    0x5c29fb03, 0x5e6f455a, 0x5fad2f6d, 0xe1351b80, 0xe0f771b7,
+    0xe2b1cfee, 0xe373a5d9, 0xe63cb35c, 0xe7fed96b, 0xe5b86732,
+    0xe47a0d05, 0xef264a38, 0xeee4200f, 0xeca29e56, 0xed60f461,
+    0xe82fe2e4, 0xe9ed88d3, 0xebab368a, 0xea695cbd, 0xfd13b8f0,
+    0xfcd1d2c7, 0xfe976c9e, 0xff5506a9, 0xfa1a102c, 0xfbd87a1b,
+    0xf99ec442, 0xf85cae75, 0xf300e948, 0xf2c2837f, 0xf0843d26,
+    0xf1465711, 0xf4094194, 0xf5cb2ba3, 0xf78d95fa, 0xf64fffcd,
+    0xd9785d60, 0xd8ba3757, 0xdafc890e, 0xdb3ee339, 0xde71f5bc,
+    0xdfb39f8b, 0xddf521d2, 0xdc374be5, 0xd76b0cd8, 0xd6a966ef,
+    0xd4efd8b6, 0xd52db281, 0xd062a404, 0xd1a0ce33, 0xd3e6706a,
+    0xd2241a5d, 0xc55efe10, 0xc49c9427, 0xc6da2a7e, 0xc7184049,
+    0xc25756cc, 0xc3953cfb, 0xc1d382a2, 0xc011e895, 0xcb4dafa8,
+    0xca8fc59f, 0xc8c97bc6, 0xc90b11f1, 0xcc440774, 0xcd866d43,
+    0xcfc0d31a, 0xce02b92d, 0x91af9640, 0x906dfc77, 0x922b422e,
+    0x93e92819, 0x96a63e9c, 0x976454ab, 0x9522eaf2, 0x94e080c5,
+    0x9fbcc7f8, 0x9e7eadcf, 0x9c381396, 0x9dfa79a1, 0x98b56f24,
+    0x99770513, 0x9b31bb4a, 0x9af3d17d, 0x8d893530, 0x8c4b5f07,
+    0x8e0de15e, 0x8fcf8b69, 0x8a809dec, 0x8b42f7db, 0x89044982,
+    0x88c623b5, 0x839a6488, 0x82580ebf, 0x801eb0e6, 0x81dcdad1,
+    0x8493cc54, 0x8551a663, 0x8717183a, 0x86d5720d, 0xa9e2d0a0,
+    0xa820ba97, 0xaa6604ce, 0xaba46ef9, 0xaeeb787c, 0xaf29124b,
+    0xad6fac12, 0xacadc625, 0xa7f18118, 0xa633eb2f, 0xa4755576,
+    0xa5b73f41, 0xa0f829c4, 0xa13a43f3, 0xa37cfdaa, 0xa2be979d,
+    0xb5c473d0, 0xb40619e7, 0xb640a7be, 0xb782cd89, 0xb2cddb0c,
+    0xb30fb13b, 0xb1490f62, 0xb08b6555, 0xbbd72268, 0xba15485f,
+    0xb853f606, 0xb9919c31, 0xbcde8ab4, 0xbd1ce083, 0xbf5a5eda,
+    0xbe9834ed},
+   {0x00000000, 0x191b3141, 0x32366282, 0x2b2d53c3, 0x646cc504,
+    0x7d77f445, 0x565aa786, 0x4f4196c7, 0xc8d98a08, 0xd1c2bb49,
+    0xfaefe88a, 0xe3f4d9cb, 0xacb54f0c, 0xb5ae7e4d, 0x9e832d8e,
+    0x87981ccf, 0x4ac21251, 0x53d92310, 0x78f470d3, 0x61ef4192,
+    0x2eaed755, 0x37b5e614, 0x1c98b5d7, 0x05838496, 0x821b9859,
+    0x9b00a918, 0xb02dfadb, 0xa936cb9a, 0xe6775d5d, 0xff6c6c1c,
+    0xd4413fdf, 0xcd5a0e9e, 0x958424a2, 0x8c9f15e3, 0xa7b24620,
+    0xbea97761, 0xf1e8e1a6, 0xe8f3d0e7, 0xc3de8324, 0xdac5b265,
+    0x5d5daeaa, 0x44469feb, 0x6f6bcc28, 0x7670fd69, 0x39316bae,
+    0x202a5aef, 0x0b07092c, 0x121c386d, 0xdf4636f3, 0xc65d07b2,
+    0xed705471, 0xf46b6530, 0xbb2af3f7, 0xa231c2b6, 0x891c9175,
+    0x9007a034, 0x179fbcfb, 0x0e848dba, 0x25a9de79, 0x3cb2ef38,
+    0x73f379ff, 0x6ae848be, 0x41c51b7d, 0x58de2a3c, 0xf0794f05,
+    0xe9627e44, 0xc24f2d87, 0xdb541cc6, 0x94158a01, 0x8d0ebb40,
+    0xa623e883, 0xbf38d9c2, 0x38a0c50d, 0x21bbf44c, 0x0a96a78f,
+    0x138d96ce, 0x5ccc0009, 0x45d73148, 0x6efa628b, 0x77e153ca,
+    0xbabb5d54, 0xa3a06c15, 0x888d3fd6, 0x91960e97, 0xded79850,
+    0xc7cca911, 0xece1fad2, 0xf5facb93, 0x7262d75c, 0x6b79e61d,
+    0x4054b5de, 0x594f849f, 0x160e1258, 0x0f152319, 0x243870da,
+    0x3d23419b, 0x65fd6ba7, 0x7ce65ae6, 0x57cb0925, 0x4ed03864,
+    0x0191aea3, 0x188a9fe2, 0x33a7cc21, 0x2abcfd60, 0xad24e1af,
+    0xb43fd0ee, 0x9f12832d, 0x8609b26c, 0xc94824ab, 0xd05315ea,
+    0xfb7e4629, 0xe2657768, 0x2f3f79f6, 0x362448b7, 0x1d091b74,
+    0x04122a35, 0x4b53bcf2, 0x52488db3, 0x7965de70, 0x607eef31,
+    0xe7e6f3fe, 0xfefdc2bf, 0xd5d0917c, 0xcccba03d, 0x838a36fa,
+    0x9a9107bb, 0xb1bc5478, 0xa8a76539, 0x3b83984b, 0x2298a90a,
+    0x09b5fac9, 0x10aecb88, 0x5fef5d4f, 0x46f46c0e, 0x6dd93fcd,
+    0x74c20e8c, 0xf35a1243, 0xea412302, 0xc16c70c1, 0xd8774180,
+    0x9736d747, 0x8e2de606, 0xa500b5c5, 0xbc1b8484, 0x71418a1a,
+    0x685abb5b, 0x4377e898, 0x5a6cd9d9, 0x152d4f1e, 0x0c367e5f,
+    0x271b2d9c, 0x3e001cdd, 0xb9980012, 0xa0833153, 0x8bae6290,
+    0x92b553d1, 0xddf4c516, 0xc4eff457, 0xefc2a794, 0xf6d996d5,
+    0xae07bce9, 0xb71c8da8, 0x9c31de6b, 0x852aef2a, 0xca6b79ed,
+    0xd37048ac, 0xf85d1b6f, 0xe1462a2e, 0x66de36e1, 0x7fc507a0,
+    0x54e85463, 0x4df36522, 0x02b2f3e5, 0x1ba9c2a4, 0x30849167,
+    0x299fa026, 0xe4c5aeb8, 0xfdde9ff9, 0xd6f3cc3a, 0xcfe8fd7b,
+    0x80a96bbc, 0x99b25afd, 0xb29f093e, 0xab84387f, 0x2c1c24b0,
+    0x350715f1, 0x1e2a4632, 0x07317773, 0x4870e1b4, 0x516bd0f5,
+    0x7a468336, 0x635db277, 0xcbfad74e, 0xd2e1e60f, 0xf9ccb5cc,
+    0xe0d7848d, 0xaf96124a, 0xb68d230b, 0x9da070c8, 0x84bb4189,
+    0x03235d46, 0x1a386c07, 0x31153fc4, 0x280e0e85, 0x674f9842,
+    0x7e54a903, 0x5579fac0, 0x4c62cb81, 0x8138c51f, 0x9823f45e,
+    0xb30ea79d, 0xaa1596dc, 0xe554001b, 0xfc4f315a, 0xd7626299,
+    0xce7953d8, 0x49e14f17, 0x50fa7e56, 0x7bd72d95, 0x62cc1cd4,
+    0x2d8d8a13, 0x3496bb52, 0x1fbbe891, 0x06a0d9d0, 0x5e7ef3ec,
+    0x4765c2ad, 0x6c48916e, 0x7553a02f, 0x3a1236e8, 0x230907a9,
+    0x0824546a, 0x113f652b, 0x96a779e4, 0x8fbc48a5, 0xa4911b66,
+    0xbd8a2a27, 0xf2cbbce0, 0xebd08da1, 0xc0fdde62, 0xd9e6ef23,
+    0x14bce1bd, 0x0da7d0fc, 0x268a833f, 0x3f91b27e, 0x70d024b9,
+    0x69cb15f8, 0x42e6463b, 0x5bfd777a, 0xdc656bb5, 0xc57e5af4,
+    0xee530937, 0xf7483876, 0xb809aeb1, 0xa1129ff0, 0x8a3fcc33,
+    0x9324fd72},
+   {0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419,
+    0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4,
+    0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07,
+    0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
+    0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856,
+    0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
+    0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4,
+    0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
+    0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3,
+    0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a,
+    0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599,
+    0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+    0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190,
+    0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f,
+    0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e,
+    0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
+    0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed,
+    0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
+    0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3,
+    0xfbd44c65, 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
+    0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a,
+    0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5,
+    0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010,
+    0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+    0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17,
+    0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6,
+    0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615,
+    0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
+    0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344,
+    0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
+    0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a,
+    0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
+    0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1,
+    0xa6bc5767, 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c,
+    0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef,
+    0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+    0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe,
+    0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31,
+    0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c,
+    0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
+    0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b,
+    0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
+    0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1,
+    0x18b74777, 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
+    0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278,
+    0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7,
+    0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66,
+    0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+    0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605,
+    0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8,
+    0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b,
+    0x2d02ef8d}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x00000000, 0x96300777, 0x2c610eee, 0xba510999, 0x19c46d07,
+    0x8ff46a70, 0x35a563e9, 0xa395649e, 0x3288db0e, 0xa4b8dc79,
+    0x1ee9d5e0, 0x88d9d297, 0x2b4cb609, 0xbd7cb17e, 0x072db8e7,
+    0x911dbf90, 0x6410b71d, 0xf220b06a, 0x4871b9f3, 0xde41be84,
+    0x7dd4da1a, 0xebe4dd6d, 0x51b5d4f4, 0xc785d383, 0x56986c13,
+    0xc0a86b64, 0x7af962fd, 0xecc9658a, 0x4f5c0114, 0xd96c0663,
+    0x633d0ffa, 0xf50d088d, 0xc8206e3b, 0x5e10694c, 0xe44160d5,
+    0x727167a2, 0xd1e4033c, 0x47d4044b, 0xfd850dd2, 0x6bb50aa5,
+    0xfaa8b535, 0x6c98b242, 0xd6c9bbdb, 0x40f9bcac, 0xe36cd832,
+    0x755cdf45, 0xcf0dd6dc, 0x593dd1ab, 0xac30d926, 0x3a00de51,
+    0x8051d7c8, 0x1661d0bf, 0xb5f4b421, 0x23c4b356, 0x9995bacf,
+    0x0fa5bdb8, 0x9eb80228, 0x0888055f, 0xb2d90cc6, 0x24e90bb1,
+    0x877c6f2f, 0x114c6858, 0xab1d61c1, 0x3d2d66b6, 0x9041dc76,
+    0x0671db01, 0xbc20d298, 0x2a10d5ef, 0x8985b171, 0x1fb5b606,
+    0xa5e4bf9f, 0x33d4b8e8, 0xa2c90778, 0x34f9000f, 0x8ea80996,
+    0x18980ee1, 0xbb0d6a7f, 0x2d3d6d08, 0x976c6491, 0x015c63e6,
+    0xf4516b6b, 0x62616c1c, 0xd8306585, 0x4e0062f2, 0xed95066c,
+    0x7ba5011b, 0xc1f40882, 0x57c40ff5, 0xc6d9b065, 0x50e9b712,
+    0xeab8be8b, 0x7c88b9fc, 0xdf1ddd62, 0x492dda15, 0xf37cd38c,
+    0x654cd4fb, 0x5861b24d, 0xce51b53a, 0x7400bca3, 0xe230bbd4,
+    0x41a5df4a, 0xd795d83d, 0x6dc4d1a4, 0xfbf4d6d3, 0x6ae96943,
+    0xfcd96e34, 0x468867ad, 0xd0b860da, 0x732d0444, 0xe51d0333,
+    0x5f4c0aaa, 0xc97c0ddd, 0x3c710550, 0xaa410227, 0x10100bbe,
+    0x86200cc9, 0x25b56857, 0xb3856f20, 0x09d466b9, 0x9fe461ce,
+    0x0ef9de5e, 0x98c9d929, 0x2298d0b0, 0xb4a8d7c7, 0x173db359,
+    0x810db42e, 0x3b5cbdb7, 0xad6cbac0, 0x2083b8ed, 0xb6b3bf9a,
+    0x0ce2b603, 0x9ad2b174, 0x3947d5ea, 0xaf77d29d, 0x1526db04,
+    0x8316dc73, 0x120b63e3, 0x843b6494, 0x3e6a6d0d, 0xa85a6a7a,
+    0x0bcf0ee4, 0x9dff0993, 0x27ae000a, 0xb19e077d, 0x44930ff0,
+    0xd2a30887, 0x68f2011e, 0xfec20669, 0x5d5762f7, 0xcb676580,
+    0x71366c19, 0xe7066b6e, 0x761bd4fe, 0xe02bd389, 0x5a7ada10,
+    0xcc4add67, 0x6fdfb9f9, 0xf9efbe8e, 0x43beb717, 0xd58eb060,
+    0xe8a3d6d6, 0x7e93d1a1, 0xc4c2d838, 0x52f2df4f, 0xf167bbd1,
+    0x6757bca6, 0xdd06b53f, 0x4b36b248, 0xda2b0dd8, 0x4c1b0aaf,
+    0xf64a0336, 0x607a0441, 0xc3ef60df, 0x55df67a8, 0xef8e6e31,
+    0x79be6946, 0x8cb361cb, 0x1a8366bc, 0xa0d26f25, 0x36e26852,
+    0x95770ccc, 0x03470bbb, 0xb9160222, 0x2f260555, 0xbe3bbac5,
+    0x280bbdb2, 0x925ab42b, 0x046ab35c, 0xa7ffd7c2, 0x31cfd0b5,
+    0x8b9ed92c, 0x1daede5b, 0xb0c2649b, 0x26f263ec, 0x9ca36a75,
+    0x0a936d02, 0xa906099c, 0x3f360eeb, 0x85670772, 0x13570005,
+    0x824abf95, 0x147ab8e2, 0xae2bb17b, 0x381bb60c, 0x9b8ed292,
+    0x0dbed5e5, 0xb7efdc7c, 0x21dfdb0b, 0xd4d2d386, 0x42e2d4f1,
+    0xf8b3dd68, 0x6e83da1f, 0xcd16be81, 0x5b26b9f6, 0xe177b06f,
+    0x7747b718, 0xe65a0888, 0x706a0fff, 0xca3b0666, 0x5c0b0111,
+    0xff9e658f, 0x69ae62f8, 0xd3ff6b61, 0x45cf6c16, 0x78e20aa0,
+    0xeed20dd7, 0x5483044e, 0xc2b30339, 0x612667a7, 0xf71660d0,
+    0x4d476949, 0xdb776e3e, 0x4a6ad1ae, 0xdc5ad6d9, 0x660bdf40,
+    0xf03bd837, 0x53aebca9, 0xc59ebbde, 0x7fcfb247, 0xe9ffb530,
+    0x1cf2bdbd, 0x8ac2baca, 0x3093b353, 0xa6a3b424, 0x0536d0ba,
+    0x9306d7cd, 0x2957de54, 0xbf67d923, 0x2e7a66b3, 0xb84a61c4,
+    0x021b685d, 0x942b6f2a, 0x37be0bb4, 0xa18e0cc3, 0x1bdf055a,
+    0x8def022d},
+   {0x00000000, 0x41311b19, 0x82623632, 0xc3532d2b, 0x04c56c64,
+    0x45f4777d, 0x86a75a56, 0xc796414f, 0x088ad9c8, 0x49bbc2d1,
+    0x8ae8effa, 0xcbd9f4e3, 0x0c4fb5ac, 0x4d7eaeb5, 0x8e2d839e,
+    0xcf1c9887, 0x5112c24a, 0x1023d953, 0xd370f478, 0x9241ef61,
+    0x55d7ae2e, 0x14e6b537, 0xd7b5981c, 0x96848305, 0x59981b82,
+    0x18a9009b, 0xdbfa2db0, 0x9acb36a9, 0x5d5d77e6, 0x1c6c6cff,
+    0xdf3f41d4, 0x9e0e5acd, 0xa2248495, 0xe3159f8c, 0x2046b2a7,
+    0x6177a9be, 0xa6e1e8f1, 0xe7d0f3e8, 0x2483dec3, 0x65b2c5da,
+    0xaaae5d5d, 0xeb9f4644, 0x28cc6b6f, 0x69fd7076, 0xae6b3139,
+    0xef5a2a20, 0x2c09070b, 0x6d381c12, 0xf33646df, 0xb2075dc6,
+    0x715470ed, 0x30656bf4, 0xf7f32abb, 0xb6c231a2, 0x75911c89,
+    0x34a00790, 0xfbbc9f17, 0xba8d840e, 0x79dea925, 0x38efb23c,
+    0xff79f373, 0xbe48e86a, 0x7d1bc541, 0x3c2ade58, 0x054f79f0,
+    0x447e62e9, 0x872d4fc2, 0xc61c54db, 0x018a1594, 0x40bb0e8d,
+    0x83e823a6, 0xc2d938bf, 0x0dc5a038, 0x4cf4bb21, 0x8fa7960a,
+    0xce968d13, 0x0900cc5c, 0x4831d745, 0x8b62fa6e, 0xca53e177,
+    0x545dbbba, 0x156ca0a3, 0xd63f8d88, 0x970e9691, 0x5098d7de,
+    0x11a9ccc7, 0xd2fae1ec, 0x93cbfaf5, 0x5cd76272, 0x1de6796b,
+    0xdeb55440, 0x9f844f59, 0x58120e16, 0x1923150f, 0xda703824,
+    0x9b41233d, 0xa76bfd65, 0xe65ae67c, 0x2509cb57, 0x6438d04e,
+    0xa3ae9101, 0xe29f8a18, 0x21cca733, 0x60fdbc2a, 0xafe124ad,
+    0xeed03fb4, 0x2d83129f, 0x6cb20986, 0xab2448c9, 0xea1553d0,
+    0x29467efb, 0x687765e2, 0xf6793f2f, 0xb7482436, 0x741b091d,
+    0x352a1204, 0xf2bc534b, 0xb38d4852, 0x70de6579, 0x31ef7e60,
+    0xfef3e6e7, 0xbfc2fdfe, 0x7c91d0d5, 0x3da0cbcc, 0xfa368a83,
+    0xbb07919a, 0x7854bcb1, 0x3965a7a8, 0x4b98833b, 0x0aa99822,
+    0xc9fab509, 0x88cbae10, 0x4f5def5f, 0x0e6cf446, 0xcd3fd96d,
+    0x8c0ec274, 0x43125af3, 0x022341ea, 0xc1706cc1, 0x804177d8,
+    0x47d73697, 0x06e62d8e, 0xc5b500a5, 0x84841bbc, 0x1a8a4171,
+    0x5bbb5a68, 0x98e87743, 0xd9d96c5a, 0x1e4f2d15, 0x5f7e360c,
+    0x9c2d1b27, 0xdd1c003e, 0x120098b9, 0x533183a0, 0x9062ae8b,
+    0xd153b592, 0x16c5f4dd, 0x57f4efc4, 0x94a7c2ef, 0xd596d9f6,
+    0xe9bc07ae, 0xa88d1cb7, 0x6bde319c, 0x2aef2a85, 0xed796bca,
+    0xac4870d3, 0x6f1b5df8, 0x2e2a46e1, 0xe136de66, 0xa007c57f,
+    0x6354e854, 0x2265f34d, 0xe5f3b202, 0xa4c2a91b, 0x67918430,
+    0x26a09f29, 0xb8aec5e4, 0xf99fdefd, 0x3accf3d6, 0x7bfde8cf,
+    0xbc6ba980, 0xfd5ab299, 0x3e099fb2, 0x7f3884ab, 0xb0241c2c,
+    0xf1150735, 0x32462a1e, 0x73773107, 0xb4e17048, 0xf5d06b51,
+    0x3683467a, 0x77b25d63, 0x4ed7facb, 0x0fe6e1d2, 0xccb5ccf9,
+    0x8d84d7e0, 0x4a1296af, 0x0b238db6, 0xc870a09d, 0x8941bb84,
+    0x465d2303, 0x076c381a, 0xc43f1531, 0x850e0e28, 0x42984f67,
+    0x03a9547e, 0xc0fa7955, 0x81cb624c, 0x1fc53881, 0x5ef42398,
+    0x9da70eb3, 0xdc9615aa, 0x1b0054e5, 0x5a314ffc, 0x996262d7,
+    0xd85379ce, 0x174fe149, 0x567efa50, 0x952dd77b, 0xd41ccc62,
+    0x138a8d2d, 0x52bb9634, 0x91e8bb1f, 0xd0d9a006, 0xecf37e5e,
+    0xadc26547, 0x6e91486c, 0x2fa05375, 0xe836123a, 0xa9070923,
+    0x6a542408, 0x2b653f11, 0xe479a796, 0xa548bc8f, 0x661b91a4,
+    0x272a8abd, 0xe0bccbf2, 0xa18dd0eb, 0x62defdc0, 0x23efe6d9,
+    0xbde1bc14, 0xfcd0a70d, 0x3f838a26, 0x7eb2913f, 0xb924d070,
+    0xf815cb69, 0x3b46e642, 0x7a77fd5b, 0xb56b65dc, 0xf45a7ec5,
+    0x370953ee, 0x763848f7, 0xb1ae09b8, 0xf09f12a1, 0x33cc3f8a,
+    0x72fd2493},
+   {0x00000000, 0x376ac201, 0x6ed48403, 0x59be4602, 0xdca80907,
+    0xebc2cb06, 0xb27c8d04, 0x85164f05, 0xb851130e, 0x8f3bd10f,
+    0xd685970d, 0xe1ef550c, 0x64f91a09, 0x5393d808, 0x0a2d9e0a,
+    0x3d475c0b, 0x70a3261c, 0x47c9e41d, 0x1e77a21f, 0x291d601e,
+    0xac0b2f1b, 0x9b61ed1a, 0xc2dfab18, 0xf5b56919, 0xc8f23512,
+    0xff98f713, 0xa626b111, 0x914c7310, 0x145a3c15, 0x2330fe14,
+    0x7a8eb816, 0x4de47a17, 0xe0464d38, 0xd72c8f39, 0x8e92c93b,
+    0xb9f80b3a, 0x3cee443f, 0x0b84863e, 0x523ac03c, 0x6550023d,
+    0x58175e36, 0x6f7d9c37, 0x36c3da35, 0x01a91834, 0x84bf5731,
+    0xb3d59530, 0xea6bd332, 0xdd011133, 0x90e56b24, 0xa78fa925,
+    0xfe31ef27, 0xc95b2d26, 0x4c4d6223, 0x7b27a022, 0x2299e620,
+    0x15f32421, 0x28b4782a, 0x1fdeba2b, 0x4660fc29, 0x710a3e28,
+    0xf41c712d, 0xc376b32c, 0x9ac8f52e, 0xada2372f, 0xc08d9a70,
+    0xf7e75871, 0xae591e73, 0x9933dc72, 0x1c259377, 0x2b4f5176,
+    0x72f11774, 0x459bd575, 0x78dc897e, 0x4fb64b7f, 0x16080d7d,
+    0x2162cf7c, 0xa4748079, 0x931e4278, 0xcaa0047a, 0xfdcac67b,
+    0xb02ebc6c, 0x87447e6d, 0xdefa386f, 0xe990fa6e, 0x6c86b56b,
+    0x5bec776a, 0x02523168, 0x3538f369, 0x087faf62, 0x3f156d63,
+    0x66ab2b61, 0x51c1e960, 0xd4d7a665, 0xe3bd6464, 0xba032266,
+    0x8d69e067, 0x20cbd748, 0x17a11549, 0x4e1f534b, 0x7975914a,
+    0xfc63de4f, 0xcb091c4e, 0x92b75a4c, 0xa5dd984d, 0x989ac446,
+    0xaff00647, 0xf64e4045, 0xc1248244, 0x4432cd41, 0x73580f40,
+    0x2ae64942, 0x1d8c8b43, 0x5068f154, 0x67023355, 0x3ebc7557,
+    0x09d6b756, 0x8cc0f853, 0xbbaa3a52, 0xe2147c50, 0xd57ebe51,
+    0xe839e25a, 0xdf53205b, 0x86ed6659, 0xb187a458, 0x3491eb5d,
+    0x03fb295c, 0x5a456f5e, 0x6d2fad5f, 0x801b35e1, 0xb771f7e0,
+    0xeecfb1e2, 0xd9a573e3, 0x5cb33ce6, 0x6bd9fee7, 0x3267b8e5,
+    0x050d7ae4, 0x384a26ef, 0x0f20e4ee, 0x569ea2ec, 0x61f460ed,
+    0xe4e22fe8, 0xd388ede9, 0x8a36abeb, 0xbd5c69ea, 0xf0b813fd,
+    0xc7d2d1fc, 0x9e6c97fe, 0xa90655ff, 0x2c101afa, 0x1b7ad8fb,
+    0x42c49ef9, 0x75ae5cf8, 0x48e900f3, 0x7f83c2f2, 0x263d84f0,
+    0x115746f1, 0x944109f4, 0xa32bcbf5, 0xfa958df7, 0xcdff4ff6,
+    0x605d78d9, 0x5737bad8, 0x0e89fcda, 0x39e33edb, 0xbcf571de,
+    0x8b9fb3df, 0xd221f5dd, 0xe54b37dc, 0xd80c6bd7, 0xef66a9d6,
+    0xb6d8efd4, 0x81b22dd5, 0x04a462d0, 0x33cea0d1, 0x6a70e6d3,
+    0x5d1a24d2, 0x10fe5ec5, 0x27949cc4, 0x7e2adac6, 0x494018c7,
+    0xcc5657c2, 0xfb3c95c3, 0xa282d3c1, 0x95e811c0, 0xa8af4dcb,
+    0x9fc58fca, 0xc67bc9c8, 0xf1110bc9, 0x740744cc, 0x436d86cd,
+    0x1ad3c0cf, 0x2db902ce, 0x4096af91, 0x77fc6d90, 0x2e422b92,
+    0x1928e993, 0x9c3ea696, 0xab546497, 0xf2ea2295, 0xc580e094,
+    0xf8c7bc9f, 0xcfad7e9e, 0x9613389c, 0xa179fa9d, 0x246fb598,
+    0x13057799, 0x4abb319b, 0x7dd1f39a, 0x3035898d, 0x075f4b8c,
+    0x5ee10d8e, 0x698bcf8f, 0xec9d808a, 0xdbf7428b, 0x82490489,
+    0xb523c688, 0x88649a83, 0xbf0e5882, 0xe6b01e80, 0xd1dadc81,
+    0x54cc9384, 0x63a65185, 0x3a181787, 0x0d72d586, 0xa0d0e2a9,
+    0x97ba20a8, 0xce0466aa, 0xf96ea4ab, 0x7c78ebae, 0x4b1229af,
+    0x12ac6fad, 0x25c6adac, 0x1881f1a7, 0x2feb33a6, 0x765575a4,
+    0x413fb7a5, 0xc429f8a0, 0xf3433aa1, 0xaafd7ca3, 0x9d97bea2,
+    0xd073c4b5, 0xe71906b4, 0xbea740b6, 0x89cd82b7, 0x0cdbcdb2,
+    0x3bb10fb3, 0x620f49b1, 0x55658bb0, 0x6822d7bb, 0x5f4815ba,
+    0x06f653b8, 0x319c91b9, 0xb48adebc, 0x83e01cbd, 0xda5e5abf,
+    0xed3498be},
+   {0x00000000, 0x6567bcb8, 0x8bc809aa, 0xeeafb512, 0x5797628f,
+    0x32f0de37, 0xdc5f6b25, 0xb938d79d, 0xef28b4c5, 0x8a4f087d,
+    0x64e0bd6f, 0x018701d7, 0xb8bfd64a, 0xddd86af2, 0x3377dfe0,
+    0x56106358, 0x9f571950, 0xfa30a5e8, 0x149f10fa, 0x71f8ac42,
+    0xc8c07bdf, 0xada7c767, 0x43087275, 0x266fcecd, 0x707fad95,
+    0x1518112d, 0xfbb7a43f, 0x9ed01887, 0x27e8cf1a, 0x428f73a2,
+    0xac20c6b0, 0xc9477a08, 0x3eaf32a0, 0x5bc88e18, 0xb5673b0a,
+    0xd00087b2, 0x6938502f, 0x0c5fec97, 0xe2f05985, 0x8797e53d,
+    0xd1878665, 0xb4e03add, 0x5a4f8fcf, 0x3f283377, 0x8610e4ea,
+    0xe3775852, 0x0dd8ed40, 0x68bf51f8, 0xa1f82bf0, 0xc49f9748,
+    0x2a30225a, 0x4f579ee2, 0xf66f497f, 0x9308f5c7, 0x7da740d5,
+    0x18c0fc6d, 0x4ed09f35, 0x2bb7238d, 0xc518969f, 0xa07f2a27,
+    0x1947fdba, 0x7c204102, 0x928ff410, 0xf7e848a8, 0x3d58149b,
+    0x583fa823, 0xb6901d31, 0xd3f7a189, 0x6acf7614, 0x0fa8caac,
+    0xe1077fbe, 0x8460c306, 0xd270a05e, 0xb7171ce6, 0x59b8a9f4,
+    0x3cdf154c, 0x85e7c2d1, 0xe0807e69, 0x0e2fcb7b, 0x6b4877c3,
+    0xa20f0dcb, 0xc768b173, 0x29c70461, 0x4ca0b8d9, 0xf5986f44,
+    0x90ffd3fc, 0x7e5066ee, 0x1b37da56, 0x4d27b90e, 0x284005b6,
+    0xc6efb0a4, 0xa3880c1c, 0x1ab0db81, 0x7fd76739, 0x9178d22b,
+    0xf41f6e93, 0x03f7263b, 0x66909a83, 0x883f2f91, 0xed589329,
+    0x546044b4, 0x3107f80c, 0xdfa84d1e, 0xbacff1a6, 0xecdf92fe,
+    0x89b82e46, 0x67179b54, 0x027027ec, 0xbb48f071, 0xde2f4cc9,
+    0x3080f9db, 0x55e74563, 0x9ca03f6b, 0xf9c783d3, 0x176836c1,
+    0x720f8a79, 0xcb375de4, 0xae50e15c, 0x40ff544e, 0x2598e8f6,
+    0x73888bae, 0x16ef3716, 0xf8408204, 0x9d273ebc, 0x241fe921,
+    0x41785599, 0xafd7e08b, 0xcab05c33, 0x3bb659ed, 0x5ed1e555,
+    0xb07e5047, 0xd519ecff, 0x6c213b62, 0x094687da, 0xe7e932c8,
+    0x828e8e70, 0xd49eed28, 0xb1f95190, 0x5f56e482, 0x3a31583a,
+    0x83098fa7, 0xe66e331f, 0x08c1860d, 0x6da63ab5, 0xa4e140bd,
+    0xc186fc05, 0x2f294917, 0x4a4ef5af, 0xf3762232, 0x96119e8a,
+    0x78be2b98, 0x1dd99720, 0x4bc9f478, 0x2eae48c0, 0xc001fdd2,
+    0xa566416a, 0x1c5e96f7, 0x79392a4f, 0x97969f5d, 0xf2f123e5,
+    0x05196b4d, 0x607ed7f5, 0x8ed162e7, 0xebb6de5f, 0x528e09c2,
+    0x37e9b57a, 0xd9460068, 0xbc21bcd0, 0xea31df88, 0x8f566330,
+    0x61f9d622, 0x049e6a9a, 0xbda6bd07, 0xd8c101bf, 0x366eb4ad,
+    0x53090815, 0x9a4e721d, 0xff29cea5, 0x11867bb7, 0x74e1c70f,
+    0xcdd91092, 0xa8beac2a, 0x46111938, 0x2376a580, 0x7566c6d8,
+    0x10017a60, 0xfeaecf72, 0x9bc973ca, 0x22f1a457, 0x479618ef,
+    0xa939adfd, 0xcc5e1145, 0x06ee4d76, 0x6389f1ce, 0x8d2644dc,
+    0xe841f864, 0x51792ff9, 0x341e9341, 0xdab12653, 0xbfd69aeb,
+    0xe9c6f9b3, 0x8ca1450b, 0x620ef019, 0x07694ca1, 0xbe519b3c,
+    0xdb362784, 0x35999296, 0x50fe2e2e, 0x99b95426, 0xfcdee89e,
+    0x12715d8c, 0x7716e134, 0xce2e36a9, 0xab498a11, 0x45e63f03,
+    0x208183bb, 0x7691e0e3, 0x13f65c5b, 0xfd59e949, 0x983e55f1,
+    0x2106826c, 0x44613ed4, 0xaace8bc6, 0xcfa9377e, 0x38417fd6,
+    0x5d26c36e, 0xb389767c, 0xd6eecac4, 0x6fd61d59, 0x0ab1a1e1,
+    0xe41e14f3, 0x8179a84b, 0xd769cb13, 0xb20e77ab, 0x5ca1c2b9,
+    0x39c67e01, 0x80fea99c, 0xe5991524, 0x0b36a036, 0x6e511c8e,
+    0xa7166686, 0xc271da3e, 0x2cde6f2c, 0x49b9d394, 0xf0810409,
+    0x95e6b8b1, 0x7b490da3, 0x1e2eb11b, 0x483ed243, 0x2d596efb,
+    0xc3f6dbe9, 0xa6916751, 0x1fa9b0cc, 0x7ace0c74, 0x9461b966,
+    0xf10605de}};
+
+#endif
+
+#endif
+
+#if N == 2
+
+#if W == 8
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0xae689191, 0x87a02563, 0x29c8b4f2, 0xd4314c87,
+    0x7a59dd16, 0x539169e4, 0xfdf9f875, 0x73139f4f, 0xdd7b0ede,
+    0xf4b3ba2c, 0x5adb2bbd, 0xa722d3c8, 0x094a4259, 0x2082f6ab,
+    0x8eea673a, 0xe6273e9e, 0x484faf0f, 0x61871bfd, 0xcfef8a6c,
+    0x32167219, 0x9c7ee388, 0xb5b6577a, 0x1bdec6eb, 0x9534a1d1,
+    0x3b5c3040, 0x129484b2, 0xbcfc1523, 0x4105ed56, 0xef6d7cc7,
+    0xc6a5c835, 0x68cd59a4, 0x173f7b7d, 0xb957eaec, 0x909f5e1e,
+    0x3ef7cf8f, 0xc30e37fa, 0x6d66a66b, 0x44ae1299, 0xeac68308,
+    0x642ce432, 0xca4475a3, 0xe38cc151, 0x4de450c0, 0xb01da8b5,
+    0x1e753924, 0x37bd8dd6, 0x99d51c47, 0xf11845e3, 0x5f70d472,
+    0x76b86080, 0xd8d0f111, 0x25290964, 0x8b4198f5, 0xa2892c07,
+    0x0ce1bd96, 0x820bdaac, 0x2c634b3d, 0x05abffcf, 0xabc36e5e,
+    0x563a962b, 0xf85207ba, 0xd19ab348, 0x7ff222d9, 0x2e7ef6fa,
+    0x8016676b, 0xa9ded399, 0x07b64208, 0xfa4fba7d, 0x54272bec,
+    0x7def9f1e, 0xd3870e8f, 0x5d6d69b5, 0xf305f824, 0xdacd4cd6,
+    0x74a5dd47, 0x895c2532, 0x2734b4a3, 0x0efc0051, 0xa09491c0,
+    0xc859c864, 0x663159f5, 0x4ff9ed07, 0xe1917c96, 0x1c6884e3,
+    0xb2001572, 0x9bc8a180, 0x35a03011, 0xbb4a572b, 0x1522c6ba,
+    0x3cea7248, 0x9282e3d9, 0x6f7b1bac, 0xc1138a3d, 0xe8db3ecf,
+    0x46b3af5e, 0x39418d87, 0x97291c16, 0xbee1a8e4, 0x10893975,
+    0xed70c100, 0x43185091, 0x6ad0e463, 0xc4b875f2, 0x4a5212c8,
+    0xe43a8359, 0xcdf237ab, 0x639aa63a, 0x9e635e4f, 0x300bcfde,
+    0x19c37b2c, 0xb7abeabd, 0xdf66b319, 0x710e2288, 0x58c6967a,
+    0xf6ae07eb, 0x0b57ff9e, 0xa53f6e0f, 0x8cf7dafd, 0x229f4b6c,
+    0xac752c56, 0x021dbdc7, 0x2bd50935, 0x85bd98a4, 0x784460d1,
+    0xd62cf140, 0xffe445b2, 0x518cd423, 0x5cfdedf4, 0xf2957c65,
+    0xdb5dc897, 0x75355906, 0x88cca173, 0x26a430e2, 0x0f6c8410,
+    0xa1041581, 0x2fee72bb, 0x8186e32a, 0xa84e57d8, 0x0626c649,
+    0xfbdf3e3c, 0x55b7afad, 0x7c7f1b5f, 0xd2178ace, 0xbadad36a,
+    0x14b242fb, 0x3d7af609, 0x93126798, 0x6eeb9fed, 0xc0830e7c,
+    0xe94bba8e, 0x47232b1f, 0xc9c94c25, 0x67a1ddb4, 0x4e696946,
+    0xe001f8d7, 0x1df800a2, 0xb3909133, 0x9a5825c1, 0x3430b450,
+    0x4bc29689, 0xe5aa0718, 0xcc62b3ea, 0x620a227b, 0x9ff3da0e,
+    0x319b4b9f, 0x1853ff6d, 0xb63b6efc, 0x38d109c6, 0x96b99857,
+    0xbf712ca5, 0x1119bd34, 0xece04541, 0x4288d4d0, 0x6b406022,
+    0xc528f1b3, 0xade5a817, 0x038d3986, 0x2a458d74, 0x842d1ce5,
+    0x79d4e490, 0xd7bc7501, 0xfe74c1f3, 0x501c5062, 0xdef63758,
+    0x709ea6c9, 0x5956123b, 0xf73e83aa, 0x0ac77bdf, 0xa4afea4e,
+    0x8d675ebc, 0x230fcf2d, 0x72831b0e, 0xdceb8a9f, 0xf5233e6d,
+    0x5b4baffc, 0xa6b25789, 0x08dac618, 0x211272ea, 0x8f7ae37b,
+    0x01908441, 0xaff815d0, 0x8630a122, 0x285830b3, 0xd5a1c8c6,
+    0x7bc95957, 0x5201eda5, 0xfc697c34, 0x94a42590, 0x3accb401,
+    0x130400f3, 0xbd6c9162, 0x40956917, 0xeefdf886, 0xc7354c74,
+    0x695ddde5, 0xe7b7badf, 0x49df2b4e, 0x60179fbc, 0xce7f0e2d,
+    0x3386f658, 0x9dee67c9, 0xb426d33b, 0x1a4e42aa, 0x65bc6073,
+    0xcbd4f1e2, 0xe21c4510, 0x4c74d481, 0xb18d2cf4, 0x1fe5bd65,
+    0x362d0997, 0x98459806, 0x16afff3c, 0xb8c76ead, 0x910fda5f,
+    0x3f674bce, 0xc29eb3bb, 0x6cf6222a, 0x453e96d8, 0xeb560749,
+    0x839b5eed, 0x2df3cf7c, 0x043b7b8e, 0xaa53ea1f, 0x57aa126a,
+    0xf9c283fb, 0xd00a3709, 0x7e62a698, 0xf088c1a2, 0x5ee05033,
+    0x7728e4c1, 0xd9407550, 0x24b98d25, 0x8ad11cb4, 0xa319a846,
+    0x0d7139d7},
+   {0x00000000, 0xb9fbdbe8, 0xa886b191, 0x117d6a79, 0x8a7c6563,
+    0x3387be8b, 0x22fad4f2, 0x9b010f1a, 0xcf89cc87, 0x7672176f,
+    0x670f7d16, 0xdef4a6fe, 0x45f5a9e4, 0xfc0e720c, 0xed731875,
+    0x5488c39d, 0x44629f4f, 0xfd9944a7, 0xece42ede, 0x551ff536,
+    0xce1efa2c, 0x77e521c4, 0x66984bbd, 0xdf639055, 0x8beb53c8,
+    0x32108820, 0x236de259, 0x9a9639b1, 0x019736ab, 0xb86ced43,
+    0xa911873a, 0x10ea5cd2, 0x88c53e9e, 0x313ee576, 0x20438f0f,
+    0x99b854e7, 0x02b95bfd, 0xbb428015, 0xaa3fea6c, 0x13c43184,
+    0x474cf219, 0xfeb729f1, 0xefca4388, 0x56319860, 0xcd30977a,
+    0x74cb4c92, 0x65b626eb, 0xdc4dfd03, 0xcca7a1d1, 0x755c7a39,
+    0x64211040, 0xdddacba8, 0x46dbc4b2, 0xff201f5a, 0xee5d7523,
+    0x57a6aecb, 0x032e6d56, 0xbad5b6be, 0xaba8dcc7, 0x1253072f,
+    0x89520835, 0x30a9d3dd, 0x21d4b9a4, 0x982f624c, 0xcafb7b7d,
+    0x7300a095, 0x627dcaec, 0xdb861104, 0x40871e1e, 0xf97cc5f6,
+    0xe801af8f, 0x51fa7467, 0x0572b7fa, 0xbc896c12, 0xadf4066b,
+    0x140fdd83, 0x8f0ed299, 0x36f50971, 0x27886308, 0x9e73b8e0,
+    0x8e99e432, 0x37623fda, 0x261f55a3, 0x9fe48e4b, 0x04e58151,
+    0xbd1e5ab9, 0xac6330c0, 0x1598eb28, 0x411028b5, 0xf8ebf35d,
+    0xe9969924, 0x506d42cc, 0xcb6c4dd6, 0x7297963e, 0x63eafc47,
+    0xda1127af, 0x423e45e3, 0xfbc59e0b, 0xeab8f472, 0x53432f9a,
+    0xc8422080, 0x71b9fb68, 0x60c49111, 0xd93f4af9, 0x8db78964,
+    0x344c528c, 0x253138f5, 0x9ccae31d, 0x07cbec07, 0xbe3037ef,
+    0xaf4d5d96, 0x16b6867e, 0x065cdaac, 0xbfa70144, 0xaeda6b3d,
+    0x1721b0d5, 0x8c20bfcf, 0x35db6427, 0x24a60e5e, 0x9d5dd5b6,
+    0xc9d5162b, 0x702ecdc3, 0x6153a7ba, 0xd8a87c52, 0x43a97348,
+    0xfa52a8a0, 0xeb2fc2d9, 0x52d41931, 0x4e87f0bb, 0xf77c2b53,
+    0xe601412a, 0x5ffa9ac2, 0xc4fb95d8, 0x7d004e30, 0x6c7d2449,
+    0xd586ffa1, 0x810e3c3c, 0x38f5e7d4, 0x29888dad, 0x90735645,
+    0x0b72595f, 0xb28982b7, 0xa3f4e8ce, 0x1a0f3326, 0x0ae56ff4,
+    0xb31eb41c, 0xa263de65, 0x1b98058d, 0x80990a97, 0x3962d17f,
+    0x281fbb06, 0x91e460ee, 0xc56ca373, 0x7c97789b, 0x6dea12e2,
+    0xd411c90a, 0x4f10c610, 0xf6eb1df8, 0xe7967781, 0x5e6dac69,
+    0xc642ce25, 0x7fb915cd, 0x6ec47fb4, 0xd73fa45c, 0x4c3eab46,
+    0xf5c570ae, 0xe4b81ad7, 0x5d43c13f, 0x09cb02a2, 0xb030d94a,
+    0xa14db333, 0x18b668db, 0x83b767c1, 0x3a4cbc29, 0x2b31d650,
+    0x92ca0db8, 0x8220516a, 0x3bdb8a82, 0x2aa6e0fb, 0x935d3b13,
+    0x085c3409, 0xb1a7efe1, 0xa0da8598, 0x19215e70, 0x4da99ded,
+    0xf4524605, 0xe52f2c7c, 0x5cd4f794, 0xc7d5f88e, 0x7e2e2366,
+    0x6f53491f, 0xd6a892f7, 0x847c8bc6, 0x3d87502e, 0x2cfa3a57,
+    0x9501e1bf, 0x0e00eea5, 0xb7fb354d, 0xa6865f34, 0x1f7d84dc,
+    0x4bf54741, 0xf20e9ca9, 0xe373f6d0, 0x5a882d38, 0xc1892222,
+    0x7872f9ca, 0x690f93b3, 0xd0f4485b, 0xc01e1489, 0x79e5cf61,
+    0x6898a518, 0xd1637ef0, 0x4a6271ea, 0xf399aa02, 0xe2e4c07b,
+    0x5b1f1b93, 0x0f97d80e, 0xb66c03e6, 0xa711699f, 0x1eeab277,
+    0x85ebbd6d, 0x3c106685, 0x2d6d0cfc, 0x9496d714, 0x0cb9b558,
+    0xb5426eb0, 0xa43f04c9, 0x1dc4df21, 0x86c5d03b, 0x3f3e0bd3,
+    0x2e4361aa, 0x97b8ba42, 0xc33079df, 0x7acba237, 0x6bb6c84e,
+    0xd24d13a6, 0x494c1cbc, 0xf0b7c754, 0xe1caad2d, 0x583176c5,
+    0x48db2a17, 0xf120f1ff, 0xe05d9b86, 0x59a6406e, 0xc2a74f74,
+    0x7b5c949c, 0x6a21fee5, 0xd3da250d, 0x8752e690, 0x3ea93d78,
+    0x2fd45701, 0x962f8ce9, 0x0d2e83f3, 0xb4d5581b, 0xa5a83262,
+    0x1c53e98a},
+   {0x00000000, 0x9d0fe176, 0xe16ec4ad, 0x7c6125db, 0x19ac8f1b,
+    0x84a36e6d, 0xf8c24bb6, 0x65cdaac0, 0x33591e36, 0xae56ff40,
+    0xd237da9b, 0x4f383bed, 0x2af5912d, 0xb7fa705b, 0xcb9b5580,
+    0x5694b4f6, 0x66b23c6c, 0xfbbddd1a, 0x87dcf8c1, 0x1ad319b7,
+    0x7f1eb377, 0xe2115201, 0x9e7077da, 0x037f96ac, 0x55eb225a,
+    0xc8e4c32c, 0xb485e6f7, 0x298a0781, 0x4c47ad41, 0xd1484c37,
+    0xad2969ec, 0x3026889a, 0xcd6478d8, 0x506b99ae, 0x2c0abc75,
+    0xb1055d03, 0xd4c8f7c3, 0x49c716b5, 0x35a6336e, 0xa8a9d218,
+    0xfe3d66ee, 0x63328798, 0x1f53a243, 0x825c4335, 0xe791e9f5,
+    0x7a9e0883, 0x06ff2d58, 0x9bf0cc2e, 0xabd644b4, 0x36d9a5c2,
+    0x4ab88019, 0xd7b7616f, 0xb27acbaf, 0x2f752ad9, 0x53140f02,
+    0xce1bee74, 0x988f5a82, 0x0580bbf4, 0x79e19e2f, 0xe4ee7f59,
+    0x8123d599, 0x1c2c34ef, 0x604d1134, 0xfd42f042, 0x41b9f7f1,
+    0xdcb61687, 0xa0d7335c, 0x3dd8d22a, 0x581578ea, 0xc51a999c,
+    0xb97bbc47, 0x24745d31, 0x72e0e9c7, 0xefef08b1, 0x938e2d6a,
+    0x0e81cc1c, 0x6b4c66dc, 0xf64387aa, 0x8a22a271, 0x172d4307,
+    0x270bcb9d, 0xba042aeb, 0xc6650f30, 0x5b6aee46, 0x3ea74486,
+    0xa3a8a5f0, 0xdfc9802b, 0x42c6615d, 0x1452d5ab, 0x895d34dd,
+    0xf53c1106, 0x6833f070, 0x0dfe5ab0, 0x90f1bbc6, 0xec909e1d,
+    0x719f7f6b, 0x8cdd8f29, 0x11d26e5f, 0x6db34b84, 0xf0bcaaf2,
+    0x95710032, 0x087ee144, 0x741fc49f, 0xe91025e9, 0xbf84911f,
+    0x228b7069, 0x5eea55b2, 0xc3e5b4c4, 0xa6281e04, 0x3b27ff72,
+    0x4746daa9, 0xda493bdf, 0xea6fb345, 0x77605233, 0x0b0177e8,
+    0x960e969e, 0xf3c33c5e, 0x6eccdd28, 0x12adf8f3, 0x8fa21985,
+    0xd936ad73, 0x44394c05, 0x385869de, 0xa55788a8, 0xc09a2268,
+    0x5d95c31e, 0x21f4e6c5, 0xbcfb07b3, 0x8373efe2, 0x1e7c0e94,
+    0x621d2b4f, 0xff12ca39, 0x9adf60f9, 0x07d0818f, 0x7bb1a454,
+    0xe6be4522, 0xb02af1d4, 0x2d2510a2, 0x51443579, 0xcc4bd40f,
+    0xa9867ecf, 0x34899fb9, 0x48e8ba62, 0xd5e75b14, 0xe5c1d38e,
+    0x78ce32f8, 0x04af1723, 0x99a0f655, 0xfc6d5c95, 0x6162bde3,
+    0x1d039838, 0x800c794e, 0xd698cdb8, 0x4b972cce, 0x37f60915,
+    0xaaf9e863, 0xcf3442a3, 0x523ba3d5, 0x2e5a860e, 0xb3556778,
+    0x4e17973a, 0xd318764c, 0xaf795397, 0x3276b2e1, 0x57bb1821,
+    0xcab4f957, 0xb6d5dc8c, 0x2bda3dfa, 0x7d4e890c, 0xe041687a,
+    0x9c204da1, 0x012facd7, 0x64e20617, 0xf9ede761, 0x858cc2ba,
+    0x188323cc, 0x28a5ab56, 0xb5aa4a20, 0xc9cb6ffb, 0x54c48e8d,
+    0x3109244d, 0xac06c53b, 0xd067e0e0, 0x4d680196, 0x1bfcb560,
+    0x86f35416, 0xfa9271cd, 0x679d90bb, 0x02503a7b, 0x9f5fdb0d,
+    0xe33efed6, 0x7e311fa0, 0xc2ca1813, 0x5fc5f965, 0x23a4dcbe,
+    0xbeab3dc8, 0xdb669708, 0x4669767e, 0x3a0853a5, 0xa707b2d3,
+    0xf1930625, 0x6c9ce753, 0x10fdc288, 0x8df223fe, 0xe83f893e,
+    0x75306848, 0x09514d93, 0x945eace5, 0xa478247f, 0x3977c509,
+    0x4516e0d2, 0xd81901a4, 0xbdd4ab64, 0x20db4a12, 0x5cba6fc9,
+    0xc1b58ebf, 0x97213a49, 0x0a2edb3f, 0x764ffee4, 0xeb401f92,
+    0x8e8db552, 0x13825424, 0x6fe371ff, 0xf2ec9089, 0x0fae60cb,
+    0x92a181bd, 0xeec0a466, 0x73cf4510, 0x1602efd0, 0x8b0d0ea6,
+    0xf76c2b7d, 0x6a63ca0b, 0x3cf77efd, 0xa1f89f8b, 0xdd99ba50,
+    0x40965b26, 0x255bf1e6, 0xb8541090, 0xc435354b, 0x593ad43d,
+    0x691c5ca7, 0xf413bdd1, 0x8872980a, 0x157d797c, 0x70b0d3bc,
+    0xedbf32ca, 0x91de1711, 0x0cd1f667, 0x5a454291, 0xc74aa3e7,
+    0xbb2b863c, 0x2624674a, 0x43e9cd8a, 0xdee62cfc, 0xa2870927,
+    0x3f88e851},
+   {0x00000000, 0xdd96d985, 0x605cb54b, 0xbdca6cce, 0xc0b96a96,
+    0x1d2fb313, 0xa0e5dfdd, 0x7d730658, 0x5a03d36d, 0x87950ae8,
+    0x3a5f6626, 0xe7c9bfa3, 0x9abab9fb, 0x472c607e, 0xfae60cb0,
+    0x2770d535, 0xb407a6da, 0x69917f5f, 0xd45b1391, 0x09cdca14,
+    0x74becc4c, 0xa92815c9, 0x14e27907, 0xc974a082, 0xee0475b7,
+    0x3392ac32, 0x8e58c0fc, 0x53ce1979, 0x2ebd1f21, 0xf32bc6a4,
+    0x4ee1aa6a, 0x937773ef, 0xb37e4bf5, 0x6ee89270, 0xd322febe,
+    0x0eb4273b, 0x73c72163, 0xae51f8e6, 0x139b9428, 0xce0d4dad,
+    0xe97d9898, 0x34eb411d, 0x89212dd3, 0x54b7f456, 0x29c4f20e,
+    0xf4522b8b, 0x49984745, 0x940e9ec0, 0x0779ed2f, 0xdaef34aa,
+    0x67255864, 0xbab381e1, 0xc7c087b9, 0x1a565e3c, 0xa79c32f2,
+    0x7a0aeb77, 0x5d7a3e42, 0x80ece7c7, 0x3d268b09, 0xe0b0528c,
+    0x9dc354d4, 0x40558d51, 0xfd9fe19f, 0x2009381a, 0xbd8d91ab,
+    0x601b482e, 0xddd124e0, 0x0047fd65, 0x7d34fb3d, 0xa0a222b8,
+    0x1d684e76, 0xc0fe97f3, 0xe78e42c6, 0x3a189b43, 0x87d2f78d,
+    0x5a442e08, 0x27372850, 0xfaa1f1d5, 0x476b9d1b, 0x9afd449e,
+    0x098a3771, 0xd41ceef4, 0x69d6823a, 0xb4405bbf, 0xc9335de7,
+    0x14a58462, 0xa96fe8ac, 0x74f93129, 0x5389e41c, 0x8e1f3d99,
+    0x33d55157, 0xee4388d2, 0x93308e8a, 0x4ea6570f, 0xf36c3bc1,
+    0x2efae244, 0x0ef3da5e, 0xd36503db, 0x6eaf6f15, 0xb339b690,
+    0xce4ab0c8, 0x13dc694d, 0xae160583, 0x7380dc06, 0x54f00933,
+    0x8966d0b6, 0x34acbc78, 0xe93a65fd, 0x944963a5, 0x49dfba20,
+    0xf415d6ee, 0x29830f6b, 0xbaf47c84, 0x6762a501, 0xdaa8c9cf,
+    0x073e104a, 0x7a4d1612, 0xa7dbcf97, 0x1a11a359, 0xc7877adc,
+    0xe0f7afe9, 0x3d61766c, 0x80ab1aa2, 0x5d3dc327, 0x204ec57f,
+    0xfdd81cfa, 0x40127034, 0x9d84a9b1, 0xa06a2517, 0x7dfcfc92,
+    0xc036905c, 0x1da049d9, 0x60d34f81, 0xbd459604, 0x008ffaca,
+    0xdd19234f, 0xfa69f67a, 0x27ff2fff, 0x9a354331, 0x47a39ab4,
+    0x3ad09cec, 0xe7464569, 0x5a8c29a7, 0x871af022, 0x146d83cd,
+    0xc9fb5a48, 0x74313686, 0xa9a7ef03, 0xd4d4e95b, 0x094230de,
+    0xb4885c10, 0x691e8595, 0x4e6e50a0, 0x93f88925, 0x2e32e5eb,
+    0xf3a43c6e, 0x8ed73a36, 0x5341e3b3, 0xee8b8f7d, 0x331d56f8,
+    0x13146ee2, 0xce82b767, 0x7348dba9, 0xaede022c, 0xd3ad0474,
+    0x0e3bddf1, 0xb3f1b13f, 0x6e6768ba, 0x4917bd8f, 0x9481640a,
+    0x294b08c4, 0xf4ddd141, 0x89aed719, 0x54380e9c, 0xe9f26252,
+    0x3464bbd7, 0xa713c838, 0x7a8511bd, 0xc74f7d73, 0x1ad9a4f6,
+    0x67aaa2ae, 0xba3c7b2b, 0x07f617e5, 0xda60ce60, 0xfd101b55,
+    0x2086c2d0, 0x9d4cae1e, 0x40da779b, 0x3da971c3, 0xe03fa846,
+    0x5df5c488, 0x80631d0d, 0x1de7b4bc, 0xc0716d39, 0x7dbb01f7,
+    0xa02dd872, 0xdd5ede2a, 0x00c807af, 0xbd026b61, 0x6094b2e4,
+    0x47e467d1, 0x9a72be54, 0x27b8d29a, 0xfa2e0b1f, 0x875d0d47,
+    0x5acbd4c2, 0xe701b80c, 0x3a976189, 0xa9e01266, 0x7476cbe3,
+    0xc9bca72d, 0x142a7ea8, 0x695978f0, 0xb4cfa175, 0x0905cdbb,
+    0xd493143e, 0xf3e3c10b, 0x2e75188e, 0x93bf7440, 0x4e29adc5,
+    0x335aab9d, 0xeecc7218, 0x53061ed6, 0x8e90c753, 0xae99ff49,
+    0x730f26cc, 0xcec54a02, 0x13539387, 0x6e2095df, 0xb3b64c5a,
+    0x0e7c2094, 0xd3eaf911, 0xf49a2c24, 0x290cf5a1, 0x94c6996f,
+    0x495040ea, 0x342346b2, 0xe9b59f37, 0x547ff3f9, 0x89e92a7c,
+    0x1a9e5993, 0xc7088016, 0x7ac2ecd8, 0xa754355d, 0xda273305,
+    0x07b1ea80, 0xba7b864e, 0x67ed5fcb, 0x409d8afe, 0x9d0b537b,
+    0x20c13fb5, 0xfd57e630, 0x8024e068, 0x5db239ed, 0xe0785523,
+    0x3dee8ca6},
+   {0x00000000, 0x9ba54c6f, 0xec3b9e9f, 0x779ed2f0, 0x03063b7f,
+    0x98a37710, 0xef3da5e0, 0x7498e98f, 0x060c76fe, 0x9da93a91,
+    0xea37e861, 0x7192a40e, 0x050a4d81, 0x9eaf01ee, 0xe931d31e,
+    0x72949f71, 0x0c18edfc, 0x97bda193, 0xe0237363, 0x7b863f0c,
+    0x0f1ed683, 0x94bb9aec, 0xe325481c, 0x78800473, 0x0a149b02,
+    0x91b1d76d, 0xe62f059d, 0x7d8a49f2, 0x0912a07d, 0x92b7ec12,
+    0xe5293ee2, 0x7e8c728d, 0x1831dbf8, 0x83949797, 0xf40a4567,
+    0x6faf0908, 0x1b37e087, 0x8092ace8, 0xf70c7e18, 0x6ca93277,
+    0x1e3dad06, 0x8598e169, 0xf2063399, 0x69a37ff6, 0x1d3b9679,
+    0x869eda16, 0xf10008e6, 0x6aa54489, 0x14293604, 0x8f8c7a6b,
+    0xf812a89b, 0x63b7e4f4, 0x172f0d7b, 0x8c8a4114, 0xfb1493e4,
+    0x60b1df8b, 0x122540fa, 0x89800c95, 0xfe1ede65, 0x65bb920a,
+    0x11237b85, 0x8a8637ea, 0xfd18e51a, 0x66bda975, 0x3063b7f0,
+    0xabc6fb9f, 0xdc58296f, 0x47fd6500, 0x33658c8f, 0xa8c0c0e0,
+    0xdf5e1210, 0x44fb5e7f, 0x366fc10e, 0xadca8d61, 0xda545f91,
+    0x41f113fe, 0x3569fa71, 0xaeccb61e, 0xd95264ee, 0x42f72881,
+    0x3c7b5a0c, 0xa7de1663, 0xd040c493, 0x4be588fc, 0x3f7d6173,
+    0xa4d82d1c, 0xd346ffec, 0x48e3b383, 0x3a772cf2, 0xa1d2609d,
+    0xd64cb26d, 0x4de9fe02, 0x3971178d, 0xa2d45be2, 0xd54a8912,
+    0x4eefc57d, 0x28526c08, 0xb3f72067, 0xc469f297, 0x5fccbef8,
+    0x2b545777, 0xb0f11b18, 0xc76fc9e8, 0x5cca8587, 0x2e5e1af6,
+    0xb5fb5699, 0xc2658469, 0x59c0c806, 0x2d582189, 0xb6fd6de6,
+    0xc163bf16, 0x5ac6f379, 0x244a81f4, 0xbfefcd9b, 0xc8711f6b,
+    0x53d45304, 0x274cba8b, 0xbce9f6e4, 0xcb772414, 0x50d2687b,
+    0x2246f70a, 0xb9e3bb65, 0xce7d6995, 0x55d825fa, 0x2140cc75,
+    0xbae5801a, 0xcd7b52ea, 0x56de1e85, 0x60c76fe0, 0xfb62238f,
+    0x8cfcf17f, 0x1759bd10, 0x63c1549f, 0xf86418f0, 0x8ffaca00,
+    0x145f866f, 0x66cb191e, 0xfd6e5571, 0x8af08781, 0x1155cbee,
+    0x65cd2261, 0xfe686e0e, 0x89f6bcfe, 0x1253f091, 0x6cdf821c,
+    0xf77ace73, 0x80e41c83, 0x1b4150ec, 0x6fd9b963, 0xf47cf50c,
+    0x83e227fc, 0x18476b93, 0x6ad3f4e2, 0xf176b88d, 0x86e86a7d,
+    0x1d4d2612, 0x69d5cf9d, 0xf27083f2, 0x85ee5102, 0x1e4b1d6d,
+    0x78f6b418, 0xe353f877, 0x94cd2a87, 0x0f6866e8, 0x7bf08f67,
+    0xe055c308, 0x97cb11f8, 0x0c6e5d97, 0x7efac2e6, 0xe55f8e89,
+    0x92c15c79, 0x09641016, 0x7dfcf999, 0xe659b5f6, 0x91c76706,
+    0x0a622b69, 0x74ee59e4, 0xef4b158b, 0x98d5c77b, 0x03708b14,
+    0x77e8629b, 0xec4d2ef4, 0x9bd3fc04, 0x0076b06b, 0x72e22f1a,
+    0xe9476375, 0x9ed9b185, 0x057cfdea, 0x71e41465, 0xea41580a,
+    0x9ddf8afa, 0x067ac695, 0x50a4d810, 0xcb01947f, 0xbc9f468f,
+    0x273a0ae0, 0x53a2e36f, 0xc807af00, 0xbf997df0, 0x243c319f,
+    0x56a8aeee, 0xcd0de281, 0xba933071, 0x21367c1e, 0x55ae9591,
+    0xce0bd9fe, 0xb9950b0e, 0x22304761, 0x5cbc35ec, 0xc7197983,
+    0xb087ab73, 0x2b22e71c, 0x5fba0e93, 0xc41f42fc, 0xb381900c,
+    0x2824dc63, 0x5ab04312, 0xc1150f7d, 0xb68bdd8d, 0x2d2e91e2,
+    0x59b6786d, 0xc2133402, 0xb58de6f2, 0x2e28aa9d, 0x489503e8,
+    0xd3304f87, 0xa4ae9d77, 0x3f0bd118, 0x4b933897, 0xd03674f8,
+    0xa7a8a608, 0x3c0dea67, 0x4e997516, 0xd53c3979, 0xa2a2eb89,
+    0x3907a7e6, 0x4d9f4e69, 0xd63a0206, 0xa1a4d0f6, 0x3a019c99,
+    0x448dee14, 0xdf28a27b, 0xa8b6708b, 0x33133ce4, 0x478bd56b,
+    0xdc2e9904, 0xabb04bf4, 0x3015079b, 0x428198ea, 0xd924d485,
+    0xaeba0675, 0x351f4a1a, 0x4187a395, 0xda22effa, 0xadbc3d0a,
+    0x36197165},
+   {0x00000000, 0xc18edfc0, 0x586cb9c1, 0x99e26601, 0xb0d97382,
+    0x7157ac42, 0xe8b5ca43, 0x293b1583, 0xbac3e145, 0x7b4d3e85,
+    0xe2af5884, 0x23218744, 0x0a1a92c7, 0xcb944d07, 0x52762b06,
+    0x93f8f4c6, 0xaef6c4cb, 0x6f781b0b, 0xf69a7d0a, 0x3714a2ca,
+    0x1e2fb749, 0xdfa16889, 0x46430e88, 0x87cdd148, 0x1435258e,
+    0xd5bbfa4e, 0x4c599c4f, 0x8dd7438f, 0xa4ec560c, 0x656289cc,
+    0xfc80efcd, 0x3d0e300d, 0x869c8fd7, 0x47125017, 0xdef03616,
+    0x1f7ee9d6, 0x3645fc55, 0xf7cb2395, 0x6e294594, 0xafa79a54,
+    0x3c5f6e92, 0xfdd1b152, 0x6433d753, 0xa5bd0893, 0x8c861d10,
+    0x4d08c2d0, 0xd4eaa4d1, 0x15647b11, 0x286a4b1c, 0xe9e494dc,
+    0x7006f2dd, 0xb1882d1d, 0x98b3389e, 0x593de75e, 0xc0df815f,
+    0x01515e9f, 0x92a9aa59, 0x53277599, 0xcac51398, 0x0b4bcc58,
+    0x2270d9db, 0xe3fe061b, 0x7a1c601a, 0xbb92bfda, 0xd64819ef,
+    0x17c6c62f, 0x8e24a02e, 0x4faa7fee, 0x66916a6d, 0xa71fb5ad,
+    0x3efdd3ac, 0xff730c6c, 0x6c8bf8aa, 0xad05276a, 0x34e7416b,
+    0xf5699eab, 0xdc528b28, 0x1ddc54e8, 0x843e32e9, 0x45b0ed29,
+    0x78bedd24, 0xb93002e4, 0x20d264e5, 0xe15cbb25, 0xc867aea6,
+    0x09e97166, 0x900b1767, 0x5185c8a7, 0xc27d3c61, 0x03f3e3a1,
+    0x9a1185a0, 0x5b9f5a60, 0x72a44fe3, 0xb32a9023, 0x2ac8f622,
+    0xeb4629e2, 0x50d49638, 0x915a49f8, 0x08b82ff9, 0xc936f039,
+    0xe00de5ba, 0x21833a7a, 0xb8615c7b, 0x79ef83bb, 0xea17777d,
+    0x2b99a8bd, 0xb27bcebc, 0x73f5117c, 0x5ace04ff, 0x9b40db3f,
+    0x02a2bd3e, 0xc32c62fe, 0xfe2252f3, 0x3fac8d33, 0xa64eeb32,
+    0x67c034f2, 0x4efb2171, 0x8f75feb1, 0x169798b0, 0xd7194770,
+    0x44e1b3b6, 0x856f6c76, 0x1c8d0a77, 0xdd03d5b7, 0xf438c034,
+    0x35b61ff4, 0xac5479f5, 0x6ddaa635, 0x77e1359f, 0xb66fea5f,
+    0x2f8d8c5e, 0xee03539e, 0xc738461d, 0x06b699dd, 0x9f54ffdc,
+    0x5eda201c, 0xcd22d4da, 0x0cac0b1a, 0x954e6d1b, 0x54c0b2db,
+    0x7dfba758, 0xbc757898, 0x25971e99, 0xe419c159, 0xd917f154,
+    0x18992e94, 0x817b4895, 0x40f59755, 0x69ce82d6, 0xa8405d16,
+    0x31a23b17, 0xf02ce4d7, 0x63d41011, 0xa25acfd1, 0x3bb8a9d0,
+    0xfa367610, 0xd30d6393, 0x1283bc53, 0x8b61da52, 0x4aef0592,
+    0xf17dba48, 0x30f36588, 0xa9110389, 0x689fdc49, 0x41a4c9ca,
+    0x802a160a, 0x19c8700b, 0xd846afcb, 0x4bbe5b0d, 0x8a3084cd,
+    0x13d2e2cc, 0xd25c3d0c, 0xfb67288f, 0x3ae9f74f, 0xa30b914e,
+    0x62854e8e, 0x5f8b7e83, 0x9e05a143, 0x07e7c742, 0xc6691882,
+    0xef520d01, 0x2edcd2c1, 0xb73eb4c0, 0x76b06b00, 0xe5489fc6,
+    0x24c64006, 0xbd242607, 0x7caaf9c7, 0x5591ec44, 0x941f3384,
+    0x0dfd5585, 0xcc738a45, 0xa1a92c70, 0x6027f3b0, 0xf9c595b1,
+    0x384b4a71, 0x11705ff2, 0xd0fe8032, 0x491ce633, 0x889239f3,
+    0x1b6acd35, 0xdae412f5, 0x430674f4, 0x8288ab34, 0xabb3beb7,
+    0x6a3d6177, 0xf3df0776, 0x3251d8b6, 0x0f5fe8bb, 0xced1377b,
+    0x5733517a, 0x96bd8eba, 0xbf869b39, 0x7e0844f9, 0xe7ea22f8,
+    0x2664fd38, 0xb59c09fe, 0x7412d63e, 0xedf0b03f, 0x2c7e6fff,
+    0x05457a7c, 0xc4cba5bc, 0x5d29c3bd, 0x9ca71c7d, 0x2735a3a7,
+    0xe6bb7c67, 0x7f591a66, 0xbed7c5a6, 0x97ecd025, 0x56620fe5,
+    0xcf8069e4, 0x0e0eb624, 0x9df642e2, 0x5c789d22, 0xc59afb23,
+    0x041424e3, 0x2d2f3160, 0xeca1eea0, 0x754388a1, 0xb4cd5761,
+    0x89c3676c, 0x484db8ac, 0xd1afdead, 0x1021016d, 0x391a14ee,
+    0xf894cb2e, 0x6176ad2f, 0xa0f872ef, 0x33008629, 0xf28e59e9,
+    0x6b6c3fe8, 0xaae2e028, 0x83d9f5ab, 0x42572a6b, 0xdbb54c6a,
+    0x1a3b93aa},
+   {0x00000000, 0xefc26b3e, 0x04f5d03d, 0xeb37bb03, 0x09eba07a,
+    0xe629cb44, 0x0d1e7047, 0xe2dc1b79, 0x13d740f4, 0xfc152bca,
+    0x172290c9, 0xf8e0fbf7, 0x1a3ce08e, 0xf5fe8bb0, 0x1ec930b3,
+    0xf10b5b8d, 0x27ae81e8, 0xc86cead6, 0x235b51d5, 0xcc993aeb,
+    0x2e452192, 0xc1874aac, 0x2ab0f1af, 0xc5729a91, 0x3479c11c,
+    0xdbbbaa22, 0x308c1121, 0xdf4e7a1f, 0x3d926166, 0xd2500a58,
+    0x3967b15b, 0xd6a5da65, 0x4f5d03d0, 0xa09f68ee, 0x4ba8d3ed,
+    0xa46ab8d3, 0x46b6a3aa, 0xa974c894, 0x42437397, 0xad8118a9,
+    0x5c8a4324, 0xb348281a, 0x587f9319, 0xb7bdf827, 0x5561e35e,
+    0xbaa38860, 0x51943363, 0xbe56585d, 0x68f38238, 0x8731e906,
+    0x6c065205, 0x83c4393b, 0x61182242, 0x8eda497c, 0x65edf27f,
+    0x8a2f9941, 0x7b24c2cc, 0x94e6a9f2, 0x7fd112f1, 0x901379cf,
+    0x72cf62b6, 0x9d0d0988, 0x763ab28b, 0x99f8d9b5, 0x9eba07a0,
+    0x71786c9e, 0x9a4fd79d, 0x758dbca3, 0x9751a7da, 0x7893cce4,
+    0x93a477e7, 0x7c661cd9, 0x8d6d4754, 0x62af2c6a, 0x89989769,
+    0x665afc57, 0x8486e72e, 0x6b448c10, 0x80733713, 0x6fb15c2d,
+    0xb9148648, 0x56d6ed76, 0xbde15675, 0x52233d4b, 0xb0ff2632,
+    0x5f3d4d0c, 0xb40af60f, 0x5bc89d31, 0xaac3c6bc, 0x4501ad82,
+    0xae361681, 0x41f47dbf, 0xa32866c6, 0x4cea0df8, 0xa7ddb6fb,
+    0x481fddc5, 0xd1e70470, 0x3e256f4e, 0xd512d44d, 0x3ad0bf73,
+    0xd80ca40a, 0x37cecf34, 0xdcf97437, 0x333b1f09, 0xc2304484,
+    0x2df22fba, 0xc6c594b9, 0x2907ff87, 0xcbdbe4fe, 0x24198fc0,
+    0xcf2e34c3, 0x20ec5ffd, 0xf6498598, 0x198beea6, 0xf2bc55a5,
+    0x1d7e3e9b, 0xffa225e2, 0x10604edc, 0xfb57f5df, 0x14959ee1,
+    0xe59ec56c, 0x0a5cae52, 0xe16b1551, 0x0ea97e6f, 0xec756516,
+    0x03b70e28, 0xe880b52b, 0x0742de15, 0xe6050901, 0x09c7623f,
+    0xe2f0d93c, 0x0d32b202, 0xefeea97b, 0x002cc245, 0xeb1b7946,
+    0x04d91278, 0xf5d249f5, 0x1a1022cb, 0xf12799c8, 0x1ee5f2f6,
+    0xfc39e98f, 0x13fb82b1, 0xf8cc39b2, 0x170e528c, 0xc1ab88e9,
+    0x2e69e3d7, 0xc55e58d4, 0x2a9c33ea, 0xc8402893, 0x278243ad,
+    0xccb5f8ae, 0x23779390, 0xd27cc81d, 0x3dbea323, 0xd6891820,
+    0x394b731e, 0xdb976867, 0x34550359, 0xdf62b85a, 0x30a0d364,
+    0xa9580ad1, 0x469a61ef, 0xadaddaec, 0x426fb1d2, 0xa0b3aaab,
+    0x4f71c195, 0xa4467a96, 0x4b8411a8, 0xba8f4a25, 0x554d211b,
+    0xbe7a9a18, 0x51b8f126, 0xb364ea5f, 0x5ca68161, 0xb7913a62,
+    0x5853515c, 0x8ef68b39, 0x6134e007, 0x8a035b04, 0x65c1303a,
+    0x871d2b43, 0x68df407d, 0x83e8fb7e, 0x6c2a9040, 0x9d21cbcd,
+    0x72e3a0f3, 0x99d41bf0, 0x761670ce, 0x94ca6bb7, 0x7b080089,
+    0x903fbb8a, 0x7ffdd0b4, 0x78bf0ea1, 0x977d659f, 0x7c4ade9c,
+    0x9388b5a2, 0x7154aedb, 0x9e96c5e5, 0x75a17ee6, 0x9a6315d8,
+    0x6b684e55, 0x84aa256b, 0x6f9d9e68, 0x805ff556, 0x6283ee2f,
+    0x8d418511, 0x66763e12, 0x89b4552c, 0x5f118f49, 0xb0d3e477,
+    0x5be45f74, 0xb426344a, 0x56fa2f33, 0xb938440d, 0x520fff0e,
+    0xbdcd9430, 0x4cc6cfbd, 0xa304a483, 0x48331f80, 0xa7f174be,
+    0x452d6fc7, 0xaaef04f9, 0x41d8bffa, 0xae1ad4c4, 0x37e20d71,
+    0xd820664f, 0x3317dd4c, 0xdcd5b672, 0x3e09ad0b, 0xd1cbc635,
+    0x3afc7d36, 0xd53e1608, 0x24354d85, 0xcbf726bb, 0x20c09db8,
+    0xcf02f686, 0x2ddeedff, 0xc21c86c1, 0x292b3dc2, 0xc6e956fc,
+    0x104c8c99, 0xff8ee7a7, 0x14b95ca4, 0xfb7b379a, 0x19a72ce3,
+    0xf66547dd, 0x1d52fcde, 0xf29097e0, 0x039bcc6d, 0xec59a753,
+    0x076e1c50, 0xe8ac776e, 0x0a706c17, 0xe5b20729, 0x0e85bc2a,
+    0xe147d714},
+   {0x00000000, 0x177b1443, 0x2ef62886, 0x398d3cc5, 0x5dec510c,
+    0x4a97454f, 0x731a798a, 0x64616dc9, 0xbbd8a218, 0xaca3b65b,
+    0x952e8a9e, 0x82559edd, 0xe634f314, 0xf14fe757, 0xc8c2db92,
+    0xdfb9cfd1, 0xacc04271, 0xbbbb5632, 0x82366af7, 0x954d7eb4,
+    0xf12c137d, 0xe657073e, 0xdfda3bfb, 0xc8a12fb8, 0x1718e069,
+    0x0063f42a, 0x39eec8ef, 0x2e95dcac, 0x4af4b165, 0x5d8fa526,
+    0x640299e3, 0x73798da0, 0x82f182a3, 0x958a96e0, 0xac07aa25,
+    0xbb7cbe66, 0xdf1dd3af, 0xc866c7ec, 0xf1ebfb29, 0xe690ef6a,
+    0x392920bb, 0x2e5234f8, 0x17df083d, 0x00a41c7e, 0x64c571b7,
+    0x73be65f4, 0x4a335931, 0x5d484d72, 0x2e31c0d2, 0x394ad491,
+    0x00c7e854, 0x17bcfc17, 0x73dd91de, 0x64a6859d, 0x5d2bb958,
+    0x4a50ad1b, 0x95e962ca, 0x82927689, 0xbb1f4a4c, 0xac645e0f,
+    0xc80533c6, 0xdf7e2785, 0xe6f31b40, 0xf1880f03, 0xde920307,
+    0xc9e91744, 0xf0642b81, 0xe71f3fc2, 0x837e520b, 0x94054648,
+    0xad887a8d, 0xbaf36ece, 0x654aa11f, 0x7231b55c, 0x4bbc8999,
+    0x5cc79dda, 0x38a6f013, 0x2fdde450, 0x1650d895, 0x012bccd6,
+    0x72524176, 0x65295535, 0x5ca469f0, 0x4bdf7db3, 0x2fbe107a,
+    0x38c50439, 0x014838fc, 0x16332cbf, 0xc98ae36e, 0xdef1f72d,
+    0xe77ccbe8, 0xf007dfab, 0x9466b262, 0x831da621, 0xba909ae4,
+    0xadeb8ea7, 0x5c6381a4, 0x4b1895e7, 0x7295a922, 0x65eebd61,
+    0x018fd0a8, 0x16f4c4eb, 0x2f79f82e, 0x3802ec6d, 0xe7bb23bc,
+    0xf0c037ff, 0xc94d0b3a, 0xde361f79, 0xba5772b0, 0xad2c66f3,
+    0x94a15a36, 0x83da4e75, 0xf0a3c3d5, 0xe7d8d796, 0xde55eb53,
+    0xc92eff10, 0xad4f92d9, 0xba34869a, 0x83b9ba5f, 0x94c2ae1c,
+    0x4b7b61cd, 0x5c00758e, 0x658d494b, 0x72f65d08, 0x169730c1,
+    0x01ec2482, 0x38611847, 0x2f1a0c04, 0x6655004f, 0x712e140c,
+    0x48a328c9, 0x5fd83c8a, 0x3bb95143, 0x2cc24500, 0x154f79c5,
+    0x02346d86, 0xdd8da257, 0xcaf6b614, 0xf37b8ad1, 0xe4009e92,
+    0x8061f35b, 0x971ae718, 0xae97dbdd, 0xb9eccf9e, 0xca95423e,
+    0xddee567d, 0xe4636ab8, 0xf3187efb, 0x97791332, 0x80020771,
+    0xb98f3bb4, 0xaef42ff7, 0x714de026, 0x6636f465, 0x5fbbc8a0,
+    0x48c0dce3, 0x2ca1b12a, 0x3bdaa569, 0x025799ac, 0x152c8def,
+    0xe4a482ec, 0xf3df96af, 0xca52aa6a, 0xdd29be29, 0xb948d3e0,
+    0xae33c7a3, 0x97befb66, 0x80c5ef25, 0x5f7c20f4, 0x480734b7,
+    0x718a0872, 0x66f11c31, 0x029071f8, 0x15eb65bb, 0x2c66597e,
+    0x3b1d4d3d, 0x4864c09d, 0x5f1fd4de, 0x6692e81b, 0x71e9fc58,
+    0x15889191, 0x02f385d2, 0x3b7eb917, 0x2c05ad54, 0xf3bc6285,
+    0xe4c776c6, 0xdd4a4a03, 0xca315e40, 0xae503389, 0xb92b27ca,
+    0x80a61b0f, 0x97dd0f4c, 0xb8c70348, 0xafbc170b, 0x96312bce,
+    0x814a3f8d, 0xe52b5244, 0xf2504607, 0xcbdd7ac2, 0xdca66e81,
+    0x031fa150, 0x1464b513, 0x2de989d6, 0x3a929d95, 0x5ef3f05c,
+    0x4988e41f, 0x7005d8da, 0x677ecc99, 0x14074139, 0x037c557a,
+    0x3af169bf, 0x2d8a7dfc, 0x49eb1035, 0x5e900476, 0x671d38b3,
+    0x70662cf0, 0xafdfe321, 0xb8a4f762, 0x8129cba7, 0x9652dfe4,
+    0xf233b22d, 0xe548a66e, 0xdcc59aab, 0xcbbe8ee8, 0x3a3681eb,
+    0x2d4d95a8, 0x14c0a96d, 0x03bbbd2e, 0x67dad0e7, 0x70a1c4a4,
+    0x492cf861, 0x5e57ec22, 0x81ee23f3, 0x969537b0, 0xaf180b75,
+    0xb8631f36, 0xdc0272ff, 0xcb7966bc, 0xf2f45a79, 0xe58f4e3a,
+    0x96f6c39a, 0x818dd7d9, 0xb800eb1c, 0xaf7bff5f, 0xcb1a9296,
+    0xdc6186d5, 0xe5ecba10, 0xf297ae53, 0x2d2e6182, 0x3a5575c1,
+    0x03d84904, 0x14a35d47, 0x70c2308e, 0x67b924cd, 0x5e341808,
+    0x494f0c4b}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x0000000000000000, 0x43147b1700000000, 0x8628f62e00000000,
+    0xc53c8d3900000000, 0x0c51ec5d00000000, 0x4f45974a00000000,
+    0x8a791a7300000000, 0xc96d616400000000, 0x18a2d8bb00000000,
+    0x5bb6a3ac00000000, 0x9e8a2e9500000000, 0xdd9e558200000000,
+    0x14f334e600000000, 0x57e74ff100000000, 0x92dbc2c800000000,
+    0xd1cfb9df00000000, 0x7142c0ac00000000, 0x3256bbbb00000000,
+    0xf76a368200000000, 0xb47e4d9500000000, 0x7d132cf100000000,
+    0x3e0757e600000000, 0xfb3bdadf00000000, 0xb82fa1c800000000,
+    0x69e0181700000000, 0x2af4630000000000, 0xefc8ee3900000000,
+    0xacdc952e00000000, 0x65b1f44a00000000, 0x26a58f5d00000000,
+    0xe399026400000000, 0xa08d797300000000, 0xa382f18200000000,
+    0xe0968a9500000000, 0x25aa07ac00000000, 0x66be7cbb00000000,
+    0xafd31ddf00000000, 0xecc766c800000000, 0x29fbebf100000000,
+    0x6aef90e600000000, 0xbb20293900000000, 0xf834522e00000000,
+    0x3d08df1700000000, 0x7e1ca40000000000, 0xb771c56400000000,
+    0xf465be7300000000, 0x3159334a00000000, 0x724d485d00000000,
+    0xd2c0312e00000000, 0x91d44a3900000000, 0x54e8c70000000000,
+    0x17fcbc1700000000, 0xde91dd7300000000, 0x9d85a66400000000,
+    0x58b92b5d00000000, 0x1bad504a00000000, 0xca62e99500000000,
+    0x8976928200000000, 0x4c4a1fbb00000000, 0x0f5e64ac00000000,
+    0xc63305c800000000, 0x85277edf00000000, 0x401bf3e600000000,
+    0x030f88f100000000, 0x070392de00000000, 0x4417e9c900000000,
+    0x812b64f000000000, 0xc23f1fe700000000, 0x0b527e8300000000,
+    0x4846059400000000, 0x8d7a88ad00000000, 0xce6ef3ba00000000,
+    0x1fa14a6500000000, 0x5cb5317200000000, 0x9989bc4b00000000,
+    0xda9dc75c00000000, 0x13f0a63800000000, 0x50e4dd2f00000000,
+    0x95d8501600000000, 0xd6cc2b0100000000, 0x7641527200000000,
+    0x3555296500000000, 0xf069a45c00000000, 0xb37ddf4b00000000,
+    0x7a10be2f00000000, 0x3904c53800000000, 0xfc38480100000000,
+    0xbf2c331600000000, 0x6ee38ac900000000, 0x2df7f1de00000000,
+    0xe8cb7ce700000000, 0xabdf07f000000000, 0x62b2669400000000,
+    0x21a61d8300000000, 0xe49a90ba00000000, 0xa78eebad00000000,
+    0xa481635c00000000, 0xe795184b00000000, 0x22a9957200000000,
+    0x61bdee6500000000, 0xa8d08f0100000000, 0xebc4f41600000000,
+    0x2ef8792f00000000, 0x6dec023800000000, 0xbc23bbe700000000,
+    0xff37c0f000000000, 0x3a0b4dc900000000, 0x791f36de00000000,
+    0xb07257ba00000000, 0xf3662cad00000000, 0x365aa19400000000,
+    0x754eda8300000000, 0xd5c3a3f000000000, 0x96d7d8e700000000,
+    0x53eb55de00000000, 0x10ff2ec900000000, 0xd9924fad00000000,
+    0x9a8634ba00000000, 0x5fbab98300000000, 0x1caec29400000000,
+    0xcd617b4b00000000, 0x8e75005c00000000, 0x4b498d6500000000,
+    0x085df67200000000, 0xc130971600000000, 0x8224ec0100000000,
+    0x4718613800000000, 0x040c1a2f00000000, 0x4f00556600000000,
+    0x0c142e7100000000, 0xc928a34800000000, 0x8a3cd85f00000000,
+    0x4351b93b00000000, 0x0045c22c00000000, 0xc5794f1500000000,
+    0x866d340200000000, 0x57a28ddd00000000, 0x14b6f6ca00000000,
+    0xd18a7bf300000000, 0x929e00e400000000, 0x5bf3618000000000,
+    0x18e71a9700000000, 0xdddb97ae00000000, 0x9ecfecb900000000,
+    0x3e4295ca00000000, 0x7d56eedd00000000, 0xb86a63e400000000,
+    0xfb7e18f300000000, 0x3213799700000000, 0x7107028000000000,
+    0xb43b8fb900000000, 0xf72ff4ae00000000, 0x26e04d7100000000,
+    0x65f4366600000000, 0xa0c8bb5f00000000, 0xe3dcc04800000000,
+    0x2ab1a12c00000000, 0x69a5da3b00000000, 0xac99570200000000,
+    0xef8d2c1500000000, 0xec82a4e400000000, 0xaf96dff300000000,
+    0x6aaa52ca00000000, 0x29be29dd00000000, 0xe0d348b900000000,
+    0xa3c733ae00000000, 0x66fbbe9700000000, 0x25efc58000000000,
+    0xf4207c5f00000000, 0xb734074800000000, 0x72088a7100000000,
+    0x311cf16600000000, 0xf871900200000000, 0xbb65eb1500000000,
+    0x7e59662c00000000, 0x3d4d1d3b00000000, 0x9dc0644800000000,
+    0xded41f5f00000000, 0x1be8926600000000, 0x58fce97100000000,
+    0x9191881500000000, 0xd285f30200000000, 0x17b97e3b00000000,
+    0x54ad052c00000000, 0x8562bcf300000000, 0xc676c7e400000000,
+    0x034a4add00000000, 0x405e31ca00000000, 0x893350ae00000000,
+    0xca272bb900000000, 0x0f1ba68000000000, 0x4c0fdd9700000000,
+    0x4803c7b800000000, 0x0b17bcaf00000000, 0xce2b319600000000,
+    0x8d3f4a8100000000, 0x44522be500000000, 0x074650f200000000,
+    0xc27addcb00000000, 0x816ea6dc00000000, 0x50a11f0300000000,
+    0x13b5641400000000, 0xd689e92d00000000, 0x959d923a00000000,
+    0x5cf0f35e00000000, 0x1fe4884900000000, 0xdad8057000000000,
+    0x99cc7e6700000000, 0x3941071400000000, 0x7a557c0300000000,
+    0xbf69f13a00000000, 0xfc7d8a2d00000000, 0x3510eb4900000000,
+    0x7604905e00000000, 0xb3381d6700000000, 0xf02c667000000000,
+    0x21e3dfaf00000000, 0x62f7a4b800000000, 0xa7cb298100000000,
+    0xe4df529600000000, 0x2db233f200000000, 0x6ea648e500000000,
+    0xab9ac5dc00000000, 0xe88ebecb00000000, 0xeb81363a00000000,
+    0xa8954d2d00000000, 0x6da9c01400000000, 0x2ebdbb0300000000,
+    0xe7d0da6700000000, 0xa4c4a17000000000, 0x61f82c4900000000,
+    0x22ec575e00000000, 0xf323ee8100000000, 0xb037959600000000,
+    0x750b18af00000000, 0x361f63b800000000, 0xff7202dc00000000,
+    0xbc6679cb00000000, 0x795af4f200000000, 0x3a4e8fe500000000,
+    0x9ac3f69600000000, 0xd9d78d8100000000, 0x1ceb00b800000000,
+    0x5fff7baf00000000, 0x96921acb00000000, 0xd58661dc00000000,
+    0x10baece500000000, 0x53ae97f200000000, 0x82612e2d00000000,
+    0xc175553a00000000, 0x0449d80300000000, 0x475da31400000000,
+    0x8e30c27000000000, 0xcd24b96700000000, 0x0818345e00000000,
+    0x4b0c4f4900000000},
+   {0x0000000000000000, 0x3e6bc2ef00000000, 0x3dd0f50400000000,
+    0x03bb37eb00000000, 0x7aa0eb0900000000, 0x44cb29e600000000,
+    0x47701e0d00000000, 0x791bdce200000000, 0xf440d71300000000,
+    0xca2b15fc00000000, 0xc990221700000000, 0xf7fbe0f800000000,
+    0x8ee03c1a00000000, 0xb08bfef500000000, 0xb330c91e00000000,
+    0x8d5b0bf100000000, 0xe881ae2700000000, 0xd6ea6cc800000000,
+    0xd5515b2300000000, 0xeb3a99cc00000000, 0x9221452e00000000,
+    0xac4a87c100000000, 0xaff1b02a00000000, 0x919a72c500000000,
+    0x1cc1793400000000, 0x22aabbdb00000000, 0x21118c3000000000,
+    0x1f7a4edf00000000, 0x6661923d00000000, 0x580a50d200000000,
+    0x5bb1673900000000, 0x65daa5d600000000, 0xd0035d4f00000000,
+    0xee689fa000000000, 0xedd3a84b00000000, 0xd3b86aa400000000,
+    0xaaa3b64600000000, 0x94c874a900000000, 0x9773434200000000,
+    0xa91881ad00000000, 0x24438a5c00000000, 0x1a2848b300000000,
+    0x19937f5800000000, 0x27f8bdb700000000, 0x5ee3615500000000,
+    0x6088a3ba00000000, 0x6333945100000000, 0x5d5856be00000000,
+    0x3882f36800000000, 0x06e9318700000000, 0x0552066c00000000,
+    0x3b39c48300000000, 0x4222186100000000, 0x7c49da8e00000000,
+    0x7ff2ed6500000000, 0x41992f8a00000000, 0xccc2247b00000000,
+    0xf2a9e69400000000, 0xf112d17f00000000, 0xcf79139000000000,
+    0xb662cf7200000000, 0x88090d9d00000000, 0x8bb23a7600000000,
+    0xb5d9f89900000000, 0xa007ba9e00000000, 0x9e6c787100000000,
+    0x9dd74f9a00000000, 0xa3bc8d7500000000, 0xdaa7519700000000,
+    0xe4cc937800000000, 0xe777a49300000000, 0xd91c667c00000000,
+    0x54476d8d00000000, 0x6a2caf6200000000, 0x6997988900000000,
+    0x57fc5a6600000000, 0x2ee7868400000000, 0x108c446b00000000,
+    0x1337738000000000, 0x2d5cb16f00000000, 0x488614b900000000,
+    0x76edd65600000000, 0x7556e1bd00000000, 0x4b3d235200000000,
+    0x3226ffb000000000, 0x0c4d3d5f00000000, 0x0ff60ab400000000,
+    0x319dc85b00000000, 0xbcc6c3aa00000000, 0x82ad014500000000,
+    0x811636ae00000000, 0xbf7df44100000000, 0xc66628a300000000,
+    0xf80dea4c00000000, 0xfbb6dda700000000, 0xc5dd1f4800000000,
+    0x7004e7d100000000, 0x4e6f253e00000000, 0x4dd412d500000000,
+    0x73bfd03a00000000, 0x0aa40cd800000000, 0x34cfce3700000000,
+    0x3774f9dc00000000, 0x091f3b3300000000, 0x844430c200000000,
+    0xba2ff22d00000000, 0xb994c5c600000000, 0x87ff072900000000,
+    0xfee4dbcb00000000, 0xc08f192400000000, 0xc3342ecf00000000,
+    0xfd5fec2000000000, 0x988549f600000000, 0xa6ee8b1900000000,
+    0xa555bcf200000000, 0x9b3e7e1d00000000, 0xe225a2ff00000000,
+    0xdc4e601000000000, 0xdff557fb00000000, 0xe19e951400000000,
+    0x6cc59ee500000000, 0x52ae5c0a00000000, 0x51156be100000000,
+    0x6f7ea90e00000000, 0x166575ec00000000, 0x280eb70300000000,
+    0x2bb580e800000000, 0x15de420700000000, 0x010905e600000000,
+    0x3f62c70900000000, 0x3cd9f0e200000000, 0x02b2320d00000000,
+    0x7ba9eeef00000000, 0x45c22c0000000000, 0x46791beb00000000,
+    0x7812d90400000000, 0xf549d2f500000000, 0xcb22101a00000000,
+    0xc89927f100000000, 0xf6f2e51e00000000, 0x8fe939fc00000000,
+    0xb182fb1300000000, 0xb239ccf800000000, 0x8c520e1700000000,
+    0xe988abc100000000, 0xd7e3692e00000000, 0xd4585ec500000000,
+    0xea339c2a00000000, 0x932840c800000000, 0xad43822700000000,
+    0xaef8b5cc00000000, 0x9093772300000000, 0x1dc87cd200000000,
+    0x23a3be3d00000000, 0x201889d600000000, 0x1e734b3900000000,
+    0x676897db00000000, 0x5903553400000000, 0x5ab862df00000000,
+    0x64d3a03000000000, 0xd10a58a900000000, 0xef619a4600000000,
+    0xecdaadad00000000, 0xd2b16f4200000000, 0xabaab3a000000000,
+    0x95c1714f00000000, 0x967a46a400000000, 0xa811844b00000000,
+    0x254a8fba00000000, 0x1b214d5500000000, 0x189a7abe00000000,
+    0x26f1b85100000000, 0x5fea64b300000000, 0x6181a65c00000000,
+    0x623a91b700000000, 0x5c51535800000000, 0x398bf68e00000000,
+    0x07e0346100000000, 0x045b038a00000000, 0x3a30c16500000000,
+    0x432b1d8700000000, 0x7d40df6800000000, 0x7efbe88300000000,
+    0x40902a6c00000000, 0xcdcb219d00000000, 0xf3a0e37200000000,
+    0xf01bd49900000000, 0xce70167600000000, 0xb76bca9400000000,
+    0x8900087b00000000, 0x8abb3f9000000000, 0xb4d0fd7f00000000,
+    0xa10ebf7800000000, 0x9f657d9700000000, 0x9cde4a7c00000000,
+    0xa2b5889300000000, 0xdbae547100000000, 0xe5c5969e00000000,
+    0xe67ea17500000000, 0xd815639a00000000, 0x554e686b00000000,
+    0x6b25aa8400000000, 0x689e9d6f00000000, 0x56f55f8000000000,
+    0x2fee836200000000, 0x1185418d00000000, 0x123e766600000000,
+    0x2c55b48900000000, 0x498f115f00000000, 0x77e4d3b000000000,
+    0x745fe45b00000000, 0x4a3426b400000000, 0x332ffa5600000000,
+    0x0d4438b900000000, 0x0eff0f5200000000, 0x3094cdbd00000000,
+    0xbdcfc64c00000000, 0x83a404a300000000, 0x801f334800000000,
+    0xbe74f1a700000000, 0xc76f2d4500000000, 0xf904efaa00000000,
+    0xfabfd84100000000, 0xc4d41aae00000000, 0x710de23700000000,
+    0x4f6620d800000000, 0x4cdd173300000000, 0x72b6d5dc00000000,
+    0x0bad093e00000000, 0x35c6cbd100000000, 0x367dfc3a00000000,
+    0x08163ed500000000, 0x854d352400000000, 0xbb26f7cb00000000,
+    0xb89dc02000000000, 0x86f602cf00000000, 0xffedde2d00000000,
+    0xc1861cc200000000, 0xc23d2b2900000000, 0xfc56e9c600000000,
+    0x998c4c1000000000, 0xa7e78eff00000000, 0xa45cb91400000000,
+    0x9a377bfb00000000, 0xe32ca71900000000, 0xdd4765f600000000,
+    0xdefc521d00000000, 0xe09790f200000000, 0x6dcc9b0300000000,
+    0x53a759ec00000000, 0x501c6e0700000000, 0x6e77ace800000000,
+    0x176c700a00000000, 0x2907b2e500000000, 0x2abc850e00000000,
+    0x14d747e100000000},
+   {0x0000000000000000, 0xc0df8ec100000000, 0xc1b96c5800000000,
+    0x0166e29900000000, 0x8273d9b000000000, 0x42ac577100000000,
+    0x43cab5e800000000, 0x83153b2900000000, 0x45e1c3ba00000000,
+    0x853e4d7b00000000, 0x8458afe200000000, 0x4487212300000000,
+    0xc7921a0a00000000, 0x074d94cb00000000, 0x062b765200000000,
+    0xc6f4f89300000000, 0xcbc4f6ae00000000, 0x0b1b786f00000000,
+    0x0a7d9af600000000, 0xcaa2143700000000, 0x49b72f1e00000000,
+    0x8968a1df00000000, 0x880e434600000000, 0x48d1cd8700000000,
+    0x8e25351400000000, 0x4efabbd500000000, 0x4f9c594c00000000,
+    0x8f43d78d00000000, 0x0c56eca400000000, 0xcc89626500000000,
+    0xcdef80fc00000000, 0x0d300e3d00000000, 0xd78f9c8600000000,
+    0x1750124700000000, 0x1636f0de00000000, 0xd6e97e1f00000000,
+    0x55fc453600000000, 0x9523cbf700000000, 0x9445296e00000000,
+    0x549aa7af00000000, 0x926e5f3c00000000, 0x52b1d1fd00000000,
+    0x53d7336400000000, 0x9308bda500000000, 0x101d868c00000000,
+    0xd0c2084d00000000, 0xd1a4ead400000000, 0x117b641500000000,
+    0x1c4b6a2800000000, 0xdc94e4e900000000, 0xddf2067000000000,
+    0x1d2d88b100000000, 0x9e38b39800000000, 0x5ee73d5900000000,
+    0x5f81dfc000000000, 0x9f5e510100000000, 0x59aaa99200000000,
+    0x9975275300000000, 0x9813c5ca00000000, 0x58cc4b0b00000000,
+    0xdbd9702200000000, 0x1b06fee300000000, 0x1a601c7a00000000,
+    0xdabf92bb00000000, 0xef1948d600000000, 0x2fc6c61700000000,
+    0x2ea0248e00000000, 0xee7faa4f00000000, 0x6d6a916600000000,
+    0xadb51fa700000000, 0xacd3fd3e00000000, 0x6c0c73ff00000000,
+    0xaaf88b6c00000000, 0x6a2705ad00000000, 0x6b41e73400000000,
+    0xab9e69f500000000, 0x288b52dc00000000, 0xe854dc1d00000000,
+    0xe9323e8400000000, 0x29edb04500000000, 0x24ddbe7800000000,
+    0xe40230b900000000, 0xe564d22000000000, 0x25bb5ce100000000,
+    0xa6ae67c800000000, 0x6671e90900000000, 0x67170b9000000000,
+    0xa7c8855100000000, 0x613c7dc200000000, 0xa1e3f30300000000,
+    0xa085119a00000000, 0x605a9f5b00000000, 0xe34fa47200000000,
+    0x23902ab300000000, 0x22f6c82a00000000, 0xe22946eb00000000,
+    0x3896d45000000000, 0xf8495a9100000000, 0xf92fb80800000000,
+    0x39f036c900000000, 0xbae50de000000000, 0x7a3a832100000000,
+    0x7b5c61b800000000, 0xbb83ef7900000000, 0x7d7717ea00000000,
+    0xbda8992b00000000, 0xbcce7bb200000000, 0x7c11f57300000000,
+    0xff04ce5a00000000, 0x3fdb409b00000000, 0x3ebda20200000000,
+    0xfe622cc300000000, 0xf35222fe00000000, 0x338dac3f00000000,
+    0x32eb4ea600000000, 0xf234c06700000000, 0x7121fb4e00000000,
+    0xb1fe758f00000000, 0xb098971600000000, 0x704719d700000000,
+    0xb6b3e14400000000, 0x766c6f8500000000, 0x770a8d1c00000000,
+    0xb7d503dd00000000, 0x34c038f400000000, 0xf41fb63500000000,
+    0xf57954ac00000000, 0x35a6da6d00000000, 0x9f35e17700000000,
+    0x5fea6fb600000000, 0x5e8c8d2f00000000, 0x9e5303ee00000000,
+    0x1d4638c700000000, 0xdd99b60600000000, 0xdcff549f00000000,
+    0x1c20da5e00000000, 0xdad422cd00000000, 0x1a0bac0c00000000,
+    0x1b6d4e9500000000, 0xdbb2c05400000000, 0x58a7fb7d00000000,
+    0x987875bc00000000, 0x991e972500000000, 0x59c119e400000000,
+    0x54f117d900000000, 0x942e991800000000, 0x95487b8100000000,
+    0x5597f54000000000, 0xd682ce6900000000, 0x165d40a800000000,
+    0x173ba23100000000, 0xd7e42cf000000000, 0x1110d46300000000,
+    0xd1cf5aa200000000, 0xd0a9b83b00000000, 0x107636fa00000000,
+    0x93630dd300000000, 0x53bc831200000000, 0x52da618b00000000,
+    0x9205ef4a00000000, 0x48ba7df100000000, 0x8865f33000000000,
+    0x890311a900000000, 0x49dc9f6800000000, 0xcac9a44100000000,
+    0x0a162a8000000000, 0x0b70c81900000000, 0xcbaf46d800000000,
+    0x0d5bbe4b00000000, 0xcd84308a00000000, 0xcce2d21300000000,
+    0x0c3d5cd200000000, 0x8f2867fb00000000, 0x4ff7e93a00000000,
+    0x4e910ba300000000, 0x8e4e856200000000, 0x837e8b5f00000000,
+    0x43a1059e00000000, 0x42c7e70700000000, 0x821869c600000000,
+    0x010d52ef00000000, 0xc1d2dc2e00000000, 0xc0b43eb700000000,
+    0x006bb07600000000, 0xc69f48e500000000, 0x0640c62400000000,
+    0x072624bd00000000, 0xc7f9aa7c00000000, 0x44ec915500000000,
+    0x84331f9400000000, 0x8555fd0d00000000, 0x458a73cc00000000,
+    0x702ca9a100000000, 0xb0f3276000000000, 0xb195c5f900000000,
+    0x714a4b3800000000, 0xf25f701100000000, 0x3280fed000000000,
+    0x33e61c4900000000, 0xf339928800000000, 0x35cd6a1b00000000,
+    0xf512e4da00000000, 0xf474064300000000, 0x34ab888200000000,
+    0xb7beb3ab00000000, 0x77613d6a00000000, 0x7607dff300000000,
+    0xb6d8513200000000, 0xbbe85f0f00000000, 0x7b37d1ce00000000,
+    0x7a51335700000000, 0xba8ebd9600000000, 0x399b86bf00000000,
+    0xf944087e00000000, 0xf822eae700000000, 0x38fd642600000000,
+    0xfe099cb500000000, 0x3ed6127400000000, 0x3fb0f0ed00000000,
+    0xff6f7e2c00000000, 0x7c7a450500000000, 0xbca5cbc400000000,
+    0xbdc3295d00000000, 0x7d1ca79c00000000, 0xa7a3352700000000,
+    0x677cbbe600000000, 0x661a597f00000000, 0xa6c5d7be00000000,
+    0x25d0ec9700000000, 0xe50f625600000000, 0xe46980cf00000000,
+    0x24b60e0e00000000, 0xe242f69d00000000, 0x229d785c00000000,
+    0x23fb9ac500000000, 0xe324140400000000, 0x60312f2d00000000,
+    0xa0eea1ec00000000, 0xa188437500000000, 0x6157cdb400000000,
+    0x6c67c38900000000, 0xacb84d4800000000, 0xaddeafd100000000,
+    0x6d01211000000000, 0xee141a3900000000, 0x2ecb94f800000000,
+    0x2fad766100000000, 0xef72f8a000000000, 0x2986003300000000,
+    0xe9598ef200000000, 0xe83f6c6b00000000, 0x28e0e2aa00000000,
+    0xabf5d98300000000, 0x6b2a574200000000, 0x6a4cb5db00000000,
+    0xaa933b1a00000000},
+   {0x0000000000000000, 0x6f4ca59b00000000, 0x9f9e3bec00000000,
+    0xf0d29e7700000000, 0x7f3b060300000000, 0x1077a39800000000,
+    0xe0a53def00000000, 0x8fe9987400000000, 0xfe760c0600000000,
+    0x913aa99d00000000, 0x61e837ea00000000, 0x0ea4927100000000,
+    0x814d0a0500000000, 0xee01af9e00000000, 0x1ed331e900000000,
+    0x719f947200000000, 0xfced180c00000000, 0x93a1bd9700000000,
+    0x637323e000000000, 0x0c3f867b00000000, 0x83d61e0f00000000,
+    0xec9abb9400000000, 0x1c4825e300000000, 0x7304807800000000,
+    0x029b140a00000000, 0x6dd7b19100000000, 0x9d052fe600000000,
+    0xf2498a7d00000000, 0x7da0120900000000, 0x12ecb79200000000,
+    0xe23e29e500000000, 0x8d728c7e00000000, 0xf8db311800000000,
+    0x9797948300000000, 0x67450af400000000, 0x0809af6f00000000,
+    0x87e0371b00000000, 0xe8ac928000000000, 0x187e0cf700000000,
+    0x7732a96c00000000, 0x06ad3d1e00000000, 0x69e1988500000000,
+    0x993306f200000000, 0xf67fa36900000000, 0x79963b1d00000000,
+    0x16da9e8600000000, 0xe60800f100000000, 0x8944a56a00000000,
+    0x0436291400000000, 0x6b7a8c8f00000000, 0x9ba812f800000000,
+    0xf4e4b76300000000, 0x7b0d2f1700000000, 0x14418a8c00000000,
+    0xe49314fb00000000, 0x8bdfb16000000000, 0xfa40251200000000,
+    0x950c808900000000, 0x65de1efe00000000, 0x0a92bb6500000000,
+    0x857b231100000000, 0xea37868a00000000, 0x1ae518fd00000000,
+    0x75a9bd6600000000, 0xf0b7633000000000, 0x9ffbc6ab00000000,
+    0x6f2958dc00000000, 0x0065fd4700000000, 0x8f8c653300000000,
+    0xe0c0c0a800000000, 0x10125edf00000000, 0x7f5efb4400000000,
+    0x0ec16f3600000000, 0x618dcaad00000000, 0x915f54da00000000,
+    0xfe13f14100000000, 0x71fa693500000000, 0x1eb6ccae00000000,
+    0xee6452d900000000, 0x8128f74200000000, 0x0c5a7b3c00000000,
+    0x6316dea700000000, 0x93c440d000000000, 0xfc88e54b00000000,
+    0x73617d3f00000000, 0x1c2dd8a400000000, 0xecff46d300000000,
+    0x83b3e34800000000, 0xf22c773a00000000, 0x9d60d2a100000000,
+    0x6db24cd600000000, 0x02fee94d00000000, 0x8d17713900000000,
+    0xe25bd4a200000000, 0x12894ad500000000, 0x7dc5ef4e00000000,
+    0x086c522800000000, 0x6720f7b300000000, 0x97f269c400000000,
+    0xf8becc5f00000000, 0x7757542b00000000, 0x181bf1b000000000,
+    0xe8c96fc700000000, 0x8785ca5c00000000, 0xf61a5e2e00000000,
+    0x9956fbb500000000, 0x698465c200000000, 0x06c8c05900000000,
+    0x8921582d00000000, 0xe66dfdb600000000, 0x16bf63c100000000,
+    0x79f3c65a00000000, 0xf4814a2400000000, 0x9bcdefbf00000000,
+    0x6b1f71c800000000, 0x0453d45300000000, 0x8bba4c2700000000,
+    0xe4f6e9bc00000000, 0x142477cb00000000, 0x7b68d25000000000,
+    0x0af7462200000000, 0x65bbe3b900000000, 0x95697dce00000000,
+    0xfa25d85500000000, 0x75cc402100000000, 0x1a80e5ba00000000,
+    0xea527bcd00000000, 0x851ede5600000000, 0xe06fc76000000000,
+    0x8f2362fb00000000, 0x7ff1fc8c00000000, 0x10bd591700000000,
+    0x9f54c16300000000, 0xf01864f800000000, 0x00cafa8f00000000,
+    0x6f865f1400000000, 0x1e19cb6600000000, 0x71556efd00000000,
+    0x8187f08a00000000, 0xeecb551100000000, 0x6122cd6500000000,
+    0x0e6e68fe00000000, 0xfebcf68900000000, 0x91f0531200000000,
+    0x1c82df6c00000000, 0x73ce7af700000000, 0x831ce48000000000,
+    0xec50411b00000000, 0x63b9d96f00000000, 0x0cf57cf400000000,
+    0xfc27e28300000000, 0x936b471800000000, 0xe2f4d36a00000000,
+    0x8db876f100000000, 0x7d6ae88600000000, 0x12264d1d00000000,
+    0x9dcfd56900000000, 0xf28370f200000000, 0x0251ee8500000000,
+    0x6d1d4b1e00000000, 0x18b4f67800000000, 0x77f853e300000000,
+    0x872acd9400000000, 0xe866680f00000000, 0x678ff07b00000000,
+    0x08c355e000000000, 0xf811cb9700000000, 0x975d6e0c00000000,
+    0xe6c2fa7e00000000, 0x898e5fe500000000, 0x795cc19200000000,
+    0x1610640900000000, 0x99f9fc7d00000000, 0xf6b559e600000000,
+    0x0667c79100000000, 0x692b620a00000000, 0xe459ee7400000000,
+    0x8b154bef00000000, 0x7bc7d59800000000, 0x148b700300000000,
+    0x9b62e87700000000, 0xf42e4dec00000000, 0x04fcd39b00000000,
+    0x6bb0760000000000, 0x1a2fe27200000000, 0x756347e900000000,
+    0x85b1d99e00000000, 0xeafd7c0500000000, 0x6514e47100000000,
+    0x0a5841ea00000000, 0xfa8adf9d00000000, 0x95c67a0600000000,
+    0x10d8a45000000000, 0x7f9401cb00000000, 0x8f469fbc00000000,
+    0xe00a3a2700000000, 0x6fe3a25300000000, 0x00af07c800000000,
+    0xf07d99bf00000000, 0x9f313c2400000000, 0xeeaea85600000000,
+    0x81e20dcd00000000, 0x713093ba00000000, 0x1e7c362100000000,
+    0x9195ae5500000000, 0xfed90bce00000000, 0x0e0b95b900000000,
+    0x6147302200000000, 0xec35bc5c00000000, 0x837919c700000000,
+    0x73ab87b000000000, 0x1ce7222b00000000, 0x930eba5f00000000,
+    0xfc421fc400000000, 0x0c9081b300000000, 0x63dc242800000000,
+    0x1243b05a00000000, 0x7d0f15c100000000, 0x8ddd8bb600000000,
+    0xe2912e2d00000000, 0x6d78b65900000000, 0x023413c200000000,
+    0xf2e68db500000000, 0x9daa282e00000000, 0xe803954800000000,
+    0x874f30d300000000, 0x779daea400000000, 0x18d10b3f00000000,
+    0x9738934b00000000, 0xf87436d000000000, 0x08a6a8a700000000,
+    0x67ea0d3c00000000, 0x1675994e00000000, 0x79393cd500000000,
+    0x89eba2a200000000, 0xe6a7073900000000, 0x694e9f4d00000000,
+    0x06023ad600000000, 0xf6d0a4a100000000, 0x999c013a00000000,
+    0x14ee8d4400000000, 0x7ba228df00000000, 0x8b70b6a800000000,
+    0xe43c133300000000, 0x6bd58b4700000000, 0x04992edc00000000,
+    0xf44bb0ab00000000, 0x9b07153000000000, 0xea98814200000000,
+    0x85d424d900000000, 0x7506baae00000000, 0x1a4a1f3500000000,
+    0x95a3874100000000, 0xfaef22da00000000, 0x0a3dbcad00000000,
+    0x6571193600000000},
+   {0x0000000000000000, 0x85d996dd00000000, 0x4bb55c6000000000,
+    0xce6ccabd00000000, 0x966ab9c000000000, 0x13b32f1d00000000,
+    0xdddfe5a000000000, 0x5806737d00000000, 0x6dd3035a00000000,
+    0xe80a958700000000, 0x26665f3a00000000, 0xa3bfc9e700000000,
+    0xfbb9ba9a00000000, 0x7e602c4700000000, 0xb00ce6fa00000000,
+    0x35d5702700000000, 0xdaa607b400000000, 0x5f7f916900000000,
+    0x91135bd400000000, 0x14cacd0900000000, 0x4cccbe7400000000,
+    0xc91528a900000000, 0x0779e21400000000, 0x82a074c900000000,
+    0xb77504ee00000000, 0x32ac923300000000, 0xfcc0588e00000000,
+    0x7919ce5300000000, 0x211fbd2e00000000, 0xa4c62bf300000000,
+    0x6aaae14e00000000, 0xef73779300000000, 0xf54b7eb300000000,
+    0x7092e86e00000000, 0xbefe22d300000000, 0x3b27b40e00000000,
+    0x6321c77300000000, 0xe6f851ae00000000, 0x28949b1300000000,
+    0xad4d0dce00000000, 0x98987de900000000, 0x1d41eb3400000000,
+    0xd32d218900000000, 0x56f4b75400000000, 0x0ef2c42900000000,
+    0x8b2b52f400000000, 0x4547984900000000, 0xc09e0e9400000000,
+    0x2fed790700000000, 0xaa34efda00000000, 0x6458256700000000,
+    0xe181b3ba00000000, 0xb987c0c700000000, 0x3c5e561a00000000,
+    0xf2329ca700000000, 0x77eb0a7a00000000, 0x423e7a5d00000000,
+    0xc7e7ec8000000000, 0x098b263d00000000, 0x8c52b0e000000000,
+    0xd454c39d00000000, 0x518d554000000000, 0x9fe19ffd00000000,
+    0x1a38092000000000, 0xab918dbd00000000, 0x2e481b6000000000,
+    0xe024d1dd00000000, 0x65fd470000000000, 0x3dfb347d00000000,
+    0xb822a2a000000000, 0x764e681d00000000, 0xf397fec000000000,
+    0xc6428ee700000000, 0x439b183a00000000, 0x8df7d28700000000,
+    0x082e445a00000000, 0x5028372700000000, 0xd5f1a1fa00000000,
+    0x1b9d6b4700000000, 0x9e44fd9a00000000, 0x71378a0900000000,
+    0xf4ee1cd400000000, 0x3a82d66900000000, 0xbf5b40b400000000,
+    0xe75d33c900000000, 0x6284a51400000000, 0xace86fa900000000,
+    0x2931f97400000000, 0x1ce4895300000000, 0x993d1f8e00000000,
+    0x5751d53300000000, 0xd28843ee00000000, 0x8a8e309300000000,
+    0x0f57a64e00000000, 0xc13b6cf300000000, 0x44e2fa2e00000000,
+    0x5edaf30e00000000, 0xdb0365d300000000, 0x156faf6e00000000,
+    0x90b639b300000000, 0xc8b04ace00000000, 0x4d69dc1300000000,
+    0x830516ae00000000, 0x06dc807300000000, 0x3309f05400000000,
+    0xb6d0668900000000, 0x78bcac3400000000, 0xfd653ae900000000,
+    0xa563499400000000, 0x20badf4900000000, 0xeed615f400000000,
+    0x6b0f832900000000, 0x847cf4ba00000000, 0x01a5626700000000,
+    0xcfc9a8da00000000, 0x4a103e0700000000, 0x12164d7a00000000,
+    0x97cfdba700000000, 0x59a3111a00000000, 0xdc7a87c700000000,
+    0xe9aff7e000000000, 0x6c76613d00000000, 0xa21aab8000000000,
+    0x27c33d5d00000000, 0x7fc54e2000000000, 0xfa1cd8fd00000000,
+    0x3470124000000000, 0xb1a9849d00000000, 0x17256aa000000000,
+    0x92fcfc7d00000000, 0x5c9036c000000000, 0xd949a01d00000000,
+    0x814fd36000000000, 0x049645bd00000000, 0xcafa8f0000000000,
+    0x4f2319dd00000000, 0x7af669fa00000000, 0xff2fff2700000000,
+    0x3143359a00000000, 0xb49aa34700000000, 0xec9cd03a00000000,
+    0x694546e700000000, 0xa7298c5a00000000, 0x22f01a8700000000,
+    0xcd836d1400000000, 0x485afbc900000000, 0x8636317400000000,
+    0x03efa7a900000000, 0x5be9d4d400000000, 0xde30420900000000,
+    0x105c88b400000000, 0x95851e6900000000, 0xa0506e4e00000000,
+    0x2589f89300000000, 0xebe5322e00000000, 0x6e3ca4f300000000,
+    0x363ad78e00000000, 0xb3e3415300000000, 0x7d8f8bee00000000,
+    0xf8561d3300000000, 0xe26e141300000000, 0x67b782ce00000000,
+    0xa9db487300000000, 0x2c02deae00000000, 0x7404add300000000,
+    0xf1dd3b0e00000000, 0x3fb1f1b300000000, 0xba68676e00000000,
+    0x8fbd174900000000, 0x0a64819400000000, 0xc4084b2900000000,
+    0x41d1ddf400000000, 0x19d7ae8900000000, 0x9c0e385400000000,
+    0x5262f2e900000000, 0xd7bb643400000000, 0x38c813a700000000,
+    0xbd11857a00000000, 0x737d4fc700000000, 0xf6a4d91a00000000,
+    0xaea2aa6700000000, 0x2b7b3cba00000000, 0xe517f60700000000,
+    0x60ce60da00000000, 0x551b10fd00000000, 0xd0c2862000000000,
+    0x1eae4c9d00000000, 0x9b77da4000000000, 0xc371a93d00000000,
+    0x46a83fe000000000, 0x88c4f55d00000000, 0x0d1d638000000000,
+    0xbcb4e71d00000000, 0x396d71c000000000, 0xf701bb7d00000000,
+    0x72d82da000000000, 0x2ade5edd00000000, 0xaf07c80000000000,
+    0x616b02bd00000000, 0xe4b2946000000000, 0xd167e44700000000,
+    0x54be729a00000000, 0x9ad2b82700000000, 0x1f0b2efa00000000,
+    0x470d5d8700000000, 0xc2d4cb5a00000000, 0x0cb801e700000000,
+    0x8961973a00000000, 0x6612e0a900000000, 0xe3cb767400000000,
+    0x2da7bcc900000000, 0xa87e2a1400000000, 0xf078596900000000,
+    0x75a1cfb400000000, 0xbbcd050900000000, 0x3e1493d400000000,
+    0x0bc1e3f300000000, 0x8e18752e00000000, 0x4074bf9300000000,
+    0xc5ad294e00000000, 0x9dab5a3300000000, 0x1872ccee00000000,
+    0xd61e065300000000, 0x53c7908e00000000, 0x49ff99ae00000000,
+    0xcc260f7300000000, 0x024ac5ce00000000, 0x8793531300000000,
+    0xdf95206e00000000, 0x5a4cb6b300000000, 0x94207c0e00000000,
+    0x11f9ead300000000, 0x242c9af400000000, 0xa1f50c2900000000,
+    0x6f99c69400000000, 0xea40504900000000, 0xb246233400000000,
+    0x379fb5e900000000, 0xf9f37f5400000000, 0x7c2ae98900000000,
+    0x93599e1a00000000, 0x168008c700000000, 0xd8ecc27a00000000,
+    0x5d3554a700000000, 0x053327da00000000, 0x80eab10700000000,
+    0x4e867bba00000000, 0xcb5fed6700000000, 0xfe8a9d4000000000,
+    0x7b530b9d00000000, 0xb53fc12000000000, 0x30e657fd00000000,
+    0x68e0248000000000, 0xed39b25d00000000, 0x235578e000000000,
+    0xa68cee3d00000000},
+   {0x0000000000000000, 0x76e10f9d00000000, 0xadc46ee100000000,
+    0xdb25617c00000000, 0x1b8fac1900000000, 0x6d6ea38400000000,
+    0xb64bc2f800000000, 0xc0aacd6500000000, 0x361e593300000000,
+    0x40ff56ae00000000, 0x9bda37d200000000, 0xed3b384f00000000,
+    0x2d91f52a00000000, 0x5b70fab700000000, 0x80559bcb00000000,
+    0xf6b4945600000000, 0x6c3cb26600000000, 0x1addbdfb00000000,
+    0xc1f8dc8700000000, 0xb719d31a00000000, 0x77b31e7f00000000,
+    0x015211e200000000, 0xda77709e00000000, 0xac967f0300000000,
+    0x5a22eb5500000000, 0x2cc3e4c800000000, 0xf7e685b400000000,
+    0x81078a2900000000, 0x41ad474c00000000, 0x374c48d100000000,
+    0xec6929ad00000000, 0x9a88263000000000, 0xd87864cd00000000,
+    0xae996b5000000000, 0x75bc0a2c00000000, 0x035d05b100000000,
+    0xc3f7c8d400000000, 0xb516c74900000000, 0x6e33a63500000000,
+    0x18d2a9a800000000, 0xee663dfe00000000, 0x9887326300000000,
+    0x43a2531f00000000, 0x35435c8200000000, 0xf5e991e700000000,
+    0x83089e7a00000000, 0x582dff0600000000, 0x2eccf09b00000000,
+    0xb444d6ab00000000, 0xc2a5d93600000000, 0x1980b84a00000000,
+    0x6f61b7d700000000, 0xafcb7ab200000000, 0xd92a752f00000000,
+    0x020f145300000000, 0x74ee1bce00000000, 0x825a8f9800000000,
+    0xf4bb800500000000, 0x2f9ee17900000000, 0x597feee400000000,
+    0x99d5238100000000, 0xef342c1c00000000, 0x34114d6000000000,
+    0x42f042fd00000000, 0xf1f7b94100000000, 0x8716b6dc00000000,
+    0x5c33d7a000000000, 0x2ad2d83d00000000, 0xea78155800000000,
+    0x9c991ac500000000, 0x47bc7bb900000000, 0x315d742400000000,
+    0xc7e9e07200000000, 0xb108efef00000000, 0x6a2d8e9300000000,
+    0x1ccc810e00000000, 0xdc664c6b00000000, 0xaa8743f600000000,
+    0x71a2228a00000000, 0x07432d1700000000, 0x9dcb0b2700000000,
+    0xeb2a04ba00000000, 0x300f65c600000000, 0x46ee6a5b00000000,
+    0x8644a73e00000000, 0xf0a5a8a300000000, 0x2b80c9df00000000,
+    0x5d61c64200000000, 0xabd5521400000000, 0xdd345d8900000000,
+    0x06113cf500000000, 0x70f0336800000000, 0xb05afe0d00000000,
+    0xc6bbf19000000000, 0x1d9e90ec00000000, 0x6b7f9f7100000000,
+    0x298fdd8c00000000, 0x5f6ed21100000000, 0x844bb36d00000000,
+    0xf2aabcf000000000, 0x3200719500000000, 0x44e17e0800000000,
+    0x9fc41f7400000000, 0xe92510e900000000, 0x1f9184bf00000000,
+    0x69708b2200000000, 0xb255ea5e00000000, 0xc4b4e5c300000000,
+    0x041e28a600000000, 0x72ff273b00000000, 0xa9da464700000000,
+    0xdf3b49da00000000, 0x45b36fea00000000, 0x3352607700000000,
+    0xe877010b00000000, 0x9e960e9600000000, 0x5e3cc3f300000000,
+    0x28ddcc6e00000000, 0xf3f8ad1200000000, 0x8519a28f00000000,
+    0x73ad36d900000000, 0x054c394400000000, 0xde69583800000000,
+    0xa88857a500000000, 0x68229ac000000000, 0x1ec3955d00000000,
+    0xc5e6f42100000000, 0xb307fbbc00000000, 0xe2ef738300000000,
+    0x940e7c1e00000000, 0x4f2b1d6200000000, 0x39ca12ff00000000,
+    0xf960df9a00000000, 0x8f81d00700000000, 0x54a4b17b00000000,
+    0x2245bee600000000, 0xd4f12ab000000000, 0xa210252d00000000,
+    0x7935445100000000, 0x0fd44bcc00000000, 0xcf7e86a900000000,
+    0xb99f893400000000, 0x62bae84800000000, 0x145be7d500000000,
+    0x8ed3c1e500000000, 0xf832ce7800000000, 0x2317af0400000000,
+    0x55f6a09900000000, 0x955c6dfc00000000, 0xe3bd626100000000,
+    0x3898031d00000000, 0x4e790c8000000000, 0xb8cd98d600000000,
+    0xce2c974b00000000, 0x1509f63700000000, 0x63e8f9aa00000000,
+    0xa34234cf00000000, 0xd5a33b5200000000, 0x0e865a2e00000000,
+    0x786755b300000000, 0x3a97174e00000000, 0x4c7618d300000000,
+    0x975379af00000000, 0xe1b2763200000000, 0x2118bb5700000000,
+    0x57f9b4ca00000000, 0x8cdcd5b600000000, 0xfa3dda2b00000000,
+    0x0c894e7d00000000, 0x7a6841e000000000, 0xa14d209c00000000,
+    0xd7ac2f0100000000, 0x1706e26400000000, 0x61e7edf900000000,
+    0xbac28c8500000000, 0xcc23831800000000, 0x56aba52800000000,
+    0x204aaab500000000, 0xfb6fcbc900000000, 0x8d8ec45400000000,
+    0x4d24093100000000, 0x3bc506ac00000000, 0xe0e067d000000000,
+    0x9601684d00000000, 0x60b5fc1b00000000, 0x1654f38600000000,
+    0xcd7192fa00000000, 0xbb909d6700000000, 0x7b3a500200000000,
+    0x0ddb5f9f00000000, 0xd6fe3ee300000000, 0xa01f317e00000000,
+    0x1318cac200000000, 0x65f9c55f00000000, 0xbedca42300000000,
+    0xc83dabbe00000000, 0x089766db00000000, 0x7e76694600000000,
+    0xa553083a00000000, 0xd3b207a700000000, 0x250693f100000000,
+    0x53e79c6c00000000, 0x88c2fd1000000000, 0xfe23f28d00000000,
+    0x3e893fe800000000, 0x4868307500000000, 0x934d510900000000,
+    0xe5ac5e9400000000, 0x7f2478a400000000, 0x09c5773900000000,
+    0xd2e0164500000000, 0xa40119d800000000, 0x64abd4bd00000000,
+    0x124adb2000000000, 0xc96fba5c00000000, 0xbf8eb5c100000000,
+    0x493a219700000000, 0x3fdb2e0a00000000, 0xe4fe4f7600000000,
+    0x921f40eb00000000, 0x52b58d8e00000000, 0x2454821300000000,
+    0xff71e36f00000000, 0x8990ecf200000000, 0xcb60ae0f00000000,
+    0xbd81a19200000000, 0x66a4c0ee00000000, 0x1045cf7300000000,
+    0xd0ef021600000000, 0xa60e0d8b00000000, 0x7d2b6cf700000000,
+    0x0bca636a00000000, 0xfd7ef73c00000000, 0x8b9ff8a100000000,
+    0x50ba99dd00000000, 0x265b964000000000, 0xe6f15b2500000000,
+    0x901054b800000000, 0x4b3535c400000000, 0x3dd43a5900000000,
+    0xa75c1c6900000000, 0xd1bd13f400000000, 0x0a98728800000000,
+    0x7c797d1500000000, 0xbcd3b07000000000, 0xca32bfed00000000,
+    0x1117de9100000000, 0x67f6d10c00000000, 0x9142455a00000000,
+    0xe7a34ac700000000, 0x3c862bbb00000000, 0x4a67242600000000,
+    0x8acde94300000000, 0xfc2ce6de00000000, 0x270987a200000000,
+    0x51e8883f00000000},
+   {0x0000000000000000, 0xe8dbfbb900000000, 0x91b186a800000000,
+    0x796a7d1100000000, 0x63657c8a00000000, 0x8bbe873300000000,
+    0xf2d4fa2200000000, 0x1a0f019b00000000, 0x87cc89cf00000000,
+    0x6f17727600000000, 0x167d0f6700000000, 0xfea6f4de00000000,
+    0xe4a9f54500000000, 0x0c720efc00000000, 0x751873ed00000000,
+    0x9dc3885400000000, 0x4f9f624400000000, 0xa74499fd00000000,
+    0xde2ee4ec00000000, 0x36f51f5500000000, 0x2cfa1ece00000000,
+    0xc421e57700000000, 0xbd4b986600000000, 0x559063df00000000,
+    0xc853eb8b00000000, 0x2088103200000000, 0x59e26d2300000000,
+    0xb139969a00000000, 0xab36970100000000, 0x43ed6cb800000000,
+    0x3a8711a900000000, 0xd25cea1000000000, 0x9e3ec58800000000,
+    0x76e53e3100000000, 0x0f8f432000000000, 0xe754b89900000000,
+    0xfd5bb90200000000, 0x158042bb00000000, 0x6cea3faa00000000,
+    0x8431c41300000000, 0x19f24c4700000000, 0xf129b7fe00000000,
+    0x8843caef00000000, 0x6098315600000000, 0x7a9730cd00000000,
+    0x924ccb7400000000, 0xeb26b66500000000, 0x03fd4ddc00000000,
+    0xd1a1a7cc00000000, 0x397a5c7500000000, 0x4010216400000000,
+    0xa8cbdadd00000000, 0xb2c4db4600000000, 0x5a1f20ff00000000,
+    0x23755dee00000000, 0xcbaea65700000000, 0x566d2e0300000000,
+    0xbeb6d5ba00000000, 0xc7dca8ab00000000, 0x2f07531200000000,
+    0x3508528900000000, 0xddd3a93000000000, 0xa4b9d42100000000,
+    0x4c622f9800000000, 0x7d7bfbca00000000, 0x95a0007300000000,
+    0xecca7d6200000000, 0x041186db00000000, 0x1e1e874000000000,
+    0xf6c57cf900000000, 0x8faf01e800000000, 0x6774fa5100000000,
+    0xfab7720500000000, 0x126c89bc00000000, 0x6b06f4ad00000000,
+    0x83dd0f1400000000, 0x99d20e8f00000000, 0x7109f53600000000,
+    0x0863882700000000, 0xe0b8739e00000000, 0x32e4998e00000000,
+    0xda3f623700000000, 0xa3551f2600000000, 0x4b8ee49f00000000,
+    0x5181e50400000000, 0xb95a1ebd00000000, 0xc03063ac00000000,
+    0x28eb981500000000, 0xb528104100000000, 0x5df3ebf800000000,
+    0x249996e900000000, 0xcc426d5000000000, 0xd64d6ccb00000000,
+    0x3e96977200000000, 0x47fcea6300000000, 0xaf2711da00000000,
+    0xe3453e4200000000, 0x0b9ec5fb00000000, 0x72f4b8ea00000000,
+    0x9a2f435300000000, 0x802042c800000000, 0x68fbb97100000000,
+    0x1191c46000000000, 0xf94a3fd900000000, 0x6489b78d00000000,
+    0x8c524c3400000000, 0xf538312500000000, 0x1de3ca9c00000000,
+    0x07eccb0700000000, 0xef3730be00000000, 0x965d4daf00000000,
+    0x7e86b61600000000, 0xacda5c0600000000, 0x4401a7bf00000000,
+    0x3d6bdaae00000000, 0xd5b0211700000000, 0xcfbf208c00000000,
+    0x2764db3500000000, 0x5e0ea62400000000, 0xb6d55d9d00000000,
+    0x2b16d5c900000000, 0xc3cd2e7000000000, 0xbaa7536100000000,
+    0x527ca8d800000000, 0x4873a94300000000, 0xa0a852fa00000000,
+    0xd9c22feb00000000, 0x3119d45200000000, 0xbbf0874e00000000,
+    0x532b7cf700000000, 0x2a4101e600000000, 0xc29afa5f00000000,
+    0xd895fbc400000000, 0x304e007d00000000, 0x49247d6c00000000,
+    0xa1ff86d500000000, 0x3c3c0e8100000000, 0xd4e7f53800000000,
+    0xad8d882900000000, 0x4556739000000000, 0x5f59720b00000000,
+    0xb78289b200000000, 0xcee8f4a300000000, 0x26330f1a00000000,
+    0xf46fe50a00000000, 0x1cb41eb300000000, 0x65de63a200000000,
+    0x8d05981b00000000, 0x970a998000000000, 0x7fd1623900000000,
+    0x06bb1f2800000000, 0xee60e49100000000, 0x73a36cc500000000,
+    0x9b78977c00000000, 0xe212ea6d00000000, 0x0ac911d400000000,
+    0x10c6104f00000000, 0xf81debf600000000, 0x817796e700000000,
+    0x69ac6d5e00000000, 0x25ce42c600000000, 0xcd15b97f00000000,
+    0xb47fc46e00000000, 0x5ca43fd700000000, 0x46ab3e4c00000000,
+    0xae70c5f500000000, 0xd71ab8e400000000, 0x3fc1435d00000000,
+    0xa202cb0900000000, 0x4ad930b000000000, 0x33b34da100000000,
+    0xdb68b61800000000, 0xc167b78300000000, 0x29bc4c3a00000000,
+    0x50d6312b00000000, 0xb80dca9200000000, 0x6a51208200000000,
+    0x828adb3b00000000, 0xfbe0a62a00000000, 0x133b5d9300000000,
+    0x09345c0800000000, 0xe1efa7b100000000, 0x9885daa000000000,
+    0x705e211900000000, 0xed9da94d00000000, 0x054652f400000000,
+    0x7c2c2fe500000000, 0x94f7d45c00000000, 0x8ef8d5c700000000,
+    0x66232e7e00000000, 0x1f49536f00000000, 0xf792a8d600000000,
+    0xc68b7c8400000000, 0x2e50873d00000000, 0x573afa2c00000000,
+    0xbfe1019500000000, 0xa5ee000e00000000, 0x4d35fbb700000000,
+    0x345f86a600000000, 0xdc847d1f00000000, 0x4147f54b00000000,
+    0xa99c0ef200000000, 0xd0f673e300000000, 0x382d885a00000000,
+    0x222289c100000000, 0xcaf9727800000000, 0xb3930f6900000000,
+    0x5b48f4d000000000, 0x89141ec000000000, 0x61cfe57900000000,
+    0x18a5986800000000, 0xf07e63d100000000, 0xea71624a00000000,
+    0x02aa99f300000000, 0x7bc0e4e200000000, 0x931b1f5b00000000,
+    0x0ed8970f00000000, 0xe6036cb600000000, 0x9f6911a700000000,
+    0x77b2ea1e00000000, 0x6dbdeb8500000000, 0x8566103c00000000,
+    0xfc0c6d2d00000000, 0x14d7969400000000, 0x58b5b90c00000000,
+    0xb06e42b500000000, 0xc9043fa400000000, 0x21dfc41d00000000,
+    0x3bd0c58600000000, 0xd30b3e3f00000000, 0xaa61432e00000000,
+    0x42bab89700000000, 0xdf7930c300000000, 0x37a2cb7a00000000,
+    0x4ec8b66b00000000, 0xa6134dd200000000, 0xbc1c4c4900000000,
+    0x54c7b7f000000000, 0x2dadcae100000000, 0xc576315800000000,
+    0x172adb4800000000, 0xfff120f100000000, 0x869b5de000000000,
+    0x6e40a65900000000, 0x744fa7c200000000, 0x9c945c7b00000000,
+    0xe5fe216a00000000, 0x0d25dad300000000, 0x90e6528700000000,
+    0x783da93e00000000, 0x0157d42f00000000, 0xe98c2f9600000000,
+    0xf3832e0d00000000, 0x1b58d5b400000000, 0x6232a8a500000000,
+    0x8ae9531c00000000},
+   {0x0000000000000000, 0x919168ae00000000, 0x6325a08700000000,
+    0xf2b4c82900000000, 0x874c31d400000000, 0x16dd597a00000000,
+    0xe469915300000000, 0x75f8f9fd00000000, 0x4f9f137300000000,
+    0xde0e7bdd00000000, 0x2cbab3f400000000, 0xbd2bdb5a00000000,
+    0xc8d322a700000000, 0x59424a0900000000, 0xabf6822000000000,
+    0x3a67ea8e00000000, 0x9e3e27e600000000, 0x0faf4f4800000000,
+    0xfd1b876100000000, 0x6c8aefcf00000000, 0x1972163200000000,
+    0x88e37e9c00000000, 0x7a57b6b500000000, 0xebc6de1b00000000,
+    0xd1a1349500000000, 0x40305c3b00000000, 0xb284941200000000,
+    0x2315fcbc00000000, 0x56ed054100000000, 0xc77c6def00000000,
+    0x35c8a5c600000000, 0xa459cd6800000000, 0x7d7b3f1700000000,
+    0xecea57b900000000, 0x1e5e9f9000000000, 0x8fcff73e00000000,
+    0xfa370ec300000000, 0x6ba6666d00000000, 0x9912ae4400000000,
+    0x0883c6ea00000000, 0x32e42c6400000000, 0xa37544ca00000000,
+    0x51c18ce300000000, 0xc050e44d00000000, 0xb5a81db000000000,
+    0x2439751e00000000, 0xd68dbd3700000000, 0x471cd59900000000,
+    0xe34518f100000000, 0x72d4705f00000000, 0x8060b87600000000,
+    0x11f1d0d800000000, 0x6409292500000000, 0xf598418b00000000,
+    0x072c89a200000000, 0x96bde10c00000000, 0xacda0b8200000000,
+    0x3d4b632c00000000, 0xcfffab0500000000, 0x5e6ec3ab00000000,
+    0x2b963a5600000000, 0xba0752f800000000, 0x48b39ad100000000,
+    0xd922f27f00000000, 0xfaf67e2e00000000, 0x6b67168000000000,
+    0x99d3dea900000000, 0x0842b60700000000, 0x7dba4ffa00000000,
+    0xec2b275400000000, 0x1e9fef7d00000000, 0x8f0e87d300000000,
+    0xb5696d5d00000000, 0x24f805f300000000, 0xd64ccdda00000000,
+    0x47dda57400000000, 0x32255c8900000000, 0xa3b4342700000000,
+    0x5100fc0e00000000, 0xc09194a000000000, 0x64c859c800000000,
+    0xf559316600000000, 0x07edf94f00000000, 0x967c91e100000000,
+    0xe384681c00000000, 0x721500b200000000, 0x80a1c89b00000000,
+    0x1130a03500000000, 0x2b574abb00000000, 0xbac6221500000000,
+    0x4872ea3c00000000, 0xd9e3829200000000, 0xac1b7b6f00000000,
+    0x3d8a13c100000000, 0xcf3edbe800000000, 0x5eafb34600000000,
+    0x878d413900000000, 0x161c299700000000, 0xe4a8e1be00000000,
+    0x7539891000000000, 0x00c170ed00000000, 0x9150184300000000,
+    0x63e4d06a00000000, 0xf275b8c400000000, 0xc812524a00000000,
+    0x59833ae400000000, 0xab37f2cd00000000, 0x3aa69a6300000000,
+    0x4f5e639e00000000, 0xdecf0b3000000000, 0x2c7bc31900000000,
+    0xbdeaabb700000000, 0x19b366df00000000, 0x88220e7100000000,
+    0x7a96c65800000000, 0xeb07aef600000000, 0x9eff570b00000000,
+    0x0f6e3fa500000000, 0xfddaf78c00000000, 0x6c4b9f2200000000,
+    0x562c75ac00000000, 0xc7bd1d0200000000, 0x3509d52b00000000,
+    0xa498bd8500000000, 0xd160447800000000, 0x40f12cd600000000,
+    0xb245e4ff00000000, 0x23d48c5100000000, 0xf4edfd5c00000000,
+    0x657c95f200000000, 0x97c85ddb00000000, 0x0659357500000000,
+    0x73a1cc8800000000, 0xe230a42600000000, 0x10846c0f00000000,
+    0x811504a100000000, 0xbb72ee2f00000000, 0x2ae3868100000000,
+    0xd8574ea800000000, 0x49c6260600000000, 0x3c3edffb00000000,
+    0xadafb75500000000, 0x5f1b7f7c00000000, 0xce8a17d200000000,
+    0x6ad3daba00000000, 0xfb42b21400000000, 0x09f67a3d00000000,
+    0x9867129300000000, 0xed9feb6e00000000, 0x7c0e83c000000000,
+    0x8eba4be900000000, 0x1f2b234700000000, 0x254cc9c900000000,
+    0xb4dda16700000000, 0x4669694e00000000, 0xd7f801e000000000,
+    0xa200f81d00000000, 0x339190b300000000, 0xc125589a00000000,
+    0x50b4303400000000, 0x8996c24b00000000, 0x1807aae500000000,
+    0xeab362cc00000000, 0x7b220a6200000000, 0x0edaf39f00000000,
+    0x9f4b9b3100000000, 0x6dff531800000000, 0xfc6e3bb600000000,
+    0xc609d13800000000, 0x5798b99600000000, 0xa52c71bf00000000,
+    0x34bd191100000000, 0x4145e0ec00000000, 0xd0d4884200000000,
+    0x2260406b00000000, 0xb3f128c500000000, 0x17a8e5ad00000000,
+    0x86398d0300000000, 0x748d452a00000000, 0xe51c2d8400000000,
+    0x90e4d47900000000, 0x0175bcd700000000, 0xf3c174fe00000000,
+    0x62501c5000000000, 0x5837f6de00000000, 0xc9a69e7000000000,
+    0x3b12565900000000, 0xaa833ef700000000, 0xdf7bc70a00000000,
+    0x4eeaafa400000000, 0xbc5e678d00000000, 0x2dcf0f2300000000,
+    0x0e1b837200000000, 0x9f8aebdc00000000, 0x6d3e23f500000000,
+    0xfcaf4b5b00000000, 0x8957b2a600000000, 0x18c6da0800000000,
+    0xea72122100000000, 0x7be37a8f00000000, 0x4184900100000000,
+    0xd015f8af00000000, 0x22a1308600000000, 0xb330582800000000,
+    0xc6c8a1d500000000, 0x5759c97b00000000, 0xa5ed015200000000,
+    0x347c69fc00000000, 0x9025a49400000000, 0x01b4cc3a00000000,
+    0xf300041300000000, 0x62916cbd00000000, 0x1769954000000000,
+    0x86f8fdee00000000, 0x744c35c700000000, 0xe5dd5d6900000000,
+    0xdfbab7e700000000, 0x4e2bdf4900000000, 0xbc9f176000000000,
+    0x2d0e7fce00000000, 0x58f6863300000000, 0xc967ee9d00000000,
+    0x3bd326b400000000, 0xaa424e1a00000000, 0x7360bc6500000000,
+    0xe2f1d4cb00000000, 0x10451ce200000000, 0x81d4744c00000000,
+    0xf42c8db100000000, 0x65bde51f00000000, 0x97092d3600000000,
+    0x0698459800000000, 0x3cffaf1600000000, 0xad6ec7b800000000,
+    0x5fda0f9100000000, 0xce4b673f00000000, 0xbbb39ec200000000,
+    0x2a22f66c00000000, 0xd8963e4500000000, 0x490756eb00000000,
+    0xed5e9b8300000000, 0x7ccff32d00000000, 0x8e7b3b0400000000,
+    0x1fea53aa00000000, 0x6a12aa5700000000, 0xfb83c2f900000000,
+    0x09370ad000000000, 0x98a6627e00000000, 0xa2c188f000000000,
+    0x3350e05e00000000, 0xc1e4287700000000, 0x507540d900000000,
+    0x258db92400000000, 0xb41cd18a00000000, 0x46a819a300000000,
+    0xd739710d00000000}};
+
+#else /* W == 4 */
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0xccaa009e, 0x4225077d, 0x8e8f07e3, 0x844a0efa,
+    0x48e00e64, 0xc66f0987, 0x0ac50919, 0xd3e51bb5, 0x1f4f1b2b,
+    0x91c01cc8, 0x5d6a1c56, 0x57af154f, 0x9b0515d1, 0x158a1232,
+    0xd92012ac, 0x7cbb312b, 0xb01131b5, 0x3e9e3656, 0xf23436c8,
+    0xf8f13fd1, 0x345b3f4f, 0xbad438ac, 0x767e3832, 0xaf5e2a9e,
+    0x63f42a00, 0xed7b2de3, 0x21d12d7d, 0x2b142464, 0xe7be24fa,
+    0x69312319, 0xa59b2387, 0xf9766256, 0x35dc62c8, 0xbb53652b,
+    0x77f965b5, 0x7d3c6cac, 0xb1966c32, 0x3f196bd1, 0xf3b36b4f,
+    0x2a9379e3, 0xe639797d, 0x68b67e9e, 0xa41c7e00, 0xaed97719,
+    0x62737787, 0xecfc7064, 0x205670fa, 0x85cd537d, 0x496753e3,
+    0xc7e85400, 0x0b42549e, 0x01875d87, 0xcd2d5d19, 0x43a25afa,
+    0x8f085a64, 0x562848c8, 0x9a824856, 0x140d4fb5, 0xd8a74f2b,
+    0xd2624632, 0x1ec846ac, 0x9047414f, 0x5ced41d1, 0x299dc2ed,
+    0xe537c273, 0x6bb8c590, 0xa712c50e, 0xadd7cc17, 0x617dcc89,
+    0xeff2cb6a, 0x2358cbf4, 0xfa78d958, 0x36d2d9c6, 0xb85dde25,
+    0x74f7debb, 0x7e32d7a2, 0xb298d73c, 0x3c17d0df, 0xf0bdd041,
+    0x5526f3c6, 0x998cf358, 0x1703f4bb, 0xdba9f425, 0xd16cfd3c,
+    0x1dc6fda2, 0x9349fa41, 0x5fe3fadf, 0x86c3e873, 0x4a69e8ed,
+    0xc4e6ef0e, 0x084cef90, 0x0289e689, 0xce23e617, 0x40ace1f4,
+    0x8c06e16a, 0xd0eba0bb, 0x1c41a025, 0x92cea7c6, 0x5e64a758,
+    0x54a1ae41, 0x980baedf, 0x1684a93c, 0xda2ea9a2, 0x030ebb0e,
+    0xcfa4bb90, 0x412bbc73, 0x8d81bced, 0x8744b5f4, 0x4beeb56a,
+    0xc561b289, 0x09cbb217, 0xac509190, 0x60fa910e, 0xee7596ed,
+    0x22df9673, 0x281a9f6a, 0xe4b09ff4, 0x6a3f9817, 0xa6959889,
+    0x7fb58a25, 0xb31f8abb, 0x3d908d58, 0xf13a8dc6, 0xfbff84df,
+    0x37558441, 0xb9da83a2, 0x7570833c, 0x533b85da, 0x9f918544,
+    0x111e82a7, 0xddb48239, 0xd7718b20, 0x1bdb8bbe, 0x95548c5d,
+    0x59fe8cc3, 0x80de9e6f, 0x4c749ef1, 0xc2fb9912, 0x0e51998c,
+    0x04949095, 0xc83e900b, 0x46b197e8, 0x8a1b9776, 0x2f80b4f1,
+    0xe32ab46f, 0x6da5b38c, 0xa10fb312, 0xabcaba0b, 0x6760ba95,
+    0xe9efbd76, 0x2545bde8, 0xfc65af44, 0x30cfafda, 0xbe40a839,
+    0x72eaa8a7, 0x782fa1be, 0xb485a120, 0x3a0aa6c3, 0xf6a0a65d,
+    0xaa4de78c, 0x66e7e712, 0xe868e0f1, 0x24c2e06f, 0x2e07e976,
+    0xe2ade9e8, 0x6c22ee0b, 0xa088ee95, 0x79a8fc39, 0xb502fca7,
+    0x3b8dfb44, 0xf727fbda, 0xfde2f2c3, 0x3148f25d, 0xbfc7f5be,
+    0x736df520, 0xd6f6d6a7, 0x1a5cd639, 0x94d3d1da, 0x5879d144,
+    0x52bcd85d, 0x9e16d8c3, 0x1099df20, 0xdc33dfbe, 0x0513cd12,
+    0xc9b9cd8c, 0x4736ca6f, 0x8b9ccaf1, 0x8159c3e8, 0x4df3c376,
+    0xc37cc495, 0x0fd6c40b, 0x7aa64737, 0xb60c47a9, 0x3883404a,
+    0xf42940d4, 0xfeec49cd, 0x32464953, 0xbcc94eb0, 0x70634e2e,
+    0xa9435c82, 0x65e95c1c, 0xeb665bff, 0x27cc5b61, 0x2d095278,
+    0xe1a352e6, 0x6f2c5505, 0xa386559b, 0x061d761c, 0xcab77682,
+    0x44387161, 0x889271ff, 0x825778e6, 0x4efd7878, 0xc0727f9b,
+    0x0cd87f05, 0xd5f86da9, 0x19526d37, 0x97dd6ad4, 0x5b776a4a,
+    0x51b26353, 0x9d1863cd, 0x1397642e, 0xdf3d64b0, 0x83d02561,
+    0x4f7a25ff, 0xc1f5221c, 0x0d5f2282, 0x079a2b9b, 0xcb302b05,
+    0x45bf2ce6, 0x89152c78, 0x50353ed4, 0x9c9f3e4a, 0x121039a9,
+    0xdeba3937, 0xd47f302e, 0x18d530b0, 0x965a3753, 0x5af037cd,
+    0xff6b144a, 0x33c114d4, 0xbd4e1337, 0x71e413a9, 0x7b211ab0,
+    0xb78b1a2e, 0x39041dcd, 0xf5ae1d53, 0x2c8e0fff, 0xe0240f61,
+    0x6eab0882, 0xa201081c, 0xa8c40105, 0x646e019b, 0xeae10678,
+    0x264b06e6},
+   {0x00000000, 0xa6770bb4, 0x979f1129, 0x31e81a9d, 0xf44f2413,
+    0x52382fa7, 0x63d0353a, 0xc5a73e8e, 0x33ef4e67, 0x959845d3,
+    0xa4705f4e, 0x020754fa, 0xc7a06a74, 0x61d761c0, 0x503f7b5d,
+    0xf64870e9, 0x67de9cce, 0xc1a9977a, 0xf0418de7, 0x56368653,
+    0x9391b8dd, 0x35e6b369, 0x040ea9f4, 0xa279a240, 0x5431d2a9,
+    0xf246d91d, 0xc3aec380, 0x65d9c834, 0xa07ef6ba, 0x0609fd0e,
+    0x37e1e793, 0x9196ec27, 0xcfbd399c, 0x69ca3228, 0x582228b5,
+    0xfe552301, 0x3bf21d8f, 0x9d85163b, 0xac6d0ca6, 0x0a1a0712,
+    0xfc5277fb, 0x5a257c4f, 0x6bcd66d2, 0xcdba6d66, 0x081d53e8,
+    0xae6a585c, 0x9f8242c1, 0x39f54975, 0xa863a552, 0x0e14aee6,
+    0x3ffcb47b, 0x998bbfcf, 0x5c2c8141, 0xfa5b8af5, 0xcbb39068,
+    0x6dc49bdc, 0x9b8ceb35, 0x3dfbe081, 0x0c13fa1c, 0xaa64f1a8,
+    0x6fc3cf26, 0xc9b4c492, 0xf85cde0f, 0x5e2bd5bb, 0x440b7579,
+    0xe27c7ecd, 0xd3946450, 0x75e36fe4, 0xb044516a, 0x16335ade,
+    0x27db4043, 0x81ac4bf7, 0x77e43b1e, 0xd19330aa, 0xe07b2a37,
+    0x460c2183, 0x83ab1f0d, 0x25dc14b9, 0x14340e24, 0xb2430590,
+    0x23d5e9b7, 0x85a2e203, 0xb44af89e, 0x123df32a, 0xd79acda4,
+    0x71edc610, 0x4005dc8d, 0xe672d739, 0x103aa7d0, 0xb64dac64,
+    0x87a5b6f9, 0x21d2bd4d, 0xe47583c3, 0x42028877, 0x73ea92ea,
+    0xd59d995e, 0x8bb64ce5, 0x2dc14751, 0x1c295dcc, 0xba5e5678,
+    0x7ff968f6, 0xd98e6342, 0xe86679df, 0x4e11726b, 0xb8590282,
+    0x1e2e0936, 0x2fc613ab, 0x89b1181f, 0x4c162691, 0xea612d25,
+    0xdb8937b8, 0x7dfe3c0c, 0xec68d02b, 0x4a1fdb9f, 0x7bf7c102,
+    0xdd80cab6, 0x1827f438, 0xbe50ff8c, 0x8fb8e511, 0x29cfeea5,
+    0xdf879e4c, 0x79f095f8, 0x48188f65, 0xee6f84d1, 0x2bc8ba5f,
+    0x8dbfb1eb, 0xbc57ab76, 0x1a20a0c2, 0x8816eaf2, 0x2e61e146,
+    0x1f89fbdb, 0xb9fef06f, 0x7c59cee1, 0xda2ec555, 0xebc6dfc8,
+    0x4db1d47c, 0xbbf9a495, 0x1d8eaf21, 0x2c66b5bc, 0x8a11be08,
+    0x4fb68086, 0xe9c18b32, 0xd82991af, 0x7e5e9a1b, 0xefc8763c,
+    0x49bf7d88, 0x78576715, 0xde206ca1, 0x1b87522f, 0xbdf0599b,
+    0x8c184306, 0x2a6f48b2, 0xdc27385b, 0x7a5033ef, 0x4bb82972,
+    0xedcf22c6, 0x28681c48, 0x8e1f17fc, 0xbff70d61, 0x198006d5,
+    0x47abd36e, 0xe1dcd8da, 0xd034c247, 0x7643c9f3, 0xb3e4f77d,
+    0x1593fcc9, 0x247be654, 0x820cede0, 0x74449d09, 0xd23396bd,
+    0xe3db8c20, 0x45ac8794, 0x800bb91a, 0x267cb2ae, 0x1794a833,
+    0xb1e3a387, 0x20754fa0, 0x86024414, 0xb7ea5e89, 0x119d553d,
+    0xd43a6bb3, 0x724d6007, 0x43a57a9a, 0xe5d2712e, 0x139a01c7,
+    0xb5ed0a73, 0x840510ee, 0x22721b5a, 0xe7d525d4, 0x41a22e60,
+    0x704a34fd, 0xd63d3f49, 0xcc1d9f8b, 0x6a6a943f, 0x5b828ea2,
+    0xfdf58516, 0x3852bb98, 0x9e25b02c, 0xafcdaab1, 0x09baa105,
+    0xfff2d1ec, 0x5985da58, 0x686dc0c5, 0xce1acb71, 0x0bbdf5ff,
+    0xadcafe4b, 0x9c22e4d6, 0x3a55ef62, 0xabc30345, 0x0db408f1,
+    0x3c5c126c, 0x9a2b19d8, 0x5f8c2756, 0xf9fb2ce2, 0xc813367f,
+    0x6e643dcb, 0x982c4d22, 0x3e5b4696, 0x0fb35c0b, 0xa9c457bf,
+    0x6c636931, 0xca146285, 0xfbfc7818, 0x5d8b73ac, 0x03a0a617,
+    0xa5d7ada3, 0x943fb73e, 0x3248bc8a, 0xf7ef8204, 0x519889b0,
+    0x6070932d, 0xc6079899, 0x304fe870, 0x9638e3c4, 0xa7d0f959,
+    0x01a7f2ed, 0xc400cc63, 0x6277c7d7, 0x539fdd4a, 0xf5e8d6fe,
+    0x647e3ad9, 0xc209316d, 0xf3e12bf0, 0x55962044, 0x90311eca,
+    0x3646157e, 0x07ae0fe3, 0xa1d90457, 0x579174be, 0xf1e67f0a,
+    0xc00e6597, 0x66796e23, 0xa3de50ad, 0x05a95b19, 0x34414184,
+    0x92364a30},
+   {0x00000000, 0xcb5cd3a5, 0x4dc8a10b, 0x869472ae, 0x9b914216,
+    0x50cd91b3, 0xd659e31d, 0x1d0530b8, 0xec53826d, 0x270f51c8,
+    0xa19b2366, 0x6ac7f0c3, 0x77c2c07b, 0xbc9e13de, 0x3a0a6170,
+    0xf156b2d5, 0x03d6029b, 0xc88ad13e, 0x4e1ea390, 0x85427035,
+    0x9847408d, 0x531b9328, 0xd58fe186, 0x1ed33223, 0xef8580f6,
+    0x24d95353, 0xa24d21fd, 0x6911f258, 0x7414c2e0, 0xbf481145,
+    0x39dc63eb, 0xf280b04e, 0x07ac0536, 0xccf0d693, 0x4a64a43d,
+    0x81387798, 0x9c3d4720, 0x57619485, 0xd1f5e62b, 0x1aa9358e,
+    0xebff875b, 0x20a354fe, 0xa6372650, 0x6d6bf5f5, 0x706ec54d,
+    0xbb3216e8, 0x3da66446, 0xf6fab7e3, 0x047a07ad, 0xcf26d408,
+    0x49b2a6a6, 0x82ee7503, 0x9feb45bb, 0x54b7961e, 0xd223e4b0,
+    0x197f3715, 0xe82985c0, 0x23755665, 0xa5e124cb, 0x6ebdf76e,
+    0x73b8c7d6, 0xb8e41473, 0x3e7066dd, 0xf52cb578, 0x0f580a6c,
+    0xc404d9c9, 0x4290ab67, 0x89cc78c2, 0x94c9487a, 0x5f959bdf,
+    0xd901e971, 0x125d3ad4, 0xe30b8801, 0x28575ba4, 0xaec3290a,
+    0x659ffaaf, 0x789aca17, 0xb3c619b2, 0x35526b1c, 0xfe0eb8b9,
+    0x0c8e08f7, 0xc7d2db52, 0x4146a9fc, 0x8a1a7a59, 0x971f4ae1,
+    0x5c439944, 0xdad7ebea, 0x118b384f, 0xe0dd8a9a, 0x2b81593f,
+    0xad152b91, 0x6649f834, 0x7b4cc88c, 0xb0101b29, 0x36846987,
+    0xfdd8ba22, 0x08f40f5a, 0xc3a8dcff, 0x453cae51, 0x8e607df4,
+    0x93654d4c, 0x58399ee9, 0xdeadec47, 0x15f13fe2, 0xe4a78d37,
+    0x2ffb5e92, 0xa96f2c3c, 0x6233ff99, 0x7f36cf21, 0xb46a1c84,
+    0x32fe6e2a, 0xf9a2bd8f, 0x0b220dc1, 0xc07ede64, 0x46eaacca,
+    0x8db67f6f, 0x90b34fd7, 0x5bef9c72, 0xdd7beedc, 0x16273d79,
+    0xe7718fac, 0x2c2d5c09, 0xaab92ea7, 0x61e5fd02, 0x7ce0cdba,
+    0xb7bc1e1f, 0x31286cb1, 0xfa74bf14, 0x1eb014d8, 0xd5ecc77d,
+    0x5378b5d3, 0x98246676, 0x852156ce, 0x4e7d856b, 0xc8e9f7c5,
+    0x03b52460, 0xf2e396b5, 0x39bf4510, 0xbf2b37be, 0x7477e41b,
+    0x6972d4a3, 0xa22e0706, 0x24ba75a8, 0xefe6a60d, 0x1d661643,
+    0xd63ac5e6, 0x50aeb748, 0x9bf264ed, 0x86f75455, 0x4dab87f0,
+    0xcb3ff55e, 0x006326fb, 0xf135942e, 0x3a69478b, 0xbcfd3525,
+    0x77a1e680, 0x6aa4d638, 0xa1f8059d, 0x276c7733, 0xec30a496,
+    0x191c11ee, 0xd240c24b, 0x54d4b0e5, 0x9f886340, 0x828d53f8,
+    0x49d1805d, 0xcf45f2f3, 0x04192156, 0xf54f9383, 0x3e134026,
+    0xb8873288, 0x73dbe12d, 0x6eded195, 0xa5820230, 0x2316709e,
+    0xe84aa33b, 0x1aca1375, 0xd196c0d0, 0x5702b27e, 0x9c5e61db,
+    0x815b5163, 0x4a0782c6, 0xcc93f068, 0x07cf23cd, 0xf6999118,
+    0x3dc542bd, 0xbb513013, 0x700de3b6, 0x6d08d30e, 0xa65400ab,
+    0x20c07205, 0xeb9ca1a0, 0x11e81eb4, 0xdab4cd11, 0x5c20bfbf,
+    0x977c6c1a, 0x8a795ca2, 0x41258f07, 0xc7b1fda9, 0x0ced2e0c,
+    0xfdbb9cd9, 0x36e74f7c, 0xb0733dd2, 0x7b2fee77, 0x662adecf,
+    0xad760d6a, 0x2be27fc4, 0xe0beac61, 0x123e1c2f, 0xd962cf8a,
+    0x5ff6bd24, 0x94aa6e81, 0x89af5e39, 0x42f38d9c, 0xc467ff32,
+    0x0f3b2c97, 0xfe6d9e42, 0x35314de7, 0xb3a53f49, 0x78f9ecec,
+    0x65fcdc54, 0xaea00ff1, 0x28347d5f, 0xe368aefa, 0x16441b82,
+    0xdd18c827, 0x5b8cba89, 0x90d0692c, 0x8dd55994, 0x46898a31,
+    0xc01df89f, 0x0b412b3a, 0xfa1799ef, 0x314b4a4a, 0xb7df38e4,
+    0x7c83eb41, 0x6186dbf9, 0xaada085c, 0x2c4e7af2, 0xe712a957,
+    0x15921919, 0xdececabc, 0x585ab812, 0x93066bb7, 0x8e035b0f,
+    0x455f88aa, 0xc3cbfa04, 0x089729a1, 0xf9c19b74, 0x329d48d1,
+    0xb4093a7f, 0x7f55e9da, 0x6250d962, 0xa90c0ac7, 0x2f987869,
+    0xe4c4abcc},
+   {0x00000000, 0x3d6029b0, 0x7ac05360, 0x47a07ad0, 0xf580a6c0,
+    0xc8e08f70, 0x8f40f5a0, 0xb220dc10, 0x30704bc1, 0x0d106271,
+    0x4ab018a1, 0x77d03111, 0xc5f0ed01, 0xf890c4b1, 0xbf30be61,
+    0x825097d1, 0x60e09782, 0x5d80be32, 0x1a20c4e2, 0x2740ed52,
+    0x95603142, 0xa80018f2, 0xefa06222, 0xd2c04b92, 0x5090dc43,
+    0x6df0f5f3, 0x2a508f23, 0x1730a693, 0xa5107a83, 0x98705333,
+    0xdfd029e3, 0xe2b00053, 0xc1c12f04, 0xfca106b4, 0xbb017c64,
+    0x866155d4, 0x344189c4, 0x0921a074, 0x4e81daa4, 0x73e1f314,
+    0xf1b164c5, 0xccd14d75, 0x8b7137a5, 0xb6111e15, 0x0431c205,
+    0x3951ebb5, 0x7ef19165, 0x4391b8d5, 0xa121b886, 0x9c419136,
+    0xdbe1ebe6, 0xe681c256, 0x54a11e46, 0x69c137f6, 0x2e614d26,
+    0x13016496, 0x9151f347, 0xac31daf7, 0xeb91a027, 0xd6f18997,
+    0x64d15587, 0x59b17c37, 0x1e1106e7, 0x23712f57, 0x58f35849,
+    0x659371f9, 0x22330b29, 0x1f532299, 0xad73fe89, 0x9013d739,
+    0xd7b3ade9, 0xead38459, 0x68831388, 0x55e33a38, 0x124340e8,
+    0x2f236958, 0x9d03b548, 0xa0639cf8, 0xe7c3e628, 0xdaa3cf98,
+    0x3813cfcb, 0x0573e67b, 0x42d39cab, 0x7fb3b51b, 0xcd93690b,
+    0xf0f340bb, 0xb7533a6b, 0x8a3313db, 0x0863840a, 0x3503adba,
+    0x72a3d76a, 0x4fc3feda, 0xfde322ca, 0xc0830b7a, 0x872371aa,
+    0xba43581a, 0x9932774d, 0xa4525efd, 0xe3f2242d, 0xde920d9d,
+    0x6cb2d18d, 0x51d2f83d, 0x167282ed, 0x2b12ab5d, 0xa9423c8c,
+    0x9422153c, 0xd3826fec, 0xeee2465c, 0x5cc29a4c, 0x61a2b3fc,
+    0x2602c92c, 0x1b62e09c, 0xf9d2e0cf, 0xc4b2c97f, 0x8312b3af,
+    0xbe729a1f, 0x0c52460f, 0x31326fbf, 0x7692156f, 0x4bf23cdf,
+    0xc9a2ab0e, 0xf4c282be, 0xb362f86e, 0x8e02d1de, 0x3c220dce,
+    0x0142247e, 0x46e25eae, 0x7b82771e, 0xb1e6b092, 0x8c869922,
+    0xcb26e3f2, 0xf646ca42, 0x44661652, 0x79063fe2, 0x3ea64532,
+    0x03c66c82, 0x8196fb53, 0xbcf6d2e3, 0xfb56a833, 0xc6368183,
+    0x74165d93, 0x49767423, 0x0ed60ef3, 0x33b62743, 0xd1062710,
+    0xec660ea0, 0xabc67470, 0x96a65dc0, 0x248681d0, 0x19e6a860,
+    0x5e46d2b0, 0x6326fb00, 0xe1766cd1, 0xdc164561, 0x9bb63fb1,
+    0xa6d61601, 0x14f6ca11, 0x2996e3a1, 0x6e369971, 0x5356b0c1,
+    0x70279f96, 0x4d47b626, 0x0ae7ccf6, 0x3787e546, 0x85a73956,
+    0xb8c710e6, 0xff676a36, 0xc2074386, 0x4057d457, 0x7d37fde7,
+    0x3a978737, 0x07f7ae87, 0xb5d77297, 0x88b75b27, 0xcf1721f7,
+    0xf2770847, 0x10c70814, 0x2da721a4, 0x6a075b74, 0x576772c4,
+    0xe547aed4, 0xd8278764, 0x9f87fdb4, 0xa2e7d404, 0x20b743d5,
+    0x1dd76a65, 0x5a7710b5, 0x67173905, 0xd537e515, 0xe857cca5,
+    0xaff7b675, 0x92979fc5, 0xe915e8db, 0xd475c16b, 0x93d5bbbb,
+    0xaeb5920b, 0x1c954e1b, 0x21f567ab, 0x66551d7b, 0x5b3534cb,
+    0xd965a31a, 0xe4058aaa, 0xa3a5f07a, 0x9ec5d9ca, 0x2ce505da,
+    0x11852c6a, 0x562556ba, 0x6b457f0a, 0x89f57f59, 0xb49556e9,
+    0xf3352c39, 0xce550589, 0x7c75d999, 0x4115f029, 0x06b58af9,
+    0x3bd5a349, 0xb9853498, 0x84e51d28, 0xc34567f8, 0xfe254e48,
+    0x4c059258, 0x7165bbe8, 0x36c5c138, 0x0ba5e888, 0x28d4c7df,
+    0x15b4ee6f, 0x521494bf, 0x6f74bd0f, 0xdd54611f, 0xe03448af,
+    0xa794327f, 0x9af41bcf, 0x18a48c1e, 0x25c4a5ae, 0x6264df7e,
+    0x5f04f6ce, 0xed242ade, 0xd044036e, 0x97e479be, 0xaa84500e,
+    0x4834505d, 0x755479ed, 0x32f4033d, 0x0f942a8d, 0xbdb4f69d,
+    0x80d4df2d, 0xc774a5fd, 0xfa148c4d, 0x78441b9c, 0x4524322c,
+    0x028448fc, 0x3fe4614c, 0x8dc4bd5c, 0xb0a494ec, 0xf704ee3c,
+    0xca64c78c}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x00000000, 0xb029603d, 0x6053c07a, 0xd07aa047, 0xc0a680f5,
+    0x708fe0c8, 0xa0f5408f, 0x10dc20b2, 0xc14b7030, 0x7162100d,
+    0xa118b04a, 0x1131d077, 0x01edf0c5, 0xb1c490f8, 0x61be30bf,
+    0xd1975082, 0x8297e060, 0x32be805d, 0xe2c4201a, 0x52ed4027,
+    0x42316095, 0xf21800a8, 0x2262a0ef, 0x924bc0d2, 0x43dc9050,
+    0xf3f5f06d, 0x238f502a, 0x93a63017, 0x837a10a5, 0x33537098,
+    0xe329d0df, 0x5300b0e2, 0x042fc1c1, 0xb406a1fc, 0x647c01bb,
+    0xd4556186, 0xc4894134, 0x74a02109, 0xa4da814e, 0x14f3e173,
+    0xc564b1f1, 0x754dd1cc, 0xa537718b, 0x151e11b6, 0x05c23104,
+    0xb5eb5139, 0x6591f17e, 0xd5b89143, 0x86b821a1, 0x3691419c,
+    0xe6ebe1db, 0x56c281e6, 0x461ea154, 0xf637c169, 0x264d612e,
+    0x96640113, 0x47f35191, 0xf7da31ac, 0x27a091eb, 0x9789f1d6,
+    0x8755d164, 0x377cb159, 0xe706111e, 0x572f7123, 0x4958f358,
+    0xf9719365, 0x290b3322, 0x9922531f, 0x89fe73ad, 0x39d71390,
+    0xe9adb3d7, 0x5984d3ea, 0x88138368, 0x383ae355, 0xe8404312,
+    0x5869232f, 0x48b5039d, 0xf89c63a0, 0x28e6c3e7, 0x98cfa3da,
+    0xcbcf1338, 0x7be67305, 0xab9cd342, 0x1bb5b37f, 0x0b6993cd,
+    0xbb40f3f0, 0x6b3a53b7, 0xdb13338a, 0x0a846308, 0xbaad0335,
+    0x6ad7a372, 0xdafec34f, 0xca22e3fd, 0x7a0b83c0, 0xaa712387,
+    0x1a5843ba, 0x4d773299, 0xfd5e52a4, 0x2d24f2e3, 0x9d0d92de,
+    0x8dd1b26c, 0x3df8d251, 0xed827216, 0x5dab122b, 0x8c3c42a9,
+    0x3c152294, 0xec6f82d3, 0x5c46e2ee, 0x4c9ac25c, 0xfcb3a261,
+    0x2cc90226, 0x9ce0621b, 0xcfe0d2f9, 0x7fc9b2c4, 0xafb31283,
+    0x1f9a72be, 0x0f46520c, 0xbf6f3231, 0x6f159276, 0xdf3cf24b,
+    0x0eaba2c9, 0xbe82c2f4, 0x6ef862b3, 0xded1028e, 0xce0d223c,
+    0x7e244201, 0xae5ee246, 0x1e77827b, 0x92b0e6b1, 0x2299868c,
+    0xf2e326cb, 0x42ca46f6, 0x52166644, 0xe23f0679, 0x3245a63e,
+    0x826cc603, 0x53fb9681, 0xe3d2f6bc, 0x33a856fb, 0x838136c6,
+    0x935d1674, 0x23747649, 0xf30ed60e, 0x4327b633, 0x102706d1,
+    0xa00e66ec, 0x7074c6ab, 0xc05da696, 0xd0818624, 0x60a8e619,
+    0xb0d2465e, 0x00fb2663, 0xd16c76e1, 0x614516dc, 0xb13fb69b,
+    0x0116d6a6, 0x11caf614, 0xa1e39629, 0x7199366e, 0xc1b05653,
+    0x969f2770, 0x26b6474d, 0xf6cce70a, 0x46e58737, 0x5639a785,
+    0xe610c7b8, 0x366a67ff, 0x864307c2, 0x57d45740, 0xe7fd377d,
+    0x3787973a, 0x87aef707, 0x9772d7b5, 0x275bb788, 0xf72117cf,
+    0x470877f2, 0x1408c710, 0xa421a72d, 0x745b076a, 0xc4726757,
+    0xd4ae47e5, 0x648727d8, 0xb4fd879f, 0x04d4e7a2, 0xd543b720,
+    0x656ad71d, 0xb510775a, 0x05391767, 0x15e537d5, 0xa5cc57e8,
+    0x75b6f7af, 0xc59f9792, 0xdbe815e9, 0x6bc175d4, 0xbbbbd593,
+    0x0b92b5ae, 0x1b4e951c, 0xab67f521, 0x7b1d5566, 0xcb34355b,
+    0x1aa365d9, 0xaa8a05e4, 0x7af0a5a3, 0xcad9c59e, 0xda05e52c,
+    0x6a2c8511, 0xba562556, 0x0a7f456b, 0x597ff589, 0xe95695b4,
+    0x392c35f3, 0x890555ce, 0x99d9757c, 0x29f01541, 0xf98ab506,
+    0x49a3d53b, 0x983485b9, 0x281de584, 0xf86745c3, 0x484e25fe,
+    0x5892054c, 0xe8bb6571, 0x38c1c536, 0x88e8a50b, 0xdfc7d428,
+    0x6feeb415, 0xbf941452, 0x0fbd746f, 0x1f6154dd, 0xaf4834e0,
+    0x7f3294a7, 0xcf1bf49a, 0x1e8ca418, 0xaea5c425, 0x7edf6462,
+    0xcef6045f, 0xde2a24ed, 0x6e0344d0, 0xbe79e497, 0x0e5084aa,
+    0x5d503448, 0xed795475, 0x3d03f432, 0x8d2a940f, 0x9df6b4bd,
+    0x2ddfd480, 0xfda574c7, 0x4d8c14fa, 0x9c1b4478, 0x2c322445,
+    0xfc488402, 0x4c61e43f, 0x5cbdc48d, 0xec94a4b0, 0x3cee04f7,
+    0x8cc764ca},
+   {0x00000000, 0xa5d35ccb, 0x0ba1c84d, 0xae729486, 0x1642919b,
+    0xb391cd50, 0x1de359d6, 0xb830051d, 0x6d8253ec, 0xc8510f27,
+    0x66239ba1, 0xc3f0c76a, 0x7bc0c277, 0xde139ebc, 0x70610a3a,
+    0xd5b256f1, 0x9b02d603, 0x3ed18ac8, 0x90a31e4e, 0x35704285,
+    0x8d404798, 0x28931b53, 0x86e18fd5, 0x2332d31e, 0xf68085ef,
+    0x5353d924, 0xfd214da2, 0x58f21169, 0xe0c21474, 0x451148bf,
+    0xeb63dc39, 0x4eb080f2, 0x3605ac07, 0x93d6f0cc, 0x3da4644a,
+    0x98773881, 0x20473d9c, 0x85946157, 0x2be6f5d1, 0x8e35a91a,
+    0x5b87ffeb, 0xfe54a320, 0x502637a6, 0xf5f56b6d, 0x4dc56e70,
+    0xe81632bb, 0x4664a63d, 0xe3b7faf6, 0xad077a04, 0x08d426cf,
+    0xa6a6b249, 0x0375ee82, 0xbb45eb9f, 0x1e96b754, 0xb0e423d2,
+    0x15377f19, 0xc08529e8, 0x65567523, 0xcb24e1a5, 0x6ef7bd6e,
+    0xd6c7b873, 0x7314e4b8, 0xdd66703e, 0x78b52cf5, 0x6c0a580f,
+    0xc9d904c4, 0x67ab9042, 0xc278cc89, 0x7a48c994, 0xdf9b955f,
+    0x71e901d9, 0xd43a5d12, 0x01880be3, 0xa45b5728, 0x0a29c3ae,
+    0xaffa9f65, 0x17ca9a78, 0xb219c6b3, 0x1c6b5235, 0xb9b80efe,
+    0xf7088e0c, 0x52dbd2c7, 0xfca94641, 0x597a1a8a, 0xe14a1f97,
+    0x4499435c, 0xeaebd7da, 0x4f388b11, 0x9a8adde0, 0x3f59812b,
+    0x912b15ad, 0x34f84966, 0x8cc84c7b, 0x291b10b0, 0x87698436,
+    0x22bad8fd, 0x5a0ff408, 0xffdca8c3, 0x51ae3c45, 0xf47d608e,
+    0x4c4d6593, 0xe99e3958, 0x47ecadde, 0xe23ff115, 0x378da7e4,
+    0x925efb2f, 0x3c2c6fa9, 0x99ff3362, 0x21cf367f, 0x841c6ab4,
+    0x2a6efe32, 0x8fbda2f9, 0xc10d220b, 0x64de7ec0, 0xcaacea46,
+    0x6f7fb68d, 0xd74fb390, 0x729cef5b, 0xdcee7bdd, 0x793d2716,
+    0xac8f71e7, 0x095c2d2c, 0xa72eb9aa, 0x02fde561, 0xbacde07c,
+    0x1f1ebcb7, 0xb16c2831, 0x14bf74fa, 0xd814b01e, 0x7dc7ecd5,
+    0xd3b57853, 0x76662498, 0xce562185, 0x6b857d4e, 0xc5f7e9c8,
+    0x6024b503, 0xb596e3f2, 0x1045bf39, 0xbe372bbf, 0x1be47774,
+    0xa3d47269, 0x06072ea2, 0xa875ba24, 0x0da6e6ef, 0x4316661d,
+    0xe6c53ad6, 0x48b7ae50, 0xed64f29b, 0x5554f786, 0xf087ab4d,
+    0x5ef53fcb, 0xfb266300, 0x2e9435f1, 0x8b47693a, 0x2535fdbc,
+    0x80e6a177, 0x38d6a46a, 0x9d05f8a1, 0x33776c27, 0x96a430ec,
+    0xee111c19, 0x4bc240d2, 0xe5b0d454, 0x4063889f, 0xf8538d82,
+    0x5d80d149, 0xf3f245cf, 0x56211904, 0x83934ff5, 0x2640133e,
+    0x883287b8, 0x2de1db73, 0x95d1de6e, 0x300282a5, 0x9e701623,
+    0x3ba34ae8, 0x7513ca1a, 0xd0c096d1, 0x7eb20257, 0xdb615e9c,
+    0x63515b81, 0xc682074a, 0x68f093cc, 0xcd23cf07, 0x189199f6,
+    0xbd42c53d, 0x133051bb, 0xb6e30d70, 0x0ed3086d, 0xab0054a6,
+    0x0572c020, 0xa0a19ceb, 0xb41ee811, 0x11cdb4da, 0xbfbf205c,
+    0x1a6c7c97, 0xa25c798a, 0x078f2541, 0xa9fdb1c7, 0x0c2eed0c,
+    0xd99cbbfd, 0x7c4fe736, 0xd23d73b0, 0x77ee2f7b, 0xcfde2a66,
+    0x6a0d76ad, 0xc47fe22b, 0x61acbee0, 0x2f1c3e12, 0x8acf62d9,
+    0x24bdf65f, 0x816eaa94, 0x395eaf89, 0x9c8df342, 0x32ff67c4,
+    0x972c3b0f, 0x429e6dfe, 0xe74d3135, 0x493fa5b3, 0xececf978,
+    0x54dcfc65, 0xf10fa0ae, 0x5f7d3428, 0xfaae68e3, 0x821b4416,
+    0x27c818dd, 0x89ba8c5b, 0x2c69d090, 0x9459d58d, 0x318a8946,
+    0x9ff81dc0, 0x3a2b410b, 0xef9917fa, 0x4a4a4b31, 0xe438dfb7,
+    0x41eb837c, 0xf9db8661, 0x5c08daaa, 0xf27a4e2c, 0x57a912e7,
+    0x19199215, 0xbccacede, 0x12b85a58, 0xb76b0693, 0x0f5b038e,
+    0xaa885f45, 0x04facbc3, 0xa1299708, 0x749bc1f9, 0xd1489d32,
+    0x7f3a09b4, 0xdae9557f, 0x62d95062, 0xc70a0ca9, 0x6978982f,
+    0xccabc4e4},
+   {0x00000000, 0xb40b77a6, 0x29119f97, 0x9d1ae831, 0x13244ff4,
+    0xa72f3852, 0x3a35d063, 0x8e3ea7c5, 0x674eef33, 0xd3459895,
+    0x4e5f70a4, 0xfa540702, 0x746aa0c7, 0xc061d761, 0x5d7b3f50,
+    0xe97048f6, 0xce9cde67, 0x7a97a9c1, 0xe78d41f0, 0x53863656,
+    0xddb89193, 0x69b3e635, 0xf4a90e04, 0x40a279a2, 0xa9d23154,
+    0x1dd946f2, 0x80c3aec3, 0x34c8d965, 0xbaf67ea0, 0x0efd0906,
+    0x93e7e137, 0x27ec9691, 0x9c39bdcf, 0x2832ca69, 0xb5282258,
+    0x012355fe, 0x8f1df23b, 0x3b16859d, 0xa60c6dac, 0x12071a0a,
+    0xfb7752fc, 0x4f7c255a, 0xd266cd6b, 0x666dbacd, 0xe8531d08,
+    0x5c586aae, 0xc142829f, 0x7549f539, 0x52a563a8, 0xe6ae140e,
+    0x7bb4fc3f, 0xcfbf8b99, 0x41812c5c, 0xf58a5bfa, 0x6890b3cb,
+    0xdc9bc46d, 0x35eb8c9b, 0x81e0fb3d, 0x1cfa130c, 0xa8f164aa,
+    0x26cfc36f, 0x92c4b4c9, 0x0fde5cf8, 0xbbd52b5e, 0x79750b44,
+    0xcd7e7ce2, 0x506494d3, 0xe46fe375, 0x6a5144b0, 0xde5a3316,
+    0x4340db27, 0xf74bac81, 0x1e3be477, 0xaa3093d1, 0x372a7be0,
+    0x83210c46, 0x0d1fab83, 0xb914dc25, 0x240e3414, 0x900543b2,
+    0xb7e9d523, 0x03e2a285, 0x9ef84ab4, 0x2af33d12, 0xa4cd9ad7,
+    0x10c6ed71, 0x8ddc0540, 0x39d772e6, 0xd0a73a10, 0x64ac4db6,
+    0xf9b6a587, 0x4dbdd221, 0xc38375e4, 0x77880242, 0xea92ea73,
+    0x5e999dd5, 0xe54cb68b, 0x5147c12d, 0xcc5d291c, 0x78565eba,
+    0xf668f97f, 0x42638ed9, 0xdf7966e8, 0x6b72114e, 0x820259b8,
+    0x36092e1e, 0xab13c62f, 0x1f18b189, 0x9126164c, 0x252d61ea,
+    0xb83789db, 0x0c3cfe7d, 0x2bd068ec, 0x9fdb1f4a, 0x02c1f77b,
+    0xb6ca80dd, 0x38f42718, 0x8cff50be, 0x11e5b88f, 0xa5eecf29,
+    0x4c9e87df, 0xf895f079, 0x658f1848, 0xd1846fee, 0x5fbac82b,
+    0xebb1bf8d, 0x76ab57bc, 0xc2a0201a, 0xf2ea1688, 0x46e1612e,
+    0xdbfb891f, 0x6ff0feb9, 0xe1ce597c, 0x55c52eda, 0xc8dfc6eb,
+    0x7cd4b14d, 0x95a4f9bb, 0x21af8e1d, 0xbcb5662c, 0x08be118a,
+    0x8680b64f, 0x328bc1e9, 0xaf9129d8, 0x1b9a5e7e, 0x3c76c8ef,
+    0x887dbf49, 0x15675778, 0xa16c20de, 0x2f52871b, 0x9b59f0bd,
+    0x0643188c, 0xb2486f2a, 0x5b3827dc, 0xef33507a, 0x7229b84b,
+    0xc622cfed, 0x481c6828, 0xfc171f8e, 0x610df7bf, 0xd5068019,
+    0x6ed3ab47, 0xdad8dce1, 0x47c234d0, 0xf3c94376, 0x7df7e4b3,
+    0xc9fc9315, 0x54e67b24, 0xe0ed0c82, 0x099d4474, 0xbd9633d2,
+    0x208cdbe3, 0x9487ac45, 0x1ab90b80, 0xaeb27c26, 0x33a89417,
+    0x87a3e3b1, 0xa04f7520, 0x14440286, 0x895eeab7, 0x3d559d11,
+    0xb36b3ad4, 0x07604d72, 0x9a7aa543, 0x2e71d2e5, 0xc7019a13,
+    0x730aedb5, 0xee100584, 0x5a1b7222, 0xd425d5e7, 0x602ea241,
+    0xfd344a70, 0x493f3dd6, 0x8b9f1dcc, 0x3f946a6a, 0xa28e825b,
+    0x1685f5fd, 0x98bb5238, 0x2cb0259e, 0xb1aacdaf, 0x05a1ba09,
+    0xecd1f2ff, 0x58da8559, 0xc5c06d68, 0x71cb1ace, 0xfff5bd0b,
+    0x4bfecaad, 0xd6e4229c, 0x62ef553a, 0x4503c3ab, 0xf108b40d,
+    0x6c125c3c, 0xd8192b9a, 0x56278c5f, 0xe22cfbf9, 0x7f3613c8,
+    0xcb3d646e, 0x224d2c98, 0x96465b3e, 0x0b5cb30f, 0xbf57c4a9,
+    0x3169636c, 0x856214ca, 0x1878fcfb, 0xac738b5d, 0x17a6a003,
+    0xa3add7a5, 0x3eb73f94, 0x8abc4832, 0x0482eff7, 0xb0899851,
+    0x2d937060, 0x999807c6, 0x70e84f30, 0xc4e33896, 0x59f9d0a7,
+    0xedf2a701, 0x63cc00c4, 0xd7c77762, 0x4add9f53, 0xfed6e8f5,
+    0xd93a7e64, 0x6d3109c2, 0xf02be1f3, 0x44209655, 0xca1e3190,
+    0x7e154636, 0xe30fae07, 0x5704d9a1, 0xbe749157, 0x0a7fe6f1,
+    0x97650ec0, 0x236e7966, 0xad50dea3, 0x195ba905, 0x84414134,
+    0x304a3692},
+   {0x00000000, 0x9e00aacc, 0x7d072542, 0xe3078f8e, 0xfa0e4a84,
+    0x640ee048, 0x87096fc6, 0x1909c50a, 0xb51be5d3, 0x2b1b4f1f,
+    0xc81cc091, 0x561c6a5d, 0x4f15af57, 0xd115059b, 0x32128a15,
+    0xac1220d9, 0x2b31bb7c, 0xb53111b0, 0x56369e3e, 0xc83634f2,
+    0xd13ff1f8, 0x4f3f5b34, 0xac38d4ba, 0x32387e76, 0x9e2a5eaf,
+    0x002af463, 0xe32d7bed, 0x7d2dd121, 0x6424142b, 0xfa24bee7,
+    0x19233169, 0x87239ba5, 0x566276f9, 0xc862dc35, 0x2b6553bb,
+    0xb565f977, 0xac6c3c7d, 0x326c96b1, 0xd16b193f, 0x4f6bb3f3,
+    0xe379932a, 0x7d7939e6, 0x9e7eb668, 0x007e1ca4, 0x1977d9ae,
+    0x87777362, 0x6470fcec, 0xfa705620, 0x7d53cd85, 0xe3536749,
+    0x0054e8c7, 0x9e54420b, 0x875d8701, 0x195d2dcd, 0xfa5aa243,
+    0x645a088f, 0xc8482856, 0x5648829a, 0xb54f0d14, 0x2b4fa7d8,
+    0x324662d2, 0xac46c81e, 0x4f414790, 0xd141ed5c, 0xedc29d29,
+    0x73c237e5, 0x90c5b86b, 0x0ec512a7, 0x17ccd7ad, 0x89cc7d61,
+    0x6acbf2ef, 0xf4cb5823, 0x58d978fa, 0xc6d9d236, 0x25de5db8,
+    0xbbdef774, 0xa2d7327e, 0x3cd798b2, 0xdfd0173c, 0x41d0bdf0,
+    0xc6f32655, 0x58f38c99, 0xbbf40317, 0x25f4a9db, 0x3cfd6cd1,
+    0xa2fdc61d, 0x41fa4993, 0xdffae35f, 0x73e8c386, 0xede8694a,
+    0x0eefe6c4, 0x90ef4c08, 0x89e68902, 0x17e623ce, 0xf4e1ac40,
+    0x6ae1068c, 0xbba0ebd0, 0x25a0411c, 0xc6a7ce92, 0x58a7645e,
+    0x41aea154, 0xdfae0b98, 0x3ca98416, 0xa2a92eda, 0x0ebb0e03,
+    0x90bba4cf, 0x73bc2b41, 0xedbc818d, 0xf4b54487, 0x6ab5ee4b,
+    0x89b261c5, 0x17b2cb09, 0x909150ac, 0x0e91fa60, 0xed9675ee,
+    0x7396df22, 0x6a9f1a28, 0xf49fb0e4, 0x17983f6a, 0x899895a6,
+    0x258ab57f, 0xbb8a1fb3, 0x588d903d, 0xc68d3af1, 0xdf84fffb,
+    0x41845537, 0xa283dab9, 0x3c837075, 0xda853b53, 0x4485919f,
+    0xa7821e11, 0x3982b4dd, 0x208b71d7, 0xbe8bdb1b, 0x5d8c5495,
+    0xc38cfe59, 0x6f9ede80, 0xf19e744c, 0x1299fbc2, 0x8c99510e,
+    0x95909404, 0x0b903ec8, 0xe897b146, 0x76971b8a, 0xf1b4802f,
+    0x6fb42ae3, 0x8cb3a56d, 0x12b30fa1, 0x0bbacaab, 0x95ba6067,
+    0x76bdefe9, 0xe8bd4525, 0x44af65fc, 0xdaafcf30, 0x39a840be,
+    0xa7a8ea72, 0xbea12f78, 0x20a185b4, 0xc3a60a3a, 0x5da6a0f6,
+    0x8ce74daa, 0x12e7e766, 0xf1e068e8, 0x6fe0c224, 0x76e9072e,
+    0xe8e9ade2, 0x0bee226c, 0x95ee88a0, 0x39fca879, 0xa7fc02b5,
+    0x44fb8d3b, 0xdafb27f7, 0xc3f2e2fd, 0x5df24831, 0xbef5c7bf,
+    0x20f56d73, 0xa7d6f6d6, 0x39d65c1a, 0xdad1d394, 0x44d17958,
+    0x5dd8bc52, 0xc3d8169e, 0x20df9910, 0xbedf33dc, 0x12cd1305,
+    0x8ccdb9c9, 0x6fca3647, 0xf1ca9c8b, 0xe8c35981, 0x76c3f34d,
+    0x95c47cc3, 0x0bc4d60f, 0x3747a67a, 0xa9470cb6, 0x4a408338,
+    0xd44029f4, 0xcd49ecfe, 0x53494632, 0xb04ec9bc, 0x2e4e6370,
+    0x825c43a9, 0x1c5ce965, 0xff5b66eb, 0x615bcc27, 0x7852092d,
+    0xe652a3e1, 0x05552c6f, 0x9b5586a3, 0x1c761d06, 0x8276b7ca,
+    0x61713844, 0xff719288, 0xe6785782, 0x7878fd4e, 0x9b7f72c0,
+    0x057fd80c, 0xa96df8d5, 0x376d5219, 0xd46add97, 0x4a6a775b,
+    0x5363b251, 0xcd63189d, 0x2e649713, 0xb0643ddf, 0x6125d083,
+    0xff257a4f, 0x1c22f5c1, 0x82225f0d, 0x9b2b9a07, 0x052b30cb,
+    0xe62cbf45, 0x782c1589, 0xd43e3550, 0x4a3e9f9c, 0xa9391012,
+    0x3739bade, 0x2e307fd4, 0xb030d518, 0x53375a96, 0xcd37f05a,
+    0x4a146bff, 0xd414c133, 0x37134ebd, 0xa913e471, 0xb01a217b,
+    0x2e1a8bb7, 0xcd1d0439, 0x531daef5, 0xff0f8e2c, 0x610f24e0,
+    0x8208ab6e, 0x1c0801a2, 0x0501c4a8, 0x9b016e64, 0x7806e1ea,
+    0xe6064b26}};
+
 #endif
-  }
-};
+
+#endif
+
+#if N == 3
+
+#if W == 8
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0x81256527, 0xd93bcc0f, 0x581ea928, 0x69069e5f,
+    0xe823fb78, 0xb03d5250, 0x31183777, 0xd20d3cbe, 0x53285999,
+    0x0b36f0b1, 0x8a139596, 0xbb0ba2e1, 0x3a2ec7c6, 0x62306eee,
+    0xe3150bc9, 0x7f6b7f3d, 0xfe4e1a1a, 0xa650b332, 0x2775d615,
+    0x166de162, 0x97488445, 0xcf562d6d, 0x4e73484a, 0xad664383,
+    0x2c4326a4, 0x745d8f8c, 0xf578eaab, 0xc460dddc, 0x4545b8fb,
+    0x1d5b11d3, 0x9c7e74f4, 0xfed6fe7a, 0x7ff39b5d, 0x27ed3275,
+    0xa6c85752, 0x97d06025, 0x16f50502, 0x4eebac2a, 0xcfcec90d,
+    0x2cdbc2c4, 0xadfea7e3, 0xf5e00ecb, 0x74c56bec, 0x45dd5c9b,
+    0xc4f839bc, 0x9ce69094, 0x1dc3f5b3, 0x81bd8147, 0x0098e460,
+    0x58864d48, 0xd9a3286f, 0xe8bb1f18, 0x699e7a3f, 0x3180d317,
+    0xb0a5b630, 0x53b0bdf9, 0xd295d8de, 0x8a8b71f6, 0x0bae14d1,
+    0x3ab623a6, 0xbb934681, 0xe38defa9, 0x62a88a8e, 0x26dcfab5,
+    0xa7f99f92, 0xffe736ba, 0x7ec2539d, 0x4fda64ea, 0xceff01cd,
+    0x96e1a8e5, 0x17c4cdc2, 0xf4d1c60b, 0x75f4a32c, 0x2dea0a04,
+    0xaccf6f23, 0x9dd75854, 0x1cf23d73, 0x44ec945b, 0xc5c9f17c,
+    0x59b78588, 0xd892e0af, 0x808c4987, 0x01a92ca0, 0x30b11bd7,
+    0xb1947ef0, 0xe98ad7d8, 0x68afb2ff, 0x8bbab936, 0x0a9fdc11,
+    0x52817539, 0xd3a4101e, 0xe2bc2769, 0x6399424e, 0x3b87eb66,
+    0xbaa28e41, 0xd80a04cf, 0x592f61e8, 0x0131c8c0, 0x8014ade7,
+    0xb10c9a90, 0x3029ffb7, 0x6837569f, 0xe91233b8, 0x0a073871,
+    0x8b225d56, 0xd33cf47e, 0x52199159, 0x6301a62e, 0xe224c309,
+    0xba3a6a21, 0x3b1f0f06, 0xa7617bf2, 0x26441ed5, 0x7e5ab7fd,
+    0xff7fd2da, 0xce67e5ad, 0x4f42808a, 0x175c29a2, 0x96794c85,
+    0x756c474c, 0xf449226b, 0xac578b43, 0x2d72ee64, 0x1c6ad913,
+    0x9d4fbc34, 0xc551151c, 0x4474703b, 0x4db9f56a, 0xcc9c904d,
+    0x94823965, 0x15a75c42, 0x24bf6b35, 0xa59a0e12, 0xfd84a73a,
+    0x7ca1c21d, 0x9fb4c9d4, 0x1e91acf3, 0x468f05db, 0xc7aa60fc,
+    0xf6b2578b, 0x779732ac, 0x2f899b84, 0xaeacfea3, 0x32d28a57,
+    0xb3f7ef70, 0xebe94658, 0x6acc237f, 0x5bd41408, 0xdaf1712f,
+    0x82efd807, 0x03cabd20, 0xe0dfb6e9, 0x61fad3ce, 0x39e47ae6,
+    0xb8c11fc1, 0x89d928b6, 0x08fc4d91, 0x50e2e4b9, 0xd1c7819e,
+    0xb36f0b10, 0x324a6e37, 0x6a54c71f, 0xeb71a238, 0xda69954f,
+    0x5b4cf068, 0x03525940, 0x82773c67, 0x616237ae, 0xe0475289,
+    0xb859fba1, 0x397c9e86, 0x0864a9f1, 0x8941ccd6, 0xd15f65fe,
+    0x507a00d9, 0xcc04742d, 0x4d21110a, 0x153fb822, 0x941add05,
+    0xa502ea72, 0x24278f55, 0x7c39267d, 0xfd1c435a, 0x1e094893,
+    0x9f2c2db4, 0xc732849c, 0x4617e1bb, 0x770fd6cc, 0xf62ab3eb,
+    0xae341ac3, 0x2f117fe4, 0x6b650fdf, 0xea406af8, 0xb25ec3d0,
+    0x337ba6f7, 0x02639180, 0x8346f4a7, 0xdb585d8f, 0x5a7d38a8,
+    0xb9683361, 0x384d5646, 0x6053ff6e, 0xe1769a49, 0xd06ead3e,
+    0x514bc819, 0x09556131, 0x88700416, 0x140e70e2, 0x952b15c5,
+    0xcd35bced, 0x4c10d9ca, 0x7d08eebd, 0xfc2d8b9a, 0xa43322b2,
+    0x25164795, 0xc6034c5c, 0x4726297b, 0x1f388053, 0x9e1de574,
+    0xaf05d203, 0x2e20b724, 0x763e1e0c, 0xf71b7b2b, 0x95b3f1a5,
+    0x14969482, 0x4c883daa, 0xcdad588d, 0xfcb56ffa, 0x7d900add,
+    0x258ea3f5, 0xa4abc6d2, 0x47becd1b, 0xc69ba83c, 0x9e850114,
+    0x1fa06433, 0x2eb85344, 0xaf9d3663, 0xf7839f4b, 0x76a6fa6c,
+    0xead88e98, 0x6bfdebbf, 0x33e34297, 0xb2c627b0, 0x83de10c7,
+    0x02fb75e0, 0x5ae5dcc8, 0xdbc0b9ef, 0x38d5b226, 0xb9f0d701,
+    0xe1ee7e29, 0x60cb1b0e, 0x51d32c79, 0xd0f6495e, 0x88e8e076,
+    0x09cd8551},
+   {0x00000000, 0x9b73ead4, 0xed96d3e9, 0x76e5393d, 0x005ca193,
+    0x9b2f4b47, 0xedca727a, 0x76b998ae, 0x00b94326, 0x9bcaa9f2,
+    0xed2f90cf, 0x765c7a1b, 0x00e5e2b5, 0x9b960861, 0xed73315c,
+    0x7600db88, 0x0172864c, 0x9a016c98, 0xece455a5, 0x7797bf71,
+    0x012e27df, 0x9a5dcd0b, 0xecb8f436, 0x77cb1ee2, 0x01cbc56a,
+    0x9ab82fbe, 0xec5d1683, 0x772efc57, 0x019764f9, 0x9ae48e2d,
+    0xec01b710, 0x77725dc4, 0x02e50c98, 0x9996e64c, 0xef73df71,
+    0x740035a5, 0x02b9ad0b, 0x99ca47df, 0xef2f7ee2, 0x745c9436,
+    0x025c4fbe, 0x992fa56a, 0xefca9c57, 0x74b97683, 0x0200ee2d,
+    0x997304f9, 0xef963dc4, 0x74e5d710, 0x03978ad4, 0x98e46000,
+    0xee01593d, 0x7572b3e9, 0x03cb2b47, 0x98b8c193, 0xee5df8ae,
+    0x752e127a, 0x032ec9f2, 0x985d2326, 0xeeb81a1b, 0x75cbf0cf,
+    0x03726861, 0x980182b5, 0xeee4bb88, 0x7597515c, 0x05ca1930,
+    0x9eb9f3e4, 0xe85ccad9, 0x732f200d, 0x0596b8a3, 0x9ee55277,
+    0xe8006b4a, 0x7373819e, 0x05735a16, 0x9e00b0c2, 0xe8e589ff,
+    0x7396632b, 0x052ffb85, 0x9e5c1151, 0xe8b9286c, 0x73cac2b8,
+    0x04b89f7c, 0x9fcb75a8, 0xe92e4c95, 0x725da641, 0x04e43eef,
+    0x9f97d43b, 0xe972ed06, 0x720107d2, 0x0401dc5a, 0x9f72368e,
+    0xe9970fb3, 0x72e4e567, 0x045d7dc9, 0x9f2e971d, 0xe9cbae20,
+    0x72b844f4, 0x072f15a8, 0x9c5cff7c, 0xeab9c641, 0x71ca2c95,
+    0x0773b43b, 0x9c005eef, 0xeae567d2, 0x71968d06, 0x0796568e,
+    0x9ce5bc5a, 0xea008567, 0x71736fb3, 0x07caf71d, 0x9cb91dc9,
+    0xea5c24f4, 0x712fce20, 0x065d93e4, 0x9d2e7930, 0xebcb400d,
+    0x70b8aad9, 0x06013277, 0x9d72d8a3, 0xeb97e19e, 0x70e40b4a,
+    0x06e4d0c2, 0x9d973a16, 0xeb72032b, 0x7001e9ff, 0x06b87151,
+    0x9dcb9b85, 0xeb2ea2b8, 0x705d486c, 0x0b943260, 0x90e7d8b4,
+    0xe602e189, 0x7d710b5d, 0x0bc893f3, 0x90bb7927, 0xe65e401a,
+    0x7d2daace, 0x0b2d7146, 0x905e9b92, 0xe6bba2af, 0x7dc8487b,
+    0x0b71d0d5, 0x90023a01, 0xe6e7033c, 0x7d94e9e8, 0x0ae6b42c,
+    0x91955ef8, 0xe77067c5, 0x7c038d11, 0x0aba15bf, 0x91c9ff6b,
+    0xe72cc656, 0x7c5f2c82, 0x0a5ff70a, 0x912c1dde, 0xe7c924e3,
+    0x7cbace37, 0x0a035699, 0x9170bc4d, 0xe7958570, 0x7ce66fa4,
+    0x09713ef8, 0x9202d42c, 0xe4e7ed11, 0x7f9407c5, 0x092d9f6b,
+    0x925e75bf, 0xe4bb4c82, 0x7fc8a656, 0x09c87dde, 0x92bb970a,
+    0xe45eae37, 0x7f2d44e3, 0x0994dc4d, 0x92e73699, 0xe4020fa4,
+    0x7f71e570, 0x0803b8b4, 0x93705260, 0xe5956b5d, 0x7ee68189,
+    0x085f1927, 0x932cf3f3, 0xe5c9cace, 0x7eba201a, 0x08bafb92,
+    0x93c91146, 0xe52c287b, 0x7e5fc2af, 0x08e65a01, 0x9395b0d5,
+    0xe57089e8, 0x7e03633c, 0x0e5e2b50, 0x952dc184, 0xe3c8f8b9,
+    0x78bb126d, 0x0e028ac3, 0x95716017, 0xe394592a, 0x78e7b3fe,
+    0x0ee76876, 0x959482a2, 0xe371bb9f, 0x7802514b, 0x0ebbc9e5,
+    0x95c82331, 0xe32d1a0c, 0x785ef0d8, 0x0f2cad1c, 0x945f47c8,
+    0xe2ba7ef5, 0x79c99421, 0x0f700c8f, 0x9403e65b, 0xe2e6df66,
+    0x799535b2, 0x0f95ee3a, 0x94e604ee, 0xe2033dd3, 0x7970d707,
+    0x0fc94fa9, 0x94baa57d, 0xe25f9c40, 0x792c7694, 0x0cbb27c8,
+    0x97c8cd1c, 0xe12df421, 0x7a5e1ef5, 0x0ce7865b, 0x97946c8f,
+    0xe17155b2, 0x7a02bf66, 0x0c0264ee, 0x97718e3a, 0xe194b707,
+    0x7ae75dd3, 0x0c5ec57d, 0x972d2fa9, 0xe1c81694, 0x7abbfc40,
+    0x0dc9a184, 0x96ba4b50, 0xe05f726d, 0x7b2c98b9, 0x0d950017,
+    0x96e6eac3, 0xe003d3fe, 0x7b70392a, 0x0d70e2a2, 0x96030876,
+    0xe0e6314b, 0x7b95db9f, 0x0d2c4331, 0x965fa9e5, 0xe0ba90d8,
+    0x7bc97a0c},
+   {0x00000000, 0x172864c0, 0x2e50c980, 0x3978ad40, 0x5ca19300,
+    0x4b89f7c0, 0x72f15a80, 0x65d93e40, 0xb9432600, 0xae6b42c0,
+    0x9713ef80, 0x803b8b40, 0xe5e2b500, 0xf2cad1c0, 0xcbb27c80,
+    0xdc9a1840, 0xa9f74a41, 0xbedf2e81, 0x87a783c1, 0x908fe701,
+    0xf556d941, 0xe27ebd81, 0xdb0610c1, 0xcc2e7401, 0x10b46c41,
+    0x079c0881, 0x3ee4a5c1, 0x29ccc101, 0x4c15ff41, 0x5b3d9b81,
+    0x624536c1, 0x756d5201, 0x889f92c3, 0x9fb7f603, 0xa6cf5b43,
+    0xb1e73f83, 0xd43e01c3, 0xc3166503, 0xfa6ec843, 0xed46ac83,
+    0x31dcb4c3, 0x26f4d003, 0x1f8c7d43, 0x08a41983, 0x6d7d27c3,
+    0x7a554303, 0x432dee43, 0x54058a83, 0x2168d882, 0x3640bc42,
+    0x0f381102, 0x181075c2, 0x7dc94b82, 0x6ae12f42, 0x53998202,
+    0x44b1e6c2, 0x982bfe82, 0x8f039a42, 0xb67b3702, 0xa15353c2,
+    0xc48a6d82, 0xd3a20942, 0xeadaa402, 0xfdf2c0c2, 0xca4e23c7,
+    0xdd664707, 0xe41eea47, 0xf3368e87, 0x96efb0c7, 0x81c7d407,
+    0xb8bf7947, 0xaf971d87, 0x730d05c7, 0x64256107, 0x5d5dcc47,
+    0x4a75a887, 0x2fac96c7, 0x3884f207, 0x01fc5f47, 0x16d43b87,
+    0x63b96986, 0x74910d46, 0x4de9a006, 0x5ac1c4c6, 0x3f18fa86,
+    0x28309e46, 0x11483306, 0x066057c6, 0xdafa4f86, 0xcdd22b46,
+    0xf4aa8606, 0xe382e2c6, 0x865bdc86, 0x9173b846, 0xa80b1506,
+    0xbf2371c6, 0x42d1b104, 0x55f9d5c4, 0x6c817884, 0x7ba91c44,
+    0x1e702204, 0x095846c4, 0x3020eb84, 0x27088f44, 0xfb929704,
+    0xecbaf3c4, 0xd5c25e84, 0xc2ea3a44, 0xa7330404, 0xb01b60c4,
+    0x8963cd84, 0x9e4ba944, 0xeb26fb45, 0xfc0e9f85, 0xc57632c5,
+    0xd25e5605, 0xb7876845, 0xa0af0c85, 0x99d7a1c5, 0x8effc505,
+    0x5265dd45, 0x454db985, 0x7c3514c5, 0x6b1d7005, 0x0ec44e45,
+    0x19ec2a85, 0x209487c5, 0x37bce305, 0x4fed41cf, 0x58c5250f,
+    0x61bd884f, 0x7695ec8f, 0x134cd2cf, 0x0464b60f, 0x3d1c1b4f,
+    0x2a347f8f, 0xf6ae67cf, 0xe186030f, 0xd8feae4f, 0xcfd6ca8f,
+    0xaa0ff4cf, 0xbd27900f, 0x845f3d4f, 0x9377598f, 0xe61a0b8e,
+    0xf1326f4e, 0xc84ac20e, 0xdf62a6ce, 0xbabb988e, 0xad93fc4e,
+    0x94eb510e, 0x83c335ce, 0x5f592d8e, 0x4871494e, 0x7109e40e,
+    0x662180ce, 0x03f8be8e, 0x14d0da4e, 0x2da8770e, 0x3a8013ce,
+    0xc772d30c, 0xd05ab7cc, 0xe9221a8c, 0xfe0a7e4c, 0x9bd3400c,
+    0x8cfb24cc, 0xb583898c, 0xa2abed4c, 0x7e31f50c, 0x691991cc,
+    0x50613c8c, 0x4749584c, 0x2290660c, 0x35b802cc, 0x0cc0af8c,
+    0x1be8cb4c, 0x6e85994d, 0x79adfd8d, 0x40d550cd, 0x57fd340d,
+    0x32240a4d, 0x250c6e8d, 0x1c74c3cd, 0x0b5ca70d, 0xd7c6bf4d,
+    0xc0eedb8d, 0xf99676cd, 0xeebe120d, 0x8b672c4d, 0x9c4f488d,
+    0xa537e5cd, 0xb21f810d, 0x85a36208, 0x928b06c8, 0xabf3ab88,
+    0xbcdbcf48, 0xd902f108, 0xce2a95c8, 0xf7523888, 0xe07a5c48,
+    0x3ce04408, 0x2bc820c8, 0x12b08d88, 0x0598e948, 0x6041d708,
+    0x7769b3c8, 0x4e111e88, 0x59397a48, 0x2c542849, 0x3b7c4c89,
+    0x0204e1c9, 0x152c8509, 0x70f5bb49, 0x67dddf89, 0x5ea572c9,
+    0x498d1609, 0x95170e49, 0x823f6a89, 0xbb47c7c9, 0xac6fa309,
+    0xc9b69d49, 0xde9ef989, 0xe7e654c9, 0xf0ce3009, 0x0d3cf0cb,
+    0x1a14940b, 0x236c394b, 0x34445d8b, 0x519d63cb, 0x46b5070b,
+    0x7fcdaa4b, 0x68e5ce8b, 0xb47fd6cb, 0xa357b20b, 0x9a2f1f4b,
+    0x8d077b8b, 0xe8de45cb, 0xfff6210b, 0xc68e8c4b, 0xd1a6e88b,
+    0xa4cbba8a, 0xb3e3de4a, 0x8a9b730a, 0x9db317ca, 0xf86a298a,
+    0xef424d4a, 0xd63ae00a, 0xc11284ca, 0x1d889c8a, 0x0aa0f84a,
+    0x33d8550a, 0x24f031ca, 0x41290f8a, 0x56016b4a, 0x6f79c60a,
+    0x7851a2ca},
+   {0x00000000, 0x9fda839e, 0xe4c4017d, 0x7b1e82e3, 0x12f904bb,
+    0x8d238725, 0xf63d05c6, 0x69e78658, 0x25f20976, 0xba288ae8,
+    0xc136080b, 0x5eec8b95, 0x370b0dcd, 0xa8d18e53, 0xd3cf0cb0,
+    0x4c158f2e, 0x4be412ec, 0xd43e9172, 0xaf201391, 0x30fa900f,
+    0x591d1657, 0xc6c795c9, 0xbdd9172a, 0x220394b4, 0x6e161b9a,
+    0xf1cc9804, 0x8ad21ae7, 0x15089979, 0x7cef1f21, 0xe3359cbf,
+    0x982b1e5c, 0x07f19dc2, 0x97c825d8, 0x0812a646, 0x730c24a5,
+    0xecd6a73b, 0x85312163, 0x1aeba2fd, 0x61f5201e, 0xfe2fa380,
+    0xb23a2cae, 0x2de0af30, 0x56fe2dd3, 0xc924ae4d, 0xa0c32815,
+    0x3f19ab8b, 0x44072968, 0xdbddaaf6, 0xdc2c3734, 0x43f6b4aa,
+    0x38e83649, 0xa732b5d7, 0xced5338f, 0x510fb011, 0x2a1132f2,
+    0xb5cbb16c, 0xf9de3e42, 0x6604bddc, 0x1d1a3f3f, 0x82c0bca1,
+    0xeb273af9, 0x74fdb967, 0x0fe33b84, 0x9039b81a, 0xf4e14df1,
+    0x6b3bce6f, 0x10254c8c, 0x8fffcf12, 0xe618494a, 0x79c2cad4,
+    0x02dc4837, 0x9d06cba9, 0xd1134487, 0x4ec9c719, 0x35d745fa,
+    0xaa0dc664, 0xc3ea403c, 0x5c30c3a2, 0x272e4141, 0xb8f4c2df,
+    0xbf055f1d, 0x20dfdc83, 0x5bc15e60, 0xc41bddfe, 0xadfc5ba6,
+    0x3226d838, 0x49385adb, 0xd6e2d945, 0x9af7566b, 0x052dd5f5,
+    0x7e335716, 0xe1e9d488, 0x880e52d0, 0x17d4d14e, 0x6cca53ad,
+    0xf310d033, 0x63296829, 0xfcf3ebb7, 0x87ed6954, 0x1837eaca,
+    0x71d06c92, 0xee0aef0c, 0x95146def, 0x0aceee71, 0x46db615f,
+    0xd901e2c1, 0xa21f6022, 0x3dc5e3bc, 0x542265e4, 0xcbf8e67a,
+    0xb0e66499, 0x2f3ce707, 0x28cd7ac5, 0xb717f95b, 0xcc097bb8,
+    0x53d3f826, 0x3a347e7e, 0xa5eefde0, 0xdef07f03, 0x412afc9d,
+    0x0d3f73b3, 0x92e5f02d, 0xe9fb72ce, 0x7621f150, 0x1fc67708,
+    0x801cf496, 0xfb027675, 0x64d8f5eb, 0x32b39da3, 0xad691e3d,
+    0xd6779cde, 0x49ad1f40, 0x204a9918, 0xbf901a86, 0xc48e9865,
+    0x5b541bfb, 0x174194d5, 0x889b174b, 0xf38595a8, 0x6c5f1636,
+    0x05b8906e, 0x9a6213f0, 0xe17c9113, 0x7ea6128d, 0x79578f4f,
+    0xe68d0cd1, 0x9d938e32, 0x02490dac, 0x6bae8bf4, 0xf474086a,
+    0x8f6a8a89, 0x10b00917, 0x5ca58639, 0xc37f05a7, 0xb8618744,
+    0x27bb04da, 0x4e5c8282, 0xd186011c, 0xaa9883ff, 0x35420061,
+    0xa57bb87b, 0x3aa13be5, 0x41bfb906, 0xde653a98, 0xb782bcc0,
+    0x28583f5e, 0x5346bdbd, 0xcc9c3e23, 0x8089b10d, 0x1f533293,
+    0x644db070, 0xfb9733ee, 0x9270b5b6, 0x0daa3628, 0x76b4b4cb,
+    0xe96e3755, 0xee9faa97, 0x71452909, 0x0a5babea, 0x95812874,
+    0xfc66ae2c, 0x63bc2db2, 0x18a2af51, 0x87782ccf, 0xcb6da3e1,
+    0x54b7207f, 0x2fa9a29c, 0xb0732102, 0xd994a75a, 0x464e24c4,
+    0x3d50a627, 0xa28a25b9, 0xc652d052, 0x598853cc, 0x2296d12f,
+    0xbd4c52b1, 0xd4abd4e9, 0x4b715777, 0x306fd594, 0xafb5560a,
+    0xe3a0d924, 0x7c7a5aba, 0x0764d859, 0x98be5bc7, 0xf159dd9f,
+    0x6e835e01, 0x159ddce2, 0x8a475f7c, 0x8db6c2be, 0x126c4120,
+    0x6972c3c3, 0xf6a8405d, 0x9f4fc605, 0x0095459b, 0x7b8bc778,
+    0xe45144e6, 0xa844cbc8, 0x379e4856, 0x4c80cab5, 0xd35a492b,
+    0xbabdcf73, 0x25674ced, 0x5e79ce0e, 0xc1a34d90, 0x519af58a,
+    0xce407614, 0xb55ef4f7, 0x2a847769, 0x4363f131, 0xdcb972af,
+    0xa7a7f04c, 0x387d73d2, 0x7468fcfc, 0xebb27f62, 0x90acfd81,
+    0x0f767e1f, 0x6691f847, 0xf94b7bd9, 0x8255f93a, 0x1d8f7aa4,
+    0x1a7ee766, 0x85a464f8, 0xfebae61b, 0x61606585, 0x0887e3dd,
+    0x975d6043, 0xec43e2a0, 0x7399613e, 0x3f8cee10, 0xa0566d8e,
+    0xdb48ef6d, 0x44926cf3, 0x2d75eaab, 0xb2af6935, 0xc9b1ebd6,
+    0x566b6848},
+   {0x00000000, 0x65673b46, 0xcace768c, 0xafa94dca, 0x4eedeb59,
+    0x2b8ad01f, 0x84239dd5, 0xe144a693, 0x9ddbd6b2, 0xf8bcedf4,
+    0x5715a03e, 0x32729b78, 0xd3363deb, 0xb65106ad, 0x19f84b67,
+    0x7c9f7021, 0xe0c6ab25, 0x85a19063, 0x2a08dda9, 0x4f6fe6ef,
+    0xae2b407c, 0xcb4c7b3a, 0x64e536f0, 0x01820db6, 0x7d1d7d97,
+    0x187a46d1, 0xb7d30b1b, 0xd2b4305d, 0x33f096ce, 0x5697ad88,
+    0xf93ee042, 0x9c59db04, 0x1afc500b, 0x7f9b6b4d, 0xd0322687,
+    0xb5551dc1, 0x5411bb52, 0x31768014, 0x9edfcdde, 0xfbb8f698,
+    0x872786b9, 0xe240bdff, 0x4de9f035, 0x288ecb73, 0xc9ca6de0,
+    0xacad56a6, 0x03041b6c, 0x6663202a, 0xfa3afb2e, 0x9f5dc068,
+    0x30f48da2, 0x5593b6e4, 0xb4d71077, 0xd1b02b31, 0x7e1966fb,
+    0x1b7e5dbd, 0x67e12d9c, 0x028616da, 0xad2f5b10, 0xc8486056,
+    0x290cc6c5, 0x4c6bfd83, 0xe3c2b049, 0x86a58b0f, 0x35f8a016,
+    0x509f9b50, 0xff36d69a, 0x9a51eddc, 0x7b154b4f, 0x1e727009,
+    0xb1db3dc3, 0xd4bc0685, 0xa82376a4, 0xcd444de2, 0x62ed0028,
+    0x078a3b6e, 0xe6ce9dfd, 0x83a9a6bb, 0x2c00eb71, 0x4967d037,
+    0xd53e0b33, 0xb0593075, 0x1ff07dbf, 0x7a9746f9, 0x9bd3e06a,
+    0xfeb4db2c, 0x511d96e6, 0x347aada0, 0x48e5dd81, 0x2d82e6c7,
+    0x822bab0d, 0xe74c904b, 0x060836d8, 0x636f0d9e, 0xccc64054,
+    0xa9a17b12, 0x2f04f01d, 0x4a63cb5b, 0xe5ca8691, 0x80adbdd7,
+    0x61e91b44, 0x048e2002, 0xab276dc8, 0xce40568e, 0xb2df26af,
+    0xd7b81de9, 0x78115023, 0x1d766b65, 0xfc32cdf6, 0x9955f6b0,
+    0x36fcbb7a, 0x539b803c, 0xcfc25b38, 0xaaa5607e, 0x050c2db4,
+    0x606b16f2, 0x812fb061, 0xe4488b27, 0x4be1c6ed, 0x2e86fdab,
+    0x52198d8a, 0x377eb6cc, 0x98d7fb06, 0xfdb0c040, 0x1cf466d3,
+    0x79935d95, 0xd63a105f, 0xb35d2b19, 0x6bf1402c, 0x0e967b6a,
+    0xa13f36a0, 0xc4580de6, 0x251cab75, 0x407b9033, 0xefd2ddf9,
+    0x8ab5e6bf, 0xf62a969e, 0x934dadd8, 0x3ce4e012, 0x5983db54,
+    0xb8c77dc7, 0xdda04681, 0x72090b4b, 0x176e300d, 0x8b37eb09,
+    0xee50d04f, 0x41f99d85, 0x249ea6c3, 0xc5da0050, 0xa0bd3b16,
+    0x0f1476dc, 0x6a734d9a, 0x16ec3dbb, 0x738b06fd, 0xdc224b37,
+    0xb9457071, 0x5801d6e2, 0x3d66eda4, 0x92cfa06e, 0xf7a89b28,
+    0x710d1027, 0x146a2b61, 0xbbc366ab, 0xdea45ded, 0x3fe0fb7e,
+    0x5a87c038, 0xf52e8df2, 0x9049b6b4, 0xecd6c695, 0x89b1fdd3,
+    0x2618b019, 0x437f8b5f, 0xa23b2dcc, 0xc75c168a, 0x68f55b40,
+    0x0d926006, 0x91cbbb02, 0xf4ac8044, 0x5b05cd8e, 0x3e62f6c8,
+    0xdf26505b, 0xba416b1d, 0x15e826d7, 0x708f1d91, 0x0c106db0,
+    0x697756f6, 0xc6de1b3c, 0xa3b9207a, 0x42fd86e9, 0x279abdaf,
+    0x8833f065, 0xed54cb23, 0x5e09e03a, 0x3b6edb7c, 0x94c796b6,
+    0xf1a0adf0, 0x10e40b63, 0x75833025, 0xda2a7def, 0xbf4d46a9,
+    0xc3d23688, 0xa6b50dce, 0x091c4004, 0x6c7b7b42, 0x8d3fddd1,
+    0xe858e697, 0x47f1ab5d, 0x2296901b, 0xbecf4b1f, 0xdba87059,
+    0x74013d93, 0x116606d5, 0xf022a046, 0x95459b00, 0x3aecd6ca,
+    0x5f8bed8c, 0x23149dad, 0x4673a6eb, 0xe9daeb21, 0x8cbdd067,
+    0x6df976f4, 0x089e4db2, 0xa7370078, 0xc2503b3e, 0x44f5b031,
+    0x21928b77, 0x8e3bc6bd, 0xeb5cfdfb, 0x0a185b68, 0x6f7f602e,
+    0xc0d62de4, 0xa5b116a2, 0xd92e6683, 0xbc495dc5, 0x13e0100f,
+    0x76872b49, 0x97c38dda, 0xf2a4b69c, 0x5d0dfb56, 0x386ac010,
+    0xa4331b14, 0xc1542052, 0x6efd6d98, 0x0b9a56de, 0xeadef04d,
+    0x8fb9cb0b, 0x201086c1, 0x4577bd87, 0x39e8cda6, 0x5c8ff6e0,
+    0xf326bb2a, 0x9641806c, 0x770526ff, 0x12621db9, 0xbdcb5073,
+    0xd8ac6b35},
+   {0x00000000, 0xd7e28058, 0x74b406f1, 0xa35686a9, 0xe9680de2,
+    0x3e8a8dba, 0x9ddc0b13, 0x4a3e8b4b, 0x09a11d85, 0xde439ddd,
+    0x7d151b74, 0xaaf79b2c, 0xe0c91067, 0x372b903f, 0x947d1696,
+    0x439f96ce, 0x13423b0a, 0xc4a0bb52, 0x67f63dfb, 0xb014bda3,
+    0xfa2a36e8, 0x2dc8b6b0, 0x8e9e3019, 0x597cb041, 0x1ae3268f,
+    0xcd01a6d7, 0x6e57207e, 0xb9b5a026, 0xf38b2b6d, 0x2469ab35,
+    0x873f2d9c, 0x50ddadc4, 0x26847614, 0xf166f64c, 0x523070e5,
+    0x85d2f0bd, 0xcfec7bf6, 0x180efbae, 0xbb587d07, 0x6cbafd5f,
+    0x2f256b91, 0xf8c7ebc9, 0x5b916d60, 0x8c73ed38, 0xc64d6673,
+    0x11afe62b, 0xb2f96082, 0x651be0da, 0x35c64d1e, 0xe224cd46,
+    0x41724bef, 0x9690cbb7, 0xdcae40fc, 0x0b4cc0a4, 0xa81a460d,
+    0x7ff8c655, 0x3c67509b, 0xeb85d0c3, 0x48d3566a, 0x9f31d632,
+    0xd50f5d79, 0x02eddd21, 0xa1bb5b88, 0x7659dbd0, 0x4d08ec28,
+    0x9aea6c70, 0x39bcead9, 0xee5e6a81, 0xa460e1ca, 0x73826192,
+    0xd0d4e73b, 0x07366763, 0x44a9f1ad, 0x934b71f5, 0x301df75c,
+    0xe7ff7704, 0xadc1fc4f, 0x7a237c17, 0xd975fabe, 0x0e977ae6,
+    0x5e4ad722, 0x89a8577a, 0x2afed1d3, 0xfd1c518b, 0xb722dac0,
+    0x60c05a98, 0xc396dc31, 0x14745c69, 0x57ebcaa7, 0x80094aff,
+    0x235fcc56, 0xf4bd4c0e, 0xbe83c745, 0x6961471d, 0xca37c1b4,
+    0x1dd541ec, 0x6b8c9a3c, 0xbc6e1a64, 0x1f389ccd, 0xc8da1c95,
+    0x82e497de, 0x55061786, 0xf650912f, 0x21b21177, 0x622d87b9,
+    0xb5cf07e1, 0x16998148, 0xc17b0110, 0x8b458a5b, 0x5ca70a03,
+    0xfff18caa, 0x28130cf2, 0x78cea136, 0xaf2c216e, 0x0c7aa7c7,
+    0xdb98279f, 0x91a6acd4, 0x46442c8c, 0xe512aa25, 0x32f02a7d,
+    0x716fbcb3, 0xa68d3ceb, 0x05dbba42, 0xd2393a1a, 0x9807b151,
+    0x4fe53109, 0xecb3b7a0, 0x3b5137f8, 0x9a11d850, 0x4df35808,
+    0xeea5dea1, 0x39475ef9, 0x7379d5b2, 0xa49b55ea, 0x07cdd343,
+    0xd02f531b, 0x93b0c5d5, 0x4452458d, 0xe704c324, 0x30e6437c,
+    0x7ad8c837, 0xad3a486f, 0x0e6ccec6, 0xd98e4e9e, 0x8953e35a,
+    0x5eb16302, 0xfde7e5ab, 0x2a0565f3, 0x603beeb8, 0xb7d96ee0,
+    0x148fe849, 0xc36d6811, 0x80f2fedf, 0x57107e87, 0xf446f82e,
+    0x23a47876, 0x699af33d, 0xbe787365, 0x1d2ef5cc, 0xcacc7594,
+    0xbc95ae44, 0x6b772e1c, 0xc821a8b5, 0x1fc328ed, 0x55fda3a6,
+    0x821f23fe, 0x2149a557, 0xf6ab250f, 0xb534b3c1, 0x62d63399,
+    0xc180b530, 0x16623568, 0x5c5cbe23, 0x8bbe3e7b, 0x28e8b8d2,
+    0xff0a388a, 0xafd7954e, 0x78351516, 0xdb6393bf, 0x0c8113e7,
+    0x46bf98ac, 0x915d18f4, 0x320b9e5d, 0xe5e91e05, 0xa67688cb,
+    0x71940893, 0xd2c28e3a, 0x05200e62, 0x4f1e8529, 0x98fc0571,
+    0x3baa83d8, 0xec480380, 0xd7193478, 0x00fbb420, 0xa3ad3289,
+    0x744fb2d1, 0x3e71399a, 0xe993b9c2, 0x4ac53f6b, 0x9d27bf33,
+    0xdeb829fd, 0x095aa9a5, 0xaa0c2f0c, 0x7deeaf54, 0x37d0241f,
+    0xe032a447, 0x436422ee, 0x9486a2b6, 0xc45b0f72, 0x13b98f2a,
+    0xb0ef0983, 0x670d89db, 0x2d330290, 0xfad182c8, 0x59870461,
+    0x8e658439, 0xcdfa12f7, 0x1a1892af, 0xb94e1406, 0x6eac945e,
+    0x24921f15, 0xf3709f4d, 0x502619e4, 0x87c499bc, 0xf19d426c,
+    0x267fc234, 0x8529449d, 0x52cbc4c5, 0x18f54f8e, 0xcf17cfd6,
+    0x6c41497f, 0xbba3c927, 0xf83c5fe9, 0x2fdedfb1, 0x8c885918,
+    0x5b6ad940, 0x1154520b, 0xc6b6d253, 0x65e054fa, 0xb202d4a2,
+    0xe2df7966, 0x353df93e, 0x966b7f97, 0x4189ffcf, 0x0bb77484,
+    0xdc55f4dc, 0x7f037275, 0xa8e1f22d, 0xeb7e64e3, 0x3c9ce4bb,
+    0x9fca6212, 0x4828e24a, 0x02166901, 0xd5f4e959, 0x76a26ff0,
+    0xa140efa8},
+   {0x00000000, 0xef52b6e1, 0x05d46b83, 0xea86dd62, 0x0ba8d706,
+    0xe4fa61e7, 0x0e7cbc85, 0xe12e0a64, 0x1751ae0c, 0xf80318ed,
+    0x1285c58f, 0xfdd7736e, 0x1cf9790a, 0xf3abcfeb, 0x192d1289,
+    0xf67fa468, 0x2ea35c18, 0xc1f1eaf9, 0x2b77379b, 0xc425817a,
+    0x250b8b1e, 0xca593dff, 0x20dfe09d, 0xcf8d567c, 0x39f2f214,
+    0xd6a044f5, 0x3c269997, 0xd3742f76, 0x325a2512, 0xdd0893f3,
+    0x378e4e91, 0xd8dcf870, 0x5d46b830, 0xb2140ed1, 0x5892d3b3,
+    0xb7c06552, 0x56ee6f36, 0xb9bcd9d7, 0x533a04b5, 0xbc68b254,
+    0x4a17163c, 0xa545a0dd, 0x4fc37dbf, 0xa091cb5e, 0x41bfc13a,
+    0xaeed77db, 0x446baab9, 0xab391c58, 0x73e5e428, 0x9cb752c9,
+    0x76318fab, 0x9963394a, 0x784d332e, 0x971f85cf, 0x7d9958ad,
+    0x92cbee4c, 0x64b44a24, 0x8be6fcc5, 0x616021a7, 0x8e329746,
+    0x6f1c9d22, 0x804e2bc3, 0x6ac8f6a1, 0x859a4040, 0xba8d7060,
+    0x55dfc681, 0xbf591be3, 0x500bad02, 0xb125a766, 0x5e771187,
+    0xb4f1cce5, 0x5ba37a04, 0xaddcde6c, 0x428e688d, 0xa808b5ef,
+    0x475a030e, 0xa674096a, 0x4926bf8b, 0xa3a062e9, 0x4cf2d408,
+    0x942e2c78, 0x7b7c9a99, 0x91fa47fb, 0x7ea8f11a, 0x9f86fb7e,
+    0x70d44d9f, 0x9a5290fd, 0x7500261c, 0x837f8274, 0x6c2d3495,
+    0x86abe9f7, 0x69f95f16, 0x88d75572, 0x6785e393, 0x8d033ef1,
+    0x62518810, 0xe7cbc850, 0x08997eb1, 0xe21fa3d3, 0x0d4d1532,
+    0xec631f56, 0x0331a9b7, 0xe9b774d5, 0x06e5c234, 0xf09a665c,
+    0x1fc8d0bd, 0xf54e0ddf, 0x1a1cbb3e, 0xfb32b15a, 0x146007bb,
+    0xfee6dad9, 0x11b46c38, 0xc9689448, 0x263a22a9, 0xccbcffcb,
+    0x23ee492a, 0xc2c0434e, 0x2d92f5af, 0xc71428cd, 0x28469e2c,
+    0xde393a44, 0x316b8ca5, 0xdbed51c7, 0x34bfe726, 0xd591ed42,
+    0x3ac35ba3, 0xd04586c1, 0x3f173020, 0xae6be681, 0x41395060,
+    0xabbf8d02, 0x44ed3be3, 0xa5c33187, 0x4a918766, 0xa0175a04,
+    0x4f45ece5, 0xb93a488d, 0x5668fe6c, 0xbcee230e, 0x53bc95ef,
+    0xb2929f8b, 0x5dc0296a, 0xb746f408, 0x581442e9, 0x80c8ba99,
+    0x6f9a0c78, 0x851cd11a, 0x6a4e67fb, 0x8b606d9f, 0x6432db7e,
+    0x8eb4061c, 0x61e6b0fd, 0x97991495, 0x78cba274, 0x924d7f16,
+    0x7d1fc9f7, 0x9c31c393, 0x73637572, 0x99e5a810, 0x76b71ef1,
+    0xf32d5eb1, 0x1c7fe850, 0xf6f93532, 0x19ab83d3, 0xf88589b7,
+    0x17d73f56, 0xfd51e234, 0x120354d5, 0xe47cf0bd, 0x0b2e465c,
+    0xe1a89b3e, 0x0efa2ddf, 0xefd427bb, 0x0086915a, 0xea004c38,
+    0x0552fad9, 0xdd8e02a9, 0x32dcb448, 0xd85a692a, 0x3708dfcb,
+    0xd626d5af, 0x3974634e, 0xd3f2be2c, 0x3ca008cd, 0xcadfaca5,
+    0x258d1a44, 0xcf0bc726, 0x205971c7, 0xc1777ba3, 0x2e25cd42,
+    0xc4a31020, 0x2bf1a6c1, 0x14e696e1, 0xfbb42000, 0x1132fd62,
+    0xfe604b83, 0x1f4e41e7, 0xf01cf706, 0x1a9a2a64, 0xf5c89c85,
+    0x03b738ed, 0xece58e0c, 0x0663536e, 0xe931e58f, 0x081fefeb,
+    0xe74d590a, 0x0dcb8468, 0xe2993289, 0x3a45caf9, 0xd5177c18,
+    0x3f91a17a, 0xd0c3179b, 0x31ed1dff, 0xdebfab1e, 0x3439767c,
+    0xdb6bc09d, 0x2d1464f5, 0xc246d214, 0x28c00f76, 0xc792b997,
+    0x26bcb3f3, 0xc9ee0512, 0x2368d870, 0xcc3a6e91, 0x49a02ed1,
+    0xa6f29830, 0x4c744552, 0xa326f3b3, 0x4208f9d7, 0xad5a4f36,
+    0x47dc9254, 0xa88e24b5, 0x5ef180dd, 0xb1a3363c, 0x5b25eb5e,
+    0xb4775dbf, 0x555957db, 0xba0be13a, 0x508d3c58, 0xbfdf8ab9,
+    0x670372c9, 0x8851c428, 0x62d7194a, 0x8d85afab, 0x6caba5cf,
+    0x83f9132e, 0x697fce4c, 0x862d78ad, 0x7052dcc5, 0x9f006a24,
+    0x7586b746, 0x9ad401a7, 0x7bfa0bc3, 0x94a8bd22, 0x7e2e6040,
+    0x917cd6a1},
+   {0x00000000, 0x87a6cb43, 0xd43c90c7, 0x539a5b84, 0x730827cf,
+    0xf4aeec8c, 0xa734b708, 0x20927c4b, 0xe6104f9e, 0x61b684dd,
+    0x322cdf59, 0xb58a141a, 0x95186851, 0x12bea312, 0x4124f896,
+    0xc68233d5, 0x1751997d, 0x90f7523e, 0xc36d09ba, 0x44cbc2f9,
+    0x6459beb2, 0xe3ff75f1, 0xb0652e75, 0x37c3e536, 0xf141d6e3,
+    0x76e71da0, 0x257d4624, 0xa2db8d67, 0x8249f12c, 0x05ef3a6f,
+    0x567561eb, 0xd1d3aaa8, 0x2ea332fa, 0xa905f9b9, 0xfa9fa23d,
+    0x7d39697e, 0x5dab1535, 0xda0dde76, 0x899785f2, 0x0e314eb1,
+    0xc8b37d64, 0x4f15b627, 0x1c8feda3, 0x9b2926e0, 0xbbbb5aab,
+    0x3c1d91e8, 0x6f87ca6c, 0xe821012f, 0x39f2ab87, 0xbe5460c4,
+    0xedce3b40, 0x6a68f003, 0x4afa8c48, 0xcd5c470b, 0x9ec61c8f,
+    0x1960d7cc, 0xdfe2e419, 0x58442f5a, 0x0bde74de, 0x8c78bf9d,
+    0xaceac3d6, 0x2b4c0895, 0x78d65311, 0xff709852, 0x5d4665f4,
+    0xdae0aeb7, 0x897af533, 0x0edc3e70, 0x2e4e423b, 0xa9e88978,
+    0xfa72d2fc, 0x7dd419bf, 0xbb562a6a, 0x3cf0e129, 0x6f6abaad,
+    0xe8cc71ee, 0xc85e0da5, 0x4ff8c6e6, 0x1c629d62, 0x9bc45621,
+    0x4a17fc89, 0xcdb137ca, 0x9e2b6c4e, 0x198da70d, 0x391fdb46,
+    0xbeb91005, 0xed234b81, 0x6a8580c2, 0xac07b317, 0x2ba17854,
+    0x783b23d0, 0xff9de893, 0xdf0f94d8, 0x58a95f9b, 0x0b33041f,
+    0x8c95cf5c, 0x73e5570e, 0xf4439c4d, 0xa7d9c7c9, 0x207f0c8a,
+    0x00ed70c1, 0x874bbb82, 0xd4d1e006, 0x53772b45, 0x95f51890,
+    0x1253d3d3, 0x41c98857, 0xc66f4314, 0xe6fd3f5f, 0x615bf41c,
+    0x32c1af98, 0xb56764db, 0x64b4ce73, 0xe3120530, 0xb0885eb4,
+    0x372e95f7, 0x17bce9bc, 0x901a22ff, 0xc380797b, 0x4426b238,
+    0x82a481ed, 0x05024aae, 0x5698112a, 0xd13eda69, 0xf1aca622,
+    0x760a6d61, 0x259036e5, 0xa236fda6, 0xba8ccbe8, 0x3d2a00ab,
+    0x6eb05b2f, 0xe916906c, 0xc984ec27, 0x4e222764, 0x1db87ce0,
+    0x9a1eb7a3, 0x5c9c8476, 0xdb3a4f35, 0x88a014b1, 0x0f06dff2,
+    0x2f94a3b9, 0xa83268fa, 0xfba8337e, 0x7c0ef83d, 0xaddd5295,
+    0x2a7b99d6, 0x79e1c252, 0xfe470911, 0xded5755a, 0x5973be19,
+    0x0ae9e59d, 0x8d4f2ede, 0x4bcd1d0b, 0xcc6bd648, 0x9ff18dcc,
+    0x1857468f, 0x38c53ac4, 0xbf63f187, 0xecf9aa03, 0x6b5f6140,
+    0x942ff912, 0x13893251, 0x401369d5, 0xc7b5a296, 0xe727dedd,
+    0x6081159e, 0x331b4e1a, 0xb4bd8559, 0x723fb68c, 0xf5997dcf,
+    0xa603264b, 0x21a5ed08, 0x01379143, 0x86915a00, 0xd50b0184,
+    0x52adcac7, 0x837e606f, 0x04d8ab2c, 0x5742f0a8, 0xd0e43beb,
+    0xf07647a0, 0x77d08ce3, 0x244ad767, 0xa3ec1c24, 0x656e2ff1,
+    0xe2c8e4b2, 0xb152bf36, 0x36f47475, 0x1666083e, 0x91c0c37d,
+    0xc25a98f9, 0x45fc53ba, 0xe7caae1c, 0x606c655f, 0x33f63edb,
+    0xb450f598, 0x94c289d3, 0x13644290, 0x40fe1914, 0xc758d257,
+    0x01dae182, 0x867c2ac1, 0xd5e67145, 0x5240ba06, 0x72d2c64d,
+    0xf5740d0e, 0xa6ee568a, 0x21489dc9, 0xf09b3761, 0x773dfc22,
+    0x24a7a7a6, 0xa3016ce5, 0x839310ae, 0x0435dbed, 0x57af8069,
+    0xd0094b2a, 0x168b78ff, 0x912db3bc, 0xc2b7e838, 0x4511237b,
+    0x65835f30, 0xe2259473, 0xb1bfcff7, 0x361904b4, 0xc9699ce6,
+    0x4ecf57a5, 0x1d550c21, 0x9af3c762, 0xba61bb29, 0x3dc7706a,
+    0x6e5d2bee, 0xe9fbe0ad, 0x2f79d378, 0xa8df183b, 0xfb4543bf,
+    0x7ce388fc, 0x5c71f4b7, 0xdbd73ff4, 0x884d6470, 0x0febaf33,
+    0xde38059b, 0x599eced8, 0x0a04955c, 0x8da25e1f, 0xad302254,
+    0x2a96e917, 0x790cb293, 0xfeaa79d0, 0x38284a05, 0xbf8e8146,
+    0xec14dac2, 0x6bb21181, 0x4b206dca, 0xcc86a689, 0x9f1cfd0d,
+    0x18ba364e}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x0000000000000000, 0x43cba68700000000, 0xc7903cd400000000,
+    0x845b9a5300000000, 0xcf27087300000000, 0x8cecaef400000000,
+    0x08b734a700000000, 0x4b7c922000000000, 0x9e4f10e600000000,
+    0xdd84b66100000000, 0x59df2c3200000000, 0x1a148ab500000000,
+    0x5168189500000000, 0x12a3be1200000000, 0x96f8244100000000,
+    0xd53382c600000000, 0x7d99511700000000, 0x3e52f79000000000,
+    0xba096dc300000000, 0xf9c2cb4400000000, 0xb2be596400000000,
+    0xf175ffe300000000, 0x752e65b000000000, 0x36e5c33700000000,
+    0xe3d641f100000000, 0xa01de77600000000, 0x24467d2500000000,
+    0x678ddba200000000, 0x2cf1498200000000, 0x6f3aef0500000000,
+    0xeb61755600000000, 0xa8aad3d100000000, 0xfa32a32e00000000,
+    0xb9f905a900000000, 0x3da29ffa00000000, 0x7e69397d00000000,
+    0x3515ab5d00000000, 0x76de0dda00000000, 0xf285978900000000,
+    0xb14e310e00000000, 0x647db3c800000000, 0x27b6154f00000000,
+    0xa3ed8f1c00000000, 0xe026299b00000000, 0xab5abbbb00000000,
+    0xe8911d3c00000000, 0x6cca876f00000000, 0x2f0121e800000000,
+    0x87abf23900000000, 0xc46054be00000000, 0x403bceed00000000,
+    0x03f0686a00000000, 0x488cfa4a00000000, 0x0b475ccd00000000,
+    0x8f1cc69e00000000, 0xccd7601900000000, 0x19e4e2df00000000,
+    0x5a2f445800000000, 0xde74de0b00000000, 0x9dbf788c00000000,
+    0xd6c3eaac00000000, 0x95084c2b00000000, 0x1153d67800000000,
+    0x529870ff00000000, 0xf465465d00000000, 0xb7aee0da00000000,
+    0x33f57a8900000000, 0x703edc0e00000000, 0x3b424e2e00000000,
+    0x7889e8a900000000, 0xfcd272fa00000000, 0xbf19d47d00000000,
+    0x6a2a56bb00000000, 0x29e1f03c00000000, 0xadba6a6f00000000,
+    0xee71cce800000000, 0xa50d5ec800000000, 0xe6c6f84f00000000,
+    0x629d621c00000000, 0x2156c49b00000000, 0x89fc174a00000000,
+    0xca37b1cd00000000, 0x4e6c2b9e00000000, 0x0da78d1900000000,
+    0x46db1f3900000000, 0x0510b9be00000000, 0x814b23ed00000000,
+    0xc280856a00000000, 0x17b307ac00000000, 0x5478a12b00000000,
+    0xd0233b7800000000, 0x93e89dff00000000, 0xd8940fdf00000000,
+    0x9b5fa95800000000, 0x1f04330b00000000, 0x5ccf958c00000000,
+    0x0e57e57300000000, 0x4d9c43f400000000, 0xc9c7d9a700000000,
+    0x8a0c7f2000000000, 0xc170ed0000000000, 0x82bb4b8700000000,
+    0x06e0d1d400000000, 0x452b775300000000, 0x9018f59500000000,
+    0xd3d3531200000000, 0x5788c94100000000, 0x14436fc600000000,
+    0x5f3ffde600000000, 0x1cf45b6100000000, 0x98afc13200000000,
+    0xdb6467b500000000, 0x73ceb46400000000, 0x300512e300000000,
+    0xb45e88b000000000, 0xf7952e3700000000, 0xbce9bc1700000000,
+    0xff221a9000000000, 0x7b7980c300000000, 0x38b2264400000000,
+    0xed81a48200000000, 0xae4a020500000000, 0x2a11985600000000,
+    0x69da3ed100000000, 0x22a6acf100000000, 0x616d0a7600000000,
+    0xe536902500000000, 0xa6fd36a200000000, 0xe8cb8cba00000000,
+    0xab002a3d00000000, 0x2f5bb06e00000000, 0x6c9016e900000000,
+    0x27ec84c900000000, 0x6427224e00000000, 0xe07cb81d00000000,
+    0xa3b71e9a00000000, 0x76849c5c00000000, 0x354f3adb00000000,
+    0xb114a08800000000, 0xf2df060f00000000, 0xb9a3942f00000000,
+    0xfa6832a800000000, 0x7e33a8fb00000000, 0x3df80e7c00000000,
+    0x9552ddad00000000, 0xd6997b2a00000000, 0x52c2e17900000000,
+    0x110947fe00000000, 0x5a75d5de00000000, 0x19be735900000000,
+    0x9de5e90a00000000, 0xde2e4f8d00000000, 0x0b1dcd4b00000000,
+    0x48d66bcc00000000, 0xcc8df19f00000000, 0x8f46571800000000,
+    0xc43ac53800000000, 0x87f163bf00000000, 0x03aaf9ec00000000,
+    0x40615f6b00000000, 0x12f92f9400000000, 0x5132891300000000,
+    0xd569134000000000, 0x96a2b5c700000000, 0xddde27e700000000,
+    0x9e15816000000000, 0x1a4e1b3300000000, 0x5985bdb400000000,
+    0x8cb63f7200000000, 0xcf7d99f500000000, 0x4b2603a600000000,
+    0x08eda52100000000, 0x4391370100000000, 0x005a918600000000,
+    0x84010bd500000000, 0xc7caad5200000000, 0x6f607e8300000000,
+    0x2cabd80400000000, 0xa8f0425700000000, 0xeb3be4d000000000,
+    0xa04776f000000000, 0xe38cd07700000000, 0x67d74a2400000000,
+    0x241ceca300000000, 0xf12f6e6500000000, 0xb2e4c8e200000000,
+    0x36bf52b100000000, 0x7574f43600000000, 0x3e08661600000000,
+    0x7dc3c09100000000, 0xf9985ac200000000, 0xba53fc4500000000,
+    0x1caecae700000000, 0x5f656c6000000000, 0xdb3ef63300000000,
+    0x98f550b400000000, 0xd389c29400000000, 0x9042641300000000,
+    0x1419fe4000000000, 0x57d258c700000000, 0x82e1da0100000000,
+    0xc12a7c8600000000, 0x4571e6d500000000, 0x06ba405200000000,
+    0x4dc6d27200000000, 0x0e0d74f500000000, 0x8a56eea600000000,
+    0xc99d482100000000, 0x61379bf000000000, 0x22fc3d7700000000,
+    0xa6a7a72400000000, 0xe56c01a300000000, 0xae10938300000000,
+    0xeddb350400000000, 0x6980af5700000000, 0x2a4b09d000000000,
+    0xff788b1600000000, 0xbcb32d9100000000, 0x38e8b7c200000000,
+    0x7b23114500000000, 0x305f836500000000, 0x739425e200000000,
+    0xf7cfbfb100000000, 0xb404193600000000, 0xe69c69c900000000,
+    0xa557cf4e00000000, 0x210c551d00000000, 0x62c7f39a00000000,
+    0x29bb61ba00000000, 0x6a70c73d00000000, 0xee2b5d6e00000000,
+    0xade0fbe900000000, 0x78d3792f00000000, 0x3b18dfa800000000,
+    0xbf4345fb00000000, 0xfc88e37c00000000, 0xb7f4715c00000000,
+    0xf43fd7db00000000, 0x70644d8800000000, 0x33afeb0f00000000,
+    0x9b0538de00000000, 0xd8ce9e5900000000, 0x5c95040a00000000,
+    0x1f5ea28d00000000, 0x542230ad00000000, 0x17e9962a00000000,
+    0x93b20c7900000000, 0xd079aafe00000000, 0x054a283800000000,
+    0x46818ebf00000000, 0xc2da14ec00000000, 0x8111b26b00000000,
+    0xca6d204b00000000, 0x89a686cc00000000, 0x0dfd1c9f00000000,
+    0x4e36ba1800000000},
+   {0x0000000000000000, 0xe1b652ef00000000, 0x836bd40500000000,
+    0x62dd86ea00000000, 0x06d7a80b00000000, 0xe761fae400000000,
+    0x85bc7c0e00000000, 0x640a2ee100000000, 0x0cae511700000000,
+    0xed1803f800000000, 0x8fc5851200000000, 0x6e73d7fd00000000,
+    0x0a79f91c00000000, 0xebcfabf300000000, 0x89122d1900000000,
+    0x68a47ff600000000, 0x185ca32e00000000, 0xf9eaf1c100000000,
+    0x9b37772b00000000, 0x7a8125c400000000, 0x1e8b0b2500000000,
+    0xff3d59ca00000000, 0x9de0df2000000000, 0x7c568dcf00000000,
+    0x14f2f23900000000, 0xf544a0d600000000, 0x9799263c00000000,
+    0x762f74d300000000, 0x12255a3200000000, 0xf39308dd00000000,
+    0x914e8e3700000000, 0x70f8dcd800000000, 0x30b8465d00000000,
+    0xd10e14b200000000, 0xb3d3925800000000, 0x5265c0b700000000,
+    0x366fee5600000000, 0xd7d9bcb900000000, 0xb5043a5300000000,
+    0x54b268bc00000000, 0x3c16174a00000000, 0xdda045a500000000,
+    0xbf7dc34f00000000, 0x5ecb91a000000000, 0x3ac1bf4100000000,
+    0xdb77edae00000000, 0xb9aa6b4400000000, 0x581c39ab00000000,
+    0x28e4e57300000000, 0xc952b79c00000000, 0xab8f317600000000,
+    0x4a39639900000000, 0x2e334d7800000000, 0xcf851f9700000000,
+    0xad58997d00000000, 0x4ceecb9200000000, 0x244ab46400000000,
+    0xc5fce68b00000000, 0xa721606100000000, 0x4697328e00000000,
+    0x229d1c6f00000000, 0xc32b4e8000000000, 0xa1f6c86a00000000,
+    0x40409a8500000000, 0x60708dba00000000, 0x81c6df5500000000,
+    0xe31b59bf00000000, 0x02ad0b5000000000, 0x66a725b100000000,
+    0x8711775e00000000, 0xe5ccf1b400000000, 0x047aa35b00000000,
+    0x6cdedcad00000000, 0x8d688e4200000000, 0xefb508a800000000,
+    0x0e035a4700000000, 0x6a0974a600000000, 0x8bbf264900000000,
+    0xe962a0a300000000, 0x08d4f24c00000000, 0x782c2e9400000000,
+    0x999a7c7b00000000, 0xfb47fa9100000000, 0x1af1a87e00000000,
+    0x7efb869f00000000, 0x9f4dd47000000000, 0xfd90529a00000000,
+    0x1c26007500000000, 0x74827f8300000000, 0x95342d6c00000000,
+    0xf7e9ab8600000000, 0x165ff96900000000, 0x7255d78800000000,
+    0x93e3856700000000, 0xf13e038d00000000, 0x1088516200000000,
+    0x50c8cbe700000000, 0xb17e990800000000, 0xd3a31fe200000000,
+    0x32154d0d00000000, 0x561f63ec00000000, 0xb7a9310300000000,
+    0xd574b7e900000000, 0x34c2e50600000000, 0x5c669af000000000,
+    0xbdd0c81f00000000, 0xdf0d4ef500000000, 0x3ebb1c1a00000000,
+    0x5ab132fb00000000, 0xbb07601400000000, 0xd9dae6fe00000000,
+    0x386cb41100000000, 0x489468c900000000, 0xa9223a2600000000,
+    0xcbffbccc00000000, 0x2a49ee2300000000, 0x4e43c0c200000000,
+    0xaff5922d00000000, 0xcd2814c700000000, 0x2c9e462800000000,
+    0x443a39de00000000, 0xa58c6b3100000000, 0xc751eddb00000000,
+    0x26e7bf3400000000, 0x42ed91d500000000, 0xa35bc33a00000000,
+    0xc18645d000000000, 0x2030173f00000000, 0x81e66bae00000000,
+    0x6050394100000000, 0x028dbfab00000000, 0xe33bed4400000000,
+    0x8731c3a500000000, 0x6687914a00000000, 0x045a17a000000000,
+    0xe5ec454f00000000, 0x8d483ab900000000, 0x6cfe685600000000,
+    0x0e23eebc00000000, 0xef95bc5300000000, 0x8b9f92b200000000,
+    0x6a29c05d00000000, 0x08f446b700000000, 0xe942145800000000,
+    0x99bac88000000000, 0x780c9a6f00000000, 0x1ad11c8500000000,
+    0xfb674e6a00000000, 0x9f6d608b00000000, 0x7edb326400000000,
+    0x1c06b48e00000000, 0xfdb0e66100000000, 0x9514999700000000,
+    0x74a2cb7800000000, 0x167f4d9200000000, 0xf7c91f7d00000000,
+    0x93c3319c00000000, 0x7275637300000000, 0x10a8e59900000000,
+    0xf11eb77600000000, 0xb15e2df300000000, 0x50e87f1c00000000,
+    0x3235f9f600000000, 0xd383ab1900000000, 0xb78985f800000000,
+    0x563fd71700000000, 0x34e251fd00000000, 0xd554031200000000,
+    0xbdf07ce400000000, 0x5c462e0b00000000, 0x3e9ba8e100000000,
+    0xdf2dfa0e00000000, 0xbb27d4ef00000000, 0x5a91860000000000,
+    0x384c00ea00000000, 0xd9fa520500000000, 0xa9028edd00000000,
+    0x48b4dc3200000000, 0x2a695ad800000000, 0xcbdf083700000000,
+    0xafd526d600000000, 0x4e63743900000000, 0x2cbef2d300000000,
+    0xcd08a03c00000000, 0xa5acdfca00000000, 0x441a8d2500000000,
+    0x26c70bcf00000000, 0xc771592000000000, 0xa37b77c100000000,
+    0x42cd252e00000000, 0x2010a3c400000000, 0xc1a6f12b00000000,
+    0xe196e61400000000, 0x0020b4fb00000000, 0x62fd321100000000,
+    0x834b60fe00000000, 0xe7414e1f00000000, 0x06f71cf000000000,
+    0x642a9a1a00000000, 0x859cc8f500000000, 0xed38b70300000000,
+    0x0c8ee5ec00000000, 0x6e53630600000000, 0x8fe531e900000000,
+    0xebef1f0800000000, 0x0a594de700000000, 0x6884cb0d00000000,
+    0x893299e200000000, 0xf9ca453a00000000, 0x187c17d500000000,
+    0x7aa1913f00000000, 0x9b17c3d000000000, 0xff1ded3100000000,
+    0x1eabbfde00000000, 0x7c76393400000000, 0x9dc06bdb00000000,
+    0xf564142d00000000, 0x14d246c200000000, 0x760fc02800000000,
+    0x97b992c700000000, 0xf3b3bc2600000000, 0x1205eec900000000,
+    0x70d8682300000000, 0x916e3acc00000000, 0xd12ea04900000000,
+    0x3098f2a600000000, 0x5245744c00000000, 0xb3f326a300000000,
+    0xd7f9084200000000, 0x364f5aad00000000, 0x5492dc4700000000,
+    0xb5248ea800000000, 0xdd80f15e00000000, 0x3c36a3b100000000,
+    0x5eeb255b00000000, 0xbf5d77b400000000, 0xdb57595500000000,
+    0x3ae10bba00000000, 0x583c8d5000000000, 0xb98adfbf00000000,
+    0xc972036700000000, 0x28c4518800000000, 0x4a19d76200000000,
+    0xabaf858d00000000, 0xcfa5ab6c00000000, 0x2e13f98300000000,
+    0x4cce7f6900000000, 0xad782d8600000000, 0xc5dc527000000000,
+    0x246a009f00000000, 0x46b7867500000000, 0xa701d49a00000000,
+    0xc30bfa7b00000000, 0x22bda89400000000, 0x40602e7e00000000,
+    0xa1d67c9100000000},
+   {0x0000000000000000, 0x5880e2d700000000, 0xf106b47400000000,
+    0xa98656a300000000, 0xe20d68e900000000, 0xba8d8a3e00000000,
+    0x130bdc9d00000000, 0x4b8b3e4a00000000, 0x851da10900000000,
+    0xdd9d43de00000000, 0x741b157d00000000, 0x2c9bf7aa00000000,
+    0x6710c9e000000000, 0x3f902b3700000000, 0x96167d9400000000,
+    0xce969f4300000000, 0x0a3b421300000000, 0x52bba0c400000000,
+    0xfb3df66700000000, 0xa3bd14b000000000, 0xe8362afa00000000,
+    0xb0b6c82d00000000, 0x19309e8e00000000, 0x41b07c5900000000,
+    0x8f26e31a00000000, 0xd7a601cd00000000, 0x7e20576e00000000,
+    0x26a0b5b900000000, 0x6d2b8bf300000000, 0x35ab692400000000,
+    0x9c2d3f8700000000, 0xc4addd5000000000, 0x1476842600000000,
+    0x4cf666f100000000, 0xe570305200000000, 0xbdf0d28500000000,
+    0xf67beccf00000000, 0xaefb0e1800000000, 0x077d58bb00000000,
+    0x5ffdba6c00000000, 0x916b252f00000000, 0xc9ebc7f800000000,
+    0x606d915b00000000, 0x38ed738c00000000, 0x73664dc600000000,
+    0x2be6af1100000000, 0x8260f9b200000000, 0xdae01b6500000000,
+    0x1e4dc63500000000, 0x46cd24e200000000, 0xef4b724100000000,
+    0xb7cb909600000000, 0xfc40aedc00000000, 0xa4c04c0b00000000,
+    0x0d461aa800000000, 0x55c6f87f00000000, 0x9b50673c00000000,
+    0xc3d085eb00000000, 0x6a56d34800000000, 0x32d6319f00000000,
+    0x795d0fd500000000, 0x21dded0200000000, 0x885bbba100000000,
+    0xd0db597600000000, 0x28ec084d00000000, 0x706cea9a00000000,
+    0xd9eabc3900000000, 0x816a5eee00000000, 0xcae160a400000000,
+    0x9261827300000000, 0x3be7d4d000000000, 0x6367360700000000,
+    0xadf1a94400000000, 0xf5714b9300000000, 0x5cf71d3000000000,
+    0x0477ffe700000000, 0x4ffcc1ad00000000, 0x177c237a00000000,
+    0xbefa75d900000000, 0xe67a970e00000000, 0x22d74a5e00000000,
+    0x7a57a88900000000, 0xd3d1fe2a00000000, 0x8b511cfd00000000,
+    0xc0da22b700000000, 0x985ac06000000000, 0x31dc96c300000000,
+    0x695c741400000000, 0xa7caeb5700000000, 0xff4a098000000000,
+    0x56cc5f2300000000, 0x0e4cbdf400000000, 0x45c783be00000000,
+    0x1d47616900000000, 0xb4c137ca00000000, 0xec41d51d00000000,
+    0x3c9a8c6b00000000, 0x641a6ebc00000000, 0xcd9c381f00000000,
+    0x951cdac800000000, 0xde97e48200000000, 0x8617065500000000,
+    0x2f9150f600000000, 0x7711b22100000000, 0xb9872d6200000000,
+    0xe107cfb500000000, 0x4881991600000000, 0x10017bc100000000,
+    0x5b8a458b00000000, 0x030aa75c00000000, 0xaa8cf1ff00000000,
+    0xf20c132800000000, 0x36a1ce7800000000, 0x6e212caf00000000,
+    0xc7a77a0c00000000, 0x9f2798db00000000, 0xd4aca69100000000,
+    0x8c2c444600000000, 0x25aa12e500000000, 0x7d2af03200000000,
+    0xb3bc6f7100000000, 0xeb3c8da600000000, 0x42badb0500000000,
+    0x1a3a39d200000000, 0x51b1079800000000, 0x0931e54f00000000,
+    0xa0b7b3ec00000000, 0xf837513b00000000, 0x50d8119a00000000,
+    0x0858f34d00000000, 0xa1dea5ee00000000, 0xf95e473900000000,
+    0xb2d5797300000000, 0xea559ba400000000, 0x43d3cd0700000000,
+    0x1b532fd000000000, 0xd5c5b09300000000, 0x8d45524400000000,
+    0x24c304e700000000, 0x7c43e63000000000, 0x37c8d87a00000000,
+    0x6f483aad00000000, 0xc6ce6c0e00000000, 0x9e4e8ed900000000,
+    0x5ae3538900000000, 0x0263b15e00000000, 0xabe5e7fd00000000,
+    0xf365052a00000000, 0xb8ee3b6000000000, 0xe06ed9b700000000,
+    0x49e88f1400000000, 0x11686dc300000000, 0xdffef28000000000,
+    0x877e105700000000, 0x2ef846f400000000, 0x7678a42300000000,
+    0x3df39a6900000000, 0x657378be00000000, 0xccf52e1d00000000,
+    0x9475ccca00000000, 0x44ae95bc00000000, 0x1c2e776b00000000,
+    0xb5a821c800000000, 0xed28c31f00000000, 0xa6a3fd5500000000,
+    0xfe231f8200000000, 0x57a5492100000000, 0x0f25abf600000000,
+    0xc1b334b500000000, 0x9933d66200000000, 0x30b580c100000000,
+    0x6835621600000000, 0x23be5c5c00000000, 0x7b3ebe8b00000000,
+    0xd2b8e82800000000, 0x8a380aff00000000, 0x4e95d7af00000000,
+    0x1615357800000000, 0xbf9363db00000000, 0xe713810c00000000,
+    0xac98bf4600000000, 0xf4185d9100000000, 0x5d9e0b3200000000,
+    0x051ee9e500000000, 0xcb8876a600000000, 0x9308947100000000,
+    0x3a8ec2d200000000, 0x620e200500000000, 0x29851e4f00000000,
+    0x7105fc9800000000, 0xd883aa3b00000000, 0x800348ec00000000,
+    0x783419d700000000, 0x20b4fb0000000000, 0x8932ada300000000,
+    0xd1b24f7400000000, 0x9a39713e00000000, 0xc2b993e900000000,
+    0x6b3fc54a00000000, 0x33bf279d00000000, 0xfd29b8de00000000,
+    0xa5a95a0900000000, 0x0c2f0caa00000000, 0x54afee7d00000000,
+    0x1f24d03700000000, 0x47a432e000000000, 0xee22644300000000,
+    0xb6a2869400000000, 0x720f5bc400000000, 0x2a8fb91300000000,
+    0x8309efb000000000, 0xdb890d6700000000, 0x9002332d00000000,
+    0xc882d1fa00000000, 0x6104875900000000, 0x3984658e00000000,
+    0xf712facd00000000, 0xaf92181a00000000, 0x06144eb900000000,
+    0x5e94ac6e00000000, 0x151f922400000000, 0x4d9f70f300000000,
+    0xe419265000000000, 0xbc99c48700000000, 0x6c429df100000000,
+    0x34c27f2600000000, 0x9d44298500000000, 0xc5c4cb5200000000,
+    0x8e4ff51800000000, 0xd6cf17cf00000000, 0x7f49416c00000000,
+    0x27c9a3bb00000000, 0xe95f3cf800000000, 0xb1dfde2f00000000,
+    0x1859888c00000000, 0x40d96a5b00000000, 0x0b52541100000000,
+    0x53d2b6c600000000, 0xfa54e06500000000, 0xa2d402b200000000,
+    0x6679dfe200000000, 0x3ef93d3500000000, 0x977f6b9600000000,
+    0xcfff894100000000, 0x8474b70b00000000, 0xdcf455dc00000000,
+    0x7572037f00000000, 0x2df2e1a800000000, 0xe3647eeb00000000,
+    0xbbe49c3c00000000, 0x1262ca9f00000000, 0x4ae2284800000000,
+    0x0169160200000000, 0x59e9f4d500000000, 0xf06fa27600000000,
+    0xa8ef40a100000000},
+   {0x0000000000000000, 0x463b676500000000, 0x8c76ceca00000000,
+    0xca4da9af00000000, 0x59ebed4e00000000, 0x1fd08a2b00000000,
+    0xd59d238400000000, 0x93a644e100000000, 0xb2d6db9d00000000,
+    0xf4edbcf800000000, 0x3ea0155700000000, 0x789b723200000000,
+    0xeb3d36d300000000, 0xad0651b600000000, 0x674bf81900000000,
+    0x21709f7c00000000, 0x25abc6e000000000, 0x6390a18500000000,
+    0xa9dd082a00000000, 0xefe66f4f00000000, 0x7c402bae00000000,
+    0x3a7b4ccb00000000, 0xf036e56400000000, 0xb60d820100000000,
+    0x977d1d7d00000000, 0xd1467a1800000000, 0x1b0bd3b700000000,
+    0x5d30b4d200000000, 0xce96f03300000000, 0x88ad975600000000,
+    0x42e03ef900000000, 0x04db599c00000000, 0x0b50fc1a00000000,
+    0x4d6b9b7f00000000, 0x872632d000000000, 0xc11d55b500000000,
+    0x52bb115400000000, 0x1480763100000000, 0xdecddf9e00000000,
+    0x98f6b8fb00000000, 0xb986278700000000, 0xffbd40e200000000,
+    0x35f0e94d00000000, 0x73cb8e2800000000, 0xe06dcac900000000,
+    0xa656adac00000000, 0x6c1b040300000000, 0x2a20636600000000,
+    0x2efb3afa00000000, 0x68c05d9f00000000, 0xa28df43000000000,
+    0xe4b6935500000000, 0x7710d7b400000000, 0x312bb0d100000000,
+    0xfb66197e00000000, 0xbd5d7e1b00000000, 0x9c2de16700000000,
+    0xda16860200000000, 0x105b2fad00000000, 0x566048c800000000,
+    0xc5c60c2900000000, 0x83fd6b4c00000000, 0x49b0c2e300000000,
+    0x0f8ba58600000000, 0x16a0f83500000000, 0x509b9f5000000000,
+    0x9ad636ff00000000, 0xdced519a00000000, 0x4f4b157b00000000,
+    0x0970721e00000000, 0xc33ddbb100000000, 0x8506bcd400000000,
+    0xa47623a800000000, 0xe24d44cd00000000, 0x2800ed6200000000,
+    0x6e3b8a0700000000, 0xfd9dcee600000000, 0xbba6a98300000000,
+    0x71eb002c00000000, 0x37d0674900000000, 0x330b3ed500000000,
+    0x753059b000000000, 0xbf7df01f00000000, 0xf946977a00000000,
+    0x6ae0d39b00000000, 0x2cdbb4fe00000000, 0xe6961d5100000000,
+    0xa0ad7a3400000000, 0x81dde54800000000, 0xc7e6822d00000000,
+    0x0dab2b8200000000, 0x4b904ce700000000, 0xd836080600000000,
+    0x9e0d6f6300000000, 0x5440c6cc00000000, 0x127ba1a900000000,
+    0x1df0042f00000000, 0x5bcb634a00000000, 0x9186cae500000000,
+    0xd7bdad8000000000, 0x441be96100000000, 0x02208e0400000000,
+    0xc86d27ab00000000, 0x8e5640ce00000000, 0xaf26dfb200000000,
+    0xe91db8d700000000, 0x2350117800000000, 0x656b761d00000000,
+    0xf6cd32fc00000000, 0xb0f6559900000000, 0x7abbfc3600000000,
+    0x3c809b5300000000, 0x385bc2cf00000000, 0x7e60a5aa00000000,
+    0xb42d0c0500000000, 0xf2166b6000000000, 0x61b02f8100000000,
+    0x278b48e400000000, 0xedc6e14b00000000, 0xabfd862e00000000,
+    0x8a8d195200000000, 0xccb67e3700000000, 0x06fbd79800000000,
+    0x40c0b0fd00000000, 0xd366f41c00000000, 0x955d937900000000,
+    0x5f103ad600000000, 0x192b5db300000000, 0x2c40f16b00000000,
+    0x6a7b960e00000000, 0xa0363fa100000000, 0xe60d58c400000000,
+    0x75ab1c2500000000, 0x33907b4000000000, 0xf9ddd2ef00000000,
+    0xbfe6b58a00000000, 0x9e962af600000000, 0xd8ad4d9300000000,
+    0x12e0e43c00000000, 0x54db835900000000, 0xc77dc7b800000000,
+    0x8146a0dd00000000, 0x4b0b097200000000, 0x0d306e1700000000,
+    0x09eb378b00000000, 0x4fd050ee00000000, 0x859df94100000000,
+    0xc3a69e2400000000, 0x5000dac500000000, 0x163bbda000000000,
+    0xdc76140f00000000, 0x9a4d736a00000000, 0xbb3dec1600000000,
+    0xfd068b7300000000, 0x374b22dc00000000, 0x717045b900000000,
+    0xe2d6015800000000, 0xa4ed663d00000000, 0x6ea0cf9200000000,
+    0x289ba8f700000000, 0x27100d7100000000, 0x612b6a1400000000,
+    0xab66c3bb00000000, 0xed5da4de00000000, 0x7efbe03f00000000,
+    0x38c0875a00000000, 0xf28d2ef500000000, 0xb4b6499000000000,
+    0x95c6d6ec00000000, 0xd3fdb18900000000, 0x19b0182600000000,
+    0x5f8b7f4300000000, 0xcc2d3ba200000000, 0x8a165cc700000000,
+    0x405bf56800000000, 0x0660920d00000000, 0x02bbcb9100000000,
+    0x4480acf400000000, 0x8ecd055b00000000, 0xc8f6623e00000000,
+    0x5b5026df00000000, 0x1d6b41ba00000000, 0xd726e81500000000,
+    0x911d8f7000000000, 0xb06d100c00000000, 0xf656776900000000,
+    0x3c1bdec600000000, 0x7a20b9a300000000, 0xe986fd4200000000,
+    0xafbd9a2700000000, 0x65f0338800000000, 0x23cb54ed00000000,
+    0x3ae0095e00000000, 0x7cdb6e3b00000000, 0xb696c79400000000,
+    0xf0ada0f100000000, 0x630be41000000000, 0x2530837500000000,
+    0xef7d2ada00000000, 0xa9464dbf00000000, 0x8836d2c300000000,
+    0xce0db5a600000000, 0x04401c0900000000, 0x427b7b6c00000000,
+    0xd1dd3f8d00000000, 0x97e658e800000000, 0x5dabf14700000000,
+    0x1b90962200000000, 0x1f4bcfbe00000000, 0x5970a8db00000000,
+    0x933d017400000000, 0xd506661100000000, 0x46a022f000000000,
+    0x009b459500000000, 0xcad6ec3a00000000, 0x8ced8b5f00000000,
+    0xad9d142300000000, 0xeba6734600000000, 0x21ebdae900000000,
+    0x67d0bd8c00000000, 0xf476f96d00000000, 0xb24d9e0800000000,
+    0x780037a700000000, 0x3e3b50c200000000, 0x31b0f54400000000,
+    0x778b922100000000, 0xbdc63b8e00000000, 0xfbfd5ceb00000000,
+    0x685b180a00000000, 0x2e607f6f00000000, 0xe42dd6c000000000,
+    0xa216b1a500000000, 0x83662ed900000000, 0xc55d49bc00000000,
+    0x0f10e01300000000, 0x492b877600000000, 0xda8dc39700000000,
+    0x9cb6a4f200000000, 0x56fb0d5d00000000, 0x10c06a3800000000,
+    0x141b33a400000000, 0x522054c100000000, 0x986dfd6e00000000,
+    0xde569a0b00000000, 0x4df0deea00000000, 0x0bcbb98f00000000,
+    0xc186102000000000, 0x87bd774500000000, 0xa6cde83900000000,
+    0xe0f68f5c00000000, 0x2abb26f300000000, 0x6c80419600000000,
+    0xff26057700000000, 0xb91d621200000000, 0x7350cbbd00000000,
+    0x356bacd800000000},
+   {0x0000000000000000, 0x9e83da9f00000000, 0x7d01c4e400000000,
+    0xe3821e7b00000000, 0xbb04f91200000000, 0x2587238d00000000,
+    0xc6053df600000000, 0x5886e76900000000, 0x7609f22500000000,
+    0xe88a28ba00000000, 0x0b0836c100000000, 0x958bec5e00000000,
+    0xcd0d0b3700000000, 0x538ed1a800000000, 0xb00ccfd300000000,
+    0x2e8f154c00000000, 0xec12e44b00000000, 0x72913ed400000000,
+    0x911320af00000000, 0x0f90fa3000000000, 0x57161d5900000000,
+    0xc995c7c600000000, 0x2a17d9bd00000000, 0xb494032200000000,
+    0x9a1b166e00000000, 0x0498ccf100000000, 0xe71ad28a00000000,
+    0x7999081500000000, 0x211fef7c00000000, 0xbf9c35e300000000,
+    0x5c1e2b9800000000, 0xc29df10700000000, 0xd825c89700000000,
+    0x46a6120800000000, 0xa5240c7300000000, 0x3ba7d6ec00000000,
+    0x6321318500000000, 0xfda2eb1a00000000, 0x1e20f56100000000,
+    0x80a32ffe00000000, 0xae2c3ab200000000, 0x30afe02d00000000,
+    0xd32dfe5600000000, 0x4dae24c900000000, 0x1528c3a000000000,
+    0x8bab193f00000000, 0x6829074400000000, 0xf6aadddb00000000,
+    0x34372cdc00000000, 0xaab4f64300000000, 0x4936e83800000000,
+    0xd7b532a700000000, 0x8f33d5ce00000000, 0x11b00f5100000000,
+    0xf232112a00000000, 0x6cb1cbb500000000, 0x423edef900000000,
+    0xdcbd046600000000, 0x3f3f1a1d00000000, 0xa1bcc08200000000,
+    0xf93a27eb00000000, 0x67b9fd7400000000, 0x843be30f00000000,
+    0x1ab8399000000000, 0xf14de1f400000000, 0x6fce3b6b00000000,
+    0x8c4c251000000000, 0x12cfff8f00000000, 0x4a4918e600000000,
+    0xd4cac27900000000, 0x3748dc0200000000, 0xa9cb069d00000000,
+    0x874413d100000000, 0x19c7c94e00000000, 0xfa45d73500000000,
+    0x64c60daa00000000, 0x3c40eac300000000, 0xa2c3305c00000000,
+    0x41412e2700000000, 0xdfc2f4b800000000, 0x1d5f05bf00000000,
+    0x83dcdf2000000000, 0x605ec15b00000000, 0xfedd1bc400000000,
+    0xa65bfcad00000000, 0x38d8263200000000, 0xdb5a384900000000,
+    0x45d9e2d600000000, 0x6b56f79a00000000, 0xf5d52d0500000000,
+    0x1657337e00000000, 0x88d4e9e100000000, 0xd0520e8800000000,
+    0x4ed1d41700000000, 0xad53ca6c00000000, 0x33d010f300000000,
+    0x2968296300000000, 0xb7ebf3fc00000000, 0x5469ed8700000000,
+    0xcaea371800000000, 0x926cd07100000000, 0x0cef0aee00000000,
+    0xef6d149500000000, 0x71eece0a00000000, 0x5f61db4600000000,
+    0xc1e201d900000000, 0x22601fa200000000, 0xbce3c53d00000000,
+    0xe465225400000000, 0x7ae6f8cb00000000, 0x9964e6b000000000,
+    0x07e73c2f00000000, 0xc57acd2800000000, 0x5bf917b700000000,
+    0xb87b09cc00000000, 0x26f8d35300000000, 0x7e7e343a00000000,
+    0xe0fdeea500000000, 0x037ff0de00000000, 0x9dfc2a4100000000,
+    0xb3733f0d00000000, 0x2df0e59200000000, 0xce72fbe900000000,
+    0x50f1217600000000, 0x0877c61f00000000, 0x96f41c8000000000,
+    0x757602fb00000000, 0xebf5d86400000000, 0xa39db33200000000,
+    0x3d1e69ad00000000, 0xde9c77d600000000, 0x401fad4900000000,
+    0x18994a2000000000, 0x861a90bf00000000, 0x65988ec400000000,
+    0xfb1b545b00000000, 0xd594411700000000, 0x4b179b8800000000,
+    0xa89585f300000000, 0x36165f6c00000000, 0x6e90b80500000000,
+    0xf013629a00000000, 0x13917ce100000000, 0x8d12a67e00000000,
+    0x4f8f577900000000, 0xd10c8de600000000, 0x328e939d00000000,
+    0xac0d490200000000, 0xf48bae6b00000000, 0x6a0874f400000000,
+    0x898a6a8f00000000, 0x1709b01000000000, 0x3986a55c00000000,
+    0xa7057fc300000000, 0x448761b800000000, 0xda04bb2700000000,
+    0x82825c4e00000000, 0x1c0186d100000000, 0xff8398aa00000000,
+    0x6100423500000000, 0x7bb87ba500000000, 0xe53ba13a00000000,
+    0x06b9bf4100000000, 0x983a65de00000000, 0xc0bc82b700000000,
+    0x5e3f582800000000, 0xbdbd465300000000, 0x233e9ccc00000000,
+    0x0db1898000000000, 0x9332531f00000000, 0x70b04d6400000000,
+    0xee3397fb00000000, 0xb6b5709200000000, 0x2836aa0d00000000,
+    0xcbb4b47600000000, 0x55376ee900000000, 0x97aa9fee00000000,
+    0x0929457100000000, 0xeaab5b0a00000000, 0x7428819500000000,
+    0x2cae66fc00000000, 0xb22dbc6300000000, 0x51afa21800000000,
+    0xcf2c788700000000, 0xe1a36dcb00000000, 0x7f20b75400000000,
+    0x9ca2a92f00000000, 0x022173b000000000, 0x5aa794d900000000,
+    0xc4244e4600000000, 0x27a6503d00000000, 0xb9258aa200000000,
+    0x52d052c600000000, 0xcc53885900000000, 0x2fd1962200000000,
+    0xb1524cbd00000000, 0xe9d4abd400000000, 0x7757714b00000000,
+    0x94d56f3000000000, 0x0a56b5af00000000, 0x24d9a0e300000000,
+    0xba5a7a7c00000000, 0x59d8640700000000, 0xc75bbe9800000000,
+    0x9fdd59f100000000, 0x015e836e00000000, 0xe2dc9d1500000000,
+    0x7c5f478a00000000, 0xbec2b68d00000000, 0x20416c1200000000,
+    0xc3c3726900000000, 0x5d40a8f600000000, 0x05c64f9f00000000,
+    0x9b45950000000000, 0x78c78b7b00000000, 0xe64451e400000000,
+    0xc8cb44a800000000, 0x56489e3700000000, 0xb5ca804c00000000,
+    0x2b495ad300000000, 0x73cfbdba00000000, 0xed4c672500000000,
+    0x0ece795e00000000, 0x904da3c100000000, 0x8af59a5100000000,
+    0x147640ce00000000, 0xf7f45eb500000000, 0x6977842a00000000,
+    0x31f1634300000000, 0xaf72b9dc00000000, 0x4cf0a7a700000000,
+    0xd2737d3800000000, 0xfcfc687400000000, 0x627fb2eb00000000,
+    0x81fdac9000000000, 0x1f7e760f00000000, 0x47f8916600000000,
+    0xd97b4bf900000000, 0x3af9558200000000, 0xa47a8f1d00000000,
+    0x66e77e1a00000000, 0xf864a48500000000, 0x1be6bafe00000000,
+    0x8565606100000000, 0xdde3870800000000, 0x43605d9700000000,
+    0xa0e243ec00000000, 0x3e61997300000000, 0x10ee8c3f00000000,
+    0x8e6d56a000000000, 0x6def48db00000000, 0xf36c924400000000,
+    0xabea752d00000000, 0x3569afb200000000, 0xd6ebb1c900000000,
+    0x48686b5600000000},
+   {0x0000000000000000, 0xc064281700000000, 0x80c9502e00000000,
+    0x40ad783900000000, 0x0093a15c00000000, 0xc0f7894b00000000,
+    0x805af17200000000, 0x403ed96500000000, 0x002643b900000000,
+    0xc0426bae00000000, 0x80ef139700000000, 0x408b3b8000000000,
+    0x00b5e2e500000000, 0xc0d1caf200000000, 0x807cb2cb00000000,
+    0x40189adc00000000, 0x414af7a900000000, 0x812edfbe00000000,
+    0xc183a78700000000, 0x01e78f9000000000, 0x41d956f500000000,
+    0x81bd7ee200000000, 0xc11006db00000000, 0x01742ecc00000000,
+    0x416cb41000000000, 0x81089c0700000000, 0xc1a5e43e00000000,
+    0x01c1cc2900000000, 0x41ff154c00000000, 0x819b3d5b00000000,
+    0xc136456200000000, 0x01526d7500000000, 0xc3929f8800000000,
+    0x03f6b79f00000000, 0x435bcfa600000000, 0x833fe7b100000000,
+    0xc3013ed400000000, 0x036516c300000000, 0x43c86efa00000000,
+    0x83ac46ed00000000, 0xc3b4dc3100000000, 0x03d0f42600000000,
+    0x437d8c1f00000000, 0x8319a40800000000, 0xc3277d6d00000000,
+    0x0343557a00000000, 0x43ee2d4300000000, 0x838a055400000000,
+    0x82d8682100000000, 0x42bc403600000000, 0x0211380f00000000,
+    0xc275101800000000, 0x824bc97d00000000, 0x422fe16a00000000,
+    0x0282995300000000, 0xc2e6b14400000000, 0x82fe2b9800000000,
+    0x429a038f00000000, 0x02377bb600000000, 0xc25353a100000000,
+    0x826d8ac400000000, 0x4209a2d300000000, 0x02a4daea00000000,
+    0xc2c0f2fd00000000, 0xc7234eca00000000, 0x074766dd00000000,
+    0x47ea1ee400000000, 0x878e36f300000000, 0xc7b0ef9600000000,
+    0x07d4c78100000000, 0x4779bfb800000000, 0x871d97af00000000,
+    0xc7050d7300000000, 0x0761256400000000, 0x47cc5d5d00000000,
+    0x87a8754a00000000, 0xc796ac2f00000000, 0x07f2843800000000,
+    0x475ffc0100000000, 0x873bd41600000000, 0x8669b96300000000,
+    0x460d917400000000, 0x06a0e94d00000000, 0xc6c4c15a00000000,
+    0x86fa183f00000000, 0x469e302800000000, 0x0633481100000000,
+    0xc657600600000000, 0x864ffada00000000, 0x462bd2cd00000000,
+    0x0686aaf400000000, 0xc6e282e300000000, 0x86dc5b8600000000,
+    0x46b8739100000000, 0x06150ba800000000, 0xc67123bf00000000,
+    0x04b1d14200000000, 0xc4d5f95500000000, 0x8478816c00000000,
+    0x441ca97b00000000, 0x0422701e00000000, 0xc446580900000000,
+    0x84eb203000000000, 0x448f082700000000, 0x049792fb00000000,
+    0xc4f3baec00000000, 0x845ec2d500000000, 0x443aeac200000000,
+    0x040433a700000000, 0xc4601bb000000000, 0x84cd638900000000,
+    0x44a94b9e00000000, 0x45fb26eb00000000, 0x859f0efc00000000,
+    0xc53276c500000000, 0x05565ed200000000, 0x456887b700000000,
+    0x850cafa000000000, 0xc5a1d79900000000, 0x05c5ff8e00000000,
+    0x45dd655200000000, 0x85b94d4500000000, 0xc514357c00000000,
+    0x05701d6b00000000, 0x454ec40e00000000, 0x852aec1900000000,
+    0xc587942000000000, 0x05e3bc3700000000, 0xcf41ed4f00000000,
+    0x0f25c55800000000, 0x4f88bd6100000000, 0x8fec957600000000,
+    0xcfd24c1300000000, 0x0fb6640400000000, 0x4f1b1c3d00000000,
+    0x8f7f342a00000000, 0xcf67aef600000000, 0x0f0386e100000000,
+    0x4faefed800000000, 0x8fcad6cf00000000, 0xcff40faa00000000,
+    0x0f9027bd00000000, 0x4f3d5f8400000000, 0x8f59779300000000,
+    0x8e0b1ae600000000, 0x4e6f32f100000000, 0x0ec24ac800000000,
+    0xcea662df00000000, 0x8e98bbba00000000, 0x4efc93ad00000000,
+    0x0e51eb9400000000, 0xce35c38300000000, 0x8e2d595f00000000,
+    0x4e49714800000000, 0x0ee4097100000000, 0xce80216600000000,
+    0x8ebef80300000000, 0x4edad01400000000, 0x0e77a82d00000000,
+    0xce13803a00000000, 0x0cd372c700000000, 0xccb75ad000000000,
+    0x8c1a22e900000000, 0x4c7e0afe00000000, 0x0c40d39b00000000,
+    0xcc24fb8c00000000, 0x8c8983b500000000, 0x4cedaba200000000,
+    0x0cf5317e00000000, 0xcc91196900000000, 0x8c3c615000000000,
+    0x4c58494700000000, 0x0c66902200000000, 0xcc02b83500000000,
+    0x8cafc00c00000000, 0x4ccbe81b00000000, 0x4d99856e00000000,
+    0x8dfdad7900000000, 0xcd50d54000000000, 0x0d34fd5700000000,
+    0x4d0a243200000000, 0x8d6e0c2500000000, 0xcdc3741c00000000,
+    0x0da75c0b00000000, 0x4dbfc6d700000000, 0x8ddbeec000000000,
+    0xcd7696f900000000, 0x0d12beee00000000, 0x4d2c678b00000000,
+    0x8d484f9c00000000, 0xcde537a500000000, 0x0d811fb200000000,
+    0x0862a38500000000, 0xc8068b9200000000, 0x88abf3ab00000000,
+    0x48cfdbbc00000000, 0x08f102d900000000, 0xc8952ace00000000,
+    0x883852f700000000, 0x485c7ae000000000, 0x0844e03c00000000,
+    0xc820c82b00000000, 0x888db01200000000, 0x48e9980500000000,
+    0x08d7416000000000, 0xc8b3697700000000, 0x881e114e00000000,
+    0x487a395900000000, 0x4928542c00000000, 0x894c7c3b00000000,
+    0xc9e1040200000000, 0x09852c1500000000, 0x49bbf57000000000,
+    0x89dfdd6700000000, 0xc972a55e00000000, 0x09168d4900000000,
+    0x490e179500000000, 0x896a3f8200000000, 0xc9c747bb00000000,
+    0x09a36fac00000000, 0x499db6c900000000, 0x89f99ede00000000,
+    0xc954e6e700000000, 0x0930cef000000000, 0xcbf03c0d00000000,
+    0x0b94141a00000000, 0x4b396c2300000000, 0x8b5d443400000000,
+    0xcb639d5100000000, 0x0b07b54600000000, 0x4baacd7f00000000,
+    0x8bcee56800000000, 0xcbd67fb400000000, 0x0bb257a300000000,
+    0x4b1f2f9a00000000, 0x8b7b078d00000000, 0xcb45dee800000000,
+    0x0b21f6ff00000000, 0x4b8c8ec600000000, 0x8be8a6d100000000,
+    0x8abacba400000000, 0x4adee3b300000000, 0x0a739b8a00000000,
+    0xca17b39d00000000, 0x8a296af800000000, 0x4a4d42ef00000000,
+    0x0ae03ad600000000, 0xca8412c100000000, 0x8a9c881d00000000,
+    0x4af8a00a00000000, 0x0a55d83300000000, 0xca31f02400000000,
+    0x8a0f294100000000, 0x4a6b015600000000, 0x0ac6796f00000000,
+    0xcaa2517800000000},
+   {0x0000000000000000, 0xd4ea739b00000000, 0xe9d396ed00000000,
+    0x3d39e57600000000, 0x93a15c0000000000, 0x474b2f9b00000000,
+    0x7a72caed00000000, 0xae98b97600000000, 0x2643b90000000000,
+    0xf2a9ca9b00000000, 0xcf902fed00000000, 0x1b7a5c7600000000,
+    0xb5e2e50000000000, 0x6108969b00000000, 0x5c3173ed00000000,
+    0x88db007600000000, 0x4c86720100000000, 0x986c019a00000000,
+    0xa555e4ec00000000, 0x71bf977700000000, 0xdf272e0100000000,
+    0x0bcd5d9a00000000, 0x36f4b8ec00000000, 0xe21ecb7700000000,
+    0x6ac5cb0100000000, 0xbe2fb89a00000000, 0x83165dec00000000,
+    0x57fc2e7700000000, 0xf964970100000000, 0x2d8ee49a00000000,
+    0x10b701ec00000000, 0xc45d727700000000, 0x980ce50200000000,
+    0x4ce6969900000000, 0x71df73ef00000000, 0xa535007400000000,
+    0x0badb90200000000, 0xdf47ca9900000000, 0xe27e2fef00000000,
+    0x36945c7400000000, 0xbe4f5c0200000000, 0x6aa52f9900000000,
+    0x579ccaef00000000, 0x8376b97400000000, 0x2dee000200000000,
+    0xf904739900000000, 0xc43d96ef00000000, 0x10d7e57400000000,
+    0xd48a970300000000, 0x0060e49800000000, 0x3d5901ee00000000,
+    0xe9b3727500000000, 0x472bcb0300000000, 0x93c1b89800000000,
+    0xaef85dee00000000, 0x7a122e7500000000, 0xf2c92e0300000000,
+    0x26235d9800000000, 0x1b1ab8ee00000000, 0xcff0cb7500000000,
+    0x6168720300000000, 0xb582019800000000, 0x88bbe4ee00000000,
+    0x5c51977500000000, 0x3019ca0500000000, 0xe4f3b99e00000000,
+    0xd9ca5ce800000000, 0x0d202f7300000000, 0xa3b8960500000000,
+    0x7752e59e00000000, 0x4a6b00e800000000, 0x9e81737300000000,
+    0x165a730500000000, 0xc2b0009e00000000, 0xff89e5e800000000,
+    0x2b63967300000000, 0x85fb2f0500000000, 0x51115c9e00000000,
+    0x6c28b9e800000000, 0xb8c2ca7300000000, 0x7c9fb80400000000,
+    0xa875cb9f00000000, 0x954c2ee900000000, 0x41a65d7200000000,
+    0xef3ee40400000000, 0x3bd4979f00000000, 0x06ed72e900000000,
+    0xd207017200000000, 0x5adc010400000000, 0x8e36729f00000000,
+    0xb30f97e900000000, 0x67e5e47200000000, 0xc97d5d0400000000,
+    0x1d972e9f00000000, 0x20aecbe900000000, 0xf444b87200000000,
+    0xa8152f0700000000, 0x7cff5c9c00000000, 0x41c6b9ea00000000,
+    0x952cca7100000000, 0x3bb4730700000000, 0xef5e009c00000000,
+    0xd267e5ea00000000, 0x068d967100000000, 0x8e56960700000000,
+    0x5abce59c00000000, 0x678500ea00000000, 0xb36f737100000000,
+    0x1df7ca0700000000, 0xc91db99c00000000, 0xf4245cea00000000,
+    0x20ce2f7100000000, 0xe4935d0600000000, 0x30792e9d00000000,
+    0x0d40cbeb00000000, 0xd9aab87000000000, 0x7732010600000000,
+    0xa3d8729d00000000, 0x9ee197eb00000000, 0x4a0be47000000000,
+    0xc2d0e40600000000, 0x163a979d00000000, 0x2b0372eb00000000,
+    0xffe9017000000000, 0x5171b80600000000, 0x859bcb9d00000000,
+    0xb8a22eeb00000000, 0x6c485d7000000000, 0x6032940b00000000,
+    0xb4d8e79000000000, 0x89e102e600000000, 0x5d0b717d00000000,
+    0xf393c80b00000000, 0x2779bb9000000000, 0x1a405ee600000000,
+    0xceaa2d7d00000000, 0x46712d0b00000000, 0x929b5e9000000000,
+    0xafa2bbe600000000, 0x7b48c87d00000000, 0xd5d0710b00000000,
+    0x013a029000000000, 0x3c03e7e600000000, 0xe8e9947d00000000,
+    0x2cb4e60a00000000, 0xf85e959100000000, 0xc56770e700000000,
+    0x118d037c00000000, 0xbf15ba0a00000000, 0x6bffc99100000000,
+    0x56c62ce700000000, 0x822c5f7c00000000, 0x0af75f0a00000000,
+    0xde1d2c9100000000, 0xe324c9e700000000, 0x37ceba7c00000000,
+    0x9956030a00000000, 0x4dbc709100000000, 0x708595e700000000,
+    0xa46fe67c00000000, 0xf83e710900000000, 0x2cd4029200000000,
+    0x11ede7e400000000, 0xc507947f00000000, 0x6b9f2d0900000000,
+    0xbf755e9200000000, 0x824cbbe400000000, 0x56a6c87f00000000,
+    0xde7dc80900000000, 0x0a97bb9200000000, 0x37ae5ee400000000,
+    0xe3442d7f00000000, 0x4ddc940900000000, 0x9936e79200000000,
+    0xa40f02e400000000, 0x70e5717f00000000, 0xb4b8030800000000,
+    0x6052709300000000, 0x5d6b95e500000000, 0x8981e67e00000000,
+    0x27195f0800000000, 0xf3f32c9300000000, 0xcecac9e500000000,
+    0x1a20ba7e00000000, 0x92fbba0800000000, 0x4611c99300000000,
+    0x7b282ce500000000, 0xafc25f7e00000000, 0x015ae60800000000,
+    0xd5b0959300000000, 0xe88970e500000000, 0x3c63037e00000000,
+    0x502b5e0e00000000, 0x84c12d9500000000, 0xb9f8c8e300000000,
+    0x6d12bb7800000000, 0xc38a020e00000000, 0x1760719500000000,
+    0x2a5994e300000000, 0xfeb3e77800000000, 0x7668e70e00000000,
+    0xa282949500000000, 0x9fbb71e300000000, 0x4b51027800000000,
+    0xe5c9bb0e00000000, 0x3123c89500000000, 0x0c1a2de300000000,
+    0xd8f05e7800000000, 0x1cad2c0f00000000, 0xc8475f9400000000,
+    0xf57ebae200000000, 0x2194c97900000000, 0x8f0c700f00000000,
+    0x5be6039400000000, 0x66dfe6e200000000, 0xb235957900000000,
+    0x3aee950f00000000, 0xee04e69400000000, 0xd33d03e200000000,
+    0x07d7707900000000, 0xa94fc90f00000000, 0x7da5ba9400000000,
+    0x409c5fe200000000, 0x94762c7900000000, 0xc827bb0c00000000,
+    0x1ccdc89700000000, 0x21f42de100000000, 0xf51e5e7a00000000,
+    0x5b86e70c00000000, 0x8f6c949700000000, 0xb25571e100000000,
+    0x66bf027a00000000, 0xee64020c00000000, 0x3a8e719700000000,
+    0x07b794e100000000, 0xd35de77a00000000, 0x7dc55e0c00000000,
+    0xa92f2d9700000000, 0x9416c8e100000000, 0x40fcbb7a00000000,
+    0x84a1c90d00000000, 0x504bba9600000000, 0x6d725fe000000000,
+    0xb9982c7b00000000, 0x1700950d00000000, 0xc3eae69600000000,
+    0xfed303e000000000, 0x2a39707b00000000, 0xa2e2700d00000000,
+    0x7608039600000000, 0x4b31e6e000000000, 0x9fdb957b00000000,
+    0x31432c0d00000000, 0xe5a95f9600000000, 0xd890bae000000000,
+    0x0c7ac97b00000000},
+   {0x0000000000000000, 0x2765258100000000, 0x0fcc3bd900000000,
+    0x28a91e5800000000, 0x5f9e066900000000, 0x78fb23e800000000,
+    0x50523db000000000, 0x7737183100000000, 0xbe3c0dd200000000,
+    0x9959285300000000, 0xb1f0360b00000000, 0x9695138a00000000,
+    0xe1a20bbb00000000, 0xc6c72e3a00000000, 0xee6e306200000000,
+    0xc90b15e300000000, 0x3d7f6b7f00000000, 0x1a1a4efe00000000,
+    0x32b350a600000000, 0x15d6752700000000, 0x62e16d1600000000,
+    0x4584489700000000, 0x6d2d56cf00000000, 0x4a48734e00000000,
+    0x834366ad00000000, 0xa426432c00000000, 0x8c8f5d7400000000,
+    0xabea78f500000000, 0xdcdd60c400000000, 0xfbb8454500000000,
+    0xd3115b1d00000000, 0xf4747e9c00000000, 0x7afed6fe00000000,
+    0x5d9bf37f00000000, 0x7532ed2700000000, 0x5257c8a600000000,
+    0x2560d09700000000, 0x0205f51600000000, 0x2aaceb4e00000000,
+    0x0dc9cecf00000000, 0xc4c2db2c00000000, 0xe3a7fead00000000,
+    0xcb0ee0f500000000, 0xec6bc57400000000, 0x9b5cdd4500000000,
+    0xbc39f8c400000000, 0x9490e69c00000000, 0xb3f5c31d00000000,
+    0x4781bd8100000000, 0x60e4980000000000, 0x484d865800000000,
+    0x6f28a3d900000000, 0x181fbbe800000000, 0x3f7a9e6900000000,
+    0x17d3803100000000, 0x30b6a5b000000000, 0xf9bdb05300000000,
+    0xded895d200000000, 0xf6718b8a00000000, 0xd114ae0b00000000,
+    0xa623b63a00000000, 0x814693bb00000000, 0xa9ef8de300000000,
+    0x8e8aa86200000000, 0xb5fadc2600000000, 0x929ff9a700000000,
+    0xba36e7ff00000000, 0x9d53c27e00000000, 0xea64da4f00000000,
+    0xcd01ffce00000000, 0xe5a8e19600000000, 0xc2cdc41700000000,
+    0x0bc6d1f400000000, 0x2ca3f47500000000, 0x040aea2d00000000,
+    0x236fcfac00000000, 0x5458d79d00000000, 0x733df21c00000000,
+    0x5b94ec4400000000, 0x7cf1c9c500000000, 0x8885b75900000000,
+    0xafe092d800000000, 0x87498c8000000000, 0xa02ca90100000000,
+    0xd71bb13000000000, 0xf07e94b100000000, 0xd8d78ae900000000,
+    0xffb2af6800000000, 0x36b9ba8b00000000, 0x11dc9f0a00000000,
+    0x3975815200000000, 0x1e10a4d300000000, 0x6927bce200000000,
+    0x4e42996300000000, 0x66eb873b00000000, 0x418ea2ba00000000,
+    0xcf040ad800000000, 0xe8612f5900000000, 0xc0c8310100000000,
+    0xe7ad148000000000, 0x909a0cb100000000, 0xb7ff293000000000,
+    0x9f56376800000000, 0xb83312e900000000, 0x7138070a00000000,
+    0x565d228b00000000, 0x7ef43cd300000000, 0x5991195200000000,
+    0x2ea6016300000000, 0x09c324e200000000, 0x216a3aba00000000,
+    0x060f1f3b00000000, 0xf27b61a700000000, 0xd51e442600000000,
+    0xfdb75a7e00000000, 0xdad27fff00000000, 0xade567ce00000000,
+    0x8a80424f00000000, 0xa2295c1700000000, 0x854c799600000000,
+    0x4c476c7500000000, 0x6b2249f400000000, 0x438b57ac00000000,
+    0x64ee722d00000000, 0x13d96a1c00000000, 0x34bc4f9d00000000,
+    0x1c1551c500000000, 0x3b70744400000000, 0x6af5b94d00000000,
+    0x4d909ccc00000000, 0x6539829400000000, 0x425ca71500000000,
+    0x356bbf2400000000, 0x120e9aa500000000, 0x3aa784fd00000000,
+    0x1dc2a17c00000000, 0xd4c9b49f00000000, 0xf3ac911e00000000,
+    0xdb058f4600000000, 0xfc60aac700000000, 0x8b57b2f600000000,
+    0xac32977700000000, 0x849b892f00000000, 0xa3feacae00000000,
+    0x578ad23200000000, 0x70eff7b300000000, 0x5846e9eb00000000,
+    0x7f23cc6a00000000, 0x0814d45b00000000, 0x2f71f1da00000000,
+    0x07d8ef8200000000, 0x20bdca0300000000, 0xe9b6dfe000000000,
+    0xced3fa6100000000, 0xe67ae43900000000, 0xc11fc1b800000000,
+    0xb628d98900000000, 0x914dfc0800000000, 0xb9e4e25000000000,
+    0x9e81c7d100000000, 0x100b6fb300000000, 0x376e4a3200000000,
+    0x1fc7546a00000000, 0x38a271eb00000000, 0x4f9569da00000000,
+    0x68f04c5b00000000, 0x4059520300000000, 0x673c778200000000,
+    0xae37626100000000, 0x895247e000000000, 0xa1fb59b800000000,
+    0x869e7c3900000000, 0xf1a9640800000000, 0xd6cc418900000000,
+    0xfe655fd100000000, 0xd9007a5000000000, 0x2d7404cc00000000,
+    0x0a11214d00000000, 0x22b83f1500000000, 0x05dd1a9400000000,
+    0x72ea02a500000000, 0x558f272400000000, 0x7d26397c00000000,
+    0x5a431cfd00000000, 0x9348091e00000000, 0xb42d2c9f00000000,
+    0x9c8432c700000000, 0xbbe1174600000000, 0xccd60f7700000000,
+    0xebb32af600000000, 0xc31a34ae00000000, 0xe47f112f00000000,
+    0xdf0f656b00000000, 0xf86a40ea00000000, 0xd0c35eb200000000,
+    0xf7a67b3300000000, 0x8091630200000000, 0xa7f4468300000000,
+    0x8f5d58db00000000, 0xa8387d5a00000000, 0x613368b900000000,
+    0x46564d3800000000, 0x6eff536000000000, 0x499a76e100000000,
+    0x3ead6ed000000000, 0x19c84b5100000000, 0x3161550900000000,
+    0x1604708800000000, 0xe2700e1400000000, 0xc5152b9500000000,
+    0xedbc35cd00000000, 0xcad9104c00000000, 0xbdee087d00000000,
+    0x9a8b2dfc00000000, 0xb22233a400000000, 0x9547162500000000,
+    0x5c4c03c600000000, 0x7b29264700000000, 0x5380381f00000000,
+    0x74e51d9e00000000, 0x03d205af00000000, 0x24b7202e00000000,
+    0x0c1e3e7600000000, 0x2b7b1bf700000000, 0xa5f1b39500000000,
+    0x8294961400000000, 0xaa3d884c00000000, 0x8d58adcd00000000,
+    0xfa6fb5fc00000000, 0xdd0a907d00000000, 0xf5a38e2500000000,
+    0xd2c6aba400000000, 0x1bcdbe4700000000, 0x3ca89bc600000000,
+    0x1401859e00000000, 0x3364a01f00000000, 0x4453b82e00000000,
+    0x63369daf00000000, 0x4b9f83f700000000, 0x6cfaa67600000000,
+    0x988ed8ea00000000, 0xbfebfd6b00000000, 0x9742e33300000000,
+    0xb027c6b200000000, 0xc710de8300000000, 0xe075fb0200000000,
+    0xc8dce55a00000000, 0xefb9c0db00000000, 0x26b2d53800000000,
+    0x01d7f0b900000000, 0x297eeee100000000, 0x0e1bcb6000000000,
+    0x792cd35100000000, 0x5e49f6d000000000, 0x76e0e88800000000,
+    0x5185cd0900000000}};
+
+#else /* W == 4 */
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0x9ba54c6f, 0xec3b9e9f, 0x779ed2f0, 0x03063b7f,
+    0x98a37710, 0xef3da5e0, 0x7498e98f, 0x060c76fe, 0x9da93a91,
+    0xea37e861, 0x7192a40e, 0x050a4d81, 0x9eaf01ee, 0xe931d31e,
+    0x72949f71, 0x0c18edfc, 0x97bda193, 0xe0237363, 0x7b863f0c,
+    0x0f1ed683, 0x94bb9aec, 0xe325481c, 0x78800473, 0x0a149b02,
+    0x91b1d76d, 0xe62f059d, 0x7d8a49f2, 0x0912a07d, 0x92b7ec12,
+    0xe5293ee2, 0x7e8c728d, 0x1831dbf8, 0x83949797, 0xf40a4567,
+    0x6faf0908, 0x1b37e087, 0x8092ace8, 0xf70c7e18, 0x6ca93277,
+    0x1e3dad06, 0x8598e169, 0xf2063399, 0x69a37ff6, 0x1d3b9679,
+    0x869eda16, 0xf10008e6, 0x6aa54489, 0x14293604, 0x8f8c7a6b,
+    0xf812a89b, 0x63b7e4f4, 0x172f0d7b, 0x8c8a4114, 0xfb1493e4,
+    0x60b1df8b, 0x122540fa, 0x89800c95, 0xfe1ede65, 0x65bb920a,
+    0x11237b85, 0x8a8637ea, 0xfd18e51a, 0x66bda975, 0x3063b7f0,
+    0xabc6fb9f, 0xdc58296f, 0x47fd6500, 0x33658c8f, 0xa8c0c0e0,
+    0xdf5e1210, 0x44fb5e7f, 0x366fc10e, 0xadca8d61, 0xda545f91,
+    0x41f113fe, 0x3569fa71, 0xaeccb61e, 0xd95264ee, 0x42f72881,
+    0x3c7b5a0c, 0xa7de1663, 0xd040c493, 0x4be588fc, 0x3f7d6173,
+    0xa4d82d1c, 0xd346ffec, 0x48e3b383, 0x3a772cf2, 0xa1d2609d,
+    0xd64cb26d, 0x4de9fe02, 0x3971178d, 0xa2d45be2, 0xd54a8912,
+    0x4eefc57d, 0x28526c08, 0xb3f72067, 0xc469f297, 0x5fccbef8,
+    0x2b545777, 0xb0f11b18, 0xc76fc9e8, 0x5cca8587, 0x2e5e1af6,
+    0xb5fb5699, 0xc2658469, 0x59c0c806, 0x2d582189, 0xb6fd6de6,
+    0xc163bf16, 0x5ac6f379, 0x244a81f4, 0xbfefcd9b, 0xc8711f6b,
+    0x53d45304, 0x274cba8b, 0xbce9f6e4, 0xcb772414, 0x50d2687b,
+    0x2246f70a, 0xb9e3bb65, 0xce7d6995, 0x55d825fa, 0x2140cc75,
+    0xbae5801a, 0xcd7b52ea, 0x56de1e85, 0x60c76fe0, 0xfb62238f,
+    0x8cfcf17f, 0x1759bd10, 0x63c1549f, 0xf86418f0, 0x8ffaca00,
+    0x145f866f, 0x66cb191e, 0xfd6e5571, 0x8af08781, 0x1155cbee,
+    0x65cd2261, 0xfe686e0e, 0x89f6bcfe, 0x1253f091, 0x6cdf821c,
+    0xf77ace73, 0x80e41c83, 0x1b4150ec, 0x6fd9b963, 0xf47cf50c,
+    0x83e227fc, 0x18476b93, 0x6ad3f4e2, 0xf176b88d, 0x86e86a7d,
+    0x1d4d2612, 0x69d5cf9d, 0xf27083f2, 0x85ee5102, 0x1e4b1d6d,
+    0x78f6b418, 0xe353f877, 0x94cd2a87, 0x0f6866e8, 0x7bf08f67,
+    0xe055c308, 0x97cb11f8, 0x0c6e5d97, 0x7efac2e6, 0xe55f8e89,
+    0x92c15c79, 0x09641016, 0x7dfcf999, 0xe659b5f6, 0x91c76706,
+    0x0a622b69, 0x74ee59e4, 0xef4b158b, 0x98d5c77b, 0x03708b14,
+    0x77e8629b, 0xec4d2ef4, 0x9bd3fc04, 0x0076b06b, 0x72e22f1a,
+    0xe9476375, 0x9ed9b185, 0x057cfdea, 0x71e41465, 0xea41580a,
+    0x9ddf8afa, 0x067ac695, 0x50a4d810, 0xcb01947f, 0xbc9f468f,
+    0x273a0ae0, 0x53a2e36f, 0xc807af00, 0xbf997df0, 0x243c319f,
+    0x56a8aeee, 0xcd0de281, 0xba933071, 0x21367c1e, 0x55ae9591,
+    0xce0bd9fe, 0xb9950b0e, 0x22304761, 0x5cbc35ec, 0xc7197983,
+    0xb087ab73, 0x2b22e71c, 0x5fba0e93, 0xc41f42fc, 0xb381900c,
+    0x2824dc63, 0x5ab04312, 0xc1150f7d, 0xb68bdd8d, 0x2d2e91e2,
+    0x59b6786d, 0xc2133402, 0xb58de6f2, 0x2e28aa9d, 0x489503e8,
+    0xd3304f87, 0xa4ae9d77, 0x3f0bd118, 0x4b933897, 0xd03674f8,
+    0xa7a8a608, 0x3c0dea67, 0x4e997516, 0xd53c3979, 0xa2a2eb89,
+    0x3907a7e6, 0x4d9f4e69, 0xd63a0206, 0xa1a4d0f6, 0x3a019c99,
+    0x448dee14, 0xdf28a27b, 0xa8b6708b, 0x33133ce4, 0x478bd56b,
+    0xdc2e9904, 0xabb04bf4, 0x3015079b, 0x428198ea, 0xd924d485,
+    0xaeba0675, 0x351f4a1a, 0x4187a395, 0xda22effa, 0xadbc3d0a,
+    0x36197165},
+   {0x00000000, 0xc18edfc0, 0x586cb9c1, 0x99e26601, 0xb0d97382,
+    0x7157ac42, 0xe8b5ca43, 0x293b1583, 0xbac3e145, 0x7b4d3e85,
+    0xe2af5884, 0x23218744, 0x0a1a92c7, 0xcb944d07, 0x52762b06,
+    0x93f8f4c6, 0xaef6c4cb, 0x6f781b0b, 0xf69a7d0a, 0x3714a2ca,
+    0x1e2fb749, 0xdfa16889, 0x46430e88, 0x87cdd148, 0x1435258e,
+    0xd5bbfa4e, 0x4c599c4f, 0x8dd7438f, 0xa4ec560c, 0x656289cc,
+    0xfc80efcd, 0x3d0e300d, 0x869c8fd7, 0x47125017, 0xdef03616,
+    0x1f7ee9d6, 0x3645fc55, 0xf7cb2395, 0x6e294594, 0xafa79a54,
+    0x3c5f6e92, 0xfdd1b152, 0x6433d753, 0xa5bd0893, 0x8c861d10,
+    0x4d08c2d0, 0xd4eaa4d1, 0x15647b11, 0x286a4b1c, 0xe9e494dc,
+    0x7006f2dd, 0xb1882d1d, 0x98b3389e, 0x593de75e, 0xc0df815f,
+    0x01515e9f, 0x92a9aa59, 0x53277599, 0xcac51398, 0x0b4bcc58,
+    0x2270d9db, 0xe3fe061b, 0x7a1c601a, 0xbb92bfda, 0xd64819ef,
+    0x17c6c62f, 0x8e24a02e, 0x4faa7fee, 0x66916a6d, 0xa71fb5ad,
+    0x3efdd3ac, 0xff730c6c, 0x6c8bf8aa, 0xad05276a, 0x34e7416b,
+    0xf5699eab, 0xdc528b28, 0x1ddc54e8, 0x843e32e9, 0x45b0ed29,
+    0x78bedd24, 0xb93002e4, 0x20d264e5, 0xe15cbb25, 0xc867aea6,
+    0x09e97166, 0x900b1767, 0x5185c8a7, 0xc27d3c61, 0x03f3e3a1,
+    0x9a1185a0, 0x5b9f5a60, 0x72a44fe3, 0xb32a9023, 0x2ac8f622,
+    0xeb4629e2, 0x50d49638, 0x915a49f8, 0x08b82ff9, 0xc936f039,
+    0xe00de5ba, 0x21833a7a, 0xb8615c7b, 0x79ef83bb, 0xea17777d,
+    0x2b99a8bd, 0xb27bcebc, 0x73f5117c, 0x5ace04ff, 0x9b40db3f,
+    0x02a2bd3e, 0xc32c62fe, 0xfe2252f3, 0x3fac8d33, 0xa64eeb32,
+    0x67c034f2, 0x4efb2171, 0x8f75feb1, 0x169798b0, 0xd7194770,
+    0x44e1b3b6, 0x856f6c76, 0x1c8d0a77, 0xdd03d5b7, 0xf438c034,
+    0x35b61ff4, 0xac5479f5, 0x6ddaa635, 0x77e1359f, 0xb66fea5f,
+    0x2f8d8c5e, 0xee03539e, 0xc738461d, 0x06b699dd, 0x9f54ffdc,
+    0x5eda201c, 0xcd22d4da, 0x0cac0b1a, 0x954e6d1b, 0x54c0b2db,
+    0x7dfba758, 0xbc757898, 0x25971e99, 0xe419c159, 0xd917f154,
+    0x18992e94, 0x817b4895, 0x40f59755, 0x69ce82d6, 0xa8405d16,
+    0x31a23b17, 0xf02ce4d7, 0x63d41011, 0xa25acfd1, 0x3bb8a9d0,
+    0xfa367610, 0xd30d6393, 0x1283bc53, 0x8b61da52, 0x4aef0592,
+    0xf17dba48, 0x30f36588, 0xa9110389, 0x689fdc49, 0x41a4c9ca,
+    0x802a160a, 0x19c8700b, 0xd846afcb, 0x4bbe5b0d, 0x8a3084cd,
+    0x13d2e2cc, 0xd25c3d0c, 0xfb67288f, 0x3ae9f74f, 0xa30b914e,
+    0x62854e8e, 0x5f8b7e83, 0x9e05a143, 0x07e7c742, 0xc6691882,
+    0xef520d01, 0x2edcd2c1, 0xb73eb4c0, 0x76b06b00, 0xe5489fc6,
+    0x24c64006, 0xbd242607, 0x7caaf9c7, 0x5591ec44, 0x941f3384,
+    0x0dfd5585, 0xcc738a45, 0xa1a92c70, 0x6027f3b0, 0xf9c595b1,
+    0x384b4a71, 0x11705ff2, 0xd0fe8032, 0x491ce633, 0x889239f3,
+    0x1b6acd35, 0xdae412f5, 0x430674f4, 0x8288ab34, 0xabb3beb7,
+    0x6a3d6177, 0xf3df0776, 0x3251d8b6, 0x0f5fe8bb, 0xced1377b,
+    0x5733517a, 0x96bd8eba, 0xbf869b39, 0x7e0844f9, 0xe7ea22f8,
+    0x2664fd38, 0xb59c09fe, 0x7412d63e, 0xedf0b03f, 0x2c7e6fff,
+    0x05457a7c, 0xc4cba5bc, 0x5d29c3bd, 0x9ca71c7d, 0x2735a3a7,
+    0xe6bb7c67, 0x7f591a66, 0xbed7c5a6, 0x97ecd025, 0x56620fe5,
+    0xcf8069e4, 0x0e0eb624, 0x9df642e2, 0x5c789d22, 0xc59afb23,
+    0x041424e3, 0x2d2f3160, 0xeca1eea0, 0x754388a1, 0xb4cd5761,
+    0x89c3676c, 0x484db8ac, 0xd1afdead, 0x1021016d, 0x391a14ee,
+    0xf894cb2e, 0x6176ad2f, 0xa0f872ef, 0x33008629, 0xf28e59e9,
+    0x6b6c3fe8, 0xaae2e028, 0x83d9f5ab, 0x42572a6b, 0xdbb54c6a,
+    0x1a3b93aa},
+   {0x00000000, 0xefc26b3e, 0x04f5d03d, 0xeb37bb03, 0x09eba07a,
+    0xe629cb44, 0x0d1e7047, 0xe2dc1b79, 0x13d740f4, 0xfc152bca,
+    0x172290c9, 0xf8e0fbf7, 0x1a3ce08e, 0xf5fe8bb0, 0x1ec930b3,
+    0xf10b5b8d, 0x27ae81e8, 0xc86cead6, 0x235b51d5, 0xcc993aeb,
+    0x2e452192, 0xc1874aac, 0x2ab0f1af, 0xc5729a91, 0x3479c11c,
+    0xdbbbaa22, 0x308c1121, 0xdf4e7a1f, 0x3d926166, 0xd2500a58,
+    0x3967b15b, 0xd6a5da65, 0x4f5d03d0, 0xa09f68ee, 0x4ba8d3ed,
+    0xa46ab8d3, 0x46b6a3aa, 0xa974c894, 0x42437397, 0xad8118a9,
+    0x5c8a4324, 0xb348281a, 0x587f9319, 0xb7bdf827, 0x5561e35e,
+    0xbaa38860, 0x51943363, 0xbe56585d, 0x68f38238, 0x8731e906,
+    0x6c065205, 0x83c4393b, 0x61182242, 0x8eda497c, 0x65edf27f,
+    0x8a2f9941, 0x7b24c2cc, 0x94e6a9f2, 0x7fd112f1, 0x901379cf,
+    0x72cf62b6, 0x9d0d0988, 0x763ab28b, 0x99f8d9b5, 0x9eba07a0,
+    0x71786c9e, 0x9a4fd79d, 0x758dbca3, 0x9751a7da, 0x7893cce4,
+    0x93a477e7, 0x7c661cd9, 0x8d6d4754, 0x62af2c6a, 0x89989769,
+    0x665afc57, 0x8486e72e, 0x6b448c10, 0x80733713, 0x6fb15c2d,
+    0xb9148648, 0x56d6ed76, 0xbde15675, 0x52233d4b, 0xb0ff2632,
+    0x5f3d4d0c, 0xb40af60f, 0x5bc89d31, 0xaac3c6bc, 0x4501ad82,
+    0xae361681, 0x41f47dbf, 0xa32866c6, 0x4cea0df8, 0xa7ddb6fb,
+    0x481fddc5, 0xd1e70470, 0x3e256f4e, 0xd512d44d, 0x3ad0bf73,
+    0xd80ca40a, 0x37cecf34, 0xdcf97437, 0x333b1f09, 0xc2304484,
+    0x2df22fba, 0xc6c594b9, 0x2907ff87, 0xcbdbe4fe, 0x24198fc0,
+    0xcf2e34c3, 0x20ec5ffd, 0xf6498598, 0x198beea6, 0xf2bc55a5,
+    0x1d7e3e9b, 0xffa225e2, 0x10604edc, 0xfb57f5df, 0x14959ee1,
+    0xe59ec56c, 0x0a5cae52, 0xe16b1551, 0x0ea97e6f, 0xec756516,
+    0x03b70e28, 0xe880b52b, 0x0742de15, 0xe6050901, 0x09c7623f,
+    0xe2f0d93c, 0x0d32b202, 0xefeea97b, 0x002cc245, 0xeb1b7946,
+    0x04d91278, 0xf5d249f5, 0x1a1022cb, 0xf12799c8, 0x1ee5f2f6,
+    0xfc39e98f, 0x13fb82b1, 0xf8cc39b2, 0x170e528c, 0xc1ab88e9,
+    0x2e69e3d7, 0xc55e58d4, 0x2a9c33ea, 0xc8402893, 0x278243ad,
+    0xccb5f8ae, 0x23779390, 0xd27cc81d, 0x3dbea323, 0xd6891820,
+    0x394b731e, 0xdb976867, 0x34550359, 0xdf62b85a, 0x30a0d364,
+    0xa9580ad1, 0x469a61ef, 0xadaddaec, 0x426fb1d2, 0xa0b3aaab,
+    0x4f71c195, 0xa4467a96, 0x4b8411a8, 0xba8f4a25, 0x554d211b,
+    0xbe7a9a18, 0x51b8f126, 0xb364ea5f, 0x5ca68161, 0xb7913a62,
+    0x5853515c, 0x8ef68b39, 0x6134e007, 0x8a035b04, 0x65c1303a,
+    0x871d2b43, 0x68df407d, 0x83e8fb7e, 0x6c2a9040, 0x9d21cbcd,
+    0x72e3a0f3, 0x99d41bf0, 0x761670ce, 0x94ca6bb7, 0x7b080089,
+    0x903fbb8a, 0x7ffdd0b4, 0x78bf0ea1, 0x977d659f, 0x7c4ade9c,
+    0x9388b5a2, 0x7154aedb, 0x9e96c5e5, 0x75a17ee6, 0x9a6315d8,
+    0x6b684e55, 0x84aa256b, 0x6f9d9e68, 0x805ff556, 0x6283ee2f,
+    0x8d418511, 0x66763e12, 0x89b4552c, 0x5f118f49, 0xb0d3e477,
+    0x5be45f74, 0xb426344a, 0x56fa2f33, 0xb938440d, 0x520fff0e,
+    0xbdcd9430, 0x4cc6cfbd, 0xa304a483, 0x48331f80, 0xa7f174be,
+    0x452d6fc7, 0xaaef04f9, 0x41d8bffa, 0xae1ad4c4, 0x37e20d71,
+    0xd820664f, 0x3317dd4c, 0xdcd5b672, 0x3e09ad0b, 0xd1cbc635,
+    0x3afc7d36, 0xd53e1608, 0x24354d85, 0xcbf726bb, 0x20c09db8,
+    0xcf02f686, 0x2ddeedff, 0xc21c86c1, 0x292b3dc2, 0xc6e956fc,
+    0x104c8c99, 0xff8ee7a7, 0x14b95ca4, 0xfb7b379a, 0x19a72ce3,
+    0xf66547dd, 0x1d52fcde, 0xf29097e0, 0x039bcc6d, 0xec59a753,
+    0x076e1c50, 0xe8ac776e, 0x0a706c17, 0xe5b20729, 0x0e85bc2a,
+    0xe147d714},
+   {0x00000000, 0x177b1443, 0x2ef62886, 0x398d3cc5, 0x5dec510c,
+    0x4a97454f, 0x731a798a, 0x64616dc9, 0xbbd8a218, 0xaca3b65b,
+    0x952e8a9e, 0x82559edd, 0xe634f314, 0xf14fe757, 0xc8c2db92,
+    0xdfb9cfd1, 0xacc04271, 0xbbbb5632, 0x82366af7, 0x954d7eb4,
+    0xf12c137d, 0xe657073e, 0xdfda3bfb, 0xc8a12fb8, 0x1718e069,
+    0x0063f42a, 0x39eec8ef, 0x2e95dcac, 0x4af4b165, 0x5d8fa526,
+    0x640299e3, 0x73798da0, 0x82f182a3, 0x958a96e0, 0xac07aa25,
+    0xbb7cbe66, 0xdf1dd3af, 0xc866c7ec, 0xf1ebfb29, 0xe690ef6a,
+    0x392920bb, 0x2e5234f8, 0x17df083d, 0x00a41c7e, 0x64c571b7,
+    0x73be65f4, 0x4a335931, 0x5d484d72, 0x2e31c0d2, 0x394ad491,
+    0x00c7e854, 0x17bcfc17, 0x73dd91de, 0x64a6859d, 0x5d2bb958,
+    0x4a50ad1b, 0x95e962ca, 0x82927689, 0xbb1f4a4c, 0xac645e0f,
+    0xc80533c6, 0xdf7e2785, 0xe6f31b40, 0xf1880f03, 0xde920307,
+    0xc9e91744, 0xf0642b81, 0xe71f3fc2, 0x837e520b, 0x94054648,
+    0xad887a8d, 0xbaf36ece, 0x654aa11f, 0x7231b55c, 0x4bbc8999,
+    0x5cc79dda, 0x38a6f013, 0x2fdde450, 0x1650d895, 0x012bccd6,
+    0x72524176, 0x65295535, 0x5ca469f0, 0x4bdf7db3, 0x2fbe107a,
+    0x38c50439, 0x014838fc, 0x16332cbf, 0xc98ae36e, 0xdef1f72d,
+    0xe77ccbe8, 0xf007dfab, 0x9466b262, 0x831da621, 0xba909ae4,
+    0xadeb8ea7, 0x5c6381a4, 0x4b1895e7, 0x7295a922, 0x65eebd61,
+    0x018fd0a8, 0x16f4c4eb, 0x2f79f82e, 0x3802ec6d, 0xe7bb23bc,
+    0xf0c037ff, 0xc94d0b3a, 0xde361f79, 0xba5772b0, 0xad2c66f3,
+    0x94a15a36, 0x83da4e75, 0xf0a3c3d5, 0xe7d8d796, 0xde55eb53,
+    0xc92eff10, 0xad4f92d9, 0xba34869a, 0x83b9ba5f, 0x94c2ae1c,
+    0x4b7b61cd, 0x5c00758e, 0x658d494b, 0x72f65d08, 0x169730c1,
+    0x01ec2482, 0x38611847, 0x2f1a0c04, 0x6655004f, 0x712e140c,
+    0x48a328c9, 0x5fd83c8a, 0x3bb95143, 0x2cc24500, 0x154f79c5,
+    0x02346d86, 0xdd8da257, 0xcaf6b614, 0xf37b8ad1, 0xe4009e92,
+    0x8061f35b, 0x971ae718, 0xae97dbdd, 0xb9eccf9e, 0xca95423e,
+    0xddee567d, 0xe4636ab8, 0xf3187efb, 0x97791332, 0x80020771,
+    0xb98f3bb4, 0xaef42ff7, 0x714de026, 0x6636f465, 0x5fbbc8a0,
+    0x48c0dce3, 0x2ca1b12a, 0x3bdaa569, 0x025799ac, 0x152c8def,
+    0xe4a482ec, 0xf3df96af, 0xca52aa6a, 0xdd29be29, 0xb948d3e0,
+    0xae33c7a3, 0x97befb66, 0x80c5ef25, 0x5f7c20f4, 0x480734b7,
+    0x718a0872, 0x66f11c31, 0x029071f8, 0x15eb65bb, 0x2c66597e,
+    0x3b1d4d3d, 0x4864c09d, 0x5f1fd4de, 0x6692e81b, 0x71e9fc58,
+    0x15889191, 0x02f385d2, 0x3b7eb917, 0x2c05ad54, 0xf3bc6285,
+    0xe4c776c6, 0xdd4a4a03, 0xca315e40, 0xae503389, 0xb92b27ca,
+    0x80a61b0f, 0x97dd0f4c, 0xb8c70348, 0xafbc170b, 0x96312bce,
+    0x814a3f8d, 0xe52b5244, 0xf2504607, 0xcbdd7ac2, 0xdca66e81,
+    0x031fa150, 0x1464b513, 0x2de989d6, 0x3a929d95, 0x5ef3f05c,
+    0x4988e41f, 0x7005d8da, 0x677ecc99, 0x14074139, 0x037c557a,
+    0x3af169bf, 0x2d8a7dfc, 0x49eb1035, 0x5e900476, 0x671d38b3,
+    0x70662cf0, 0xafdfe321, 0xb8a4f762, 0x8129cba7, 0x9652dfe4,
+    0xf233b22d, 0xe548a66e, 0xdcc59aab, 0xcbbe8ee8, 0x3a3681eb,
+    0x2d4d95a8, 0x14c0a96d, 0x03bbbd2e, 0x67dad0e7, 0x70a1c4a4,
+    0x492cf861, 0x5e57ec22, 0x81ee23f3, 0x969537b0, 0xaf180b75,
+    0xb8631f36, 0xdc0272ff, 0xcb7966bc, 0xf2f45a79, 0xe58f4e3a,
+    0x96f6c39a, 0x818dd7d9, 0xb800eb1c, 0xaf7bff5f, 0xcb1a9296,
+    0xdc6186d5, 0xe5ecba10, 0xf297ae53, 0x2d2e6182, 0x3a5575c1,
+    0x03d84904, 0x14a35d47, 0x70c2308e, 0x67b924cd, 0x5e341808,
+    0x494f0c4b}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x00000000, 0x43147b17, 0x8628f62e, 0xc53c8d39, 0x0c51ec5d,
+    0x4f45974a, 0x8a791a73, 0xc96d6164, 0x18a2d8bb, 0x5bb6a3ac,
+    0x9e8a2e95, 0xdd9e5582, 0x14f334e6, 0x57e74ff1, 0x92dbc2c8,
+    0xd1cfb9df, 0x7142c0ac, 0x3256bbbb, 0xf76a3682, 0xb47e4d95,
+    0x7d132cf1, 0x3e0757e6, 0xfb3bdadf, 0xb82fa1c8, 0x69e01817,
+    0x2af46300, 0xefc8ee39, 0xacdc952e, 0x65b1f44a, 0x26a58f5d,
+    0xe3990264, 0xa08d7973, 0xa382f182, 0xe0968a95, 0x25aa07ac,
+    0x66be7cbb, 0xafd31ddf, 0xecc766c8, 0x29fbebf1, 0x6aef90e6,
+    0xbb202939, 0xf834522e, 0x3d08df17, 0x7e1ca400, 0xb771c564,
+    0xf465be73, 0x3159334a, 0x724d485d, 0xd2c0312e, 0x91d44a39,
+    0x54e8c700, 0x17fcbc17, 0xde91dd73, 0x9d85a664, 0x58b92b5d,
+    0x1bad504a, 0xca62e995, 0x89769282, 0x4c4a1fbb, 0x0f5e64ac,
+    0xc63305c8, 0x85277edf, 0x401bf3e6, 0x030f88f1, 0x070392de,
+    0x4417e9c9, 0x812b64f0, 0xc23f1fe7, 0x0b527e83, 0x48460594,
+    0x8d7a88ad, 0xce6ef3ba, 0x1fa14a65, 0x5cb53172, 0x9989bc4b,
+    0xda9dc75c, 0x13f0a638, 0x50e4dd2f, 0x95d85016, 0xd6cc2b01,
+    0x76415272, 0x35552965, 0xf069a45c, 0xb37ddf4b, 0x7a10be2f,
+    0x3904c538, 0xfc384801, 0xbf2c3316, 0x6ee38ac9, 0x2df7f1de,
+    0xe8cb7ce7, 0xabdf07f0, 0x62b26694, 0x21a61d83, 0xe49a90ba,
+    0xa78eebad, 0xa481635c, 0xe795184b, 0x22a99572, 0x61bdee65,
+    0xa8d08f01, 0xebc4f416, 0x2ef8792f, 0x6dec0238, 0xbc23bbe7,
+    0xff37c0f0, 0x3a0b4dc9, 0x791f36de, 0xb07257ba, 0xf3662cad,
+    0x365aa194, 0x754eda83, 0xd5c3a3f0, 0x96d7d8e7, 0x53eb55de,
+    0x10ff2ec9, 0xd9924fad, 0x9a8634ba, 0x5fbab983, 0x1caec294,
+    0xcd617b4b, 0x8e75005c, 0x4b498d65, 0x085df672, 0xc1309716,
+    0x8224ec01, 0x47186138, 0x040c1a2f, 0x4f005566, 0x0c142e71,
+    0xc928a348, 0x8a3cd85f, 0x4351b93b, 0x0045c22c, 0xc5794f15,
+    0x866d3402, 0x57a28ddd, 0x14b6f6ca, 0xd18a7bf3, 0x929e00e4,
+    0x5bf36180, 0x18e71a97, 0xdddb97ae, 0x9ecfecb9, 0x3e4295ca,
+    0x7d56eedd, 0xb86a63e4, 0xfb7e18f3, 0x32137997, 0x71070280,
+    0xb43b8fb9, 0xf72ff4ae, 0x26e04d71, 0x65f43666, 0xa0c8bb5f,
+    0xe3dcc048, 0x2ab1a12c, 0x69a5da3b, 0xac995702, 0xef8d2c15,
+    0xec82a4e4, 0xaf96dff3, 0x6aaa52ca, 0x29be29dd, 0xe0d348b9,
+    0xa3c733ae, 0x66fbbe97, 0x25efc580, 0xf4207c5f, 0xb7340748,
+    0x72088a71, 0x311cf166, 0xf8719002, 0xbb65eb15, 0x7e59662c,
+    0x3d4d1d3b, 0x9dc06448, 0xded41f5f, 0x1be89266, 0x58fce971,
+    0x91918815, 0xd285f302, 0x17b97e3b, 0x54ad052c, 0x8562bcf3,
+    0xc676c7e4, 0x034a4add, 0x405e31ca, 0x893350ae, 0xca272bb9,
+    0x0f1ba680, 0x4c0fdd97, 0x4803c7b8, 0x0b17bcaf, 0xce2b3196,
+    0x8d3f4a81, 0x44522be5, 0x074650f2, 0xc27addcb, 0x816ea6dc,
+    0x50a11f03, 0x13b56414, 0xd689e92d, 0x959d923a, 0x5cf0f35e,
+    0x1fe48849, 0xdad80570, 0x99cc7e67, 0x39410714, 0x7a557c03,
+    0xbf69f13a, 0xfc7d8a2d, 0x3510eb49, 0x7604905e, 0xb3381d67,
+    0xf02c6670, 0x21e3dfaf, 0x62f7a4b8, 0xa7cb2981, 0xe4df5296,
+    0x2db233f2, 0x6ea648e5, 0xab9ac5dc, 0xe88ebecb, 0xeb81363a,
+    0xa8954d2d, 0x6da9c014, 0x2ebdbb03, 0xe7d0da67, 0xa4c4a170,
+    0x61f82c49, 0x22ec575e, 0xf323ee81, 0xb0379596, 0x750b18af,
+    0x361f63b8, 0xff7202dc, 0xbc6679cb, 0x795af4f2, 0x3a4e8fe5,
+    0x9ac3f696, 0xd9d78d81, 0x1ceb00b8, 0x5fff7baf, 0x96921acb,
+    0xd58661dc, 0x10baece5, 0x53ae97f2, 0x82612e2d, 0xc175553a,
+    0x0449d803, 0x475da314, 0x8e30c270, 0xcd24b967, 0x0818345e,
+    0x4b0c4f49},
+   {0x00000000, 0x3e6bc2ef, 0x3dd0f504, 0x03bb37eb, 0x7aa0eb09,
+    0x44cb29e6, 0x47701e0d, 0x791bdce2, 0xf440d713, 0xca2b15fc,
+    0xc9902217, 0xf7fbe0f8, 0x8ee03c1a, 0xb08bfef5, 0xb330c91e,
+    0x8d5b0bf1, 0xe881ae27, 0xd6ea6cc8, 0xd5515b23, 0xeb3a99cc,
+    0x9221452e, 0xac4a87c1, 0xaff1b02a, 0x919a72c5, 0x1cc17934,
+    0x22aabbdb, 0x21118c30, 0x1f7a4edf, 0x6661923d, 0x580a50d2,
+    0x5bb16739, 0x65daa5d6, 0xd0035d4f, 0xee689fa0, 0xedd3a84b,
+    0xd3b86aa4, 0xaaa3b646, 0x94c874a9, 0x97734342, 0xa91881ad,
+    0x24438a5c, 0x1a2848b3, 0x19937f58, 0x27f8bdb7, 0x5ee36155,
+    0x6088a3ba, 0x63339451, 0x5d5856be, 0x3882f368, 0x06e93187,
+    0x0552066c, 0x3b39c483, 0x42221861, 0x7c49da8e, 0x7ff2ed65,
+    0x41992f8a, 0xccc2247b, 0xf2a9e694, 0xf112d17f, 0xcf791390,
+    0xb662cf72, 0x88090d9d, 0x8bb23a76, 0xb5d9f899, 0xa007ba9e,
+    0x9e6c7871, 0x9dd74f9a, 0xa3bc8d75, 0xdaa75197, 0xe4cc9378,
+    0xe777a493, 0xd91c667c, 0x54476d8d, 0x6a2caf62, 0x69979889,
+    0x57fc5a66, 0x2ee78684, 0x108c446b, 0x13377380, 0x2d5cb16f,
+    0x488614b9, 0x76edd656, 0x7556e1bd, 0x4b3d2352, 0x3226ffb0,
+    0x0c4d3d5f, 0x0ff60ab4, 0x319dc85b, 0xbcc6c3aa, 0x82ad0145,
+    0x811636ae, 0xbf7df441, 0xc66628a3, 0xf80dea4c, 0xfbb6dda7,
+    0xc5dd1f48, 0x7004e7d1, 0x4e6f253e, 0x4dd412d5, 0x73bfd03a,
+    0x0aa40cd8, 0x34cfce37, 0x3774f9dc, 0x091f3b33, 0x844430c2,
+    0xba2ff22d, 0xb994c5c6, 0x87ff0729, 0xfee4dbcb, 0xc08f1924,
+    0xc3342ecf, 0xfd5fec20, 0x988549f6, 0xa6ee8b19, 0xa555bcf2,
+    0x9b3e7e1d, 0xe225a2ff, 0xdc4e6010, 0xdff557fb, 0xe19e9514,
+    0x6cc59ee5, 0x52ae5c0a, 0x51156be1, 0x6f7ea90e, 0x166575ec,
+    0x280eb703, 0x2bb580e8, 0x15de4207, 0x010905e6, 0x3f62c709,
+    0x3cd9f0e2, 0x02b2320d, 0x7ba9eeef, 0x45c22c00, 0x46791beb,
+    0x7812d904, 0xf549d2f5, 0xcb22101a, 0xc89927f1, 0xf6f2e51e,
+    0x8fe939fc, 0xb182fb13, 0xb239ccf8, 0x8c520e17, 0xe988abc1,
+    0xd7e3692e, 0xd4585ec5, 0xea339c2a, 0x932840c8, 0xad438227,
+    0xaef8b5cc, 0x90937723, 0x1dc87cd2, 0x23a3be3d, 0x201889d6,
+    0x1e734b39, 0x676897db, 0x59035534, 0x5ab862df, 0x64d3a030,
+    0xd10a58a9, 0xef619a46, 0xecdaadad, 0xd2b16f42, 0xabaab3a0,
+    0x95c1714f, 0x967a46a4, 0xa811844b, 0x254a8fba, 0x1b214d55,
+    0x189a7abe, 0x26f1b851, 0x5fea64b3, 0x6181a65c, 0x623a91b7,
+    0x5c515358, 0x398bf68e, 0x07e03461, 0x045b038a, 0x3a30c165,
+    0x432b1d87, 0x7d40df68, 0x7efbe883, 0x40902a6c, 0xcdcb219d,
+    0xf3a0e372, 0xf01bd499, 0xce701676, 0xb76bca94, 0x8900087b,
+    0x8abb3f90, 0xb4d0fd7f, 0xa10ebf78, 0x9f657d97, 0x9cde4a7c,
+    0xa2b58893, 0xdbae5471, 0xe5c5969e, 0xe67ea175, 0xd815639a,
+    0x554e686b, 0x6b25aa84, 0x689e9d6f, 0x56f55f80, 0x2fee8362,
+    0x1185418d, 0x123e7666, 0x2c55b489, 0x498f115f, 0x77e4d3b0,
+    0x745fe45b, 0x4a3426b4, 0x332ffa56, 0x0d4438b9, 0x0eff0f52,
+    0x3094cdbd, 0xbdcfc64c, 0x83a404a3, 0x801f3348, 0xbe74f1a7,
+    0xc76f2d45, 0xf904efaa, 0xfabfd841, 0xc4d41aae, 0x710de237,
+    0x4f6620d8, 0x4cdd1733, 0x72b6d5dc, 0x0bad093e, 0x35c6cbd1,
+    0x367dfc3a, 0x08163ed5, 0x854d3524, 0xbb26f7cb, 0xb89dc020,
+    0x86f602cf, 0xffedde2d, 0xc1861cc2, 0xc23d2b29, 0xfc56e9c6,
+    0x998c4c10, 0xa7e78eff, 0xa45cb914, 0x9a377bfb, 0xe32ca719,
+    0xdd4765f6, 0xdefc521d, 0xe09790f2, 0x6dcc9b03, 0x53a759ec,
+    0x501c6e07, 0x6e77ace8, 0x176c700a, 0x2907b2e5, 0x2abc850e,
+    0x14d747e1},
+   {0x00000000, 0xc0df8ec1, 0xc1b96c58, 0x0166e299, 0x8273d9b0,
+    0x42ac5771, 0x43cab5e8, 0x83153b29, 0x45e1c3ba, 0x853e4d7b,
+    0x8458afe2, 0x44872123, 0xc7921a0a, 0x074d94cb, 0x062b7652,
+    0xc6f4f893, 0xcbc4f6ae, 0x0b1b786f, 0x0a7d9af6, 0xcaa21437,
+    0x49b72f1e, 0x8968a1df, 0x880e4346, 0x48d1cd87, 0x8e253514,
+    0x4efabbd5, 0x4f9c594c, 0x8f43d78d, 0x0c56eca4, 0xcc896265,
+    0xcdef80fc, 0x0d300e3d, 0xd78f9c86, 0x17501247, 0x1636f0de,
+    0xd6e97e1f, 0x55fc4536, 0x9523cbf7, 0x9445296e, 0x549aa7af,
+    0x926e5f3c, 0x52b1d1fd, 0x53d73364, 0x9308bda5, 0x101d868c,
+    0xd0c2084d, 0xd1a4ead4, 0x117b6415, 0x1c4b6a28, 0xdc94e4e9,
+    0xddf20670, 0x1d2d88b1, 0x9e38b398, 0x5ee73d59, 0x5f81dfc0,
+    0x9f5e5101, 0x59aaa992, 0x99752753, 0x9813c5ca, 0x58cc4b0b,
+    0xdbd97022, 0x1b06fee3, 0x1a601c7a, 0xdabf92bb, 0xef1948d6,
+    0x2fc6c617, 0x2ea0248e, 0xee7faa4f, 0x6d6a9166, 0xadb51fa7,
+    0xacd3fd3e, 0x6c0c73ff, 0xaaf88b6c, 0x6a2705ad, 0x6b41e734,
+    0xab9e69f5, 0x288b52dc, 0xe854dc1d, 0xe9323e84, 0x29edb045,
+    0x24ddbe78, 0xe40230b9, 0xe564d220, 0x25bb5ce1, 0xa6ae67c8,
+    0x6671e909, 0x67170b90, 0xa7c88551, 0x613c7dc2, 0xa1e3f303,
+    0xa085119a, 0x605a9f5b, 0xe34fa472, 0x23902ab3, 0x22f6c82a,
+    0xe22946eb, 0x3896d450, 0xf8495a91, 0xf92fb808, 0x39f036c9,
+    0xbae50de0, 0x7a3a8321, 0x7b5c61b8, 0xbb83ef79, 0x7d7717ea,
+    0xbda8992b, 0xbcce7bb2, 0x7c11f573, 0xff04ce5a, 0x3fdb409b,
+    0x3ebda202, 0xfe622cc3, 0xf35222fe, 0x338dac3f, 0x32eb4ea6,
+    0xf234c067, 0x7121fb4e, 0xb1fe758f, 0xb0989716, 0x704719d7,
+    0xb6b3e144, 0x766c6f85, 0x770a8d1c, 0xb7d503dd, 0x34c038f4,
+    0xf41fb635, 0xf57954ac, 0x35a6da6d, 0x9f35e177, 0x5fea6fb6,
+    0x5e8c8d2f, 0x9e5303ee, 0x1d4638c7, 0xdd99b606, 0xdcff549f,
+    0x1c20da5e, 0xdad422cd, 0x1a0bac0c, 0x1b6d4e95, 0xdbb2c054,
+    0x58a7fb7d, 0x987875bc, 0x991e9725, 0x59c119e4, 0x54f117d9,
+    0x942e9918, 0x95487b81, 0x5597f540, 0xd682ce69, 0x165d40a8,
+    0x173ba231, 0xd7e42cf0, 0x1110d463, 0xd1cf5aa2, 0xd0a9b83b,
+    0x107636fa, 0x93630dd3, 0x53bc8312, 0x52da618b, 0x9205ef4a,
+    0x48ba7df1, 0x8865f330, 0x890311a9, 0x49dc9f68, 0xcac9a441,
+    0x0a162a80, 0x0b70c819, 0xcbaf46d8, 0x0d5bbe4b, 0xcd84308a,
+    0xcce2d213, 0x0c3d5cd2, 0x8f2867fb, 0x4ff7e93a, 0x4e910ba3,
+    0x8e4e8562, 0x837e8b5f, 0x43a1059e, 0x42c7e707, 0x821869c6,
+    0x010d52ef, 0xc1d2dc2e, 0xc0b43eb7, 0x006bb076, 0xc69f48e5,
+    0x0640c624, 0x072624bd, 0xc7f9aa7c, 0x44ec9155, 0x84331f94,
+    0x8555fd0d, 0x458a73cc, 0x702ca9a1, 0xb0f32760, 0xb195c5f9,
+    0x714a4b38, 0xf25f7011, 0x3280fed0, 0x33e61c49, 0xf3399288,
+    0x35cd6a1b, 0xf512e4da, 0xf4740643, 0x34ab8882, 0xb7beb3ab,
+    0x77613d6a, 0x7607dff3, 0xb6d85132, 0xbbe85f0f, 0x7b37d1ce,
+    0x7a513357, 0xba8ebd96, 0x399b86bf, 0xf944087e, 0xf822eae7,
+    0x38fd6426, 0xfe099cb5, 0x3ed61274, 0x3fb0f0ed, 0xff6f7e2c,
+    0x7c7a4505, 0xbca5cbc4, 0xbdc3295d, 0x7d1ca79c, 0xa7a33527,
+    0x677cbbe6, 0x661a597f, 0xa6c5d7be, 0x25d0ec97, 0xe50f6256,
+    0xe46980cf, 0x24b60e0e, 0xe242f69d, 0x229d785c, 0x23fb9ac5,
+    0xe3241404, 0x60312f2d, 0xa0eea1ec, 0xa1884375, 0x6157cdb4,
+    0x6c67c389, 0xacb84d48, 0xaddeafd1, 0x6d012110, 0xee141a39,
+    0x2ecb94f8, 0x2fad7661, 0xef72f8a0, 0x29860033, 0xe9598ef2,
+    0xe83f6c6b, 0x28e0e2aa, 0xabf5d983, 0x6b2a5742, 0x6a4cb5db,
+    0xaa933b1a},
+   {0x00000000, 0x6f4ca59b, 0x9f9e3bec, 0xf0d29e77, 0x7f3b0603,
+    0x1077a398, 0xe0a53def, 0x8fe99874, 0xfe760c06, 0x913aa99d,
+    0x61e837ea, 0x0ea49271, 0x814d0a05, 0xee01af9e, 0x1ed331e9,
+    0x719f9472, 0xfced180c, 0x93a1bd97, 0x637323e0, 0x0c3f867b,
+    0x83d61e0f, 0xec9abb94, 0x1c4825e3, 0x73048078, 0x029b140a,
+    0x6dd7b191, 0x9d052fe6, 0xf2498a7d, 0x7da01209, 0x12ecb792,
+    0xe23e29e5, 0x8d728c7e, 0xf8db3118, 0x97979483, 0x67450af4,
+    0x0809af6f, 0x87e0371b, 0xe8ac9280, 0x187e0cf7, 0x7732a96c,
+    0x06ad3d1e, 0x69e19885, 0x993306f2, 0xf67fa369, 0x79963b1d,
+    0x16da9e86, 0xe60800f1, 0x8944a56a, 0x04362914, 0x6b7a8c8f,
+    0x9ba812f8, 0xf4e4b763, 0x7b0d2f17, 0x14418a8c, 0xe49314fb,
+    0x8bdfb160, 0xfa402512, 0x950c8089, 0x65de1efe, 0x0a92bb65,
+    0x857b2311, 0xea37868a, 0x1ae518fd, 0x75a9bd66, 0xf0b76330,
+    0x9ffbc6ab, 0x6f2958dc, 0x0065fd47, 0x8f8c6533, 0xe0c0c0a8,
+    0x10125edf, 0x7f5efb44, 0x0ec16f36, 0x618dcaad, 0x915f54da,
+    0xfe13f141, 0x71fa6935, 0x1eb6ccae, 0xee6452d9, 0x8128f742,
+    0x0c5a7b3c, 0x6316dea7, 0x93c440d0, 0xfc88e54b, 0x73617d3f,
+    0x1c2dd8a4, 0xecff46d3, 0x83b3e348, 0xf22c773a, 0x9d60d2a1,
+    0x6db24cd6, 0x02fee94d, 0x8d177139, 0xe25bd4a2, 0x12894ad5,
+    0x7dc5ef4e, 0x086c5228, 0x6720f7b3, 0x97f269c4, 0xf8becc5f,
+    0x7757542b, 0x181bf1b0, 0xe8c96fc7, 0x8785ca5c, 0xf61a5e2e,
+    0x9956fbb5, 0x698465c2, 0x06c8c059, 0x8921582d, 0xe66dfdb6,
+    0x16bf63c1, 0x79f3c65a, 0xf4814a24, 0x9bcdefbf, 0x6b1f71c8,
+    0x0453d453, 0x8bba4c27, 0xe4f6e9bc, 0x142477cb, 0x7b68d250,
+    0x0af74622, 0x65bbe3b9, 0x95697dce, 0xfa25d855, 0x75cc4021,
+    0x1a80e5ba, 0xea527bcd, 0x851ede56, 0xe06fc760, 0x8f2362fb,
+    0x7ff1fc8c, 0x10bd5917, 0x9f54c163, 0xf01864f8, 0x00cafa8f,
+    0x6f865f14, 0x1e19cb66, 0x71556efd, 0x8187f08a, 0xeecb5511,
+    0x6122cd65, 0x0e6e68fe, 0xfebcf689, 0x91f05312, 0x1c82df6c,
+    0x73ce7af7, 0x831ce480, 0xec50411b, 0x63b9d96f, 0x0cf57cf4,
+    0xfc27e283, 0x936b4718, 0xe2f4d36a, 0x8db876f1, 0x7d6ae886,
+    0x12264d1d, 0x9dcfd569, 0xf28370f2, 0x0251ee85, 0x6d1d4b1e,
+    0x18b4f678, 0x77f853e3, 0x872acd94, 0xe866680f, 0x678ff07b,
+    0x08c355e0, 0xf811cb97, 0x975d6e0c, 0xe6c2fa7e, 0x898e5fe5,
+    0x795cc192, 0x16106409, 0x99f9fc7d, 0xf6b559e6, 0x0667c791,
+    0x692b620a, 0xe459ee74, 0x8b154bef, 0x7bc7d598, 0x148b7003,
+    0x9b62e877, 0xf42e4dec, 0x04fcd39b, 0x6bb07600, 0x1a2fe272,
+    0x756347e9, 0x85b1d99e, 0xeafd7c05, 0x6514e471, 0x0a5841ea,
+    0xfa8adf9d, 0x95c67a06, 0x10d8a450, 0x7f9401cb, 0x8f469fbc,
+    0xe00a3a27, 0x6fe3a253, 0x00af07c8, 0xf07d99bf, 0x9f313c24,
+    0xeeaea856, 0x81e20dcd, 0x713093ba, 0x1e7c3621, 0x9195ae55,
+    0xfed90bce, 0x0e0b95b9, 0x61473022, 0xec35bc5c, 0x837919c7,
+    0x73ab87b0, 0x1ce7222b, 0x930eba5f, 0xfc421fc4, 0x0c9081b3,
+    0x63dc2428, 0x1243b05a, 0x7d0f15c1, 0x8ddd8bb6, 0xe2912e2d,
+    0x6d78b659, 0x023413c2, 0xf2e68db5, 0x9daa282e, 0xe8039548,
+    0x874f30d3, 0x779daea4, 0x18d10b3f, 0x9738934b, 0xf87436d0,
+    0x08a6a8a7, 0x67ea0d3c, 0x1675994e, 0x79393cd5, 0x89eba2a2,
+    0xe6a70739, 0x694e9f4d, 0x06023ad6, 0xf6d0a4a1, 0x999c013a,
+    0x14ee8d44, 0x7ba228df, 0x8b70b6a8, 0xe43c1333, 0x6bd58b47,
+    0x04992edc, 0xf44bb0ab, 0x9b071530, 0xea988142, 0x85d424d9,
+    0x7506baae, 0x1a4a1f35, 0x95a38741, 0xfaef22da, 0x0a3dbcad,
+    0x65711936}};
+
+#endif
+
+#endif
+
+#if N == 4
+
+#if W == 8
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0xf1da05aa, 0x38c50d15, 0xc91f08bf, 0x718a1a2a,
+    0x80501f80, 0x494f173f, 0xb8951295, 0xe3143454, 0x12ce31fe,
+    0xdbd13941, 0x2a0b3ceb, 0x929e2e7e, 0x63442bd4, 0xaa5b236b,
+    0x5b8126c1, 0x1d596ee9, 0xec836b43, 0x259c63fc, 0xd4466656,
+    0x6cd374c3, 0x9d097169, 0x541679d6, 0xa5cc7c7c, 0xfe4d5abd,
+    0x0f975f17, 0xc68857a8, 0x37525202, 0x8fc74097, 0x7e1d453d,
+    0xb7024d82, 0x46d84828, 0x3ab2ddd2, 0xcb68d878, 0x0277d0c7,
+    0xf3add56d, 0x4b38c7f8, 0xbae2c252, 0x73fdcaed, 0x8227cf47,
+    0xd9a6e986, 0x287cec2c, 0xe163e493, 0x10b9e139, 0xa82cf3ac,
+    0x59f6f606, 0x90e9feb9, 0x6133fb13, 0x27ebb33b, 0xd631b691,
+    0x1f2ebe2e, 0xeef4bb84, 0x5661a911, 0xa7bbacbb, 0x6ea4a404,
+    0x9f7ea1ae, 0xc4ff876f, 0x352582c5, 0xfc3a8a7a, 0x0de08fd0,
+    0xb5759d45, 0x44af98ef, 0x8db09050, 0x7c6a95fa, 0x7565bba4,
+    0x84bfbe0e, 0x4da0b6b1, 0xbc7ab31b, 0x04efa18e, 0xf535a424,
+    0x3c2aac9b, 0xcdf0a931, 0x96718ff0, 0x67ab8a5a, 0xaeb482e5,
+    0x5f6e874f, 0xe7fb95da, 0x16219070, 0xdf3e98cf, 0x2ee49d65,
+    0x683cd54d, 0x99e6d0e7, 0x50f9d858, 0xa123ddf2, 0x19b6cf67,
+    0xe86ccacd, 0x2173c272, 0xd0a9c7d8, 0x8b28e119, 0x7af2e4b3,
+    0xb3edec0c, 0x4237e9a6, 0xfaa2fb33, 0x0b78fe99, 0xc267f626,
+    0x33bdf38c, 0x4fd76676, 0xbe0d63dc, 0x77126b63, 0x86c86ec9,
+    0x3e5d7c5c, 0xcf8779f6, 0x06987149, 0xf74274e3, 0xacc35222,
+    0x5d195788, 0x94065f37, 0x65dc5a9d, 0xdd494808, 0x2c934da2,
+    0xe58c451d, 0x145640b7, 0x528e089f, 0xa3540d35, 0x6a4b058a,
+    0x9b910020, 0x230412b5, 0xd2de171f, 0x1bc11fa0, 0xea1b1a0a,
+    0xb19a3ccb, 0x40403961, 0x895f31de, 0x78853474, 0xc01026e1,
+    0x31ca234b, 0xf8d52bf4, 0x090f2e5e, 0xeacb7748, 0x1b1172e2,
+    0xd20e7a5d, 0x23d47ff7, 0x9b416d62, 0x6a9b68c8, 0xa3846077,
+    0x525e65dd, 0x09df431c, 0xf80546b6, 0x311a4e09, 0xc0c04ba3,
+    0x78555936, 0x898f5c9c, 0x40905423, 0xb14a5189, 0xf79219a1,
+    0x06481c0b, 0xcf5714b4, 0x3e8d111e, 0x8618038b, 0x77c20621,
+    0xbedd0e9e, 0x4f070b34, 0x14862df5, 0xe55c285f, 0x2c4320e0,
+    0xdd99254a, 0x650c37df, 0x94d63275, 0x5dc93aca, 0xac133f60,
+    0xd079aa9a, 0x21a3af30, 0xe8bca78f, 0x1966a225, 0xa1f3b0b0,
+    0x5029b51a, 0x9936bda5, 0x68ecb80f, 0x336d9ece, 0xc2b79b64,
+    0x0ba893db, 0xfa729671, 0x42e784e4, 0xb33d814e, 0x7a2289f1,
+    0x8bf88c5b, 0xcd20c473, 0x3cfac1d9, 0xf5e5c966, 0x043fcccc,
+    0xbcaade59, 0x4d70dbf3, 0x846fd34c, 0x75b5d6e6, 0x2e34f027,
+    0xdfeef58d, 0x16f1fd32, 0xe72bf898, 0x5fbeea0d, 0xae64efa7,
+    0x677be718, 0x96a1e2b2, 0x9faeccec, 0x6e74c946, 0xa76bc1f9,
+    0x56b1c453, 0xee24d6c6, 0x1ffed36c, 0xd6e1dbd3, 0x273bde79,
+    0x7cbaf8b8, 0x8d60fd12, 0x447ff5ad, 0xb5a5f007, 0x0d30e292,
+    0xfceae738, 0x35f5ef87, 0xc42fea2d, 0x82f7a205, 0x732da7af,
+    0xba32af10, 0x4be8aaba, 0xf37db82f, 0x02a7bd85, 0xcbb8b53a,
+    0x3a62b090, 0x61e39651, 0x903993fb, 0x59269b44, 0xa8fc9eee,
+    0x10698c7b, 0xe1b389d1, 0x28ac816e, 0xd97684c4, 0xa51c113e,
+    0x54c61494, 0x9dd91c2b, 0x6c031981, 0xd4960b14, 0x254c0ebe,
+    0xec530601, 0x1d8903ab, 0x4608256a, 0xb7d220c0, 0x7ecd287f,
+    0x8f172dd5, 0x37823f40, 0xc6583aea, 0x0f473255, 0xfe9d37ff,
+    0xb8457fd7, 0x499f7a7d, 0x808072c2, 0x715a7768, 0xc9cf65fd,
+    0x38156057, 0xf10a68e8, 0x00d06d42, 0x5b514b83, 0xaa8b4e29,
+    0x63944696, 0x924e433c, 0x2adb51a9, 0xdb015403, 0x121e5cbc,
+    0xe3c45916},
+   {0x00000000, 0x0ee7e8d1, 0x1dcfd1a2, 0x13283973, 0x3b9fa344,
+    0x35784b95, 0x265072e6, 0x28b79a37, 0x773f4688, 0x79d8ae59,
+    0x6af0972a, 0x64177ffb, 0x4ca0e5cc, 0x42470d1d, 0x516f346e,
+    0x5f88dcbf, 0xee7e8d10, 0xe09965c1, 0xf3b15cb2, 0xfd56b463,
+    0xd5e12e54, 0xdb06c685, 0xc82efff6, 0xc6c91727, 0x9941cb98,
+    0x97a62349, 0x848e1a3a, 0x8a69f2eb, 0xa2de68dc, 0xac39800d,
+    0xbf11b97e, 0xb1f651af, 0x078c1c61, 0x096bf4b0, 0x1a43cdc3,
+    0x14a42512, 0x3c13bf25, 0x32f457f4, 0x21dc6e87, 0x2f3b8656,
+    0x70b35ae9, 0x7e54b238, 0x6d7c8b4b, 0x639b639a, 0x4b2cf9ad,
+    0x45cb117c, 0x56e3280f, 0x5804c0de, 0xe9f29171, 0xe71579a0,
+    0xf43d40d3, 0xfadaa802, 0xd26d3235, 0xdc8adae4, 0xcfa2e397,
+    0xc1450b46, 0x9ecdd7f9, 0x902a3f28, 0x8302065b, 0x8de5ee8a,
+    0xa55274bd, 0xabb59c6c, 0xb89da51f, 0xb67a4dce, 0x0f1838c2,
+    0x01ffd013, 0x12d7e960, 0x1c3001b1, 0x34879b86, 0x3a607357,
+    0x29484a24, 0x27afa2f5, 0x78277e4a, 0x76c0969b, 0x65e8afe8,
+    0x6b0f4739, 0x43b8dd0e, 0x4d5f35df, 0x5e770cac, 0x5090e47d,
+    0xe166b5d2, 0xef815d03, 0xfca96470, 0xf24e8ca1, 0xdaf91696,
+    0xd41efe47, 0xc736c734, 0xc9d12fe5, 0x9659f35a, 0x98be1b8b,
+    0x8b9622f8, 0x8571ca29, 0xadc6501e, 0xa321b8cf, 0xb00981bc,
+    0xbeee696d, 0x089424a3, 0x0673cc72, 0x155bf501, 0x1bbc1dd0,
+    0x330b87e7, 0x3dec6f36, 0x2ec45645, 0x2023be94, 0x7fab622b,
+    0x714c8afa, 0x6264b389, 0x6c835b58, 0x4434c16f, 0x4ad329be,
+    0x59fb10cd, 0x571cf81c, 0xe6eaa9b3, 0xe80d4162, 0xfb257811,
+    0xf5c290c0, 0xdd750af7, 0xd392e226, 0xc0badb55, 0xce5d3384,
+    0x91d5ef3b, 0x9f3207ea, 0x8c1a3e99, 0x82fdd648, 0xaa4a4c7f,
+    0xa4ada4ae, 0xb7859ddd, 0xb962750c, 0x1e307184, 0x10d79955,
+    0x03ffa026, 0x0d1848f7, 0x25afd2c0, 0x2b483a11, 0x38600362,
+    0x3687ebb3, 0x690f370c, 0x67e8dfdd, 0x74c0e6ae, 0x7a270e7f,
+    0x52909448, 0x5c777c99, 0x4f5f45ea, 0x41b8ad3b, 0xf04efc94,
+    0xfea91445, 0xed812d36, 0xe366c5e7, 0xcbd15fd0, 0xc536b701,
+    0xd61e8e72, 0xd8f966a3, 0x8771ba1c, 0x899652cd, 0x9abe6bbe,
+    0x9459836f, 0xbcee1958, 0xb209f189, 0xa121c8fa, 0xafc6202b,
+    0x19bc6de5, 0x175b8534, 0x0473bc47, 0x0a945496, 0x2223cea1,
+    0x2cc42670, 0x3fec1f03, 0x310bf7d2, 0x6e832b6d, 0x6064c3bc,
+    0x734cfacf, 0x7dab121e, 0x551c8829, 0x5bfb60f8, 0x48d3598b,
+    0x4634b15a, 0xf7c2e0f5, 0xf9250824, 0xea0d3157, 0xe4ead986,
+    0xcc5d43b1, 0xc2baab60, 0xd1929213, 0xdf757ac2, 0x80fda67d,
+    0x8e1a4eac, 0x9d3277df, 0x93d59f0e, 0xbb620539, 0xb585ede8,
+    0xa6add49b, 0xa84a3c4a, 0x11284946, 0x1fcfa197, 0x0ce798e4,
+    0x02007035, 0x2ab7ea02, 0x245002d3, 0x37783ba0, 0x399fd371,
+    0x66170fce, 0x68f0e71f, 0x7bd8de6c, 0x753f36bd, 0x5d88ac8a,
+    0x536f445b, 0x40477d28, 0x4ea095f9, 0xff56c456, 0xf1b12c87,
+    0xe29915f4, 0xec7efd25, 0xc4c96712, 0xca2e8fc3, 0xd906b6b0,
+    0xd7e15e61, 0x886982de, 0x868e6a0f, 0x95a6537c, 0x9b41bbad,
+    0xb3f6219a, 0xbd11c94b, 0xae39f038, 0xa0de18e9, 0x16a45527,
+    0x1843bdf6, 0x0b6b8485, 0x058c6c54, 0x2d3bf663, 0x23dc1eb2,
+    0x30f427c1, 0x3e13cf10, 0x619b13af, 0x6f7cfb7e, 0x7c54c20d,
+    0x72b32adc, 0x5a04b0eb, 0x54e3583a, 0x47cb6149, 0x492c8998,
+    0xf8dad837, 0xf63d30e6, 0xe5150995, 0xebf2e144, 0xc3457b73,
+    0xcda293a2, 0xde8aaad1, 0xd06d4200, 0x8fe59ebf, 0x8102766e,
+    0x922a4f1d, 0x9ccda7cc, 0xb47a3dfb, 0xba9dd52a, 0xa9b5ec59,
+    0xa7520488},
+   {0x00000000, 0x3c60e308, 0x78c1c610, 0x44a12518, 0xf1838c20,
+    0xcde36f28, 0x89424a30, 0xb522a938, 0x38761e01, 0x0416fd09,
+    0x40b7d811, 0x7cd73b19, 0xc9f59221, 0xf5957129, 0xb1345431,
+    0x8d54b739, 0x70ec3c02, 0x4c8cdf0a, 0x082dfa12, 0x344d191a,
+    0x816fb022, 0xbd0f532a, 0xf9ae7632, 0xc5ce953a, 0x489a2203,
+    0x74fac10b, 0x305be413, 0x0c3b071b, 0xb919ae23, 0x85794d2b,
+    0xc1d86833, 0xfdb88b3b, 0xe1d87804, 0xddb89b0c, 0x9919be14,
+    0xa5795d1c, 0x105bf424, 0x2c3b172c, 0x689a3234, 0x54fad13c,
+    0xd9ae6605, 0xe5ce850d, 0xa16fa015, 0x9d0f431d, 0x282dea25,
+    0x144d092d, 0x50ec2c35, 0x6c8ccf3d, 0x91344406, 0xad54a70e,
+    0xe9f58216, 0xd595611e, 0x60b7c826, 0x5cd72b2e, 0x18760e36,
+    0x2416ed3e, 0xa9425a07, 0x9522b90f, 0xd1839c17, 0xede37f1f,
+    0x58c1d627, 0x64a1352f, 0x20001037, 0x1c60f33f, 0x18c1f649,
+    0x24a11541, 0x60003059, 0x5c60d351, 0xe9427a69, 0xd5229961,
+    0x9183bc79, 0xade35f71, 0x20b7e848, 0x1cd70b40, 0x58762e58,
+    0x6416cd50, 0xd1346468, 0xed548760, 0xa9f5a278, 0x95954170,
+    0x682dca4b, 0x544d2943, 0x10ec0c5b, 0x2c8cef53, 0x99ae466b,
+    0xa5cea563, 0xe16f807b, 0xdd0f6373, 0x505bd44a, 0x6c3b3742,
+    0x289a125a, 0x14faf152, 0xa1d8586a, 0x9db8bb62, 0xd9199e7a,
+    0xe5797d72, 0xf9198e4d, 0xc5796d45, 0x81d8485d, 0xbdb8ab55,
+    0x089a026d, 0x34fae165, 0x705bc47d, 0x4c3b2775, 0xc16f904c,
+    0xfd0f7344, 0xb9ae565c, 0x85ceb554, 0x30ec1c6c, 0x0c8cff64,
+    0x482dda7c, 0x744d3974, 0x89f5b24f, 0xb5955147, 0xf134745f,
+    0xcd549757, 0x78763e6f, 0x4416dd67, 0x00b7f87f, 0x3cd71b77,
+    0xb183ac4e, 0x8de34f46, 0xc9426a5e, 0xf5228956, 0x4000206e,
+    0x7c60c366, 0x38c1e67e, 0x04a10576, 0x3183ec92, 0x0de30f9a,
+    0x49422a82, 0x7522c98a, 0xc00060b2, 0xfc6083ba, 0xb8c1a6a2,
+    0x84a145aa, 0x09f5f293, 0x3595119b, 0x71343483, 0x4d54d78b,
+    0xf8767eb3, 0xc4169dbb, 0x80b7b8a3, 0xbcd75bab, 0x416fd090,
+    0x7d0f3398, 0x39ae1680, 0x05cef588, 0xb0ec5cb0, 0x8c8cbfb8,
+    0xc82d9aa0, 0xf44d79a8, 0x7919ce91, 0x45792d99, 0x01d80881,
+    0x3db8eb89, 0x889a42b1, 0xb4faa1b9, 0xf05b84a1, 0xcc3b67a9,
+    0xd05b9496, 0xec3b779e, 0xa89a5286, 0x94fab18e, 0x21d818b6,
+    0x1db8fbbe, 0x5919dea6, 0x65793dae, 0xe82d8a97, 0xd44d699f,
+    0x90ec4c87, 0xac8caf8f, 0x19ae06b7, 0x25cee5bf, 0x616fc0a7,
+    0x5d0f23af, 0xa0b7a894, 0x9cd74b9c, 0xd8766e84, 0xe4168d8c,
+    0x513424b4, 0x6d54c7bc, 0x29f5e2a4, 0x159501ac, 0x98c1b695,
+    0xa4a1559d, 0xe0007085, 0xdc60938d, 0x69423ab5, 0x5522d9bd,
+    0x1183fca5, 0x2de31fad, 0x29421adb, 0x1522f9d3, 0x5183dccb,
+    0x6de33fc3, 0xd8c196fb, 0xe4a175f3, 0xa00050eb, 0x9c60b3e3,
+    0x113404da, 0x2d54e7d2, 0x69f5c2ca, 0x559521c2, 0xe0b788fa,
+    0xdcd76bf2, 0x98764eea, 0xa416ade2, 0x59ae26d9, 0x65cec5d1,
+    0x216fe0c9, 0x1d0f03c1, 0xa82daaf9, 0x944d49f1, 0xd0ec6ce9,
+    0xec8c8fe1, 0x61d838d8, 0x5db8dbd0, 0x1919fec8, 0x25791dc0,
+    0x905bb4f8, 0xac3b57f0, 0xe89a72e8, 0xd4fa91e0, 0xc89a62df,
+    0xf4fa81d7, 0xb05ba4cf, 0x8c3b47c7, 0x3919eeff, 0x05790df7,
+    0x41d828ef, 0x7db8cbe7, 0xf0ec7cde, 0xcc8c9fd6, 0x882dbace,
+    0xb44d59c6, 0x016ff0fe, 0x3d0f13f6, 0x79ae36ee, 0x45ced5e6,
+    0xb8765edd, 0x8416bdd5, 0xc0b798cd, 0xfcd77bc5, 0x49f5d2fd,
+    0x759531f5, 0x313414ed, 0x0d54f7e5, 0x800040dc, 0xbc60a3d4,
+    0xf8c186cc, 0xc4a165c4, 0x7183ccfc, 0x4de32ff4, 0x09420aec,
+    0x3522e9e4},
+   {0x00000000, 0x6307d924, 0xc60fb248, 0xa5086b6c, 0x576e62d1,
+    0x3469bbf5, 0x9161d099, 0xf26609bd, 0xaedcc5a2, 0xcddb1c86,
+    0x68d377ea, 0x0bd4aece, 0xf9b2a773, 0x9ab57e57, 0x3fbd153b,
+    0x5cbacc1f, 0x86c88d05, 0xe5cf5421, 0x40c73f4d, 0x23c0e669,
+    0xd1a6efd4, 0xb2a136f0, 0x17a95d9c, 0x74ae84b8, 0x281448a7,
+    0x4b139183, 0xee1bfaef, 0x8d1c23cb, 0x7f7a2a76, 0x1c7df352,
+    0xb975983e, 0xda72411a, 0xd6e01c4b, 0xb5e7c56f, 0x10efae03,
+    0x73e87727, 0x818e7e9a, 0xe289a7be, 0x4781ccd2, 0x248615f6,
+    0x783cd9e9, 0x1b3b00cd, 0xbe336ba1, 0xdd34b285, 0x2f52bb38,
+    0x4c55621c, 0xe95d0970, 0x8a5ad054, 0x5028914e, 0x332f486a,
+    0x96272306, 0xf520fa22, 0x0746f39f, 0x64412abb, 0xc14941d7,
+    0xa24e98f3, 0xfef454ec, 0x9df38dc8, 0x38fbe6a4, 0x5bfc3f80,
+    0xa99a363d, 0xca9def19, 0x6f958475, 0x0c925d51, 0x76b13ed7,
+    0x15b6e7f3, 0xb0be8c9f, 0xd3b955bb, 0x21df5c06, 0x42d88522,
+    0xe7d0ee4e, 0x84d7376a, 0xd86dfb75, 0xbb6a2251, 0x1e62493d,
+    0x7d659019, 0x8f0399a4, 0xec044080, 0x490c2bec, 0x2a0bf2c8,
+    0xf079b3d2, 0x937e6af6, 0x3676019a, 0x5571d8be, 0xa717d103,
+    0xc4100827, 0x6118634b, 0x021fba6f, 0x5ea57670, 0x3da2af54,
+    0x98aac438, 0xfbad1d1c, 0x09cb14a1, 0x6acccd85, 0xcfc4a6e9,
+    0xacc37fcd, 0xa051229c, 0xc356fbb8, 0x665e90d4, 0x055949f0,
+    0xf73f404d, 0x94389969, 0x3130f205, 0x52372b21, 0x0e8de73e,
+    0x6d8a3e1a, 0xc8825576, 0xab858c52, 0x59e385ef, 0x3ae45ccb,
+    0x9fec37a7, 0xfcebee83, 0x2699af99, 0x459e76bd, 0xe0961dd1,
+    0x8391c4f5, 0x71f7cd48, 0x12f0146c, 0xb7f87f00, 0xd4ffa624,
+    0x88456a3b, 0xeb42b31f, 0x4e4ad873, 0x2d4d0157, 0xdf2b08ea,
+    0xbc2cd1ce, 0x1924baa2, 0x7a236386, 0xed627dae, 0x8e65a48a,
+    0x2b6dcfe6, 0x486a16c2, 0xba0c1f7f, 0xd90bc65b, 0x7c03ad37,
+    0x1f047413, 0x43beb80c, 0x20b96128, 0x85b10a44, 0xe6b6d360,
+    0x14d0dadd, 0x77d703f9, 0xd2df6895, 0xb1d8b1b1, 0x6baaf0ab,
+    0x08ad298f, 0xada542e3, 0xcea29bc7, 0x3cc4927a, 0x5fc34b5e,
+    0xfacb2032, 0x99ccf916, 0xc5763509, 0xa671ec2d, 0x03798741,
+    0x607e5e65, 0x921857d8, 0xf11f8efc, 0x5417e590, 0x37103cb4,
+    0x3b8261e5, 0x5885b8c1, 0xfd8dd3ad, 0x9e8a0a89, 0x6cec0334,
+    0x0febda10, 0xaae3b17c, 0xc9e46858, 0x955ea447, 0xf6597d63,
+    0x5351160f, 0x3056cf2b, 0xc230c696, 0xa1371fb2, 0x043f74de,
+    0x6738adfa, 0xbd4aece0, 0xde4d35c4, 0x7b455ea8, 0x1842878c,
+    0xea248e31, 0x89235715, 0x2c2b3c79, 0x4f2ce55d, 0x13962942,
+    0x7091f066, 0xd5999b0a, 0xb69e422e, 0x44f84b93, 0x27ff92b7,
+    0x82f7f9db, 0xe1f020ff, 0x9bd34379, 0xf8d49a5d, 0x5ddcf131,
+    0x3edb2815, 0xccbd21a8, 0xafbaf88c, 0x0ab293e0, 0x69b54ac4,
+    0x350f86db, 0x56085fff, 0xf3003493, 0x9007edb7, 0x6261e40a,
+    0x01663d2e, 0xa46e5642, 0xc7698f66, 0x1d1bce7c, 0x7e1c1758,
+    0xdb147c34, 0xb813a510, 0x4a75acad, 0x29727589, 0x8c7a1ee5,
+    0xef7dc7c1, 0xb3c70bde, 0xd0c0d2fa, 0x75c8b996, 0x16cf60b2,
+    0xe4a9690f, 0x87aeb02b, 0x22a6db47, 0x41a10263, 0x4d335f32,
+    0x2e348616, 0x8b3ced7a, 0xe83b345e, 0x1a5d3de3, 0x795ae4c7,
+    0xdc528fab, 0xbf55568f, 0xe3ef9a90, 0x80e843b4, 0x25e028d8,
+    0x46e7f1fc, 0xb481f841, 0xd7862165, 0x728e4a09, 0x1189932d,
+    0xcbfbd237, 0xa8fc0b13, 0x0df4607f, 0x6ef3b95b, 0x9c95b0e6,
+    0xff9269c2, 0x5a9a02ae, 0x399ddb8a, 0x65271795, 0x0620ceb1,
+    0xa328a5dd, 0xc02f7cf9, 0x32497544, 0x514eac60, 0xf446c70c,
+    0x97411e28},
+   {0x00000000, 0x01b5fd1d, 0x036bfa3a, 0x02de0727, 0x06d7f474,
+    0x07620969, 0x05bc0e4e, 0x0409f353, 0x0dafe8e8, 0x0c1a15f5,
+    0x0ec412d2, 0x0f71efcf, 0x0b781c9c, 0x0acde181, 0x0813e6a6,
+    0x09a61bbb, 0x1b5fd1d0, 0x1aea2ccd, 0x18342bea, 0x1981d6f7,
+    0x1d8825a4, 0x1c3dd8b9, 0x1ee3df9e, 0x1f562283, 0x16f03938,
+    0x1745c425, 0x159bc302, 0x142e3e1f, 0x1027cd4c, 0x11923051,
+    0x134c3776, 0x12f9ca6b, 0x36bfa3a0, 0x370a5ebd, 0x35d4599a,
+    0x3461a487, 0x306857d4, 0x31ddaac9, 0x3303adee, 0x32b650f3,
+    0x3b104b48, 0x3aa5b655, 0x387bb172, 0x39ce4c6f, 0x3dc7bf3c,
+    0x3c724221, 0x3eac4506, 0x3f19b81b, 0x2de07270, 0x2c558f6d,
+    0x2e8b884a, 0x2f3e7557, 0x2b378604, 0x2a827b19, 0x285c7c3e,
+    0x29e98123, 0x204f9a98, 0x21fa6785, 0x232460a2, 0x22919dbf,
+    0x26986eec, 0x272d93f1, 0x25f394d6, 0x244669cb, 0x6d7f4740,
+    0x6ccaba5d, 0x6e14bd7a, 0x6fa14067, 0x6ba8b334, 0x6a1d4e29,
+    0x68c3490e, 0x6976b413, 0x60d0afa8, 0x616552b5, 0x63bb5592,
+    0x620ea88f, 0x66075bdc, 0x67b2a6c1, 0x656ca1e6, 0x64d95cfb,
+    0x76209690, 0x77956b8d, 0x754b6caa, 0x74fe91b7, 0x70f762e4,
+    0x71429ff9, 0x739c98de, 0x722965c3, 0x7b8f7e78, 0x7a3a8365,
+    0x78e48442, 0x7951795f, 0x7d588a0c, 0x7ced7711, 0x7e337036,
+    0x7f868d2b, 0x5bc0e4e0, 0x5a7519fd, 0x58ab1eda, 0x591ee3c7,
+    0x5d171094, 0x5ca2ed89, 0x5e7ceaae, 0x5fc917b3, 0x566f0c08,
+    0x57daf115, 0x5504f632, 0x54b10b2f, 0x50b8f87c, 0x510d0561,
+    0x53d30246, 0x5266ff5b, 0x409f3530, 0x412ac82d, 0x43f4cf0a,
+    0x42413217, 0x4648c144, 0x47fd3c59, 0x45233b7e, 0x4496c663,
+    0x4d30ddd8, 0x4c8520c5, 0x4e5b27e2, 0x4feedaff, 0x4be729ac,
+    0x4a52d4b1, 0x488cd396, 0x49392e8b, 0xdafe8e80, 0xdb4b739d,
+    0xd99574ba, 0xd82089a7, 0xdc297af4, 0xdd9c87e9, 0xdf4280ce,
+    0xdef77dd3, 0xd7516668, 0xd6e49b75, 0xd43a9c52, 0xd58f614f,
+    0xd186921c, 0xd0336f01, 0xd2ed6826, 0xd358953b, 0xc1a15f50,
+    0xc014a24d, 0xc2caa56a, 0xc37f5877, 0xc776ab24, 0xc6c35639,
+    0xc41d511e, 0xc5a8ac03, 0xcc0eb7b8, 0xcdbb4aa5, 0xcf654d82,
+    0xced0b09f, 0xcad943cc, 0xcb6cbed1, 0xc9b2b9f6, 0xc80744eb,
+    0xec412d20, 0xedf4d03d, 0xef2ad71a, 0xee9f2a07, 0xea96d954,
+    0xeb232449, 0xe9fd236e, 0xe848de73, 0xe1eec5c8, 0xe05b38d5,
+    0xe2853ff2, 0xe330c2ef, 0xe73931bc, 0xe68ccca1, 0xe452cb86,
+    0xe5e7369b, 0xf71efcf0, 0xf6ab01ed, 0xf47506ca, 0xf5c0fbd7,
+    0xf1c90884, 0xf07cf599, 0xf2a2f2be, 0xf3170fa3, 0xfab11418,
+    0xfb04e905, 0xf9daee22, 0xf86f133f, 0xfc66e06c, 0xfdd31d71,
+    0xff0d1a56, 0xfeb8e74b, 0xb781c9c0, 0xb63434dd, 0xb4ea33fa,
+    0xb55fcee7, 0xb1563db4, 0xb0e3c0a9, 0xb23dc78e, 0xb3883a93,
+    0xba2e2128, 0xbb9bdc35, 0xb945db12, 0xb8f0260f, 0xbcf9d55c,
+    0xbd4c2841, 0xbf922f66, 0xbe27d27b, 0xacde1810, 0xad6be50d,
+    0xafb5e22a, 0xae001f37, 0xaa09ec64, 0xabbc1179, 0xa962165e,
+    0xa8d7eb43, 0xa171f0f8, 0xa0c40de5, 0xa21a0ac2, 0xa3aff7df,
+    0xa7a6048c, 0xa613f991, 0xa4cdfeb6, 0xa57803ab, 0x813e6a60,
+    0x808b977d, 0x8255905a, 0x83e06d47, 0x87e99e14, 0x865c6309,
+    0x8482642e, 0x85379933, 0x8c918288, 0x8d247f95, 0x8ffa78b2,
+    0x8e4f85af, 0x8a4676fc, 0x8bf38be1, 0x892d8cc6, 0x889871db,
+    0x9a61bbb0, 0x9bd446ad, 0x990a418a, 0x98bfbc97, 0x9cb64fc4,
+    0x9d03b2d9, 0x9fddb5fe, 0x9e6848e3, 0x97ce5358, 0x967bae45,
+    0x94a5a962, 0x9510547f, 0x9119a72c, 0x90ac5a31, 0x92725d16,
+    0x93c7a00b},
+   {0x00000000, 0x6e8c1b41, 0xdd183682, 0xb3942dc3, 0x61416b45,
+    0x0fcd7004, 0xbc595dc7, 0xd2d54686, 0xc282d68a, 0xac0ecdcb,
+    0x1f9ae008, 0x7116fb49, 0xa3c3bdcf, 0xcd4fa68e, 0x7edb8b4d,
+    0x1057900c, 0x5e74ab55, 0x30f8b014, 0x836c9dd7, 0xede08696,
+    0x3f35c010, 0x51b9db51, 0xe22df692, 0x8ca1edd3, 0x9cf67ddf,
+    0xf27a669e, 0x41ee4b5d, 0x2f62501c, 0xfdb7169a, 0x933b0ddb,
+    0x20af2018, 0x4e233b59, 0xbce956aa, 0xd2654deb, 0x61f16028,
+    0x0f7d7b69, 0xdda83def, 0xb32426ae, 0x00b00b6d, 0x6e3c102c,
+    0x7e6b8020, 0x10e79b61, 0xa373b6a2, 0xcdffade3, 0x1f2aeb65,
+    0x71a6f024, 0xc232dde7, 0xacbec6a6, 0xe29dfdff, 0x8c11e6be,
+    0x3f85cb7d, 0x5109d03c, 0x83dc96ba, 0xed508dfb, 0x5ec4a038,
+    0x3048bb79, 0x201f2b75, 0x4e933034, 0xfd071df7, 0x938b06b6,
+    0x415e4030, 0x2fd25b71, 0x9c4676b2, 0xf2ca6df3, 0xa2a3ab15,
+    0xcc2fb054, 0x7fbb9d97, 0x113786d6, 0xc3e2c050, 0xad6edb11,
+    0x1efaf6d2, 0x7076ed93, 0x60217d9f, 0x0ead66de, 0xbd394b1d,
+    0xd3b5505c, 0x016016da, 0x6fec0d9b, 0xdc782058, 0xb2f43b19,
+    0xfcd70040, 0x925b1b01, 0x21cf36c2, 0x4f432d83, 0x9d966b05,
+    0xf31a7044, 0x408e5d87, 0x2e0246c6, 0x3e55d6ca, 0x50d9cd8b,
+    0xe34de048, 0x8dc1fb09, 0x5f14bd8f, 0x3198a6ce, 0x820c8b0d,
+    0xec80904c, 0x1e4afdbf, 0x70c6e6fe, 0xc352cb3d, 0xadded07c,
+    0x7f0b96fa, 0x11878dbb, 0xa213a078, 0xcc9fbb39, 0xdcc82b35,
+    0xb2443074, 0x01d01db7, 0x6f5c06f6, 0xbd894070, 0xd3055b31,
+    0x609176f2, 0x0e1d6db3, 0x403e56ea, 0x2eb24dab, 0x9d266068,
+    0xf3aa7b29, 0x217f3daf, 0x4ff326ee, 0xfc670b2d, 0x92eb106c,
+    0x82bc8060, 0xec309b21, 0x5fa4b6e2, 0x3128ada3, 0xe3fdeb25,
+    0x8d71f064, 0x3ee5dda7, 0x5069c6e6, 0x9e36506b, 0xf0ba4b2a,
+    0x432e66e9, 0x2da27da8, 0xff773b2e, 0x91fb206f, 0x226f0dac,
+    0x4ce316ed, 0x5cb486e1, 0x32389da0, 0x81acb063, 0xef20ab22,
+    0x3df5eda4, 0x5379f6e5, 0xe0eddb26, 0x8e61c067, 0xc042fb3e,
+    0xaecee07f, 0x1d5acdbc, 0x73d6d6fd, 0xa103907b, 0xcf8f8b3a,
+    0x7c1ba6f9, 0x1297bdb8, 0x02c02db4, 0x6c4c36f5, 0xdfd81b36,
+    0xb1540077, 0x638146f1, 0x0d0d5db0, 0xbe997073, 0xd0156b32,
+    0x22df06c1, 0x4c531d80, 0xffc73043, 0x914b2b02, 0x439e6d84,
+    0x2d1276c5, 0x9e865b06, 0xf00a4047, 0xe05dd04b, 0x8ed1cb0a,
+    0x3d45e6c9, 0x53c9fd88, 0x811cbb0e, 0xef90a04f, 0x5c048d8c,
+    0x328896cd, 0x7cabad94, 0x1227b6d5, 0xa1b39b16, 0xcf3f8057,
+    0x1deac6d1, 0x7366dd90, 0xc0f2f053, 0xae7eeb12, 0xbe297b1e,
+    0xd0a5605f, 0x63314d9c, 0x0dbd56dd, 0xdf68105b, 0xb1e40b1a,
+    0x027026d9, 0x6cfc3d98, 0x3c95fb7e, 0x5219e03f, 0xe18dcdfc,
+    0x8f01d6bd, 0x5dd4903b, 0x33588b7a, 0x80cca6b9, 0xee40bdf8,
+    0xfe172df4, 0x909b36b5, 0x230f1b76, 0x4d830037, 0x9f5646b1,
+    0xf1da5df0, 0x424e7033, 0x2cc26b72, 0x62e1502b, 0x0c6d4b6a,
+    0xbff966a9, 0xd1757de8, 0x03a03b6e, 0x6d2c202f, 0xdeb80dec,
+    0xb03416ad, 0xa06386a1, 0xceef9de0, 0x7d7bb023, 0x13f7ab62,
+    0xc122ede4, 0xafaef6a5, 0x1c3adb66, 0x72b6c027, 0x807cadd4,
+    0xeef0b695, 0x5d649b56, 0x33e88017, 0xe13dc691, 0x8fb1ddd0,
+    0x3c25f013, 0x52a9eb52, 0x42fe7b5e, 0x2c72601f, 0x9fe64ddc,
+    0xf16a569d, 0x23bf101b, 0x4d330b5a, 0xfea72699, 0x902b3dd8,
+    0xde080681, 0xb0841dc0, 0x03103003, 0x6d9c2b42, 0xbf496dc4,
+    0xd1c57685, 0x62515b46, 0x0cdd4007, 0x1c8ad00b, 0x7206cb4a,
+    0xc192e689, 0xaf1efdc8, 0x7dcbbb4e, 0x1347a00f, 0xa0d38dcc,
+    0xce5f968d},
+   {0x00000000, 0xe71da697, 0x154a4b6f, 0xf257edf8, 0x2a9496de,
+    0xcd893049, 0x3fdeddb1, 0xd8c37b26, 0x55292dbc, 0xb2348b2b,
+    0x406366d3, 0xa77ec044, 0x7fbdbb62, 0x98a01df5, 0x6af7f00d,
+    0x8dea569a, 0xaa525b78, 0x4d4ffdef, 0xbf181017, 0x5805b680,
+    0x80c6cda6, 0x67db6b31, 0x958c86c9, 0x7291205e, 0xff7b76c4,
+    0x1866d053, 0xea313dab, 0x0d2c9b3c, 0xd5efe01a, 0x32f2468d,
+    0xc0a5ab75, 0x27b80de2, 0x8fd5b0b1, 0x68c81626, 0x9a9ffbde,
+    0x7d825d49, 0xa541266f, 0x425c80f8, 0xb00b6d00, 0x5716cb97,
+    0xdafc9d0d, 0x3de13b9a, 0xcfb6d662, 0x28ab70f5, 0xf0680bd3,
+    0x1775ad44, 0xe52240bc, 0x023fe62b, 0x2587ebc9, 0xc29a4d5e,
+    0x30cda0a6, 0xd7d00631, 0x0f137d17, 0xe80edb80, 0x1a593678,
+    0xfd4490ef, 0x70aec675, 0x97b360e2, 0x65e48d1a, 0x82f92b8d,
+    0x5a3a50ab, 0xbd27f63c, 0x4f701bc4, 0xa86dbd53, 0xc4da6723,
+    0x23c7c1b4, 0xd1902c4c, 0x368d8adb, 0xee4ef1fd, 0x0953576a,
+    0xfb04ba92, 0x1c191c05, 0x91f34a9f, 0x76eeec08, 0x84b901f0,
+    0x63a4a767, 0xbb67dc41, 0x5c7a7ad6, 0xae2d972e, 0x493031b9,
+    0x6e883c5b, 0x89959acc, 0x7bc27734, 0x9cdfd1a3, 0x441caa85,
+    0xa3010c12, 0x5156e1ea, 0xb64b477d, 0x3ba111e7, 0xdcbcb770,
+    0x2eeb5a88, 0xc9f6fc1f, 0x11358739, 0xf62821ae, 0x047fcc56,
+    0xe3626ac1, 0x4b0fd792, 0xac127105, 0x5e459cfd, 0xb9583a6a,
+    0x619b414c, 0x8686e7db, 0x74d10a23, 0x93ccacb4, 0x1e26fa2e,
+    0xf93b5cb9, 0x0b6cb141, 0xec7117d6, 0x34b26cf0, 0xd3afca67,
+    0x21f8279f, 0xc6e58108, 0xe15d8cea, 0x06402a7d, 0xf417c785,
+    0x130a6112, 0xcbc91a34, 0x2cd4bca3, 0xde83515b, 0x399ef7cc,
+    0xb474a156, 0x536907c1, 0xa13eea39, 0x46234cae, 0x9ee03788,
+    0x79fd911f, 0x8baa7ce7, 0x6cb7da70, 0x52c5c807, 0xb5d86e90,
+    0x478f8368, 0xa09225ff, 0x78515ed9, 0x9f4cf84e, 0x6d1b15b6,
+    0x8a06b321, 0x07ece5bb, 0xe0f1432c, 0x12a6aed4, 0xf5bb0843,
+    0x2d787365, 0xca65d5f2, 0x3832380a, 0xdf2f9e9d, 0xf897937f,
+    0x1f8a35e8, 0xedddd810, 0x0ac07e87, 0xd20305a1, 0x351ea336,
+    0xc7494ece, 0x2054e859, 0xadbebec3, 0x4aa31854, 0xb8f4f5ac,
+    0x5fe9533b, 0x872a281d, 0x60378e8a, 0x92606372, 0x757dc5e5,
+    0xdd1078b6, 0x3a0dde21, 0xc85a33d9, 0x2f47954e, 0xf784ee68,
+    0x109948ff, 0xe2cea507, 0x05d30390, 0x8839550a, 0x6f24f39d,
+    0x9d731e65, 0x7a6eb8f2, 0xa2adc3d4, 0x45b06543, 0xb7e788bb,
+    0x50fa2e2c, 0x774223ce, 0x905f8559, 0x620868a1, 0x8515ce36,
+    0x5dd6b510, 0xbacb1387, 0x489cfe7f, 0xaf8158e8, 0x226b0e72,
+    0xc576a8e5, 0x3721451d, 0xd03ce38a, 0x08ff98ac, 0xefe23e3b,
+    0x1db5d3c3, 0xfaa87554, 0x961faf24, 0x710209b3, 0x8355e44b,
+    0x644842dc, 0xbc8b39fa, 0x5b969f6d, 0xa9c17295, 0x4edcd402,
+    0xc3368298, 0x242b240f, 0xd67cc9f7, 0x31616f60, 0xe9a21446,
+    0x0ebfb2d1, 0xfce85f29, 0x1bf5f9be, 0x3c4df45c, 0xdb5052cb,
+    0x2907bf33, 0xce1a19a4, 0x16d96282, 0xf1c4c415, 0x039329ed,
+    0xe48e8f7a, 0x6964d9e0, 0x8e797f77, 0x7c2e928f, 0x9b333418,
+    0x43f04f3e, 0xa4ede9a9, 0x56ba0451, 0xb1a7a2c6, 0x19ca1f95,
+    0xfed7b902, 0x0c8054fa, 0xeb9df26d, 0x335e894b, 0xd4432fdc,
+    0x2614c224, 0xc10964b3, 0x4ce33229, 0xabfe94be, 0x59a97946,
+    0xbeb4dfd1, 0x6677a4f7, 0x816a0260, 0x733def98, 0x9420490f,
+    0xb39844ed, 0x5485e27a, 0xa6d20f82, 0x41cfa915, 0x990cd233,
+    0x7e1174a4, 0x8c46995c, 0x6b5b3fcb, 0xe6b16951, 0x01accfc6,
+    0xf3fb223e, 0x14e684a9, 0xcc25ff8f, 0x2b385918, 0xd96fb4e0,
+    0x3e721277},
+   {0x00000000, 0xa58b900e, 0x9066265d, 0x35edb653, 0xfbbd4afb,
+    0x5e36daf5, 0x6bdb6ca6, 0xce50fca8, 0x2c0b93b7, 0x898003b9,
+    0xbc6db5ea, 0x19e625e4, 0xd7b6d94c, 0x723d4942, 0x47d0ff11,
+    0xe25b6f1f, 0x5817276e, 0xfd9cb760, 0xc8710133, 0x6dfa913d,
+    0xa3aa6d95, 0x0621fd9b, 0x33cc4bc8, 0x9647dbc6, 0x741cb4d9,
+    0xd19724d7, 0xe47a9284, 0x41f1028a, 0x8fa1fe22, 0x2a2a6e2c,
+    0x1fc7d87f, 0xba4c4871, 0xb02e4edc, 0x15a5ded2, 0x20486881,
+    0x85c3f88f, 0x4b930427, 0xee189429, 0xdbf5227a, 0x7e7eb274,
+    0x9c25dd6b, 0x39ae4d65, 0x0c43fb36, 0xa9c86b38, 0x67989790,
+    0xc213079e, 0xf7feb1cd, 0x527521c3, 0xe83969b2, 0x4db2f9bc,
+    0x785f4fef, 0xddd4dfe1, 0x13842349, 0xb60fb347, 0x83e20514,
+    0x2669951a, 0xc432fa05, 0x61b96a0b, 0x5454dc58, 0xf1df4c56,
+    0x3f8fb0fe, 0x9a0420f0, 0xafe996a3, 0x0a6206ad, 0xbb2d9bf9,
+    0x1ea60bf7, 0x2b4bbda4, 0x8ec02daa, 0x4090d102, 0xe51b410c,
+    0xd0f6f75f, 0x757d6751, 0x9726084e, 0x32ad9840, 0x07402e13,
+    0xa2cbbe1d, 0x6c9b42b5, 0xc910d2bb, 0xfcfd64e8, 0x5976f4e6,
+    0xe33abc97, 0x46b12c99, 0x735c9aca, 0xd6d70ac4, 0x1887f66c,
+    0xbd0c6662, 0x88e1d031, 0x2d6a403f, 0xcf312f20, 0x6ababf2e,
+    0x5f57097d, 0xfadc9973, 0x348c65db, 0x9107f5d5, 0xa4ea4386,
+    0x0161d388, 0x0b03d525, 0xae88452b, 0x9b65f378, 0x3eee6376,
+    0xf0be9fde, 0x55350fd0, 0x60d8b983, 0xc553298d, 0x27084692,
+    0x8283d69c, 0xb76e60cf, 0x12e5f0c1, 0xdcb50c69, 0x793e9c67,
+    0x4cd32a34, 0xe958ba3a, 0x5314f24b, 0xf69f6245, 0xc372d416,
+    0x66f94418, 0xa8a9b8b0, 0x0d2228be, 0x38cf9eed, 0x9d440ee3,
+    0x7f1f61fc, 0xda94f1f2, 0xef7947a1, 0x4af2d7af, 0x84a22b07,
+    0x2129bb09, 0x14c40d5a, 0xb14f9d54, 0xad2a31b3, 0x08a1a1bd,
+    0x3d4c17ee, 0x98c787e0, 0x56977b48, 0xf31ceb46, 0xc6f15d15,
+    0x637acd1b, 0x8121a204, 0x24aa320a, 0x11478459, 0xb4cc1457,
+    0x7a9ce8ff, 0xdf1778f1, 0xeafacea2, 0x4f715eac, 0xf53d16dd,
+    0x50b686d3, 0x655b3080, 0xc0d0a08e, 0x0e805c26, 0xab0bcc28,
+    0x9ee67a7b, 0x3b6dea75, 0xd936856a, 0x7cbd1564, 0x4950a337,
+    0xecdb3339, 0x228bcf91, 0x87005f9f, 0xb2ede9cc, 0x176679c2,
+    0x1d047f6f, 0xb88fef61, 0x8d625932, 0x28e9c93c, 0xe6b93594,
+    0x4332a59a, 0x76df13c9, 0xd35483c7, 0x310fecd8, 0x94847cd6,
+    0xa169ca85, 0x04e25a8b, 0xcab2a623, 0x6f39362d, 0x5ad4807e,
+    0xff5f1070, 0x45135801, 0xe098c80f, 0xd5757e5c, 0x70feee52,
+    0xbeae12fa, 0x1b2582f4, 0x2ec834a7, 0x8b43a4a9, 0x6918cbb6,
+    0xcc935bb8, 0xf97eedeb, 0x5cf57de5, 0x92a5814d, 0x372e1143,
+    0x02c3a710, 0xa748371e, 0x1607aa4a, 0xb38c3a44, 0x86618c17,
+    0x23ea1c19, 0xedbae0b1, 0x483170bf, 0x7ddcc6ec, 0xd85756e2,
+    0x3a0c39fd, 0x9f87a9f3, 0xaa6a1fa0, 0x0fe18fae, 0xc1b17306,
+    0x643ae308, 0x51d7555b, 0xf45cc555, 0x4e108d24, 0xeb9b1d2a,
+    0xde76ab79, 0x7bfd3b77, 0xb5adc7df, 0x102657d1, 0x25cbe182,
+    0x8040718c, 0x621b1e93, 0xc7908e9d, 0xf27d38ce, 0x57f6a8c0,
+    0x99a65468, 0x3c2dc466, 0x09c07235, 0xac4be23b, 0xa629e496,
+    0x03a27498, 0x364fc2cb, 0x93c452c5, 0x5d94ae6d, 0xf81f3e63,
+    0xcdf28830, 0x6879183e, 0x8a227721, 0x2fa9e72f, 0x1a44517c,
+    0xbfcfc172, 0x719f3dda, 0xd414add4, 0xe1f91b87, 0x44728b89,
+    0xfe3ec3f8, 0x5bb553f6, 0x6e58e5a5, 0xcbd375ab, 0x05838903,
+    0xa008190d, 0x95e5af5e, 0x306e3f50, 0xd235504f, 0x77bec041,
+    0x42537612, 0xe7d8e61c, 0x29881ab4, 0x8c038aba, 0xb9ee3ce9,
+    0x1c65ace7}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x0000000000000000, 0x0e908ba500000000, 0x5d26669000000000,
+    0x53b6ed3500000000, 0xfb4abdfb00000000, 0xf5da365e00000000,
+    0xa66cdb6b00000000, 0xa8fc50ce00000000, 0xb7930b2c00000000,
+    0xb903808900000000, 0xeab56dbc00000000, 0xe425e61900000000,
+    0x4cd9b6d700000000, 0x42493d7200000000, 0x11ffd04700000000,
+    0x1f6f5be200000000, 0x6e27175800000000, 0x60b79cfd00000000,
+    0x330171c800000000, 0x3d91fa6d00000000, 0x956daaa300000000,
+    0x9bfd210600000000, 0xc84bcc3300000000, 0xc6db479600000000,
+    0xd9b41c7400000000, 0xd72497d100000000, 0x84927ae400000000,
+    0x8a02f14100000000, 0x22fea18f00000000, 0x2c6e2a2a00000000,
+    0x7fd8c71f00000000, 0x71484cba00000000, 0xdc4e2eb000000000,
+    0xd2dea51500000000, 0x8168482000000000, 0x8ff8c38500000000,
+    0x2704934b00000000, 0x299418ee00000000, 0x7a22f5db00000000,
+    0x74b27e7e00000000, 0x6bdd259c00000000, 0x654dae3900000000,
+    0x36fb430c00000000, 0x386bc8a900000000, 0x9097986700000000,
+    0x9e0713c200000000, 0xcdb1fef700000000, 0xc321755200000000,
+    0xb26939e800000000, 0xbcf9b24d00000000, 0xef4f5f7800000000,
+    0xe1dfd4dd00000000, 0x4923841300000000, 0x47b30fb600000000,
+    0x1405e28300000000, 0x1a95692600000000, 0x05fa32c400000000,
+    0x0b6ab96100000000, 0x58dc545400000000, 0x564cdff100000000,
+    0xfeb08f3f00000000, 0xf020049a00000000, 0xa396e9af00000000,
+    0xad06620a00000000, 0xf99b2dbb00000000, 0xf70ba61e00000000,
+    0xa4bd4b2b00000000, 0xaa2dc08e00000000, 0x02d1904000000000,
+    0x0c411be500000000, 0x5ff7f6d000000000, 0x51677d7500000000,
+    0x4e08269700000000, 0x4098ad3200000000, 0x132e400700000000,
+    0x1dbecba200000000, 0xb5429b6c00000000, 0xbbd210c900000000,
+    0xe864fdfc00000000, 0xe6f4765900000000, 0x97bc3ae300000000,
+    0x992cb14600000000, 0xca9a5c7300000000, 0xc40ad7d600000000,
+    0x6cf6871800000000, 0x62660cbd00000000, 0x31d0e18800000000,
+    0x3f406a2d00000000, 0x202f31cf00000000, 0x2ebfba6a00000000,
+    0x7d09575f00000000, 0x7399dcfa00000000, 0xdb658c3400000000,
+    0xd5f5079100000000, 0x8643eaa400000000, 0x88d3610100000000,
+    0x25d5030b00000000, 0x2b4588ae00000000, 0x78f3659b00000000,
+    0x7663ee3e00000000, 0xde9fbef000000000, 0xd00f355500000000,
+    0x83b9d86000000000, 0x8d2953c500000000, 0x9246082700000000,
+    0x9cd6838200000000, 0xcf606eb700000000, 0xc1f0e51200000000,
+    0x690cb5dc00000000, 0x679c3e7900000000, 0x342ad34c00000000,
+    0x3aba58e900000000, 0x4bf2145300000000, 0x45629ff600000000,
+    0x16d472c300000000, 0x1844f96600000000, 0xb0b8a9a800000000,
+    0xbe28220d00000000, 0xed9ecf3800000000, 0xe30e449d00000000,
+    0xfc611f7f00000000, 0xf2f194da00000000, 0xa14779ef00000000,
+    0xafd7f24a00000000, 0x072ba28400000000, 0x09bb292100000000,
+    0x5a0dc41400000000, 0x549d4fb100000000, 0xb3312aad00000000,
+    0xbda1a10800000000, 0xee174c3d00000000, 0xe087c79800000000,
+    0x487b975600000000, 0x46eb1cf300000000, 0x155df1c600000000,
+    0x1bcd7a6300000000, 0x04a2218100000000, 0x0a32aa2400000000,
+    0x5984471100000000, 0x5714ccb400000000, 0xffe89c7a00000000,
+    0xf17817df00000000, 0xa2cefaea00000000, 0xac5e714f00000000,
+    0xdd163df500000000, 0xd386b65000000000, 0x80305b6500000000,
+    0x8ea0d0c000000000, 0x265c800e00000000, 0x28cc0bab00000000,
+    0x7b7ae69e00000000, 0x75ea6d3b00000000, 0x6a8536d900000000,
+    0x6415bd7c00000000, 0x37a3504900000000, 0x3933dbec00000000,
+    0x91cf8b2200000000, 0x9f5f008700000000, 0xcce9edb200000000,
+    0xc279661700000000, 0x6f7f041d00000000, 0x61ef8fb800000000,
+    0x3259628d00000000, 0x3cc9e92800000000, 0x9435b9e600000000,
+    0x9aa5324300000000, 0xc913df7600000000, 0xc78354d300000000,
+    0xd8ec0f3100000000, 0xd67c849400000000, 0x85ca69a100000000,
+    0x8b5ae20400000000, 0x23a6b2ca00000000, 0x2d36396f00000000,
+    0x7e80d45a00000000, 0x70105fff00000000, 0x0158134500000000,
+    0x0fc898e000000000, 0x5c7e75d500000000, 0x52eefe7000000000,
+    0xfa12aebe00000000, 0xf482251b00000000, 0xa734c82e00000000,
+    0xa9a4438b00000000, 0xb6cb186900000000, 0xb85b93cc00000000,
+    0xebed7ef900000000, 0xe57df55c00000000, 0x4d81a59200000000,
+    0x43112e3700000000, 0x10a7c30200000000, 0x1e3748a700000000,
+    0x4aaa071600000000, 0x443a8cb300000000, 0x178c618600000000,
+    0x191cea2300000000, 0xb1e0baed00000000, 0xbf70314800000000,
+    0xecc6dc7d00000000, 0xe25657d800000000, 0xfd390c3a00000000,
+    0xf3a9879f00000000, 0xa01f6aaa00000000, 0xae8fe10f00000000,
+    0x0673b1c100000000, 0x08e33a6400000000, 0x5b55d75100000000,
+    0x55c55cf400000000, 0x248d104e00000000, 0x2a1d9beb00000000,
+    0x79ab76de00000000, 0x773bfd7b00000000, 0xdfc7adb500000000,
+    0xd157261000000000, 0x82e1cb2500000000, 0x8c71408000000000,
+    0x931e1b6200000000, 0x9d8e90c700000000, 0xce387df200000000,
+    0xc0a8f65700000000, 0x6854a69900000000, 0x66c42d3c00000000,
+    0x3572c00900000000, 0x3be24bac00000000, 0x96e429a600000000,
+    0x9874a20300000000, 0xcbc24f3600000000, 0xc552c49300000000,
+    0x6dae945d00000000, 0x633e1ff800000000, 0x3088f2cd00000000,
+    0x3e18796800000000, 0x2177228a00000000, 0x2fe7a92f00000000,
+    0x7c51441a00000000, 0x72c1cfbf00000000, 0xda3d9f7100000000,
+    0xd4ad14d400000000, 0x871bf9e100000000, 0x898b724400000000,
+    0xf8c33efe00000000, 0xf653b55b00000000, 0xa5e5586e00000000,
+    0xab75d3cb00000000, 0x0389830500000000, 0x0d1908a000000000,
+    0x5eafe59500000000, 0x503f6e3000000000, 0x4f5035d200000000,
+    0x41c0be7700000000, 0x1276534200000000, 0x1ce6d8e700000000,
+    0xb41a882900000000, 0xba8a038c00000000, 0xe93ceeb900000000,
+    0xe7ac651c00000000},
+   {0x0000000000000000, 0x97a61de700000000, 0x6f4b4a1500000000,
+    0xf8ed57f200000000, 0xde96942a00000000, 0x493089cd00000000,
+    0xb1ddde3f00000000, 0x267bc3d800000000, 0xbc2d295500000000,
+    0x2b8b34b200000000, 0xd366634000000000, 0x44c07ea700000000,
+    0x62bbbd7f00000000, 0xf51da09800000000, 0x0df0f76a00000000,
+    0x9a56ea8d00000000, 0x785b52aa00000000, 0xeffd4f4d00000000,
+    0x171018bf00000000, 0x80b6055800000000, 0xa6cdc68000000000,
+    0x316bdb6700000000, 0xc9868c9500000000, 0x5e20917200000000,
+    0xc4767bff00000000, 0x53d0661800000000, 0xab3d31ea00000000,
+    0x3c9b2c0d00000000, 0x1ae0efd500000000, 0x8d46f23200000000,
+    0x75aba5c000000000, 0xe20db82700000000, 0xb1b0d58f00000000,
+    0x2616c86800000000, 0xdefb9f9a00000000, 0x495d827d00000000,
+    0x6f2641a500000000, 0xf8805c4200000000, 0x006d0bb000000000,
+    0x97cb165700000000, 0x0d9dfcda00000000, 0x9a3be13d00000000,
+    0x62d6b6cf00000000, 0xf570ab2800000000, 0xd30b68f000000000,
+    0x44ad751700000000, 0xbc4022e500000000, 0x2be63f0200000000,
+    0xc9eb872500000000, 0x5e4d9ac200000000, 0xa6a0cd3000000000,
+    0x3106d0d700000000, 0x177d130f00000000, 0x80db0ee800000000,
+    0x7836591a00000000, 0xef9044fd00000000, 0x75c6ae7000000000,
+    0xe260b39700000000, 0x1a8de46500000000, 0x8d2bf98200000000,
+    0xab503a5a00000000, 0x3cf627bd00000000, 0xc41b704f00000000,
+    0x53bd6da800000000, 0x2367dac400000000, 0xb4c1c72300000000,
+    0x4c2c90d100000000, 0xdb8a8d3600000000, 0xfdf14eee00000000,
+    0x6a57530900000000, 0x92ba04fb00000000, 0x051c191c00000000,
+    0x9f4af39100000000, 0x08ecee7600000000, 0xf001b98400000000,
+    0x67a7a46300000000, 0x41dc67bb00000000, 0xd67a7a5c00000000,
+    0x2e972dae00000000, 0xb931304900000000, 0x5b3c886e00000000,
+    0xcc9a958900000000, 0x3477c27b00000000, 0xa3d1df9c00000000,
+    0x85aa1c4400000000, 0x120c01a300000000, 0xeae1565100000000,
+    0x7d474bb600000000, 0xe711a13b00000000, 0x70b7bcdc00000000,
+    0x885aeb2e00000000, 0x1ffcf6c900000000, 0x3987351100000000,
+    0xae2128f600000000, 0x56cc7f0400000000, 0xc16a62e300000000,
+    0x92d70f4b00000000, 0x057112ac00000000, 0xfd9c455e00000000,
+    0x6a3a58b900000000, 0x4c419b6100000000, 0xdbe7868600000000,
+    0x230ad17400000000, 0xb4accc9300000000, 0x2efa261e00000000,
+    0xb95c3bf900000000, 0x41b16c0b00000000, 0xd61771ec00000000,
+    0xf06cb23400000000, 0x67caafd300000000, 0x9f27f82100000000,
+    0x0881e5c600000000, 0xea8c5de100000000, 0x7d2a400600000000,
+    0x85c717f400000000, 0x12610a1300000000, 0x341ac9cb00000000,
+    0xa3bcd42c00000000, 0x5b5183de00000000, 0xccf79e3900000000,
+    0x56a174b400000000, 0xc107695300000000, 0x39ea3ea100000000,
+    0xae4c234600000000, 0x8837e09e00000000, 0x1f91fd7900000000,
+    0xe77caa8b00000000, 0x70dab76c00000000, 0x07c8c55200000000,
+    0x906ed8b500000000, 0x68838f4700000000, 0xff2592a000000000,
+    0xd95e517800000000, 0x4ef84c9f00000000, 0xb6151b6d00000000,
+    0x21b3068a00000000, 0xbbe5ec0700000000, 0x2c43f1e000000000,
+    0xd4aea61200000000, 0x4308bbf500000000, 0x6573782d00000000,
+    0xf2d565ca00000000, 0x0a38323800000000, 0x9d9e2fdf00000000,
+    0x7f9397f800000000, 0xe8358a1f00000000, 0x10d8dded00000000,
+    0x877ec00a00000000, 0xa10503d200000000, 0x36a31e3500000000,
+    0xce4e49c700000000, 0x59e8542000000000, 0xc3bebead00000000,
+    0x5418a34a00000000, 0xacf5f4b800000000, 0x3b53e95f00000000,
+    0x1d282a8700000000, 0x8a8e376000000000, 0x7263609200000000,
+    0xe5c57d7500000000, 0xb67810dd00000000, 0x21de0d3a00000000,
+    0xd9335ac800000000, 0x4e95472f00000000, 0x68ee84f700000000,
+    0xff48991000000000, 0x07a5cee200000000, 0x9003d30500000000,
+    0x0a55398800000000, 0x9df3246f00000000, 0x651e739d00000000,
+    0xf2b86e7a00000000, 0xd4c3ada200000000, 0x4365b04500000000,
+    0xbb88e7b700000000, 0x2c2efa5000000000, 0xce23427700000000,
+    0x59855f9000000000, 0xa168086200000000, 0x36ce158500000000,
+    0x10b5d65d00000000, 0x8713cbba00000000, 0x7ffe9c4800000000,
+    0xe85881af00000000, 0x720e6b2200000000, 0xe5a876c500000000,
+    0x1d45213700000000, 0x8ae33cd000000000, 0xac98ff0800000000,
+    0x3b3ee2ef00000000, 0xc3d3b51d00000000, 0x5475a8fa00000000,
+    0x24af1f9600000000, 0xb309027100000000, 0x4be4558300000000,
+    0xdc42486400000000, 0xfa398bbc00000000, 0x6d9f965b00000000,
+    0x9572c1a900000000, 0x02d4dc4e00000000, 0x988236c300000000,
+    0x0f242b2400000000, 0xf7c97cd600000000, 0x606f613100000000,
+    0x4614a2e900000000, 0xd1b2bf0e00000000, 0x295fe8fc00000000,
+    0xbef9f51b00000000, 0x5cf44d3c00000000, 0xcb5250db00000000,
+    0x33bf072900000000, 0xa4191ace00000000, 0x8262d91600000000,
+    0x15c4c4f100000000, 0xed29930300000000, 0x7a8f8ee400000000,
+    0xe0d9646900000000, 0x777f798e00000000, 0x8f922e7c00000000,
+    0x1834339b00000000, 0x3e4ff04300000000, 0xa9e9eda400000000,
+    0x5104ba5600000000, 0xc6a2a7b100000000, 0x951fca1900000000,
+    0x02b9d7fe00000000, 0xfa54800c00000000, 0x6df29deb00000000,
+    0x4b895e3300000000, 0xdc2f43d400000000, 0x24c2142600000000,
+    0xb36409c100000000, 0x2932e34c00000000, 0xbe94feab00000000,
+    0x4679a95900000000, 0xd1dfb4be00000000, 0xf7a4776600000000,
+    0x60026a8100000000, 0x98ef3d7300000000, 0x0f49209400000000,
+    0xed4498b300000000, 0x7ae2855400000000, 0x820fd2a600000000,
+    0x15a9cf4100000000, 0x33d20c9900000000, 0xa474117e00000000,
+    0x5c99468c00000000, 0xcb3f5b6b00000000, 0x5169b1e600000000,
+    0xc6cfac0100000000, 0x3e22fbf300000000, 0xa984e61400000000,
+    0x8fff25cc00000000, 0x1859382b00000000, 0xe0b46fd900000000,
+    0x7712723e00000000},
+   {0x0000000000000000, 0x411b8c6e00000000, 0x823618dd00000000,
+    0xc32d94b300000000, 0x456b416100000000, 0x0470cd0f00000000,
+    0xc75d59bc00000000, 0x8646d5d200000000, 0x8ad682c200000000,
+    0xcbcd0eac00000000, 0x08e09a1f00000000, 0x49fb167100000000,
+    0xcfbdc3a300000000, 0x8ea64fcd00000000, 0x4d8bdb7e00000000,
+    0x0c90571000000000, 0x55ab745e00000000, 0x14b0f83000000000,
+    0xd79d6c8300000000, 0x9686e0ed00000000, 0x10c0353f00000000,
+    0x51dbb95100000000, 0x92f62de200000000, 0xd3eda18c00000000,
+    0xdf7df69c00000000, 0x9e667af200000000, 0x5d4bee4100000000,
+    0x1c50622f00000000, 0x9a16b7fd00000000, 0xdb0d3b9300000000,
+    0x1820af2000000000, 0x593b234e00000000, 0xaa56e9bc00000000,
+    0xeb4d65d200000000, 0x2860f16100000000, 0x697b7d0f00000000,
+    0xef3da8dd00000000, 0xae2624b300000000, 0x6d0bb00000000000,
+    0x2c103c6e00000000, 0x20806b7e00000000, 0x619be71000000000,
+    0xa2b673a300000000, 0xe3adffcd00000000, 0x65eb2a1f00000000,
+    0x24f0a67100000000, 0xe7dd32c200000000, 0xa6c6beac00000000,
+    0xfffd9de200000000, 0xbee6118c00000000, 0x7dcb853f00000000,
+    0x3cd0095100000000, 0xba96dc8300000000, 0xfb8d50ed00000000,
+    0x38a0c45e00000000, 0x79bb483000000000, 0x752b1f2000000000,
+    0x3430934e00000000, 0xf71d07fd00000000, 0xb6068b9300000000,
+    0x30405e4100000000, 0x715bd22f00000000, 0xb276469c00000000,
+    0xf36dcaf200000000, 0x15aba3a200000000, 0x54b02fcc00000000,
+    0x979dbb7f00000000, 0xd686371100000000, 0x50c0e2c300000000,
+    0x11db6ead00000000, 0xd2f6fa1e00000000, 0x93ed767000000000,
+    0x9f7d216000000000, 0xde66ad0e00000000, 0x1d4b39bd00000000,
+    0x5c50b5d300000000, 0xda16600100000000, 0x9b0dec6f00000000,
+    0x582078dc00000000, 0x193bf4b200000000, 0x4000d7fc00000000,
+    0x011b5b9200000000, 0xc236cf2100000000, 0x832d434f00000000,
+    0x056b969d00000000, 0x44701af300000000, 0x875d8e4000000000,
+    0xc646022e00000000, 0xcad6553e00000000, 0x8bcdd95000000000,
+    0x48e04de300000000, 0x09fbc18d00000000, 0x8fbd145f00000000,
+    0xcea6983100000000, 0x0d8b0c8200000000, 0x4c9080ec00000000,
+    0xbffd4a1e00000000, 0xfee6c67000000000, 0x3dcb52c300000000,
+    0x7cd0dead00000000, 0xfa960b7f00000000, 0xbb8d871100000000,
+    0x78a013a200000000, 0x39bb9fcc00000000, 0x352bc8dc00000000,
+    0x743044b200000000, 0xb71dd00100000000, 0xf6065c6f00000000,
+    0x704089bd00000000, 0x315b05d300000000, 0xf276916000000000,
+    0xb36d1d0e00000000, 0xea563e4000000000, 0xab4db22e00000000,
+    0x6860269d00000000, 0x297baaf300000000, 0xaf3d7f2100000000,
+    0xee26f34f00000000, 0x2d0b67fc00000000, 0x6c10eb9200000000,
+    0x6080bc8200000000, 0x219b30ec00000000, 0xe2b6a45f00000000,
+    0xa3ad283100000000, 0x25ebfde300000000, 0x64f0718d00000000,
+    0xa7dde53e00000000, 0xe6c6695000000000, 0x6b50369e00000000,
+    0x2a4bbaf000000000, 0xe9662e4300000000, 0xa87da22d00000000,
+    0x2e3b77ff00000000, 0x6f20fb9100000000, 0xac0d6f2200000000,
+    0xed16e34c00000000, 0xe186b45c00000000, 0xa09d383200000000,
+    0x63b0ac8100000000, 0x22ab20ef00000000, 0xa4edf53d00000000,
+    0xe5f6795300000000, 0x26dbede000000000, 0x67c0618e00000000,
+    0x3efb42c000000000, 0x7fe0ceae00000000, 0xbccd5a1d00000000,
+    0xfdd6d67300000000, 0x7b9003a100000000, 0x3a8b8fcf00000000,
+    0xf9a61b7c00000000, 0xb8bd971200000000, 0xb42dc00200000000,
+    0xf5364c6c00000000, 0x361bd8df00000000, 0x770054b100000000,
+    0xf146816300000000, 0xb05d0d0d00000000, 0x737099be00000000,
+    0x326b15d000000000, 0xc106df2200000000, 0x801d534c00000000,
+    0x4330c7ff00000000, 0x022b4b9100000000, 0x846d9e4300000000,
+    0xc576122d00000000, 0x065b869e00000000, 0x47400af000000000,
+    0x4bd05de000000000, 0x0acbd18e00000000, 0xc9e6453d00000000,
+    0x88fdc95300000000, 0x0ebb1c8100000000, 0x4fa090ef00000000,
+    0x8c8d045c00000000, 0xcd96883200000000, 0x94adab7c00000000,
+    0xd5b6271200000000, 0x169bb3a100000000, 0x57803fcf00000000,
+    0xd1c6ea1d00000000, 0x90dd667300000000, 0x53f0f2c000000000,
+    0x12eb7eae00000000, 0x1e7b29be00000000, 0x5f60a5d000000000,
+    0x9c4d316300000000, 0xdd56bd0d00000000, 0x5b1068df00000000,
+    0x1a0be4b100000000, 0xd926700200000000, 0x983dfc6c00000000,
+    0x7efb953c00000000, 0x3fe0195200000000, 0xfccd8de100000000,
+    0xbdd6018f00000000, 0x3b90d45d00000000, 0x7a8b583300000000,
+    0xb9a6cc8000000000, 0xf8bd40ee00000000, 0xf42d17fe00000000,
+    0xb5369b9000000000, 0x761b0f2300000000, 0x3700834d00000000,
+    0xb146569f00000000, 0xf05ddaf100000000, 0x33704e4200000000,
+    0x726bc22c00000000, 0x2b50e16200000000, 0x6a4b6d0c00000000,
+    0xa966f9bf00000000, 0xe87d75d100000000, 0x6e3ba00300000000,
+    0x2f202c6d00000000, 0xec0db8de00000000, 0xad1634b000000000,
+    0xa18663a000000000, 0xe09defce00000000, 0x23b07b7d00000000,
+    0x62abf71300000000, 0xe4ed22c100000000, 0xa5f6aeaf00000000,
+    0x66db3a1c00000000, 0x27c0b67200000000, 0xd4ad7c8000000000,
+    0x95b6f0ee00000000, 0x569b645d00000000, 0x1780e83300000000,
+    0x91c63de100000000, 0xd0ddb18f00000000, 0x13f0253c00000000,
+    0x52eba95200000000, 0x5e7bfe4200000000, 0x1f60722c00000000,
+    0xdc4de69f00000000, 0x9d566af100000000, 0x1b10bf2300000000,
+    0x5a0b334d00000000, 0x9926a7fe00000000, 0xd83d2b9000000000,
+    0x810608de00000000, 0xc01d84b000000000, 0x0330100300000000,
+    0x422b9c6d00000000, 0xc46d49bf00000000, 0x8576c5d100000000,
+    0x465b516200000000, 0x0740dd0c00000000, 0x0bd08a1c00000000,
+    0x4acb067200000000, 0x89e692c100000000, 0xc8fd1eaf00000000,
+    0x4ebbcb7d00000000, 0x0fa0471300000000, 0xcc8dd3a000000000,
+    0x8d965fce00000000},
+   {0x0000000000000000, 0x1dfdb50100000000, 0x3afa6b0300000000,
+    0x2707de0200000000, 0x74f4d70600000000, 0x6909620700000000,
+    0x4e0ebc0500000000, 0x53f3090400000000, 0xe8e8af0d00000000,
+    0xf5151a0c00000000, 0xd212c40e00000000, 0xcfef710f00000000,
+    0x9c1c780b00000000, 0x81e1cd0a00000000, 0xa6e6130800000000,
+    0xbb1ba60900000000, 0xd0d15f1b00000000, 0xcd2cea1a00000000,
+    0xea2b341800000000, 0xf7d6811900000000, 0xa425881d00000000,
+    0xb9d83d1c00000000, 0x9edfe31e00000000, 0x8322561f00000000,
+    0x3839f01600000000, 0x25c4451700000000, 0x02c39b1500000000,
+    0x1f3e2e1400000000, 0x4ccd271000000000, 0x5130921100000000,
+    0x76374c1300000000, 0x6bcaf91200000000, 0xa0a3bf3600000000,
+    0xbd5e0a3700000000, 0x9a59d43500000000, 0x87a4613400000000,
+    0xd457683000000000, 0xc9aadd3100000000, 0xeead033300000000,
+    0xf350b63200000000, 0x484b103b00000000, 0x55b6a53a00000000,
+    0x72b17b3800000000, 0x6f4cce3900000000, 0x3cbfc73d00000000,
+    0x2142723c00000000, 0x0645ac3e00000000, 0x1bb8193f00000000,
+    0x7072e02d00000000, 0x6d8f552c00000000, 0x4a888b2e00000000,
+    0x57753e2f00000000, 0x0486372b00000000, 0x197b822a00000000,
+    0x3e7c5c2800000000, 0x2381e92900000000, 0x989a4f2000000000,
+    0x8567fa2100000000, 0xa260242300000000, 0xbf9d912200000000,
+    0xec6e982600000000, 0xf1932d2700000000, 0xd694f32500000000,
+    0xcb69462400000000, 0x40477f6d00000000, 0x5dbaca6c00000000,
+    0x7abd146e00000000, 0x6740a16f00000000, 0x34b3a86b00000000,
+    0x294e1d6a00000000, 0x0e49c36800000000, 0x13b4766900000000,
+    0xa8afd06000000000, 0xb552656100000000, 0x9255bb6300000000,
+    0x8fa80e6200000000, 0xdc5b076600000000, 0xc1a6b26700000000,
+    0xe6a16c6500000000, 0xfb5cd96400000000, 0x9096207600000000,
+    0x8d6b957700000000, 0xaa6c4b7500000000, 0xb791fe7400000000,
+    0xe462f77000000000, 0xf99f427100000000, 0xde989c7300000000,
+    0xc365297200000000, 0x787e8f7b00000000, 0x65833a7a00000000,
+    0x4284e47800000000, 0x5f79517900000000, 0x0c8a587d00000000,
+    0x1177ed7c00000000, 0x3670337e00000000, 0x2b8d867f00000000,
+    0xe0e4c05b00000000, 0xfd19755a00000000, 0xda1eab5800000000,
+    0xc7e31e5900000000, 0x9410175d00000000, 0x89eda25c00000000,
+    0xaeea7c5e00000000, 0xb317c95f00000000, 0x080c6f5600000000,
+    0x15f1da5700000000, 0x32f6045500000000, 0x2f0bb15400000000,
+    0x7cf8b85000000000, 0x61050d5100000000, 0x4602d35300000000,
+    0x5bff665200000000, 0x30359f4000000000, 0x2dc82a4100000000,
+    0x0acff44300000000, 0x1732414200000000, 0x44c1484600000000,
+    0x593cfd4700000000, 0x7e3b234500000000, 0x63c6964400000000,
+    0xd8dd304d00000000, 0xc520854c00000000, 0xe2275b4e00000000,
+    0xffdaee4f00000000, 0xac29e74b00000000, 0xb1d4524a00000000,
+    0x96d38c4800000000, 0x8b2e394900000000, 0x808efeda00000000,
+    0x9d734bdb00000000, 0xba7495d900000000, 0xa78920d800000000,
+    0xf47a29dc00000000, 0xe9879cdd00000000, 0xce8042df00000000,
+    0xd37df7de00000000, 0x686651d700000000, 0x759be4d600000000,
+    0x529c3ad400000000, 0x4f618fd500000000, 0x1c9286d100000000,
+    0x016f33d000000000, 0x2668edd200000000, 0x3b9558d300000000,
+    0x505fa1c100000000, 0x4da214c000000000, 0x6aa5cac200000000,
+    0x77587fc300000000, 0x24ab76c700000000, 0x3956c3c600000000,
+    0x1e511dc400000000, 0x03aca8c500000000, 0xb8b70ecc00000000,
+    0xa54abbcd00000000, 0x824d65cf00000000, 0x9fb0d0ce00000000,
+    0xcc43d9ca00000000, 0xd1be6ccb00000000, 0xf6b9b2c900000000,
+    0xeb4407c800000000, 0x202d41ec00000000, 0x3dd0f4ed00000000,
+    0x1ad72aef00000000, 0x072a9fee00000000, 0x54d996ea00000000,
+    0x492423eb00000000, 0x6e23fde900000000, 0x73de48e800000000,
+    0xc8c5eee100000000, 0xd5385be000000000, 0xf23f85e200000000,
+    0xefc230e300000000, 0xbc3139e700000000, 0xa1cc8ce600000000,
+    0x86cb52e400000000, 0x9b36e7e500000000, 0xf0fc1ef700000000,
+    0xed01abf600000000, 0xca0675f400000000, 0xd7fbc0f500000000,
+    0x8408c9f100000000, 0x99f57cf000000000, 0xbef2a2f200000000,
+    0xa30f17f300000000, 0x1814b1fa00000000, 0x05e904fb00000000,
+    0x22eedaf900000000, 0x3f136ff800000000, 0x6ce066fc00000000,
+    0x711dd3fd00000000, 0x561a0dff00000000, 0x4be7b8fe00000000,
+    0xc0c981b700000000, 0xdd3434b600000000, 0xfa33eab400000000,
+    0xe7ce5fb500000000, 0xb43d56b100000000, 0xa9c0e3b000000000,
+    0x8ec73db200000000, 0x933a88b300000000, 0x28212eba00000000,
+    0x35dc9bbb00000000, 0x12db45b900000000, 0x0f26f0b800000000,
+    0x5cd5f9bc00000000, 0x41284cbd00000000, 0x662f92bf00000000,
+    0x7bd227be00000000, 0x1018deac00000000, 0x0de56bad00000000,
+    0x2ae2b5af00000000, 0x371f00ae00000000, 0x64ec09aa00000000,
+    0x7911bcab00000000, 0x5e1662a900000000, 0x43ebd7a800000000,
+    0xf8f071a100000000, 0xe50dc4a000000000, 0xc20a1aa200000000,
+    0xdff7afa300000000, 0x8c04a6a700000000, 0x91f913a600000000,
+    0xb6fecda400000000, 0xab0378a500000000, 0x606a3e8100000000,
+    0x7d978b8000000000, 0x5a90558200000000, 0x476de08300000000,
+    0x149ee98700000000, 0x09635c8600000000, 0x2e64828400000000,
+    0x3399378500000000, 0x8882918c00000000, 0x957f248d00000000,
+    0xb278fa8f00000000, 0xaf854f8e00000000, 0xfc76468a00000000,
+    0xe18bf38b00000000, 0xc68c2d8900000000, 0xdb71988800000000,
+    0xb0bb619a00000000, 0xad46d49b00000000, 0x8a410a9900000000,
+    0x97bcbf9800000000, 0xc44fb69c00000000, 0xd9b2039d00000000,
+    0xfeb5dd9f00000000, 0xe348689e00000000, 0x5853ce9700000000,
+    0x45ae7b9600000000, 0x62a9a59400000000, 0x7f54109500000000,
+    0x2ca7199100000000, 0x315aac9000000000, 0x165d729200000000,
+    0x0ba0c79300000000},
+   {0x0000000000000000, 0x24d9076300000000, 0x48b20fc600000000,
+    0x6c6b08a500000000, 0xd1626e5700000000, 0xf5bb693400000000,
+    0x99d0619100000000, 0xbd0966f200000000, 0xa2c5dcae00000000,
+    0x861cdbcd00000000, 0xea77d36800000000, 0xceaed40b00000000,
+    0x73a7b2f900000000, 0x577eb59a00000000, 0x3b15bd3f00000000,
+    0x1fccba5c00000000, 0x058dc88600000000, 0x2154cfe500000000,
+    0x4d3fc74000000000, 0x69e6c02300000000, 0xd4efa6d100000000,
+    0xf036a1b200000000, 0x9c5da91700000000, 0xb884ae7400000000,
+    0xa748142800000000, 0x8391134b00000000, 0xeffa1bee00000000,
+    0xcb231c8d00000000, 0x762a7a7f00000000, 0x52f37d1c00000000,
+    0x3e9875b900000000, 0x1a4172da00000000, 0x4b1ce0d600000000,
+    0x6fc5e7b500000000, 0x03aeef1000000000, 0x2777e87300000000,
+    0x9a7e8e8100000000, 0xbea789e200000000, 0xd2cc814700000000,
+    0xf615862400000000, 0xe9d93c7800000000, 0xcd003b1b00000000,
+    0xa16b33be00000000, 0x85b234dd00000000, 0x38bb522f00000000,
+    0x1c62554c00000000, 0x70095de900000000, 0x54d05a8a00000000,
+    0x4e91285000000000, 0x6a482f3300000000, 0x0623279600000000,
+    0x22fa20f500000000, 0x9ff3460700000000, 0xbb2a416400000000,
+    0xd74149c100000000, 0xf3984ea200000000, 0xec54f4fe00000000,
+    0xc88df39d00000000, 0xa4e6fb3800000000, 0x803ffc5b00000000,
+    0x3d369aa900000000, 0x19ef9dca00000000, 0x7584956f00000000,
+    0x515d920c00000000, 0xd73eb17600000000, 0xf3e7b61500000000,
+    0x9f8cbeb000000000, 0xbb55b9d300000000, 0x065cdf2100000000,
+    0x2285d84200000000, 0x4eeed0e700000000, 0x6a37d78400000000,
+    0x75fb6dd800000000, 0x51226abb00000000, 0x3d49621e00000000,
+    0x1990657d00000000, 0xa499038f00000000, 0x804004ec00000000,
+    0xec2b0c4900000000, 0xc8f20b2a00000000, 0xd2b379f000000000,
+    0xf66a7e9300000000, 0x9a01763600000000, 0xbed8715500000000,
+    0x03d117a700000000, 0x270810c400000000, 0x4b63186100000000,
+    0x6fba1f0200000000, 0x7076a55e00000000, 0x54afa23d00000000,
+    0x38c4aa9800000000, 0x1c1dadfb00000000, 0xa114cb0900000000,
+    0x85cdcc6a00000000, 0xe9a6c4cf00000000, 0xcd7fc3ac00000000,
+    0x9c2251a000000000, 0xb8fb56c300000000, 0xd4905e6600000000,
+    0xf049590500000000, 0x4d403ff700000000, 0x6999389400000000,
+    0x05f2303100000000, 0x212b375200000000, 0x3ee78d0e00000000,
+    0x1a3e8a6d00000000, 0x765582c800000000, 0x528c85ab00000000,
+    0xef85e35900000000, 0xcb5ce43a00000000, 0xa737ec9f00000000,
+    0x83eeebfc00000000, 0x99af992600000000, 0xbd769e4500000000,
+    0xd11d96e000000000, 0xf5c4918300000000, 0x48cdf77100000000,
+    0x6c14f01200000000, 0x007ff8b700000000, 0x24a6ffd400000000,
+    0x3b6a458800000000, 0x1fb342eb00000000, 0x73d84a4e00000000,
+    0x57014d2d00000000, 0xea082bdf00000000, 0xced12cbc00000000,
+    0xa2ba241900000000, 0x8663237a00000000, 0xae7d62ed00000000,
+    0x8aa4658e00000000, 0xe6cf6d2b00000000, 0xc2166a4800000000,
+    0x7f1f0cba00000000, 0x5bc60bd900000000, 0x37ad037c00000000,
+    0x1374041f00000000, 0x0cb8be4300000000, 0x2861b92000000000,
+    0x440ab18500000000, 0x60d3b6e600000000, 0xdddad01400000000,
+    0xf903d77700000000, 0x9568dfd200000000, 0xb1b1d8b100000000,
+    0xabf0aa6b00000000, 0x8f29ad0800000000, 0xe342a5ad00000000,
+    0xc79ba2ce00000000, 0x7a92c43c00000000, 0x5e4bc35f00000000,
+    0x3220cbfa00000000, 0x16f9cc9900000000, 0x093576c500000000,
+    0x2dec71a600000000, 0x4187790300000000, 0x655e7e6000000000,
+    0xd857189200000000, 0xfc8e1ff100000000, 0x90e5175400000000,
+    0xb43c103700000000, 0xe561823b00000000, 0xc1b8855800000000,
+    0xadd38dfd00000000, 0x890a8a9e00000000, 0x3403ec6c00000000,
+    0x10daeb0f00000000, 0x7cb1e3aa00000000, 0x5868e4c900000000,
+    0x47a45e9500000000, 0x637d59f600000000, 0x0f16515300000000,
+    0x2bcf563000000000, 0x96c630c200000000, 0xb21f37a100000000,
+    0xde743f0400000000, 0xfaad386700000000, 0xe0ec4abd00000000,
+    0xc4354dde00000000, 0xa85e457b00000000, 0x8c87421800000000,
+    0x318e24ea00000000, 0x1557238900000000, 0x793c2b2c00000000,
+    0x5de52c4f00000000, 0x4229961300000000, 0x66f0917000000000,
+    0x0a9b99d500000000, 0x2e429eb600000000, 0x934bf84400000000,
+    0xb792ff2700000000, 0xdbf9f78200000000, 0xff20f0e100000000,
+    0x7943d39b00000000, 0x5d9ad4f800000000, 0x31f1dc5d00000000,
+    0x1528db3e00000000, 0xa821bdcc00000000, 0x8cf8baaf00000000,
+    0xe093b20a00000000, 0xc44ab56900000000, 0xdb860f3500000000,
+    0xff5f085600000000, 0x933400f300000000, 0xb7ed079000000000,
+    0x0ae4616200000000, 0x2e3d660100000000, 0x42566ea400000000,
+    0x668f69c700000000, 0x7cce1b1d00000000, 0x58171c7e00000000,
+    0x347c14db00000000, 0x10a513b800000000, 0xadac754a00000000,
+    0x8975722900000000, 0xe51e7a8c00000000, 0xc1c77def00000000,
+    0xde0bc7b300000000, 0xfad2c0d000000000, 0x96b9c87500000000,
+    0xb260cf1600000000, 0x0f69a9e400000000, 0x2bb0ae8700000000,
+    0x47dba62200000000, 0x6302a14100000000, 0x325f334d00000000,
+    0x1686342e00000000, 0x7aed3c8b00000000, 0x5e343be800000000,
+    0xe33d5d1a00000000, 0xc7e45a7900000000, 0xab8f52dc00000000,
+    0x8f5655bf00000000, 0x909aefe300000000, 0xb443e88000000000,
+    0xd828e02500000000, 0xfcf1e74600000000, 0x41f881b400000000,
+    0x652186d700000000, 0x094a8e7200000000, 0x2d93891100000000,
+    0x37d2fbcb00000000, 0x130bfca800000000, 0x7f60f40d00000000,
+    0x5bb9f36e00000000, 0xe6b0959c00000000, 0xc26992ff00000000,
+    0xae029a5a00000000, 0x8adb9d3900000000, 0x9517276500000000,
+    0xb1ce200600000000, 0xdda528a300000000, 0xf97c2fc000000000,
+    0x4475493200000000, 0x60ac4e5100000000, 0x0cc746f400000000,
+    0x281e419700000000},
+   {0x0000000000000000, 0x08e3603c00000000, 0x10c6c17800000000,
+    0x1825a14400000000, 0x208c83f100000000, 0x286fe3cd00000000,
+    0x304a428900000000, 0x38a922b500000000, 0x011e763800000000,
+    0x09fd160400000000, 0x11d8b74000000000, 0x193bd77c00000000,
+    0x2192f5c900000000, 0x297195f500000000, 0x315434b100000000,
+    0x39b7548d00000000, 0x023cec7000000000, 0x0adf8c4c00000000,
+    0x12fa2d0800000000, 0x1a194d3400000000, 0x22b06f8100000000,
+    0x2a530fbd00000000, 0x3276aef900000000, 0x3a95cec500000000,
+    0x03229a4800000000, 0x0bc1fa7400000000, 0x13e45b3000000000,
+    0x1b073b0c00000000, 0x23ae19b900000000, 0x2b4d798500000000,
+    0x3368d8c100000000, 0x3b8bb8fd00000000, 0x0478d8e100000000,
+    0x0c9bb8dd00000000, 0x14be199900000000, 0x1c5d79a500000000,
+    0x24f45b1000000000, 0x2c173b2c00000000, 0x34329a6800000000,
+    0x3cd1fa5400000000, 0x0566aed900000000, 0x0d85cee500000000,
+    0x15a06fa100000000, 0x1d430f9d00000000, 0x25ea2d2800000000,
+    0x2d094d1400000000, 0x352cec5000000000, 0x3dcf8c6c00000000,
+    0x0644349100000000, 0x0ea754ad00000000, 0x1682f5e900000000,
+    0x1e6195d500000000, 0x26c8b76000000000, 0x2e2bd75c00000000,
+    0x360e761800000000, 0x3eed162400000000, 0x075a42a900000000,
+    0x0fb9229500000000, 0x179c83d100000000, 0x1f7fe3ed00000000,
+    0x27d6c15800000000, 0x2f35a16400000000, 0x3710002000000000,
+    0x3ff3601c00000000, 0x49f6c11800000000, 0x4115a12400000000,
+    0x5930006000000000, 0x51d3605c00000000, 0x697a42e900000000,
+    0x619922d500000000, 0x79bc839100000000, 0x715fe3ad00000000,
+    0x48e8b72000000000, 0x400bd71c00000000, 0x582e765800000000,
+    0x50cd166400000000, 0x686434d100000000, 0x608754ed00000000,
+    0x78a2f5a900000000, 0x7041959500000000, 0x4bca2d6800000000,
+    0x43294d5400000000, 0x5b0cec1000000000, 0x53ef8c2c00000000,
+    0x6b46ae9900000000, 0x63a5cea500000000, 0x7b806fe100000000,
+    0x73630fdd00000000, 0x4ad45b5000000000, 0x42373b6c00000000,
+    0x5a129a2800000000, 0x52f1fa1400000000, 0x6a58d8a100000000,
+    0x62bbb89d00000000, 0x7a9e19d900000000, 0x727d79e500000000,
+    0x4d8e19f900000000, 0x456d79c500000000, 0x5d48d88100000000,
+    0x55abb8bd00000000, 0x6d029a0800000000, 0x65e1fa3400000000,
+    0x7dc45b7000000000, 0x75273b4c00000000, 0x4c906fc100000000,
+    0x44730ffd00000000, 0x5c56aeb900000000, 0x54b5ce8500000000,
+    0x6c1cec3000000000, 0x64ff8c0c00000000, 0x7cda2d4800000000,
+    0x74394d7400000000, 0x4fb2f58900000000, 0x475195b500000000,
+    0x5f7434f100000000, 0x579754cd00000000, 0x6f3e767800000000,
+    0x67dd164400000000, 0x7ff8b70000000000, 0x771bd73c00000000,
+    0x4eac83b100000000, 0x464fe38d00000000, 0x5e6a42c900000000,
+    0x568922f500000000, 0x6e20004000000000, 0x66c3607c00000000,
+    0x7ee6c13800000000, 0x7605a10400000000, 0x92ec833100000000,
+    0x9a0fe30d00000000, 0x822a424900000000, 0x8ac9227500000000,
+    0xb26000c000000000, 0xba8360fc00000000, 0xa2a6c1b800000000,
+    0xaa45a18400000000, 0x93f2f50900000000, 0x9b11953500000000,
+    0x8334347100000000, 0x8bd7544d00000000, 0xb37e76f800000000,
+    0xbb9d16c400000000, 0xa3b8b78000000000, 0xab5bd7bc00000000,
+    0x90d06f4100000000, 0x98330f7d00000000, 0x8016ae3900000000,
+    0x88f5ce0500000000, 0xb05cecb000000000, 0xb8bf8c8c00000000,
+    0xa09a2dc800000000, 0xa8794df400000000, 0x91ce197900000000,
+    0x992d794500000000, 0x8108d80100000000, 0x89ebb83d00000000,
+    0xb1429a8800000000, 0xb9a1fab400000000, 0xa1845bf000000000,
+    0xa9673bcc00000000, 0x96945bd000000000, 0x9e773bec00000000,
+    0x86529aa800000000, 0x8eb1fa9400000000, 0xb618d82100000000,
+    0xbefbb81d00000000, 0xa6de195900000000, 0xae3d796500000000,
+    0x978a2de800000000, 0x9f694dd400000000, 0x874cec9000000000,
+    0x8faf8cac00000000, 0xb706ae1900000000, 0xbfe5ce2500000000,
+    0xa7c06f6100000000, 0xaf230f5d00000000, 0x94a8b7a000000000,
+    0x9c4bd79c00000000, 0x846e76d800000000, 0x8c8d16e400000000,
+    0xb424345100000000, 0xbcc7546d00000000, 0xa4e2f52900000000,
+    0xac01951500000000, 0x95b6c19800000000, 0x9d55a1a400000000,
+    0x857000e000000000, 0x8d9360dc00000000, 0xb53a426900000000,
+    0xbdd9225500000000, 0xa5fc831100000000, 0xad1fe32d00000000,
+    0xdb1a422900000000, 0xd3f9221500000000, 0xcbdc835100000000,
+    0xc33fe36d00000000, 0xfb96c1d800000000, 0xf375a1e400000000,
+    0xeb5000a000000000, 0xe3b3609c00000000, 0xda04341100000000,
+    0xd2e7542d00000000, 0xcac2f56900000000, 0xc221955500000000,
+    0xfa88b7e000000000, 0xf26bd7dc00000000, 0xea4e769800000000,
+    0xe2ad16a400000000, 0xd926ae5900000000, 0xd1c5ce6500000000,
+    0xc9e06f2100000000, 0xc1030f1d00000000, 0xf9aa2da800000000,
+    0xf1494d9400000000, 0xe96cecd000000000, 0xe18f8cec00000000,
+    0xd838d86100000000, 0xd0dbb85d00000000, 0xc8fe191900000000,
+    0xc01d792500000000, 0xf8b45b9000000000, 0xf0573bac00000000,
+    0xe8729ae800000000, 0xe091fad400000000, 0xdf629ac800000000,
+    0xd781faf400000000, 0xcfa45bb000000000, 0xc7473b8c00000000,
+    0xffee193900000000, 0xf70d790500000000, 0xef28d84100000000,
+    0xe7cbb87d00000000, 0xde7cecf000000000, 0xd69f8ccc00000000,
+    0xceba2d8800000000, 0xc6594db400000000, 0xfef06f0100000000,
+    0xf6130f3d00000000, 0xee36ae7900000000, 0xe6d5ce4500000000,
+    0xdd5e76b800000000, 0xd5bd168400000000, 0xcd98b7c000000000,
+    0xc57bd7fc00000000, 0xfdd2f54900000000, 0xf531957500000000,
+    0xed14343100000000, 0xe5f7540d00000000, 0xdc40008000000000,
+    0xd4a360bc00000000, 0xcc86c1f800000000, 0xc465a1c400000000,
+    0xfccc837100000000, 0xf42fe34d00000000, 0xec0a420900000000,
+    0xe4e9223500000000},
+   {0x0000000000000000, 0xd1e8e70e00000000, 0xa2d1cf1d00000000,
+    0x7339281300000000, 0x44a39f3b00000000, 0x954b783500000000,
+    0xe672502600000000, 0x379ab72800000000, 0x88463f7700000000,
+    0x59aed87900000000, 0x2a97f06a00000000, 0xfb7f176400000000,
+    0xcce5a04c00000000, 0x1d0d474200000000, 0x6e346f5100000000,
+    0xbfdc885f00000000, 0x108d7eee00000000, 0xc16599e000000000,
+    0xb25cb1f300000000, 0x63b456fd00000000, 0x542ee1d500000000,
+    0x85c606db00000000, 0xf6ff2ec800000000, 0x2717c9c600000000,
+    0x98cb419900000000, 0x4923a69700000000, 0x3a1a8e8400000000,
+    0xebf2698a00000000, 0xdc68dea200000000, 0x0d8039ac00000000,
+    0x7eb911bf00000000, 0xaf51f6b100000000, 0x611c8c0700000000,
+    0xb0f46b0900000000, 0xc3cd431a00000000, 0x1225a41400000000,
+    0x25bf133c00000000, 0xf457f43200000000, 0x876edc2100000000,
+    0x56863b2f00000000, 0xe95ab37000000000, 0x38b2547e00000000,
+    0x4b8b7c6d00000000, 0x9a639b6300000000, 0xadf92c4b00000000,
+    0x7c11cb4500000000, 0x0f28e35600000000, 0xdec0045800000000,
+    0x7191f2e900000000, 0xa07915e700000000, 0xd3403df400000000,
+    0x02a8dafa00000000, 0x35326dd200000000, 0xe4da8adc00000000,
+    0x97e3a2cf00000000, 0x460b45c100000000, 0xf9d7cd9e00000000,
+    0x283f2a9000000000, 0x5b06028300000000, 0x8aeee58d00000000,
+    0xbd7452a500000000, 0x6c9cb5ab00000000, 0x1fa59db800000000,
+    0xce4d7ab600000000, 0xc238180f00000000, 0x13d0ff0100000000,
+    0x60e9d71200000000, 0xb101301c00000000, 0x869b873400000000,
+    0x5773603a00000000, 0x244a482900000000, 0xf5a2af2700000000,
+    0x4a7e277800000000, 0x9b96c07600000000, 0xe8afe86500000000,
+    0x39470f6b00000000, 0x0eddb84300000000, 0xdf355f4d00000000,
+    0xac0c775e00000000, 0x7de4905000000000, 0xd2b566e100000000,
+    0x035d81ef00000000, 0x7064a9fc00000000, 0xa18c4ef200000000,
+    0x9616f9da00000000, 0x47fe1ed400000000, 0x34c736c700000000,
+    0xe52fd1c900000000, 0x5af3599600000000, 0x8b1bbe9800000000,
+    0xf822968b00000000, 0x29ca718500000000, 0x1e50c6ad00000000,
+    0xcfb821a300000000, 0xbc8109b000000000, 0x6d69eebe00000000,
+    0xa324940800000000, 0x72cc730600000000, 0x01f55b1500000000,
+    0xd01dbc1b00000000, 0xe7870b3300000000, 0x366fec3d00000000,
+    0x4556c42e00000000, 0x94be232000000000, 0x2b62ab7f00000000,
+    0xfa8a4c7100000000, 0x89b3646200000000, 0x585b836c00000000,
+    0x6fc1344400000000, 0xbe29d34a00000000, 0xcd10fb5900000000,
+    0x1cf81c5700000000, 0xb3a9eae600000000, 0x62410de800000000,
+    0x117825fb00000000, 0xc090c2f500000000, 0xf70a75dd00000000,
+    0x26e292d300000000, 0x55dbbac000000000, 0x84335dce00000000,
+    0x3befd59100000000, 0xea07329f00000000, 0x993e1a8c00000000,
+    0x48d6fd8200000000, 0x7f4c4aaa00000000, 0xaea4ada400000000,
+    0xdd9d85b700000000, 0x0c7562b900000000, 0x8471301e00000000,
+    0x5599d71000000000, 0x26a0ff0300000000, 0xf748180d00000000,
+    0xc0d2af2500000000, 0x113a482b00000000, 0x6203603800000000,
+    0xb3eb873600000000, 0x0c370f6900000000, 0xdddfe86700000000,
+    0xaee6c07400000000, 0x7f0e277a00000000, 0x4894905200000000,
+    0x997c775c00000000, 0xea455f4f00000000, 0x3badb84100000000,
+    0x94fc4ef000000000, 0x4514a9fe00000000, 0x362d81ed00000000,
+    0xe7c566e300000000, 0xd05fd1cb00000000, 0x01b736c500000000,
+    0x728e1ed600000000, 0xa366f9d800000000, 0x1cba718700000000,
+    0xcd52968900000000, 0xbe6bbe9a00000000, 0x6f83599400000000,
+    0x5819eebc00000000, 0x89f109b200000000, 0xfac821a100000000,
+    0x2b20c6af00000000, 0xe56dbc1900000000, 0x34855b1700000000,
+    0x47bc730400000000, 0x9654940a00000000, 0xa1ce232200000000,
+    0x7026c42c00000000, 0x031fec3f00000000, 0xd2f70b3100000000,
+    0x6d2b836e00000000, 0xbcc3646000000000, 0xcffa4c7300000000,
+    0x1e12ab7d00000000, 0x29881c5500000000, 0xf860fb5b00000000,
+    0x8b59d34800000000, 0x5ab1344600000000, 0xf5e0c2f700000000,
+    0x240825f900000000, 0x57310dea00000000, 0x86d9eae400000000,
+    0xb1435dcc00000000, 0x60abbac200000000, 0x139292d100000000,
+    0xc27a75df00000000, 0x7da6fd8000000000, 0xac4e1a8e00000000,
+    0xdf77329d00000000, 0x0e9fd59300000000, 0x390562bb00000000,
+    0xe8ed85b500000000, 0x9bd4ada600000000, 0x4a3c4aa800000000,
+    0x4649281100000000, 0x97a1cf1f00000000, 0xe498e70c00000000,
+    0x3570000200000000, 0x02eab72a00000000, 0xd302502400000000,
+    0xa03b783700000000, 0x71d39f3900000000, 0xce0f176600000000,
+    0x1fe7f06800000000, 0x6cded87b00000000, 0xbd363f7500000000,
+    0x8aac885d00000000, 0x5b446f5300000000, 0x287d474000000000,
+    0xf995a04e00000000, 0x56c456ff00000000, 0x872cb1f100000000,
+    0xf41599e200000000, 0x25fd7eec00000000, 0x1267c9c400000000,
+    0xc38f2eca00000000, 0xb0b606d900000000, 0x615ee1d700000000,
+    0xde82698800000000, 0x0f6a8e8600000000, 0x7c53a69500000000,
+    0xadbb419b00000000, 0x9a21f6b300000000, 0x4bc911bd00000000,
+    0x38f039ae00000000, 0xe918dea000000000, 0x2755a41600000000,
+    0xf6bd431800000000, 0x85846b0b00000000, 0x546c8c0500000000,
+    0x63f63b2d00000000, 0xb21edc2300000000, 0xc127f43000000000,
+    0x10cf133e00000000, 0xaf139b6100000000, 0x7efb7c6f00000000,
+    0x0dc2547c00000000, 0xdc2ab37200000000, 0xebb0045a00000000,
+    0x3a58e35400000000, 0x4961cb4700000000, 0x98892c4900000000,
+    0x37d8daf800000000, 0xe6303df600000000, 0x950915e500000000,
+    0x44e1f2eb00000000, 0x737b45c300000000, 0xa293a2cd00000000,
+    0xd1aa8ade00000000, 0x00426dd000000000, 0xbf9ee58f00000000,
+    0x6e76028100000000, 0x1d4f2a9200000000, 0xcca7cd9c00000000,
+    0xfb3d7ab400000000, 0x2ad59dba00000000, 0x59ecb5a900000000,
+    0x880452a700000000},
+   {0x0000000000000000, 0xaa05daf100000000, 0x150dc53800000000,
+    0xbf081fc900000000, 0x2a1a8a7100000000, 0x801f508000000000,
+    0x3f174f4900000000, 0x951295b800000000, 0x543414e300000000,
+    0xfe31ce1200000000, 0x4139d1db00000000, 0xeb3c0b2a00000000,
+    0x7e2e9e9200000000, 0xd42b446300000000, 0x6b235baa00000000,
+    0xc126815b00000000, 0xe96e591d00000000, 0x436b83ec00000000,
+    0xfc639c2500000000, 0x566646d400000000, 0xc374d36c00000000,
+    0x6971099d00000000, 0xd679165400000000, 0x7c7ccca500000000,
+    0xbd5a4dfe00000000, 0x175f970f00000000, 0xa85788c600000000,
+    0x0252523700000000, 0x9740c78f00000000, 0x3d451d7e00000000,
+    0x824d02b700000000, 0x2848d84600000000, 0xd2ddb23a00000000,
+    0x78d868cb00000000, 0xc7d0770200000000, 0x6dd5adf300000000,
+    0xf8c7384b00000000, 0x52c2e2ba00000000, 0xedcafd7300000000,
+    0x47cf278200000000, 0x86e9a6d900000000, 0x2cec7c2800000000,
+    0x93e463e100000000, 0x39e1b91000000000, 0xacf32ca800000000,
+    0x06f6f65900000000, 0xb9fee99000000000, 0x13fb336100000000,
+    0x3bb3eb2700000000, 0x91b631d600000000, 0x2ebe2e1f00000000,
+    0x84bbf4ee00000000, 0x11a9615600000000, 0xbbacbba700000000,
+    0x04a4a46e00000000, 0xaea17e9f00000000, 0x6f87ffc400000000,
+    0xc582253500000000, 0x7a8a3afc00000000, 0xd08fe00d00000000,
+    0x459d75b500000000, 0xef98af4400000000, 0x5090b08d00000000,
+    0xfa956a7c00000000, 0xa4bb657500000000, 0x0ebebf8400000000,
+    0xb1b6a04d00000000, 0x1bb37abc00000000, 0x8ea1ef0400000000,
+    0x24a435f500000000, 0x9bac2a3c00000000, 0x31a9f0cd00000000,
+    0xf08f719600000000, 0x5a8aab6700000000, 0xe582b4ae00000000,
+    0x4f876e5f00000000, 0xda95fbe700000000, 0x7090211600000000,
+    0xcf983edf00000000, 0x659de42e00000000, 0x4dd53c6800000000,
+    0xe7d0e69900000000, 0x58d8f95000000000, 0xf2dd23a100000000,
+    0x67cfb61900000000, 0xcdca6ce800000000, 0x72c2732100000000,
+    0xd8c7a9d000000000, 0x19e1288b00000000, 0xb3e4f27a00000000,
+    0x0cecedb300000000, 0xa6e9374200000000, 0x33fba2fa00000000,
+    0x99fe780b00000000, 0x26f667c200000000, 0x8cf3bd3300000000,
+    0x7666d74f00000000, 0xdc630dbe00000000, 0x636b127700000000,
+    0xc96ec88600000000, 0x5c7c5d3e00000000, 0xf67987cf00000000,
+    0x4971980600000000, 0xe37442f700000000, 0x2252c3ac00000000,
+    0x8857195d00000000, 0x375f069400000000, 0x9d5adc6500000000,
+    0x084849dd00000000, 0xa24d932c00000000, 0x1d458ce500000000,
+    0xb740561400000000, 0x9f088e5200000000, 0x350d54a300000000,
+    0x8a054b6a00000000, 0x2000919b00000000, 0xb512042300000000,
+    0x1f17ded200000000, 0xa01fc11b00000000, 0x0a1a1bea00000000,
+    0xcb3c9ab100000000, 0x6139404000000000, 0xde315f8900000000,
+    0x7434857800000000, 0xe12610c000000000, 0x4b23ca3100000000,
+    0xf42bd5f800000000, 0x5e2e0f0900000000, 0x4877cbea00000000,
+    0xe272111b00000000, 0x5d7a0ed200000000, 0xf77fd42300000000,
+    0x626d419b00000000, 0xc8689b6a00000000, 0x776084a300000000,
+    0xdd655e5200000000, 0x1c43df0900000000, 0xb64605f800000000,
+    0x094e1a3100000000, 0xa34bc0c000000000, 0x3659557800000000,
+    0x9c5c8f8900000000, 0x2354904000000000, 0x89514ab100000000,
+    0xa11992f700000000, 0x0b1c480600000000, 0xb41457cf00000000,
+    0x1e118d3e00000000, 0x8b03188600000000, 0x2106c27700000000,
+    0x9e0eddbe00000000, 0x340b074f00000000, 0xf52d861400000000,
+    0x5f285ce500000000, 0xe020432c00000000, 0x4a2599dd00000000,
+    0xdf370c6500000000, 0x7532d69400000000, 0xca3ac95d00000000,
+    0x603f13ac00000000, 0x9aaa79d000000000, 0x30afa32100000000,
+    0x8fa7bce800000000, 0x25a2661900000000, 0xb0b0f3a100000000,
+    0x1ab5295000000000, 0xa5bd369900000000, 0x0fb8ec6800000000,
+    0xce9e6d3300000000, 0x649bb7c200000000, 0xdb93a80b00000000,
+    0x719672fa00000000, 0xe484e74200000000, 0x4e813db300000000,
+    0xf189227a00000000, 0x5b8cf88b00000000, 0x73c420cd00000000,
+    0xd9c1fa3c00000000, 0x66c9e5f500000000, 0xcccc3f0400000000,
+    0x59deaabc00000000, 0xf3db704d00000000, 0x4cd36f8400000000,
+    0xe6d6b57500000000, 0x27f0342e00000000, 0x8df5eedf00000000,
+    0x32fdf11600000000, 0x98f82be700000000, 0x0deabe5f00000000,
+    0xa7ef64ae00000000, 0x18e77b6700000000, 0xb2e2a19600000000,
+    0xecccae9f00000000, 0x46c9746e00000000, 0xf9c16ba700000000,
+    0x53c4b15600000000, 0xc6d624ee00000000, 0x6cd3fe1f00000000,
+    0xd3dbe1d600000000, 0x79de3b2700000000, 0xb8f8ba7c00000000,
+    0x12fd608d00000000, 0xadf57f4400000000, 0x07f0a5b500000000,
+    0x92e2300d00000000, 0x38e7eafc00000000, 0x87eff53500000000,
+    0x2dea2fc400000000, 0x05a2f78200000000, 0xafa72d7300000000,
+    0x10af32ba00000000, 0xbaaae84b00000000, 0x2fb87df300000000,
+    0x85bda70200000000, 0x3ab5b8cb00000000, 0x90b0623a00000000,
+    0x5196e36100000000, 0xfb93399000000000, 0x449b265900000000,
+    0xee9efca800000000, 0x7b8c691000000000, 0xd189b3e100000000,
+    0x6e81ac2800000000, 0xc48476d900000000, 0x3e111ca500000000,
+    0x9414c65400000000, 0x2b1cd99d00000000, 0x8119036c00000000,
+    0x140b96d400000000, 0xbe0e4c2500000000, 0x010653ec00000000,
+    0xab03891d00000000, 0x6a25084600000000, 0xc020d2b700000000,
+    0x7f28cd7e00000000, 0xd52d178f00000000, 0x403f823700000000,
+    0xea3a58c600000000, 0x5532470f00000000, 0xff379dfe00000000,
+    0xd77f45b800000000, 0x7d7a9f4900000000, 0xc272808000000000,
+    0x68775a7100000000, 0xfd65cfc900000000, 0x5760153800000000,
+    0xe8680af100000000, 0x426dd00000000000, 0x834b515b00000000,
+    0x294e8baa00000000, 0x9646946300000000, 0x3c434e9200000000,
+    0xa951db2a00000000, 0x035401db00000000, 0xbc5c1e1200000000,
+    0x1659c4e300000000}};
+
+#else /* W == 4 */
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0xae689191, 0x87a02563, 0x29c8b4f2, 0xd4314c87,
+    0x7a59dd16, 0x539169e4, 0xfdf9f875, 0x73139f4f, 0xdd7b0ede,
+    0xf4b3ba2c, 0x5adb2bbd, 0xa722d3c8, 0x094a4259, 0x2082f6ab,
+    0x8eea673a, 0xe6273e9e, 0x484faf0f, 0x61871bfd, 0xcfef8a6c,
+    0x32167219, 0x9c7ee388, 0xb5b6577a, 0x1bdec6eb, 0x9534a1d1,
+    0x3b5c3040, 0x129484b2, 0xbcfc1523, 0x4105ed56, 0xef6d7cc7,
+    0xc6a5c835, 0x68cd59a4, 0x173f7b7d, 0xb957eaec, 0x909f5e1e,
+    0x3ef7cf8f, 0xc30e37fa, 0x6d66a66b, 0x44ae1299, 0xeac68308,
+    0x642ce432, 0xca4475a3, 0xe38cc151, 0x4de450c0, 0xb01da8b5,
+    0x1e753924, 0x37bd8dd6, 0x99d51c47, 0xf11845e3, 0x5f70d472,
+    0x76b86080, 0xd8d0f111, 0x25290964, 0x8b4198f5, 0xa2892c07,
+    0x0ce1bd96, 0x820bdaac, 0x2c634b3d, 0x05abffcf, 0xabc36e5e,
+    0x563a962b, 0xf85207ba, 0xd19ab348, 0x7ff222d9, 0x2e7ef6fa,
+    0x8016676b, 0xa9ded399, 0x07b64208, 0xfa4fba7d, 0x54272bec,
+    0x7def9f1e, 0xd3870e8f, 0x5d6d69b5, 0xf305f824, 0xdacd4cd6,
+    0x74a5dd47, 0x895c2532, 0x2734b4a3, 0x0efc0051, 0xa09491c0,
+    0xc859c864, 0x663159f5, 0x4ff9ed07, 0xe1917c96, 0x1c6884e3,
+    0xb2001572, 0x9bc8a180, 0x35a03011, 0xbb4a572b, 0x1522c6ba,
+    0x3cea7248, 0x9282e3d9, 0x6f7b1bac, 0xc1138a3d, 0xe8db3ecf,
+    0x46b3af5e, 0x39418d87, 0x97291c16, 0xbee1a8e4, 0x10893975,
+    0xed70c100, 0x43185091, 0x6ad0e463, 0xc4b875f2, 0x4a5212c8,
+    0xe43a8359, 0xcdf237ab, 0x639aa63a, 0x9e635e4f, 0x300bcfde,
+    0x19c37b2c, 0xb7abeabd, 0xdf66b319, 0x710e2288, 0x58c6967a,
+    0xf6ae07eb, 0x0b57ff9e, 0xa53f6e0f, 0x8cf7dafd, 0x229f4b6c,
+    0xac752c56, 0x021dbdc7, 0x2bd50935, 0x85bd98a4, 0x784460d1,
+    0xd62cf140, 0xffe445b2, 0x518cd423, 0x5cfdedf4, 0xf2957c65,
+    0xdb5dc897, 0x75355906, 0x88cca173, 0x26a430e2, 0x0f6c8410,
+    0xa1041581, 0x2fee72bb, 0x8186e32a, 0xa84e57d8, 0x0626c649,
+    0xfbdf3e3c, 0x55b7afad, 0x7c7f1b5f, 0xd2178ace, 0xbadad36a,
+    0x14b242fb, 0x3d7af609, 0x93126798, 0x6eeb9fed, 0xc0830e7c,
+    0xe94bba8e, 0x47232b1f, 0xc9c94c25, 0x67a1ddb4, 0x4e696946,
+    0xe001f8d7, 0x1df800a2, 0xb3909133, 0x9a5825c1, 0x3430b450,
+    0x4bc29689, 0xe5aa0718, 0xcc62b3ea, 0x620a227b, 0x9ff3da0e,
+    0x319b4b9f, 0x1853ff6d, 0xb63b6efc, 0x38d109c6, 0x96b99857,
+    0xbf712ca5, 0x1119bd34, 0xece04541, 0x4288d4d0, 0x6b406022,
+    0xc528f1b3, 0xade5a817, 0x038d3986, 0x2a458d74, 0x842d1ce5,
+    0x79d4e490, 0xd7bc7501, 0xfe74c1f3, 0x501c5062, 0xdef63758,
+    0x709ea6c9, 0x5956123b, 0xf73e83aa, 0x0ac77bdf, 0xa4afea4e,
+    0x8d675ebc, 0x230fcf2d, 0x72831b0e, 0xdceb8a9f, 0xf5233e6d,
+    0x5b4baffc, 0xa6b25789, 0x08dac618, 0x211272ea, 0x8f7ae37b,
+    0x01908441, 0xaff815d0, 0x8630a122, 0x285830b3, 0xd5a1c8c6,
+    0x7bc95957, 0x5201eda5, 0xfc697c34, 0x94a42590, 0x3accb401,
+    0x130400f3, 0xbd6c9162, 0x40956917, 0xeefdf886, 0xc7354c74,
+    0x695ddde5, 0xe7b7badf, 0x49df2b4e, 0x60179fbc, 0xce7f0e2d,
+    0x3386f658, 0x9dee67c9, 0xb426d33b, 0x1a4e42aa, 0x65bc6073,
+    0xcbd4f1e2, 0xe21c4510, 0x4c74d481, 0xb18d2cf4, 0x1fe5bd65,
+    0x362d0997, 0x98459806, 0x16afff3c, 0xb8c76ead, 0x910fda5f,
+    0x3f674bce, 0xc29eb3bb, 0x6cf6222a, 0x453e96d8, 0xeb560749,
+    0x839b5eed, 0x2df3cf7c, 0x043b7b8e, 0xaa53ea1f, 0x57aa126a,
+    0xf9c283fb, 0xd00a3709, 0x7e62a698, 0xf088c1a2, 0x5ee05033,
+    0x7728e4c1, 0xd9407550, 0x24b98d25, 0x8ad11cb4, 0xa319a846,
+    0x0d7139d7},
+   {0x00000000, 0xb9fbdbe8, 0xa886b191, 0x117d6a79, 0x8a7c6563,
+    0x3387be8b, 0x22fad4f2, 0x9b010f1a, 0xcf89cc87, 0x7672176f,
+    0x670f7d16, 0xdef4a6fe, 0x45f5a9e4, 0xfc0e720c, 0xed731875,
+    0x5488c39d, 0x44629f4f, 0xfd9944a7, 0xece42ede, 0x551ff536,
+    0xce1efa2c, 0x77e521c4, 0x66984bbd, 0xdf639055, 0x8beb53c8,
+    0x32108820, 0x236de259, 0x9a9639b1, 0x019736ab, 0xb86ced43,
+    0xa911873a, 0x10ea5cd2, 0x88c53e9e, 0x313ee576, 0x20438f0f,
+    0x99b854e7, 0x02b95bfd, 0xbb428015, 0xaa3fea6c, 0x13c43184,
+    0x474cf219, 0xfeb729f1, 0xefca4388, 0x56319860, 0xcd30977a,
+    0x74cb4c92, 0x65b626eb, 0xdc4dfd03, 0xcca7a1d1, 0x755c7a39,
+    0x64211040, 0xdddacba8, 0x46dbc4b2, 0xff201f5a, 0xee5d7523,
+    0x57a6aecb, 0x032e6d56, 0xbad5b6be, 0xaba8dcc7, 0x1253072f,
+    0x89520835, 0x30a9d3dd, 0x21d4b9a4, 0x982f624c, 0xcafb7b7d,
+    0x7300a095, 0x627dcaec, 0xdb861104, 0x40871e1e, 0xf97cc5f6,
+    0xe801af8f, 0x51fa7467, 0x0572b7fa, 0xbc896c12, 0xadf4066b,
+    0x140fdd83, 0x8f0ed299, 0x36f50971, 0x27886308, 0x9e73b8e0,
+    0x8e99e432, 0x37623fda, 0x261f55a3, 0x9fe48e4b, 0x04e58151,
+    0xbd1e5ab9, 0xac6330c0, 0x1598eb28, 0x411028b5, 0xf8ebf35d,
+    0xe9969924, 0x506d42cc, 0xcb6c4dd6, 0x7297963e, 0x63eafc47,
+    0xda1127af, 0x423e45e3, 0xfbc59e0b, 0xeab8f472, 0x53432f9a,
+    0xc8422080, 0x71b9fb68, 0x60c49111, 0xd93f4af9, 0x8db78964,
+    0x344c528c, 0x253138f5, 0x9ccae31d, 0x07cbec07, 0xbe3037ef,
+    0xaf4d5d96, 0x16b6867e, 0x065cdaac, 0xbfa70144, 0xaeda6b3d,
+    0x1721b0d5, 0x8c20bfcf, 0x35db6427, 0x24a60e5e, 0x9d5dd5b6,
+    0xc9d5162b, 0x702ecdc3, 0x6153a7ba, 0xd8a87c52, 0x43a97348,
+    0xfa52a8a0, 0xeb2fc2d9, 0x52d41931, 0x4e87f0bb, 0xf77c2b53,
+    0xe601412a, 0x5ffa9ac2, 0xc4fb95d8, 0x7d004e30, 0x6c7d2449,
+    0xd586ffa1, 0x810e3c3c, 0x38f5e7d4, 0x29888dad, 0x90735645,
+    0x0b72595f, 0xb28982b7, 0xa3f4e8ce, 0x1a0f3326, 0x0ae56ff4,
+    0xb31eb41c, 0xa263de65, 0x1b98058d, 0x80990a97, 0x3962d17f,
+    0x281fbb06, 0x91e460ee, 0xc56ca373, 0x7c97789b, 0x6dea12e2,
+    0xd411c90a, 0x4f10c610, 0xf6eb1df8, 0xe7967781, 0x5e6dac69,
+    0xc642ce25, 0x7fb915cd, 0x6ec47fb4, 0xd73fa45c, 0x4c3eab46,
+    0xf5c570ae, 0xe4b81ad7, 0x5d43c13f, 0x09cb02a2, 0xb030d94a,
+    0xa14db333, 0x18b668db, 0x83b767c1, 0x3a4cbc29, 0x2b31d650,
+    0x92ca0db8, 0x8220516a, 0x3bdb8a82, 0x2aa6e0fb, 0x935d3b13,
+    0x085c3409, 0xb1a7efe1, 0xa0da8598, 0x19215e70, 0x4da99ded,
+    0xf4524605, 0xe52f2c7c, 0x5cd4f794, 0xc7d5f88e, 0x7e2e2366,
+    0x6f53491f, 0xd6a892f7, 0x847c8bc6, 0x3d87502e, 0x2cfa3a57,
+    0x9501e1bf, 0x0e00eea5, 0xb7fb354d, 0xa6865f34, 0x1f7d84dc,
+    0x4bf54741, 0xf20e9ca9, 0xe373f6d0, 0x5a882d38, 0xc1892222,
+    0x7872f9ca, 0x690f93b3, 0xd0f4485b, 0xc01e1489, 0x79e5cf61,
+    0x6898a518, 0xd1637ef0, 0x4a6271ea, 0xf399aa02, 0xe2e4c07b,
+    0x5b1f1b93, 0x0f97d80e, 0xb66c03e6, 0xa711699f, 0x1eeab277,
+    0x85ebbd6d, 0x3c106685, 0x2d6d0cfc, 0x9496d714, 0x0cb9b558,
+    0xb5426eb0, 0xa43f04c9, 0x1dc4df21, 0x86c5d03b, 0x3f3e0bd3,
+    0x2e4361aa, 0x97b8ba42, 0xc33079df, 0x7acba237, 0x6bb6c84e,
+    0xd24d13a6, 0x494c1cbc, 0xf0b7c754, 0xe1caad2d, 0x583176c5,
+    0x48db2a17, 0xf120f1ff, 0xe05d9b86, 0x59a6406e, 0xc2a74f74,
+    0x7b5c949c, 0x6a21fee5, 0xd3da250d, 0x8752e690, 0x3ea93d78,
+    0x2fd45701, 0x962f8ce9, 0x0d2e83f3, 0xb4d5581b, 0xa5a83262,
+    0x1c53e98a},
+   {0x00000000, 0x9d0fe176, 0xe16ec4ad, 0x7c6125db, 0x19ac8f1b,
+    0x84a36e6d, 0xf8c24bb6, 0x65cdaac0, 0x33591e36, 0xae56ff40,
+    0xd237da9b, 0x4f383bed, 0x2af5912d, 0xb7fa705b, 0xcb9b5580,
+    0x5694b4f6, 0x66b23c6c, 0xfbbddd1a, 0x87dcf8c1, 0x1ad319b7,
+    0x7f1eb377, 0xe2115201, 0x9e7077da, 0x037f96ac, 0x55eb225a,
+    0xc8e4c32c, 0xb485e6f7, 0x298a0781, 0x4c47ad41, 0xd1484c37,
+    0xad2969ec, 0x3026889a, 0xcd6478d8, 0x506b99ae, 0x2c0abc75,
+    0xb1055d03, 0xd4c8f7c3, 0x49c716b5, 0x35a6336e, 0xa8a9d218,
+    0xfe3d66ee, 0x63328798, 0x1f53a243, 0x825c4335, 0xe791e9f5,
+    0x7a9e0883, 0x06ff2d58, 0x9bf0cc2e, 0xabd644b4, 0x36d9a5c2,
+    0x4ab88019, 0xd7b7616f, 0xb27acbaf, 0x2f752ad9, 0x53140f02,
+    0xce1bee74, 0x988f5a82, 0x0580bbf4, 0x79e19e2f, 0xe4ee7f59,
+    0x8123d599, 0x1c2c34ef, 0x604d1134, 0xfd42f042, 0x41b9f7f1,
+    0xdcb61687, 0xa0d7335c, 0x3dd8d22a, 0x581578ea, 0xc51a999c,
+    0xb97bbc47, 0x24745d31, 0x72e0e9c7, 0xefef08b1, 0x938e2d6a,
+    0x0e81cc1c, 0x6b4c66dc, 0xf64387aa, 0x8a22a271, 0x172d4307,
+    0x270bcb9d, 0xba042aeb, 0xc6650f30, 0x5b6aee46, 0x3ea74486,
+    0xa3a8a5f0, 0xdfc9802b, 0x42c6615d, 0x1452d5ab, 0x895d34dd,
+    0xf53c1106, 0x6833f070, 0x0dfe5ab0, 0x90f1bbc6, 0xec909e1d,
+    0x719f7f6b, 0x8cdd8f29, 0x11d26e5f, 0x6db34b84, 0xf0bcaaf2,
+    0x95710032, 0x087ee144, 0x741fc49f, 0xe91025e9, 0xbf84911f,
+    0x228b7069, 0x5eea55b2, 0xc3e5b4c4, 0xa6281e04, 0x3b27ff72,
+    0x4746daa9, 0xda493bdf, 0xea6fb345, 0x77605233, 0x0b0177e8,
+    0x960e969e, 0xf3c33c5e, 0x6eccdd28, 0x12adf8f3, 0x8fa21985,
+    0xd936ad73, 0x44394c05, 0x385869de, 0xa55788a8, 0xc09a2268,
+    0x5d95c31e, 0x21f4e6c5, 0xbcfb07b3, 0x8373efe2, 0x1e7c0e94,
+    0x621d2b4f, 0xff12ca39, 0x9adf60f9, 0x07d0818f, 0x7bb1a454,
+    0xe6be4522, 0xb02af1d4, 0x2d2510a2, 0x51443579, 0xcc4bd40f,
+    0xa9867ecf, 0x34899fb9, 0x48e8ba62, 0xd5e75b14, 0xe5c1d38e,
+    0x78ce32f8, 0x04af1723, 0x99a0f655, 0xfc6d5c95, 0x6162bde3,
+    0x1d039838, 0x800c794e, 0xd698cdb8, 0x4b972cce, 0x37f60915,
+    0xaaf9e863, 0xcf3442a3, 0x523ba3d5, 0x2e5a860e, 0xb3556778,
+    0x4e17973a, 0xd318764c, 0xaf795397, 0x3276b2e1, 0x57bb1821,
+    0xcab4f957, 0xb6d5dc8c, 0x2bda3dfa, 0x7d4e890c, 0xe041687a,
+    0x9c204da1, 0x012facd7, 0x64e20617, 0xf9ede761, 0x858cc2ba,
+    0x188323cc, 0x28a5ab56, 0xb5aa4a20, 0xc9cb6ffb, 0x54c48e8d,
+    0x3109244d, 0xac06c53b, 0xd067e0e0, 0x4d680196, 0x1bfcb560,
+    0x86f35416, 0xfa9271cd, 0x679d90bb, 0x02503a7b, 0x9f5fdb0d,
+    0xe33efed6, 0x7e311fa0, 0xc2ca1813, 0x5fc5f965, 0x23a4dcbe,
+    0xbeab3dc8, 0xdb669708, 0x4669767e, 0x3a0853a5, 0xa707b2d3,
+    0xf1930625, 0x6c9ce753, 0x10fdc288, 0x8df223fe, 0xe83f893e,
+    0x75306848, 0x09514d93, 0x945eace5, 0xa478247f, 0x3977c509,
+    0x4516e0d2, 0xd81901a4, 0xbdd4ab64, 0x20db4a12, 0x5cba6fc9,
+    0xc1b58ebf, 0x97213a49, 0x0a2edb3f, 0x764ffee4, 0xeb401f92,
+    0x8e8db552, 0x13825424, 0x6fe371ff, 0xf2ec9089, 0x0fae60cb,
+    0x92a181bd, 0xeec0a466, 0x73cf4510, 0x1602efd0, 0x8b0d0ea6,
+    0xf76c2b7d, 0x6a63ca0b, 0x3cf77efd, 0xa1f89f8b, 0xdd99ba50,
+    0x40965b26, 0x255bf1e6, 0xb8541090, 0xc435354b, 0x593ad43d,
+    0x691c5ca7, 0xf413bdd1, 0x8872980a, 0x157d797c, 0x70b0d3bc,
+    0xedbf32ca, 0x91de1711, 0x0cd1f667, 0x5a454291, 0xc74aa3e7,
+    0xbb2b863c, 0x2624674a, 0x43e9cd8a, 0xdee62cfc, 0xa2870927,
+    0x3f88e851},
+   {0x00000000, 0xdd96d985, 0x605cb54b, 0xbdca6cce, 0xc0b96a96,
+    0x1d2fb313, 0xa0e5dfdd, 0x7d730658, 0x5a03d36d, 0x87950ae8,
+    0x3a5f6626, 0xe7c9bfa3, 0x9abab9fb, 0x472c607e, 0xfae60cb0,
+    0x2770d535, 0xb407a6da, 0x69917f5f, 0xd45b1391, 0x09cdca14,
+    0x74becc4c, 0xa92815c9, 0x14e27907, 0xc974a082, 0xee0475b7,
+    0x3392ac32, 0x8e58c0fc, 0x53ce1979, 0x2ebd1f21, 0xf32bc6a4,
+    0x4ee1aa6a, 0x937773ef, 0xb37e4bf5, 0x6ee89270, 0xd322febe,
+    0x0eb4273b, 0x73c72163, 0xae51f8e6, 0x139b9428, 0xce0d4dad,
+    0xe97d9898, 0x34eb411d, 0x89212dd3, 0x54b7f456, 0x29c4f20e,
+    0xf4522b8b, 0x49984745, 0x940e9ec0, 0x0779ed2f, 0xdaef34aa,
+    0x67255864, 0xbab381e1, 0xc7c087b9, 0x1a565e3c, 0xa79c32f2,
+    0x7a0aeb77, 0x5d7a3e42, 0x80ece7c7, 0x3d268b09, 0xe0b0528c,
+    0x9dc354d4, 0x40558d51, 0xfd9fe19f, 0x2009381a, 0xbd8d91ab,
+    0x601b482e, 0xddd124e0, 0x0047fd65, 0x7d34fb3d, 0xa0a222b8,
+    0x1d684e76, 0xc0fe97f3, 0xe78e42c6, 0x3a189b43, 0x87d2f78d,
+    0x5a442e08, 0x27372850, 0xfaa1f1d5, 0x476b9d1b, 0x9afd449e,
+    0x098a3771, 0xd41ceef4, 0x69d6823a, 0xb4405bbf, 0xc9335de7,
+    0x14a58462, 0xa96fe8ac, 0x74f93129, 0x5389e41c, 0x8e1f3d99,
+    0x33d55157, 0xee4388d2, 0x93308e8a, 0x4ea6570f, 0xf36c3bc1,
+    0x2efae244, 0x0ef3da5e, 0xd36503db, 0x6eaf6f15, 0xb339b690,
+    0xce4ab0c8, 0x13dc694d, 0xae160583, 0x7380dc06, 0x54f00933,
+    0x8966d0b6, 0x34acbc78, 0xe93a65fd, 0x944963a5, 0x49dfba20,
+    0xf415d6ee, 0x29830f6b, 0xbaf47c84, 0x6762a501, 0xdaa8c9cf,
+    0x073e104a, 0x7a4d1612, 0xa7dbcf97, 0x1a11a359, 0xc7877adc,
+    0xe0f7afe9, 0x3d61766c, 0x80ab1aa2, 0x5d3dc327, 0x204ec57f,
+    0xfdd81cfa, 0x40127034, 0x9d84a9b1, 0xa06a2517, 0x7dfcfc92,
+    0xc036905c, 0x1da049d9, 0x60d34f81, 0xbd459604, 0x008ffaca,
+    0xdd19234f, 0xfa69f67a, 0x27ff2fff, 0x9a354331, 0x47a39ab4,
+    0x3ad09cec, 0xe7464569, 0x5a8c29a7, 0x871af022, 0x146d83cd,
+    0xc9fb5a48, 0x74313686, 0xa9a7ef03, 0xd4d4e95b, 0x094230de,
+    0xb4885c10, 0x691e8595, 0x4e6e50a0, 0x93f88925, 0x2e32e5eb,
+    0xf3a43c6e, 0x8ed73a36, 0x5341e3b3, 0xee8b8f7d, 0x331d56f8,
+    0x13146ee2, 0xce82b767, 0x7348dba9, 0xaede022c, 0xd3ad0474,
+    0x0e3bddf1, 0xb3f1b13f, 0x6e6768ba, 0x4917bd8f, 0x9481640a,
+    0x294b08c4, 0xf4ddd141, 0x89aed719, 0x54380e9c, 0xe9f26252,
+    0x3464bbd7, 0xa713c838, 0x7a8511bd, 0xc74f7d73, 0x1ad9a4f6,
+    0x67aaa2ae, 0xba3c7b2b, 0x07f617e5, 0xda60ce60, 0xfd101b55,
+    0x2086c2d0, 0x9d4cae1e, 0x40da779b, 0x3da971c3, 0xe03fa846,
+    0x5df5c488, 0x80631d0d, 0x1de7b4bc, 0xc0716d39, 0x7dbb01f7,
+    0xa02dd872, 0xdd5ede2a, 0x00c807af, 0xbd026b61, 0x6094b2e4,
+    0x47e467d1, 0x9a72be54, 0x27b8d29a, 0xfa2e0b1f, 0x875d0d47,
+    0x5acbd4c2, 0xe701b80c, 0x3a976189, 0xa9e01266, 0x7476cbe3,
+    0xc9bca72d, 0x142a7ea8, 0x695978f0, 0xb4cfa175, 0x0905cdbb,
+    0xd493143e, 0xf3e3c10b, 0x2e75188e, 0x93bf7440, 0x4e29adc5,
+    0x335aab9d, 0xeecc7218, 0x53061ed6, 0x8e90c753, 0xae99ff49,
+    0x730f26cc, 0xcec54a02, 0x13539387, 0x6e2095df, 0xb3b64c5a,
+    0x0e7c2094, 0xd3eaf911, 0xf49a2c24, 0x290cf5a1, 0x94c6996f,
+    0x495040ea, 0x342346b2, 0xe9b59f37, 0x547ff3f9, 0x89e92a7c,
+    0x1a9e5993, 0xc7088016, 0x7ac2ecd8, 0xa754355d, 0xda273305,
+    0x07b1ea80, 0xba7b864e, 0x67ed5fcb, 0x409d8afe, 0x9d0b537b,
+    0x20c13fb5, 0xfd57e630, 0x8024e068, 0x5db239ed, 0xe0785523,
+    0x3dee8ca6}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x00000000, 0x85d996dd, 0x4bb55c60, 0xce6ccabd, 0x966ab9c0,
+    0x13b32f1d, 0xdddfe5a0, 0x5806737d, 0x6dd3035a, 0xe80a9587,
+    0x26665f3a, 0xa3bfc9e7, 0xfbb9ba9a, 0x7e602c47, 0xb00ce6fa,
+    0x35d57027, 0xdaa607b4, 0x5f7f9169, 0x91135bd4, 0x14cacd09,
+    0x4cccbe74, 0xc91528a9, 0x0779e214, 0x82a074c9, 0xb77504ee,
+    0x32ac9233, 0xfcc0588e, 0x7919ce53, 0x211fbd2e, 0xa4c62bf3,
+    0x6aaae14e, 0xef737793, 0xf54b7eb3, 0x7092e86e, 0xbefe22d3,
+    0x3b27b40e, 0x6321c773, 0xe6f851ae, 0x28949b13, 0xad4d0dce,
+    0x98987de9, 0x1d41eb34, 0xd32d2189, 0x56f4b754, 0x0ef2c429,
+    0x8b2b52f4, 0x45479849, 0xc09e0e94, 0x2fed7907, 0xaa34efda,
+    0x64582567, 0xe181b3ba, 0xb987c0c7, 0x3c5e561a, 0xf2329ca7,
+    0x77eb0a7a, 0x423e7a5d, 0xc7e7ec80, 0x098b263d, 0x8c52b0e0,
+    0xd454c39d, 0x518d5540, 0x9fe19ffd, 0x1a380920, 0xab918dbd,
+    0x2e481b60, 0xe024d1dd, 0x65fd4700, 0x3dfb347d, 0xb822a2a0,
+    0x764e681d, 0xf397fec0, 0xc6428ee7, 0x439b183a, 0x8df7d287,
+    0x082e445a, 0x50283727, 0xd5f1a1fa, 0x1b9d6b47, 0x9e44fd9a,
+    0x71378a09, 0xf4ee1cd4, 0x3a82d669, 0xbf5b40b4, 0xe75d33c9,
+    0x6284a514, 0xace86fa9, 0x2931f974, 0x1ce48953, 0x993d1f8e,
+    0x5751d533, 0xd28843ee, 0x8a8e3093, 0x0f57a64e, 0xc13b6cf3,
+    0x44e2fa2e, 0x5edaf30e, 0xdb0365d3, 0x156faf6e, 0x90b639b3,
+    0xc8b04ace, 0x4d69dc13, 0x830516ae, 0x06dc8073, 0x3309f054,
+    0xb6d06689, 0x78bcac34, 0xfd653ae9, 0xa5634994, 0x20badf49,
+    0xeed615f4, 0x6b0f8329, 0x847cf4ba, 0x01a56267, 0xcfc9a8da,
+    0x4a103e07, 0x12164d7a, 0x97cfdba7, 0x59a3111a, 0xdc7a87c7,
+    0xe9aff7e0, 0x6c76613d, 0xa21aab80, 0x27c33d5d, 0x7fc54e20,
+    0xfa1cd8fd, 0x34701240, 0xb1a9849d, 0x17256aa0, 0x92fcfc7d,
+    0x5c9036c0, 0xd949a01d, 0x814fd360, 0x049645bd, 0xcafa8f00,
+    0x4f2319dd, 0x7af669fa, 0xff2fff27, 0x3143359a, 0xb49aa347,
+    0xec9cd03a, 0x694546e7, 0xa7298c5a, 0x22f01a87, 0xcd836d14,
+    0x485afbc9, 0x86363174, 0x03efa7a9, 0x5be9d4d4, 0xde304209,
+    0x105c88b4, 0x95851e69, 0xa0506e4e, 0x2589f893, 0xebe5322e,
+    0x6e3ca4f3, 0x363ad78e, 0xb3e34153, 0x7d8f8bee, 0xf8561d33,
+    0xe26e1413, 0x67b782ce, 0xa9db4873, 0x2c02deae, 0x7404add3,
+    0xf1dd3b0e, 0x3fb1f1b3, 0xba68676e, 0x8fbd1749, 0x0a648194,
+    0xc4084b29, 0x41d1ddf4, 0x19d7ae89, 0x9c0e3854, 0x5262f2e9,
+    0xd7bb6434, 0x38c813a7, 0xbd11857a, 0x737d4fc7, 0xf6a4d91a,
+    0xaea2aa67, 0x2b7b3cba, 0xe517f607, 0x60ce60da, 0x551b10fd,
+    0xd0c28620, 0x1eae4c9d, 0x9b77da40, 0xc371a93d, 0x46a83fe0,
+    0x88c4f55d, 0x0d1d6380, 0xbcb4e71d, 0x396d71c0, 0xf701bb7d,
+    0x72d82da0, 0x2ade5edd, 0xaf07c800, 0x616b02bd, 0xe4b29460,
+    0xd167e447, 0x54be729a, 0x9ad2b827, 0x1f0b2efa, 0x470d5d87,
+    0xc2d4cb5a, 0x0cb801e7, 0x8961973a, 0x6612e0a9, 0xe3cb7674,
+    0x2da7bcc9, 0xa87e2a14, 0xf0785969, 0x75a1cfb4, 0xbbcd0509,
+    0x3e1493d4, 0x0bc1e3f3, 0x8e18752e, 0x4074bf93, 0xc5ad294e,
+    0x9dab5a33, 0x1872ccee, 0xd61e0653, 0x53c7908e, 0x49ff99ae,
+    0xcc260f73, 0x024ac5ce, 0x87935313, 0xdf95206e, 0x5a4cb6b3,
+    0x94207c0e, 0x11f9ead3, 0x242c9af4, 0xa1f50c29, 0x6f99c694,
+    0xea405049, 0xb2462334, 0x379fb5e9, 0xf9f37f54, 0x7c2ae989,
+    0x93599e1a, 0x168008c7, 0xd8ecc27a, 0x5d3554a7, 0x053327da,
+    0x80eab107, 0x4e867bba, 0xcb5fed67, 0xfe8a9d40, 0x7b530b9d,
+    0xb53fc120, 0x30e657fd, 0x68e02480, 0xed39b25d, 0x235578e0,
+    0xa68cee3d},
+   {0x00000000, 0x76e10f9d, 0xadc46ee1, 0xdb25617c, 0x1b8fac19,
+    0x6d6ea384, 0xb64bc2f8, 0xc0aacd65, 0x361e5933, 0x40ff56ae,
+    0x9bda37d2, 0xed3b384f, 0x2d91f52a, 0x5b70fab7, 0x80559bcb,
+    0xf6b49456, 0x6c3cb266, 0x1addbdfb, 0xc1f8dc87, 0xb719d31a,
+    0x77b31e7f, 0x015211e2, 0xda77709e, 0xac967f03, 0x5a22eb55,
+    0x2cc3e4c8, 0xf7e685b4, 0x81078a29, 0x41ad474c, 0x374c48d1,
+    0xec6929ad, 0x9a882630, 0xd87864cd, 0xae996b50, 0x75bc0a2c,
+    0x035d05b1, 0xc3f7c8d4, 0xb516c749, 0x6e33a635, 0x18d2a9a8,
+    0xee663dfe, 0x98873263, 0x43a2531f, 0x35435c82, 0xf5e991e7,
+    0x83089e7a, 0x582dff06, 0x2eccf09b, 0xb444d6ab, 0xc2a5d936,
+    0x1980b84a, 0x6f61b7d7, 0xafcb7ab2, 0xd92a752f, 0x020f1453,
+    0x74ee1bce, 0x825a8f98, 0xf4bb8005, 0x2f9ee179, 0x597feee4,
+    0x99d52381, 0xef342c1c, 0x34114d60, 0x42f042fd, 0xf1f7b941,
+    0x8716b6dc, 0x5c33d7a0, 0x2ad2d83d, 0xea781558, 0x9c991ac5,
+    0x47bc7bb9, 0x315d7424, 0xc7e9e072, 0xb108efef, 0x6a2d8e93,
+    0x1ccc810e, 0xdc664c6b, 0xaa8743f6, 0x71a2228a, 0x07432d17,
+    0x9dcb0b27, 0xeb2a04ba, 0x300f65c6, 0x46ee6a5b, 0x8644a73e,
+    0xf0a5a8a3, 0x2b80c9df, 0x5d61c642, 0xabd55214, 0xdd345d89,
+    0x06113cf5, 0x70f03368, 0xb05afe0d, 0xc6bbf190, 0x1d9e90ec,
+    0x6b7f9f71, 0x298fdd8c, 0x5f6ed211, 0x844bb36d, 0xf2aabcf0,
+    0x32007195, 0x44e17e08, 0x9fc41f74, 0xe92510e9, 0x1f9184bf,
+    0x69708b22, 0xb255ea5e, 0xc4b4e5c3, 0x041e28a6, 0x72ff273b,
+    0xa9da4647, 0xdf3b49da, 0x45b36fea, 0x33526077, 0xe877010b,
+    0x9e960e96, 0x5e3cc3f3, 0x28ddcc6e, 0xf3f8ad12, 0x8519a28f,
+    0x73ad36d9, 0x054c3944, 0xde695838, 0xa88857a5, 0x68229ac0,
+    0x1ec3955d, 0xc5e6f421, 0xb307fbbc, 0xe2ef7383, 0x940e7c1e,
+    0x4f2b1d62, 0x39ca12ff, 0xf960df9a, 0x8f81d007, 0x54a4b17b,
+    0x2245bee6, 0xd4f12ab0, 0xa210252d, 0x79354451, 0x0fd44bcc,
+    0xcf7e86a9, 0xb99f8934, 0x62bae848, 0x145be7d5, 0x8ed3c1e5,
+    0xf832ce78, 0x2317af04, 0x55f6a099, 0x955c6dfc, 0xe3bd6261,
+    0x3898031d, 0x4e790c80, 0xb8cd98d6, 0xce2c974b, 0x1509f637,
+    0x63e8f9aa, 0xa34234cf, 0xd5a33b52, 0x0e865a2e, 0x786755b3,
+    0x3a97174e, 0x4c7618d3, 0x975379af, 0xe1b27632, 0x2118bb57,
+    0x57f9b4ca, 0x8cdcd5b6, 0xfa3dda2b, 0x0c894e7d, 0x7a6841e0,
+    0xa14d209c, 0xd7ac2f01, 0x1706e264, 0x61e7edf9, 0xbac28c85,
+    0xcc238318, 0x56aba528, 0x204aaab5, 0xfb6fcbc9, 0x8d8ec454,
+    0x4d240931, 0x3bc506ac, 0xe0e067d0, 0x9601684d, 0x60b5fc1b,
+    0x1654f386, 0xcd7192fa, 0xbb909d67, 0x7b3a5002, 0x0ddb5f9f,
+    0xd6fe3ee3, 0xa01f317e, 0x1318cac2, 0x65f9c55f, 0xbedca423,
+    0xc83dabbe, 0x089766db, 0x7e766946, 0xa553083a, 0xd3b207a7,
+    0x250693f1, 0x53e79c6c, 0x88c2fd10, 0xfe23f28d, 0x3e893fe8,
+    0x48683075, 0x934d5109, 0xe5ac5e94, 0x7f2478a4, 0x09c57739,
+    0xd2e01645, 0xa40119d8, 0x64abd4bd, 0x124adb20, 0xc96fba5c,
+    0xbf8eb5c1, 0x493a2197, 0x3fdb2e0a, 0xe4fe4f76, 0x921f40eb,
+    0x52b58d8e, 0x24548213, 0xff71e36f, 0x8990ecf2, 0xcb60ae0f,
+    0xbd81a192, 0x66a4c0ee, 0x1045cf73, 0xd0ef0216, 0xa60e0d8b,
+    0x7d2b6cf7, 0x0bca636a, 0xfd7ef73c, 0x8b9ff8a1, 0x50ba99dd,
+    0x265b9640, 0xe6f15b25, 0x901054b8, 0x4b3535c4, 0x3dd43a59,
+    0xa75c1c69, 0xd1bd13f4, 0x0a987288, 0x7c797d15, 0xbcd3b070,
+    0xca32bfed, 0x1117de91, 0x67f6d10c, 0x9142455a, 0xe7a34ac7,
+    0x3c862bbb, 0x4a672426, 0x8acde943, 0xfc2ce6de, 0x270987a2,
+    0x51e8883f},
+   {0x00000000, 0xe8dbfbb9, 0x91b186a8, 0x796a7d11, 0x63657c8a,
+    0x8bbe8733, 0xf2d4fa22, 0x1a0f019b, 0x87cc89cf, 0x6f177276,
+    0x167d0f67, 0xfea6f4de, 0xe4a9f545, 0x0c720efc, 0x751873ed,
+    0x9dc38854, 0x4f9f6244, 0xa74499fd, 0xde2ee4ec, 0x36f51f55,
+    0x2cfa1ece, 0xc421e577, 0xbd4b9866, 0x559063df, 0xc853eb8b,
+    0x20881032, 0x59e26d23, 0xb139969a, 0xab369701, 0x43ed6cb8,
+    0x3a8711a9, 0xd25cea10, 0x9e3ec588, 0x76e53e31, 0x0f8f4320,
+    0xe754b899, 0xfd5bb902, 0x158042bb, 0x6cea3faa, 0x8431c413,
+    0x19f24c47, 0xf129b7fe, 0x8843caef, 0x60983156, 0x7a9730cd,
+    0x924ccb74, 0xeb26b665, 0x03fd4ddc, 0xd1a1a7cc, 0x397a5c75,
+    0x40102164, 0xa8cbdadd, 0xb2c4db46, 0x5a1f20ff, 0x23755dee,
+    0xcbaea657, 0x566d2e03, 0xbeb6d5ba, 0xc7dca8ab, 0x2f075312,
+    0x35085289, 0xddd3a930, 0xa4b9d421, 0x4c622f98, 0x7d7bfbca,
+    0x95a00073, 0xecca7d62, 0x041186db, 0x1e1e8740, 0xf6c57cf9,
+    0x8faf01e8, 0x6774fa51, 0xfab77205, 0x126c89bc, 0x6b06f4ad,
+    0x83dd0f14, 0x99d20e8f, 0x7109f536, 0x08638827, 0xe0b8739e,
+    0x32e4998e, 0xda3f6237, 0xa3551f26, 0x4b8ee49f, 0x5181e504,
+    0xb95a1ebd, 0xc03063ac, 0x28eb9815, 0xb5281041, 0x5df3ebf8,
+    0x249996e9, 0xcc426d50, 0xd64d6ccb, 0x3e969772, 0x47fcea63,
+    0xaf2711da, 0xe3453e42, 0x0b9ec5fb, 0x72f4b8ea, 0x9a2f4353,
+    0x802042c8, 0x68fbb971, 0x1191c460, 0xf94a3fd9, 0x6489b78d,
+    0x8c524c34, 0xf5383125, 0x1de3ca9c, 0x07eccb07, 0xef3730be,
+    0x965d4daf, 0x7e86b616, 0xacda5c06, 0x4401a7bf, 0x3d6bdaae,
+    0xd5b02117, 0xcfbf208c, 0x2764db35, 0x5e0ea624, 0xb6d55d9d,
+    0x2b16d5c9, 0xc3cd2e70, 0xbaa75361, 0x527ca8d8, 0x4873a943,
+    0xa0a852fa, 0xd9c22feb, 0x3119d452, 0xbbf0874e, 0x532b7cf7,
+    0x2a4101e6, 0xc29afa5f, 0xd895fbc4, 0x304e007d, 0x49247d6c,
+    0xa1ff86d5, 0x3c3c0e81, 0xd4e7f538, 0xad8d8829, 0x45567390,
+    0x5f59720b, 0xb78289b2, 0xcee8f4a3, 0x26330f1a, 0xf46fe50a,
+    0x1cb41eb3, 0x65de63a2, 0x8d05981b, 0x970a9980, 0x7fd16239,
+    0x06bb1f28, 0xee60e491, 0x73a36cc5, 0x9b78977c, 0xe212ea6d,
+    0x0ac911d4, 0x10c6104f, 0xf81debf6, 0x817796e7, 0x69ac6d5e,
+    0x25ce42c6, 0xcd15b97f, 0xb47fc46e, 0x5ca43fd7, 0x46ab3e4c,
+    0xae70c5f5, 0xd71ab8e4, 0x3fc1435d, 0xa202cb09, 0x4ad930b0,
+    0x33b34da1, 0xdb68b618, 0xc167b783, 0x29bc4c3a, 0x50d6312b,
+    0xb80dca92, 0x6a512082, 0x828adb3b, 0xfbe0a62a, 0x133b5d93,
+    0x09345c08, 0xe1efa7b1, 0x9885daa0, 0x705e2119, 0xed9da94d,
+    0x054652f4, 0x7c2c2fe5, 0x94f7d45c, 0x8ef8d5c7, 0x66232e7e,
+    0x1f49536f, 0xf792a8d6, 0xc68b7c84, 0x2e50873d, 0x573afa2c,
+    0xbfe10195, 0xa5ee000e, 0x4d35fbb7, 0x345f86a6, 0xdc847d1f,
+    0x4147f54b, 0xa99c0ef2, 0xd0f673e3, 0x382d885a, 0x222289c1,
+    0xcaf97278, 0xb3930f69, 0x5b48f4d0, 0x89141ec0, 0x61cfe579,
+    0x18a59868, 0xf07e63d1, 0xea71624a, 0x02aa99f3, 0x7bc0e4e2,
+    0x931b1f5b, 0x0ed8970f, 0xe6036cb6, 0x9f6911a7, 0x77b2ea1e,
+    0x6dbdeb85, 0x8566103c, 0xfc0c6d2d, 0x14d79694, 0x58b5b90c,
+    0xb06e42b5, 0xc9043fa4, 0x21dfc41d, 0x3bd0c586, 0xd30b3e3f,
+    0xaa61432e, 0x42bab897, 0xdf7930c3, 0x37a2cb7a, 0x4ec8b66b,
+    0xa6134dd2, 0xbc1c4c49, 0x54c7b7f0, 0x2dadcae1, 0xc5763158,
+    0x172adb48, 0xfff120f1, 0x869b5de0, 0x6e40a659, 0x744fa7c2,
+    0x9c945c7b, 0xe5fe216a, 0x0d25dad3, 0x90e65287, 0x783da93e,
+    0x0157d42f, 0xe98c2f96, 0xf3832e0d, 0x1b58d5b4, 0x6232a8a5,
+    0x8ae9531c},
+   {0x00000000, 0x919168ae, 0x6325a087, 0xf2b4c829, 0x874c31d4,
+    0x16dd597a, 0xe4699153, 0x75f8f9fd, 0x4f9f1373, 0xde0e7bdd,
+    0x2cbab3f4, 0xbd2bdb5a, 0xc8d322a7, 0x59424a09, 0xabf68220,
+    0x3a67ea8e, 0x9e3e27e6, 0x0faf4f48, 0xfd1b8761, 0x6c8aefcf,
+    0x19721632, 0x88e37e9c, 0x7a57b6b5, 0xebc6de1b, 0xd1a13495,
+    0x40305c3b, 0xb2849412, 0x2315fcbc, 0x56ed0541, 0xc77c6def,
+    0x35c8a5c6, 0xa459cd68, 0x7d7b3f17, 0xecea57b9, 0x1e5e9f90,
+    0x8fcff73e, 0xfa370ec3, 0x6ba6666d, 0x9912ae44, 0x0883c6ea,
+    0x32e42c64, 0xa37544ca, 0x51c18ce3, 0xc050e44d, 0xb5a81db0,
+    0x2439751e, 0xd68dbd37, 0x471cd599, 0xe34518f1, 0x72d4705f,
+    0x8060b876, 0x11f1d0d8, 0x64092925, 0xf598418b, 0x072c89a2,
+    0x96bde10c, 0xacda0b82, 0x3d4b632c, 0xcfffab05, 0x5e6ec3ab,
+    0x2b963a56, 0xba0752f8, 0x48b39ad1, 0xd922f27f, 0xfaf67e2e,
+    0x6b671680, 0x99d3dea9, 0x0842b607, 0x7dba4ffa, 0xec2b2754,
+    0x1e9fef7d, 0x8f0e87d3, 0xb5696d5d, 0x24f805f3, 0xd64ccdda,
+    0x47dda574, 0x32255c89, 0xa3b43427, 0x5100fc0e, 0xc09194a0,
+    0x64c859c8, 0xf5593166, 0x07edf94f, 0x967c91e1, 0xe384681c,
+    0x721500b2, 0x80a1c89b, 0x1130a035, 0x2b574abb, 0xbac62215,
+    0x4872ea3c, 0xd9e38292, 0xac1b7b6f, 0x3d8a13c1, 0xcf3edbe8,
+    0x5eafb346, 0x878d4139, 0x161c2997, 0xe4a8e1be, 0x75398910,
+    0x00c170ed, 0x91501843, 0x63e4d06a, 0xf275b8c4, 0xc812524a,
+    0x59833ae4, 0xab37f2cd, 0x3aa69a63, 0x4f5e639e, 0xdecf0b30,
+    0x2c7bc319, 0xbdeaabb7, 0x19b366df, 0x88220e71, 0x7a96c658,
+    0xeb07aef6, 0x9eff570b, 0x0f6e3fa5, 0xfddaf78c, 0x6c4b9f22,
+    0x562c75ac, 0xc7bd1d02, 0x3509d52b, 0xa498bd85, 0xd1604478,
+    0x40f12cd6, 0xb245e4ff, 0x23d48c51, 0xf4edfd5c, 0x657c95f2,
+    0x97c85ddb, 0x06593575, 0x73a1cc88, 0xe230a426, 0x10846c0f,
+    0x811504a1, 0xbb72ee2f, 0x2ae38681, 0xd8574ea8, 0x49c62606,
+    0x3c3edffb, 0xadafb755, 0x5f1b7f7c, 0xce8a17d2, 0x6ad3daba,
+    0xfb42b214, 0x09f67a3d, 0x98671293, 0xed9feb6e, 0x7c0e83c0,
+    0x8eba4be9, 0x1f2b2347, 0x254cc9c9, 0xb4dda167, 0x4669694e,
+    0xd7f801e0, 0xa200f81d, 0x339190b3, 0xc125589a, 0x50b43034,
+    0x8996c24b, 0x1807aae5, 0xeab362cc, 0x7b220a62, 0x0edaf39f,
+    0x9f4b9b31, 0x6dff5318, 0xfc6e3bb6, 0xc609d138, 0x5798b996,
+    0xa52c71bf, 0x34bd1911, 0x4145e0ec, 0xd0d48842, 0x2260406b,
+    0xb3f128c5, 0x17a8e5ad, 0x86398d03, 0x748d452a, 0xe51c2d84,
+    0x90e4d479, 0x0175bcd7, 0xf3c174fe, 0x62501c50, 0x5837f6de,
+    0xc9a69e70, 0x3b125659, 0xaa833ef7, 0xdf7bc70a, 0x4eeaafa4,
+    0xbc5e678d, 0x2dcf0f23, 0x0e1b8372, 0x9f8aebdc, 0x6d3e23f5,
+    0xfcaf4b5b, 0x8957b2a6, 0x18c6da08, 0xea721221, 0x7be37a8f,
+    0x41849001, 0xd015f8af, 0x22a13086, 0xb3305828, 0xc6c8a1d5,
+    0x5759c97b, 0xa5ed0152, 0x347c69fc, 0x9025a494, 0x01b4cc3a,
+    0xf3000413, 0x62916cbd, 0x17699540, 0x86f8fdee, 0x744c35c7,
+    0xe5dd5d69, 0xdfbab7e7, 0x4e2bdf49, 0xbc9f1760, 0x2d0e7fce,
+    0x58f68633, 0xc967ee9d, 0x3bd326b4, 0xaa424e1a, 0x7360bc65,
+    0xe2f1d4cb, 0x10451ce2, 0x81d4744c, 0xf42c8db1, 0x65bde51f,
+    0x97092d36, 0x06984598, 0x3cffaf16, 0xad6ec7b8, 0x5fda0f91,
+    0xce4b673f, 0xbbb39ec2, 0x2a22f66c, 0xd8963e45, 0x490756eb,
+    0xed5e9b83, 0x7ccff32d, 0x8e7b3b04, 0x1fea53aa, 0x6a12aa57,
+    0xfb83c2f9, 0x09370ad0, 0x98a6627e, 0xa2c188f0, 0x3350e05e,
+    0xc1e42877, 0x507540d9, 0x258db924, 0xb41cd18a, 0x46a819a3,
+    0xd739710d}};
+
+#endif
+
+#endif
+
+#if N == 5
+
+#if W == 8
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0xaf449247, 0x85f822cf, 0x2abcb088, 0xd08143df,
+    0x7fc5d198, 0x55796110, 0xfa3df357, 0x7a7381ff, 0xd53713b8,
+    0xff8ba330, 0x50cf3177, 0xaaf2c220, 0x05b65067, 0x2f0ae0ef,
+    0x804e72a8, 0xf4e703fe, 0x5ba391b9, 0x711f2131, 0xde5bb376,
+    0x24664021, 0x8b22d266, 0xa19e62ee, 0x0edaf0a9, 0x8e948201,
+    0x21d01046, 0x0b6ca0ce, 0xa4283289, 0x5e15c1de, 0xf1515399,
+    0xdbede311, 0x74a97156, 0x32bf01bd, 0x9dfb93fa, 0xb7472372,
+    0x1803b135, 0xe23e4262, 0x4d7ad025, 0x67c660ad, 0xc882f2ea,
+    0x48cc8042, 0xe7881205, 0xcd34a28d, 0x627030ca, 0x984dc39d,
+    0x370951da, 0x1db5e152, 0xb2f17315, 0xc6580243, 0x691c9004,
+    0x43a0208c, 0xece4b2cb, 0x16d9419c, 0xb99dd3db, 0x93216353,
+    0x3c65f114, 0xbc2b83bc, 0x136f11fb, 0x39d3a173, 0x96973334,
+    0x6caac063, 0xc3ee5224, 0xe952e2ac, 0x461670eb, 0x657e037a,
+    0xca3a913d, 0xe08621b5, 0x4fc2b3f2, 0xb5ff40a5, 0x1abbd2e2,
+    0x3007626a, 0x9f43f02d, 0x1f0d8285, 0xb04910c2, 0x9af5a04a,
+    0x35b1320d, 0xcf8cc15a, 0x60c8531d, 0x4a74e395, 0xe53071d2,
+    0x91990084, 0x3edd92c3, 0x1461224b, 0xbb25b00c, 0x4118435b,
+    0xee5cd11c, 0xc4e06194, 0x6ba4f3d3, 0xebea817b, 0x44ae133c,
+    0x6e12a3b4, 0xc15631f3, 0x3b6bc2a4, 0x942f50e3, 0xbe93e06b,
+    0x11d7722c, 0x57c102c7, 0xf8859080, 0xd2392008, 0x7d7db24f,
+    0x87404118, 0x2804d35f, 0x02b863d7, 0xadfcf190, 0x2db28338,
+    0x82f6117f, 0xa84aa1f7, 0x070e33b0, 0xfd33c0e7, 0x527752a0,
+    0x78cbe228, 0xd78f706f, 0xa3260139, 0x0c62937e, 0x26de23f6,
+    0x899ab1b1, 0x73a742e6, 0xdce3d0a1, 0xf65f6029, 0x591bf26e,
+    0xd95580c6, 0x76111281, 0x5cada209, 0xf3e9304e, 0x09d4c319,
+    0xa690515e, 0x8c2ce1d6, 0x23687391, 0xcafc06f4, 0x65b894b3,
+    0x4f04243b, 0xe040b67c, 0x1a7d452b, 0xb539d76c, 0x9f8567e4,
+    0x30c1f5a3, 0xb08f870b, 0x1fcb154c, 0x3577a5c4, 0x9a333783,
+    0x600ec4d4, 0xcf4a5693, 0xe5f6e61b, 0x4ab2745c, 0x3e1b050a,
+    0x915f974d, 0xbbe327c5, 0x14a7b582, 0xee9a46d5, 0x41ded492,
+    0x6b62641a, 0xc426f65d, 0x446884f5, 0xeb2c16b2, 0xc190a63a,
+    0x6ed4347d, 0x94e9c72a, 0x3bad556d, 0x1111e5e5, 0xbe5577a2,
+    0xf8430749, 0x5707950e, 0x7dbb2586, 0xd2ffb7c1, 0x28c24496,
+    0x8786d6d1, 0xad3a6659, 0x027ef41e, 0x823086b6, 0x2d7414f1,
+    0x07c8a479, 0xa88c363e, 0x52b1c569, 0xfdf5572e, 0xd749e7a6,
+    0x780d75e1, 0x0ca404b7, 0xa3e096f0, 0x895c2678, 0x2618b43f,
+    0xdc254768, 0x7361d52f, 0x59dd65a7, 0xf699f7e0, 0x76d78548,
+    0xd993170f, 0xf32fa787, 0x5c6b35c0, 0xa656c697, 0x091254d0,
+    0x23aee458, 0x8cea761f, 0xaf82058e, 0x00c697c9, 0x2a7a2741,
+    0x853eb506, 0x7f034651, 0xd047d416, 0xfafb649e, 0x55bff6d9,
+    0xd5f18471, 0x7ab51636, 0x5009a6be, 0xff4d34f9, 0x0570c7ae,
+    0xaa3455e9, 0x8088e561, 0x2fcc7726, 0x5b650670, 0xf4219437,
+    0xde9d24bf, 0x71d9b6f8, 0x8be445af, 0x24a0d7e8, 0x0e1c6760,
+    0xa158f527, 0x2116878f, 0x8e5215c8, 0xa4eea540, 0x0baa3707,
+    0xf197c450, 0x5ed35617, 0x746fe69f, 0xdb2b74d8, 0x9d3d0433,
+    0x32799674, 0x18c526fc, 0xb781b4bb, 0x4dbc47ec, 0xe2f8d5ab,
+    0xc8446523, 0x6700f764, 0xe74e85cc, 0x480a178b, 0x62b6a703,
+    0xcdf23544, 0x37cfc613, 0x988b5454, 0xb237e4dc, 0x1d73769b,
+    0x69da07cd, 0xc69e958a, 0xec222502, 0x4366b745, 0xb95b4412,
+    0x161fd655, 0x3ca366dd, 0x93e7f49a, 0x13a98632, 0xbced1475,
+    0x9651a4fd, 0x391536ba, 0xc328c5ed, 0x6c6c57aa, 0x46d0e722,
+    0xe9947565},
+   {0x00000000, 0x4e890ba9, 0x9d121752, 0xd39b1cfb, 0xe15528e5,
+    0xafdc234c, 0x7c473fb7, 0x32ce341e, 0x19db578b, 0x57525c22,
+    0x84c940d9, 0xca404b70, 0xf88e7f6e, 0xb60774c7, 0x659c683c,
+    0x2b156395, 0x33b6af16, 0x7d3fa4bf, 0xaea4b844, 0xe02db3ed,
+    0xd2e387f3, 0x9c6a8c5a, 0x4ff190a1, 0x01789b08, 0x2a6df89d,
+    0x64e4f334, 0xb77fefcf, 0xf9f6e466, 0xcb38d078, 0x85b1dbd1,
+    0x562ac72a, 0x18a3cc83, 0x676d5e2c, 0x29e45585, 0xfa7f497e,
+    0xb4f642d7, 0x863876c9, 0xc8b17d60, 0x1b2a619b, 0x55a36a32,
+    0x7eb609a7, 0x303f020e, 0xe3a41ef5, 0xad2d155c, 0x9fe32142,
+    0xd16a2aeb, 0x02f13610, 0x4c783db9, 0x54dbf13a, 0x1a52fa93,
+    0xc9c9e668, 0x8740edc1, 0xb58ed9df, 0xfb07d276, 0x289cce8d,
+    0x6615c524, 0x4d00a6b1, 0x0389ad18, 0xd012b1e3, 0x9e9bba4a,
+    0xac558e54, 0xe2dc85fd, 0x31479906, 0x7fce92af, 0xcedabc58,
+    0x8053b7f1, 0x53c8ab0a, 0x1d41a0a3, 0x2f8f94bd, 0x61069f14,
+    0xb29d83ef, 0xfc148846, 0xd701ebd3, 0x9988e07a, 0x4a13fc81,
+    0x049af728, 0x3654c336, 0x78ddc89f, 0xab46d464, 0xe5cfdfcd,
+    0xfd6c134e, 0xb3e518e7, 0x607e041c, 0x2ef70fb5, 0x1c393bab,
+    0x52b03002, 0x812b2cf9, 0xcfa22750, 0xe4b744c5, 0xaa3e4f6c,
+    0x79a55397, 0x372c583e, 0x05e26c20, 0x4b6b6789, 0x98f07b72,
+    0xd67970db, 0xa9b7e274, 0xe73ee9dd, 0x34a5f526, 0x7a2cfe8f,
+    0x48e2ca91, 0x066bc138, 0xd5f0ddc3, 0x9b79d66a, 0xb06cb5ff,
+    0xfee5be56, 0x2d7ea2ad, 0x63f7a904, 0x51399d1a, 0x1fb096b3,
+    0xcc2b8a48, 0x82a281e1, 0x9a014d62, 0xd48846cb, 0x07135a30,
+    0x499a5199, 0x7b546587, 0x35dd6e2e, 0xe64672d5, 0xa8cf797c,
+    0x83da1ae9, 0xcd531140, 0x1ec80dbb, 0x50410612, 0x628f320c,
+    0x2c0639a5, 0xff9d255e, 0xb1142ef7, 0x46c47ef1, 0x084d7558,
+    0xdbd669a3, 0x955f620a, 0xa7915614, 0xe9185dbd, 0x3a834146,
+    0x740a4aef, 0x5f1f297a, 0x119622d3, 0xc20d3e28, 0x8c843581,
+    0xbe4a019f, 0xf0c30a36, 0x235816cd, 0x6dd11d64, 0x7572d1e7,
+    0x3bfbda4e, 0xe860c6b5, 0xa6e9cd1c, 0x9427f902, 0xdaaef2ab,
+    0x0935ee50, 0x47bce5f9, 0x6ca9866c, 0x22208dc5, 0xf1bb913e,
+    0xbf329a97, 0x8dfcae89, 0xc375a520, 0x10eeb9db, 0x5e67b272,
+    0x21a920dd, 0x6f202b74, 0xbcbb378f, 0xf2323c26, 0xc0fc0838,
+    0x8e750391, 0x5dee1f6a, 0x136714c3, 0x38727756, 0x76fb7cff,
+    0xa5606004, 0xebe96bad, 0xd9275fb3, 0x97ae541a, 0x443548e1,
+    0x0abc4348, 0x121f8fcb, 0x5c968462, 0x8f0d9899, 0xc1849330,
+    0xf34aa72e, 0xbdc3ac87, 0x6e58b07c, 0x20d1bbd5, 0x0bc4d840,
+    0x454dd3e9, 0x96d6cf12, 0xd85fc4bb, 0xea91f0a5, 0xa418fb0c,
+    0x7783e7f7, 0x390aec5e, 0x881ec2a9, 0xc697c900, 0x150cd5fb,
+    0x5b85de52, 0x694bea4c, 0x27c2e1e5, 0xf459fd1e, 0xbad0f6b7,
+    0x91c59522, 0xdf4c9e8b, 0x0cd78270, 0x425e89d9, 0x7090bdc7,
+    0x3e19b66e, 0xed82aa95, 0xa30ba13c, 0xbba86dbf, 0xf5216616,
+    0x26ba7aed, 0x68337144, 0x5afd455a, 0x14744ef3, 0xc7ef5208,
+    0x896659a1, 0xa2733a34, 0xecfa319d, 0x3f612d66, 0x71e826cf,
+    0x432612d1, 0x0daf1978, 0xde340583, 0x90bd0e2a, 0xef739c85,
+    0xa1fa972c, 0x72618bd7, 0x3ce8807e, 0x0e26b460, 0x40afbfc9,
+    0x9334a332, 0xddbda89b, 0xf6a8cb0e, 0xb821c0a7, 0x6bbadc5c,
+    0x2533d7f5, 0x17fde3eb, 0x5974e842, 0x8aeff4b9, 0xc466ff10,
+    0xdcc53393, 0x924c383a, 0x41d724c1, 0x0f5e2f68, 0x3d901b76,
+    0x731910df, 0xa0820c24, 0xee0b078d, 0xc51e6418, 0x8b976fb1,
+    0x580c734a, 0x168578e3, 0x244b4cfd, 0x6ac24754, 0xb9595baf,
+    0xf7d05006},
+   {0x00000000, 0x8d88fde2, 0xc060fd85, 0x4de80067, 0x5bb0fd4b,
+    0xd63800a9, 0x9bd000ce, 0x1658fd2c, 0xb761fa96, 0x3ae90774,
+    0x77010713, 0xfa89faf1, 0xecd107dd, 0x6159fa3f, 0x2cb1fa58,
+    0xa13907ba, 0xb5b2f36d, 0x383a0e8f, 0x75d20ee8, 0xf85af30a,
+    0xee020e26, 0x638af3c4, 0x2e62f3a3, 0xa3ea0e41, 0x02d309fb,
+    0x8f5bf419, 0xc2b3f47e, 0x4f3b099c, 0x5963f4b0, 0xd4eb0952,
+    0x99030935, 0x148bf4d7, 0xb014e09b, 0x3d9c1d79, 0x70741d1e,
+    0xfdfce0fc, 0xeba41dd0, 0x662ce032, 0x2bc4e055, 0xa64c1db7,
+    0x07751a0d, 0x8afde7ef, 0xc715e788, 0x4a9d1a6a, 0x5cc5e746,
+    0xd14d1aa4, 0x9ca51ac3, 0x112de721, 0x05a613f6, 0x882eee14,
+    0xc5c6ee73, 0x484e1391, 0x5e16eebd, 0xd39e135f, 0x9e761338,
+    0x13feeeda, 0xb2c7e960, 0x3f4f1482, 0x72a714e5, 0xff2fe907,
+    0xe977142b, 0x64ffe9c9, 0x2917e9ae, 0xa49f144c, 0xbb58c777,
+    0x36d03a95, 0x7b383af2, 0xf6b0c710, 0xe0e83a3c, 0x6d60c7de,
+    0x2088c7b9, 0xad003a5b, 0x0c393de1, 0x81b1c003, 0xcc59c064,
+    0x41d13d86, 0x5789c0aa, 0xda013d48, 0x97e93d2f, 0x1a61c0cd,
+    0x0eea341a, 0x8362c9f8, 0xce8ac99f, 0x4302347d, 0x555ac951,
+    0xd8d234b3, 0x953a34d4, 0x18b2c936, 0xb98bce8c, 0x3403336e,
+    0x79eb3309, 0xf463ceeb, 0xe23b33c7, 0x6fb3ce25, 0x225bce42,
+    0xafd333a0, 0x0b4c27ec, 0x86c4da0e, 0xcb2cda69, 0x46a4278b,
+    0x50fcdaa7, 0xdd742745, 0x909c2722, 0x1d14dac0, 0xbc2ddd7a,
+    0x31a52098, 0x7c4d20ff, 0xf1c5dd1d, 0xe79d2031, 0x6a15ddd3,
+    0x27fdddb4, 0xaa752056, 0xbefed481, 0x33762963, 0x7e9e2904,
+    0xf316d4e6, 0xe54e29ca, 0x68c6d428, 0x252ed44f, 0xa8a629ad,
+    0x099f2e17, 0x8417d3f5, 0xc9ffd392, 0x44772e70, 0x522fd35c,
+    0xdfa72ebe, 0x924f2ed9, 0x1fc7d33b, 0xadc088af, 0x2048754d,
+    0x6da0752a, 0xe02888c8, 0xf67075e4, 0x7bf88806, 0x36108861,
+    0xbb987583, 0x1aa17239, 0x97298fdb, 0xdac18fbc, 0x5749725e,
+    0x41118f72, 0xcc997290, 0x817172f7, 0x0cf98f15, 0x18727bc2,
+    0x95fa8620, 0xd8128647, 0x559a7ba5, 0x43c28689, 0xce4a7b6b,
+    0x83a27b0c, 0x0e2a86ee, 0xaf138154, 0x229b7cb6, 0x6f737cd1,
+    0xe2fb8133, 0xf4a37c1f, 0x792b81fd, 0x34c3819a, 0xb94b7c78,
+    0x1dd46834, 0x905c95d6, 0xddb495b1, 0x503c6853, 0x4664957f,
+    0xcbec689d, 0x860468fa, 0x0b8c9518, 0xaab592a2, 0x273d6f40,
+    0x6ad56f27, 0xe75d92c5, 0xf1056fe9, 0x7c8d920b, 0x3165926c,
+    0xbced6f8e, 0xa8669b59, 0x25ee66bb, 0x680666dc, 0xe58e9b3e,
+    0xf3d66612, 0x7e5e9bf0, 0x33b69b97, 0xbe3e6675, 0x1f0761cf,
+    0x928f9c2d, 0xdf679c4a, 0x52ef61a8, 0x44b79c84, 0xc93f6166,
+    0x84d76101, 0x095f9ce3, 0x16984fd8, 0x9b10b23a, 0xd6f8b25d,
+    0x5b704fbf, 0x4d28b293, 0xc0a04f71, 0x8d484f16, 0x00c0b2f4,
+    0xa1f9b54e, 0x2c7148ac, 0x619948cb, 0xec11b529, 0xfa494805,
+    0x77c1b5e7, 0x3a29b580, 0xb7a14862, 0xa32abcb5, 0x2ea24157,
+    0x634a4130, 0xeec2bcd2, 0xf89a41fe, 0x7512bc1c, 0x38fabc7b,
+    0xb5724199, 0x144b4623, 0x99c3bbc1, 0xd42bbba6, 0x59a34644,
+    0x4ffbbb68, 0xc273468a, 0x8f9b46ed, 0x0213bb0f, 0xa68caf43,
+    0x2b0452a1, 0x66ec52c6, 0xeb64af24, 0xfd3c5208, 0x70b4afea,
+    0x3d5caf8d, 0xb0d4526f, 0x11ed55d5, 0x9c65a837, 0xd18da850,
+    0x5c0555b2, 0x4a5da89e, 0xc7d5557c, 0x8a3d551b, 0x07b5a8f9,
+    0x133e5c2e, 0x9eb6a1cc, 0xd35ea1ab, 0x5ed65c49, 0x488ea165,
+    0xc5065c87, 0x88ee5ce0, 0x0566a102, 0xa45fa6b8, 0x29d75b5a,
+    0x643f5b3d, 0xe9b7a6df, 0xffef5bf3, 0x7267a611, 0x3f8fa676,
+    0xb2075b94},
+   {0x00000000, 0x80f0171f, 0xda91287f, 0x5a613f60, 0x6e5356bf,
+    0xeea341a0, 0xb4c27ec0, 0x343269df, 0xdca6ad7e, 0x5c56ba61,
+    0x06378501, 0x86c7921e, 0xb2f5fbc1, 0x3205ecde, 0x6864d3be,
+    0xe894c4a1, 0x623c5cbd, 0xe2cc4ba2, 0xb8ad74c2, 0x385d63dd,
+    0x0c6f0a02, 0x8c9f1d1d, 0xd6fe227d, 0x560e3562, 0xbe9af1c3,
+    0x3e6ae6dc, 0x640bd9bc, 0xe4fbcea3, 0xd0c9a77c, 0x5039b063,
+    0x0a588f03, 0x8aa8981c, 0xc478b97a, 0x4488ae65, 0x1ee99105,
+    0x9e19861a, 0xaa2befc5, 0x2adbf8da, 0x70bac7ba, 0xf04ad0a5,
+    0x18de1404, 0x982e031b, 0xc24f3c7b, 0x42bf2b64, 0x768d42bb,
+    0xf67d55a4, 0xac1c6ac4, 0x2cec7ddb, 0xa644e5c7, 0x26b4f2d8,
+    0x7cd5cdb8, 0xfc25daa7, 0xc817b378, 0x48e7a467, 0x12869b07,
+    0x92768c18, 0x7ae248b9, 0xfa125fa6, 0xa07360c6, 0x208377d9,
+    0x14b11e06, 0x94410919, 0xce203679, 0x4ed02166, 0x538074b5,
+    0xd37063aa, 0x89115cca, 0x09e14bd5, 0x3dd3220a, 0xbd233515,
+    0xe7420a75, 0x67b21d6a, 0x8f26d9cb, 0x0fd6ced4, 0x55b7f1b4,
+    0xd547e6ab, 0xe1758f74, 0x6185986b, 0x3be4a70b, 0xbb14b014,
+    0x31bc2808, 0xb14c3f17, 0xeb2d0077, 0x6bdd1768, 0x5fef7eb7,
+    0xdf1f69a8, 0x857e56c8, 0x058e41d7, 0xed1a8576, 0x6dea9269,
+    0x378bad09, 0xb77bba16, 0x8349d3c9, 0x03b9c4d6, 0x59d8fbb6,
+    0xd928eca9, 0x97f8cdcf, 0x1708dad0, 0x4d69e5b0, 0xcd99f2af,
+    0xf9ab9b70, 0x795b8c6f, 0x233ab30f, 0xa3caa410, 0x4b5e60b1,
+    0xcbae77ae, 0x91cf48ce, 0x113f5fd1, 0x250d360e, 0xa5fd2111,
+    0xff9c1e71, 0x7f6c096e, 0xf5c49172, 0x7534866d, 0x2f55b90d,
+    0xafa5ae12, 0x9b97c7cd, 0x1b67d0d2, 0x4106efb2, 0xc1f6f8ad,
+    0x29623c0c, 0xa9922b13, 0xf3f31473, 0x7303036c, 0x47316ab3,
+    0xc7c17dac, 0x9da042cc, 0x1d5055d3, 0xa700e96a, 0x27f0fe75,
+    0x7d91c115, 0xfd61d60a, 0xc953bfd5, 0x49a3a8ca, 0x13c297aa,
+    0x933280b5, 0x7ba64414, 0xfb56530b, 0xa1376c6b, 0x21c77b74,
+    0x15f512ab, 0x950505b4, 0xcf643ad4, 0x4f942dcb, 0xc53cb5d7,
+    0x45cca2c8, 0x1fad9da8, 0x9f5d8ab7, 0xab6fe368, 0x2b9ff477,
+    0x71fecb17, 0xf10edc08, 0x199a18a9, 0x996a0fb6, 0xc30b30d6,
+    0x43fb27c9, 0x77c94e16, 0xf7395909, 0xad586669, 0x2da87176,
+    0x63785010, 0xe388470f, 0xb9e9786f, 0x39196f70, 0x0d2b06af,
+    0x8ddb11b0, 0xd7ba2ed0, 0x574a39cf, 0xbfdefd6e, 0x3f2eea71,
+    0x654fd511, 0xe5bfc20e, 0xd18dabd1, 0x517dbcce, 0x0b1c83ae,
+    0x8bec94b1, 0x01440cad, 0x81b41bb2, 0xdbd524d2, 0x5b2533cd,
+    0x6f175a12, 0xefe74d0d, 0xb586726d, 0x35766572, 0xdde2a1d3,
+    0x5d12b6cc, 0x077389ac, 0x87839eb3, 0xb3b1f76c, 0x3341e073,
+    0x6920df13, 0xe9d0c80c, 0xf4809ddf, 0x74708ac0, 0x2e11b5a0,
+    0xaee1a2bf, 0x9ad3cb60, 0x1a23dc7f, 0x4042e31f, 0xc0b2f400,
+    0x282630a1, 0xa8d627be, 0xf2b718de, 0x72470fc1, 0x4675661e,
+    0xc6857101, 0x9ce44e61, 0x1c14597e, 0x96bcc162, 0x164cd67d,
+    0x4c2de91d, 0xccddfe02, 0xf8ef97dd, 0x781f80c2, 0x227ebfa2,
+    0xa28ea8bd, 0x4a1a6c1c, 0xcaea7b03, 0x908b4463, 0x107b537c,
+    0x24493aa3, 0xa4b92dbc, 0xfed812dc, 0x7e2805c3, 0x30f824a5,
+    0xb00833ba, 0xea690cda, 0x6a991bc5, 0x5eab721a, 0xde5b6505,
+    0x843a5a65, 0x04ca4d7a, 0xec5e89db, 0x6cae9ec4, 0x36cfa1a4,
+    0xb63fb6bb, 0x820ddf64, 0x02fdc87b, 0x589cf71b, 0xd86ce004,
+    0x52c47818, 0xd2346f07, 0x88555067, 0x08a54778, 0x3c972ea7,
+    0xbc6739b8, 0xe60606d8, 0x66f611c7, 0x8e62d566, 0x0e92c279,
+    0x54f3fd19, 0xd403ea06, 0xe03183d9, 0x60c194c6, 0x3aa0aba6,
+    0xba50bcb9},
+   {0x00000000, 0x9570d495, 0xf190af6b, 0x64e07bfe, 0x38505897,
+    0xad208c02, 0xc9c0f7fc, 0x5cb02369, 0x70a0b12e, 0xe5d065bb,
+    0x81301e45, 0x1440cad0, 0x48f0e9b9, 0xdd803d2c, 0xb96046d2,
+    0x2c109247, 0xe141625c, 0x7431b6c9, 0x10d1cd37, 0x85a119a2,
+    0xd9113acb, 0x4c61ee5e, 0x288195a0, 0xbdf14135, 0x91e1d372,
+    0x049107e7, 0x60717c19, 0xf501a88c, 0xa9b18be5, 0x3cc15f70,
+    0x5821248e, 0xcd51f01b, 0x19f3c2f9, 0x8c83166c, 0xe8636d92,
+    0x7d13b907, 0x21a39a6e, 0xb4d34efb, 0xd0333505, 0x4543e190,
+    0x695373d7, 0xfc23a742, 0x98c3dcbc, 0x0db30829, 0x51032b40,
+    0xc473ffd5, 0xa093842b, 0x35e350be, 0xf8b2a0a5, 0x6dc27430,
+    0x09220fce, 0x9c52db5b, 0xc0e2f832, 0x55922ca7, 0x31725759,
+    0xa40283cc, 0x8812118b, 0x1d62c51e, 0x7982bee0, 0xecf26a75,
+    0xb042491c, 0x25329d89, 0x41d2e677, 0xd4a232e2, 0x33e785f2,
+    0xa6975167, 0xc2772a99, 0x5707fe0c, 0x0bb7dd65, 0x9ec709f0,
+    0xfa27720e, 0x6f57a69b, 0x434734dc, 0xd637e049, 0xb2d79bb7,
+    0x27a74f22, 0x7b176c4b, 0xee67b8de, 0x8a87c320, 0x1ff717b5,
+    0xd2a6e7ae, 0x47d6333b, 0x233648c5, 0xb6469c50, 0xeaf6bf39,
+    0x7f866bac, 0x1b661052, 0x8e16c4c7, 0xa2065680, 0x37768215,
+    0x5396f9eb, 0xc6e62d7e, 0x9a560e17, 0x0f26da82, 0x6bc6a17c,
+    0xfeb675e9, 0x2a14470b, 0xbf64939e, 0xdb84e860, 0x4ef43cf5,
+    0x12441f9c, 0x8734cb09, 0xe3d4b0f7, 0x76a46462, 0x5ab4f625,
+    0xcfc422b0, 0xab24594e, 0x3e548ddb, 0x62e4aeb2, 0xf7947a27,
+    0x937401d9, 0x0604d54c, 0xcb552557, 0x5e25f1c2, 0x3ac58a3c,
+    0xafb55ea9, 0xf3057dc0, 0x6675a955, 0x0295d2ab, 0x97e5063e,
+    0xbbf59479, 0x2e8540ec, 0x4a653b12, 0xdf15ef87, 0x83a5ccee,
+    0x16d5187b, 0x72356385, 0xe745b710, 0x67cf0be4, 0xf2bfdf71,
+    0x965fa48f, 0x032f701a, 0x5f9f5373, 0xcaef87e6, 0xae0ffc18,
+    0x3b7f288d, 0x176fbaca, 0x821f6e5f, 0xe6ff15a1, 0x738fc134,
+    0x2f3fe25d, 0xba4f36c8, 0xdeaf4d36, 0x4bdf99a3, 0x868e69b8,
+    0x13febd2d, 0x771ec6d3, 0xe26e1246, 0xbede312f, 0x2baee5ba,
+    0x4f4e9e44, 0xda3e4ad1, 0xf62ed896, 0x635e0c03, 0x07be77fd,
+    0x92cea368, 0xce7e8001, 0x5b0e5494, 0x3fee2f6a, 0xaa9efbff,
+    0x7e3cc91d, 0xeb4c1d88, 0x8fac6676, 0x1adcb2e3, 0x466c918a,
+    0xd31c451f, 0xb7fc3ee1, 0x228cea74, 0x0e9c7833, 0x9becaca6,
+    0xff0cd758, 0x6a7c03cd, 0x36cc20a4, 0xa3bcf431, 0xc75c8fcf,
+    0x522c5b5a, 0x9f7dab41, 0x0a0d7fd4, 0x6eed042a, 0xfb9dd0bf,
+    0xa72df3d6, 0x325d2743, 0x56bd5cbd, 0xc3cd8828, 0xefdd1a6f,
+    0x7aadcefa, 0x1e4db504, 0x8b3d6191, 0xd78d42f8, 0x42fd966d,
+    0x261ded93, 0xb36d3906, 0x54288e16, 0xc1585a83, 0xa5b8217d,
+    0x30c8f5e8, 0x6c78d681, 0xf9080214, 0x9de879ea, 0x0898ad7f,
+    0x24883f38, 0xb1f8ebad, 0xd5189053, 0x406844c6, 0x1cd867af,
+    0x89a8b33a, 0xed48c8c4, 0x78381c51, 0xb569ec4a, 0x201938df,
+    0x44f94321, 0xd18997b4, 0x8d39b4dd, 0x18496048, 0x7ca91bb6,
+    0xe9d9cf23, 0xc5c95d64, 0x50b989f1, 0x3459f20f, 0xa129269a,
+    0xfd9905f3, 0x68e9d166, 0x0c09aa98, 0x99797e0d, 0x4ddb4cef,
+    0xd8ab987a, 0xbc4be384, 0x293b3711, 0x758b1478, 0xe0fbc0ed,
+    0x841bbb13, 0x116b6f86, 0x3d7bfdc1, 0xa80b2954, 0xcceb52aa,
+    0x599b863f, 0x052ba556, 0x905b71c3, 0xf4bb0a3d, 0x61cbdea8,
+    0xac9a2eb3, 0x39eafa26, 0x5d0a81d8, 0xc87a554d, 0x94ca7624,
+    0x01baa2b1, 0x655ad94f, 0xf02a0dda, 0xdc3a9f9d, 0x494a4b08,
+    0x2daa30f6, 0xb8dae463, 0xe46ac70a, 0x711a139f, 0x15fa6861,
+    0x808abcf4},
+   {0x00000000, 0xcf9e17c8, 0x444d29d1, 0x8bd33e19, 0x889a53a2,
+    0x4704446a, 0xccd77a73, 0x03496dbb, 0xca45a105, 0x05dbb6cd,
+    0x8e0888d4, 0x41969f1c, 0x42dff2a7, 0x8d41e56f, 0x0692db76,
+    0xc90cccbe, 0x4ffa444b, 0x80645383, 0x0bb76d9a, 0xc4297a52,
+    0xc76017e9, 0x08fe0021, 0x832d3e38, 0x4cb329f0, 0x85bfe54e,
+    0x4a21f286, 0xc1f2cc9f, 0x0e6cdb57, 0x0d25b6ec, 0xc2bba124,
+    0x49689f3d, 0x86f688f5, 0x9ff48896, 0x506a9f5e, 0xdbb9a147,
+    0x1427b68f, 0x176edb34, 0xd8f0ccfc, 0x5323f2e5, 0x9cbde52d,
+    0x55b12993, 0x9a2f3e5b, 0x11fc0042, 0xde62178a, 0xdd2b7a31,
+    0x12b56df9, 0x996653e0, 0x56f84428, 0xd00eccdd, 0x1f90db15,
+    0x9443e50c, 0x5bddf2c4, 0x58949f7f, 0x970a88b7, 0x1cd9b6ae,
+    0xd347a166, 0x1a4b6dd8, 0xd5d57a10, 0x5e064409, 0x919853c1,
+    0x92d13e7a, 0x5d4f29b2, 0xd69c17ab, 0x19020063, 0xe498176d,
+    0x2b0600a5, 0xa0d53ebc, 0x6f4b2974, 0x6c0244cf, 0xa39c5307,
+    0x284f6d1e, 0xe7d17ad6, 0x2eddb668, 0xe143a1a0, 0x6a909fb9,
+    0xa50e8871, 0xa647e5ca, 0x69d9f202, 0xe20acc1b, 0x2d94dbd3,
+    0xab625326, 0x64fc44ee, 0xef2f7af7, 0x20b16d3f, 0x23f80084,
+    0xec66174c, 0x67b52955, 0xa82b3e9d, 0x6127f223, 0xaeb9e5eb,
+    0x256adbf2, 0xeaf4cc3a, 0xe9bda181, 0x2623b649, 0xadf08850,
+    0x626e9f98, 0x7b6c9ffb, 0xb4f28833, 0x3f21b62a, 0xf0bfa1e2,
+    0xf3f6cc59, 0x3c68db91, 0xb7bbe588, 0x7825f240, 0xb1293efe,
+    0x7eb72936, 0xf564172f, 0x3afa00e7, 0x39b36d5c, 0xf62d7a94,
+    0x7dfe448d, 0xb2605345, 0x3496dbb0, 0xfb08cc78, 0x70dbf261,
+    0xbf45e5a9, 0xbc0c8812, 0x73929fda, 0xf841a1c3, 0x37dfb60b,
+    0xfed37ab5, 0x314d6d7d, 0xba9e5364, 0x750044ac, 0x76492917,
+    0xb9d73edf, 0x320400c6, 0xfd9a170e, 0x1241289b, 0xdddf3f53,
+    0x560c014a, 0x99921682, 0x9adb7b39, 0x55456cf1, 0xde9652e8,
+    0x11084520, 0xd804899e, 0x179a9e56, 0x9c49a04f, 0x53d7b787,
+    0x509eda3c, 0x9f00cdf4, 0x14d3f3ed, 0xdb4de425, 0x5dbb6cd0,
+    0x92257b18, 0x19f64501, 0xd66852c9, 0xd5213f72, 0x1abf28ba,
+    0x916c16a3, 0x5ef2016b, 0x97fecdd5, 0x5860da1d, 0xd3b3e404,
+    0x1c2df3cc, 0x1f649e77, 0xd0fa89bf, 0x5b29b7a6, 0x94b7a06e,
+    0x8db5a00d, 0x422bb7c5, 0xc9f889dc, 0x06669e14, 0x052ff3af,
+    0xcab1e467, 0x4162da7e, 0x8efccdb6, 0x47f00108, 0x886e16c0,
+    0x03bd28d9, 0xcc233f11, 0xcf6a52aa, 0x00f44562, 0x8b277b7b,
+    0x44b96cb3, 0xc24fe446, 0x0dd1f38e, 0x8602cd97, 0x499cda5f,
+    0x4ad5b7e4, 0x854ba02c, 0x0e989e35, 0xc10689fd, 0x080a4543,
+    0xc794528b, 0x4c476c92, 0x83d97b5a, 0x809016e1, 0x4f0e0129,
+    0xc4dd3f30, 0x0b4328f8, 0xf6d93ff6, 0x3947283e, 0xb2941627,
+    0x7d0a01ef, 0x7e436c54, 0xb1dd7b9c, 0x3a0e4585, 0xf590524d,
+    0x3c9c9ef3, 0xf302893b, 0x78d1b722, 0xb74fa0ea, 0xb406cd51,
+    0x7b98da99, 0xf04be480, 0x3fd5f348, 0xb9237bbd, 0x76bd6c75,
+    0xfd6e526c, 0x32f045a4, 0x31b9281f, 0xfe273fd7, 0x75f401ce,
+    0xba6a1606, 0x7366dab8, 0xbcf8cd70, 0x372bf369, 0xf8b5e4a1,
+    0xfbfc891a, 0x34629ed2, 0xbfb1a0cb, 0x702fb703, 0x692db760,
+    0xa6b3a0a8, 0x2d609eb1, 0xe2fe8979, 0xe1b7e4c2, 0x2e29f30a,
+    0xa5facd13, 0x6a64dadb, 0xa3681665, 0x6cf601ad, 0xe7253fb4,
+    0x28bb287c, 0x2bf245c7, 0xe46c520f, 0x6fbf6c16, 0xa0217bde,
+    0x26d7f32b, 0xe949e4e3, 0x629adafa, 0xad04cd32, 0xae4da089,
+    0x61d3b741, 0xea008958, 0x259e9e90, 0xec92522e, 0x230c45e6,
+    0xa8df7bff, 0x67416c37, 0x6408018c, 0xab961644, 0x2045285d,
+    0xefdb3f95},
+   {0x00000000, 0x24825136, 0x4904a26c, 0x6d86f35a, 0x920944d8,
+    0xb68b15ee, 0xdb0de6b4, 0xff8fb782, 0xff638ff1, 0xdbe1dec7,
+    0xb6672d9d, 0x92e57cab, 0x6d6acb29, 0x49e89a1f, 0x246e6945,
+    0x00ec3873, 0x25b619a3, 0x01344895, 0x6cb2bbcf, 0x4830eaf9,
+    0xb7bf5d7b, 0x933d0c4d, 0xfebbff17, 0xda39ae21, 0xdad59652,
+    0xfe57c764, 0x93d1343e, 0xb7536508, 0x48dcd28a, 0x6c5e83bc,
+    0x01d870e6, 0x255a21d0, 0x4b6c3346, 0x6fee6270, 0x0268912a,
+    0x26eac01c, 0xd965779e, 0xfde726a8, 0x9061d5f2, 0xb4e384c4,
+    0xb40fbcb7, 0x908ded81, 0xfd0b1edb, 0xd9894fed, 0x2606f86f,
+    0x0284a959, 0x6f025a03, 0x4b800b35, 0x6eda2ae5, 0x4a587bd3,
+    0x27de8889, 0x035cd9bf, 0xfcd36e3d, 0xd8513f0b, 0xb5d7cc51,
+    0x91559d67, 0x91b9a514, 0xb53bf422, 0xd8bd0778, 0xfc3f564e,
+    0x03b0e1cc, 0x2732b0fa, 0x4ab443a0, 0x6e361296, 0x96d8668c,
+    0xb25a37ba, 0xdfdcc4e0, 0xfb5e95d6, 0x04d12254, 0x20537362,
+    0x4dd58038, 0x6957d10e, 0x69bbe97d, 0x4d39b84b, 0x20bf4b11,
+    0x043d1a27, 0xfbb2ada5, 0xdf30fc93, 0xb2b60fc9, 0x96345eff,
+    0xb36e7f2f, 0x97ec2e19, 0xfa6add43, 0xdee88c75, 0x21673bf7,
+    0x05e56ac1, 0x6863999b, 0x4ce1c8ad, 0x4c0df0de, 0x688fa1e8,
+    0x050952b2, 0x218b0384, 0xde04b406, 0xfa86e530, 0x9700166a,
+    0xb382475c, 0xddb455ca, 0xf93604fc, 0x94b0f7a6, 0xb032a690,
+    0x4fbd1112, 0x6b3f4024, 0x06b9b37e, 0x223be248, 0x22d7da3b,
+    0x06558b0d, 0x6bd37857, 0x4f512961, 0xb0de9ee3, 0x945ccfd5,
+    0xf9da3c8f, 0xdd586db9, 0xf8024c69, 0xdc801d5f, 0xb106ee05,
+    0x9584bf33, 0x6a0b08b1, 0x4e895987, 0x230faadd, 0x078dfbeb,
+    0x0761c398, 0x23e392ae, 0x4e6561f4, 0x6ae730c2, 0x95688740,
+    0xb1ead676, 0xdc6c252c, 0xf8ee741a, 0xf6c1cb59, 0xd2439a6f,
+    0xbfc56935, 0x9b473803, 0x64c88f81, 0x404adeb7, 0x2dcc2ded,
+    0x094e7cdb, 0x09a244a8, 0x2d20159e, 0x40a6e6c4, 0x6424b7f2,
+    0x9bab0070, 0xbf295146, 0xd2afa21c, 0xf62df32a, 0xd377d2fa,
+    0xf7f583cc, 0x9a737096, 0xbef121a0, 0x417e9622, 0x65fcc714,
+    0x087a344e, 0x2cf86578, 0x2c145d0b, 0x08960c3d, 0x6510ff67,
+    0x4192ae51, 0xbe1d19d3, 0x9a9f48e5, 0xf719bbbf, 0xd39bea89,
+    0xbdadf81f, 0x992fa929, 0xf4a95a73, 0xd02b0b45, 0x2fa4bcc7,
+    0x0b26edf1, 0x66a01eab, 0x42224f9d, 0x42ce77ee, 0x664c26d8,
+    0x0bcad582, 0x2f4884b4, 0xd0c73336, 0xf4456200, 0x99c3915a,
+    0xbd41c06c, 0x981be1bc, 0xbc99b08a, 0xd11f43d0, 0xf59d12e6,
+    0x0a12a564, 0x2e90f452, 0x43160708, 0x6794563e, 0x67786e4d,
+    0x43fa3f7b, 0x2e7ccc21, 0x0afe9d17, 0xf5712a95, 0xd1f37ba3,
+    0xbc7588f9, 0x98f7d9cf, 0x6019add5, 0x449bfce3, 0x291d0fb9,
+    0x0d9f5e8f, 0xf210e90d, 0xd692b83b, 0xbb144b61, 0x9f961a57,
+    0x9f7a2224, 0xbbf87312, 0xd67e8048, 0xf2fcd17e, 0x0d7366fc,
+    0x29f137ca, 0x4477c490, 0x60f595a6, 0x45afb476, 0x612de540,
+    0x0cab161a, 0x2829472c, 0xd7a6f0ae, 0xf324a198, 0x9ea252c2,
+    0xba2003f4, 0xbacc3b87, 0x9e4e6ab1, 0xf3c899eb, 0xd74ac8dd,
+    0x28c57f5f, 0x0c472e69, 0x61c1dd33, 0x45438c05, 0x2b759e93,
+    0x0ff7cfa5, 0x62713cff, 0x46f36dc9, 0xb97cda4b, 0x9dfe8b7d,
+    0xf0787827, 0xd4fa2911, 0xd4161162, 0xf0944054, 0x9d12b30e,
+    0xb990e238, 0x461f55ba, 0x629d048c, 0x0f1bf7d6, 0x2b99a6e0,
+    0x0ec38730, 0x2a41d606, 0x47c7255c, 0x6345746a, 0x9ccac3e8,
+    0xb84892de, 0xd5ce6184, 0xf14c30b2, 0xf1a008c1, 0xd52259f7,
+    0xb8a4aaad, 0x9c26fb9b, 0x63a94c19, 0x472b1d2f, 0x2aadee75,
+    0x0e2fbf43},
+   {0x00000000, 0x36f290f3, 0x6de521e6, 0x5b17b115, 0xdbca43cc,
+    0xed38d33f, 0xb62f622a, 0x80ddf2d9, 0x6ce581d9, 0x5a17112a,
+    0x0100a03f, 0x37f230cc, 0xb72fc215, 0x81dd52e6, 0xdacae3f3,
+    0xec387300, 0xd9cb03b2, 0xef399341, 0xb42e2254, 0x82dcb2a7,
+    0x0201407e, 0x34f3d08d, 0x6fe46198, 0x5916f16b, 0xb52e826b,
+    0x83dc1298, 0xd8cba38d, 0xee39337e, 0x6ee4c1a7, 0x58165154,
+    0x0301e041, 0x35f370b2, 0x68e70125, 0x5e1591d6, 0x050220c3,
+    0x33f0b030, 0xb32d42e9, 0x85dfd21a, 0xdec8630f, 0xe83af3fc,
+    0x040280fc, 0x32f0100f, 0x69e7a11a, 0x5f1531e9, 0xdfc8c330,
+    0xe93a53c3, 0xb22de2d6, 0x84df7225, 0xb12c0297, 0x87de9264,
+    0xdcc92371, 0xea3bb382, 0x6ae6415b, 0x5c14d1a8, 0x070360bd,
+    0x31f1f04e, 0xddc9834e, 0xeb3b13bd, 0xb02ca2a8, 0x86de325b,
+    0x0603c082, 0x30f15071, 0x6be6e164, 0x5d147197, 0xd1ce024a,
+    0xe73c92b9, 0xbc2b23ac, 0x8ad9b35f, 0x0a044186, 0x3cf6d175,
+    0x67e16060, 0x5113f093, 0xbd2b8393, 0x8bd91360, 0xd0cea275,
+    0xe63c3286, 0x66e1c05f, 0x501350ac, 0x0b04e1b9, 0x3df6714a,
+    0x080501f8, 0x3ef7910b, 0x65e0201e, 0x5312b0ed, 0xd3cf4234,
+    0xe53dd2c7, 0xbe2a63d2, 0x88d8f321, 0x64e08021, 0x521210d2,
+    0x0905a1c7, 0x3ff73134, 0xbf2ac3ed, 0x89d8531e, 0xd2cfe20b,
+    0xe43d72f8, 0xb929036f, 0x8fdb939c, 0xd4cc2289, 0xe23eb27a,
+    0x62e340a3, 0x5411d050, 0x0f066145, 0x39f4f1b6, 0xd5cc82b6,
+    0xe33e1245, 0xb829a350, 0x8edb33a3, 0x0e06c17a, 0x38f45189,
+    0x63e3e09c, 0x5511706f, 0x60e200dd, 0x5610902e, 0x0d07213b,
+    0x3bf5b1c8, 0xbb284311, 0x8ddad3e2, 0xd6cd62f7, 0xe03ff204,
+    0x0c078104, 0x3af511f7, 0x61e2a0e2, 0x57103011, 0xd7cdc2c8,
+    0xe13f523b, 0xba28e32e, 0x8cda73dd, 0x78ed02d5, 0x4e1f9226,
+    0x15082333, 0x23fab3c0, 0xa3274119, 0x95d5d1ea, 0xcec260ff,
+    0xf830f00c, 0x1408830c, 0x22fa13ff, 0x79eda2ea, 0x4f1f3219,
+    0xcfc2c0c0, 0xf9305033, 0xa227e126, 0x94d571d5, 0xa1260167,
+    0x97d49194, 0xccc32081, 0xfa31b072, 0x7aec42ab, 0x4c1ed258,
+    0x1709634d, 0x21fbf3be, 0xcdc380be, 0xfb31104d, 0xa026a158,
+    0x96d431ab, 0x1609c372, 0x20fb5381, 0x7bece294, 0x4d1e7267,
+    0x100a03f0, 0x26f89303, 0x7def2216, 0x4b1db2e5, 0xcbc0403c,
+    0xfd32d0cf, 0xa62561da, 0x90d7f129, 0x7cef8229, 0x4a1d12da,
+    0x110aa3cf, 0x27f8333c, 0xa725c1e5, 0x91d75116, 0xcac0e003,
+    0xfc3270f0, 0xc9c10042, 0xff3390b1, 0xa42421a4, 0x92d6b157,
+    0x120b438e, 0x24f9d37d, 0x7fee6268, 0x491cf29b, 0xa524819b,
+    0x93d61168, 0xc8c1a07d, 0xfe33308e, 0x7eeec257, 0x481c52a4,
+    0x130be3b1, 0x25f97342, 0xa923009f, 0x9fd1906c, 0xc4c62179,
+    0xf234b18a, 0x72e94353, 0x441bd3a0, 0x1f0c62b5, 0x29fef246,
+    0xc5c68146, 0xf33411b5, 0xa823a0a0, 0x9ed13053, 0x1e0cc28a,
+    0x28fe5279, 0x73e9e36c, 0x451b739f, 0x70e8032d, 0x461a93de,
+    0x1d0d22cb, 0x2bffb238, 0xab2240e1, 0x9dd0d012, 0xc6c76107,
+    0xf035f1f4, 0x1c0d82f4, 0x2aff1207, 0x71e8a312, 0x471a33e1,
+    0xc7c7c138, 0xf13551cb, 0xaa22e0de, 0x9cd0702d, 0xc1c401ba,
+    0xf7369149, 0xac21205c, 0x9ad3b0af, 0x1a0e4276, 0x2cfcd285,
+    0x77eb6390, 0x4119f363, 0xad218063, 0x9bd31090, 0xc0c4a185,
+    0xf6363176, 0x76ebc3af, 0x4019535c, 0x1b0ee249, 0x2dfc72ba,
+    0x180f0208, 0x2efd92fb, 0x75ea23ee, 0x4318b31d, 0xc3c541c4,
+    0xf537d137, 0xae206022, 0x98d2f0d1, 0x74ea83d1, 0x42181322,
+    0x190fa237, 0x2ffd32c4, 0xaf20c01d, 0x99d250ee, 0xc2c5e1fb,
+    0xf4377108}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x0000000000000000, 0xf390f23600000000, 0xe621e56d00000000,
+    0x15b1175b00000000, 0xcc43cadb00000000, 0x3fd338ed00000000,
+    0x2a622fb600000000, 0xd9f2dd8000000000, 0xd981e56c00000000,
+    0x2a11175a00000000, 0x3fa0000100000000, 0xcc30f23700000000,
+    0x15c22fb700000000, 0xe652dd8100000000, 0xf3e3cada00000000,
+    0x007338ec00000000, 0xb203cbd900000000, 0x419339ef00000000,
+    0x54222eb400000000, 0xa7b2dc8200000000, 0x7e40010200000000,
+    0x8dd0f33400000000, 0x9861e46f00000000, 0x6bf1165900000000,
+    0x6b822eb500000000, 0x9812dc8300000000, 0x8da3cbd800000000,
+    0x7e3339ee00000000, 0xa7c1e46e00000000, 0x5451165800000000,
+    0x41e0010300000000, 0xb270f33500000000, 0x2501e76800000000,
+    0xd691155e00000000, 0xc320020500000000, 0x30b0f03300000000,
+    0xe9422db300000000, 0x1ad2df8500000000, 0x0f63c8de00000000,
+    0xfcf33ae800000000, 0xfc80020400000000, 0x0f10f03200000000,
+    0x1aa1e76900000000, 0xe931155f00000000, 0x30c3c8df00000000,
+    0xc3533ae900000000, 0xd6e22db200000000, 0x2572df8400000000,
+    0x97022cb100000000, 0x6492de8700000000, 0x7123c9dc00000000,
+    0x82b33bea00000000, 0x5b41e66a00000000, 0xa8d1145c00000000,
+    0xbd60030700000000, 0x4ef0f13100000000, 0x4e83c9dd00000000,
+    0xbd133beb00000000, 0xa8a22cb000000000, 0x5b32de8600000000,
+    0x82c0030600000000, 0x7150f13000000000, 0x64e1e66b00000000,
+    0x9771145d00000000, 0x4a02ced100000000, 0xb9923ce700000000,
+    0xac232bbc00000000, 0x5fb3d98a00000000, 0x8641040a00000000,
+    0x75d1f63c00000000, 0x6060e16700000000, 0x93f0135100000000,
+    0x93832bbd00000000, 0x6013d98b00000000, 0x75a2ced000000000,
+    0x86323ce600000000, 0x5fc0e16600000000, 0xac50135000000000,
+    0xb9e1040b00000000, 0x4a71f63d00000000, 0xf801050800000000,
+    0x0b91f73e00000000, 0x1e20e06500000000, 0xedb0125300000000,
+    0x3442cfd300000000, 0xc7d23de500000000, 0xd2632abe00000000,
+    0x21f3d88800000000, 0x2180e06400000000, 0xd210125200000000,
+    0xc7a1050900000000, 0x3431f73f00000000, 0xedc32abf00000000,
+    0x1e53d88900000000, 0x0be2cfd200000000, 0xf8723de400000000,
+    0x6f0329b900000000, 0x9c93db8f00000000, 0x8922ccd400000000,
+    0x7ab23ee200000000, 0xa340e36200000000, 0x50d0115400000000,
+    0x4561060f00000000, 0xb6f1f43900000000, 0xb682ccd500000000,
+    0x45123ee300000000, 0x50a329b800000000, 0xa333db8e00000000,
+    0x7ac1060e00000000, 0x8951f43800000000, 0x9ce0e36300000000,
+    0x6f70115500000000, 0xdd00e26000000000, 0x2e90105600000000,
+    0x3b21070d00000000, 0xc8b1f53b00000000, 0x114328bb00000000,
+    0xe2d3da8d00000000, 0xf762cdd600000000, 0x04f23fe000000000,
+    0x0481070c00000000, 0xf711f53a00000000, 0xe2a0e26100000000,
+    0x1130105700000000, 0xc8c2cdd700000000, 0x3b523fe100000000,
+    0x2ee328ba00000000, 0xdd73da8c00000000, 0xd502ed7800000000,
+    0x26921f4e00000000, 0x3323081500000000, 0xc0b3fa2300000000,
+    0x194127a300000000, 0xead1d59500000000, 0xff60c2ce00000000,
+    0x0cf030f800000000, 0x0c83081400000000, 0xff13fa2200000000,
+    0xeaa2ed7900000000, 0x19321f4f00000000, 0xc0c0c2cf00000000,
+    0x335030f900000000, 0x26e127a200000000, 0xd571d59400000000,
+    0x670126a100000000, 0x9491d49700000000, 0x8120c3cc00000000,
+    0x72b031fa00000000, 0xab42ec7a00000000, 0x58d21e4c00000000,
+    0x4d63091700000000, 0xbef3fb2100000000, 0xbe80c3cd00000000,
+    0x4d1031fb00000000, 0x58a126a000000000, 0xab31d49600000000,
+    0x72c3091600000000, 0x8153fb2000000000, 0x94e2ec7b00000000,
+    0x67721e4d00000000, 0xf0030a1000000000, 0x0393f82600000000,
+    0x1622ef7d00000000, 0xe5b21d4b00000000, 0x3c40c0cb00000000,
+    0xcfd032fd00000000, 0xda6125a600000000, 0x29f1d79000000000,
+    0x2982ef7c00000000, 0xda121d4a00000000, 0xcfa30a1100000000,
+    0x3c33f82700000000, 0xe5c125a700000000, 0x1651d79100000000,
+    0x03e0c0ca00000000, 0xf07032fc00000000, 0x4200c1c900000000,
+    0xb19033ff00000000, 0xa42124a400000000, 0x57b1d69200000000,
+    0x8e430b1200000000, 0x7dd3f92400000000, 0x6862ee7f00000000,
+    0x9bf21c4900000000, 0x9b8124a500000000, 0x6811d69300000000,
+    0x7da0c1c800000000, 0x8e3033fe00000000, 0x57c2ee7e00000000,
+    0xa4521c4800000000, 0xb1e30b1300000000, 0x4273f92500000000,
+    0x9f0023a900000000, 0x6c90d19f00000000, 0x7921c6c400000000,
+    0x8ab134f200000000, 0x5343e97200000000, 0xa0d31b4400000000,
+    0xb5620c1f00000000, 0x46f2fe2900000000, 0x4681c6c500000000,
+    0xb51134f300000000, 0xa0a023a800000000, 0x5330d19e00000000,
+    0x8ac20c1e00000000, 0x7952fe2800000000, 0x6ce3e97300000000,
+    0x9f731b4500000000, 0x2d03e87000000000, 0xde931a4600000000,
+    0xcb220d1d00000000, 0x38b2ff2b00000000, 0xe14022ab00000000,
+    0x12d0d09d00000000, 0x0761c7c600000000, 0xf4f135f000000000,
+    0xf4820d1c00000000, 0x0712ff2a00000000, 0x12a3e87100000000,
+    0xe1331a4700000000, 0x38c1c7c700000000, 0xcb5135f100000000,
+    0xdee022aa00000000, 0x2d70d09c00000000, 0xba01c4c100000000,
+    0x499136f700000000, 0x5c2021ac00000000, 0xafb0d39a00000000,
+    0x76420e1a00000000, 0x85d2fc2c00000000, 0x9063eb7700000000,
+    0x63f3194100000000, 0x638021ad00000000, 0x9010d39b00000000,
+    0x85a1c4c000000000, 0x763136f600000000, 0xafc3eb7600000000,
+    0x5c53194000000000, 0x49e20e1b00000000, 0xba72fc2d00000000,
+    0x08020f1800000000, 0xfb92fd2e00000000, 0xee23ea7500000000,
+    0x1db3184300000000, 0xc441c5c300000000, 0x37d137f500000000,
+    0x226020ae00000000, 0xd1f0d29800000000, 0xd183ea7400000000,
+    0x2213184200000000, 0x37a20f1900000000, 0xc432fd2f00000000,
+    0x1dc020af00000000, 0xee50d29900000000, 0xfbe1c5c200000000,
+    0x087137f400000000},
+   {0x0000000000000000, 0x3651822400000000, 0x6ca2044900000000,
+    0x5af3866d00000000, 0xd844099200000000, 0xee158bb600000000,
+    0xb4e60ddb00000000, 0x82b78fff00000000, 0xf18f63ff00000000,
+    0xc7dee1db00000000, 0x9d2d67b600000000, 0xab7ce59200000000,
+    0x29cb6a6d00000000, 0x1f9ae84900000000, 0x45696e2400000000,
+    0x7338ec0000000000, 0xa319b62500000000, 0x9548340100000000,
+    0xcfbbb26c00000000, 0xf9ea304800000000, 0x7b5dbfb700000000,
+    0x4d0c3d9300000000, 0x17ffbbfe00000000, 0x21ae39da00000000,
+    0x5296d5da00000000, 0x64c757fe00000000, 0x3e34d19300000000,
+    0x086553b700000000, 0x8ad2dc4800000000, 0xbc835e6c00000000,
+    0xe670d80100000000, 0xd0215a2500000000, 0x46336c4b00000000,
+    0x7062ee6f00000000, 0x2a91680200000000, 0x1cc0ea2600000000,
+    0x9e7765d900000000, 0xa826e7fd00000000, 0xf2d5619000000000,
+    0xc484e3b400000000, 0xb7bc0fb400000000, 0x81ed8d9000000000,
+    0xdb1e0bfd00000000, 0xed4f89d900000000, 0x6ff8062600000000,
+    0x59a9840200000000, 0x035a026f00000000, 0x350b804b00000000,
+    0xe52ada6e00000000, 0xd37b584a00000000, 0x8988de2700000000,
+    0xbfd95c0300000000, 0x3d6ed3fc00000000, 0x0b3f51d800000000,
+    0x51ccd7b500000000, 0x679d559100000000, 0x14a5b99100000000,
+    0x22f43bb500000000, 0x7807bdd800000000, 0x4e563ffc00000000,
+    0xcce1b00300000000, 0xfab0322700000000, 0xa043b44a00000000,
+    0x9612366e00000000, 0x8c66d89600000000, 0xba375ab200000000,
+    0xe0c4dcdf00000000, 0xd6955efb00000000, 0x5422d10400000000,
+    0x6273532000000000, 0x3880d54d00000000, 0x0ed1576900000000,
+    0x7de9bb6900000000, 0x4bb8394d00000000, 0x114bbf2000000000,
+    0x271a3d0400000000, 0xa5adb2fb00000000, 0x93fc30df00000000,
+    0xc90fb6b200000000, 0xff5e349600000000, 0x2f7f6eb300000000,
+    0x192eec9700000000, 0x43dd6afa00000000, 0x758ce8de00000000,
+    0xf73b672100000000, 0xc16ae50500000000, 0x9b99636800000000,
+    0xadc8e14c00000000, 0xdef00d4c00000000, 0xe8a18f6800000000,
+    0xb252090500000000, 0x84038b2100000000, 0x06b404de00000000,
+    0x30e586fa00000000, 0x6a16009700000000, 0x5c4782b300000000,
+    0xca55b4dd00000000, 0xfc0436f900000000, 0xa6f7b09400000000,
+    0x90a632b000000000, 0x1211bd4f00000000, 0x24403f6b00000000,
+    0x7eb3b90600000000, 0x48e23b2200000000, 0x3bdad72200000000,
+    0x0d8b550600000000, 0x5778d36b00000000, 0x6129514f00000000,
+    0xe39edeb000000000, 0xd5cf5c9400000000, 0x8f3cdaf900000000,
+    0xb96d58dd00000000, 0x694c02f800000000, 0x5f1d80dc00000000,
+    0x05ee06b100000000, 0x33bf849500000000, 0xb1080b6a00000000,
+    0x8759894e00000000, 0xddaa0f2300000000, 0xebfb8d0700000000,
+    0x98c3610700000000, 0xae92e32300000000, 0xf461654e00000000,
+    0xc230e76a00000000, 0x4087689500000000, 0x76d6eab100000000,
+    0x2c256cdc00000000, 0x1a74eef800000000, 0x59cbc1f600000000,
+    0x6f9a43d200000000, 0x3569c5bf00000000, 0x0338479b00000000,
+    0x818fc86400000000, 0xb7de4a4000000000, 0xed2dcc2d00000000,
+    0xdb7c4e0900000000, 0xa844a20900000000, 0x9e15202d00000000,
+    0xc4e6a64000000000, 0xf2b7246400000000, 0x7000ab9b00000000,
+    0x465129bf00000000, 0x1ca2afd200000000, 0x2af32df600000000,
+    0xfad277d300000000, 0xcc83f5f700000000, 0x9670739a00000000,
+    0xa021f1be00000000, 0x22967e4100000000, 0x14c7fc6500000000,
+    0x4e347a0800000000, 0x7865f82c00000000, 0x0b5d142c00000000,
+    0x3d0c960800000000, 0x67ff106500000000, 0x51ae924100000000,
+    0xd3191dbe00000000, 0xe5489f9a00000000, 0xbfbb19f700000000,
+    0x89ea9bd300000000, 0x1ff8adbd00000000, 0x29a92f9900000000,
+    0x735aa9f400000000, 0x450b2bd000000000, 0xc7bca42f00000000,
+    0xf1ed260b00000000, 0xab1ea06600000000, 0x9d4f224200000000,
+    0xee77ce4200000000, 0xd8264c6600000000, 0x82d5ca0b00000000,
+    0xb484482f00000000, 0x3633c7d000000000, 0x006245f400000000,
+    0x5a91c39900000000, 0x6cc041bd00000000, 0xbce11b9800000000,
+    0x8ab099bc00000000, 0xd0431fd100000000, 0xe6129df500000000,
+    0x64a5120a00000000, 0x52f4902e00000000, 0x0807164300000000,
+    0x3e56946700000000, 0x4d6e786700000000, 0x7b3ffa4300000000,
+    0x21cc7c2e00000000, 0x179dfe0a00000000, 0x952a71f500000000,
+    0xa37bf3d100000000, 0xf98875bc00000000, 0xcfd9f79800000000,
+    0xd5ad196000000000, 0xe3fc9b4400000000, 0xb90f1d2900000000,
+    0x8f5e9f0d00000000, 0x0de910f200000000, 0x3bb892d600000000,
+    0x614b14bb00000000, 0x571a969f00000000, 0x24227a9f00000000,
+    0x1273f8bb00000000, 0x48807ed600000000, 0x7ed1fcf200000000,
+    0xfc66730d00000000, 0xca37f12900000000, 0x90c4774400000000,
+    0xa695f56000000000, 0x76b4af4500000000, 0x40e52d6100000000,
+    0x1a16ab0c00000000, 0x2c47292800000000, 0xaef0a6d700000000,
+    0x98a124f300000000, 0xc252a29e00000000, 0xf40320ba00000000,
+    0x873bccba00000000, 0xb16a4e9e00000000, 0xeb99c8f300000000,
+    0xddc84ad700000000, 0x5f7fc52800000000, 0x692e470c00000000,
+    0x33ddc16100000000, 0x058c434500000000, 0x939e752b00000000,
+    0xa5cff70f00000000, 0xff3c716200000000, 0xc96df34600000000,
+    0x4bda7cb900000000, 0x7d8bfe9d00000000, 0x277878f000000000,
+    0x1129fad400000000, 0x621116d400000000, 0x544094f000000000,
+    0x0eb3129d00000000, 0x38e290b900000000, 0xba551f4600000000,
+    0x8c049d6200000000, 0xd6f71b0f00000000, 0xe0a6992b00000000,
+    0x3087c30e00000000, 0x06d6412a00000000, 0x5c25c74700000000,
+    0x6a74456300000000, 0xe8c3ca9c00000000, 0xde9248b800000000,
+    0x8461ced500000000, 0xb2304cf100000000, 0xc108a0f100000000,
+    0xf75922d500000000, 0xadaaa4b800000000, 0x9bfb269c00000000,
+    0x194ca96300000000, 0x2f1d2b4700000000, 0x75eead2a00000000,
+    0x43bf2f0e00000000},
+   {0x0000000000000000, 0xc8179ecf00000000, 0xd1294d4400000000,
+    0x193ed38b00000000, 0xa2539a8800000000, 0x6a44044700000000,
+    0x737ad7cc00000000, 0xbb6d490300000000, 0x05a145ca00000000,
+    0xcdb6db0500000000, 0xd488088e00000000, 0x1c9f964100000000,
+    0xa7f2df4200000000, 0x6fe5418d00000000, 0x76db920600000000,
+    0xbecc0cc900000000, 0x4b44fa4f00000000, 0x8353648000000000,
+    0x9a6db70b00000000, 0x527a29c400000000, 0xe91760c700000000,
+    0x2100fe0800000000, 0x383e2d8300000000, 0xf029b34c00000000,
+    0x4ee5bf8500000000, 0x86f2214a00000000, 0x9fccf2c100000000,
+    0x57db6c0e00000000, 0xecb6250d00000000, 0x24a1bbc200000000,
+    0x3d9f684900000000, 0xf588f68600000000, 0x9688f49f00000000,
+    0x5e9f6a5000000000, 0x47a1b9db00000000, 0x8fb6271400000000,
+    0x34db6e1700000000, 0xfcccf0d800000000, 0xe5f2235300000000,
+    0x2de5bd9c00000000, 0x9329b15500000000, 0x5b3e2f9a00000000,
+    0x4200fc1100000000, 0x8a1762de00000000, 0x317a2bdd00000000,
+    0xf96db51200000000, 0xe053669900000000, 0x2844f85600000000,
+    0xddcc0ed000000000, 0x15db901f00000000, 0x0ce5439400000000,
+    0xc4f2dd5b00000000, 0x7f9f945800000000, 0xb7880a9700000000,
+    0xaeb6d91c00000000, 0x66a147d300000000, 0xd86d4b1a00000000,
+    0x107ad5d500000000, 0x0944065e00000000, 0xc153989100000000,
+    0x7a3ed19200000000, 0xb2294f5d00000000, 0xab179cd600000000,
+    0x6300021900000000, 0x6d1798e400000000, 0xa500062b00000000,
+    0xbc3ed5a000000000, 0x74294b6f00000000, 0xcf44026c00000000,
+    0x07539ca300000000, 0x1e6d4f2800000000, 0xd67ad1e700000000,
+    0x68b6dd2e00000000, 0xa0a143e100000000, 0xb99f906a00000000,
+    0x71880ea500000000, 0xcae547a600000000, 0x02f2d96900000000,
+    0x1bcc0ae200000000, 0xd3db942d00000000, 0x265362ab00000000,
+    0xee44fc6400000000, 0xf77a2fef00000000, 0x3f6db12000000000,
+    0x8400f82300000000, 0x4c1766ec00000000, 0x5529b56700000000,
+    0x9d3e2ba800000000, 0x23f2276100000000, 0xebe5b9ae00000000,
+    0xf2db6a2500000000, 0x3accf4ea00000000, 0x81a1bde900000000,
+    0x49b6232600000000, 0x5088f0ad00000000, 0x989f6e6200000000,
+    0xfb9f6c7b00000000, 0x3388f2b400000000, 0x2ab6213f00000000,
+    0xe2a1bff000000000, 0x59ccf6f300000000, 0x91db683c00000000,
+    0x88e5bbb700000000, 0x40f2257800000000, 0xfe3e29b100000000,
+    0x3629b77e00000000, 0x2f1764f500000000, 0xe700fa3a00000000,
+    0x5c6db33900000000, 0x947a2df600000000, 0x8d44fe7d00000000,
+    0x455360b200000000, 0xb0db963400000000, 0x78cc08fb00000000,
+    0x61f2db7000000000, 0xa9e545bf00000000, 0x12880cbc00000000,
+    0xda9f927300000000, 0xc3a141f800000000, 0x0bb6df3700000000,
+    0xb57ad3fe00000000, 0x7d6d4d3100000000, 0x64539eba00000000,
+    0xac44007500000000, 0x1729497600000000, 0xdf3ed7b900000000,
+    0xc600043200000000, 0x0e179afd00000000, 0x9b28411200000000,
+    0x533fdfdd00000000, 0x4a010c5600000000, 0x8216929900000000,
+    0x397bdb9a00000000, 0xf16c455500000000, 0xe85296de00000000,
+    0x2045081100000000, 0x9e8904d800000000, 0x569e9a1700000000,
+    0x4fa0499c00000000, 0x87b7d75300000000, 0x3cda9e5000000000,
+    0xf4cd009f00000000, 0xedf3d31400000000, 0x25e44ddb00000000,
+    0xd06cbb5d00000000, 0x187b259200000000, 0x0145f61900000000,
+    0xc95268d600000000, 0x723f21d500000000, 0xba28bf1a00000000,
+    0xa3166c9100000000, 0x6b01f25e00000000, 0xd5cdfe9700000000,
+    0x1dda605800000000, 0x04e4b3d300000000, 0xccf32d1c00000000,
+    0x779e641f00000000, 0xbf89fad000000000, 0xa6b7295b00000000,
+    0x6ea0b79400000000, 0x0da0b58d00000000, 0xc5b72b4200000000,
+    0xdc89f8c900000000, 0x149e660600000000, 0xaff32f0500000000,
+    0x67e4b1ca00000000, 0x7eda624100000000, 0xb6cdfc8e00000000,
+    0x0801f04700000000, 0xc0166e8800000000, 0xd928bd0300000000,
+    0x113f23cc00000000, 0xaa526acf00000000, 0x6245f40000000000,
+    0x7b7b278b00000000, 0xb36cb94400000000, 0x46e44fc200000000,
+    0x8ef3d10d00000000, 0x97cd028600000000, 0x5fda9c4900000000,
+    0xe4b7d54a00000000, 0x2ca04b8500000000, 0x359e980e00000000,
+    0xfd8906c100000000, 0x43450a0800000000, 0x8b5294c700000000,
+    0x926c474c00000000, 0x5a7bd98300000000, 0xe116908000000000,
+    0x29010e4f00000000, 0x303fddc400000000, 0xf828430b00000000,
+    0xf63fd9f600000000, 0x3e28473900000000, 0x271694b200000000,
+    0xef010a7d00000000, 0x546c437e00000000, 0x9c7bddb100000000,
+    0x85450e3a00000000, 0x4d5290f500000000, 0xf39e9c3c00000000,
+    0x3b8902f300000000, 0x22b7d17800000000, 0xeaa04fb700000000,
+    0x51cd06b400000000, 0x99da987b00000000, 0x80e44bf000000000,
+    0x48f3d53f00000000, 0xbd7b23b900000000, 0x756cbd7600000000,
+    0x6c526efd00000000, 0xa445f03200000000, 0x1f28b93100000000,
+    0xd73f27fe00000000, 0xce01f47500000000, 0x06166aba00000000,
+    0xb8da667300000000, 0x70cdf8bc00000000, 0x69f32b3700000000,
+    0xa1e4b5f800000000, 0x1a89fcfb00000000, 0xd29e623400000000,
+    0xcba0b1bf00000000, 0x03b72f7000000000, 0x60b72d6900000000,
+    0xa8a0b3a600000000, 0xb19e602d00000000, 0x7989fee200000000,
+    0xc2e4b7e100000000, 0x0af3292e00000000, 0x13cdfaa500000000,
+    0xdbda646a00000000, 0x651668a300000000, 0xad01f66c00000000,
+    0xb43f25e700000000, 0x7c28bb2800000000, 0xc745f22b00000000,
+    0x0f526ce400000000, 0x166cbf6f00000000, 0xde7b21a000000000,
+    0x2bf3d72600000000, 0xe3e449e900000000, 0xfada9a6200000000,
+    0x32cd04ad00000000, 0x89a04dae00000000, 0x41b7d36100000000,
+    0x588900ea00000000, 0x909e9e2500000000, 0x2e5292ec00000000,
+    0xe6450c2300000000, 0xff7bdfa800000000, 0x376c416700000000,
+    0x8c01086400000000, 0x441696ab00000000, 0x5d28452000000000,
+    0x953fdbef00000000},
+   {0x0000000000000000, 0x95d4709500000000, 0x6baf90f100000000,
+    0xfe7be06400000000, 0x9758503800000000, 0x028c20ad00000000,
+    0xfcf7c0c900000000, 0x6923b05c00000000, 0x2eb1a07000000000,
+    0xbb65d0e500000000, 0x451e308100000000, 0xd0ca401400000000,
+    0xb9e9f04800000000, 0x2c3d80dd00000000, 0xd24660b900000000,
+    0x4792102c00000000, 0x5c6241e100000000, 0xc9b6317400000000,
+    0x37cdd11000000000, 0xa219a18500000000, 0xcb3a11d900000000,
+    0x5eee614c00000000, 0xa095812800000000, 0x3541f1bd00000000,
+    0x72d3e19100000000, 0xe707910400000000, 0x197c716000000000,
+    0x8ca801f500000000, 0xe58bb1a900000000, 0x705fc13c00000000,
+    0x8e24215800000000, 0x1bf051cd00000000, 0xf9c2f31900000000,
+    0x6c16838c00000000, 0x926d63e800000000, 0x07b9137d00000000,
+    0x6e9aa32100000000, 0xfb4ed3b400000000, 0x053533d000000000,
+    0x90e1434500000000, 0xd773536900000000, 0x42a723fc00000000,
+    0xbcdcc39800000000, 0x2908b30d00000000, 0x402b035100000000,
+    0xd5ff73c400000000, 0x2b8493a000000000, 0xbe50e33500000000,
+    0xa5a0b2f800000000, 0x3074c26d00000000, 0xce0f220900000000,
+    0x5bdb529c00000000, 0x32f8e2c000000000, 0xa72c925500000000,
+    0x5957723100000000, 0xcc8302a400000000, 0x8b11128800000000,
+    0x1ec5621d00000000, 0xe0be827900000000, 0x756af2ec00000000,
+    0x1c4942b000000000, 0x899d322500000000, 0x77e6d24100000000,
+    0xe232a2d400000000, 0xf285e73300000000, 0x675197a600000000,
+    0x992a77c200000000, 0x0cfe075700000000, 0x65ddb70b00000000,
+    0xf009c79e00000000, 0x0e7227fa00000000, 0x9ba6576f00000000,
+    0xdc34474300000000, 0x49e037d600000000, 0xb79bd7b200000000,
+    0x224fa72700000000, 0x4b6c177b00000000, 0xdeb867ee00000000,
+    0x20c3878a00000000, 0xb517f71f00000000, 0xaee7a6d200000000,
+    0x3b33d64700000000, 0xc548362300000000, 0x509c46b600000000,
+    0x39bff6ea00000000, 0xac6b867f00000000, 0x5210661b00000000,
+    0xc7c4168e00000000, 0x805606a200000000, 0x1582763700000000,
+    0xebf9965300000000, 0x7e2de6c600000000, 0x170e569a00000000,
+    0x82da260f00000000, 0x7ca1c66b00000000, 0xe975b6fe00000000,
+    0x0b47142a00000000, 0x9e9364bf00000000, 0x60e884db00000000,
+    0xf53cf44e00000000, 0x9c1f441200000000, 0x09cb348700000000,
+    0xf7b0d4e300000000, 0x6264a47600000000, 0x25f6b45a00000000,
+    0xb022c4cf00000000, 0x4e5924ab00000000, 0xdb8d543e00000000,
+    0xb2aee46200000000, 0x277a94f700000000, 0xd901749300000000,
+    0x4cd5040600000000, 0x572555cb00000000, 0xc2f1255e00000000,
+    0x3c8ac53a00000000, 0xa95eb5af00000000, 0xc07d05f300000000,
+    0x55a9756600000000, 0xabd2950200000000, 0x3e06e59700000000,
+    0x7994f5bb00000000, 0xec40852e00000000, 0x123b654a00000000,
+    0x87ef15df00000000, 0xeecca58300000000, 0x7b18d51600000000,
+    0x8563357200000000, 0x10b745e700000000, 0xe40bcf6700000000,
+    0x71dfbff200000000, 0x8fa45f9600000000, 0x1a702f0300000000,
+    0x73539f5f00000000, 0xe687efca00000000, 0x18fc0fae00000000,
+    0x8d287f3b00000000, 0xcaba6f1700000000, 0x5f6e1f8200000000,
+    0xa115ffe600000000, 0x34c18f7300000000, 0x5de23f2f00000000,
+    0xc8364fba00000000, 0x364dafde00000000, 0xa399df4b00000000,
+    0xb8698e8600000000, 0x2dbdfe1300000000, 0xd3c61e7700000000,
+    0x46126ee200000000, 0x2f31debe00000000, 0xbae5ae2b00000000,
+    0x449e4e4f00000000, 0xd14a3eda00000000, 0x96d82ef600000000,
+    0x030c5e6300000000, 0xfd77be0700000000, 0x68a3ce9200000000,
+    0x01807ece00000000, 0x94540e5b00000000, 0x6a2fee3f00000000,
+    0xfffb9eaa00000000, 0x1dc93c7e00000000, 0x881d4ceb00000000,
+    0x7666ac8f00000000, 0xe3b2dc1a00000000, 0x8a916c4600000000,
+    0x1f451cd300000000, 0xe13efcb700000000, 0x74ea8c2200000000,
+    0x33789c0e00000000, 0xa6acec9b00000000, 0x58d70cff00000000,
+    0xcd037c6a00000000, 0xa420cc3600000000, 0x31f4bca300000000,
+    0xcf8f5cc700000000, 0x5a5b2c5200000000, 0x41ab7d9f00000000,
+    0xd47f0d0a00000000, 0x2a04ed6e00000000, 0xbfd09dfb00000000,
+    0xd6f32da700000000, 0x43275d3200000000, 0xbd5cbd5600000000,
+    0x2888cdc300000000, 0x6f1addef00000000, 0xfacead7a00000000,
+    0x04b54d1e00000000, 0x91613d8b00000000, 0xf8428dd700000000,
+    0x6d96fd4200000000, 0x93ed1d2600000000, 0x06396db300000000,
+    0x168e285400000000, 0x835a58c100000000, 0x7d21b8a500000000,
+    0xe8f5c83000000000, 0x81d6786c00000000, 0x140208f900000000,
+    0xea79e89d00000000, 0x7fad980800000000, 0x383f882400000000,
+    0xadebf8b100000000, 0x539018d500000000, 0xc644684000000000,
+    0xaf67d81c00000000, 0x3ab3a88900000000, 0xc4c848ed00000000,
+    0x511c387800000000, 0x4aec69b500000000, 0xdf38192000000000,
+    0x2143f94400000000, 0xb49789d100000000, 0xddb4398d00000000,
+    0x4860491800000000, 0xb61ba97c00000000, 0x23cfd9e900000000,
+    0x645dc9c500000000, 0xf189b95000000000, 0x0ff2593400000000,
+    0x9a2629a100000000, 0xf30599fd00000000, 0x66d1e96800000000,
+    0x98aa090c00000000, 0x0d7e799900000000, 0xef4cdb4d00000000,
+    0x7a98abd800000000, 0x84e34bbc00000000, 0x11373b2900000000,
+    0x78148b7500000000, 0xedc0fbe000000000, 0x13bb1b8400000000,
+    0x866f6b1100000000, 0xc1fd7b3d00000000, 0x54290ba800000000,
+    0xaa52ebcc00000000, 0x3f869b5900000000, 0x56a52b0500000000,
+    0xc3715b9000000000, 0x3d0abbf400000000, 0xa8decb6100000000,
+    0xb32e9aac00000000, 0x26faea3900000000, 0xd8810a5d00000000,
+    0x4d557ac800000000, 0x2476ca9400000000, 0xb1a2ba0100000000,
+    0x4fd95a6500000000, 0xda0d2af000000000, 0x9d9f3adc00000000,
+    0x084b4a4900000000, 0xf630aa2d00000000, 0x63e4dab800000000,
+    0x0ac76ae400000000, 0x9f131a7100000000, 0x6168fa1500000000,
+    0xf4bc8a8000000000},
+   {0x0000000000000000, 0x1f17f08000000000, 0x7f2891da00000000,
+    0x603f615a00000000, 0xbf56536e00000000, 0xa041a3ee00000000,
+    0xc07ec2b400000000, 0xdf69323400000000, 0x7eada6dc00000000,
+    0x61ba565c00000000, 0x0185370600000000, 0x1e92c78600000000,
+    0xc1fbf5b200000000, 0xdeec053200000000, 0xbed3646800000000,
+    0xa1c494e800000000, 0xbd5c3c6200000000, 0xa24bcce200000000,
+    0xc274adb800000000, 0xdd635d3800000000, 0x020a6f0c00000000,
+    0x1d1d9f8c00000000, 0x7d22fed600000000, 0x62350e5600000000,
+    0xc3f19abe00000000, 0xdce66a3e00000000, 0xbcd90b6400000000,
+    0xa3cefbe400000000, 0x7ca7c9d000000000, 0x63b0395000000000,
+    0x038f580a00000000, 0x1c98a88a00000000, 0x7ab978c400000000,
+    0x65ae884400000000, 0x0591e91e00000000, 0x1a86199e00000000,
+    0xc5ef2baa00000000, 0xdaf8db2a00000000, 0xbac7ba7000000000,
+    0xa5d04af000000000, 0x0414de1800000000, 0x1b032e9800000000,
+    0x7b3c4fc200000000, 0x642bbf4200000000, 0xbb428d7600000000,
+    0xa4557df600000000, 0xc46a1cac00000000, 0xdb7dec2c00000000,
+    0xc7e544a600000000, 0xd8f2b42600000000, 0xb8cdd57c00000000,
+    0xa7da25fc00000000, 0x78b317c800000000, 0x67a4e74800000000,
+    0x079b861200000000, 0x188c769200000000, 0xb948e27a00000000,
+    0xa65f12fa00000000, 0xc66073a000000000, 0xd977832000000000,
+    0x061eb11400000000, 0x1909419400000000, 0x793620ce00000000,
+    0x6621d04e00000000, 0xb574805300000000, 0xaa6370d300000000,
+    0xca5c118900000000, 0xd54be10900000000, 0x0a22d33d00000000,
+    0x153523bd00000000, 0x750a42e700000000, 0x6a1db26700000000,
+    0xcbd9268f00000000, 0xd4ced60f00000000, 0xb4f1b75500000000,
+    0xabe647d500000000, 0x748f75e100000000, 0x6b98856100000000,
+    0x0ba7e43b00000000, 0x14b014bb00000000, 0x0828bc3100000000,
+    0x173f4cb100000000, 0x77002deb00000000, 0x6817dd6b00000000,
+    0xb77eef5f00000000, 0xa8691fdf00000000, 0xc8567e8500000000,
+    0xd7418e0500000000, 0x76851aed00000000, 0x6992ea6d00000000,
+    0x09ad8b3700000000, 0x16ba7bb700000000, 0xc9d3498300000000,
+    0xd6c4b90300000000, 0xb6fbd85900000000, 0xa9ec28d900000000,
+    0xcfcdf89700000000, 0xd0da081700000000, 0xb0e5694d00000000,
+    0xaff299cd00000000, 0x709babf900000000, 0x6f8c5b7900000000,
+    0x0fb33a2300000000, 0x10a4caa300000000, 0xb1605e4b00000000,
+    0xae77aecb00000000, 0xce48cf9100000000, 0xd15f3f1100000000,
+    0x0e360d2500000000, 0x1121fda500000000, 0x711e9cff00000000,
+    0x6e096c7f00000000, 0x7291c4f500000000, 0x6d86347500000000,
+    0x0db9552f00000000, 0x12aea5af00000000, 0xcdc7979b00000000,
+    0xd2d0671b00000000, 0xb2ef064100000000, 0xadf8f6c100000000,
+    0x0c3c622900000000, 0x132b92a900000000, 0x7314f3f300000000,
+    0x6c03037300000000, 0xb36a314700000000, 0xac7dc1c700000000,
+    0xcc42a09d00000000, 0xd355501d00000000, 0x6ae900a700000000,
+    0x75fef02700000000, 0x15c1917d00000000, 0x0ad661fd00000000,
+    0xd5bf53c900000000, 0xcaa8a34900000000, 0xaa97c21300000000,
+    0xb580329300000000, 0x1444a67b00000000, 0x0b5356fb00000000,
+    0x6b6c37a100000000, 0x747bc72100000000, 0xab12f51500000000,
+    0xb405059500000000, 0xd43a64cf00000000, 0xcb2d944f00000000,
+    0xd7b53cc500000000, 0xc8a2cc4500000000, 0xa89dad1f00000000,
+    0xb78a5d9f00000000, 0x68e36fab00000000, 0x77f49f2b00000000,
+    0x17cbfe7100000000, 0x08dc0ef100000000, 0xa9189a1900000000,
+    0xb60f6a9900000000, 0xd6300bc300000000, 0xc927fb4300000000,
+    0x164ec97700000000, 0x095939f700000000, 0x696658ad00000000,
+    0x7671a82d00000000, 0x1050786300000000, 0x0f4788e300000000,
+    0x6f78e9b900000000, 0x706f193900000000, 0xaf062b0d00000000,
+    0xb011db8d00000000, 0xd02ebad700000000, 0xcf394a5700000000,
+    0x6efddebf00000000, 0x71ea2e3f00000000, 0x11d54f6500000000,
+    0x0ec2bfe500000000, 0xd1ab8dd100000000, 0xcebc7d5100000000,
+    0xae831c0b00000000, 0xb194ec8b00000000, 0xad0c440100000000,
+    0xb21bb48100000000, 0xd224d5db00000000, 0xcd33255b00000000,
+    0x125a176f00000000, 0x0d4de7ef00000000, 0x6d7286b500000000,
+    0x7265763500000000, 0xd3a1e2dd00000000, 0xccb6125d00000000,
+    0xac89730700000000, 0xb39e838700000000, 0x6cf7b1b300000000,
+    0x73e0413300000000, 0x13df206900000000, 0x0cc8d0e900000000,
+    0xdf9d80f400000000, 0xc08a707400000000, 0xa0b5112e00000000,
+    0xbfa2e1ae00000000, 0x60cbd39a00000000, 0x7fdc231a00000000,
+    0x1fe3424000000000, 0x00f4b2c000000000, 0xa130262800000000,
+    0xbe27d6a800000000, 0xde18b7f200000000, 0xc10f477200000000,
+    0x1e66754600000000, 0x017185c600000000, 0x614ee49c00000000,
+    0x7e59141c00000000, 0x62c1bc9600000000, 0x7dd64c1600000000,
+    0x1de92d4c00000000, 0x02feddcc00000000, 0xdd97eff800000000,
+    0xc2801f7800000000, 0xa2bf7e2200000000, 0xbda88ea200000000,
+    0x1c6c1a4a00000000, 0x037beaca00000000, 0x63448b9000000000,
+    0x7c537b1000000000, 0xa33a492400000000, 0xbc2db9a400000000,
+    0xdc12d8fe00000000, 0xc305287e00000000, 0xa524f83000000000,
+    0xba3308b000000000, 0xda0c69ea00000000, 0xc51b996a00000000,
+    0x1a72ab5e00000000, 0x05655bde00000000, 0x655a3a8400000000,
+    0x7a4dca0400000000, 0xdb895eec00000000, 0xc49eae6c00000000,
+    0xa4a1cf3600000000, 0xbbb63fb600000000, 0x64df0d8200000000,
+    0x7bc8fd0200000000, 0x1bf79c5800000000, 0x04e06cd800000000,
+    0x1878c45200000000, 0x076f34d200000000, 0x6750558800000000,
+    0x7847a50800000000, 0xa72e973c00000000, 0xb83967bc00000000,
+    0xd80606e600000000, 0xc711f66600000000, 0x66d5628e00000000,
+    0x79c2920e00000000, 0x19fdf35400000000, 0x06ea03d400000000,
+    0xd98331e000000000, 0xc694c16000000000, 0xa6aba03a00000000,
+    0xb9bc50ba00000000},
+   {0x0000000000000000, 0xe2fd888d00000000, 0x85fd60c000000000,
+    0x6700e84d00000000, 0x4bfdb05b00000000, 0xa90038d600000000,
+    0xce00d09b00000000, 0x2cfd581600000000, 0x96fa61b700000000,
+    0x7407e93a00000000, 0x1307017700000000, 0xf1fa89fa00000000,
+    0xdd07d1ec00000000, 0x3ffa596100000000, 0x58fab12c00000000,
+    0xba0739a100000000, 0x6df3b2b500000000, 0x8f0e3a3800000000,
+    0xe80ed27500000000, 0x0af35af800000000, 0x260e02ee00000000,
+    0xc4f38a6300000000, 0xa3f3622e00000000, 0x410eeaa300000000,
+    0xfb09d30200000000, 0x19f45b8f00000000, 0x7ef4b3c200000000,
+    0x9c093b4f00000000, 0xb0f4635900000000, 0x5209ebd400000000,
+    0x3509039900000000, 0xd7f48b1400000000, 0x9be014b000000000,
+    0x791d9c3d00000000, 0x1e1d747000000000, 0xfce0fcfd00000000,
+    0xd01da4eb00000000, 0x32e02c6600000000, 0x55e0c42b00000000,
+    0xb71d4ca600000000, 0x0d1a750700000000, 0xefe7fd8a00000000,
+    0x88e715c700000000, 0x6a1a9d4a00000000, 0x46e7c55c00000000,
+    0xa41a4dd100000000, 0xc31aa59c00000000, 0x21e72d1100000000,
+    0xf613a60500000000, 0x14ee2e8800000000, 0x73eec6c500000000,
+    0x91134e4800000000, 0xbdee165e00000000, 0x5f139ed300000000,
+    0x3813769e00000000, 0xdaeefe1300000000, 0x60e9c7b200000000,
+    0x82144f3f00000000, 0xe514a77200000000, 0x07e92fff00000000,
+    0x2b1477e900000000, 0xc9e9ff6400000000, 0xaee9172900000000,
+    0x4c149fa400000000, 0x77c758bb00000000, 0x953ad03600000000,
+    0xf23a387b00000000, 0x10c7b0f600000000, 0x3c3ae8e000000000,
+    0xdec7606d00000000, 0xb9c7882000000000, 0x5b3a00ad00000000,
+    0xe13d390c00000000, 0x03c0b18100000000, 0x64c059cc00000000,
+    0x863dd14100000000, 0xaac0895700000000, 0x483d01da00000000,
+    0x2f3de99700000000, 0xcdc0611a00000000, 0x1a34ea0e00000000,
+    0xf8c9628300000000, 0x9fc98ace00000000, 0x7d34024300000000,
+    0x51c95a5500000000, 0xb334d2d800000000, 0xd4343a9500000000,
+    0x36c9b21800000000, 0x8cce8bb900000000, 0x6e33033400000000,
+    0x0933eb7900000000, 0xebce63f400000000, 0xc7333be200000000,
+    0x25ceb36f00000000, 0x42ce5b2200000000, 0xa033d3af00000000,
+    0xec274c0b00000000, 0x0edac48600000000, 0x69da2ccb00000000,
+    0x8b27a44600000000, 0xa7dafc5000000000, 0x452774dd00000000,
+    0x22279c9000000000, 0xc0da141d00000000, 0x7add2dbc00000000,
+    0x9820a53100000000, 0xff204d7c00000000, 0x1dddc5f100000000,
+    0x31209de700000000, 0xd3dd156a00000000, 0xb4ddfd2700000000,
+    0x562075aa00000000, 0x81d4febe00000000, 0x6329763300000000,
+    0x04299e7e00000000, 0xe6d416f300000000, 0xca294ee500000000,
+    0x28d4c66800000000, 0x4fd42e2500000000, 0xad29a6a800000000,
+    0x172e9f0900000000, 0xf5d3178400000000, 0x92d3ffc900000000,
+    0x702e774400000000, 0x5cd32f5200000000, 0xbe2ea7df00000000,
+    0xd92e4f9200000000, 0x3bd3c71f00000000, 0xaf88c0ad00000000,
+    0x4d75482000000000, 0x2a75a06d00000000, 0xc88828e000000000,
+    0xe47570f600000000, 0x0688f87b00000000, 0x6188103600000000,
+    0x837598bb00000000, 0x3972a11a00000000, 0xdb8f299700000000,
+    0xbc8fc1da00000000, 0x5e72495700000000, 0x728f114100000000,
+    0x907299cc00000000, 0xf772718100000000, 0x158ff90c00000000,
+    0xc27b721800000000, 0x2086fa9500000000, 0x478612d800000000,
+    0xa57b9a5500000000, 0x8986c24300000000, 0x6b7b4ace00000000,
+    0x0c7ba28300000000, 0xee862a0e00000000, 0x548113af00000000,
+    0xb67c9b2200000000, 0xd17c736f00000000, 0x3381fbe200000000,
+    0x1f7ca3f400000000, 0xfd812b7900000000, 0x9a81c33400000000,
+    0x787c4bb900000000, 0x3468d41d00000000, 0xd6955c9000000000,
+    0xb195b4dd00000000, 0x53683c5000000000, 0x7f95644600000000,
+    0x9d68eccb00000000, 0xfa68048600000000, 0x18958c0b00000000,
+    0xa292b5aa00000000, 0x406f3d2700000000, 0x276fd56a00000000,
+    0xc5925de700000000, 0xe96f05f100000000, 0x0b928d7c00000000,
+    0x6c92653100000000, 0x8e6fedbc00000000, 0x599b66a800000000,
+    0xbb66ee2500000000, 0xdc66066800000000, 0x3e9b8ee500000000,
+    0x1266d6f300000000, 0xf09b5e7e00000000, 0x979bb63300000000,
+    0x75663ebe00000000, 0xcf61071f00000000, 0x2d9c8f9200000000,
+    0x4a9c67df00000000, 0xa861ef5200000000, 0x849cb74400000000,
+    0x66613fc900000000, 0x0161d78400000000, 0xe39c5f0900000000,
+    0xd84f981600000000, 0x3ab2109b00000000, 0x5db2f8d600000000,
+    0xbf4f705b00000000, 0x93b2284d00000000, 0x714fa0c000000000,
+    0x164f488d00000000, 0xf4b2c00000000000, 0x4eb5f9a100000000,
+    0xac48712c00000000, 0xcb48996100000000, 0x29b511ec00000000,
+    0x054849fa00000000, 0xe7b5c17700000000, 0x80b5293a00000000,
+    0x6248a1b700000000, 0xb5bc2aa300000000, 0x5741a22e00000000,
+    0x30414a6300000000, 0xd2bcc2ee00000000, 0xfe419af800000000,
+    0x1cbc127500000000, 0x7bbcfa3800000000, 0x994172b500000000,
+    0x23464b1400000000, 0xc1bbc39900000000, 0xa6bb2bd400000000,
+    0x4446a35900000000, 0x68bbfb4f00000000, 0x8a4673c200000000,
+    0xed469b8f00000000, 0x0fbb130200000000, 0x43af8ca600000000,
+    0xa152042b00000000, 0xc652ec6600000000, 0x24af64eb00000000,
+    0x08523cfd00000000, 0xeaafb47000000000, 0x8daf5c3d00000000,
+    0x6f52d4b000000000, 0xd555ed1100000000, 0x37a8659c00000000,
+    0x50a88dd100000000, 0xb255055c00000000, 0x9ea85d4a00000000,
+    0x7c55d5c700000000, 0x1b553d8a00000000, 0xf9a8b50700000000,
+    0x2e5c3e1300000000, 0xcca1b69e00000000, 0xaba15ed300000000,
+    0x495cd65e00000000, 0x65a18e4800000000, 0x875c06c500000000,
+    0xe05cee8800000000, 0x02a1660500000000, 0xb8a65fa400000000,
+    0x5a5bd72900000000, 0x3d5b3f6400000000, 0xdfa6b7e900000000,
+    0xf35befff00000000, 0x11a6677200000000, 0x76a68f3f00000000,
+    0x945b07b200000000},
+   {0x0000000000000000, 0xa90b894e00000000, 0x5217129d00000000,
+    0xfb1c9bd300000000, 0xe52855e100000000, 0x4c23dcaf00000000,
+    0xb73f477c00000000, 0x1e34ce3200000000, 0x8b57db1900000000,
+    0x225c525700000000, 0xd940c98400000000, 0x704b40ca00000000,
+    0x6e7f8ef800000000, 0xc77407b600000000, 0x3c689c6500000000,
+    0x9563152b00000000, 0x16afb63300000000, 0xbfa43f7d00000000,
+    0x44b8a4ae00000000, 0xedb32de000000000, 0xf387e3d200000000,
+    0x5a8c6a9c00000000, 0xa190f14f00000000, 0x089b780100000000,
+    0x9df86d2a00000000, 0x34f3e46400000000, 0xcfef7fb700000000,
+    0x66e4f6f900000000, 0x78d038cb00000000, 0xd1dbb18500000000,
+    0x2ac72a5600000000, 0x83cca31800000000, 0x2c5e6d6700000000,
+    0x8555e42900000000, 0x7e497ffa00000000, 0xd742f6b400000000,
+    0xc976388600000000, 0x607db1c800000000, 0x9b612a1b00000000,
+    0x326aa35500000000, 0xa709b67e00000000, 0x0e023f3000000000,
+    0xf51ea4e300000000, 0x5c152dad00000000, 0x4221e39f00000000,
+    0xeb2a6ad100000000, 0x1036f10200000000, 0xb93d784c00000000,
+    0x3af1db5400000000, 0x93fa521a00000000, 0x68e6c9c900000000,
+    0xc1ed408700000000, 0xdfd98eb500000000, 0x76d207fb00000000,
+    0x8dce9c2800000000, 0x24c5156600000000, 0xb1a6004d00000000,
+    0x18ad890300000000, 0xe3b112d000000000, 0x4aba9b9e00000000,
+    0x548e55ac00000000, 0xfd85dce200000000, 0x0699473100000000,
+    0xaf92ce7f00000000, 0x58bcdace00000000, 0xf1b7538000000000,
+    0x0aabc85300000000, 0xa3a0411d00000000, 0xbd948f2f00000000,
+    0x149f066100000000, 0xef839db200000000, 0x468814fc00000000,
+    0xd3eb01d700000000, 0x7ae0889900000000, 0x81fc134a00000000,
+    0x28f79a0400000000, 0x36c3543600000000, 0x9fc8dd7800000000,
+    0x64d446ab00000000, 0xcddfcfe500000000, 0x4e136cfd00000000,
+    0xe718e5b300000000, 0x1c047e6000000000, 0xb50ff72e00000000,
+    0xab3b391c00000000, 0x0230b05200000000, 0xf92c2b8100000000,
+    0x5027a2cf00000000, 0xc544b7e400000000, 0x6c4f3eaa00000000,
+    0x9753a57900000000, 0x3e582c3700000000, 0x206ce20500000000,
+    0x89676b4b00000000, 0x727bf09800000000, 0xdb7079d600000000,
+    0x74e2b7a900000000, 0xdde93ee700000000, 0x26f5a53400000000,
+    0x8ffe2c7a00000000, 0x91cae24800000000, 0x38c16b0600000000,
+    0xc3ddf0d500000000, 0x6ad6799b00000000, 0xffb56cb000000000,
+    0x56bee5fe00000000, 0xada27e2d00000000, 0x04a9f76300000000,
+    0x1a9d395100000000, 0xb396b01f00000000, 0x488a2bcc00000000,
+    0xe181a28200000000, 0x624d019a00000000, 0xcb4688d400000000,
+    0x305a130700000000, 0x99519a4900000000, 0x8765547b00000000,
+    0x2e6edd3500000000, 0xd57246e600000000, 0x7c79cfa800000000,
+    0xe91ada8300000000, 0x401153cd00000000, 0xbb0dc81e00000000,
+    0x1206415000000000, 0x0c328f6200000000, 0xa539062c00000000,
+    0x5e259dff00000000, 0xf72e14b100000000, 0xf17ec44600000000,
+    0x58754d0800000000, 0xa369d6db00000000, 0x0a625f9500000000,
+    0x145691a700000000, 0xbd5d18e900000000, 0x4641833a00000000,
+    0xef4a0a7400000000, 0x7a291f5f00000000, 0xd322961100000000,
+    0x283e0dc200000000, 0x8135848c00000000, 0x9f014abe00000000,
+    0x360ac3f000000000, 0xcd16582300000000, 0x641dd16d00000000,
+    0xe7d1727500000000, 0x4edafb3b00000000, 0xb5c660e800000000,
+    0x1ccde9a600000000, 0x02f9279400000000, 0xabf2aeda00000000,
+    0x50ee350900000000, 0xf9e5bc4700000000, 0x6c86a96c00000000,
+    0xc58d202200000000, 0x3e91bbf100000000, 0x979a32bf00000000,
+    0x89aefc8d00000000, 0x20a575c300000000, 0xdbb9ee1000000000,
+    0x72b2675e00000000, 0xdd20a92100000000, 0x742b206f00000000,
+    0x8f37bbbc00000000, 0x263c32f200000000, 0x3808fcc000000000,
+    0x9103758e00000000, 0x6a1fee5d00000000, 0xc314671300000000,
+    0x5677723800000000, 0xff7cfb7600000000, 0x046060a500000000,
+    0xad6be9eb00000000, 0xb35f27d900000000, 0x1a54ae9700000000,
+    0xe148354400000000, 0x4843bc0a00000000, 0xcb8f1f1200000000,
+    0x6284965c00000000, 0x99980d8f00000000, 0x309384c100000000,
+    0x2ea74af300000000, 0x87acc3bd00000000, 0x7cb0586e00000000,
+    0xd5bbd12000000000, 0x40d8c40b00000000, 0xe9d34d4500000000,
+    0x12cfd69600000000, 0xbbc45fd800000000, 0xa5f091ea00000000,
+    0x0cfb18a400000000, 0xf7e7837700000000, 0x5eec0a3900000000,
+    0xa9c21e8800000000, 0x00c997c600000000, 0xfbd50c1500000000,
+    0x52de855b00000000, 0x4cea4b6900000000, 0xe5e1c22700000000,
+    0x1efd59f400000000, 0xb7f6d0ba00000000, 0x2295c59100000000,
+    0x8b9e4cdf00000000, 0x7082d70c00000000, 0xd9895e4200000000,
+    0xc7bd907000000000, 0x6eb6193e00000000, 0x95aa82ed00000000,
+    0x3ca10ba300000000, 0xbf6da8bb00000000, 0x166621f500000000,
+    0xed7aba2600000000, 0x4471336800000000, 0x5a45fd5a00000000,
+    0xf34e741400000000, 0x0852efc700000000, 0xa159668900000000,
+    0x343a73a200000000, 0x9d31faec00000000, 0x662d613f00000000,
+    0xcf26e87100000000, 0xd112264300000000, 0x7819af0d00000000,
+    0x830534de00000000, 0x2a0ebd9000000000, 0x859c73ef00000000,
+    0x2c97faa100000000, 0xd78b617200000000, 0x7e80e83c00000000,
+    0x60b4260e00000000, 0xc9bfaf4000000000, 0x32a3349300000000,
+    0x9ba8bddd00000000, 0x0ecba8f600000000, 0xa7c021b800000000,
+    0x5cdcba6b00000000, 0xf5d7332500000000, 0xebe3fd1700000000,
+    0x42e8745900000000, 0xb9f4ef8a00000000, 0x10ff66c400000000,
+    0x9333c5dc00000000, 0x3a384c9200000000, 0xc124d74100000000,
+    0x682f5e0f00000000, 0x761b903d00000000, 0xdf10197300000000,
+    0x240c82a000000000, 0x8d070bee00000000, 0x18641ec500000000,
+    0xb16f978b00000000, 0x4a730c5800000000, 0xe378851600000000,
+    0xfd4c4b2400000000, 0x5447c26a00000000, 0xaf5b59b900000000,
+    0x0650d0f700000000},
+   {0x0000000000000000, 0x479244af00000000, 0xcf22f88500000000,
+    0x88b0bc2a00000000, 0xdf4381d000000000, 0x98d1c57f00000000,
+    0x1061795500000000, 0x57f33dfa00000000, 0xff81737a00000000,
+    0xb81337d500000000, 0x30a38bff00000000, 0x7731cf5000000000,
+    0x20c2f2aa00000000, 0x6750b60500000000, 0xefe00a2f00000000,
+    0xa8724e8000000000, 0xfe03e7f400000000, 0xb991a35b00000000,
+    0x31211f7100000000, 0x76b35bde00000000, 0x2140662400000000,
+    0x66d2228b00000000, 0xee629ea100000000, 0xa9f0da0e00000000,
+    0x0182948e00000000, 0x4610d02100000000, 0xcea06c0b00000000,
+    0x893228a400000000, 0xdec1155e00000000, 0x995351f100000000,
+    0x11e3eddb00000000, 0x5671a97400000000, 0xbd01bf3200000000,
+    0xfa93fb9d00000000, 0x722347b700000000, 0x35b1031800000000,
+    0x62423ee200000000, 0x25d07a4d00000000, 0xad60c66700000000,
+    0xeaf282c800000000, 0x4280cc4800000000, 0x051288e700000000,
+    0x8da234cd00000000, 0xca30706200000000, 0x9dc34d9800000000,
+    0xda51093700000000, 0x52e1b51d00000000, 0x1573f1b200000000,
+    0x430258c600000000, 0x04901c6900000000, 0x8c20a04300000000,
+    0xcbb2e4ec00000000, 0x9c41d91600000000, 0xdbd39db900000000,
+    0x5363219300000000, 0x14f1653c00000000, 0xbc832bbc00000000,
+    0xfb116f1300000000, 0x73a1d33900000000, 0x3433979600000000,
+    0x63c0aa6c00000000, 0x2452eec300000000, 0xace252e900000000,
+    0xeb70164600000000, 0x7a037e6500000000, 0x3d913aca00000000,
+    0xb52186e000000000, 0xf2b3c24f00000000, 0xa540ffb500000000,
+    0xe2d2bb1a00000000, 0x6a62073000000000, 0x2df0439f00000000,
+    0x85820d1f00000000, 0xc21049b000000000, 0x4aa0f59a00000000,
+    0x0d32b13500000000, 0x5ac18ccf00000000, 0x1d53c86000000000,
+    0x95e3744a00000000, 0xd27130e500000000, 0x8400999100000000,
+    0xc392dd3e00000000, 0x4b22611400000000, 0x0cb025bb00000000,
+    0x5b43184100000000, 0x1cd15cee00000000, 0x9461e0c400000000,
+    0xd3f3a46b00000000, 0x7b81eaeb00000000, 0x3c13ae4400000000,
+    0xb4a3126e00000000, 0xf33156c100000000, 0xa4c26b3b00000000,
+    0xe3502f9400000000, 0x6be093be00000000, 0x2c72d71100000000,
+    0xc702c15700000000, 0x809085f800000000, 0x082039d200000000,
+    0x4fb27d7d00000000, 0x1841408700000000, 0x5fd3042800000000,
+    0xd763b80200000000, 0x90f1fcad00000000, 0x3883b22d00000000,
+    0x7f11f68200000000, 0xf7a14aa800000000, 0xb0330e0700000000,
+    0xe7c033fd00000000, 0xa052775200000000, 0x28e2cb7800000000,
+    0x6f708fd700000000, 0x390126a300000000, 0x7e93620c00000000,
+    0xf623de2600000000, 0xb1b19a8900000000, 0xe642a77300000000,
+    0xa1d0e3dc00000000, 0x29605ff600000000, 0x6ef21b5900000000,
+    0xc68055d900000000, 0x8112117600000000, 0x09a2ad5c00000000,
+    0x4e30e9f300000000, 0x19c3d40900000000, 0x5e5190a600000000,
+    0xd6e12c8c00000000, 0x9173682300000000, 0xf406fcca00000000,
+    0xb394b86500000000, 0x3b24044f00000000, 0x7cb640e000000000,
+    0x2b457d1a00000000, 0x6cd739b500000000, 0xe467859f00000000,
+    0xa3f5c13000000000, 0x0b878fb000000000, 0x4c15cb1f00000000,
+    0xc4a5773500000000, 0x8337339a00000000, 0xd4c40e6000000000,
+    0x93564acf00000000, 0x1be6f6e500000000, 0x5c74b24a00000000,
+    0x0a051b3e00000000, 0x4d975f9100000000, 0xc527e3bb00000000,
+    0x82b5a71400000000, 0xd5469aee00000000, 0x92d4de4100000000,
+    0x1a64626b00000000, 0x5df626c400000000, 0xf584684400000000,
+    0xb2162ceb00000000, 0x3aa690c100000000, 0x7d34d46e00000000,
+    0x2ac7e99400000000, 0x6d55ad3b00000000, 0xe5e5111100000000,
+    0xa27755be00000000, 0x490743f800000000, 0x0e95075700000000,
+    0x8625bb7d00000000, 0xc1b7ffd200000000, 0x9644c22800000000,
+    0xd1d6868700000000, 0x59663aad00000000, 0x1ef47e0200000000,
+    0xb686308200000000, 0xf114742d00000000, 0x79a4c80700000000,
+    0x3e368ca800000000, 0x69c5b15200000000, 0x2e57f5fd00000000,
+    0xa6e749d700000000, 0xe1750d7800000000, 0xb704a40c00000000,
+    0xf096e0a300000000, 0x78265c8900000000, 0x3fb4182600000000,
+    0x684725dc00000000, 0x2fd5617300000000, 0xa765dd5900000000,
+    0xe0f799f600000000, 0x4885d77600000000, 0x0f1793d900000000,
+    0x87a72ff300000000, 0xc0356b5c00000000, 0x97c656a600000000,
+    0xd054120900000000, 0x58e4ae2300000000, 0x1f76ea8c00000000,
+    0x8e0582af00000000, 0xc997c60000000000, 0x41277a2a00000000,
+    0x06b53e8500000000, 0x5146037f00000000, 0x16d447d000000000,
+    0x9e64fbfa00000000, 0xd9f6bf5500000000, 0x7184f1d500000000,
+    0x3616b57a00000000, 0xbea6095000000000, 0xf9344dff00000000,
+    0xaec7700500000000, 0xe95534aa00000000, 0x61e5888000000000,
+    0x2677cc2f00000000, 0x7006655b00000000, 0x379421f400000000,
+    0xbf249dde00000000, 0xf8b6d97100000000, 0xaf45e48b00000000,
+    0xe8d7a02400000000, 0x60671c0e00000000, 0x27f558a100000000,
+    0x8f87162100000000, 0xc815528e00000000, 0x40a5eea400000000,
+    0x0737aa0b00000000, 0x50c497f100000000, 0x1756d35e00000000,
+    0x9fe66f7400000000, 0xd8742bdb00000000, 0x33043d9d00000000,
+    0x7496793200000000, 0xfc26c51800000000, 0xbbb481b700000000,
+    0xec47bc4d00000000, 0xabd5f8e200000000, 0x236544c800000000,
+    0x64f7006700000000, 0xcc854ee700000000, 0x8b170a4800000000,
+    0x03a7b66200000000, 0x4435f2cd00000000, 0x13c6cf3700000000,
+    0x54548b9800000000, 0xdce437b200000000, 0x9b76731d00000000,
+    0xcd07da6900000000, 0x8a959ec600000000, 0x022522ec00000000,
+    0x45b7664300000000, 0x12445bb900000000, 0x55d61f1600000000,
+    0xdd66a33c00000000, 0x9af4e79300000000, 0x3286a91300000000,
+    0x7514edbc00000000, 0xfda4519600000000, 0xba36153900000000,
+    0xedc528c300000000, 0xaa576c6c00000000, 0x22e7d04600000000,
+    0x657594e900000000}};
+
+#else /* W == 4 */
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0x65673b46, 0xcace768c, 0xafa94dca, 0x4eedeb59,
+    0x2b8ad01f, 0x84239dd5, 0xe144a693, 0x9ddbd6b2, 0xf8bcedf4,
+    0x5715a03e, 0x32729b78, 0xd3363deb, 0xb65106ad, 0x19f84b67,
+    0x7c9f7021, 0xe0c6ab25, 0x85a19063, 0x2a08dda9, 0x4f6fe6ef,
+    0xae2b407c, 0xcb4c7b3a, 0x64e536f0, 0x01820db6, 0x7d1d7d97,
+    0x187a46d1, 0xb7d30b1b, 0xd2b4305d, 0x33f096ce, 0x5697ad88,
+    0xf93ee042, 0x9c59db04, 0x1afc500b, 0x7f9b6b4d, 0xd0322687,
+    0xb5551dc1, 0x5411bb52, 0x31768014, 0x9edfcdde, 0xfbb8f698,
+    0x872786b9, 0xe240bdff, 0x4de9f035, 0x288ecb73, 0xc9ca6de0,
+    0xacad56a6, 0x03041b6c, 0x6663202a, 0xfa3afb2e, 0x9f5dc068,
+    0x30f48da2, 0x5593b6e4, 0xb4d71077, 0xd1b02b31, 0x7e1966fb,
+    0x1b7e5dbd, 0x67e12d9c, 0x028616da, 0xad2f5b10, 0xc8486056,
+    0x290cc6c5, 0x4c6bfd83, 0xe3c2b049, 0x86a58b0f, 0x35f8a016,
+    0x509f9b50, 0xff36d69a, 0x9a51eddc, 0x7b154b4f, 0x1e727009,
+    0xb1db3dc3, 0xd4bc0685, 0xa82376a4, 0xcd444de2, 0x62ed0028,
+    0x078a3b6e, 0xe6ce9dfd, 0x83a9a6bb, 0x2c00eb71, 0x4967d037,
+    0xd53e0b33, 0xb0593075, 0x1ff07dbf, 0x7a9746f9, 0x9bd3e06a,
+    0xfeb4db2c, 0x511d96e6, 0x347aada0, 0x48e5dd81, 0x2d82e6c7,
+    0x822bab0d, 0xe74c904b, 0x060836d8, 0x636f0d9e, 0xccc64054,
+    0xa9a17b12, 0x2f04f01d, 0x4a63cb5b, 0xe5ca8691, 0x80adbdd7,
+    0x61e91b44, 0x048e2002, 0xab276dc8, 0xce40568e, 0xb2df26af,
+    0xd7b81de9, 0x78115023, 0x1d766b65, 0xfc32cdf6, 0x9955f6b0,
+    0x36fcbb7a, 0x539b803c, 0xcfc25b38, 0xaaa5607e, 0x050c2db4,
+    0x606b16f2, 0x812fb061, 0xe4488b27, 0x4be1c6ed, 0x2e86fdab,
+    0x52198d8a, 0x377eb6cc, 0x98d7fb06, 0xfdb0c040, 0x1cf466d3,
+    0x79935d95, 0xd63a105f, 0xb35d2b19, 0x6bf1402c, 0x0e967b6a,
+    0xa13f36a0, 0xc4580de6, 0x251cab75, 0x407b9033, 0xefd2ddf9,
+    0x8ab5e6bf, 0xf62a969e, 0x934dadd8, 0x3ce4e012, 0x5983db54,
+    0xb8c77dc7, 0xdda04681, 0x72090b4b, 0x176e300d, 0x8b37eb09,
+    0xee50d04f, 0x41f99d85, 0x249ea6c3, 0xc5da0050, 0xa0bd3b16,
+    0x0f1476dc, 0x6a734d9a, 0x16ec3dbb, 0x738b06fd, 0xdc224b37,
+    0xb9457071, 0x5801d6e2, 0x3d66eda4, 0x92cfa06e, 0xf7a89b28,
+    0x710d1027, 0x146a2b61, 0xbbc366ab, 0xdea45ded, 0x3fe0fb7e,
+    0x5a87c038, 0xf52e8df2, 0x9049b6b4, 0xecd6c695, 0x89b1fdd3,
+    0x2618b019, 0x437f8b5f, 0xa23b2dcc, 0xc75c168a, 0x68f55b40,
+    0x0d926006, 0x91cbbb02, 0xf4ac8044, 0x5b05cd8e, 0x3e62f6c8,
+    0xdf26505b, 0xba416b1d, 0x15e826d7, 0x708f1d91, 0x0c106db0,
+    0x697756f6, 0xc6de1b3c, 0xa3b9207a, 0x42fd86e9, 0x279abdaf,
+    0x8833f065, 0xed54cb23, 0x5e09e03a, 0x3b6edb7c, 0x94c796b6,
+    0xf1a0adf0, 0x10e40b63, 0x75833025, 0xda2a7def, 0xbf4d46a9,
+    0xc3d23688, 0xa6b50dce, 0x091c4004, 0x6c7b7b42, 0x8d3fddd1,
+    0xe858e697, 0x47f1ab5d, 0x2296901b, 0xbecf4b1f, 0xdba87059,
+    0x74013d93, 0x116606d5, 0xf022a046, 0x95459b00, 0x3aecd6ca,
+    0x5f8bed8c, 0x23149dad, 0x4673a6eb, 0xe9daeb21, 0x8cbdd067,
+    0x6df976f4, 0x089e4db2, 0xa7370078, 0xc2503b3e, 0x44f5b031,
+    0x21928b77, 0x8e3bc6bd, 0xeb5cfdfb, 0x0a185b68, 0x6f7f602e,
+    0xc0d62de4, 0xa5b116a2, 0xd92e6683, 0xbc495dc5, 0x13e0100f,
+    0x76872b49, 0x97c38dda, 0xf2a4b69c, 0x5d0dfb56, 0x386ac010,
+    0xa4331b14, 0xc1542052, 0x6efd6d98, 0x0b9a56de, 0xeadef04d,
+    0x8fb9cb0b, 0x201086c1, 0x4577bd87, 0x39e8cda6, 0x5c8ff6e0,
+    0xf326bb2a, 0x9641806c, 0x770526ff, 0x12621db9, 0xbdcb5073,
+    0xd8ac6b35},
+   {0x00000000, 0xd7e28058, 0x74b406f1, 0xa35686a9, 0xe9680de2,
+    0x3e8a8dba, 0x9ddc0b13, 0x4a3e8b4b, 0x09a11d85, 0xde439ddd,
+    0x7d151b74, 0xaaf79b2c, 0xe0c91067, 0x372b903f, 0x947d1696,
+    0x439f96ce, 0x13423b0a, 0xc4a0bb52, 0x67f63dfb, 0xb014bda3,
+    0xfa2a36e8, 0x2dc8b6b0, 0x8e9e3019, 0x597cb041, 0x1ae3268f,
+    0xcd01a6d7, 0x6e57207e, 0xb9b5a026, 0xf38b2b6d, 0x2469ab35,
+    0x873f2d9c, 0x50ddadc4, 0x26847614, 0xf166f64c, 0x523070e5,
+    0x85d2f0bd, 0xcfec7bf6, 0x180efbae, 0xbb587d07, 0x6cbafd5f,
+    0x2f256b91, 0xf8c7ebc9, 0x5b916d60, 0x8c73ed38, 0xc64d6673,
+    0x11afe62b, 0xb2f96082, 0x651be0da, 0x35c64d1e, 0xe224cd46,
+    0x41724bef, 0x9690cbb7, 0xdcae40fc, 0x0b4cc0a4, 0xa81a460d,
+    0x7ff8c655, 0x3c67509b, 0xeb85d0c3, 0x48d3566a, 0x9f31d632,
+    0xd50f5d79, 0x02eddd21, 0xa1bb5b88, 0x7659dbd0, 0x4d08ec28,
+    0x9aea6c70, 0x39bcead9, 0xee5e6a81, 0xa460e1ca, 0x73826192,
+    0xd0d4e73b, 0x07366763, 0x44a9f1ad, 0x934b71f5, 0x301df75c,
+    0xe7ff7704, 0xadc1fc4f, 0x7a237c17, 0xd975fabe, 0x0e977ae6,
+    0x5e4ad722, 0x89a8577a, 0x2afed1d3, 0xfd1c518b, 0xb722dac0,
+    0x60c05a98, 0xc396dc31, 0x14745c69, 0x57ebcaa7, 0x80094aff,
+    0x235fcc56, 0xf4bd4c0e, 0xbe83c745, 0x6961471d, 0xca37c1b4,
+    0x1dd541ec, 0x6b8c9a3c, 0xbc6e1a64, 0x1f389ccd, 0xc8da1c95,
+    0x82e497de, 0x55061786, 0xf650912f, 0x21b21177, 0x622d87b9,
+    0xb5cf07e1, 0x16998148, 0xc17b0110, 0x8b458a5b, 0x5ca70a03,
+    0xfff18caa, 0x28130cf2, 0x78cea136, 0xaf2c216e, 0x0c7aa7c7,
+    0xdb98279f, 0x91a6acd4, 0x46442c8c, 0xe512aa25, 0x32f02a7d,
+    0x716fbcb3, 0xa68d3ceb, 0x05dbba42, 0xd2393a1a, 0x9807b151,
+    0x4fe53109, 0xecb3b7a0, 0x3b5137f8, 0x9a11d850, 0x4df35808,
+    0xeea5dea1, 0x39475ef9, 0x7379d5b2, 0xa49b55ea, 0x07cdd343,
+    0xd02f531b, 0x93b0c5d5, 0x4452458d, 0xe704c324, 0x30e6437c,
+    0x7ad8c837, 0xad3a486f, 0x0e6ccec6, 0xd98e4e9e, 0x8953e35a,
+    0x5eb16302, 0xfde7e5ab, 0x2a0565f3, 0x603beeb8, 0xb7d96ee0,
+    0x148fe849, 0xc36d6811, 0x80f2fedf, 0x57107e87, 0xf446f82e,
+    0x23a47876, 0x699af33d, 0xbe787365, 0x1d2ef5cc, 0xcacc7594,
+    0xbc95ae44, 0x6b772e1c, 0xc821a8b5, 0x1fc328ed, 0x55fda3a6,
+    0x821f23fe, 0x2149a557, 0xf6ab250f, 0xb534b3c1, 0x62d63399,
+    0xc180b530, 0x16623568, 0x5c5cbe23, 0x8bbe3e7b, 0x28e8b8d2,
+    0xff0a388a, 0xafd7954e, 0x78351516, 0xdb6393bf, 0x0c8113e7,
+    0x46bf98ac, 0x915d18f4, 0x320b9e5d, 0xe5e91e05, 0xa67688cb,
+    0x71940893, 0xd2c28e3a, 0x05200e62, 0x4f1e8529, 0x98fc0571,
+    0x3baa83d8, 0xec480380, 0xd7193478, 0x00fbb420, 0xa3ad3289,
+    0x744fb2d1, 0x3e71399a, 0xe993b9c2, 0x4ac53f6b, 0x9d27bf33,
+    0xdeb829fd, 0x095aa9a5, 0xaa0c2f0c, 0x7deeaf54, 0x37d0241f,
+    0xe032a447, 0x436422ee, 0x9486a2b6, 0xc45b0f72, 0x13b98f2a,
+    0xb0ef0983, 0x670d89db, 0x2d330290, 0xfad182c8, 0x59870461,
+    0x8e658439, 0xcdfa12f7, 0x1a1892af, 0xb94e1406, 0x6eac945e,
+    0x24921f15, 0xf3709f4d, 0x502619e4, 0x87c499bc, 0xf19d426c,
+    0x267fc234, 0x8529449d, 0x52cbc4c5, 0x18f54f8e, 0xcf17cfd6,
+    0x6c41497f, 0xbba3c927, 0xf83c5fe9, 0x2fdedfb1, 0x8c885918,
+    0x5b6ad940, 0x1154520b, 0xc6b6d253, 0x65e054fa, 0xb202d4a2,
+    0xe2df7966, 0x353df93e, 0x966b7f97, 0x4189ffcf, 0x0bb77484,
+    0xdc55f4dc, 0x7f037275, 0xa8e1f22d, 0xeb7e64e3, 0x3c9ce4bb,
+    0x9fca6212, 0x4828e24a, 0x02166901, 0xd5f4e959, 0x76a26ff0,
+    0xa140efa8},
+   {0x00000000, 0xef52b6e1, 0x05d46b83, 0xea86dd62, 0x0ba8d706,
+    0xe4fa61e7, 0x0e7cbc85, 0xe12e0a64, 0x1751ae0c, 0xf80318ed,
+    0x1285c58f, 0xfdd7736e, 0x1cf9790a, 0xf3abcfeb, 0x192d1289,
+    0xf67fa468, 0x2ea35c18, 0xc1f1eaf9, 0x2b77379b, 0xc425817a,
+    0x250b8b1e, 0xca593dff, 0x20dfe09d, 0xcf8d567c, 0x39f2f214,
+    0xd6a044f5, 0x3c269997, 0xd3742f76, 0x325a2512, 0xdd0893f3,
+    0x378e4e91, 0xd8dcf870, 0x5d46b830, 0xb2140ed1, 0x5892d3b3,
+    0xb7c06552, 0x56ee6f36, 0xb9bcd9d7, 0x533a04b5, 0xbc68b254,
+    0x4a17163c, 0xa545a0dd, 0x4fc37dbf, 0xa091cb5e, 0x41bfc13a,
+    0xaeed77db, 0x446baab9, 0xab391c58, 0x73e5e428, 0x9cb752c9,
+    0x76318fab, 0x9963394a, 0x784d332e, 0x971f85cf, 0x7d9958ad,
+    0x92cbee4c, 0x64b44a24, 0x8be6fcc5, 0x616021a7, 0x8e329746,
+    0x6f1c9d22, 0x804e2bc3, 0x6ac8f6a1, 0x859a4040, 0xba8d7060,
+    0x55dfc681, 0xbf591be3, 0x500bad02, 0xb125a766, 0x5e771187,
+    0xb4f1cce5, 0x5ba37a04, 0xaddcde6c, 0x428e688d, 0xa808b5ef,
+    0x475a030e, 0xa674096a, 0x4926bf8b, 0xa3a062e9, 0x4cf2d408,
+    0x942e2c78, 0x7b7c9a99, 0x91fa47fb, 0x7ea8f11a, 0x9f86fb7e,
+    0x70d44d9f, 0x9a5290fd, 0x7500261c, 0x837f8274, 0x6c2d3495,
+    0x86abe9f7, 0x69f95f16, 0x88d75572, 0x6785e393, 0x8d033ef1,
+    0x62518810, 0xe7cbc850, 0x08997eb1, 0xe21fa3d3, 0x0d4d1532,
+    0xec631f56, 0x0331a9b7, 0xe9b774d5, 0x06e5c234, 0xf09a665c,
+    0x1fc8d0bd, 0xf54e0ddf, 0x1a1cbb3e, 0xfb32b15a, 0x146007bb,
+    0xfee6dad9, 0x11b46c38, 0xc9689448, 0x263a22a9, 0xccbcffcb,
+    0x23ee492a, 0xc2c0434e, 0x2d92f5af, 0xc71428cd, 0x28469e2c,
+    0xde393a44, 0x316b8ca5, 0xdbed51c7, 0x34bfe726, 0xd591ed42,
+    0x3ac35ba3, 0xd04586c1, 0x3f173020, 0xae6be681, 0x41395060,
+    0xabbf8d02, 0x44ed3be3, 0xa5c33187, 0x4a918766, 0xa0175a04,
+    0x4f45ece5, 0xb93a488d, 0x5668fe6c, 0xbcee230e, 0x53bc95ef,
+    0xb2929f8b, 0x5dc0296a, 0xb746f408, 0x581442e9, 0x80c8ba99,
+    0x6f9a0c78, 0x851cd11a, 0x6a4e67fb, 0x8b606d9f, 0x6432db7e,
+    0x8eb4061c, 0x61e6b0fd, 0x97991495, 0x78cba274, 0x924d7f16,
+    0x7d1fc9f7, 0x9c31c393, 0x73637572, 0x99e5a810, 0x76b71ef1,
+    0xf32d5eb1, 0x1c7fe850, 0xf6f93532, 0x19ab83d3, 0xf88589b7,
+    0x17d73f56, 0xfd51e234, 0x120354d5, 0xe47cf0bd, 0x0b2e465c,
+    0xe1a89b3e, 0x0efa2ddf, 0xefd427bb, 0x0086915a, 0xea004c38,
+    0x0552fad9, 0xdd8e02a9, 0x32dcb448, 0xd85a692a, 0x3708dfcb,
+    0xd626d5af, 0x3974634e, 0xd3f2be2c, 0x3ca008cd, 0xcadfaca5,
+    0x258d1a44, 0xcf0bc726, 0x205971c7, 0xc1777ba3, 0x2e25cd42,
+    0xc4a31020, 0x2bf1a6c1, 0x14e696e1, 0xfbb42000, 0x1132fd62,
+    0xfe604b83, 0x1f4e41e7, 0xf01cf706, 0x1a9a2a64, 0xf5c89c85,
+    0x03b738ed, 0xece58e0c, 0x0663536e, 0xe931e58f, 0x081fefeb,
+    0xe74d590a, 0x0dcb8468, 0xe2993289, 0x3a45caf9, 0xd5177c18,
+    0x3f91a17a, 0xd0c3179b, 0x31ed1dff, 0xdebfab1e, 0x3439767c,
+    0xdb6bc09d, 0x2d1464f5, 0xc246d214, 0x28c00f76, 0xc792b997,
+    0x26bcb3f3, 0xc9ee0512, 0x2368d870, 0xcc3a6e91, 0x49a02ed1,
+    0xa6f29830, 0x4c744552, 0xa326f3b3, 0x4208f9d7, 0xad5a4f36,
+    0x47dc9254, 0xa88e24b5, 0x5ef180dd, 0xb1a3363c, 0x5b25eb5e,
+    0xb4775dbf, 0x555957db, 0xba0be13a, 0x508d3c58, 0xbfdf8ab9,
+    0x670372c9, 0x8851c428, 0x62d7194a, 0x8d85afab, 0x6caba5cf,
+    0x83f9132e, 0x697fce4c, 0x862d78ad, 0x7052dcc5, 0x9f006a24,
+    0x7586b746, 0x9ad401a7, 0x7bfa0bc3, 0x94a8bd22, 0x7e2e6040,
+    0x917cd6a1},
+   {0x00000000, 0x87a6cb43, 0xd43c90c7, 0x539a5b84, 0x730827cf,
+    0xf4aeec8c, 0xa734b708, 0x20927c4b, 0xe6104f9e, 0x61b684dd,
+    0x322cdf59, 0xb58a141a, 0x95186851, 0x12bea312, 0x4124f896,
+    0xc68233d5, 0x1751997d, 0x90f7523e, 0xc36d09ba, 0x44cbc2f9,
+    0x6459beb2, 0xe3ff75f1, 0xb0652e75, 0x37c3e536, 0xf141d6e3,
+    0x76e71da0, 0x257d4624, 0xa2db8d67, 0x8249f12c, 0x05ef3a6f,
+    0x567561eb, 0xd1d3aaa8, 0x2ea332fa, 0xa905f9b9, 0xfa9fa23d,
+    0x7d39697e, 0x5dab1535, 0xda0dde76, 0x899785f2, 0x0e314eb1,
+    0xc8b37d64, 0x4f15b627, 0x1c8feda3, 0x9b2926e0, 0xbbbb5aab,
+    0x3c1d91e8, 0x6f87ca6c, 0xe821012f, 0x39f2ab87, 0xbe5460c4,
+    0xedce3b40, 0x6a68f003, 0x4afa8c48, 0xcd5c470b, 0x9ec61c8f,
+    0x1960d7cc, 0xdfe2e419, 0x58442f5a, 0x0bde74de, 0x8c78bf9d,
+    0xaceac3d6, 0x2b4c0895, 0x78d65311, 0xff709852, 0x5d4665f4,
+    0xdae0aeb7, 0x897af533, 0x0edc3e70, 0x2e4e423b, 0xa9e88978,
+    0xfa72d2fc, 0x7dd419bf, 0xbb562a6a, 0x3cf0e129, 0x6f6abaad,
+    0xe8cc71ee, 0xc85e0da5, 0x4ff8c6e6, 0x1c629d62, 0x9bc45621,
+    0x4a17fc89, 0xcdb137ca, 0x9e2b6c4e, 0x198da70d, 0x391fdb46,
+    0xbeb91005, 0xed234b81, 0x6a8580c2, 0xac07b317, 0x2ba17854,
+    0x783b23d0, 0xff9de893, 0xdf0f94d8, 0x58a95f9b, 0x0b33041f,
+    0x8c95cf5c, 0x73e5570e, 0xf4439c4d, 0xa7d9c7c9, 0x207f0c8a,
+    0x00ed70c1, 0x874bbb82, 0xd4d1e006, 0x53772b45, 0x95f51890,
+    0x1253d3d3, 0x41c98857, 0xc66f4314, 0xe6fd3f5f, 0x615bf41c,
+    0x32c1af98, 0xb56764db, 0x64b4ce73, 0xe3120530, 0xb0885eb4,
+    0x372e95f7, 0x17bce9bc, 0x901a22ff, 0xc380797b, 0x4426b238,
+    0x82a481ed, 0x05024aae, 0x5698112a, 0xd13eda69, 0xf1aca622,
+    0x760a6d61, 0x259036e5, 0xa236fda6, 0xba8ccbe8, 0x3d2a00ab,
+    0x6eb05b2f, 0xe916906c, 0xc984ec27, 0x4e222764, 0x1db87ce0,
+    0x9a1eb7a3, 0x5c9c8476, 0xdb3a4f35, 0x88a014b1, 0x0f06dff2,
+    0x2f94a3b9, 0xa83268fa, 0xfba8337e, 0x7c0ef83d, 0xaddd5295,
+    0x2a7b99d6, 0x79e1c252, 0xfe470911, 0xded5755a, 0x5973be19,
+    0x0ae9e59d, 0x8d4f2ede, 0x4bcd1d0b, 0xcc6bd648, 0x9ff18dcc,
+    0x1857468f, 0x38c53ac4, 0xbf63f187, 0xecf9aa03, 0x6b5f6140,
+    0x942ff912, 0x13893251, 0x401369d5, 0xc7b5a296, 0xe727dedd,
+    0x6081159e, 0x331b4e1a, 0xb4bd8559, 0x723fb68c, 0xf5997dcf,
+    0xa603264b, 0x21a5ed08, 0x01379143, 0x86915a00, 0xd50b0184,
+    0x52adcac7, 0x837e606f, 0x04d8ab2c, 0x5742f0a8, 0xd0e43beb,
+    0xf07647a0, 0x77d08ce3, 0x244ad767, 0xa3ec1c24, 0x656e2ff1,
+    0xe2c8e4b2, 0xb152bf36, 0x36f47475, 0x1666083e, 0x91c0c37d,
+    0xc25a98f9, 0x45fc53ba, 0xe7caae1c, 0x606c655f, 0x33f63edb,
+    0xb450f598, 0x94c289d3, 0x13644290, 0x40fe1914, 0xc758d257,
+    0x01dae182, 0x867c2ac1, 0xd5e67145, 0x5240ba06, 0x72d2c64d,
+    0xf5740d0e, 0xa6ee568a, 0x21489dc9, 0xf09b3761, 0x773dfc22,
+    0x24a7a7a6, 0xa3016ce5, 0x839310ae, 0x0435dbed, 0x57af8069,
+    0xd0094b2a, 0x168b78ff, 0x912db3bc, 0xc2b7e838, 0x4511237b,
+    0x65835f30, 0xe2259473, 0xb1bfcff7, 0x361904b4, 0xc9699ce6,
+    0x4ecf57a5, 0x1d550c21, 0x9af3c762, 0xba61bb29, 0x3dc7706a,
+    0x6e5d2bee, 0xe9fbe0ad, 0x2f79d378, 0xa8df183b, 0xfb4543bf,
+    0x7ce388fc, 0x5c71f4b7, 0xdbd73ff4, 0x884d6470, 0x0febaf33,
+    0xde38059b, 0x599eced8, 0x0a04955c, 0x8da25e1f, 0xad302254,
+    0x2a96e917, 0x790cb293, 0xfeaa79d0, 0x38284a05, 0xbf8e8146,
+    0xec14dac2, 0x6bb21181, 0x4b206dca, 0xcc86a689, 0x9f1cfd0d,
+    0x18ba364e}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x00000000, 0x43cba687, 0xc7903cd4, 0x845b9a53, 0xcf270873,
+    0x8cecaef4, 0x08b734a7, 0x4b7c9220, 0x9e4f10e6, 0xdd84b661,
+    0x59df2c32, 0x1a148ab5, 0x51681895, 0x12a3be12, 0x96f82441,
+    0xd53382c6, 0x7d995117, 0x3e52f790, 0xba096dc3, 0xf9c2cb44,
+    0xb2be5964, 0xf175ffe3, 0x752e65b0, 0x36e5c337, 0xe3d641f1,
+    0xa01de776, 0x24467d25, 0x678ddba2, 0x2cf14982, 0x6f3aef05,
+    0xeb617556, 0xa8aad3d1, 0xfa32a32e, 0xb9f905a9, 0x3da29ffa,
+    0x7e69397d, 0x3515ab5d, 0x76de0dda, 0xf2859789, 0xb14e310e,
+    0x647db3c8, 0x27b6154f, 0xa3ed8f1c, 0xe026299b, 0xab5abbbb,
+    0xe8911d3c, 0x6cca876f, 0x2f0121e8, 0x87abf239, 0xc46054be,
+    0x403bceed, 0x03f0686a, 0x488cfa4a, 0x0b475ccd, 0x8f1cc69e,
+    0xccd76019, 0x19e4e2df, 0x5a2f4458, 0xde74de0b, 0x9dbf788c,
+    0xd6c3eaac, 0x95084c2b, 0x1153d678, 0x529870ff, 0xf465465d,
+    0xb7aee0da, 0x33f57a89, 0x703edc0e, 0x3b424e2e, 0x7889e8a9,
+    0xfcd272fa, 0xbf19d47d, 0x6a2a56bb, 0x29e1f03c, 0xadba6a6f,
+    0xee71cce8, 0xa50d5ec8, 0xe6c6f84f, 0x629d621c, 0x2156c49b,
+    0x89fc174a, 0xca37b1cd, 0x4e6c2b9e, 0x0da78d19, 0x46db1f39,
+    0x0510b9be, 0x814b23ed, 0xc280856a, 0x17b307ac, 0x5478a12b,
+    0xd0233b78, 0x93e89dff, 0xd8940fdf, 0x9b5fa958, 0x1f04330b,
+    0x5ccf958c, 0x0e57e573, 0x4d9c43f4, 0xc9c7d9a7, 0x8a0c7f20,
+    0xc170ed00, 0x82bb4b87, 0x06e0d1d4, 0x452b7753, 0x9018f595,
+    0xd3d35312, 0x5788c941, 0x14436fc6, 0x5f3ffde6, 0x1cf45b61,
+    0x98afc132, 0xdb6467b5, 0x73ceb464, 0x300512e3, 0xb45e88b0,
+    0xf7952e37, 0xbce9bc17, 0xff221a90, 0x7b7980c3, 0x38b22644,
+    0xed81a482, 0xae4a0205, 0x2a119856, 0x69da3ed1, 0x22a6acf1,
+    0x616d0a76, 0xe5369025, 0xa6fd36a2, 0xe8cb8cba, 0xab002a3d,
+    0x2f5bb06e, 0x6c9016e9, 0x27ec84c9, 0x6427224e, 0xe07cb81d,
+    0xa3b71e9a, 0x76849c5c, 0x354f3adb, 0xb114a088, 0xf2df060f,
+    0xb9a3942f, 0xfa6832a8, 0x7e33a8fb, 0x3df80e7c, 0x9552ddad,
+    0xd6997b2a, 0x52c2e179, 0x110947fe, 0x5a75d5de, 0x19be7359,
+    0x9de5e90a, 0xde2e4f8d, 0x0b1dcd4b, 0x48d66bcc, 0xcc8df19f,
+    0x8f465718, 0xc43ac538, 0x87f163bf, 0x03aaf9ec, 0x40615f6b,
+    0x12f92f94, 0x51328913, 0xd5691340, 0x96a2b5c7, 0xddde27e7,
+    0x9e158160, 0x1a4e1b33, 0x5985bdb4, 0x8cb63f72, 0xcf7d99f5,
+    0x4b2603a6, 0x08eda521, 0x43913701, 0x005a9186, 0x84010bd5,
+    0xc7caad52, 0x6f607e83, 0x2cabd804, 0xa8f04257, 0xeb3be4d0,
+    0xa04776f0, 0xe38cd077, 0x67d74a24, 0x241ceca3, 0xf12f6e65,
+    0xb2e4c8e2, 0x36bf52b1, 0x7574f436, 0x3e086616, 0x7dc3c091,
+    0xf9985ac2, 0xba53fc45, 0x1caecae7, 0x5f656c60, 0xdb3ef633,
+    0x98f550b4, 0xd389c294, 0x90426413, 0x1419fe40, 0x57d258c7,
+    0x82e1da01, 0xc12a7c86, 0x4571e6d5, 0x06ba4052, 0x4dc6d272,
+    0x0e0d74f5, 0x8a56eea6, 0xc99d4821, 0x61379bf0, 0x22fc3d77,
+    0xa6a7a724, 0xe56c01a3, 0xae109383, 0xeddb3504, 0x6980af57,
+    0x2a4b09d0, 0xff788b16, 0xbcb32d91, 0x38e8b7c2, 0x7b231145,
+    0x305f8365, 0x739425e2, 0xf7cfbfb1, 0xb4041936, 0xe69c69c9,
+    0xa557cf4e, 0x210c551d, 0x62c7f39a, 0x29bb61ba, 0x6a70c73d,
+    0xee2b5d6e, 0xade0fbe9, 0x78d3792f, 0x3b18dfa8, 0xbf4345fb,
+    0xfc88e37c, 0xb7f4715c, 0xf43fd7db, 0x70644d88, 0x33afeb0f,
+    0x9b0538de, 0xd8ce9e59, 0x5c95040a, 0x1f5ea28d, 0x542230ad,
+    0x17e9962a, 0x93b20c79, 0xd079aafe, 0x054a2838, 0x46818ebf,
+    0xc2da14ec, 0x8111b26b, 0xca6d204b, 0x89a686cc, 0x0dfd1c9f,
+    0x4e36ba18},
+   {0x00000000, 0xe1b652ef, 0x836bd405, 0x62dd86ea, 0x06d7a80b,
+    0xe761fae4, 0x85bc7c0e, 0x640a2ee1, 0x0cae5117, 0xed1803f8,
+    0x8fc58512, 0x6e73d7fd, 0x0a79f91c, 0xebcfabf3, 0x89122d19,
+    0x68a47ff6, 0x185ca32e, 0xf9eaf1c1, 0x9b37772b, 0x7a8125c4,
+    0x1e8b0b25, 0xff3d59ca, 0x9de0df20, 0x7c568dcf, 0x14f2f239,
+    0xf544a0d6, 0x9799263c, 0x762f74d3, 0x12255a32, 0xf39308dd,
+    0x914e8e37, 0x70f8dcd8, 0x30b8465d, 0xd10e14b2, 0xb3d39258,
+    0x5265c0b7, 0x366fee56, 0xd7d9bcb9, 0xb5043a53, 0x54b268bc,
+    0x3c16174a, 0xdda045a5, 0xbf7dc34f, 0x5ecb91a0, 0x3ac1bf41,
+    0xdb77edae, 0xb9aa6b44, 0x581c39ab, 0x28e4e573, 0xc952b79c,
+    0xab8f3176, 0x4a396399, 0x2e334d78, 0xcf851f97, 0xad58997d,
+    0x4ceecb92, 0x244ab464, 0xc5fce68b, 0xa7216061, 0x4697328e,
+    0x229d1c6f, 0xc32b4e80, 0xa1f6c86a, 0x40409a85, 0x60708dba,
+    0x81c6df55, 0xe31b59bf, 0x02ad0b50, 0x66a725b1, 0x8711775e,
+    0xe5ccf1b4, 0x047aa35b, 0x6cdedcad, 0x8d688e42, 0xefb508a8,
+    0x0e035a47, 0x6a0974a6, 0x8bbf2649, 0xe962a0a3, 0x08d4f24c,
+    0x782c2e94, 0x999a7c7b, 0xfb47fa91, 0x1af1a87e, 0x7efb869f,
+    0x9f4dd470, 0xfd90529a, 0x1c260075, 0x74827f83, 0x95342d6c,
+    0xf7e9ab86, 0x165ff969, 0x7255d788, 0x93e38567, 0xf13e038d,
+    0x10885162, 0x50c8cbe7, 0xb17e9908, 0xd3a31fe2, 0x32154d0d,
+    0x561f63ec, 0xb7a93103, 0xd574b7e9, 0x34c2e506, 0x5c669af0,
+    0xbdd0c81f, 0xdf0d4ef5, 0x3ebb1c1a, 0x5ab132fb, 0xbb076014,
+    0xd9dae6fe, 0x386cb411, 0x489468c9, 0xa9223a26, 0xcbffbccc,
+    0x2a49ee23, 0x4e43c0c2, 0xaff5922d, 0xcd2814c7, 0x2c9e4628,
+    0x443a39de, 0xa58c6b31, 0xc751eddb, 0x26e7bf34, 0x42ed91d5,
+    0xa35bc33a, 0xc18645d0, 0x2030173f, 0x81e66bae, 0x60503941,
+    0x028dbfab, 0xe33bed44, 0x8731c3a5, 0x6687914a, 0x045a17a0,
+    0xe5ec454f, 0x8d483ab9, 0x6cfe6856, 0x0e23eebc, 0xef95bc53,
+    0x8b9f92b2, 0x6a29c05d, 0x08f446b7, 0xe9421458, 0x99bac880,
+    0x780c9a6f, 0x1ad11c85, 0xfb674e6a, 0x9f6d608b, 0x7edb3264,
+    0x1c06b48e, 0xfdb0e661, 0x95149997, 0x74a2cb78, 0x167f4d92,
+    0xf7c91f7d, 0x93c3319c, 0x72756373, 0x10a8e599, 0xf11eb776,
+    0xb15e2df3, 0x50e87f1c, 0x3235f9f6, 0xd383ab19, 0xb78985f8,
+    0x563fd717, 0x34e251fd, 0xd5540312, 0xbdf07ce4, 0x5c462e0b,
+    0x3e9ba8e1, 0xdf2dfa0e, 0xbb27d4ef, 0x5a918600, 0x384c00ea,
+    0xd9fa5205, 0xa9028edd, 0x48b4dc32, 0x2a695ad8, 0xcbdf0837,
+    0xafd526d6, 0x4e637439, 0x2cbef2d3, 0xcd08a03c, 0xa5acdfca,
+    0x441a8d25, 0x26c70bcf, 0xc7715920, 0xa37b77c1, 0x42cd252e,
+    0x2010a3c4, 0xc1a6f12b, 0xe196e614, 0x0020b4fb, 0x62fd3211,
+    0x834b60fe, 0xe7414e1f, 0x06f71cf0, 0x642a9a1a, 0x859cc8f5,
+    0xed38b703, 0x0c8ee5ec, 0x6e536306, 0x8fe531e9, 0xebef1f08,
+    0x0a594de7, 0x6884cb0d, 0x893299e2, 0xf9ca453a, 0x187c17d5,
+    0x7aa1913f, 0x9b17c3d0, 0xff1ded31, 0x1eabbfde, 0x7c763934,
+    0x9dc06bdb, 0xf564142d, 0x14d246c2, 0x760fc028, 0x97b992c7,
+    0xf3b3bc26, 0x1205eec9, 0x70d86823, 0x916e3acc, 0xd12ea049,
+    0x3098f2a6, 0x5245744c, 0xb3f326a3, 0xd7f90842, 0x364f5aad,
+    0x5492dc47, 0xb5248ea8, 0xdd80f15e, 0x3c36a3b1, 0x5eeb255b,
+    0xbf5d77b4, 0xdb575955, 0x3ae10bba, 0x583c8d50, 0xb98adfbf,
+    0xc9720367, 0x28c45188, 0x4a19d762, 0xabaf858d, 0xcfa5ab6c,
+    0x2e13f983, 0x4cce7f69, 0xad782d86, 0xc5dc5270, 0x246a009f,
+    0x46b78675, 0xa701d49a, 0xc30bfa7b, 0x22bda894, 0x40602e7e,
+    0xa1d67c91},
+   {0x00000000, 0x5880e2d7, 0xf106b474, 0xa98656a3, 0xe20d68e9,
+    0xba8d8a3e, 0x130bdc9d, 0x4b8b3e4a, 0x851da109, 0xdd9d43de,
+    0x741b157d, 0x2c9bf7aa, 0x6710c9e0, 0x3f902b37, 0x96167d94,
+    0xce969f43, 0x0a3b4213, 0x52bba0c4, 0xfb3df667, 0xa3bd14b0,
+    0xe8362afa, 0xb0b6c82d, 0x19309e8e, 0x41b07c59, 0x8f26e31a,
+    0xd7a601cd, 0x7e20576e, 0x26a0b5b9, 0x6d2b8bf3, 0x35ab6924,
+    0x9c2d3f87, 0xc4addd50, 0x14768426, 0x4cf666f1, 0xe5703052,
+    0xbdf0d285, 0xf67beccf, 0xaefb0e18, 0x077d58bb, 0x5ffdba6c,
+    0x916b252f, 0xc9ebc7f8, 0x606d915b, 0x38ed738c, 0x73664dc6,
+    0x2be6af11, 0x8260f9b2, 0xdae01b65, 0x1e4dc635, 0x46cd24e2,
+    0xef4b7241, 0xb7cb9096, 0xfc40aedc, 0xa4c04c0b, 0x0d461aa8,
+    0x55c6f87f, 0x9b50673c, 0xc3d085eb, 0x6a56d348, 0x32d6319f,
+    0x795d0fd5, 0x21dded02, 0x885bbba1, 0xd0db5976, 0x28ec084d,
+    0x706cea9a, 0xd9eabc39, 0x816a5eee, 0xcae160a4, 0x92618273,
+    0x3be7d4d0, 0x63673607, 0xadf1a944, 0xf5714b93, 0x5cf71d30,
+    0x0477ffe7, 0x4ffcc1ad, 0x177c237a, 0xbefa75d9, 0xe67a970e,
+    0x22d74a5e, 0x7a57a889, 0xd3d1fe2a, 0x8b511cfd, 0xc0da22b7,
+    0x985ac060, 0x31dc96c3, 0x695c7414, 0xa7caeb57, 0xff4a0980,
+    0x56cc5f23, 0x0e4cbdf4, 0x45c783be, 0x1d476169, 0xb4c137ca,
+    0xec41d51d, 0x3c9a8c6b, 0x641a6ebc, 0xcd9c381f, 0x951cdac8,
+    0xde97e482, 0x86170655, 0x2f9150f6, 0x7711b221, 0xb9872d62,
+    0xe107cfb5, 0x48819916, 0x10017bc1, 0x5b8a458b, 0x030aa75c,
+    0xaa8cf1ff, 0xf20c1328, 0x36a1ce78, 0x6e212caf, 0xc7a77a0c,
+    0x9f2798db, 0xd4aca691, 0x8c2c4446, 0x25aa12e5, 0x7d2af032,
+    0xb3bc6f71, 0xeb3c8da6, 0x42badb05, 0x1a3a39d2, 0x51b10798,
+    0x0931e54f, 0xa0b7b3ec, 0xf837513b, 0x50d8119a, 0x0858f34d,
+    0xa1dea5ee, 0xf95e4739, 0xb2d57973, 0xea559ba4, 0x43d3cd07,
+    0x1b532fd0, 0xd5c5b093, 0x8d455244, 0x24c304e7, 0x7c43e630,
+    0x37c8d87a, 0x6f483aad, 0xc6ce6c0e, 0x9e4e8ed9, 0x5ae35389,
+    0x0263b15e, 0xabe5e7fd, 0xf365052a, 0xb8ee3b60, 0xe06ed9b7,
+    0x49e88f14, 0x11686dc3, 0xdffef280, 0x877e1057, 0x2ef846f4,
+    0x7678a423, 0x3df39a69, 0x657378be, 0xccf52e1d, 0x9475ccca,
+    0x44ae95bc, 0x1c2e776b, 0xb5a821c8, 0xed28c31f, 0xa6a3fd55,
+    0xfe231f82, 0x57a54921, 0x0f25abf6, 0xc1b334b5, 0x9933d662,
+    0x30b580c1, 0x68356216, 0x23be5c5c, 0x7b3ebe8b, 0xd2b8e828,
+    0x8a380aff, 0x4e95d7af, 0x16153578, 0xbf9363db, 0xe713810c,
+    0xac98bf46, 0xf4185d91, 0x5d9e0b32, 0x051ee9e5, 0xcb8876a6,
+    0x93089471, 0x3a8ec2d2, 0x620e2005, 0x29851e4f, 0x7105fc98,
+    0xd883aa3b, 0x800348ec, 0x783419d7, 0x20b4fb00, 0x8932ada3,
+    0xd1b24f74, 0x9a39713e, 0xc2b993e9, 0x6b3fc54a, 0x33bf279d,
+    0xfd29b8de, 0xa5a95a09, 0x0c2f0caa, 0x54afee7d, 0x1f24d037,
+    0x47a432e0, 0xee226443, 0xb6a28694, 0x720f5bc4, 0x2a8fb913,
+    0x8309efb0, 0xdb890d67, 0x9002332d, 0xc882d1fa, 0x61048759,
+    0x3984658e, 0xf712facd, 0xaf92181a, 0x06144eb9, 0x5e94ac6e,
+    0x151f9224, 0x4d9f70f3, 0xe4192650, 0xbc99c487, 0x6c429df1,
+    0x34c27f26, 0x9d442985, 0xc5c4cb52, 0x8e4ff518, 0xd6cf17cf,
+    0x7f49416c, 0x27c9a3bb, 0xe95f3cf8, 0xb1dfde2f, 0x1859888c,
+    0x40d96a5b, 0x0b525411, 0x53d2b6c6, 0xfa54e065, 0xa2d402b2,
+    0x6679dfe2, 0x3ef93d35, 0x977f6b96, 0xcfff8941, 0x8474b70b,
+    0xdcf455dc, 0x7572037f, 0x2df2e1a8, 0xe3647eeb, 0xbbe49c3c,
+    0x1262ca9f, 0x4ae22848, 0x01691602, 0x59e9f4d5, 0xf06fa276,
+    0xa8ef40a1},
+   {0x00000000, 0x463b6765, 0x8c76ceca, 0xca4da9af, 0x59ebed4e,
+    0x1fd08a2b, 0xd59d2384, 0x93a644e1, 0xb2d6db9d, 0xf4edbcf8,
+    0x3ea01557, 0x789b7232, 0xeb3d36d3, 0xad0651b6, 0x674bf819,
+    0x21709f7c, 0x25abc6e0, 0x6390a185, 0xa9dd082a, 0xefe66f4f,
+    0x7c402bae, 0x3a7b4ccb, 0xf036e564, 0xb60d8201, 0x977d1d7d,
+    0xd1467a18, 0x1b0bd3b7, 0x5d30b4d2, 0xce96f033, 0x88ad9756,
+    0x42e03ef9, 0x04db599c, 0x0b50fc1a, 0x4d6b9b7f, 0x872632d0,
+    0xc11d55b5, 0x52bb1154, 0x14807631, 0xdecddf9e, 0x98f6b8fb,
+    0xb9862787, 0xffbd40e2, 0x35f0e94d, 0x73cb8e28, 0xe06dcac9,
+    0xa656adac, 0x6c1b0403, 0x2a206366, 0x2efb3afa, 0x68c05d9f,
+    0xa28df430, 0xe4b69355, 0x7710d7b4, 0x312bb0d1, 0xfb66197e,
+    0xbd5d7e1b, 0x9c2de167, 0xda168602, 0x105b2fad, 0x566048c8,
+    0xc5c60c29, 0x83fd6b4c, 0x49b0c2e3, 0x0f8ba586, 0x16a0f835,
+    0x509b9f50, 0x9ad636ff, 0xdced519a, 0x4f4b157b, 0x0970721e,
+    0xc33ddbb1, 0x8506bcd4, 0xa47623a8, 0xe24d44cd, 0x2800ed62,
+    0x6e3b8a07, 0xfd9dcee6, 0xbba6a983, 0x71eb002c, 0x37d06749,
+    0x330b3ed5, 0x753059b0, 0xbf7df01f, 0xf946977a, 0x6ae0d39b,
+    0x2cdbb4fe, 0xe6961d51, 0xa0ad7a34, 0x81dde548, 0xc7e6822d,
+    0x0dab2b82, 0x4b904ce7, 0xd8360806, 0x9e0d6f63, 0x5440c6cc,
+    0x127ba1a9, 0x1df0042f, 0x5bcb634a, 0x9186cae5, 0xd7bdad80,
+    0x441be961, 0x02208e04, 0xc86d27ab, 0x8e5640ce, 0xaf26dfb2,
+    0xe91db8d7, 0x23501178, 0x656b761d, 0xf6cd32fc, 0xb0f65599,
+    0x7abbfc36, 0x3c809b53, 0x385bc2cf, 0x7e60a5aa, 0xb42d0c05,
+    0xf2166b60, 0x61b02f81, 0x278b48e4, 0xedc6e14b, 0xabfd862e,
+    0x8a8d1952, 0xccb67e37, 0x06fbd798, 0x40c0b0fd, 0xd366f41c,
+    0x955d9379, 0x5f103ad6, 0x192b5db3, 0x2c40f16b, 0x6a7b960e,
+    0xa0363fa1, 0xe60d58c4, 0x75ab1c25, 0x33907b40, 0xf9ddd2ef,
+    0xbfe6b58a, 0x9e962af6, 0xd8ad4d93, 0x12e0e43c, 0x54db8359,
+    0xc77dc7b8, 0x8146a0dd, 0x4b0b0972, 0x0d306e17, 0x09eb378b,
+    0x4fd050ee, 0x859df941, 0xc3a69e24, 0x5000dac5, 0x163bbda0,
+    0xdc76140f, 0x9a4d736a, 0xbb3dec16, 0xfd068b73, 0x374b22dc,
+    0x717045b9, 0xe2d60158, 0xa4ed663d, 0x6ea0cf92, 0x289ba8f7,
+    0x27100d71, 0x612b6a14, 0xab66c3bb, 0xed5da4de, 0x7efbe03f,
+    0x38c0875a, 0xf28d2ef5, 0xb4b64990, 0x95c6d6ec, 0xd3fdb189,
+    0x19b01826, 0x5f8b7f43, 0xcc2d3ba2, 0x8a165cc7, 0x405bf568,
+    0x0660920d, 0x02bbcb91, 0x4480acf4, 0x8ecd055b, 0xc8f6623e,
+    0x5b5026df, 0x1d6b41ba, 0xd726e815, 0x911d8f70, 0xb06d100c,
+    0xf6567769, 0x3c1bdec6, 0x7a20b9a3, 0xe986fd42, 0xafbd9a27,
+    0x65f03388, 0x23cb54ed, 0x3ae0095e, 0x7cdb6e3b, 0xb696c794,
+    0xf0ada0f1, 0x630be410, 0x25308375, 0xef7d2ada, 0xa9464dbf,
+    0x8836d2c3, 0xce0db5a6, 0x04401c09, 0x427b7b6c, 0xd1dd3f8d,
+    0x97e658e8, 0x5dabf147, 0x1b909622, 0x1f4bcfbe, 0x5970a8db,
+    0x933d0174, 0xd5066611, 0x46a022f0, 0x009b4595, 0xcad6ec3a,
+    0x8ced8b5f, 0xad9d1423, 0xeba67346, 0x21ebdae9, 0x67d0bd8c,
+    0xf476f96d, 0xb24d9e08, 0x780037a7, 0x3e3b50c2, 0x31b0f544,
+    0x778b9221, 0xbdc63b8e, 0xfbfd5ceb, 0x685b180a, 0x2e607f6f,
+    0xe42dd6c0, 0xa216b1a5, 0x83662ed9, 0xc55d49bc, 0x0f10e013,
+    0x492b8776, 0xda8dc397, 0x9cb6a4f2, 0x56fb0d5d, 0x10c06a38,
+    0x141b33a4, 0x522054c1, 0x986dfd6e, 0xde569a0b, 0x4df0deea,
+    0x0bcbb98f, 0xc1861020, 0x87bd7745, 0xa6cde839, 0xe0f68f5c,
+    0x2abb26f3, 0x6c804196, 0xff260577, 0xb91d6212, 0x7350cbbd,
+    0x356bacd8}};
+
+#endif
+
+#endif
+
+#if N == 6
+
+#if W == 8
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0x3db1ecdc, 0x7b63d9b8, 0x46d23564, 0xf6c7b370,
+    0xcb765fac, 0x8da46ac8, 0xb0158614, 0x36fe60a1, 0x0b4f8c7d,
+    0x4d9db919, 0x702c55c5, 0xc039d3d1, 0xfd883f0d, 0xbb5a0a69,
+    0x86ebe6b5, 0x6dfcc142, 0x504d2d9e, 0x169f18fa, 0x2b2ef426,
+    0x9b3b7232, 0xa68a9eee, 0xe058ab8a, 0xdde94756, 0x5b02a1e3,
+    0x66b34d3f, 0x2061785b, 0x1dd09487, 0xadc51293, 0x9074fe4f,
+    0xd6a6cb2b, 0xeb1727f7, 0xdbf98284, 0xe6486e58, 0xa09a5b3c,
+    0x9d2bb7e0, 0x2d3e31f4, 0x108fdd28, 0x565de84c, 0x6bec0490,
+    0xed07e225, 0xd0b60ef9, 0x96643b9d, 0xabd5d741, 0x1bc05155,
+    0x2671bd89, 0x60a388ed, 0x5d126431, 0xb60543c6, 0x8bb4af1a,
+    0xcd669a7e, 0xf0d776a2, 0x40c2f0b6, 0x7d731c6a, 0x3ba1290e,
+    0x0610c5d2, 0x80fb2367, 0xbd4acfbb, 0xfb98fadf, 0xc6291603,
+    0x763c9017, 0x4b8d7ccb, 0x0d5f49af, 0x30eea573, 0x6c820349,
+    0x5133ef95, 0x17e1daf1, 0x2a50362d, 0x9a45b039, 0xa7f45ce5,
+    0xe1266981, 0xdc97855d, 0x5a7c63e8, 0x67cd8f34, 0x211fba50,
+    0x1cae568c, 0xacbbd098, 0x910a3c44, 0xd7d80920, 0xea69e5fc,
+    0x017ec20b, 0x3ccf2ed7, 0x7a1d1bb3, 0x47acf76f, 0xf7b9717b,
+    0xca089da7, 0x8cdaa8c3, 0xb16b441f, 0x3780a2aa, 0x0a314e76,
+    0x4ce37b12, 0x715297ce, 0xc14711da, 0xfcf6fd06, 0xba24c862,
+    0x879524be, 0xb77b81cd, 0x8aca6d11, 0xcc185875, 0xf1a9b4a9,
+    0x41bc32bd, 0x7c0dde61, 0x3adfeb05, 0x076e07d9, 0x8185e16c,
+    0xbc340db0, 0xfae638d4, 0xc757d408, 0x7742521c, 0x4af3bec0,
+    0x0c218ba4, 0x31906778, 0xda87408f, 0xe736ac53, 0xa1e49937,
+    0x9c5575eb, 0x2c40f3ff, 0x11f11f23, 0x57232a47, 0x6a92c69b,
+    0xec79202e, 0xd1c8ccf2, 0x971af996, 0xaaab154a, 0x1abe935e,
+    0x270f7f82, 0x61dd4ae6, 0x5c6ca63a, 0xd9040692, 0xe4b5ea4e,
+    0xa267df2a, 0x9fd633f6, 0x2fc3b5e2, 0x1272593e, 0x54a06c5a,
+    0x69118086, 0xeffa6633, 0xd24b8aef, 0x9499bf8b, 0xa9285357,
+    0x193dd543, 0x248c399f, 0x625e0cfb, 0x5fefe027, 0xb4f8c7d0,
+    0x89492b0c, 0xcf9b1e68, 0xf22af2b4, 0x423f74a0, 0x7f8e987c,
+    0x395cad18, 0x04ed41c4, 0x8206a771, 0xbfb74bad, 0xf9657ec9,
+    0xc4d49215, 0x74c11401, 0x4970f8dd, 0x0fa2cdb9, 0x32132165,
+    0x02fd8416, 0x3f4c68ca, 0x799e5dae, 0x442fb172, 0xf43a3766,
+    0xc98bdbba, 0x8f59eede, 0xb2e80202, 0x3403e4b7, 0x09b2086b,
+    0x4f603d0f, 0x72d1d1d3, 0xc2c457c7, 0xff75bb1b, 0xb9a78e7f,
+    0x841662a3, 0x6f014554, 0x52b0a988, 0x14629cec, 0x29d37030,
+    0x99c6f624, 0xa4771af8, 0xe2a52f9c, 0xdf14c340, 0x59ff25f5,
+    0x644ec929, 0x229cfc4d, 0x1f2d1091, 0xaf389685, 0x92897a59,
+    0xd45b4f3d, 0xe9eaa3e1, 0xb58605db, 0x8837e907, 0xcee5dc63,
+    0xf35430bf, 0x4341b6ab, 0x7ef05a77, 0x38226f13, 0x059383cf,
+    0x8378657a, 0xbec989a6, 0xf81bbcc2, 0xc5aa501e, 0x75bfd60a,
+    0x480e3ad6, 0x0edc0fb2, 0x336de36e, 0xd87ac499, 0xe5cb2845,
+    0xa3191d21, 0x9ea8f1fd, 0x2ebd77e9, 0x130c9b35, 0x55deae51,
+    0x686f428d, 0xee84a438, 0xd33548e4, 0x95e77d80, 0xa856915c,
+    0x18431748, 0x25f2fb94, 0x6320cef0, 0x5e91222c, 0x6e7f875f,
+    0x53ce6b83, 0x151c5ee7, 0x28adb23b, 0x98b8342f, 0xa509d8f3,
+    0xe3dbed97, 0xde6a014b, 0x5881e7fe, 0x65300b22, 0x23e23e46,
+    0x1e53d29a, 0xae46548e, 0x93f7b852, 0xd5258d36, 0xe89461ea,
+    0x0383461d, 0x3e32aac1, 0x78e09fa5, 0x45517379, 0xf544f56d,
+    0xc8f519b1, 0x8e272cd5, 0xb396c009, 0x357d26bc, 0x08ccca60,
+    0x4e1eff04, 0x73af13d8, 0xc3ba95cc, 0xfe0b7910, 0xb8d94c74,
+    0x8568a0a8},
+   {0x00000000, 0x69790b65, 0xd2f216ca, 0xbb8b1daf, 0x7e952bd5,
+    0x17ec20b0, 0xac673d1f, 0xc51e367a, 0xfd2a57aa, 0x94535ccf,
+    0x2fd84160, 0x46a14a05, 0x83bf7c7f, 0xeac6771a, 0x514d6ab5,
+    0x383461d0, 0x2125a915, 0x485ca270, 0xf3d7bfdf, 0x9aaeb4ba,
+    0x5fb082c0, 0x36c989a5, 0x8d42940a, 0xe43b9f6f, 0xdc0ffebf,
+    0xb576f5da, 0x0efde875, 0x6784e310, 0xa29ad56a, 0xcbe3de0f,
+    0x7068c3a0, 0x1911c8c5, 0x424b522a, 0x2b32594f, 0x90b944e0,
+    0xf9c04f85, 0x3cde79ff, 0x55a7729a, 0xee2c6f35, 0x87556450,
+    0xbf610580, 0xd6180ee5, 0x6d93134a, 0x04ea182f, 0xc1f42e55,
+    0xa88d2530, 0x1306389f, 0x7a7f33fa, 0x636efb3f, 0x0a17f05a,
+    0xb19cedf5, 0xd8e5e690, 0x1dfbd0ea, 0x7482db8f, 0xcf09c620,
+    0xa670cd45, 0x9e44ac95, 0xf73da7f0, 0x4cb6ba5f, 0x25cfb13a,
+    0xe0d18740, 0x89a88c25, 0x3223918a, 0x5b5a9aef, 0x8496a454,
+    0xedefaf31, 0x5664b29e, 0x3f1db9fb, 0xfa038f81, 0x937a84e4,
+    0x28f1994b, 0x4188922e, 0x79bcf3fe, 0x10c5f89b, 0xab4ee534,
+    0xc237ee51, 0x0729d82b, 0x6e50d34e, 0xd5dbcee1, 0xbca2c584,
+    0xa5b30d41, 0xccca0624, 0x77411b8b, 0x1e3810ee, 0xdb262694,
+    0xb25f2df1, 0x09d4305e, 0x60ad3b3b, 0x58995aeb, 0x31e0518e,
+    0x8a6b4c21, 0xe3124744, 0x260c713e, 0x4f757a5b, 0xf4fe67f4,
+    0x9d876c91, 0xc6ddf67e, 0xafa4fd1b, 0x142fe0b4, 0x7d56ebd1,
+    0xb848ddab, 0xd131d6ce, 0x6abacb61, 0x03c3c004, 0x3bf7a1d4,
+    0x528eaab1, 0xe905b71e, 0x807cbc7b, 0x45628a01, 0x2c1b8164,
+    0x97909ccb, 0xfee997ae, 0xe7f85f6b, 0x8e81540e, 0x350a49a1,
+    0x5c7342c4, 0x996d74be, 0xf0147fdb, 0x4b9f6274, 0x22e66911,
+    0x1ad208c1, 0x73ab03a4, 0xc8201e0b, 0xa159156e, 0x64472314,
+    0x0d3e2871, 0xb6b535de, 0xdfcc3ebb, 0xd25c4ee9, 0xbb25458c,
+    0x00ae5823, 0x69d75346, 0xacc9653c, 0xc5b06e59, 0x7e3b73f6,
+    0x17427893, 0x2f761943, 0x460f1226, 0xfd840f89, 0x94fd04ec,
+    0x51e33296, 0x389a39f3, 0x8311245c, 0xea682f39, 0xf379e7fc,
+    0x9a00ec99, 0x218bf136, 0x48f2fa53, 0x8deccc29, 0xe495c74c,
+    0x5f1edae3, 0x3667d186, 0x0e53b056, 0x672abb33, 0xdca1a69c,
+    0xb5d8adf9, 0x70c69b83, 0x19bf90e6, 0xa2348d49, 0xcb4d862c,
+    0x90171cc3, 0xf96e17a6, 0x42e50a09, 0x2b9c016c, 0xee823716,
+    0x87fb3c73, 0x3c7021dc, 0x55092ab9, 0x6d3d4b69, 0x0444400c,
+    0xbfcf5da3, 0xd6b656c6, 0x13a860bc, 0x7ad16bd9, 0xc15a7676,
+    0xa8237d13, 0xb132b5d6, 0xd84bbeb3, 0x63c0a31c, 0x0ab9a879,
+    0xcfa79e03, 0xa6de9566, 0x1d5588c9, 0x742c83ac, 0x4c18e27c,
+    0x2561e919, 0x9eeaf4b6, 0xf793ffd3, 0x328dc9a9, 0x5bf4c2cc,
+    0xe07fdf63, 0x8906d406, 0x56caeabd, 0x3fb3e1d8, 0x8438fc77,
+    0xed41f712, 0x285fc168, 0x4126ca0d, 0xfaadd7a2, 0x93d4dcc7,
+    0xabe0bd17, 0xc299b672, 0x7912abdd, 0x106ba0b8, 0xd57596c2,
+    0xbc0c9da7, 0x07878008, 0x6efe8b6d, 0x77ef43a8, 0x1e9648cd,
+    0xa51d5562, 0xcc645e07, 0x097a687d, 0x60036318, 0xdb887eb7,
+    0xb2f175d2, 0x8ac51402, 0xe3bc1f67, 0x583702c8, 0x314e09ad,
+    0xf4503fd7, 0x9d2934b2, 0x26a2291d, 0x4fdb2278, 0x1481b897,
+    0x7df8b3f2, 0xc673ae5d, 0xaf0aa538, 0x6a149342, 0x036d9827,
+    0xb8e68588, 0xd19f8eed, 0xe9abef3d, 0x80d2e458, 0x3b59f9f7,
+    0x5220f292, 0x973ec4e8, 0xfe47cf8d, 0x45ccd222, 0x2cb5d947,
+    0x35a41182, 0x5cdd1ae7, 0xe7560748, 0x8e2f0c2d, 0x4b313a57,
+    0x22483132, 0x99c32c9d, 0xf0ba27f8, 0xc88e4628, 0xa1f74d4d,
+    0x1a7c50e2, 0x73055b87, 0xb61b6dfd, 0xdf626698, 0x64e97b37,
+    0x0d907052},
+   {0x00000000, 0x7fc99b93, 0xff933726, 0x805aacb5, 0x2457680d,
+    0x5b9ef39e, 0xdbc45f2b, 0xa40dc4b8, 0x48aed01a, 0x37674b89,
+    0xb73de73c, 0xc8f47caf, 0x6cf9b817, 0x13302384, 0x936a8f31,
+    0xeca314a2, 0x915da034, 0xee943ba7, 0x6ece9712, 0x11070c81,
+    0xb50ac839, 0xcac353aa, 0x4a99ff1f, 0x3550648c, 0xd9f3702e,
+    0xa63aebbd, 0x26604708, 0x59a9dc9b, 0xfda41823, 0x826d83b0,
+    0x02372f05, 0x7dfeb496, 0xf9ca4629, 0x8603ddba, 0x0659710f,
+    0x7990ea9c, 0xdd9d2e24, 0xa254b5b7, 0x220e1902, 0x5dc78291,
+    0xb1649633, 0xcead0da0, 0x4ef7a115, 0x313e3a86, 0x9533fe3e,
+    0xeafa65ad, 0x6aa0c918, 0x1569528b, 0x6897e61d, 0x175e7d8e,
+    0x9704d13b, 0xe8cd4aa8, 0x4cc08e10, 0x33091583, 0xb353b936,
+    0xcc9a22a5, 0x20393607, 0x5ff0ad94, 0xdfaa0121, 0xa0639ab2,
+    0x046e5e0a, 0x7ba7c599, 0xfbfd692c, 0x8434f2bf, 0x28e58a13,
+    0x572c1180, 0xd776bd35, 0xa8bf26a6, 0x0cb2e21e, 0x737b798d,
+    0xf321d538, 0x8ce84eab, 0x604b5a09, 0x1f82c19a, 0x9fd86d2f,
+    0xe011f6bc, 0x441c3204, 0x3bd5a997, 0xbb8f0522, 0xc4469eb1,
+    0xb9b82a27, 0xc671b1b4, 0x462b1d01, 0x39e28692, 0x9def422a,
+    0xe226d9b9, 0x627c750c, 0x1db5ee9f, 0xf116fa3d, 0x8edf61ae,
+    0x0e85cd1b, 0x714c5688, 0xd5419230, 0xaa8809a3, 0x2ad2a516,
+    0x551b3e85, 0xd12fcc3a, 0xaee657a9, 0x2ebcfb1c, 0x5175608f,
+    0xf578a437, 0x8ab13fa4, 0x0aeb9311, 0x75220882, 0x99811c20,
+    0xe64887b3, 0x66122b06, 0x19dbb095, 0xbdd6742d, 0xc21fefbe,
+    0x4245430b, 0x3d8cd898, 0x40726c0e, 0x3fbbf79d, 0xbfe15b28,
+    0xc028c0bb, 0x64250403, 0x1bec9f90, 0x9bb63325, 0xe47fa8b6,
+    0x08dcbc14, 0x77152787, 0xf74f8b32, 0x888610a1, 0x2c8bd419,
+    0x53424f8a, 0xd318e33f, 0xacd178ac, 0x51cb1426, 0x2e028fb5,
+    0xae582300, 0xd191b893, 0x759c7c2b, 0x0a55e7b8, 0x8a0f4b0d,
+    0xf5c6d09e, 0x1965c43c, 0x66ac5faf, 0xe6f6f31a, 0x993f6889,
+    0x3d32ac31, 0x42fb37a2, 0xc2a19b17, 0xbd680084, 0xc096b412,
+    0xbf5f2f81, 0x3f058334, 0x40cc18a7, 0xe4c1dc1f, 0x9b08478c,
+    0x1b52eb39, 0x649b70aa, 0x88386408, 0xf7f1ff9b, 0x77ab532e,
+    0x0862c8bd, 0xac6f0c05, 0xd3a69796, 0x53fc3b23, 0x2c35a0b0,
+    0xa801520f, 0xd7c8c99c, 0x57926529, 0x285bfeba, 0x8c563a02,
+    0xf39fa191, 0x73c50d24, 0x0c0c96b7, 0xe0af8215, 0x9f661986,
+    0x1f3cb533, 0x60f52ea0, 0xc4f8ea18, 0xbb31718b, 0x3b6bdd3e,
+    0x44a246ad, 0x395cf23b, 0x469569a8, 0xc6cfc51d, 0xb9065e8e,
+    0x1d0b9a36, 0x62c201a5, 0xe298ad10, 0x9d513683, 0x71f22221,
+    0x0e3bb9b2, 0x8e611507, 0xf1a88e94, 0x55a54a2c, 0x2a6cd1bf,
+    0xaa367d0a, 0xd5ffe699, 0x792e9e35, 0x06e705a6, 0x86bda913,
+    0xf9743280, 0x5d79f638, 0x22b06dab, 0xa2eac11e, 0xdd235a8d,
+    0x31804e2f, 0x4e49d5bc, 0xce137909, 0xb1dae29a, 0x15d72622,
+    0x6a1ebdb1, 0xea441104, 0x958d8a97, 0xe8733e01, 0x97baa592,
+    0x17e00927, 0x682992b4, 0xcc24560c, 0xb3edcd9f, 0x33b7612a,
+    0x4c7efab9, 0xa0ddee1b, 0xdf147588, 0x5f4ed93d, 0x208742ae,
+    0x848a8616, 0xfb431d85, 0x7b19b130, 0x04d02aa3, 0x80e4d81c,
+    0xff2d438f, 0x7f77ef3a, 0x00be74a9, 0xa4b3b011, 0xdb7a2b82,
+    0x5b208737, 0x24e91ca4, 0xc84a0806, 0xb7839395, 0x37d93f20,
+    0x4810a4b3, 0xec1d600b, 0x93d4fb98, 0x138e572d, 0x6c47ccbe,
+    0x11b97828, 0x6e70e3bb, 0xee2a4f0e, 0x91e3d49d, 0x35ee1025,
+    0x4a278bb6, 0xca7d2703, 0xb5b4bc90, 0x5917a832, 0x26de33a1,
+    0xa6849f14, 0xd94d0487, 0x7d40c03f, 0x02895bac, 0x82d3f719,
+    0xfd1a6c8a},
+   {0x00000000, 0xa396284c, 0x9c5d56d9, 0x3fcb7e95, 0xe3cbabf3,
+    0x405d83bf, 0x7f96fd2a, 0xdc00d566, 0x1ce651a7, 0xbf7079eb,
+    0x80bb077e, 0x232d2f32, 0xff2dfa54, 0x5cbbd218, 0x6370ac8d,
+    0xc0e684c1, 0x39cca34e, 0x9a5a8b02, 0xa591f597, 0x0607dddb,
+    0xda0708bd, 0x799120f1, 0x465a5e64, 0xe5cc7628, 0x252af2e9,
+    0x86bcdaa5, 0xb977a430, 0x1ae18c7c, 0xc6e1591a, 0x65777156,
+    0x5abc0fc3, 0xf92a278f, 0x7399469c, 0xd00f6ed0, 0xefc41045,
+    0x4c523809, 0x9052ed6f, 0x33c4c523, 0x0c0fbbb6, 0xaf9993fa,
+    0x6f7f173b, 0xcce93f77, 0xf32241e2, 0x50b469ae, 0x8cb4bcc8,
+    0x2f229484, 0x10e9ea11, 0xb37fc25d, 0x4a55e5d2, 0xe9c3cd9e,
+    0xd608b30b, 0x759e9b47, 0xa99e4e21, 0x0a08666d, 0x35c318f8,
+    0x965530b4, 0x56b3b475, 0xf5259c39, 0xcaeee2ac, 0x6978cae0,
+    0xb5781f86, 0x16ee37ca, 0x2925495f, 0x8ab36113, 0xe7328d38,
+    0x44a4a574, 0x7b6fdbe1, 0xd8f9f3ad, 0x04f926cb, 0xa76f0e87,
+    0x98a47012, 0x3b32585e, 0xfbd4dc9f, 0x5842f4d3, 0x67898a46,
+    0xc41fa20a, 0x181f776c, 0xbb895f20, 0x844221b5, 0x27d409f9,
+    0xdefe2e76, 0x7d68063a, 0x42a378af, 0xe13550e3, 0x3d358585,
+    0x9ea3adc9, 0xa168d35c, 0x02fefb10, 0xc2187fd1, 0x618e579d,
+    0x5e452908, 0xfdd30144, 0x21d3d422, 0x8245fc6e, 0xbd8e82fb,
+    0x1e18aab7, 0x94abcba4, 0x373de3e8, 0x08f69d7d, 0xab60b531,
+    0x77606057, 0xd4f6481b, 0xeb3d368e, 0x48ab1ec2, 0x884d9a03,
+    0x2bdbb24f, 0x1410ccda, 0xb786e496, 0x6b8631f0, 0xc81019bc,
+    0xf7db6729, 0x544d4f65, 0xad6768ea, 0x0ef140a6, 0x313a3e33,
+    0x92ac167f, 0x4eacc319, 0xed3aeb55, 0xd2f195c0, 0x7167bd8c,
+    0xb181394d, 0x12171101, 0x2ddc6f94, 0x8e4a47d8, 0x524a92be,
+    0xf1dcbaf2, 0xce17c467, 0x6d81ec2b, 0x15141c31, 0xb682347d,
+    0x89494ae8, 0x2adf62a4, 0xf6dfb7c2, 0x55499f8e, 0x6a82e11b,
+    0xc914c957, 0x09f24d96, 0xaa6465da, 0x95af1b4f, 0x36393303,
+    0xea39e665, 0x49afce29, 0x7664b0bc, 0xd5f298f0, 0x2cd8bf7f,
+    0x8f4e9733, 0xb085e9a6, 0x1313c1ea, 0xcf13148c, 0x6c853cc0,
+    0x534e4255, 0xf0d86a19, 0x303eeed8, 0x93a8c694, 0xac63b801,
+    0x0ff5904d, 0xd3f5452b, 0x70636d67, 0x4fa813f2, 0xec3e3bbe,
+    0x668d5aad, 0xc51b72e1, 0xfad00c74, 0x59462438, 0x8546f15e,
+    0x26d0d912, 0x191ba787, 0xba8d8fcb, 0x7a6b0b0a, 0xd9fd2346,
+    0xe6365dd3, 0x45a0759f, 0x99a0a0f9, 0x3a3688b5, 0x05fdf620,
+    0xa66bde6c, 0x5f41f9e3, 0xfcd7d1af, 0xc31caf3a, 0x608a8776,
+    0xbc8a5210, 0x1f1c7a5c, 0x20d704c9, 0x83412c85, 0x43a7a844,
+    0xe0318008, 0xdffafe9d, 0x7c6cd6d1, 0xa06c03b7, 0x03fa2bfb,
+    0x3c31556e, 0x9fa77d22, 0xf2269109, 0x51b0b945, 0x6e7bc7d0,
+    0xcdedef9c, 0x11ed3afa, 0xb27b12b6, 0x8db06c23, 0x2e26446f,
+    0xeec0c0ae, 0x4d56e8e2, 0x729d9677, 0xd10bbe3b, 0x0d0b6b5d,
+    0xae9d4311, 0x91563d84, 0x32c015c8, 0xcbea3247, 0x687c1a0b,
+    0x57b7649e, 0xf4214cd2, 0x282199b4, 0x8bb7b1f8, 0xb47ccf6d,
+    0x17eae721, 0xd70c63e0, 0x749a4bac, 0x4b513539, 0xe8c71d75,
+    0x34c7c813, 0x9751e05f, 0xa89a9eca, 0x0b0cb686, 0x81bfd795,
+    0x2229ffd9, 0x1de2814c, 0xbe74a900, 0x62747c66, 0xc1e2542a,
+    0xfe292abf, 0x5dbf02f3, 0x9d598632, 0x3ecfae7e, 0x0104d0eb,
+    0xa292f8a7, 0x7e922dc1, 0xdd04058d, 0xe2cf7b18, 0x41595354,
+    0xb87374db, 0x1be55c97, 0x242e2202, 0x87b80a4e, 0x5bb8df28,
+    0xf82ef764, 0xc7e589f1, 0x6473a1bd, 0xa495257c, 0x07030d30,
+    0x38c873a5, 0x9b5e5be9, 0x475e8e8f, 0xe4c8a6c3, 0xdb03d856,
+    0x7895f01a},
+   {0x00000000, 0x2a283862, 0x545070c4, 0x7e7848a6, 0xa8a0e188,
+    0x8288d9ea, 0xfcf0914c, 0xd6d8a92e, 0x8a30c551, 0xa018fd33,
+    0xde60b595, 0xf4488df7, 0x229024d9, 0x08b81cbb, 0x76c0541d,
+    0x5ce86c7f, 0xcf108ce3, 0xe538b481, 0x9b40fc27, 0xb168c445,
+    0x67b06d6b, 0x4d985509, 0x33e01daf, 0x19c825cd, 0x452049b2,
+    0x6f0871d0, 0x11703976, 0x3b580114, 0xed80a83a, 0xc7a89058,
+    0xb9d0d8fe, 0x93f8e09c, 0x45501f87, 0x6f7827e5, 0x11006f43,
+    0x3b285721, 0xedf0fe0f, 0xc7d8c66d, 0xb9a08ecb, 0x9388b6a9,
+    0xcf60dad6, 0xe548e2b4, 0x9b30aa12, 0xb1189270, 0x67c03b5e,
+    0x4de8033c, 0x33904b9a, 0x19b873f8, 0x8a409364, 0xa068ab06,
+    0xde10e3a0, 0xf438dbc2, 0x22e072ec, 0x08c84a8e, 0x76b00228,
+    0x5c983a4a, 0x00705635, 0x2a586e57, 0x542026f1, 0x7e081e93,
+    0xa8d0b7bd, 0x82f88fdf, 0xfc80c779, 0xd6a8ff1b, 0x8aa03f0e,
+    0xa088076c, 0xdef04fca, 0xf4d877a8, 0x2200de86, 0x0828e6e4,
+    0x7650ae42, 0x5c789620, 0x0090fa5f, 0x2ab8c23d, 0x54c08a9b,
+    0x7ee8b2f9, 0xa8301bd7, 0x821823b5, 0xfc606b13, 0xd6485371,
+    0x45b0b3ed, 0x6f988b8f, 0x11e0c329, 0x3bc8fb4b, 0xed105265,
+    0xc7386a07, 0xb94022a1, 0x93681ac3, 0xcf8076bc, 0xe5a84ede,
+    0x9bd00678, 0xb1f83e1a, 0x67209734, 0x4d08af56, 0x3370e7f0,
+    0x1958df92, 0xcff02089, 0xe5d818eb, 0x9ba0504d, 0xb188682f,
+    0x6750c101, 0x4d78f963, 0x3300b1c5, 0x192889a7, 0x45c0e5d8,
+    0x6fe8ddba, 0x1190951c, 0x3bb8ad7e, 0xed600450, 0xc7483c32,
+    0xb9307494, 0x93184cf6, 0x00e0ac6a, 0x2ac89408, 0x54b0dcae,
+    0x7e98e4cc, 0xa8404de2, 0x82687580, 0xfc103d26, 0xd6380544,
+    0x8ad0693b, 0xa0f85159, 0xde8019ff, 0xf4a8219d, 0x227088b3,
+    0x0858b0d1, 0x7620f877, 0x5c08c015, 0xce31785d, 0xe419403f,
+    0x9a610899, 0xb04930fb, 0x669199d5, 0x4cb9a1b7, 0x32c1e911,
+    0x18e9d173, 0x4401bd0c, 0x6e29856e, 0x1051cdc8, 0x3a79f5aa,
+    0xeca15c84, 0xc68964e6, 0xb8f12c40, 0x92d91422, 0x0121f4be,
+    0x2b09ccdc, 0x5571847a, 0x7f59bc18, 0xa9811536, 0x83a92d54,
+    0xfdd165f2, 0xd7f95d90, 0x8b1131ef, 0xa139098d, 0xdf41412b,
+    0xf5697949, 0x23b1d067, 0x0999e805, 0x77e1a0a3, 0x5dc998c1,
+    0x8b6167da, 0xa1495fb8, 0xdf31171e, 0xf5192f7c, 0x23c18652,
+    0x09e9be30, 0x7791f696, 0x5db9cef4, 0x0151a28b, 0x2b799ae9,
+    0x5501d24f, 0x7f29ea2d, 0xa9f14303, 0x83d97b61, 0xfda133c7,
+    0xd7890ba5, 0x4471eb39, 0x6e59d35b, 0x10219bfd, 0x3a09a39f,
+    0xecd10ab1, 0xc6f932d3, 0xb8817a75, 0x92a94217, 0xce412e68,
+    0xe469160a, 0x9a115eac, 0xb03966ce, 0x66e1cfe0, 0x4cc9f782,
+    0x32b1bf24, 0x18998746, 0x44914753, 0x6eb97f31, 0x10c13797,
+    0x3ae90ff5, 0xec31a6db, 0xc6199eb9, 0xb861d61f, 0x9249ee7d,
+    0xcea18202, 0xe489ba60, 0x9af1f2c6, 0xb0d9caa4, 0x6601638a,
+    0x4c295be8, 0x3251134e, 0x18792b2c, 0x8b81cbb0, 0xa1a9f3d2,
+    0xdfd1bb74, 0xf5f98316, 0x23212a38, 0x0909125a, 0x77715afc,
+    0x5d59629e, 0x01b10ee1, 0x2b993683, 0x55e17e25, 0x7fc94647,
+    0xa911ef69, 0x8339d70b, 0xfd419fad, 0xd769a7cf, 0x01c158d4,
+    0x2be960b6, 0x55912810, 0x7fb91072, 0xa961b95c, 0x8349813e,
+    0xfd31c998, 0xd719f1fa, 0x8bf19d85, 0xa1d9a5e7, 0xdfa1ed41,
+    0xf589d523, 0x23517c0d, 0x0979446f, 0x77010cc9, 0x5d2934ab,
+    0xced1d437, 0xe4f9ec55, 0x9a81a4f3, 0xb0a99c91, 0x667135bf,
+    0x4c590ddd, 0x3221457b, 0x18097d19, 0x44e11166, 0x6ec92904,
+    0x10b161a2, 0x3a9959c0, 0xec41f0ee, 0xc669c88c, 0xb811802a,
+    0x9239b848},
+   {0x00000000, 0x4713f6fb, 0x8e27edf6, 0xc9341b0d, 0xc73eddad,
+    0x802d2b56, 0x4919305b, 0x0e0ac6a0, 0x550cbd1b, 0x121f4be0,
+    0xdb2b50ed, 0x9c38a616, 0x923260b6, 0xd521964d, 0x1c158d40,
+    0x5b067bbb, 0xaa197a36, 0xed0a8ccd, 0x243e97c0, 0x632d613b,
+    0x6d27a79b, 0x2a345160, 0xe3004a6d, 0xa413bc96, 0xff15c72d,
+    0xb80631d6, 0x71322adb, 0x3621dc20, 0x382b1a80, 0x7f38ec7b,
+    0xb60cf776, 0xf11f018d, 0x8f43f22d, 0xc85004d6, 0x01641fdb,
+    0x4677e920, 0x487d2f80, 0x0f6ed97b, 0xc65ac276, 0x8149348d,
+    0xda4f4f36, 0x9d5cb9cd, 0x5468a2c0, 0x137b543b, 0x1d71929b,
+    0x5a626460, 0x93567f6d, 0xd4458996, 0x255a881b, 0x62497ee0,
+    0xab7d65ed, 0xec6e9316, 0xe26455b6, 0xa577a34d, 0x6c43b840,
+    0x2b504ebb, 0x70563500, 0x3745c3fb, 0xfe71d8f6, 0xb9622e0d,
+    0xb768e8ad, 0xf07b1e56, 0x394f055b, 0x7e5cf3a0, 0xc5f6e21b,
+    0x82e514e0, 0x4bd10fed, 0x0cc2f916, 0x02c83fb6, 0x45dbc94d,
+    0x8cefd240, 0xcbfc24bb, 0x90fa5f00, 0xd7e9a9fb, 0x1eddb2f6,
+    0x59ce440d, 0x57c482ad, 0x10d77456, 0xd9e36f5b, 0x9ef099a0,
+    0x6fef982d, 0x28fc6ed6, 0xe1c875db, 0xa6db8320, 0xa8d14580,
+    0xefc2b37b, 0x26f6a876, 0x61e55e8d, 0x3ae32536, 0x7df0d3cd,
+    0xb4c4c8c0, 0xf3d73e3b, 0xfdddf89b, 0xbace0e60, 0x73fa156d,
+    0x34e9e396, 0x4ab51036, 0x0da6e6cd, 0xc492fdc0, 0x83810b3b,
+    0x8d8bcd9b, 0xca983b60, 0x03ac206d, 0x44bfd696, 0x1fb9ad2d,
+    0x58aa5bd6, 0x919e40db, 0xd68db620, 0xd8877080, 0x9f94867b,
+    0x56a09d76, 0x11b36b8d, 0xe0ac6a00, 0xa7bf9cfb, 0x6e8b87f6,
+    0x2998710d, 0x2792b7ad, 0x60814156, 0xa9b55a5b, 0xeea6aca0,
+    0xb5a0d71b, 0xf2b321e0, 0x3b873aed, 0x7c94cc16, 0x729e0ab6,
+    0x358dfc4d, 0xfcb9e740, 0xbbaa11bb, 0x509cc277, 0x178f348c,
+    0xdebb2f81, 0x99a8d97a, 0x97a21fda, 0xd0b1e921, 0x1985f22c,
+    0x5e9604d7, 0x05907f6c, 0x42838997, 0x8bb7929a, 0xcca46461,
+    0xc2aea2c1, 0x85bd543a, 0x4c894f37, 0x0b9ab9cc, 0xfa85b841,
+    0xbd964eba, 0x74a255b7, 0x33b1a34c, 0x3dbb65ec, 0x7aa89317,
+    0xb39c881a, 0xf48f7ee1, 0xaf89055a, 0xe89af3a1, 0x21aee8ac,
+    0x66bd1e57, 0x68b7d8f7, 0x2fa42e0c, 0xe6903501, 0xa183c3fa,
+    0xdfdf305a, 0x98ccc6a1, 0x51f8ddac, 0x16eb2b57, 0x18e1edf7,
+    0x5ff21b0c, 0x96c60001, 0xd1d5f6fa, 0x8ad38d41, 0xcdc07bba,
+    0x04f460b7, 0x43e7964c, 0x4ded50ec, 0x0afea617, 0xc3cabd1a,
+    0x84d94be1, 0x75c64a6c, 0x32d5bc97, 0xfbe1a79a, 0xbcf25161,
+    0xb2f897c1, 0xf5eb613a, 0x3cdf7a37, 0x7bcc8ccc, 0x20caf777,
+    0x67d9018c, 0xaeed1a81, 0xe9feec7a, 0xe7f42ada, 0xa0e7dc21,
+    0x69d3c72c, 0x2ec031d7, 0x956a206c, 0xd279d697, 0x1b4dcd9a,
+    0x5c5e3b61, 0x5254fdc1, 0x15470b3a, 0xdc731037, 0x9b60e6cc,
+    0xc0669d77, 0x87756b8c, 0x4e417081, 0x0952867a, 0x075840da,
+    0x404bb621, 0x897fad2c, 0xce6c5bd7, 0x3f735a5a, 0x7860aca1,
+    0xb154b7ac, 0xf6474157, 0xf84d87f7, 0xbf5e710c, 0x766a6a01,
+    0x31799cfa, 0x6a7fe741, 0x2d6c11ba, 0xe4580ab7, 0xa34bfc4c,
+    0xad413aec, 0xea52cc17, 0x2366d71a, 0x647521e1, 0x1a29d241,
+    0x5d3a24ba, 0x940e3fb7, 0xd31dc94c, 0xdd170fec, 0x9a04f917,
+    0x5330e21a, 0x142314e1, 0x4f256f5a, 0x083699a1, 0xc10282ac,
+    0x86117457, 0x881bb2f7, 0xcf08440c, 0x063c5f01, 0x412fa9fa,
+    0xb030a877, 0xf7235e8c, 0x3e174581, 0x7904b37a, 0x770e75da,
+    0x301d8321, 0xf929982c, 0xbe3a6ed7, 0xe53c156c, 0xa22fe397,
+    0x6b1bf89a, 0x2c080e61, 0x2202c8c1, 0x65113e3a, 0xac252537,
+    0xeb36d3cc},
+   {0x00000000, 0xa13984ee, 0x99020f9d, 0x383b8b73, 0xe975197b,
+    0x484c9d95, 0x707716e6, 0xd14e9208, 0x099b34b7, 0xa8a2b059,
+    0x90993b2a, 0x31a0bfc4, 0xe0ee2dcc, 0x41d7a922, 0x79ec2251,
+    0xd8d5a6bf, 0x1336696e, 0xb20fed80, 0x8a3466f3, 0x2b0de21d,
+    0xfa437015, 0x5b7af4fb, 0x63417f88, 0xc278fb66, 0x1aad5dd9,
+    0xbb94d937, 0x83af5244, 0x2296d6aa, 0xf3d844a2, 0x52e1c04c,
+    0x6ada4b3f, 0xcbe3cfd1, 0x266cd2dc, 0x87555632, 0xbf6edd41,
+    0x1e5759af, 0xcf19cba7, 0x6e204f49, 0x561bc43a, 0xf72240d4,
+    0x2ff7e66b, 0x8ece6285, 0xb6f5e9f6, 0x17cc6d18, 0xc682ff10,
+    0x67bb7bfe, 0x5f80f08d, 0xfeb97463, 0x355abbb2, 0x94633f5c,
+    0xac58b42f, 0x0d6130c1, 0xdc2fa2c9, 0x7d162627, 0x452dad54,
+    0xe41429ba, 0x3cc18f05, 0x9df80beb, 0xa5c38098, 0x04fa0476,
+    0xd5b4967e, 0x748d1290, 0x4cb699e3, 0xed8f1d0d, 0x4cd9a5b8,
+    0xede02156, 0xd5dbaa25, 0x74e22ecb, 0xa5acbcc3, 0x0495382d,
+    0x3caeb35e, 0x9d9737b0, 0x4542910f, 0xe47b15e1, 0xdc409e92,
+    0x7d791a7c, 0xac378874, 0x0d0e0c9a, 0x353587e9, 0x940c0307,
+    0x5fefccd6, 0xfed64838, 0xc6edc34b, 0x67d447a5, 0xb69ad5ad,
+    0x17a35143, 0x2f98da30, 0x8ea15ede, 0x5674f861, 0xf74d7c8f,
+    0xcf76f7fc, 0x6e4f7312, 0xbf01e11a, 0x1e3865f4, 0x2603ee87,
+    0x873a6a69, 0x6ab57764, 0xcb8cf38a, 0xf3b778f9, 0x528efc17,
+    0x83c06e1f, 0x22f9eaf1, 0x1ac26182, 0xbbfbe56c, 0x632e43d3,
+    0xc217c73d, 0xfa2c4c4e, 0x5b15c8a0, 0x8a5b5aa8, 0x2b62de46,
+    0x13595535, 0xb260d1db, 0x79831e0a, 0xd8ba9ae4, 0xe0811197,
+    0x41b89579, 0x90f60771, 0x31cf839f, 0x09f408ec, 0xa8cd8c02,
+    0x70182abd, 0xd121ae53, 0xe91a2520, 0x4823a1ce, 0x996d33c6,
+    0x3854b728, 0x006f3c5b, 0xa156b8b5, 0x99b34b70, 0x388acf9e,
+    0x00b144ed, 0xa188c003, 0x70c6520b, 0xd1ffd6e5, 0xe9c45d96,
+    0x48fdd978, 0x90287fc7, 0x3111fb29, 0x092a705a, 0xa813f4b4,
+    0x795d66bc, 0xd864e252, 0xe05f6921, 0x4166edcf, 0x8a85221e,
+    0x2bbca6f0, 0x13872d83, 0xb2bea96d, 0x63f03b65, 0xc2c9bf8b,
+    0xfaf234f8, 0x5bcbb016, 0x831e16a9, 0x22279247, 0x1a1c1934,
+    0xbb259dda, 0x6a6b0fd2, 0xcb528b3c, 0xf369004f, 0x525084a1,
+    0xbfdf99ac, 0x1ee61d42, 0x26dd9631, 0x87e412df, 0x56aa80d7,
+    0xf7930439, 0xcfa88f4a, 0x6e910ba4, 0xb644ad1b, 0x177d29f5,
+    0x2f46a286, 0x8e7f2668, 0x5f31b460, 0xfe08308e, 0xc633bbfd,
+    0x670a3f13, 0xace9f0c2, 0x0dd0742c, 0x35ebff5f, 0x94d27bb1,
+    0x459ce9b9, 0xe4a56d57, 0xdc9ee624, 0x7da762ca, 0xa572c475,
+    0x044b409b, 0x3c70cbe8, 0x9d494f06, 0x4c07dd0e, 0xed3e59e0,
+    0xd505d293, 0x743c567d, 0xd56aeec8, 0x74536a26, 0x4c68e155,
+    0xed5165bb, 0x3c1ff7b3, 0x9d26735d, 0xa51df82e, 0x04247cc0,
+    0xdcf1da7f, 0x7dc85e91, 0x45f3d5e2, 0xe4ca510c, 0x3584c304,
+    0x94bd47ea, 0xac86cc99, 0x0dbf4877, 0xc65c87a6, 0x67650348,
+    0x5f5e883b, 0xfe670cd5, 0x2f299edd, 0x8e101a33, 0xb62b9140,
+    0x171215ae, 0xcfc7b311, 0x6efe37ff, 0x56c5bc8c, 0xf7fc3862,
+    0x26b2aa6a, 0x878b2e84, 0xbfb0a5f7, 0x1e892119, 0xf3063c14,
+    0x523fb8fa, 0x6a043389, 0xcb3db767, 0x1a73256f, 0xbb4aa181,
+    0x83712af2, 0x2248ae1c, 0xfa9d08a3, 0x5ba48c4d, 0x639f073e,
+    0xc2a683d0, 0x13e811d8, 0xb2d19536, 0x8aea1e45, 0x2bd39aab,
+    0xe030557a, 0x4109d194, 0x79325ae7, 0xd80bde09, 0x09454c01,
+    0xa87cc8ef, 0x9047439c, 0x317ec772, 0xe9ab61cd, 0x4892e523,
+    0x70a96e50, 0xd190eabe, 0x00de78b6, 0xa1e7fc58, 0x99dc772b,
+    0x38e5f3c5},
+   {0x00000000, 0xe81790a1, 0x0b5e2703, 0xe349b7a2, 0x16bc4e06,
+    0xfeabdea7, 0x1de26905, 0xf5f5f9a4, 0x2d789c0c, 0xc56f0cad,
+    0x2626bb0f, 0xce312bae, 0x3bc4d20a, 0xd3d342ab, 0x309af509,
+    0xd88d65a8, 0x5af13818, 0xb2e6a8b9, 0x51af1f1b, 0xb9b88fba,
+    0x4c4d761e, 0xa45ae6bf, 0x4713511d, 0xaf04c1bc, 0x7789a414,
+    0x9f9e34b5, 0x7cd78317, 0x94c013b6, 0x6135ea12, 0x89227ab3,
+    0x6a6bcd11, 0x827c5db0, 0xb5e27030, 0x5df5e091, 0xbebc5733,
+    0x56abc792, 0xa35e3e36, 0x4b49ae97, 0xa8001935, 0x40178994,
+    0x989aec3c, 0x708d7c9d, 0x93c4cb3f, 0x7bd35b9e, 0x8e26a23a,
+    0x6631329b, 0x85788539, 0x6d6f1598, 0xef134828, 0x0704d889,
+    0xe44d6f2b, 0x0c5aff8a, 0xf9af062e, 0x11b8968f, 0xf2f1212d,
+    0x1ae6b18c, 0xc26bd424, 0x2a7c4485, 0xc935f327, 0x21226386,
+    0xd4d79a22, 0x3cc00a83, 0xdf89bd21, 0x379e2d80, 0xb0b5e621,
+    0x58a27680, 0xbbebc122, 0x53fc5183, 0xa609a827, 0x4e1e3886,
+    0xad578f24, 0x45401f85, 0x9dcd7a2d, 0x75daea8c, 0x96935d2e,
+    0x7e84cd8f, 0x8b71342b, 0x6366a48a, 0x802f1328, 0x68388389,
+    0xea44de39, 0x02534e98, 0xe11af93a, 0x090d699b, 0xfcf8903f,
+    0x14ef009e, 0xf7a6b73c, 0x1fb1279d, 0xc73c4235, 0x2f2bd294,
+    0xcc626536, 0x2475f597, 0xd1800c33, 0x39979c92, 0xdade2b30,
+    0x32c9bb91, 0x05579611, 0xed4006b0, 0x0e09b112, 0xe61e21b3,
+    0x13ebd817, 0xfbfc48b6, 0x18b5ff14, 0xf0a26fb5, 0x282f0a1d,
+    0xc0389abc, 0x23712d1e, 0xcb66bdbf, 0x3e93441b, 0xd684d4ba,
+    0x35cd6318, 0xdddaf3b9, 0x5fa6ae09, 0xb7b13ea8, 0x54f8890a,
+    0xbcef19ab, 0x491ae00f, 0xa10d70ae, 0x4244c70c, 0xaa5357ad,
+    0x72de3205, 0x9ac9a2a4, 0x79801506, 0x919785a7, 0x64627c03,
+    0x8c75eca2, 0x6f3c5b00, 0x872bcba1, 0xba1aca03, 0x520d5aa2,
+    0xb144ed00, 0x59537da1, 0xaca68405, 0x44b114a4, 0xa7f8a306,
+    0x4fef33a7, 0x9762560f, 0x7f75c6ae, 0x9c3c710c, 0x742be1ad,
+    0x81de1809, 0x69c988a8, 0x8a803f0a, 0x6297afab, 0xe0ebf21b,
+    0x08fc62ba, 0xebb5d518, 0x03a245b9, 0xf657bc1d, 0x1e402cbc,
+    0xfd099b1e, 0x151e0bbf, 0xcd936e17, 0x2584feb6, 0xc6cd4914,
+    0x2edad9b5, 0xdb2f2011, 0x3338b0b0, 0xd0710712, 0x386697b3,
+    0x0ff8ba33, 0xe7ef2a92, 0x04a69d30, 0xecb10d91, 0x1944f435,
+    0xf1536494, 0x121ad336, 0xfa0d4397, 0x2280263f, 0xca97b69e,
+    0x29de013c, 0xc1c9919d, 0x343c6839, 0xdc2bf898, 0x3f624f3a,
+    0xd775df9b, 0x5509822b, 0xbd1e128a, 0x5e57a528, 0xb6403589,
+    0x43b5cc2d, 0xaba25c8c, 0x48ebeb2e, 0xa0fc7b8f, 0x78711e27,
+    0x90668e86, 0x732f3924, 0x9b38a985, 0x6ecd5021, 0x86dac080,
+    0x65937722, 0x8d84e783, 0x0aaf2c22, 0xe2b8bc83, 0x01f10b21,
+    0xe9e69b80, 0x1c136224, 0xf404f285, 0x174d4527, 0xff5ad586,
+    0x27d7b02e, 0xcfc0208f, 0x2c89972d, 0xc49e078c, 0x316bfe28,
+    0xd97c6e89, 0x3a35d92b, 0xd222498a, 0x505e143a, 0xb849849b,
+    0x5b003339, 0xb317a398, 0x46e25a3c, 0xaef5ca9d, 0x4dbc7d3f,
+    0xa5abed9e, 0x7d268836, 0x95311897, 0x7678af35, 0x9e6f3f94,
+    0x6b9ac630, 0x838d5691, 0x60c4e133, 0x88d37192, 0xbf4d5c12,
+    0x575accb3, 0xb4137b11, 0x5c04ebb0, 0xa9f11214, 0x41e682b5,
+    0xa2af3517, 0x4ab8a5b6, 0x9235c01e, 0x7a2250bf, 0x996be71d,
+    0x717c77bc, 0x84898e18, 0x6c9e1eb9, 0x8fd7a91b, 0x67c039ba,
+    0xe5bc640a, 0x0dabf4ab, 0xeee24309, 0x06f5d3a8, 0xf3002a0c,
+    0x1b17baad, 0xf85e0d0f, 0x10499dae, 0xc8c4f806, 0x20d368a7,
+    0xc39adf05, 0x2b8d4fa4, 0xde78b600, 0x366f26a1, 0xd5269103,
+    0x3d3101a2}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x0000000000000000, 0xa19017e800000000, 0x03275e0b00000000,
+    0xa2b749e300000000, 0x064ebc1600000000, 0xa7deabfe00000000,
+    0x0569e21d00000000, 0xa4f9f5f500000000, 0x0c9c782d00000000,
+    0xad0c6fc500000000, 0x0fbb262600000000, 0xae2b31ce00000000,
+    0x0ad2c43b00000000, 0xab42d3d300000000, 0x09f59a3000000000,
+    0xa8658dd800000000, 0x1838f15a00000000, 0xb9a8e6b200000000,
+    0x1b1faf5100000000, 0xba8fb8b900000000, 0x1e764d4c00000000,
+    0xbfe65aa400000000, 0x1d51134700000000, 0xbcc104af00000000,
+    0x14a4897700000000, 0xb5349e9f00000000, 0x1783d77c00000000,
+    0xb613c09400000000, 0x12ea356100000000, 0xb37a228900000000,
+    0x11cd6b6a00000000, 0xb05d7c8200000000, 0x3070e2b500000000,
+    0x91e0f55d00000000, 0x3357bcbe00000000, 0x92c7ab5600000000,
+    0x363e5ea300000000, 0x97ae494b00000000, 0x351900a800000000,
+    0x9489174000000000, 0x3cec9a9800000000, 0x9d7c8d7000000000,
+    0x3fcbc49300000000, 0x9e5bd37b00000000, 0x3aa2268e00000000,
+    0x9b32316600000000, 0x3985788500000000, 0x98156f6d00000000,
+    0x284813ef00000000, 0x89d8040700000000, 0x2b6f4de400000000,
+    0x8aff5a0c00000000, 0x2e06aff900000000, 0x8f96b81100000000,
+    0x2d21f1f200000000, 0x8cb1e61a00000000, 0x24d46bc200000000,
+    0x85447c2a00000000, 0x27f335c900000000, 0x8663222100000000,
+    0x229ad7d400000000, 0x830ac03c00000000, 0x21bd89df00000000,
+    0x802d9e3700000000, 0x21e6b5b000000000, 0x8076a25800000000,
+    0x22c1ebbb00000000, 0x8351fc5300000000, 0x27a809a600000000,
+    0x86381e4e00000000, 0x248f57ad00000000, 0x851f404500000000,
+    0x2d7acd9d00000000, 0x8ceada7500000000, 0x2e5d939600000000,
+    0x8fcd847e00000000, 0x2b34718b00000000, 0x8aa4666300000000,
+    0x28132f8000000000, 0x8983386800000000, 0x39de44ea00000000,
+    0x984e530200000000, 0x3af91ae100000000, 0x9b690d0900000000,
+    0x3f90f8fc00000000, 0x9e00ef1400000000, 0x3cb7a6f700000000,
+    0x9d27b11f00000000, 0x35423cc700000000, 0x94d22b2f00000000,
+    0x366562cc00000000, 0x97f5752400000000, 0x330c80d100000000,
+    0x929c973900000000, 0x302bdeda00000000, 0x91bbc93200000000,
+    0x1196570500000000, 0xb00640ed00000000, 0x12b1090e00000000,
+    0xb3211ee600000000, 0x17d8eb1300000000, 0xb648fcfb00000000,
+    0x14ffb51800000000, 0xb56fa2f000000000, 0x1d0a2f2800000000,
+    0xbc9a38c000000000, 0x1e2d712300000000, 0xbfbd66cb00000000,
+    0x1b44933e00000000, 0xbad484d600000000, 0x1863cd3500000000,
+    0xb9f3dadd00000000, 0x09aea65f00000000, 0xa83eb1b700000000,
+    0x0a89f85400000000, 0xab19efbc00000000, 0x0fe01a4900000000,
+    0xae700da100000000, 0x0cc7444200000000, 0xad5753aa00000000,
+    0x0532de7200000000, 0xa4a2c99a00000000, 0x0615807900000000,
+    0xa785979100000000, 0x037c626400000000, 0xa2ec758c00000000,
+    0x005b3c6f00000000, 0xa1cb2b8700000000, 0x03ca1aba00000000,
+    0xa25a0d5200000000, 0x00ed44b100000000, 0xa17d535900000000,
+    0x0584a6ac00000000, 0xa414b14400000000, 0x06a3f8a700000000,
+    0xa733ef4f00000000, 0x0f56629700000000, 0xaec6757f00000000,
+    0x0c713c9c00000000, 0xade12b7400000000, 0x0918de8100000000,
+    0xa888c96900000000, 0x0a3f808a00000000, 0xabaf976200000000,
+    0x1bf2ebe000000000, 0xba62fc0800000000, 0x18d5b5eb00000000,
+    0xb945a20300000000, 0x1dbc57f600000000, 0xbc2c401e00000000,
+    0x1e9b09fd00000000, 0xbf0b1e1500000000, 0x176e93cd00000000,
+    0xb6fe842500000000, 0x1449cdc600000000, 0xb5d9da2e00000000,
+    0x11202fdb00000000, 0xb0b0383300000000, 0x120771d000000000,
+    0xb397663800000000, 0x33baf80f00000000, 0x922aefe700000000,
+    0x309da60400000000, 0x910db1ec00000000, 0x35f4441900000000,
+    0x946453f100000000, 0x36d31a1200000000, 0x97430dfa00000000,
+    0x3f26802200000000, 0x9eb697ca00000000, 0x3c01de2900000000,
+    0x9d91c9c100000000, 0x39683c3400000000, 0x98f82bdc00000000,
+    0x3a4f623f00000000, 0x9bdf75d700000000, 0x2b82095500000000,
+    0x8a121ebd00000000, 0x28a5575e00000000, 0x893540b600000000,
+    0x2dccb54300000000, 0x8c5ca2ab00000000, 0x2eebeb4800000000,
+    0x8f7bfca000000000, 0x271e717800000000, 0x868e669000000000,
+    0x24392f7300000000, 0x85a9389b00000000, 0x2150cd6e00000000,
+    0x80c0da8600000000, 0x2277936500000000, 0x83e7848d00000000,
+    0x222caf0a00000000, 0x83bcb8e200000000, 0x210bf10100000000,
+    0x809be6e900000000, 0x2462131c00000000, 0x85f204f400000000,
+    0x27454d1700000000, 0x86d55aff00000000, 0x2eb0d72700000000,
+    0x8f20c0cf00000000, 0x2d97892c00000000, 0x8c079ec400000000,
+    0x28fe6b3100000000, 0x896e7cd900000000, 0x2bd9353a00000000,
+    0x8a4922d200000000, 0x3a145e5000000000, 0x9b8449b800000000,
+    0x3933005b00000000, 0x98a317b300000000, 0x3c5ae24600000000,
+    0x9dcaf5ae00000000, 0x3f7dbc4d00000000, 0x9eedaba500000000,
+    0x3688267d00000000, 0x9718319500000000, 0x35af787600000000,
+    0x943f6f9e00000000, 0x30c69a6b00000000, 0x91568d8300000000,
+    0x33e1c46000000000, 0x9271d38800000000, 0x125c4dbf00000000,
+    0xb3cc5a5700000000, 0x117b13b400000000, 0xb0eb045c00000000,
+    0x1412f1a900000000, 0xb582e64100000000, 0x1735afa200000000,
+    0xb6a5b84a00000000, 0x1ec0359200000000, 0xbf50227a00000000,
+    0x1de76b9900000000, 0xbc777c7100000000, 0x188e898400000000,
+    0xb91e9e6c00000000, 0x1ba9d78f00000000, 0xba39c06700000000,
+    0x0a64bce500000000, 0xabf4ab0d00000000, 0x0943e2ee00000000,
+    0xa8d3f50600000000, 0x0c2a00f300000000, 0xadba171b00000000,
+    0x0f0d5ef800000000, 0xae9d491000000000, 0x06f8c4c800000000,
+    0xa768d32000000000, 0x05df9ac300000000, 0xa44f8d2b00000000,
+    0x00b678de00000000, 0xa1266f3600000000, 0x039126d500000000,
+    0xa201313d00000000},
+   {0x0000000000000000, 0xee8439a100000000, 0x9d0f029900000000,
+    0x738b3b3800000000, 0x7b1975e900000000, 0x959d4c4800000000,
+    0xe616777000000000, 0x08924ed100000000, 0xb7349b0900000000,
+    0x59b0a2a800000000, 0x2a3b999000000000, 0xc4bfa03100000000,
+    0xcc2deee000000000, 0x22a9d74100000000, 0x5122ec7900000000,
+    0xbfa6d5d800000000, 0x6e69361300000000, 0x80ed0fb200000000,
+    0xf366348a00000000, 0x1de20d2b00000000, 0x157043fa00000000,
+    0xfbf47a5b00000000, 0x887f416300000000, 0x66fb78c200000000,
+    0xd95dad1a00000000, 0x37d994bb00000000, 0x4452af8300000000,
+    0xaad6962200000000, 0xa244d8f300000000, 0x4cc0e15200000000,
+    0x3f4bda6a00000000, 0xd1cfe3cb00000000, 0xdcd26c2600000000,
+    0x3256558700000000, 0x41dd6ebf00000000, 0xaf59571e00000000,
+    0xa7cb19cf00000000, 0x494f206e00000000, 0x3ac41b5600000000,
+    0xd44022f700000000, 0x6be6f72f00000000, 0x8562ce8e00000000,
+    0xf6e9f5b600000000, 0x186dcc1700000000, 0x10ff82c600000000,
+    0xfe7bbb6700000000, 0x8df0805f00000000, 0x6374b9fe00000000,
+    0xb2bb5a3500000000, 0x5c3f639400000000, 0x2fb458ac00000000,
+    0xc130610d00000000, 0xc9a22fdc00000000, 0x2726167d00000000,
+    0x54ad2d4500000000, 0xba2914e400000000, 0x058fc13c00000000,
+    0xeb0bf89d00000000, 0x9880c3a500000000, 0x7604fa0400000000,
+    0x7e96b4d500000000, 0x90128d7400000000, 0xe399b64c00000000,
+    0x0d1d8fed00000000, 0xb8a5d94c00000000, 0x5621e0ed00000000,
+    0x25aadbd500000000, 0xcb2ee27400000000, 0xc3bcaca500000000,
+    0x2d38950400000000, 0x5eb3ae3c00000000, 0xb037979d00000000,
+    0x0f91424500000000, 0xe1157be400000000, 0x929e40dc00000000,
+    0x7c1a797d00000000, 0x748837ac00000000, 0x9a0c0e0d00000000,
+    0xe987353500000000, 0x07030c9400000000, 0xd6ccef5f00000000,
+    0x3848d6fe00000000, 0x4bc3edc600000000, 0xa547d46700000000,
+    0xadd59ab600000000, 0x4351a31700000000, 0x30da982f00000000,
+    0xde5ea18e00000000, 0x61f8745600000000, 0x8f7c4df700000000,
+    0xfcf776cf00000000, 0x12734f6e00000000, 0x1ae101bf00000000,
+    0xf465381e00000000, 0x87ee032600000000, 0x696a3a8700000000,
+    0x6477b56a00000000, 0x8af38ccb00000000, 0xf978b7f300000000,
+    0x17fc8e5200000000, 0x1f6ec08300000000, 0xf1eaf92200000000,
+    0x8261c21a00000000, 0x6ce5fbbb00000000, 0xd3432e6300000000,
+    0x3dc717c200000000, 0x4e4c2cfa00000000, 0xa0c8155b00000000,
+    0xa85a5b8a00000000, 0x46de622b00000000, 0x3555591300000000,
+    0xdbd160b200000000, 0x0a1e837900000000, 0xe49abad800000000,
+    0x971181e000000000, 0x7995b84100000000, 0x7107f69000000000,
+    0x9f83cf3100000000, 0xec08f40900000000, 0x028ccda800000000,
+    0xbd2a187000000000, 0x53ae21d100000000, 0x20251ae900000000,
+    0xcea1234800000000, 0xc6336d9900000000, 0x28b7543800000000,
+    0x5b3c6f0000000000, 0xb5b856a100000000, 0x704bb39900000000,
+    0x9ecf8a3800000000, 0xed44b10000000000, 0x03c088a100000000,
+    0x0b52c67000000000, 0xe5d6ffd100000000, 0x965dc4e900000000,
+    0x78d9fd4800000000, 0xc77f289000000000, 0x29fb113100000000,
+    0x5a702a0900000000, 0xb4f413a800000000, 0xbc665d7900000000,
+    0x52e264d800000000, 0x21695fe000000000, 0xcfed664100000000,
+    0x1e22858a00000000, 0xf0a6bc2b00000000, 0x832d871300000000,
+    0x6da9beb200000000, 0x653bf06300000000, 0x8bbfc9c200000000,
+    0xf834f2fa00000000, 0x16b0cb5b00000000, 0xa9161e8300000000,
+    0x4792272200000000, 0x34191c1a00000000, 0xda9d25bb00000000,
+    0xd20f6b6a00000000, 0x3c8b52cb00000000, 0x4f0069f300000000,
+    0xa184505200000000, 0xac99dfbf00000000, 0x421de61e00000000,
+    0x3196dd2600000000, 0xdf12e48700000000, 0xd780aa5600000000,
+    0x390493f700000000, 0x4a8fa8cf00000000, 0xa40b916e00000000,
+    0x1bad44b600000000, 0xf5297d1700000000, 0x86a2462f00000000,
+    0x68267f8e00000000, 0x60b4315f00000000, 0x8e3008fe00000000,
+    0xfdbb33c600000000, 0x133f0a6700000000, 0xc2f0e9ac00000000,
+    0x2c74d00d00000000, 0x5fffeb3500000000, 0xb17bd29400000000,
+    0xb9e99c4500000000, 0x576da5e400000000, 0x24e69edc00000000,
+    0xca62a77d00000000, 0x75c472a500000000, 0x9b404b0400000000,
+    0xe8cb703c00000000, 0x064f499d00000000, 0x0edd074c00000000,
+    0xe0593eed00000000, 0x93d205d500000000, 0x7d563c7400000000,
+    0xc8ee6ad500000000, 0x266a537400000000, 0x55e1684c00000000,
+    0xbb6551ed00000000, 0xb3f71f3c00000000, 0x5d73269d00000000,
+    0x2ef81da500000000, 0xc07c240400000000, 0x7fdaf1dc00000000,
+    0x915ec87d00000000, 0xe2d5f34500000000, 0x0c51cae400000000,
+    0x04c3843500000000, 0xea47bd9400000000, 0x99cc86ac00000000,
+    0x7748bf0d00000000, 0xa6875cc600000000, 0x4803656700000000,
+    0x3b885e5f00000000, 0xd50c67fe00000000, 0xdd9e292f00000000,
+    0x331a108e00000000, 0x40912bb600000000, 0xae15121700000000,
+    0x11b3c7cf00000000, 0xff37fe6e00000000, 0x8cbcc55600000000,
+    0x6238fcf700000000, 0x6aaab22600000000, 0x842e8b8700000000,
+    0xf7a5b0bf00000000, 0x1921891e00000000, 0x143c06f300000000,
+    0xfab83f5200000000, 0x8933046a00000000, 0x67b73dcb00000000,
+    0x6f25731a00000000, 0x81a14abb00000000, 0xf22a718300000000,
+    0x1cae482200000000, 0xa3089dfa00000000, 0x4d8ca45b00000000,
+    0x3e079f6300000000, 0xd083a6c200000000, 0xd811e81300000000,
+    0x3695d1b200000000, 0x451eea8a00000000, 0xab9ad32b00000000,
+    0x7a5530e000000000, 0x94d1094100000000, 0xe75a327900000000,
+    0x09de0bd800000000, 0x014c450900000000, 0xefc87ca800000000,
+    0x9c43479000000000, 0x72c77e3100000000, 0xcd61abe900000000,
+    0x23e5924800000000, 0x506ea97000000000, 0xbeea90d100000000,
+    0xb678de0000000000, 0x58fce7a100000000, 0x2b77dc9900000000,
+    0xc5f3e53800000000},
+   {0x0000000000000000, 0xfbf6134700000000, 0xf6ed278e00000000,
+    0x0d1b34c900000000, 0xaddd3ec700000000, 0x562b2d8000000000,
+    0x5b30194900000000, 0xa0c60a0e00000000, 0x1bbd0c5500000000,
+    0xe04b1f1200000000, 0xed502bdb00000000, 0x16a6389c00000000,
+    0xb660329200000000, 0x4d9621d500000000, 0x408d151c00000000,
+    0xbb7b065b00000000, 0x367a19aa00000000, 0xcd8c0aed00000000,
+    0xc0973e2400000000, 0x3b612d6300000000, 0x9ba7276d00000000,
+    0x6051342a00000000, 0x6d4a00e300000000, 0x96bc13a400000000,
+    0x2dc715ff00000000, 0xd63106b800000000, 0xdb2a327100000000,
+    0x20dc213600000000, 0x801a2b3800000000, 0x7bec387f00000000,
+    0x76f70cb600000000, 0x8d011ff100000000, 0x2df2438f00000000,
+    0xd60450c800000000, 0xdb1f640100000000, 0x20e9774600000000,
+    0x802f7d4800000000, 0x7bd96e0f00000000, 0x76c25ac600000000,
+    0x8d34498100000000, 0x364f4fda00000000, 0xcdb95c9d00000000,
+    0xc0a2685400000000, 0x3b547b1300000000, 0x9b92711d00000000,
+    0x6064625a00000000, 0x6d7f569300000000, 0x968945d400000000,
+    0x1b885a2500000000, 0xe07e496200000000, 0xed657dab00000000,
+    0x16936eec00000000, 0xb65564e200000000, 0x4da377a500000000,
+    0x40b8436c00000000, 0xbb4e502b00000000, 0x0035567000000000,
+    0xfbc3453700000000, 0xf6d871fe00000000, 0x0d2e62b900000000,
+    0xade868b700000000, 0x561e7bf000000000, 0x5b054f3900000000,
+    0xa0f35c7e00000000, 0x1be2f6c500000000, 0xe014e58200000000,
+    0xed0fd14b00000000, 0x16f9c20c00000000, 0xb63fc80200000000,
+    0x4dc9db4500000000, 0x40d2ef8c00000000, 0xbb24fccb00000000,
+    0x005ffa9000000000, 0xfba9e9d700000000, 0xf6b2dd1e00000000,
+    0x0d44ce5900000000, 0xad82c45700000000, 0x5674d71000000000,
+    0x5b6fe3d900000000, 0xa099f09e00000000, 0x2d98ef6f00000000,
+    0xd66efc2800000000, 0xdb75c8e100000000, 0x2083dba600000000,
+    0x8045d1a800000000, 0x7bb3c2ef00000000, 0x76a8f62600000000,
+    0x8d5ee56100000000, 0x3625e33a00000000, 0xcdd3f07d00000000,
+    0xc0c8c4b400000000, 0x3b3ed7f300000000, 0x9bf8ddfd00000000,
+    0x600eceba00000000, 0x6d15fa7300000000, 0x96e3e93400000000,
+    0x3610b54a00000000, 0xcde6a60d00000000, 0xc0fd92c400000000,
+    0x3b0b818300000000, 0x9bcd8b8d00000000, 0x603b98ca00000000,
+    0x6d20ac0300000000, 0x96d6bf4400000000, 0x2dadb91f00000000,
+    0xd65baa5800000000, 0xdb409e9100000000, 0x20b68dd600000000,
+    0x807087d800000000, 0x7b86949f00000000, 0x769da05600000000,
+    0x8d6bb31100000000, 0x006aace000000000, 0xfb9cbfa700000000,
+    0xf6878b6e00000000, 0x0d71982900000000, 0xadb7922700000000,
+    0x5641816000000000, 0x5b5ab5a900000000, 0xa0aca6ee00000000,
+    0x1bd7a0b500000000, 0xe021b3f200000000, 0xed3a873b00000000,
+    0x16cc947c00000000, 0xb60a9e7200000000, 0x4dfc8d3500000000,
+    0x40e7b9fc00000000, 0xbb11aabb00000000, 0x77c29c5000000000,
+    0x8c348f1700000000, 0x812fbbde00000000, 0x7ad9a89900000000,
+    0xda1fa29700000000, 0x21e9b1d000000000, 0x2cf2851900000000,
+    0xd704965e00000000, 0x6c7f900500000000, 0x9789834200000000,
+    0x9a92b78b00000000, 0x6164a4cc00000000, 0xc1a2aec200000000,
+    0x3a54bd8500000000, 0x374f894c00000000, 0xccb99a0b00000000,
+    0x41b885fa00000000, 0xba4e96bd00000000, 0xb755a27400000000,
+    0x4ca3b13300000000, 0xec65bb3d00000000, 0x1793a87a00000000,
+    0x1a889cb300000000, 0xe17e8ff400000000, 0x5a0589af00000000,
+    0xa1f39ae800000000, 0xace8ae2100000000, 0x571ebd6600000000,
+    0xf7d8b76800000000, 0x0c2ea42f00000000, 0x013590e600000000,
+    0xfac383a100000000, 0x5a30dfdf00000000, 0xa1c6cc9800000000,
+    0xacddf85100000000, 0x572beb1600000000, 0xf7ede11800000000,
+    0x0c1bf25f00000000, 0x0100c69600000000, 0xfaf6d5d100000000,
+    0x418dd38a00000000, 0xba7bc0cd00000000, 0xb760f40400000000,
+    0x4c96e74300000000, 0xec50ed4d00000000, 0x17a6fe0a00000000,
+    0x1abdcac300000000, 0xe14bd98400000000, 0x6c4ac67500000000,
+    0x97bcd53200000000, 0x9aa7e1fb00000000, 0x6151f2bc00000000,
+    0xc197f8b200000000, 0x3a61ebf500000000, 0x377adf3c00000000,
+    0xcc8ccc7b00000000, 0x77f7ca2000000000, 0x8c01d96700000000,
+    0x811aedae00000000, 0x7aecfee900000000, 0xda2af4e700000000,
+    0x21dce7a000000000, 0x2cc7d36900000000, 0xd731c02e00000000,
+    0x6c206a9500000000, 0x97d679d200000000, 0x9acd4d1b00000000,
+    0x613b5e5c00000000, 0xc1fd545200000000, 0x3a0b471500000000,
+    0x371073dc00000000, 0xcce6609b00000000, 0x779d66c000000000,
+    0x8c6b758700000000, 0x8170414e00000000, 0x7a86520900000000,
+    0xda40580700000000, 0x21b64b4000000000, 0x2cad7f8900000000,
+    0xd75b6cce00000000, 0x5a5a733f00000000, 0xa1ac607800000000,
+    0xacb754b100000000, 0x574147f600000000, 0xf7874df800000000,
+    0x0c715ebf00000000, 0x016a6a7600000000, 0xfa9c793100000000,
+    0x41e77f6a00000000, 0xba116c2d00000000, 0xb70a58e400000000,
+    0x4cfc4ba300000000, 0xec3a41ad00000000, 0x17cc52ea00000000,
+    0x1ad7662300000000, 0xe121756400000000, 0x41d2291a00000000,
+    0xba243a5d00000000, 0xb73f0e9400000000, 0x4cc91dd300000000,
+    0xec0f17dd00000000, 0x17f9049a00000000, 0x1ae2305300000000,
+    0xe114231400000000, 0x5a6f254f00000000, 0xa199360800000000,
+    0xac8202c100000000, 0x5774118600000000, 0xf7b21b8800000000,
+    0x0c4408cf00000000, 0x015f3c0600000000, 0xfaa92f4100000000,
+    0x77a830b000000000, 0x8c5e23f700000000, 0x8145173e00000000,
+    0x7ab3047900000000, 0xda750e7700000000, 0x21831d3000000000,
+    0x2c9829f900000000, 0xd76e3abe00000000, 0x6c153ce500000000,
+    0x97e32fa200000000, 0x9af81b6b00000000, 0x610e082c00000000,
+    0xc1c8022200000000, 0x3a3e116500000000, 0x372525ac00000000,
+    0xccd336eb00000000},
+   {0x0000000000000000, 0x6238282a00000000, 0xc470505400000000,
+    0xa648787e00000000, 0x88e1a0a800000000, 0xead9888200000000,
+    0x4c91f0fc00000000, 0x2ea9d8d600000000, 0x51c5308a00000000,
+    0x33fd18a000000000, 0x95b560de00000000, 0xf78d48f400000000,
+    0xd924902200000000, 0xbb1cb80800000000, 0x1d54c07600000000,
+    0x7f6ce85c00000000, 0xe38c10cf00000000, 0x81b438e500000000,
+    0x27fc409b00000000, 0x45c468b100000000, 0x6b6db06700000000,
+    0x0955984d00000000, 0xaf1de03300000000, 0xcd25c81900000000,
+    0xb249204500000000, 0xd071086f00000000, 0x7639701100000000,
+    0x1401583b00000000, 0x3aa880ed00000000, 0x5890a8c700000000,
+    0xfed8d0b900000000, 0x9ce0f89300000000, 0x871f504500000000,
+    0xe527786f00000000, 0x436f001100000000, 0x2157283b00000000,
+    0x0ffef0ed00000000, 0x6dc6d8c700000000, 0xcb8ea0b900000000,
+    0xa9b6889300000000, 0xd6da60cf00000000, 0xb4e248e500000000,
+    0x12aa309b00000000, 0x709218b100000000, 0x5e3bc06700000000,
+    0x3c03e84d00000000, 0x9a4b903300000000, 0xf873b81900000000,
+    0x6493408a00000000, 0x06ab68a000000000, 0xa0e310de00000000,
+    0xc2db38f400000000, 0xec72e02200000000, 0x8e4ac80800000000,
+    0x2802b07600000000, 0x4a3a985c00000000, 0x3556700000000000,
+    0x576e582a00000000, 0xf126205400000000, 0x931e087e00000000,
+    0xbdb7d0a800000000, 0xdf8ff88200000000, 0x79c780fc00000000,
+    0x1bffa8d600000000, 0x0e3fa08a00000000, 0x6c0788a000000000,
+    0xca4ff0de00000000, 0xa877d8f400000000, 0x86de002200000000,
+    0xe4e6280800000000, 0x42ae507600000000, 0x2096785c00000000,
+    0x5ffa900000000000, 0x3dc2b82a00000000, 0x9b8ac05400000000,
+    0xf9b2e87e00000000, 0xd71b30a800000000, 0xb523188200000000,
+    0x136b60fc00000000, 0x715348d600000000, 0xedb3b04500000000,
+    0x8f8b986f00000000, 0x29c3e01100000000, 0x4bfbc83b00000000,
+    0x655210ed00000000, 0x076a38c700000000, 0xa12240b900000000,
+    0xc31a689300000000, 0xbc7680cf00000000, 0xde4ea8e500000000,
+    0x7806d09b00000000, 0x1a3ef8b100000000, 0x3497206700000000,
+    0x56af084d00000000, 0xf0e7703300000000, 0x92df581900000000,
+    0x8920f0cf00000000, 0xeb18d8e500000000, 0x4d50a09b00000000,
+    0x2f6888b100000000, 0x01c1506700000000, 0x63f9784d00000000,
+    0xc5b1003300000000, 0xa789281900000000, 0xd8e5c04500000000,
+    0xbadde86f00000000, 0x1c95901100000000, 0x7eadb83b00000000,
+    0x500460ed00000000, 0x323c48c700000000, 0x947430b900000000,
+    0xf64c189300000000, 0x6aace00000000000, 0x0894c82a00000000,
+    0xaedcb05400000000, 0xcce4987e00000000, 0xe24d40a800000000,
+    0x8075688200000000, 0x263d10fc00000000, 0x440538d600000000,
+    0x3b69d08a00000000, 0x5951f8a000000000, 0xff1980de00000000,
+    0x9d21a8f400000000, 0xb388702200000000, 0xd1b0580800000000,
+    0x77f8207600000000, 0x15c0085c00000000, 0x5d7831ce00000000,
+    0x3f4019e400000000, 0x9908619a00000000, 0xfb3049b000000000,
+    0xd599916600000000, 0xb7a1b94c00000000, 0x11e9c13200000000,
+    0x73d1e91800000000, 0x0cbd014400000000, 0x6e85296e00000000,
+    0xc8cd511000000000, 0xaaf5793a00000000, 0x845ca1ec00000000,
+    0xe66489c600000000, 0x402cf1b800000000, 0x2214d99200000000,
+    0xbef4210100000000, 0xdccc092b00000000, 0x7a84715500000000,
+    0x18bc597f00000000, 0x361581a900000000, 0x542da98300000000,
+    0xf265d1fd00000000, 0x905df9d700000000, 0xef31118b00000000,
+    0x8d0939a100000000, 0x2b4141df00000000, 0x497969f500000000,
+    0x67d0b12300000000, 0x05e8990900000000, 0xa3a0e17700000000,
+    0xc198c95d00000000, 0xda67618b00000000, 0xb85f49a100000000,
+    0x1e1731df00000000, 0x7c2f19f500000000, 0x5286c12300000000,
+    0x30bee90900000000, 0x96f6917700000000, 0xf4ceb95d00000000,
+    0x8ba2510100000000, 0xe99a792b00000000, 0x4fd2015500000000,
+    0x2dea297f00000000, 0x0343f1a900000000, 0x617bd98300000000,
+    0xc733a1fd00000000, 0xa50b89d700000000, 0x39eb714400000000,
+    0x5bd3596e00000000, 0xfd9b211000000000, 0x9fa3093a00000000,
+    0xb10ad1ec00000000, 0xd332f9c600000000, 0x757a81b800000000,
+    0x1742a99200000000, 0x682e41ce00000000, 0x0a1669e400000000,
+    0xac5e119a00000000, 0xce6639b000000000, 0xe0cfe16600000000,
+    0x82f7c94c00000000, 0x24bfb13200000000, 0x4687991800000000,
+    0x5347914400000000, 0x317fb96e00000000, 0x9737c11000000000,
+    0xf50fe93a00000000, 0xdba631ec00000000, 0xb99e19c600000000,
+    0x1fd661b800000000, 0x7dee499200000000, 0x0282a1ce00000000,
+    0x60ba89e400000000, 0xc6f2f19a00000000, 0xa4cad9b000000000,
+    0x8a63016600000000, 0xe85b294c00000000, 0x4e13513200000000,
+    0x2c2b791800000000, 0xb0cb818b00000000, 0xd2f3a9a100000000,
+    0x74bbd1df00000000, 0x1683f9f500000000, 0x382a212300000000,
+    0x5a12090900000000, 0xfc5a717700000000, 0x9e62595d00000000,
+    0xe10eb10100000000, 0x8336992b00000000, 0x257ee15500000000,
+    0x4746c97f00000000, 0x69ef11a900000000, 0x0bd7398300000000,
+    0xad9f41fd00000000, 0xcfa769d700000000, 0xd458c10100000000,
+    0xb660e92b00000000, 0x1028915500000000, 0x7210b97f00000000,
+    0x5cb961a900000000, 0x3e81498300000000, 0x98c931fd00000000,
+    0xfaf119d700000000, 0x859df18b00000000, 0xe7a5d9a100000000,
+    0x41eda1df00000000, 0x23d589f500000000, 0x0d7c512300000000,
+    0x6f44790900000000, 0xc90c017700000000, 0xab34295d00000000,
+    0x37d4d1ce00000000, 0x55ecf9e400000000, 0xf3a4819a00000000,
+    0x919ca9b000000000, 0xbf35716600000000, 0xdd0d594c00000000,
+    0x7b45213200000000, 0x197d091800000000, 0x6611e14400000000,
+    0x0429c96e00000000, 0xa261b11000000000, 0xc059993a00000000,
+    0xeef041ec00000000, 0x8cc869c600000000, 0x2a8011b800000000,
+    0x48b8399200000000},
+   {0x0000000000000000, 0x4c2896a300000000, 0xd9565d9c00000000,
+    0x957ecb3f00000000, 0xf3abcbe300000000, 0xbf835d4000000000,
+    0x2afd967f00000000, 0x66d500dc00000000, 0xa751e61c00000000,
+    0xeb7970bf00000000, 0x7e07bb8000000000, 0x322f2d2300000000,
+    0x54fa2dff00000000, 0x18d2bb5c00000000, 0x8dac706300000000,
+    0xc184e6c000000000, 0x4ea3cc3900000000, 0x028b5a9a00000000,
+    0x97f591a500000000, 0xdbdd070600000000, 0xbd0807da00000000,
+    0xf120917900000000, 0x645e5a4600000000, 0x2876cce500000000,
+    0xe9f22a2500000000, 0xa5dabc8600000000, 0x30a477b900000000,
+    0x7c8ce11a00000000, 0x1a59e1c600000000, 0x5671776500000000,
+    0xc30fbc5a00000000, 0x8f272af900000000, 0x9c46997300000000,
+    0xd06e0fd000000000, 0x4510c4ef00000000, 0x0938524c00000000,
+    0x6fed529000000000, 0x23c5c43300000000, 0xb6bb0f0c00000000,
+    0xfa9399af00000000, 0x3b177f6f00000000, 0x773fe9cc00000000,
+    0xe24122f300000000, 0xae69b45000000000, 0xc8bcb48c00000000,
+    0x8494222f00000000, 0x11eae91000000000, 0x5dc27fb300000000,
+    0xd2e5554a00000000, 0x9ecdc3e900000000, 0x0bb308d600000000,
+    0x479b9e7500000000, 0x214e9ea900000000, 0x6d66080a00000000,
+    0xf818c33500000000, 0xb430559600000000, 0x75b4b35600000000,
+    0x399c25f500000000, 0xace2eeca00000000, 0xe0ca786900000000,
+    0x861f78b500000000, 0xca37ee1600000000, 0x5f49252900000000,
+    0x1361b38a00000000, 0x388d32e700000000, 0x74a5a44400000000,
+    0xe1db6f7b00000000, 0xadf3f9d800000000, 0xcb26f90400000000,
+    0x870e6fa700000000, 0x1270a49800000000, 0x5e58323b00000000,
+    0x9fdcd4fb00000000, 0xd3f4425800000000, 0x468a896700000000,
+    0x0aa21fc400000000, 0x6c771f1800000000, 0x205f89bb00000000,
+    0xb521428400000000, 0xf909d42700000000, 0x762efede00000000,
+    0x3a06687d00000000, 0xaf78a34200000000, 0xe35035e100000000,
+    0x8585353d00000000, 0xc9ada39e00000000, 0x5cd368a100000000,
+    0x10fbfe0200000000, 0xd17f18c200000000, 0x9d578e6100000000,
+    0x0829455e00000000, 0x4401d3fd00000000, 0x22d4d32100000000,
+    0x6efc458200000000, 0xfb828ebd00000000, 0xb7aa181e00000000,
+    0xa4cbab9400000000, 0xe8e33d3700000000, 0x7d9df60800000000,
+    0x31b560ab00000000, 0x5760607700000000, 0x1b48f6d400000000,
+    0x8e363deb00000000, 0xc21eab4800000000, 0x039a4d8800000000,
+    0x4fb2db2b00000000, 0xdacc101400000000, 0x96e486b700000000,
+    0xf031866b00000000, 0xbc1910c800000000, 0x2967dbf700000000,
+    0x654f4d5400000000, 0xea6867ad00000000, 0xa640f10e00000000,
+    0x333e3a3100000000, 0x7f16ac9200000000, 0x19c3ac4e00000000,
+    0x55eb3aed00000000, 0xc095f1d200000000, 0x8cbd677100000000,
+    0x4d3981b100000000, 0x0111171200000000, 0x946fdc2d00000000,
+    0xd8474a8e00000000, 0xbe924a5200000000, 0xf2badcf100000000,
+    0x67c417ce00000000, 0x2bec816d00000000, 0x311c141500000000,
+    0x7d3482b600000000, 0xe84a498900000000, 0xa462df2a00000000,
+    0xc2b7dff600000000, 0x8e9f495500000000, 0x1be1826a00000000,
+    0x57c914c900000000, 0x964df20900000000, 0xda6564aa00000000,
+    0x4f1baf9500000000, 0x0333393600000000, 0x65e639ea00000000,
+    0x29ceaf4900000000, 0xbcb0647600000000, 0xf098f2d500000000,
+    0x7fbfd82c00000000, 0x33974e8f00000000, 0xa6e985b000000000,
+    0xeac1131300000000, 0x8c1413cf00000000, 0xc03c856c00000000,
+    0x55424e5300000000, 0x196ad8f000000000, 0xd8ee3e3000000000,
+    0x94c6a89300000000, 0x01b863ac00000000, 0x4d90f50f00000000,
+    0x2b45f5d300000000, 0x676d637000000000, 0xf213a84f00000000,
+    0xbe3b3eec00000000, 0xad5a8d6600000000, 0xe1721bc500000000,
+    0x740cd0fa00000000, 0x3824465900000000, 0x5ef1468500000000,
+    0x12d9d02600000000, 0x87a71b1900000000, 0xcb8f8dba00000000,
+    0x0a0b6b7a00000000, 0x4623fdd900000000, 0xd35d36e600000000,
+    0x9f75a04500000000, 0xf9a0a09900000000, 0xb588363a00000000,
+    0x20f6fd0500000000, 0x6cde6ba600000000, 0xe3f9415f00000000,
+    0xafd1d7fc00000000, 0x3aaf1cc300000000, 0x76878a6000000000,
+    0x10528abc00000000, 0x5c7a1c1f00000000, 0xc904d72000000000,
+    0x852c418300000000, 0x44a8a74300000000, 0x088031e000000000,
+    0x9dfefadf00000000, 0xd1d66c7c00000000, 0xb7036ca000000000,
+    0xfb2bfa0300000000, 0x6e55313c00000000, 0x227da79f00000000,
+    0x099126f200000000, 0x45b9b05100000000, 0xd0c77b6e00000000,
+    0x9cefedcd00000000, 0xfa3aed1100000000, 0xb6127bb200000000,
+    0x236cb08d00000000, 0x6f44262e00000000, 0xaec0c0ee00000000,
+    0xe2e8564d00000000, 0x77969d7200000000, 0x3bbe0bd100000000,
+    0x5d6b0b0d00000000, 0x11439dae00000000, 0x843d569100000000,
+    0xc815c03200000000, 0x4732eacb00000000, 0x0b1a7c6800000000,
+    0x9e64b75700000000, 0xd24c21f400000000, 0xb499212800000000,
+    0xf8b1b78b00000000, 0x6dcf7cb400000000, 0x21e7ea1700000000,
+    0xe0630cd700000000, 0xac4b9a7400000000, 0x3935514b00000000,
+    0x751dc7e800000000, 0x13c8c73400000000, 0x5fe0519700000000,
+    0xca9e9aa800000000, 0x86b60c0b00000000, 0x95d7bf8100000000,
+    0xd9ff292200000000, 0x4c81e21d00000000, 0x00a974be00000000,
+    0x667c746200000000, 0x2a54e2c100000000, 0xbf2a29fe00000000,
+    0xf302bf5d00000000, 0x3286599d00000000, 0x7eaecf3e00000000,
+    0xebd0040100000000, 0xa7f892a200000000, 0xc12d927e00000000,
+    0x8d0504dd00000000, 0x187bcfe200000000, 0x5453594100000000,
+    0xdb7473b800000000, 0x975ce51b00000000, 0x02222e2400000000,
+    0x4e0ab88700000000, 0x28dfb85b00000000, 0x64f72ef800000000,
+    0xf189e5c700000000, 0xbda1736400000000, 0x7c2595a400000000,
+    0x300d030700000000, 0xa573c83800000000, 0xe95b5e9b00000000,
+    0x8f8e5e4700000000, 0xc3a6c8e400000000, 0x56d803db00000000,
+    0x1af0957800000000},
+   {0x0000000000000000, 0x939bc97f00000000, 0x263793ff00000000,
+    0xb5ac5a8000000000, 0x0d68572400000000, 0x9ef39e5b00000000,
+    0x2b5fc4db00000000, 0xb8c40da400000000, 0x1ad0ae4800000000,
+    0x894b673700000000, 0x3ce73db700000000, 0xaf7cf4c800000000,
+    0x17b8f96c00000000, 0x8423301300000000, 0x318f6a9300000000,
+    0xa214a3ec00000000, 0x34a05d9100000000, 0xa73b94ee00000000,
+    0x1297ce6e00000000, 0x810c071100000000, 0x39c80ab500000000,
+    0xaa53c3ca00000000, 0x1fff994a00000000, 0x8c64503500000000,
+    0x2e70f3d900000000, 0xbdeb3aa600000000, 0x0847602600000000,
+    0x9bdca95900000000, 0x2318a4fd00000000, 0xb0836d8200000000,
+    0x052f370200000000, 0x96b4fe7d00000000, 0x2946caf900000000,
+    0xbadd038600000000, 0x0f71590600000000, 0x9cea907900000000,
+    0x242e9ddd00000000, 0xb7b554a200000000, 0x02190e2200000000,
+    0x9182c75d00000000, 0x339664b100000000, 0xa00dadce00000000,
+    0x15a1f74e00000000, 0x863a3e3100000000, 0x3efe339500000000,
+    0xad65faea00000000, 0x18c9a06a00000000, 0x8b52691500000000,
+    0x1de6976800000000, 0x8e7d5e1700000000, 0x3bd1049700000000,
+    0xa84acde800000000, 0x108ec04c00000000, 0x8315093300000000,
+    0x36b953b300000000, 0xa5229acc00000000, 0x0736392000000000,
+    0x94adf05f00000000, 0x2101aadf00000000, 0xb29a63a000000000,
+    0x0a5e6e0400000000, 0x99c5a77b00000000, 0x2c69fdfb00000000,
+    0xbff2348400000000, 0x138ae52800000000, 0x80112c5700000000,
+    0x35bd76d700000000, 0xa626bfa800000000, 0x1ee2b20c00000000,
+    0x8d797b7300000000, 0x38d521f300000000, 0xab4ee88c00000000,
+    0x095a4b6000000000, 0x9ac1821f00000000, 0x2f6dd89f00000000,
+    0xbcf611e000000000, 0x04321c4400000000, 0x97a9d53b00000000,
+    0x22058fbb00000000, 0xb19e46c400000000, 0x272ab8b900000000,
+    0xb4b171c600000000, 0x011d2b4600000000, 0x9286e23900000000,
+    0x2a42ef9d00000000, 0xb9d926e200000000, 0x0c757c6200000000,
+    0x9feeb51d00000000, 0x3dfa16f100000000, 0xae61df8e00000000,
+    0x1bcd850e00000000, 0x88564c7100000000, 0x309241d500000000,
+    0xa30988aa00000000, 0x16a5d22a00000000, 0x853e1b5500000000,
+    0x3acc2fd100000000, 0xa957e6ae00000000, 0x1cfbbc2e00000000,
+    0x8f60755100000000, 0x37a478f500000000, 0xa43fb18a00000000,
+    0x1193eb0a00000000, 0x8208227500000000, 0x201c819900000000,
+    0xb38748e600000000, 0x062b126600000000, 0x95b0db1900000000,
+    0x2d74d6bd00000000, 0xbeef1fc200000000, 0x0b43454200000000,
+    0x98d88c3d00000000, 0x0e6c724000000000, 0x9df7bb3f00000000,
+    0x285be1bf00000000, 0xbbc028c000000000, 0x0304256400000000,
+    0x909fec1b00000000, 0x2533b69b00000000, 0xb6a87fe400000000,
+    0x14bcdc0800000000, 0x8727157700000000, 0x328b4ff700000000,
+    0xa110868800000000, 0x19d48b2c00000000, 0x8a4f425300000000,
+    0x3fe318d300000000, 0xac78d1ac00000000, 0x2614cb5100000000,
+    0xb58f022e00000000, 0x002358ae00000000, 0x93b891d100000000,
+    0x2b7c9c7500000000, 0xb8e7550a00000000, 0x0d4b0f8a00000000,
+    0x9ed0c6f500000000, 0x3cc4651900000000, 0xaf5fac6600000000,
+    0x1af3f6e600000000, 0x89683f9900000000, 0x31ac323d00000000,
+    0xa237fb4200000000, 0x179ba1c200000000, 0x840068bd00000000,
+    0x12b496c000000000, 0x812f5fbf00000000, 0x3483053f00000000,
+    0xa718cc4000000000, 0x1fdcc1e400000000, 0x8c47089b00000000,
+    0x39eb521b00000000, 0xaa709b6400000000, 0x0864388800000000,
+    0x9bfff1f700000000, 0x2e53ab7700000000, 0xbdc8620800000000,
+    0x050c6fac00000000, 0x9697a6d300000000, 0x233bfc5300000000,
+    0xb0a0352c00000000, 0x0f5201a800000000, 0x9cc9c8d700000000,
+    0x2965925700000000, 0xbafe5b2800000000, 0x023a568c00000000,
+    0x91a19ff300000000, 0x240dc57300000000, 0xb7960c0c00000000,
+    0x1582afe000000000, 0x8619669f00000000, 0x33b53c1f00000000,
+    0xa02ef56000000000, 0x18eaf8c400000000, 0x8b7131bb00000000,
+    0x3edd6b3b00000000, 0xad46a24400000000, 0x3bf25c3900000000,
+    0xa869954600000000, 0x1dc5cfc600000000, 0x8e5e06b900000000,
+    0x369a0b1d00000000, 0xa501c26200000000, 0x10ad98e200000000,
+    0x8336519d00000000, 0x2122f27100000000, 0xb2b93b0e00000000,
+    0x0715618e00000000, 0x948ea8f100000000, 0x2c4aa55500000000,
+    0xbfd16c2a00000000, 0x0a7d36aa00000000, 0x99e6ffd500000000,
+    0x359e2e7900000000, 0xa605e70600000000, 0x13a9bd8600000000,
+    0x803274f900000000, 0x38f6795d00000000, 0xab6db02200000000,
+    0x1ec1eaa200000000, 0x8d5a23dd00000000, 0x2f4e803100000000,
+    0xbcd5494e00000000, 0x097913ce00000000, 0x9ae2dab100000000,
+    0x2226d71500000000, 0xb1bd1e6a00000000, 0x041144ea00000000,
+    0x978a8d9500000000, 0x013e73e800000000, 0x92a5ba9700000000,
+    0x2709e01700000000, 0xb492296800000000, 0x0c5624cc00000000,
+    0x9fcdedb300000000, 0x2a61b73300000000, 0xb9fa7e4c00000000,
+    0x1beedda000000000, 0x887514df00000000, 0x3dd94e5f00000000,
+    0xae42872000000000, 0x16868a8400000000, 0x851d43fb00000000,
+    0x30b1197b00000000, 0xa32ad00400000000, 0x1cd8e48000000000,
+    0x8f432dff00000000, 0x3aef777f00000000, 0xa974be0000000000,
+    0x11b0b3a400000000, 0x822b7adb00000000, 0x3787205b00000000,
+    0xa41ce92400000000, 0x06084ac800000000, 0x959383b700000000,
+    0x203fd93700000000, 0xb3a4104800000000, 0x0b601dec00000000,
+    0x98fbd49300000000, 0x2d578e1300000000, 0xbecc476c00000000,
+    0x2878b91100000000, 0xbbe3706e00000000, 0x0e4f2aee00000000,
+    0x9dd4e39100000000, 0x2510ee3500000000, 0xb68b274a00000000,
+    0x03277dca00000000, 0x90bcb4b500000000, 0x32a8175900000000,
+    0xa133de2600000000, 0x149f84a600000000, 0x87044dd900000000,
+    0x3fc0407d00000000, 0xac5b890200000000, 0x19f7d38200000000,
+    0x8a6c1afd00000000},
+   {0x0000000000000000, 0x650b796900000000, 0xca16f2d200000000,
+    0xaf1d8bbb00000000, 0xd52b957e00000000, 0xb020ec1700000000,
+    0x1f3d67ac00000000, 0x7a361ec500000000, 0xaa572afd00000000,
+    0xcf5c539400000000, 0x6041d82f00000000, 0x054aa14600000000,
+    0x7f7cbf8300000000, 0x1a77c6ea00000000, 0xb56a4d5100000000,
+    0xd061343800000000, 0x15a9252100000000, 0x70a25c4800000000,
+    0xdfbfd7f300000000, 0xbab4ae9a00000000, 0xc082b05f00000000,
+    0xa589c93600000000, 0x0a94428d00000000, 0x6f9f3be400000000,
+    0xbffe0fdc00000000, 0xdaf576b500000000, 0x75e8fd0e00000000,
+    0x10e3846700000000, 0x6ad59aa200000000, 0x0fdee3cb00000000,
+    0xa0c3687000000000, 0xc5c8111900000000, 0x2a524b4200000000,
+    0x4f59322b00000000, 0xe044b99000000000, 0x854fc0f900000000,
+    0xff79de3c00000000, 0x9a72a75500000000, 0x356f2cee00000000,
+    0x5064558700000000, 0x800561bf00000000, 0xe50e18d600000000,
+    0x4a13936d00000000, 0x2f18ea0400000000, 0x552ef4c100000000,
+    0x30258da800000000, 0x9f38061300000000, 0xfa337f7a00000000,
+    0x3ffb6e6300000000, 0x5af0170a00000000, 0xf5ed9cb100000000,
+    0x90e6e5d800000000, 0xead0fb1d00000000, 0x8fdb827400000000,
+    0x20c609cf00000000, 0x45cd70a600000000, 0x95ac449e00000000,
+    0xf0a73df700000000, 0x5fbab64c00000000, 0x3ab1cf2500000000,
+    0x4087d1e000000000, 0x258ca88900000000, 0x8a91233200000000,
+    0xef9a5a5b00000000, 0x54a4968400000000, 0x31afefed00000000,
+    0x9eb2645600000000, 0xfbb91d3f00000000, 0x818f03fa00000000,
+    0xe4847a9300000000, 0x4b99f12800000000, 0x2e92884100000000,
+    0xfef3bc7900000000, 0x9bf8c51000000000, 0x34e54eab00000000,
+    0x51ee37c200000000, 0x2bd8290700000000, 0x4ed3506e00000000,
+    0xe1cedbd500000000, 0x84c5a2bc00000000, 0x410db3a500000000,
+    0x2406cacc00000000, 0x8b1b417700000000, 0xee10381e00000000,
+    0x942626db00000000, 0xf12d5fb200000000, 0x5e30d40900000000,
+    0x3b3bad6000000000, 0xeb5a995800000000, 0x8e51e03100000000,
+    0x214c6b8a00000000, 0x444712e300000000, 0x3e710c2600000000,
+    0x5b7a754f00000000, 0xf467fef400000000, 0x916c879d00000000,
+    0x7ef6ddc600000000, 0x1bfda4af00000000, 0xb4e02f1400000000,
+    0xd1eb567d00000000, 0xabdd48b800000000, 0xced631d100000000,
+    0x61cbba6a00000000, 0x04c0c30300000000, 0xd4a1f73b00000000,
+    0xb1aa8e5200000000, 0x1eb705e900000000, 0x7bbc7c8000000000,
+    0x018a624500000000, 0x64811b2c00000000, 0xcb9c909700000000,
+    0xae97e9fe00000000, 0x6b5ff8e700000000, 0x0e54818e00000000,
+    0xa1490a3500000000, 0xc442735c00000000, 0xbe746d9900000000,
+    0xdb7f14f000000000, 0x74629f4b00000000, 0x1169e62200000000,
+    0xc108d21a00000000, 0xa403ab7300000000, 0x0b1e20c800000000,
+    0x6e1559a100000000, 0x1423476400000000, 0x71283e0d00000000,
+    0xde35b5b600000000, 0xbb3eccdf00000000, 0xe94e5cd200000000,
+    0x8c4525bb00000000, 0x2358ae0000000000, 0x4653d76900000000,
+    0x3c65c9ac00000000, 0x596eb0c500000000, 0xf6733b7e00000000,
+    0x9378421700000000, 0x4319762f00000000, 0x26120f4600000000,
+    0x890f84fd00000000, 0xec04fd9400000000, 0x9632e35100000000,
+    0xf3399a3800000000, 0x5c24118300000000, 0x392f68ea00000000,
+    0xfce779f300000000, 0x99ec009a00000000, 0x36f18b2100000000,
+    0x53faf24800000000, 0x29ccec8d00000000, 0x4cc795e400000000,
+    0xe3da1e5f00000000, 0x86d1673600000000, 0x56b0530e00000000,
+    0x33bb2a6700000000, 0x9ca6a1dc00000000, 0xf9add8b500000000,
+    0x839bc67000000000, 0xe690bf1900000000, 0x498d34a200000000,
+    0x2c864dcb00000000, 0xc31c179000000000, 0xa6176ef900000000,
+    0x090ae54200000000, 0x6c019c2b00000000, 0x163782ee00000000,
+    0x733cfb8700000000, 0xdc21703c00000000, 0xb92a095500000000,
+    0x694b3d6d00000000, 0x0c40440400000000, 0xa35dcfbf00000000,
+    0xc656b6d600000000, 0xbc60a81300000000, 0xd96bd17a00000000,
+    0x76765ac100000000, 0x137d23a800000000, 0xd6b532b100000000,
+    0xb3be4bd800000000, 0x1ca3c06300000000, 0x79a8b90a00000000,
+    0x039ea7cf00000000, 0x6695dea600000000, 0xc988551d00000000,
+    0xac832c7400000000, 0x7ce2184c00000000, 0x19e9612500000000,
+    0xb6f4ea9e00000000, 0xd3ff93f700000000, 0xa9c98d3200000000,
+    0xccc2f45b00000000, 0x63df7fe000000000, 0x06d4068900000000,
+    0xbdeaca5600000000, 0xd8e1b33f00000000, 0x77fc388400000000,
+    0x12f741ed00000000, 0x68c15f2800000000, 0x0dca264100000000,
+    0xa2d7adfa00000000, 0xc7dcd49300000000, 0x17bde0ab00000000,
+    0x72b699c200000000, 0xddab127900000000, 0xb8a06b1000000000,
+    0xc29675d500000000, 0xa79d0cbc00000000, 0x0880870700000000,
+    0x6d8bfe6e00000000, 0xa843ef7700000000, 0xcd48961e00000000,
+    0x62551da500000000, 0x075e64cc00000000, 0x7d687a0900000000,
+    0x1863036000000000, 0xb77e88db00000000, 0xd275f1b200000000,
+    0x0214c58a00000000, 0x671fbce300000000, 0xc802375800000000,
+    0xad094e3100000000, 0xd73f50f400000000, 0xb234299d00000000,
+    0x1d29a22600000000, 0x7822db4f00000000, 0x97b8811400000000,
+    0xf2b3f87d00000000, 0x5dae73c600000000, 0x38a50aaf00000000,
+    0x4293146a00000000, 0x27986d0300000000, 0x8885e6b800000000,
+    0xed8e9fd100000000, 0x3defabe900000000, 0x58e4d28000000000,
+    0xf7f9593b00000000, 0x92f2205200000000, 0xe8c43e9700000000,
+    0x8dcf47fe00000000, 0x22d2cc4500000000, 0x47d9b52c00000000,
+    0x8211a43500000000, 0xe71add5c00000000, 0x480756e700000000,
+    0x2d0c2f8e00000000, 0x573a314b00000000, 0x3231482200000000,
+    0x9d2cc39900000000, 0xf827baf000000000, 0x28468ec800000000,
+    0x4d4df7a100000000, 0xe2507c1a00000000, 0x875b057300000000,
+    0xfd6d1bb600000000, 0x986662df00000000, 0x377be96400000000,
+    0x5270900d00000000},
+   {0x0000000000000000, 0xdcecb13d00000000, 0xb8d9637b00000000,
+    0x6435d24600000000, 0x70b3c7f600000000, 0xac5f76cb00000000,
+    0xc86aa48d00000000, 0x148615b000000000, 0xa160fe3600000000,
+    0x7d8c4f0b00000000, 0x19b99d4d00000000, 0xc5552c7000000000,
+    0xd1d339c000000000, 0x0d3f88fd00000000, 0x690a5abb00000000,
+    0xb5e6eb8600000000, 0x42c1fc6d00000000, 0x9e2d4d5000000000,
+    0xfa189f1600000000, 0x26f42e2b00000000, 0x32723b9b00000000,
+    0xee9e8aa600000000, 0x8aab58e000000000, 0x5647e9dd00000000,
+    0xe3a1025b00000000, 0x3f4db36600000000, 0x5b78612000000000,
+    0x8794d01d00000000, 0x9312c5ad00000000, 0x4ffe749000000000,
+    0x2bcba6d600000000, 0xf72717eb00000000, 0x8482f9db00000000,
+    0x586e48e600000000, 0x3c5b9aa000000000, 0xe0b72b9d00000000,
+    0xf4313e2d00000000, 0x28dd8f1000000000, 0x4ce85d5600000000,
+    0x9004ec6b00000000, 0x25e207ed00000000, 0xf90eb6d000000000,
+    0x9d3b649600000000, 0x41d7d5ab00000000, 0x5551c01b00000000,
+    0x89bd712600000000, 0xed88a36000000000, 0x3164125d00000000,
+    0xc64305b600000000, 0x1aafb48b00000000, 0x7e9a66cd00000000,
+    0xa276d7f000000000, 0xb6f0c24000000000, 0x6a1c737d00000000,
+    0x0e29a13b00000000, 0xd2c5100600000000, 0x6723fb8000000000,
+    0xbbcf4abd00000000, 0xdffa98fb00000000, 0x031629c600000000,
+    0x17903c7600000000, 0xcb7c8d4b00000000, 0xaf495f0d00000000,
+    0x73a5ee3000000000, 0x4903826c00000000, 0x95ef335100000000,
+    0xf1dae11700000000, 0x2d36502a00000000, 0x39b0459a00000000,
+    0xe55cf4a700000000, 0x816926e100000000, 0x5d8597dc00000000,
+    0xe8637c5a00000000, 0x348fcd6700000000, 0x50ba1f2100000000,
+    0x8c56ae1c00000000, 0x98d0bbac00000000, 0x443c0a9100000000,
+    0x2009d8d700000000, 0xfce569ea00000000, 0x0bc27e0100000000,
+    0xd72ecf3c00000000, 0xb31b1d7a00000000, 0x6ff7ac4700000000,
+    0x7b71b9f700000000, 0xa79d08ca00000000, 0xc3a8da8c00000000,
+    0x1f446bb100000000, 0xaaa2803700000000, 0x764e310a00000000,
+    0x127be34c00000000, 0xce97527100000000, 0xda1147c100000000,
+    0x06fdf6fc00000000, 0x62c824ba00000000, 0xbe24958700000000,
+    0xcd817bb700000000, 0x116dca8a00000000, 0x755818cc00000000,
+    0xa9b4a9f100000000, 0xbd32bc4100000000, 0x61de0d7c00000000,
+    0x05ebdf3a00000000, 0xd9076e0700000000, 0x6ce1858100000000,
+    0xb00d34bc00000000, 0xd438e6fa00000000, 0x08d457c700000000,
+    0x1c52427700000000, 0xc0bef34a00000000, 0xa48b210c00000000,
+    0x7867903100000000, 0x8f4087da00000000, 0x53ac36e700000000,
+    0x3799e4a100000000, 0xeb75559c00000000, 0xfff3402c00000000,
+    0x231ff11100000000, 0x472a235700000000, 0x9bc6926a00000000,
+    0x2e2079ec00000000, 0xf2ccc8d100000000, 0x96f91a9700000000,
+    0x4a15abaa00000000, 0x5e93be1a00000000, 0x827f0f2700000000,
+    0xe64add6100000000, 0x3aa66c5c00000000, 0x920604d900000000,
+    0x4eeab5e400000000, 0x2adf67a200000000, 0xf633d69f00000000,
+    0xe2b5c32f00000000, 0x3e59721200000000, 0x5a6ca05400000000,
+    0x8680116900000000, 0x3366faef00000000, 0xef8a4bd200000000,
+    0x8bbf999400000000, 0x575328a900000000, 0x43d53d1900000000,
+    0x9f398c2400000000, 0xfb0c5e6200000000, 0x27e0ef5f00000000,
+    0xd0c7f8b400000000, 0x0c2b498900000000, 0x681e9bcf00000000,
+    0xb4f22af200000000, 0xa0743f4200000000, 0x7c988e7f00000000,
+    0x18ad5c3900000000, 0xc441ed0400000000, 0x71a7068200000000,
+    0xad4bb7bf00000000, 0xc97e65f900000000, 0x1592d4c400000000,
+    0x0114c17400000000, 0xddf8704900000000, 0xb9cda20f00000000,
+    0x6521133200000000, 0x1684fd0200000000, 0xca684c3f00000000,
+    0xae5d9e7900000000, 0x72b12f4400000000, 0x66373af400000000,
+    0xbadb8bc900000000, 0xdeee598f00000000, 0x0202e8b200000000,
+    0xb7e4033400000000, 0x6b08b20900000000, 0x0f3d604f00000000,
+    0xd3d1d17200000000, 0xc757c4c200000000, 0x1bbb75ff00000000,
+    0x7f8ea7b900000000, 0xa362168400000000, 0x5445016f00000000,
+    0x88a9b05200000000, 0xec9c621400000000, 0x3070d32900000000,
+    0x24f6c69900000000, 0xf81a77a400000000, 0x9c2fa5e200000000,
+    0x40c314df00000000, 0xf525ff5900000000, 0x29c94e6400000000,
+    0x4dfc9c2200000000, 0x91102d1f00000000, 0x859638af00000000,
+    0x597a899200000000, 0x3d4f5bd400000000, 0xe1a3eae900000000,
+    0xdb0586b500000000, 0x07e9378800000000, 0x63dce5ce00000000,
+    0xbf3054f300000000, 0xabb6414300000000, 0x775af07e00000000,
+    0x136f223800000000, 0xcf83930500000000, 0x7a65788300000000,
+    0xa689c9be00000000, 0xc2bc1bf800000000, 0x1e50aac500000000,
+    0x0ad6bf7500000000, 0xd63a0e4800000000, 0xb20fdc0e00000000,
+    0x6ee36d3300000000, 0x99c47ad800000000, 0x4528cbe500000000,
+    0x211d19a300000000, 0xfdf1a89e00000000, 0xe977bd2e00000000,
+    0x359b0c1300000000, 0x51aede5500000000, 0x8d426f6800000000,
+    0x38a484ee00000000, 0xe44835d300000000, 0x807de79500000000,
+    0x5c9156a800000000, 0x4817431800000000, 0x94fbf22500000000,
+    0xf0ce206300000000, 0x2c22915e00000000, 0x5f877f6e00000000,
+    0x836bce5300000000, 0xe75e1c1500000000, 0x3bb2ad2800000000,
+    0x2f34b89800000000, 0xf3d809a500000000, 0x97eddbe300000000,
+    0x4b016ade00000000, 0xfee7815800000000, 0x220b306500000000,
+    0x463ee22300000000, 0x9ad2531e00000000, 0x8e5446ae00000000,
+    0x52b8f79300000000, 0x368d25d500000000, 0xea6194e800000000,
+    0x1d46830300000000, 0xc1aa323e00000000, 0xa59fe07800000000,
+    0x7973514500000000, 0x6df544f500000000, 0xb119f5c800000000,
+    0xd52c278e00000000, 0x09c096b300000000, 0xbc267d3500000000,
+    0x60cacc0800000000, 0x04ff1e4e00000000, 0xd813af7300000000,
+    0xcc95bac300000000, 0x10790bfe00000000, 0x744cd9b800000000,
+    0xa8a0688500000000}};
+
+#else /* W == 4 */
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0x81256527, 0xd93bcc0f, 0x581ea928, 0x69069e5f,
+    0xe823fb78, 0xb03d5250, 0x31183777, 0xd20d3cbe, 0x53285999,
+    0x0b36f0b1, 0x8a139596, 0xbb0ba2e1, 0x3a2ec7c6, 0x62306eee,
+    0xe3150bc9, 0x7f6b7f3d, 0xfe4e1a1a, 0xa650b332, 0x2775d615,
+    0x166de162, 0x97488445, 0xcf562d6d, 0x4e73484a, 0xad664383,
+    0x2c4326a4, 0x745d8f8c, 0xf578eaab, 0xc460dddc, 0x4545b8fb,
+    0x1d5b11d3, 0x9c7e74f4, 0xfed6fe7a, 0x7ff39b5d, 0x27ed3275,
+    0xa6c85752, 0x97d06025, 0x16f50502, 0x4eebac2a, 0xcfcec90d,
+    0x2cdbc2c4, 0xadfea7e3, 0xf5e00ecb, 0x74c56bec, 0x45dd5c9b,
+    0xc4f839bc, 0x9ce69094, 0x1dc3f5b3, 0x81bd8147, 0x0098e460,
+    0x58864d48, 0xd9a3286f, 0xe8bb1f18, 0x699e7a3f, 0x3180d317,
+    0xb0a5b630, 0x53b0bdf9, 0xd295d8de, 0x8a8b71f6, 0x0bae14d1,
+    0x3ab623a6, 0xbb934681, 0xe38defa9, 0x62a88a8e, 0x26dcfab5,
+    0xa7f99f92, 0xffe736ba, 0x7ec2539d, 0x4fda64ea, 0xceff01cd,
+    0x96e1a8e5, 0x17c4cdc2, 0xf4d1c60b, 0x75f4a32c, 0x2dea0a04,
+    0xaccf6f23, 0x9dd75854, 0x1cf23d73, 0x44ec945b, 0xc5c9f17c,
+    0x59b78588, 0xd892e0af, 0x808c4987, 0x01a92ca0, 0x30b11bd7,
+    0xb1947ef0, 0xe98ad7d8, 0x68afb2ff, 0x8bbab936, 0x0a9fdc11,
+    0x52817539, 0xd3a4101e, 0xe2bc2769, 0x6399424e, 0x3b87eb66,
+    0xbaa28e41, 0xd80a04cf, 0x592f61e8, 0x0131c8c0, 0x8014ade7,
+    0xb10c9a90, 0x3029ffb7, 0x6837569f, 0xe91233b8, 0x0a073871,
+    0x8b225d56, 0xd33cf47e, 0x52199159, 0x6301a62e, 0xe224c309,
+    0xba3a6a21, 0x3b1f0f06, 0xa7617bf2, 0x26441ed5, 0x7e5ab7fd,
+    0xff7fd2da, 0xce67e5ad, 0x4f42808a, 0x175c29a2, 0x96794c85,
+    0x756c474c, 0xf449226b, 0xac578b43, 0x2d72ee64, 0x1c6ad913,
+    0x9d4fbc34, 0xc551151c, 0x4474703b, 0x4db9f56a, 0xcc9c904d,
+    0x94823965, 0x15a75c42, 0x24bf6b35, 0xa59a0e12, 0xfd84a73a,
+    0x7ca1c21d, 0x9fb4c9d4, 0x1e91acf3, 0x468f05db, 0xc7aa60fc,
+    0xf6b2578b, 0x779732ac, 0x2f899b84, 0xaeacfea3, 0x32d28a57,
+    0xb3f7ef70, 0xebe94658, 0x6acc237f, 0x5bd41408, 0xdaf1712f,
+    0x82efd807, 0x03cabd20, 0xe0dfb6e9, 0x61fad3ce, 0x39e47ae6,
+    0xb8c11fc1, 0x89d928b6, 0x08fc4d91, 0x50e2e4b9, 0xd1c7819e,
+    0xb36f0b10, 0x324a6e37, 0x6a54c71f, 0xeb71a238, 0xda69954f,
+    0x5b4cf068, 0x03525940, 0x82773c67, 0x616237ae, 0xe0475289,
+    0xb859fba1, 0x397c9e86, 0x0864a9f1, 0x8941ccd6, 0xd15f65fe,
+    0x507a00d9, 0xcc04742d, 0x4d21110a, 0x153fb822, 0x941add05,
+    0xa502ea72, 0x24278f55, 0x7c39267d, 0xfd1c435a, 0x1e094893,
+    0x9f2c2db4, 0xc732849c, 0x4617e1bb, 0x770fd6cc, 0xf62ab3eb,
+    0xae341ac3, 0x2f117fe4, 0x6b650fdf, 0xea406af8, 0xb25ec3d0,
+    0x337ba6f7, 0x02639180, 0x8346f4a7, 0xdb585d8f, 0x5a7d38a8,
+    0xb9683361, 0x384d5646, 0x6053ff6e, 0xe1769a49, 0xd06ead3e,
+    0x514bc819, 0x09556131, 0x88700416, 0x140e70e2, 0x952b15c5,
+    0xcd35bced, 0x4c10d9ca, 0x7d08eebd, 0xfc2d8b9a, 0xa43322b2,
+    0x25164795, 0xc6034c5c, 0x4726297b, 0x1f388053, 0x9e1de574,
+    0xaf05d203, 0x2e20b724, 0x763e1e0c, 0xf71b7b2b, 0x95b3f1a5,
+    0x14969482, 0x4c883daa, 0xcdad588d, 0xfcb56ffa, 0x7d900add,
+    0x258ea3f5, 0xa4abc6d2, 0x47becd1b, 0xc69ba83c, 0x9e850114,
+    0x1fa06433, 0x2eb85344, 0xaf9d3663, 0xf7839f4b, 0x76a6fa6c,
+    0xead88e98, 0x6bfdebbf, 0x33e34297, 0xb2c627b0, 0x83de10c7,
+    0x02fb75e0, 0x5ae5dcc8, 0xdbc0b9ef, 0x38d5b226, 0xb9f0d701,
+    0xe1ee7e29, 0x60cb1b0e, 0x51d32c79, 0xd0f6495e, 0x88e8e076,
+    0x09cd8551},
+   {0x00000000, 0x9b73ead4, 0xed96d3e9, 0x76e5393d, 0x005ca193,
+    0x9b2f4b47, 0xedca727a, 0x76b998ae, 0x00b94326, 0x9bcaa9f2,
+    0xed2f90cf, 0x765c7a1b, 0x00e5e2b5, 0x9b960861, 0xed73315c,
+    0x7600db88, 0x0172864c, 0x9a016c98, 0xece455a5, 0x7797bf71,
+    0x012e27df, 0x9a5dcd0b, 0xecb8f436, 0x77cb1ee2, 0x01cbc56a,
+    0x9ab82fbe, 0xec5d1683, 0x772efc57, 0x019764f9, 0x9ae48e2d,
+    0xec01b710, 0x77725dc4, 0x02e50c98, 0x9996e64c, 0xef73df71,
+    0x740035a5, 0x02b9ad0b, 0x99ca47df, 0xef2f7ee2, 0x745c9436,
+    0x025c4fbe, 0x992fa56a, 0xefca9c57, 0x74b97683, 0x0200ee2d,
+    0x997304f9, 0xef963dc4, 0x74e5d710, 0x03978ad4, 0x98e46000,
+    0xee01593d, 0x7572b3e9, 0x03cb2b47, 0x98b8c193, 0xee5df8ae,
+    0x752e127a, 0x032ec9f2, 0x985d2326, 0xeeb81a1b, 0x75cbf0cf,
+    0x03726861, 0x980182b5, 0xeee4bb88, 0x7597515c, 0x05ca1930,
+    0x9eb9f3e4, 0xe85ccad9, 0x732f200d, 0x0596b8a3, 0x9ee55277,
+    0xe8006b4a, 0x7373819e, 0x05735a16, 0x9e00b0c2, 0xe8e589ff,
+    0x7396632b, 0x052ffb85, 0x9e5c1151, 0xe8b9286c, 0x73cac2b8,
+    0x04b89f7c, 0x9fcb75a8, 0xe92e4c95, 0x725da641, 0x04e43eef,
+    0x9f97d43b, 0xe972ed06, 0x720107d2, 0x0401dc5a, 0x9f72368e,
+    0xe9970fb3, 0x72e4e567, 0x045d7dc9, 0x9f2e971d, 0xe9cbae20,
+    0x72b844f4, 0x072f15a8, 0x9c5cff7c, 0xeab9c641, 0x71ca2c95,
+    0x0773b43b, 0x9c005eef, 0xeae567d2, 0x71968d06, 0x0796568e,
+    0x9ce5bc5a, 0xea008567, 0x71736fb3, 0x07caf71d, 0x9cb91dc9,
+    0xea5c24f4, 0x712fce20, 0x065d93e4, 0x9d2e7930, 0xebcb400d,
+    0x70b8aad9, 0x06013277, 0x9d72d8a3, 0xeb97e19e, 0x70e40b4a,
+    0x06e4d0c2, 0x9d973a16, 0xeb72032b, 0x7001e9ff, 0x06b87151,
+    0x9dcb9b85, 0xeb2ea2b8, 0x705d486c, 0x0b943260, 0x90e7d8b4,
+    0xe602e189, 0x7d710b5d, 0x0bc893f3, 0x90bb7927, 0xe65e401a,
+    0x7d2daace, 0x0b2d7146, 0x905e9b92, 0xe6bba2af, 0x7dc8487b,
+    0x0b71d0d5, 0x90023a01, 0xe6e7033c, 0x7d94e9e8, 0x0ae6b42c,
+    0x91955ef8, 0xe77067c5, 0x7c038d11, 0x0aba15bf, 0x91c9ff6b,
+    0xe72cc656, 0x7c5f2c82, 0x0a5ff70a, 0x912c1dde, 0xe7c924e3,
+    0x7cbace37, 0x0a035699, 0x9170bc4d, 0xe7958570, 0x7ce66fa4,
+    0x09713ef8, 0x9202d42c, 0xe4e7ed11, 0x7f9407c5, 0x092d9f6b,
+    0x925e75bf, 0xe4bb4c82, 0x7fc8a656, 0x09c87dde, 0x92bb970a,
+    0xe45eae37, 0x7f2d44e3, 0x0994dc4d, 0x92e73699, 0xe4020fa4,
+    0x7f71e570, 0x0803b8b4, 0x93705260, 0xe5956b5d, 0x7ee68189,
+    0x085f1927, 0x932cf3f3, 0xe5c9cace, 0x7eba201a, 0x08bafb92,
+    0x93c91146, 0xe52c287b, 0x7e5fc2af, 0x08e65a01, 0x9395b0d5,
+    0xe57089e8, 0x7e03633c, 0x0e5e2b50, 0x952dc184, 0xe3c8f8b9,
+    0x78bb126d, 0x0e028ac3, 0x95716017, 0xe394592a, 0x78e7b3fe,
+    0x0ee76876, 0x959482a2, 0xe371bb9f, 0x7802514b, 0x0ebbc9e5,
+    0x95c82331, 0xe32d1a0c, 0x785ef0d8, 0x0f2cad1c, 0x945f47c8,
+    0xe2ba7ef5, 0x79c99421, 0x0f700c8f, 0x9403e65b, 0xe2e6df66,
+    0x799535b2, 0x0f95ee3a, 0x94e604ee, 0xe2033dd3, 0x7970d707,
+    0x0fc94fa9, 0x94baa57d, 0xe25f9c40, 0x792c7694, 0x0cbb27c8,
+    0x97c8cd1c, 0xe12df421, 0x7a5e1ef5, 0x0ce7865b, 0x97946c8f,
+    0xe17155b2, 0x7a02bf66, 0x0c0264ee, 0x97718e3a, 0xe194b707,
+    0x7ae75dd3, 0x0c5ec57d, 0x972d2fa9, 0xe1c81694, 0x7abbfc40,
+    0x0dc9a184, 0x96ba4b50, 0xe05f726d, 0x7b2c98b9, 0x0d950017,
+    0x96e6eac3, 0xe003d3fe, 0x7b70392a, 0x0d70e2a2, 0x96030876,
+    0xe0e6314b, 0x7b95db9f, 0x0d2c4331, 0x965fa9e5, 0xe0ba90d8,
+    0x7bc97a0c},
+   {0x00000000, 0x172864c0, 0x2e50c980, 0x3978ad40, 0x5ca19300,
+    0x4b89f7c0, 0x72f15a80, 0x65d93e40, 0xb9432600, 0xae6b42c0,
+    0x9713ef80, 0x803b8b40, 0xe5e2b500, 0xf2cad1c0, 0xcbb27c80,
+    0xdc9a1840, 0xa9f74a41, 0xbedf2e81, 0x87a783c1, 0x908fe701,
+    0xf556d941, 0xe27ebd81, 0xdb0610c1, 0xcc2e7401, 0x10b46c41,
+    0x079c0881, 0x3ee4a5c1, 0x29ccc101, 0x4c15ff41, 0x5b3d9b81,
+    0x624536c1, 0x756d5201, 0x889f92c3, 0x9fb7f603, 0xa6cf5b43,
+    0xb1e73f83, 0xd43e01c3, 0xc3166503, 0xfa6ec843, 0xed46ac83,
+    0x31dcb4c3, 0x26f4d003, 0x1f8c7d43, 0x08a41983, 0x6d7d27c3,
+    0x7a554303, 0x432dee43, 0x54058a83, 0x2168d882, 0x3640bc42,
+    0x0f381102, 0x181075c2, 0x7dc94b82, 0x6ae12f42, 0x53998202,
+    0x44b1e6c2, 0x982bfe82, 0x8f039a42, 0xb67b3702, 0xa15353c2,
+    0xc48a6d82, 0xd3a20942, 0xeadaa402, 0xfdf2c0c2, 0xca4e23c7,
+    0xdd664707, 0xe41eea47, 0xf3368e87, 0x96efb0c7, 0x81c7d407,
+    0xb8bf7947, 0xaf971d87, 0x730d05c7, 0x64256107, 0x5d5dcc47,
+    0x4a75a887, 0x2fac96c7, 0x3884f207, 0x01fc5f47, 0x16d43b87,
+    0x63b96986, 0x74910d46, 0x4de9a006, 0x5ac1c4c6, 0x3f18fa86,
+    0x28309e46, 0x11483306, 0x066057c6, 0xdafa4f86, 0xcdd22b46,
+    0xf4aa8606, 0xe382e2c6, 0x865bdc86, 0x9173b846, 0xa80b1506,
+    0xbf2371c6, 0x42d1b104, 0x55f9d5c4, 0x6c817884, 0x7ba91c44,
+    0x1e702204, 0x095846c4, 0x3020eb84, 0x27088f44, 0xfb929704,
+    0xecbaf3c4, 0xd5c25e84, 0xc2ea3a44, 0xa7330404, 0xb01b60c4,
+    0x8963cd84, 0x9e4ba944, 0xeb26fb45, 0xfc0e9f85, 0xc57632c5,
+    0xd25e5605, 0xb7876845, 0xa0af0c85, 0x99d7a1c5, 0x8effc505,
+    0x5265dd45, 0x454db985, 0x7c3514c5, 0x6b1d7005, 0x0ec44e45,
+    0x19ec2a85, 0x209487c5, 0x37bce305, 0x4fed41cf, 0x58c5250f,
+    0x61bd884f, 0x7695ec8f, 0x134cd2cf, 0x0464b60f, 0x3d1c1b4f,
+    0x2a347f8f, 0xf6ae67cf, 0xe186030f, 0xd8feae4f, 0xcfd6ca8f,
+    0xaa0ff4cf, 0xbd27900f, 0x845f3d4f, 0x9377598f, 0xe61a0b8e,
+    0xf1326f4e, 0xc84ac20e, 0xdf62a6ce, 0xbabb988e, 0xad93fc4e,
+    0x94eb510e, 0x83c335ce, 0x5f592d8e, 0x4871494e, 0x7109e40e,
+    0x662180ce, 0x03f8be8e, 0x14d0da4e, 0x2da8770e, 0x3a8013ce,
+    0xc772d30c, 0xd05ab7cc, 0xe9221a8c, 0xfe0a7e4c, 0x9bd3400c,
+    0x8cfb24cc, 0xb583898c, 0xa2abed4c, 0x7e31f50c, 0x691991cc,
+    0x50613c8c, 0x4749584c, 0x2290660c, 0x35b802cc, 0x0cc0af8c,
+    0x1be8cb4c, 0x6e85994d, 0x79adfd8d, 0x40d550cd, 0x57fd340d,
+    0x32240a4d, 0x250c6e8d, 0x1c74c3cd, 0x0b5ca70d, 0xd7c6bf4d,
+    0xc0eedb8d, 0xf99676cd, 0xeebe120d, 0x8b672c4d, 0x9c4f488d,
+    0xa537e5cd, 0xb21f810d, 0x85a36208, 0x928b06c8, 0xabf3ab88,
+    0xbcdbcf48, 0xd902f108, 0xce2a95c8, 0xf7523888, 0xe07a5c48,
+    0x3ce04408, 0x2bc820c8, 0x12b08d88, 0x0598e948, 0x6041d708,
+    0x7769b3c8, 0x4e111e88, 0x59397a48, 0x2c542849, 0x3b7c4c89,
+    0x0204e1c9, 0x152c8509, 0x70f5bb49, 0x67dddf89, 0x5ea572c9,
+    0x498d1609, 0x95170e49, 0x823f6a89, 0xbb47c7c9, 0xac6fa309,
+    0xc9b69d49, 0xde9ef989, 0xe7e654c9, 0xf0ce3009, 0x0d3cf0cb,
+    0x1a14940b, 0x236c394b, 0x34445d8b, 0x519d63cb, 0x46b5070b,
+    0x7fcdaa4b, 0x68e5ce8b, 0xb47fd6cb, 0xa357b20b, 0x9a2f1f4b,
+    0x8d077b8b, 0xe8de45cb, 0xfff6210b, 0xc68e8c4b, 0xd1a6e88b,
+    0xa4cbba8a, 0xb3e3de4a, 0x8a9b730a, 0x9db317ca, 0xf86a298a,
+    0xef424d4a, 0xd63ae00a, 0xc11284ca, 0x1d889c8a, 0x0aa0f84a,
+    0x33d8550a, 0x24f031ca, 0x41290f8a, 0x56016b4a, 0x6f79c60a,
+    0x7851a2ca},
+   {0x00000000, 0x9fda839e, 0xe4c4017d, 0x7b1e82e3, 0x12f904bb,
+    0x8d238725, 0xf63d05c6, 0x69e78658, 0x25f20976, 0xba288ae8,
+    0xc136080b, 0x5eec8b95, 0x370b0dcd, 0xa8d18e53, 0xd3cf0cb0,
+    0x4c158f2e, 0x4be412ec, 0xd43e9172, 0xaf201391, 0x30fa900f,
+    0x591d1657, 0xc6c795c9, 0xbdd9172a, 0x220394b4, 0x6e161b9a,
+    0xf1cc9804, 0x8ad21ae7, 0x15089979, 0x7cef1f21, 0xe3359cbf,
+    0x982b1e5c, 0x07f19dc2, 0x97c825d8, 0x0812a646, 0x730c24a5,
+    0xecd6a73b, 0x85312163, 0x1aeba2fd, 0x61f5201e, 0xfe2fa380,
+    0xb23a2cae, 0x2de0af30, 0x56fe2dd3, 0xc924ae4d, 0xa0c32815,
+    0x3f19ab8b, 0x44072968, 0xdbddaaf6, 0xdc2c3734, 0x43f6b4aa,
+    0x38e83649, 0xa732b5d7, 0xced5338f, 0x510fb011, 0x2a1132f2,
+    0xb5cbb16c, 0xf9de3e42, 0x6604bddc, 0x1d1a3f3f, 0x82c0bca1,
+    0xeb273af9, 0x74fdb967, 0x0fe33b84, 0x9039b81a, 0xf4e14df1,
+    0x6b3bce6f, 0x10254c8c, 0x8fffcf12, 0xe618494a, 0x79c2cad4,
+    0x02dc4837, 0x9d06cba9, 0xd1134487, 0x4ec9c719, 0x35d745fa,
+    0xaa0dc664, 0xc3ea403c, 0x5c30c3a2, 0x272e4141, 0xb8f4c2df,
+    0xbf055f1d, 0x20dfdc83, 0x5bc15e60, 0xc41bddfe, 0xadfc5ba6,
+    0x3226d838, 0x49385adb, 0xd6e2d945, 0x9af7566b, 0x052dd5f5,
+    0x7e335716, 0xe1e9d488, 0x880e52d0, 0x17d4d14e, 0x6cca53ad,
+    0xf310d033, 0x63296829, 0xfcf3ebb7, 0x87ed6954, 0x1837eaca,
+    0x71d06c92, 0xee0aef0c, 0x95146def, 0x0aceee71, 0x46db615f,
+    0xd901e2c1, 0xa21f6022, 0x3dc5e3bc, 0x542265e4, 0xcbf8e67a,
+    0xb0e66499, 0x2f3ce707, 0x28cd7ac5, 0xb717f95b, 0xcc097bb8,
+    0x53d3f826, 0x3a347e7e, 0xa5eefde0, 0xdef07f03, 0x412afc9d,
+    0x0d3f73b3, 0x92e5f02d, 0xe9fb72ce, 0x7621f150, 0x1fc67708,
+    0x801cf496, 0xfb027675, 0x64d8f5eb, 0x32b39da3, 0xad691e3d,
+    0xd6779cde, 0x49ad1f40, 0x204a9918, 0xbf901a86, 0xc48e9865,
+    0x5b541bfb, 0x174194d5, 0x889b174b, 0xf38595a8, 0x6c5f1636,
+    0x05b8906e, 0x9a6213f0, 0xe17c9113, 0x7ea6128d, 0x79578f4f,
+    0xe68d0cd1, 0x9d938e32, 0x02490dac, 0x6bae8bf4, 0xf474086a,
+    0x8f6a8a89, 0x10b00917, 0x5ca58639, 0xc37f05a7, 0xb8618744,
+    0x27bb04da, 0x4e5c8282, 0xd186011c, 0xaa9883ff, 0x35420061,
+    0xa57bb87b, 0x3aa13be5, 0x41bfb906, 0xde653a98, 0xb782bcc0,
+    0x28583f5e, 0x5346bdbd, 0xcc9c3e23, 0x8089b10d, 0x1f533293,
+    0x644db070, 0xfb9733ee, 0x9270b5b6, 0x0daa3628, 0x76b4b4cb,
+    0xe96e3755, 0xee9faa97, 0x71452909, 0x0a5babea, 0x95812874,
+    0xfc66ae2c, 0x63bc2db2, 0x18a2af51, 0x87782ccf, 0xcb6da3e1,
+    0x54b7207f, 0x2fa9a29c, 0xb0732102, 0xd994a75a, 0x464e24c4,
+    0x3d50a627, 0xa28a25b9, 0xc652d052, 0x598853cc, 0x2296d12f,
+    0xbd4c52b1, 0xd4abd4e9, 0x4b715777, 0x306fd594, 0xafb5560a,
+    0xe3a0d924, 0x7c7a5aba, 0x0764d859, 0x98be5bc7, 0xf159dd9f,
+    0x6e835e01, 0x159ddce2, 0x8a475f7c, 0x8db6c2be, 0x126c4120,
+    0x6972c3c3, 0xf6a8405d, 0x9f4fc605, 0x0095459b, 0x7b8bc778,
+    0xe45144e6, 0xa844cbc8, 0x379e4856, 0x4c80cab5, 0xd35a492b,
+    0xbabdcf73, 0x25674ced, 0x5e79ce0e, 0xc1a34d90, 0x519af58a,
+    0xce407614, 0xb55ef4f7, 0x2a847769, 0x4363f131, 0xdcb972af,
+    0xa7a7f04c, 0x387d73d2, 0x7468fcfc, 0xebb27f62, 0x90acfd81,
+    0x0f767e1f, 0x6691f847, 0xf94b7bd9, 0x8255f93a, 0x1d8f7aa4,
+    0x1a7ee766, 0x85a464f8, 0xfebae61b, 0x61606585, 0x0887e3dd,
+    0x975d6043, 0xec43e2a0, 0x7399613e, 0x3f8cee10, 0xa0566d8e,
+    0xdb48ef6d, 0x44926cf3, 0x2d75eaab, 0xb2af6935, 0xc9b1ebd6,
+    0x566b6848}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x00000000, 0x9e83da9f, 0x7d01c4e4, 0xe3821e7b, 0xbb04f912,
+    0x2587238d, 0xc6053df6, 0x5886e769, 0x7609f225, 0xe88a28ba,
+    0x0b0836c1, 0x958bec5e, 0xcd0d0b37, 0x538ed1a8, 0xb00ccfd3,
+    0x2e8f154c, 0xec12e44b, 0x72913ed4, 0x911320af, 0x0f90fa30,
+    0x57161d59, 0xc995c7c6, 0x2a17d9bd, 0xb4940322, 0x9a1b166e,
+    0x0498ccf1, 0xe71ad28a, 0x79990815, 0x211fef7c, 0xbf9c35e3,
+    0x5c1e2b98, 0xc29df107, 0xd825c897, 0x46a61208, 0xa5240c73,
+    0x3ba7d6ec, 0x63213185, 0xfda2eb1a, 0x1e20f561, 0x80a32ffe,
+    0xae2c3ab2, 0x30afe02d, 0xd32dfe56, 0x4dae24c9, 0x1528c3a0,
+    0x8bab193f, 0x68290744, 0xf6aadddb, 0x34372cdc, 0xaab4f643,
+    0x4936e838, 0xd7b532a7, 0x8f33d5ce, 0x11b00f51, 0xf232112a,
+    0x6cb1cbb5, 0x423edef9, 0xdcbd0466, 0x3f3f1a1d, 0xa1bcc082,
+    0xf93a27eb, 0x67b9fd74, 0x843be30f, 0x1ab83990, 0xf14de1f4,
+    0x6fce3b6b, 0x8c4c2510, 0x12cfff8f, 0x4a4918e6, 0xd4cac279,
+    0x3748dc02, 0xa9cb069d, 0x874413d1, 0x19c7c94e, 0xfa45d735,
+    0x64c60daa, 0x3c40eac3, 0xa2c3305c, 0x41412e27, 0xdfc2f4b8,
+    0x1d5f05bf, 0x83dcdf20, 0x605ec15b, 0xfedd1bc4, 0xa65bfcad,
+    0x38d82632, 0xdb5a3849, 0x45d9e2d6, 0x6b56f79a, 0xf5d52d05,
+    0x1657337e, 0x88d4e9e1, 0xd0520e88, 0x4ed1d417, 0xad53ca6c,
+    0x33d010f3, 0x29682963, 0xb7ebf3fc, 0x5469ed87, 0xcaea3718,
+    0x926cd071, 0x0cef0aee, 0xef6d1495, 0x71eece0a, 0x5f61db46,
+    0xc1e201d9, 0x22601fa2, 0xbce3c53d, 0xe4652254, 0x7ae6f8cb,
+    0x9964e6b0, 0x07e73c2f, 0xc57acd28, 0x5bf917b7, 0xb87b09cc,
+    0x26f8d353, 0x7e7e343a, 0xe0fdeea5, 0x037ff0de, 0x9dfc2a41,
+    0xb3733f0d, 0x2df0e592, 0xce72fbe9, 0x50f12176, 0x0877c61f,
+    0x96f41c80, 0x757602fb, 0xebf5d864, 0xa39db332, 0x3d1e69ad,
+    0xde9c77d6, 0x401fad49, 0x18994a20, 0x861a90bf, 0x65988ec4,
+    0xfb1b545b, 0xd5944117, 0x4b179b88, 0xa89585f3, 0x36165f6c,
+    0x6e90b805, 0xf013629a, 0x13917ce1, 0x8d12a67e, 0x4f8f5779,
+    0xd10c8de6, 0x328e939d, 0xac0d4902, 0xf48bae6b, 0x6a0874f4,
+    0x898a6a8f, 0x1709b010, 0x3986a55c, 0xa7057fc3, 0x448761b8,
+    0xda04bb27, 0x82825c4e, 0x1c0186d1, 0xff8398aa, 0x61004235,
+    0x7bb87ba5, 0xe53ba13a, 0x06b9bf41, 0x983a65de, 0xc0bc82b7,
+    0x5e3f5828, 0xbdbd4653, 0x233e9ccc, 0x0db18980, 0x9332531f,
+    0x70b04d64, 0xee3397fb, 0xb6b57092, 0x2836aa0d, 0xcbb4b476,
+    0x55376ee9, 0x97aa9fee, 0x09294571, 0xeaab5b0a, 0x74288195,
+    0x2cae66fc, 0xb22dbc63, 0x51afa218, 0xcf2c7887, 0xe1a36dcb,
+    0x7f20b754, 0x9ca2a92f, 0x022173b0, 0x5aa794d9, 0xc4244e46,
+    0x27a6503d, 0xb9258aa2, 0x52d052c6, 0xcc538859, 0x2fd19622,
+    0xb1524cbd, 0xe9d4abd4, 0x7757714b, 0x94d56f30, 0x0a56b5af,
+    0x24d9a0e3, 0xba5a7a7c, 0x59d86407, 0xc75bbe98, 0x9fdd59f1,
+    0x015e836e, 0xe2dc9d15, 0x7c5f478a, 0xbec2b68d, 0x20416c12,
+    0xc3c37269, 0x5d40a8f6, 0x05c64f9f, 0x9b459500, 0x78c78b7b,
+    0xe64451e4, 0xc8cb44a8, 0x56489e37, 0xb5ca804c, 0x2b495ad3,
+    0x73cfbdba, 0xed4c6725, 0x0ece795e, 0x904da3c1, 0x8af59a51,
+    0x147640ce, 0xf7f45eb5, 0x6977842a, 0x31f16343, 0xaf72b9dc,
+    0x4cf0a7a7, 0xd2737d38, 0xfcfc6874, 0x627fb2eb, 0x81fdac90,
+    0x1f7e760f, 0x47f89166, 0xd97b4bf9, 0x3af95582, 0xa47a8f1d,
+    0x66e77e1a, 0xf864a485, 0x1be6bafe, 0x85656061, 0xdde38708,
+    0x43605d97, 0xa0e243ec, 0x3e619973, 0x10ee8c3f, 0x8e6d56a0,
+    0x6def48db, 0xf36c9244, 0xabea752d, 0x3569afb2, 0xd6ebb1c9,
+    0x48686b56},
+   {0x00000000, 0xc0642817, 0x80c9502e, 0x40ad7839, 0x0093a15c,
+    0xc0f7894b, 0x805af172, 0x403ed965, 0x002643b9, 0xc0426bae,
+    0x80ef1397, 0x408b3b80, 0x00b5e2e5, 0xc0d1caf2, 0x807cb2cb,
+    0x40189adc, 0x414af7a9, 0x812edfbe, 0xc183a787, 0x01e78f90,
+    0x41d956f5, 0x81bd7ee2, 0xc11006db, 0x01742ecc, 0x416cb410,
+    0x81089c07, 0xc1a5e43e, 0x01c1cc29, 0x41ff154c, 0x819b3d5b,
+    0xc1364562, 0x01526d75, 0xc3929f88, 0x03f6b79f, 0x435bcfa6,
+    0x833fe7b1, 0xc3013ed4, 0x036516c3, 0x43c86efa, 0x83ac46ed,
+    0xc3b4dc31, 0x03d0f426, 0x437d8c1f, 0x8319a408, 0xc3277d6d,
+    0x0343557a, 0x43ee2d43, 0x838a0554, 0x82d86821, 0x42bc4036,
+    0x0211380f, 0xc2751018, 0x824bc97d, 0x422fe16a, 0x02829953,
+    0xc2e6b144, 0x82fe2b98, 0x429a038f, 0x02377bb6, 0xc25353a1,
+    0x826d8ac4, 0x4209a2d3, 0x02a4daea, 0xc2c0f2fd, 0xc7234eca,
+    0x074766dd, 0x47ea1ee4, 0x878e36f3, 0xc7b0ef96, 0x07d4c781,
+    0x4779bfb8, 0x871d97af, 0xc7050d73, 0x07612564, 0x47cc5d5d,
+    0x87a8754a, 0xc796ac2f, 0x07f28438, 0x475ffc01, 0x873bd416,
+    0x8669b963, 0x460d9174, 0x06a0e94d, 0xc6c4c15a, 0x86fa183f,
+    0x469e3028, 0x06334811, 0xc6576006, 0x864ffada, 0x462bd2cd,
+    0x0686aaf4, 0xc6e282e3, 0x86dc5b86, 0x46b87391, 0x06150ba8,
+    0xc67123bf, 0x04b1d142, 0xc4d5f955, 0x8478816c, 0x441ca97b,
+    0x0422701e, 0xc4465809, 0x84eb2030, 0x448f0827, 0x049792fb,
+    0xc4f3baec, 0x845ec2d5, 0x443aeac2, 0x040433a7, 0xc4601bb0,
+    0x84cd6389, 0x44a94b9e, 0x45fb26eb, 0x859f0efc, 0xc53276c5,
+    0x05565ed2, 0x456887b7, 0x850cafa0, 0xc5a1d799, 0x05c5ff8e,
+    0x45dd6552, 0x85b94d45, 0xc514357c, 0x05701d6b, 0x454ec40e,
+    0x852aec19, 0xc5879420, 0x05e3bc37, 0xcf41ed4f, 0x0f25c558,
+    0x4f88bd61, 0x8fec9576, 0xcfd24c13, 0x0fb66404, 0x4f1b1c3d,
+    0x8f7f342a, 0xcf67aef6, 0x0f0386e1, 0x4faefed8, 0x8fcad6cf,
+    0xcff40faa, 0x0f9027bd, 0x4f3d5f84, 0x8f597793, 0x8e0b1ae6,
+    0x4e6f32f1, 0x0ec24ac8, 0xcea662df, 0x8e98bbba, 0x4efc93ad,
+    0x0e51eb94, 0xce35c383, 0x8e2d595f, 0x4e497148, 0x0ee40971,
+    0xce802166, 0x8ebef803, 0x4edad014, 0x0e77a82d, 0xce13803a,
+    0x0cd372c7, 0xccb75ad0, 0x8c1a22e9, 0x4c7e0afe, 0x0c40d39b,
+    0xcc24fb8c, 0x8c8983b5, 0x4cedaba2, 0x0cf5317e, 0xcc911969,
+    0x8c3c6150, 0x4c584947, 0x0c669022, 0xcc02b835, 0x8cafc00c,
+    0x4ccbe81b, 0x4d99856e, 0x8dfdad79, 0xcd50d540, 0x0d34fd57,
+    0x4d0a2432, 0x8d6e0c25, 0xcdc3741c, 0x0da75c0b, 0x4dbfc6d7,
+    0x8ddbeec0, 0xcd7696f9, 0x0d12beee, 0x4d2c678b, 0x8d484f9c,
+    0xcde537a5, 0x0d811fb2, 0x0862a385, 0xc8068b92, 0x88abf3ab,
+    0x48cfdbbc, 0x08f102d9, 0xc8952ace, 0x883852f7, 0x485c7ae0,
+    0x0844e03c, 0xc820c82b, 0x888db012, 0x48e99805, 0x08d74160,
+    0xc8b36977, 0x881e114e, 0x487a3959, 0x4928542c, 0x894c7c3b,
+    0xc9e10402, 0x09852c15, 0x49bbf570, 0x89dfdd67, 0xc972a55e,
+    0x09168d49, 0x490e1795, 0x896a3f82, 0xc9c747bb, 0x09a36fac,
+    0x499db6c9, 0x89f99ede, 0xc954e6e7, 0x0930cef0, 0xcbf03c0d,
+    0x0b94141a, 0x4b396c23, 0x8b5d4434, 0xcb639d51, 0x0b07b546,
+    0x4baacd7f, 0x8bcee568, 0xcbd67fb4, 0x0bb257a3, 0x4b1f2f9a,
+    0x8b7b078d, 0xcb45dee8, 0x0b21f6ff, 0x4b8c8ec6, 0x8be8a6d1,
+    0x8abacba4, 0x4adee3b3, 0x0a739b8a, 0xca17b39d, 0x8a296af8,
+    0x4a4d42ef, 0x0ae03ad6, 0xca8412c1, 0x8a9c881d, 0x4af8a00a,
+    0x0a55d833, 0xca31f024, 0x8a0f2941, 0x4a6b0156, 0x0ac6796f,
+    0xcaa25178},
+   {0x00000000, 0xd4ea739b, 0xe9d396ed, 0x3d39e576, 0x93a15c00,
+    0x474b2f9b, 0x7a72caed, 0xae98b976, 0x2643b900, 0xf2a9ca9b,
+    0xcf902fed, 0x1b7a5c76, 0xb5e2e500, 0x6108969b, 0x5c3173ed,
+    0x88db0076, 0x4c867201, 0x986c019a, 0xa555e4ec, 0x71bf9777,
+    0xdf272e01, 0x0bcd5d9a, 0x36f4b8ec, 0xe21ecb77, 0x6ac5cb01,
+    0xbe2fb89a, 0x83165dec, 0x57fc2e77, 0xf9649701, 0x2d8ee49a,
+    0x10b701ec, 0xc45d7277, 0x980ce502, 0x4ce69699, 0x71df73ef,
+    0xa5350074, 0x0badb902, 0xdf47ca99, 0xe27e2fef, 0x36945c74,
+    0xbe4f5c02, 0x6aa52f99, 0x579ccaef, 0x8376b974, 0x2dee0002,
+    0xf9047399, 0xc43d96ef, 0x10d7e574, 0xd48a9703, 0x0060e498,
+    0x3d5901ee, 0xe9b37275, 0x472bcb03, 0x93c1b898, 0xaef85dee,
+    0x7a122e75, 0xf2c92e03, 0x26235d98, 0x1b1ab8ee, 0xcff0cb75,
+    0x61687203, 0xb5820198, 0x88bbe4ee, 0x5c519775, 0x3019ca05,
+    0xe4f3b99e, 0xd9ca5ce8, 0x0d202f73, 0xa3b89605, 0x7752e59e,
+    0x4a6b00e8, 0x9e817373, 0x165a7305, 0xc2b0009e, 0xff89e5e8,
+    0x2b639673, 0x85fb2f05, 0x51115c9e, 0x6c28b9e8, 0xb8c2ca73,
+    0x7c9fb804, 0xa875cb9f, 0x954c2ee9, 0x41a65d72, 0xef3ee404,
+    0x3bd4979f, 0x06ed72e9, 0xd2070172, 0x5adc0104, 0x8e36729f,
+    0xb30f97e9, 0x67e5e472, 0xc97d5d04, 0x1d972e9f, 0x20aecbe9,
+    0xf444b872, 0xa8152f07, 0x7cff5c9c, 0x41c6b9ea, 0x952cca71,
+    0x3bb47307, 0xef5e009c, 0xd267e5ea, 0x068d9671, 0x8e569607,
+    0x5abce59c, 0x678500ea, 0xb36f7371, 0x1df7ca07, 0xc91db99c,
+    0xf4245cea, 0x20ce2f71, 0xe4935d06, 0x30792e9d, 0x0d40cbeb,
+    0xd9aab870, 0x77320106, 0xa3d8729d, 0x9ee197eb, 0x4a0be470,
+    0xc2d0e406, 0x163a979d, 0x2b0372eb, 0xffe90170, 0x5171b806,
+    0x859bcb9d, 0xb8a22eeb, 0x6c485d70, 0x6032940b, 0xb4d8e790,
+    0x89e102e6, 0x5d0b717d, 0xf393c80b, 0x2779bb90, 0x1a405ee6,
+    0xceaa2d7d, 0x46712d0b, 0x929b5e90, 0xafa2bbe6, 0x7b48c87d,
+    0xd5d0710b, 0x013a0290, 0x3c03e7e6, 0xe8e9947d, 0x2cb4e60a,
+    0xf85e9591, 0xc56770e7, 0x118d037c, 0xbf15ba0a, 0x6bffc991,
+    0x56c62ce7, 0x822c5f7c, 0x0af75f0a, 0xde1d2c91, 0xe324c9e7,
+    0x37ceba7c, 0x9956030a, 0x4dbc7091, 0x708595e7, 0xa46fe67c,
+    0xf83e7109, 0x2cd40292, 0x11ede7e4, 0xc507947f, 0x6b9f2d09,
+    0xbf755e92, 0x824cbbe4, 0x56a6c87f, 0xde7dc809, 0x0a97bb92,
+    0x37ae5ee4, 0xe3442d7f, 0x4ddc9409, 0x9936e792, 0xa40f02e4,
+    0x70e5717f, 0xb4b80308, 0x60527093, 0x5d6b95e5, 0x8981e67e,
+    0x27195f08, 0xf3f32c93, 0xcecac9e5, 0x1a20ba7e, 0x92fbba08,
+    0x4611c993, 0x7b282ce5, 0xafc25f7e, 0x015ae608, 0xd5b09593,
+    0xe88970e5, 0x3c63037e, 0x502b5e0e, 0x84c12d95, 0xb9f8c8e3,
+    0x6d12bb78, 0xc38a020e, 0x17607195, 0x2a5994e3, 0xfeb3e778,
+    0x7668e70e, 0xa2829495, 0x9fbb71e3, 0x4b510278, 0xe5c9bb0e,
+    0x3123c895, 0x0c1a2de3, 0xd8f05e78, 0x1cad2c0f, 0xc8475f94,
+    0xf57ebae2, 0x2194c979, 0x8f0c700f, 0x5be60394, 0x66dfe6e2,
+    0xb2359579, 0x3aee950f, 0xee04e694, 0xd33d03e2, 0x07d77079,
+    0xa94fc90f, 0x7da5ba94, 0x409c5fe2, 0x94762c79, 0xc827bb0c,
+    0x1ccdc897, 0x21f42de1, 0xf51e5e7a, 0x5b86e70c, 0x8f6c9497,
+    0xb25571e1, 0x66bf027a, 0xee64020c, 0x3a8e7197, 0x07b794e1,
+    0xd35de77a, 0x7dc55e0c, 0xa92f2d97, 0x9416c8e1, 0x40fcbb7a,
+    0x84a1c90d, 0x504bba96, 0x6d725fe0, 0xb9982c7b, 0x1700950d,
+    0xc3eae696, 0xfed303e0, 0x2a39707b, 0xa2e2700d, 0x76080396,
+    0x4b31e6e0, 0x9fdb957b, 0x31432c0d, 0xe5a95f96, 0xd890bae0,
+    0x0c7ac97b},
+   {0x00000000, 0x27652581, 0x0fcc3bd9, 0x28a91e58, 0x5f9e0669,
+    0x78fb23e8, 0x50523db0, 0x77371831, 0xbe3c0dd2, 0x99592853,
+    0xb1f0360b, 0x9695138a, 0xe1a20bbb, 0xc6c72e3a, 0xee6e3062,
+    0xc90b15e3, 0x3d7f6b7f, 0x1a1a4efe, 0x32b350a6, 0x15d67527,
+    0x62e16d16, 0x45844897, 0x6d2d56cf, 0x4a48734e, 0x834366ad,
+    0xa426432c, 0x8c8f5d74, 0xabea78f5, 0xdcdd60c4, 0xfbb84545,
+    0xd3115b1d, 0xf4747e9c, 0x7afed6fe, 0x5d9bf37f, 0x7532ed27,
+    0x5257c8a6, 0x2560d097, 0x0205f516, 0x2aaceb4e, 0x0dc9cecf,
+    0xc4c2db2c, 0xe3a7fead, 0xcb0ee0f5, 0xec6bc574, 0x9b5cdd45,
+    0xbc39f8c4, 0x9490e69c, 0xb3f5c31d, 0x4781bd81, 0x60e49800,
+    0x484d8658, 0x6f28a3d9, 0x181fbbe8, 0x3f7a9e69, 0x17d38031,
+    0x30b6a5b0, 0xf9bdb053, 0xded895d2, 0xf6718b8a, 0xd114ae0b,
+    0xa623b63a, 0x814693bb, 0xa9ef8de3, 0x8e8aa862, 0xb5fadc26,
+    0x929ff9a7, 0xba36e7ff, 0x9d53c27e, 0xea64da4f, 0xcd01ffce,
+    0xe5a8e196, 0xc2cdc417, 0x0bc6d1f4, 0x2ca3f475, 0x040aea2d,
+    0x236fcfac, 0x5458d79d, 0x733df21c, 0x5b94ec44, 0x7cf1c9c5,
+    0x8885b759, 0xafe092d8, 0x87498c80, 0xa02ca901, 0xd71bb130,
+    0xf07e94b1, 0xd8d78ae9, 0xffb2af68, 0x36b9ba8b, 0x11dc9f0a,
+    0x39758152, 0x1e10a4d3, 0x6927bce2, 0x4e429963, 0x66eb873b,
+    0x418ea2ba, 0xcf040ad8, 0xe8612f59, 0xc0c83101, 0xe7ad1480,
+    0x909a0cb1, 0xb7ff2930, 0x9f563768, 0xb83312e9, 0x7138070a,
+    0x565d228b, 0x7ef43cd3, 0x59911952, 0x2ea60163, 0x09c324e2,
+    0x216a3aba, 0x060f1f3b, 0xf27b61a7, 0xd51e4426, 0xfdb75a7e,
+    0xdad27fff, 0xade567ce, 0x8a80424f, 0xa2295c17, 0x854c7996,
+    0x4c476c75, 0x6b2249f4, 0x438b57ac, 0x64ee722d, 0x13d96a1c,
+    0x34bc4f9d, 0x1c1551c5, 0x3b707444, 0x6af5b94d, 0x4d909ccc,
+    0x65398294, 0x425ca715, 0x356bbf24, 0x120e9aa5, 0x3aa784fd,
+    0x1dc2a17c, 0xd4c9b49f, 0xf3ac911e, 0xdb058f46, 0xfc60aac7,
+    0x8b57b2f6, 0xac329777, 0x849b892f, 0xa3feacae, 0x578ad232,
+    0x70eff7b3, 0x5846e9eb, 0x7f23cc6a, 0x0814d45b, 0x2f71f1da,
+    0x07d8ef82, 0x20bdca03, 0xe9b6dfe0, 0xced3fa61, 0xe67ae439,
+    0xc11fc1b8, 0xb628d989, 0x914dfc08, 0xb9e4e250, 0x9e81c7d1,
+    0x100b6fb3, 0x376e4a32, 0x1fc7546a, 0x38a271eb, 0x4f9569da,
+    0x68f04c5b, 0x40595203, 0x673c7782, 0xae376261, 0x895247e0,
+    0xa1fb59b8, 0x869e7c39, 0xf1a96408, 0xd6cc4189, 0xfe655fd1,
+    0xd9007a50, 0x2d7404cc, 0x0a11214d, 0x22b83f15, 0x05dd1a94,
+    0x72ea02a5, 0x558f2724, 0x7d26397c, 0x5a431cfd, 0x9348091e,
+    0xb42d2c9f, 0x9c8432c7, 0xbbe11746, 0xccd60f77, 0xebb32af6,
+    0xc31a34ae, 0xe47f112f, 0xdf0f656b, 0xf86a40ea, 0xd0c35eb2,
+    0xf7a67b33, 0x80916302, 0xa7f44683, 0x8f5d58db, 0xa8387d5a,
+    0x613368b9, 0x46564d38, 0x6eff5360, 0x499a76e1, 0x3ead6ed0,
+    0x19c84b51, 0x31615509, 0x16047088, 0xe2700e14, 0xc5152b95,
+    0xedbc35cd, 0xcad9104c, 0xbdee087d, 0x9a8b2dfc, 0xb22233a4,
+    0x95471625, 0x5c4c03c6, 0x7b292647, 0x5380381f, 0x74e51d9e,
+    0x03d205af, 0x24b7202e, 0x0c1e3e76, 0x2b7b1bf7, 0xa5f1b395,
+    0x82949614, 0xaa3d884c, 0x8d58adcd, 0xfa6fb5fc, 0xdd0a907d,
+    0xf5a38e25, 0xd2c6aba4, 0x1bcdbe47, 0x3ca89bc6, 0x1401859e,
+    0x3364a01f, 0x4453b82e, 0x63369daf, 0x4b9f83f7, 0x6cfaa676,
+    0x988ed8ea, 0xbfebfd6b, 0x9742e333, 0xb027c6b2, 0xc710de83,
+    0xe075fb02, 0xc8dce55a, 0xefb9c0db, 0x26b2d538, 0x01d7f0b9,
+    0x297eeee1, 0x0e1bcb60, 0x792cd351, 0x5e49f6d0, 0x76e0e888,
+    0x5185cd09}};
+
+#endif
+
+#endif
+
+#endif
+
+local const z_crc_t FAR x2n_table[] = {
+    0x40000000, 0x20000000, 0x08000000, 0x00800000, 0x00008000,
+    0xedb88320, 0xb1e6b092, 0xa06a2517, 0xed627dae, 0x88d14467,
+    0xd7bbfe6a, 0xec447f11, 0x8e7ea170, 0x6427800e, 0x4d47bae0,
+    0x09fe548f, 0x83852d0f, 0x30362f1a, 0x7b5a9cc3, 0x31fec169,
+    0x9fec022a, 0x6c8dedc4, 0x15d6874d, 0x5fde7a4e, 0xbad90e37,
+    0x2e4e5eef, 0x4eaba214, 0xa8a472c0, 0x429a969e, 0x148d302a,
+    0xc40ba6d0, 0xc4e22c3c};
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/crc32_simd.c b/extern/crashpad/crashpad/third_party/zlib/zlib/crc32_simd.c
new file mode 100644
index 0000000000..7428270920
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/crc32_simd.c
@@ -0,0 +1,621 @@
+/* crc32_simd.c
+ *
+ * Copyright 2017 The Chromium Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the Chromium source repository LICENSE file.
+ */
+
+#include "crc32_simd.h"
+#if defined(CRC32_SIMD_AVX512_PCLMUL)
+
+/*
+ * crc32_avx512_simd_(): compute the crc32 of the buffer, where the buffer
+ * length must be at least 256, and a multiple of 64. Based on:
+ *
+ * "Fast CRC Computation for Generic Polynomials Using PCLMULQDQ Instruction"
+ *  V. Gopal, E. Ozturk, et al., 2009, http://intel.ly/2ySEwL0
+ */
+
+#include <emmintrin.h>
+#include <smmintrin.h>
+#include <wmmintrin.h>
+#include <immintrin.h>
+
+uint32_t ZLIB_INTERNAL crc32_avx512_simd_(  /* AVX512+PCLMUL */
+    const unsigned char *buf,
+    z_size_t len,
+    uint32_t crc)
+{
+    /*
+     * Definitions of the bit-reflected domain constants k1,k2,k3,k4
+     * are similar to those given at the end of the paper, and remaining
+     * constants and CRC32+Barrett polynomials remain unchanged.
+     *
+     * Replace the index of x from 128 to 512. As follows:
+     * k1 = ( x ^ ( 512 * 4 + 32 ) mod P(x) << 32 )' << 1 = 0x011542778a
+     * k2 = ( x ^ ( 512 * 4 - 32 ) mod P(x) << 32 )' << 1 = 0x01322d1430
+     * k3 = ( x ^ ( 512 + 32 ) mod P(x) << 32 )' << 1 = 0x0154442bd4
+     * k4 = ( x ^ ( 512 - 32 ) mod P(x) << 32 )' << 1 = 0x01c6e41596
+     */
+    static const uint64_t zalign(64) k1k2[] = { 0x011542778a, 0x01322d1430,
+                                                0x011542778a, 0x01322d1430,
+                                                0x011542778a, 0x01322d1430,
+                                                0x011542778a, 0x01322d1430 };
+    static const uint64_t zalign(64) k3k4[] = { 0x0154442bd4, 0x01c6e41596,
+                                                0x0154442bd4, 0x01c6e41596,
+                                                0x0154442bd4, 0x01c6e41596,
+                                                0x0154442bd4, 0x01c6e41596 };
+    static const uint64_t zalign(16) k5k6[] = { 0x01751997d0, 0x00ccaa009e };
+    static const uint64_t zalign(16) k7k8[] = { 0x0163cd6124, 0x0000000000 };
+    static const uint64_t zalign(16) poly[] = { 0x01db710641, 0x01f7011641 };
+    __m512i x0, x1, x2, x3, x4, x5, x6, x7, x8, y5, y6, y7, y8;
+    __m128i a0, a1, a2, a3;
+
+    /*
+     * There's at least one block of 256.
+     */
+    x1 = _mm512_loadu_si512((__m512i *)(buf + 0x00));
+    x2 = _mm512_loadu_si512((__m512i *)(buf + 0x40));
+    x3 = _mm512_loadu_si512((__m512i *)(buf + 0x80));
+    x4 = _mm512_loadu_si512((__m512i *)(buf + 0xC0));
+
+    x1 = _mm512_xor_si512(x1, _mm512_castsi128_si512(_mm_cvtsi32_si128(crc)));
+
+    x0 = _mm512_load_si512((__m512i *)k1k2);
+
+    buf += 256;
+    len -= 256;
+
+    /*
+     * Parallel fold blocks of 256, if any.
+     */
+    while (len >= 256)
+    {
+        x5 = _mm512_clmulepi64_epi128(x1, x0, 0x00);
+        x6 = _mm512_clmulepi64_epi128(x2, x0, 0x00);
+        x7 = _mm512_clmulepi64_epi128(x3, x0, 0x00);
+        x8 = _mm512_clmulepi64_epi128(x4, x0, 0x00);
+
+
+        x1 = _mm512_clmulepi64_epi128(x1, x0, 0x11);
+        x2 = _mm512_clmulepi64_epi128(x2, x0, 0x11);
+        x3 = _mm512_clmulepi64_epi128(x3, x0, 0x11);
+        x4 = _mm512_clmulepi64_epi128(x4, x0, 0x11);
+
+        y5 = _mm512_loadu_si512((__m512i *)(buf + 0x00));
+        y6 = _mm512_loadu_si512((__m512i *)(buf + 0x40));
+        y7 = _mm512_loadu_si512((__m512i *)(buf + 0x80));
+        y8 = _mm512_loadu_si512((__m512i *)(buf + 0xC0));
+
+        x1 = _mm512_xor_si512(x1, x5);
+        x2 = _mm512_xor_si512(x2, x6);
+        x3 = _mm512_xor_si512(x3, x7);
+        x4 = _mm512_xor_si512(x4, x8);
+
+        x1 = _mm512_xor_si512(x1, y5);
+        x2 = _mm512_xor_si512(x2, y6);
+        x3 = _mm512_xor_si512(x3, y7);
+        x4 = _mm512_xor_si512(x4, y8);
+
+        buf += 256;
+        len -= 256;
+    }
+
+    /*
+     * Fold into 512-bits.
+     */
+    x0 = _mm512_load_si512((__m512i *)k3k4);
+
+    x5 = _mm512_clmulepi64_epi128(x1, x0, 0x00);
+    x1 = _mm512_clmulepi64_epi128(x1, x0, 0x11);
+    x1 = _mm512_xor_si512(x1, x2);
+    x1 = _mm512_xor_si512(x1, x5);
+
+    x5 = _mm512_clmulepi64_epi128(x1, x0, 0x00);
+    x1 = _mm512_clmulepi64_epi128(x1, x0, 0x11);
+    x1 = _mm512_xor_si512(x1, x3);
+    x1 = _mm512_xor_si512(x1, x5);
+
+    x5 = _mm512_clmulepi64_epi128(x1, x0, 0x00);
+    x1 = _mm512_clmulepi64_epi128(x1, x0, 0x11);
+    x1 = _mm512_xor_si512(x1, x4);
+    x1 = _mm512_xor_si512(x1, x5);
+
+    /*
+     * Single fold blocks of 64, if any.
+     */
+    while (len >= 64)
+    {
+        x2 = _mm512_loadu_si512((__m512i *)buf);
+
+        x5 = _mm512_clmulepi64_epi128(x1, x0, 0x00);
+        x1 = _mm512_clmulepi64_epi128(x1, x0, 0x11);
+        x1 = _mm512_xor_si512(x1, x2);
+        x1 = _mm512_xor_si512(x1, x5);
+
+        buf += 64;
+        len -= 64;
+    }
+
+    /*
+     * Fold 512-bits to 384-bits.
+     */
+    a0 = _mm_load_si128((__m128i *)k5k6);
+
+    a1 = _mm512_extracti32x4_epi32(x1, 0);
+    a2 = _mm512_extracti32x4_epi32(x1, 1);
+
+    a3 = _mm_clmulepi64_si128(a1, a0, 0x00);
+    a1 = _mm_clmulepi64_si128(a1, a0, 0x11);
+
+    a1 = _mm_xor_si128(a1, a3);
+    a1 = _mm_xor_si128(a1, a2);
+
+    /*
+     * Fold 384-bits to 256-bits.
+     */
+    a2 = _mm512_extracti32x4_epi32(x1, 2);
+    a3 = _mm_clmulepi64_si128(a1, a0, 0x00);
+    a1 = _mm_clmulepi64_si128(a1, a0, 0x11);
+    a1 = _mm_xor_si128(a1, a3);
+    a1 = _mm_xor_si128(a1, a2);
+
+    /*
+     * Fold 256-bits to 128-bits.
+     */
+    a2 = _mm512_extracti32x4_epi32(x1, 3);
+    a3 = _mm_clmulepi64_si128(a1, a0, 0x00);
+    a1 = _mm_clmulepi64_si128(a1, a0, 0x11);
+    a1 = _mm_xor_si128(a1, a3);
+    a1 = _mm_xor_si128(a1, a2);
+
+    /*
+     * Fold 128-bits to 64-bits.
+     */
+    a2 = _mm_clmulepi64_si128(a1, a0, 0x10);
+    a3 = _mm_setr_epi32(~0, 0, ~0, 0);
+    a1 = _mm_srli_si128(a1, 8);
+    a1 = _mm_xor_si128(a1, a2);
+
+    a0 = _mm_loadl_epi64((__m128i*)k7k8);
+    a2 = _mm_srli_si128(a1, 4);
+    a1 = _mm_and_si128(a1, a3);
+    a1 = _mm_clmulepi64_si128(a1, a0, 0x00);
+    a1 = _mm_xor_si128(a1, a2);
+
+    /*
+     * Barret reduce to 32-bits.
+     */
+    a0 = _mm_load_si128((__m128i*)poly);
+
+    a2 = _mm_and_si128(a1, a3);
+    a2 = _mm_clmulepi64_si128(a2, a0, 0x10);
+    a2 = _mm_and_si128(a2, a3);
+    a2 = _mm_clmulepi64_si128(a2, a0, 0x00);
+    a1 = _mm_xor_si128(a1, a2);
+
+    /*
+     * Return the crc32.
+     */
+    return _mm_extract_epi32(a1, 1);
+}
+
+#elif defined(CRC32_SIMD_SSE42_PCLMUL)
+
+/*
+ * crc32_sse42_simd_(): compute the crc32 of the buffer, where the buffer
+ * length must be at least 64, and a multiple of 16.
+ */
+
+#include <emmintrin.h>
+#include <smmintrin.h>
+#include <wmmintrin.h>
+
+uint32_t ZLIB_INTERNAL crc32_sse42_simd_(  /* SSE4.2+PCLMUL */
+    const unsigned char *buf,
+    z_size_t len,
+    uint32_t crc)
+{
+    /*
+     * Definitions of the bit-reflected domain constants k1,k2,k3, etc and
+     * the CRC32+Barrett polynomials given at the end of the paper.
+     */
+    static const uint64_t zalign(16) k1k2[] = { 0x0154442bd4, 0x01c6e41596 };
+    static const uint64_t zalign(16) k3k4[] = { 0x01751997d0, 0x00ccaa009e };
+    static const uint64_t zalign(16) k5k0[] = { 0x0163cd6124, 0x0000000000 };
+    static const uint64_t zalign(16) poly[] = { 0x01db710641, 0x01f7011641 };
+
+    __m128i x0, x1, x2, x3, x4, x5, x6, x7, x8, y5, y6, y7, y8;
+
+    /*
+     * There's at least one block of 64.
+     */
+    x1 = _mm_loadu_si128((__m128i *)(buf + 0x00));
+    x2 = _mm_loadu_si128((__m128i *)(buf + 0x10));
+    x3 = _mm_loadu_si128((__m128i *)(buf + 0x20));
+    x4 = _mm_loadu_si128((__m128i *)(buf + 0x30));
+
+    x1 = _mm_xor_si128(x1, _mm_cvtsi32_si128(crc));
+
+    x0 = _mm_load_si128((__m128i *)k1k2);
+
+    buf += 64;
+    len -= 64;
+
+    /*
+     * Parallel fold blocks of 64, if any.
+     */
+    while (len >= 64)
+    {
+        x5 = _mm_clmulepi64_si128(x1, x0, 0x00);
+        x6 = _mm_clmulepi64_si128(x2, x0, 0x00);
+        x7 = _mm_clmulepi64_si128(x3, x0, 0x00);
+        x8 = _mm_clmulepi64_si128(x4, x0, 0x00);
+
+        x1 = _mm_clmulepi64_si128(x1, x0, 0x11);
+        x2 = _mm_clmulepi64_si128(x2, x0, 0x11);
+        x3 = _mm_clmulepi64_si128(x3, x0, 0x11);
+        x4 = _mm_clmulepi64_si128(x4, x0, 0x11);
+
+        y5 = _mm_loadu_si128((__m128i *)(buf + 0x00));
+        y6 = _mm_loadu_si128((__m128i *)(buf + 0x10));
+        y7 = _mm_loadu_si128((__m128i *)(buf + 0x20));
+        y8 = _mm_loadu_si128((__m128i *)(buf + 0x30));
+
+        x1 = _mm_xor_si128(x1, x5);
+        x2 = _mm_xor_si128(x2, x6);
+        x3 = _mm_xor_si128(x3, x7);
+        x4 = _mm_xor_si128(x4, x8);
+
+        x1 = _mm_xor_si128(x1, y5);
+        x2 = _mm_xor_si128(x2, y6);
+        x3 = _mm_xor_si128(x3, y7);
+        x4 = _mm_xor_si128(x4, y8);
+
+        buf += 64;
+        len -= 64;
+    }
+
+    /*
+     * Fold into 128-bits.
+     */
+    x0 = _mm_load_si128((__m128i *)k3k4);
+
+    x5 = _mm_clmulepi64_si128(x1, x0, 0x00);
+    x1 = _mm_clmulepi64_si128(x1, x0, 0x11);
+    x1 = _mm_xor_si128(x1, x2);
+    x1 = _mm_xor_si128(x1, x5);
+
+    x5 = _mm_clmulepi64_si128(x1, x0, 0x00);
+    x1 = _mm_clmulepi64_si128(x1, x0, 0x11);
+    x1 = _mm_xor_si128(x1, x3);
+    x1 = _mm_xor_si128(x1, x5);
+
+    x5 = _mm_clmulepi64_si128(x1, x0, 0x00);
+    x1 = _mm_clmulepi64_si128(x1, x0, 0x11);
+    x1 = _mm_xor_si128(x1, x4);
+    x1 = _mm_xor_si128(x1, x5);
+
+    /*
+     * Single fold blocks of 16, if any.
+     */
+    while (len >= 16)
+    {
+        x2 = _mm_loadu_si128((__m128i *)buf);
+
+        x5 = _mm_clmulepi64_si128(x1, x0, 0x00);
+        x1 = _mm_clmulepi64_si128(x1, x0, 0x11);
+        x1 = _mm_xor_si128(x1, x2);
+        x1 = _mm_xor_si128(x1, x5);
+
+        buf += 16;
+        len -= 16;
+    }
+
+    /*
+     * Fold 128-bits to 64-bits.
+     */
+    x2 = _mm_clmulepi64_si128(x1, x0, 0x10);
+    x3 = _mm_setr_epi32(~0, 0, ~0, 0);
+    x1 = _mm_srli_si128(x1, 8);
+    x1 = _mm_xor_si128(x1, x2);
+
+    x0 = _mm_loadl_epi64((__m128i*)k5k0);
+
+    x2 = _mm_srli_si128(x1, 4);
+    x1 = _mm_and_si128(x1, x3);
+    x1 = _mm_clmulepi64_si128(x1, x0, 0x00);
+    x1 = _mm_xor_si128(x1, x2);
+
+    /*
+     * Barret reduce to 32-bits.
+     */
+    x0 = _mm_load_si128((__m128i*)poly);
+
+    x2 = _mm_and_si128(x1, x3);
+    x2 = _mm_clmulepi64_si128(x2, x0, 0x10);
+    x2 = _mm_and_si128(x2, x3);
+    x2 = _mm_clmulepi64_si128(x2, x0, 0x00);
+    x1 = _mm_xor_si128(x1, x2);
+
+    /*
+     * Return the crc32.
+     */
+    return _mm_extract_epi32(x1, 1);
+}
+
+#elif defined(CRC32_ARMV8_CRC32)
+
+/* CRC32 checksums using ARMv8-a crypto instructions.
+ */
+
+#if defined(__clang__)
+/* We need some extra types for using PMULL.
+ */
+#if defined(__aarch64__)
+#include <arm_neon.h>
+#include <arm_acle.h>
+#endif
+
+/* CRC32 intrinsics are #ifdef'ed out of arm_acle.h unless we build with an
+ * armv8 target, which is incompatible with ThinLTO optimizations on Android.
+ * (Namely, mixing and matching different module-level targets makes ThinLTO
+ * warn, and Android defaults to armv7-a. This restriction does not apply to
+ * function-level `target`s, however.)
+ *
+ * Since we only need four crc intrinsics, and since clang's implementation of
+ * those are just wrappers around compiler builtins, it's simplest to #define
+ * those builtins directly. If this #define list grows too much (or we depend on
+ * an intrinsic that isn't a trivial wrapper), we may have to find a better way
+ * to go about this.
+ *
+ * NOTE: clang currently complains that "'+soft-float-abi' is not a recognized
+ * feature for this target (ignoring feature)." This appears to be a harmless
+ * bug in clang.
+ *
+ * These definitions must appear *after* including arm_acle.h otherwise that
+ * header may end up defining functions named __builtin_arm_crc32* that call
+ * themselves, creating an infinite loop when the intrinsic is called.
+ */
+/* XXX: Cannot hook into builtins with XCode for arm64. */
+#if !defined(ARMV8_OS_MACOS)
+#define __crc32b __builtin_arm_crc32b
+#define __crc32d __builtin_arm_crc32d
+#define __crc32w __builtin_arm_crc32w
+#define __crc32cw __builtin_arm_crc32cw
+#endif
+
+#if defined(__aarch64__)
+#define TARGET_ARMV8_WITH_CRC __attribute__((target("aes,crc")))
+#else  // !defined(__aarch64__)
+#define TARGET_ARMV8_WITH_CRC __attribute__((target("armv8-a,crc")))
+#endif  // defined(__aarch64__)
+
+#elif defined(__GNUC__)
+/* For GCC, we are setting CRC extensions at module level, so ThinLTO is not
+ * allowed. We can just include arm_acle.h.
+ */
+#include <arm_acle.h>
+#include <arm_neon.h>
+#define TARGET_ARMV8_WITH_CRC
+#else  // !defined(__GNUC__) && !defined(_aarch64__)
+#error ARM CRC32 SIMD extensions only supported for Clang and GCC
+#endif
+
+TARGET_ARMV8_WITH_CRC
+uint32_t ZLIB_INTERNAL armv8_crc32_little(
+    const unsigned char *buf,
+    z_size_t len,
+    uint32_t crc)
+{
+    uint32_t c = (uint32_t) ~crc;
+
+    while (len && ((uintptr_t)buf & 7)) {
+        c = __crc32b(c, *buf++);
+        --len;
+    }
+
+    const uint64_t *buf8 = (const uint64_t *)buf;
+
+    while (len >= 64) {
+        c = __crc32d(c, *buf8++);
+        c = __crc32d(c, *buf8++);
+        c = __crc32d(c, *buf8++);
+        c = __crc32d(c, *buf8++);
+
+        c = __crc32d(c, *buf8++);
+        c = __crc32d(c, *buf8++);
+        c = __crc32d(c, *buf8++);
+        c = __crc32d(c, *buf8++);
+        len -= 64;
+    }
+
+    while (len >= 8) {
+        c = __crc32d(c, *buf8++);
+        len -= 8;
+    }
+
+    buf = (const unsigned char *)buf8;
+
+    while (len--) {
+        c = __crc32b(c, *buf++);
+    }
+
+    return ~c;
+}
+
+#if defined(__aarch64__) || defined(ARMV8_OS_MACOS) /* aarch64 specific code. */
+
+/*
+ * crc32_pmull_simd_(): compute the crc32 of the buffer, where the buffer
+ * length must be at least 64, and a multiple of 16. Based on:
+ *
+ * "Fast CRC Computation for Generic Polynomials Using PCLMULQDQ Instruction"
+ *  V. Gopal, E. Ozturk, et al., 2009, http://intel.ly/2ySEwL0
+ */
+TARGET_ARMV8_WITH_CRC
+static inline uint8x16_t pmull_lo(const uint64x2_t a, const uint64x2_t b)
+{
+    uint8x16_t r;
+    __asm__ __volatile__ ("pmull  %0.1q, %1.1d, %2.1d \n\t"
+        : "=w" (r) : "w" (a), "w" (b) );
+    return r;
+}
+
+TARGET_ARMV8_WITH_CRC
+static inline uint8x16_t pmull_01(const uint64x2_t a, const uint64x2_t b)
+{
+    uint8x16_t r;
+    __asm__ __volatile__ ("pmull  %0.1q, %1.1d, %2.1d \n\t"
+        : "=w" (r) : "w" (a), "w" (vgetq_lane_u64(b, 1)) );
+    return r;
+}
+
+TARGET_ARMV8_WITH_CRC
+static inline uint8x16_t pmull_hi(const uint64x2_t a, const uint64x2_t b)
+{
+    uint8x16_t r;
+    __asm__ __volatile__ ("pmull2 %0.1q, %1.2d, %2.2d \n\t"
+        : "=w" (r) : "w" (a), "w" (b) );
+    return r;
+}
+
+TARGET_ARMV8_WITH_CRC
+uint32_t ZLIB_INTERNAL armv8_crc32_pmull_little(
+    const unsigned char *buf,
+    z_size_t len,
+    uint32_t crc)
+{
+    /*
+     * Definitions of the bit-reflected domain constants k1,k2,k3, etc and
+     * the CRC32+Barrett polynomials given at the end of the paper.
+     */
+    static const uint64_t zalign(16) k1k2[] = { 0x0154442bd4, 0x01c6e41596 };
+    static const uint64_t zalign(16) k3k4[] = { 0x01751997d0, 0x00ccaa009e };
+    static const uint64_t zalign(16) k5k0[] = { 0x0163cd6124, 0x0000000000 };
+    static const uint64_t zalign(16) poly[] = { 0x01db710641, 0x01f7011641 };
+
+    uint64x2_t x0, x1, x2, x3, x4, x5, x6, x7, x8, y5, y6, y7, y8;
+
+    /*
+     * There's at least one block of 64.
+     */
+    x1 = vld1q_u64((const uint64_t *)(buf + 0x00));
+    x2 = vld1q_u64((const uint64_t *)(buf + 0x10));
+    x3 = vld1q_u64((const uint64_t *)(buf + 0x20));
+    x4 = vld1q_u64((const uint64_t *)(buf + 0x30));
+
+    x1 = veorq_u64(x1, (uint64x2_t) vsetq_lane_u32(crc, vdupq_n_u32(0), 0));
+
+    x0 = vld1q_u64(k1k2);
+
+    buf += 64;
+    len -= 64;
+
+    /*
+     * Parallel fold blocks of 64, if any.
+     */
+    while (len >= 64)
+    {
+        x5 = (uint64x2_t) pmull_lo(x1, x0);
+        x6 = (uint64x2_t) pmull_lo(x2, x0);
+        x7 = (uint64x2_t) pmull_lo(x3, x0);
+        x8 = (uint64x2_t) pmull_lo(x4, x0);
+
+        y5 = vld1q_u64((const uint64_t *)(buf + 0x00));
+        y6 = vld1q_u64((const uint64_t *)(buf + 0x10));
+        y7 = vld1q_u64((const uint64_t *)(buf + 0x20));
+        y8 = vld1q_u64((const uint64_t *)(buf + 0x30));
+
+        x1 = (uint64x2_t) pmull_hi(x1, x0);
+        x2 = (uint64x2_t) pmull_hi(x2, x0);
+        x3 = (uint64x2_t) pmull_hi(x3, x0);
+        x4 = (uint64x2_t) pmull_hi(x4, x0);
+
+        x1 = veorq_u64(x1, x5);
+        x2 = veorq_u64(x2, x6);
+        x3 = veorq_u64(x3, x7);
+        x4 = veorq_u64(x4, x8);
+
+        x1 = veorq_u64(x1, y5);
+        x2 = veorq_u64(x2, y6);
+        x3 = veorq_u64(x3, y7);
+        x4 = veorq_u64(x4, y8);
+
+        buf += 64;
+        len -= 64;
+    }
+
+    /*
+     * Fold into 128-bits.
+     */
+    x0 = vld1q_u64(k3k4);
+
+    x5 = (uint64x2_t) pmull_lo(x1, x0);
+    x1 = (uint64x2_t) pmull_hi(x1, x0);
+    x1 = veorq_u64(x1, x2);
+    x1 = veorq_u64(x1, x5);
+
+    x5 = (uint64x2_t) pmull_lo(x1, x0);
+    x1 = (uint64x2_t) pmull_hi(x1, x0);
+    x1 = veorq_u64(x1, x3);
+    x1 = veorq_u64(x1, x5);
+
+    x5 = (uint64x2_t) pmull_lo(x1, x0);
+    x1 = (uint64x2_t) pmull_hi(x1, x0);
+    x1 = veorq_u64(x1, x4);
+    x1 = veorq_u64(x1, x5);
+
+    /*
+     * Single fold blocks of 16, if any.
+     */
+    while (len >= 16)
+    {
+        x2 = vld1q_u64((const uint64_t *)buf);
+
+        x5 = (uint64x2_t) pmull_lo(x1, x0);
+        x1 = (uint64x2_t) pmull_hi(x1, x0);
+        x1 = veorq_u64(x1, x2);
+        x1 = veorq_u64(x1, x5);
+
+        buf += 16;
+        len -= 16;
+    }
+
+    /*
+     * Fold 128-bits to 64-bits.
+     */
+    static uint32_t zalign(16) mask[] = { ~0u, 0u, ~0u, 0u };
+
+    x2 = (uint64x2_t) pmull_01(x1, x0);
+    x1 = (uint64x2_t) vextq_u8(vreinterpretq_u8_u64(x1), vdupq_n_u8(0), 8);
+    x3 = (uint64x2_t) vld1q_u32(mask);
+    x1 = veorq_u64(x1, x2);
+
+    x0 = vld1q_u64(k5k0);
+
+    x2 = (uint64x2_t) pmull_01(x2, x0);
+    x2 = (uint64x2_t) vextq_u8(vreinterpretq_u8_u64(x1), vdupq_n_u8(0), 4);
+    x1 = vandq_u64(x1, x3);
+    x1 = (uint64x2_t) pmull_lo(x1, x0);
+    x1 = veorq_u64(x1, x2);
+
+    /*
+     * Barret reduce to 32-bits.
+     */
+    x0 = vld1q_u64(poly);
+
+    x2 = vandq_u64(x1, x3);
+    x2 = (uint64x2_t) pmull_01(x2, x0);
+    x2 = vandq_u64(x2, x3);
+    x2 = (uint64x2_t) pmull_lo(x2, x0);
+    x1 = veorq_u64(x1, x2);
+
+    /*
+     * Return the crc32.
+     */
+    return vgetq_lane_u32(vreinterpretq_u32_u64(x1), 1);
+}
+#endif /* aarch64 specific code. */
+
+#endif
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/crc32_simd.h b/extern/crashpad/crashpad/third_party/zlib/zlib/crc32_simd.h
new file mode 100644
index 0000000000..84624647bc
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/crc32_simd.h
@@ -0,0 +1,57 @@
+/* crc32_simd.h
+ *
+ * Copyright 2017 The Chromium Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the Chromium source repository LICENSE file.
+ */
+
+#include <stdint.h>
+
+#include "zconf.h"
+#include "zutil.h"
+#include "deflate.h"
+
+/*
+ * crc32_sse42_simd_(): compute the crc32 of the buffer, where the buffer
+ * length must be at least 64, and a multiple of 16.
+ */
+uint32_t ZLIB_INTERNAL crc32_sse42_simd_(const unsigned char* buf,
+                                         z_size_t len,
+                                         uint32_t crc);
+
+uint32_t ZLIB_INTERNAL crc32_avx512_simd_(const unsigned char* buf,
+                                          z_size_t len,
+                                          uint32_t crc);
+
+/*
+ * crc32_sse42_simd_ buffer size constraints: see the use in zlib/crc32.c
+ * for computing the crc32 of an arbitrary length buffer.
+ */
+#define Z_CRC32_SSE42_MINIMUM_LENGTH 64
+#define Z_CRC32_SSE42_CHUNKSIZE_MASK 15
+#define Z_CRC32_AVX512_MINIMUM_LENGTH 256
+#define Z_CRC32_AVX512_CHUNKSIZE_MASK 63
+
+/*
+ * CRC32 checksums using ARMv8-a crypto instructions.
+ */
+uint32_t ZLIB_INTERNAL armv8_crc32_little(const unsigned char* buf,
+                                          z_size_t len,
+                                          uint32_t crc);
+
+/* aarch64 specific code. */
+#if defined(__aarch64__)
+
+/* 128 is the sweet spot at the time of coding (late 2020). */
+#define Z_CRC32_PMULL_MINIMUM_LENGTH 128
+#define Z_CRC32_PMULL_CHUNKSIZE_MASK 15
+
+/*
+ * CRC32 checksums using ARMv8-a PMULL instructions, where the buffer
+ * length must be at least 64, and a multiple of 16.
+ */
+uint32_t ZLIB_INTERNAL armv8_crc32_pmull_little(const unsigned char* buf,
+                                                z_size_t len,
+                                                uint32_t crc);
+
+#endif
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/crc_folding.c b/extern/crashpad/crashpad/third_party/zlib/zlib/crc_folding.c
index 48d77744aa..1b4f4e1d19 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/crc_folding.c
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/crc_folding.c
@@ -18,6 +18,8 @@
 
 #include "deflate.h"
 
+#ifdef CRC32_SIMD_SSE42_PCLMUL
+
 #include <inttypes.h>
 #include <emmintrin.h>
 #include <immintrin.h>
@@ -283,7 +285,7 @@ ZLIB_INTERNAL void crc_fold_copy(deflate_state *const s,
         goto partial;
     }
 
-    algn_diff = 0 - (uintptr_t)src & 0xF;
+    algn_diff = (0 - (uintptr_t)src) & 0xF;
     if (algn_diff) {
         xmm_crc_part = _mm_loadu_si128((__m128i *)src);
         _mm_storeu_si128((__m128i *)dst, xmm_crc_part);
@@ -433,7 +435,10 @@ unsigned ZLIB_INTERNAL crc_fold_512to32(deflate_state *const s)
     unsigned crc;
     __m128i x_tmp0, x_tmp1, x_tmp2, crc_fold;
 
-    CRC_LOAD(s)
+    __m128i xmm_crc0 = _mm_loadu_si128((__m128i *)s->crc0 + 0);
+    __m128i xmm_crc1 = _mm_loadu_si128((__m128i *)s->crc0 + 1);
+    __m128i xmm_crc2 = _mm_loadu_si128((__m128i *)s->crc0 + 2);
+    __m128i xmm_crc3 = _mm_loadu_si128((__m128i *)s->crc0 + 3);
 
     /*
      * k1
@@ -489,5 +494,6 @@ unsigned ZLIB_INTERNAL crc_fold_512to32(deflate_state *const s)
 
     crc = _mm_extract_epi32(xmm_crc3, 2);
     return ~crc;
-    CRC_SAVE(s)
 }
+
+#endif  /* CRC32_SIMD_SSE42_PCLMUL */
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/deflate.c b/extern/crashpad/crashpad/third_party/zlib/zlib/deflate.c
index aa0c9c67a6..173ce596be 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/deflate.c
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/deflate.c
@@ -1,5 +1,5 @@
 /* deflate.c -- compress data using the deflation algorithm
- * Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
+ * Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -50,10 +50,22 @@
 /* @(#) $Id$ */
 #include <assert.h>
 #include "deflate.h"
-#include "x86.h"
+
+#include "cpu_features.h"
+
+#if defined(DEFLATE_SLIDE_HASH_SSE2) || defined(DEFLATE_SLIDE_HASH_NEON)
+#include "slide_hash_simd.h"
+#endif
+
+#include "contrib/optimizations/insert_string.h"
+
+#ifdef FASTEST
+/* See http://crbug.com/1113596 */
+#error "FASTEST is not supported in Chromium's zlib."
+#endif
 
 const char deflate_copyright[] =
-   " deflate 1.2.11 Copyright 1995-2017 Jean-loup Gailly and Mark Adler ";
+   " deflate 1.2.13.1 Copyright 1995-2022 Jean-loup Gailly and Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -61,9 +73,6 @@ const char deflate_copyright[] =
   copyright string in the executable of your product.
  */
 
-/* ===========================================================================
- *  Function prototypes.
- */
 typedef enum {
     need_more,      /* block not completed, need more input or more output */
     block_done,     /* block flush performed */
@@ -71,50 +80,22 @@ typedef enum {
     finish_done     /* finish done, accept no more input or output */
 } block_state;
 
-typedef block_state (*compress_func) OF((deflate_state *s, int flush));
+typedef block_state (*compress_func)(deflate_state *s, int flush);
 /* Compression function. Returns the block state after the call. */
 
-local int deflateStateCheck      OF((z_streamp strm));
-local void slide_hash     OF((deflate_state *s));
-local void fill_window    OF((deflate_state *s));
-local block_state deflate_stored OF((deflate_state *s, int flush));
-local block_state deflate_fast   OF((deflate_state *s, int flush));
+local block_state deflate_stored(deflate_state *s, int flush);
+local block_state deflate_fast(deflate_state *s, int flush);
 #ifndef FASTEST
-local block_state deflate_slow   OF((deflate_state *s, int flush));
-#endif
-local block_state deflate_rle    OF((deflate_state *s, int flush));
-local block_state deflate_huff   OF((deflate_state *s, int flush));
-local void lm_init        OF((deflate_state *s));
-local void putShortMSB    OF((deflate_state *s, uInt b));
-local void flush_pending  OF((z_streamp strm));
-unsigned ZLIB_INTERNAL read_buf OF((z_streamp strm, Bytef *buf, unsigned size));
-#ifdef ASMV
-#  pragma message("Assembler code may have bugs -- use at your own risk")
-      void match_init OF((void)); /* asm code initialization */
-      uInt longest_match  OF((deflate_state *s, IPos cur_match));
-#else
-local uInt longest_match  OF((deflate_state *s, IPos cur_match));
-#endif
-
-#ifdef ZLIB_DEBUG
-local  void check_match OF((deflate_state *s, IPos start, IPos match,
-                            int length));
+local block_state deflate_slow(deflate_state *s, int flush);
 #endif
+local block_state deflate_rle(deflate_state *s, int flush);
+local block_state deflate_huff(deflate_state *s, int flush);
 
 /* From crc32.c */
 extern void ZLIB_INTERNAL crc_reset(deflate_state *const s);
 extern void ZLIB_INTERNAL crc_finalize(deflate_state *const s);
 extern void ZLIB_INTERNAL copy_with_crc(z_streamp strm, Bytef *dst, long size);
 
-#ifdef _MSC_VER
-#define INLINE __inline
-#else
-#define INLINE inline
-#endif
-
-/* Inline optimisation */
-local INLINE Pos insert_string_sse(deflate_state *const s, const Pos str);
-
 /* ===========================================================================
  * Local data
  */
@@ -169,63 +150,30 @@ local const config configuration_table[10] = {
 /* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */
 #define RANK(f) (((f) * 2) - ((f) > 4 ? 9 : 0))
 
-/* ===========================================================================
- * Update a hash value with the given input byte
- * IN  assertion: all calls to UPDATE_HASH are made with consecutive input
- *    characters, so that a running hash key can be computed from the previous
- *    key instead of complete recalculation each time.
- */
-#define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)
-
-/* ===========================================================================
- * Insert string str in the dictionary and set match_head to the previous head
- * of the hash chain (the most recent string with same hash key). Return
- * the previous length of the hash chain.
- * If this file is compiled with -DFASTEST, the compression level is forced
- * to 1, and no hash chains are maintained.
- * IN  assertion: all calls to INSERT_STRING are made with consecutive input
- *    characters and the first MIN_MATCH bytes of str are valid (except for
- *    the last MIN_MATCH-1 bytes of the input file).
- */
-local INLINE Pos insert_string_c(deflate_state *const s, const Pos str)
-{
-    Pos ret;
-
-    UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]);
-#ifdef FASTEST
-    ret = s->head[s->ins_h];
-#else
-    ret = s->prev[str & s->w_mask] = s->head[s->ins_h];
-#endif
-    s->head[s->ins_h] = str;
-
-    return ret;
-}
-
-local INLINE Pos insert_string(deflate_state *const s, const Pos str)
-{
-    if (x86_cpu_enable_simd)
-        return insert_string_sse(s, str);
-    return insert_string_c(s, str);
-}
-
-
 /* ===========================================================================
  * Initialize the hash table (avoiding 64K overflow for 16 bit systems).
  * prev[] will be initialized on the fly.
+ * TODO(cavalcantii): optimization opportunity, check comments on:
+ * https://chromium-review.googlesource.com/c/chromium/src/+/3561506/
  */
 #define CLEAR_HASH(s) \
-    s->head[s->hash_size-1] = NIL; \
-    zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
+    do { \
+        s->head[s->hash_size - 1] = NIL; \
+        zmemzero((Bytef *)s->head, \
+                 (unsigned)(s->hash_size - 1)*sizeof(*s->head)); \
+    } while (0)
 
 /* ===========================================================================
  * Slide the hash table when sliding the window down (could be avoided with 32
  * bit values at the expense of memory usage). We slide even when level == 0 to
  * keep the hash table consistent if we switch back to level > 0 later.
  */
-local void slide_hash(s)
-    deflate_state *s;
-{
+local void slide_hash(deflate_state *s) {
+#if defined(DEFLATE_SLIDE_HASH_SSE2) || defined(DEFLATE_SLIDE_HASH_NEON)
+    slide_hash_simd(s->head, s->prev, s->w_size, s->hash_size);
+    return;
+#endif
+
     unsigned n, m;
     Posf *p;
     uInt wsize = s->w_size;
@@ -249,41 +197,207 @@ local void slide_hash(s)
 #endif
 }
 
+/* ===========================================================================
+ * Read a new buffer from the current input stream, update the adler32
+ * and total number of bytes read.  All deflate() input goes through
+ * this function so some applications may wish to modify it to avoid
+ * allocating a large strm->next_in buffer and copying from it.
+ * (See also flush_pending()).
+ */
+local unsigned read_buf(z_streamp strm, Bytef *buf, unsigned size) {
+    unsigned len = strm->avail_in;
+
+    if (len > size) len = size;
+    if (len == 0) return 0;
+
+    strm->avail_in  -= len;
+
+    /* TODO(cavalcantii): verify if we can remove 'copy_with_crc', it is legacy
+     * of the Intel optimizations dating back to 2015.
+     */
+#ifdef GZIP
+    if (strm->state->wrap == 2)
+        copy_with_crc(strm, buf, len);
+    else
+#endif
+    {
+        zmemcpy(buf, strm->next_in, len);
+        if (strm->state->wrap == 1)
+            strm->adler = adler32(strm->adler, buf, len);
+    }
+    strm->next_in  += len;
+    strm->total_in += len;
+
+    return len;
+}
+
+/* ===========================================================================
+ * Fill the window when the lookahead becomes insufficient.
+ * Updates strstart and lookahead.
+ *
+ * IN assertion: lookahead < MIN_LOOKAHEAD
+ * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD
+ *    At least one byte has been read, or avail_in == 0; reads are
+ *    performed for at least two bytes (required for the zip translate_eol
+ *    option -- not supported here).
+ */
+local void fill_window(deflate_state *s) {
+    unsigned n;
+    unsigned more;    /* Amount of free space at the end of the window. */
+    uInt wsize = s->w_size;
+
+    Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead");
+
+    do {
+        more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
+
+        /* Deal with !@#$% 64K limit: */
+        if (sizeof(int) <= 2) {
+            if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
+                more = wsize;
+
+            } else if (more == (unsigned)(-1)) {
+                /* Very unlikely, but possible on 16 bit machine if
+                 * strstart == 0 && lookahead == 1 (input done a byte at time)
+                 */
+                more--;
+            }
+        }
+
+        /* If the window is almost full and there is insufficient lookahead,
+         * move the upper half to the lower one to make room in the upper half.
+         */
+        if (s->strstart >= wsize + MAX_DIST(s)) {
+
+            zmemcpy(s->window, s->window + wsize, (unsigned)wsize - more);
+            s->match_start -= wsize;
+            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
+            s->block_start -= (long) wsize;
+            if (s->insert > s->strstart)
+                s->insert = s->strstart;
+            slide_hash(s);
+            more += wsize;
+        }
+        if (s->strm->avail_in == 0) break;
+
+        /* If there was no sliding:
+         *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
+         *    more == window_size - lookahead - strstart
+         * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
+         * => more >= window_size - 2*WSIZE + 2
+         * In the BIG_MEM or MMAP case (not yet supported),
+         *   window_size == input_size + MIN_LOOKAHEAD  &&
+         *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
+         * Otherwise, window_size == 2*WSIZE so more >= 2.
+         * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
+         */
+        Assert(more >= 2, "more < 2");
+
+        n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
+        s->lookahead += n;
+
+        /* Initialize the hash value now that we have some input: */
+        if (s->chromium_zlib_hash) {
+            /* chromium hash reads 4 bytes */
+            if (s->lookahead + s->insert > MIN_MATCH) {
+                uInt str = s->strstart - s->insert;
+                while (s->insert) {
+                    insert_string(s, str);
+                    str++;
+                    s->insert--;
+                    if (s->lookahead + s->insert <= MIN_MATCH)
+                        break;
+                }
+            }
+        } else
+        /* Initialize the hash value now that we have some input: */
+        if (s->lookahead + s->insert >= MIN_MATCH) {
+            uInt str = s->strstart - s->insert;
+            s->ins_h = s->window[str];
+            UPDATE_HASH(s, s->ins_h, s->window[str + 1]);
+#if MIN_MATCH != 3
+            Call UPDATE_HASH() MIN_MATCH-3 more times
+#endif
+            while (s->insert) {
+                UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
+#ifndef FASTEST
+                s->prev[str & s->w_mask] = s->head[s->ins_h];
+#endif
+                s->head[s->ins_h] = (Pos)str;
+                str++;
+                s->insert--;
+                if (s->lookahead + s->insert < MIN_MATCH)
+                    break;
+            }
+        }
+        /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
+         * but this is not important since only literal bytes will be emitted.
+         */
+
+    } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
+
+    /* If the WIN_INIT bytes after the end of the current data have never been
+     * written, then zero those bytes in order to avoid memory check reports of
+     * the use of uninitialized (or uninitialised as Julian writes) bytes by
+     * the longest match routines.  Update the high water mark for the next
+     * time through here.  WIN_INIT is set to MAX_MATCH since the longest match
+     * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead.
+     */
+    if (s->high_water < s->window_size) {
+        ulg curr = s->strstart + (ulg)(s->lookahead);
+        ulg init;
+
+        if (s->high_water < curr) {
+            /* Previous high water mark below current data -- zero WIN_INIT
+             * bytes or up to end of window, whichever is less.
+             */
+            init = s->window_size - curr;
+            if (init > WIN_INIT)
+                init = WIN_INIT;
+            zmemzero(s->window + curr, (unsigned)init);
+            s->high_water = curr + init;
+        }
+        else if (s->high_water < (ulg)curr + WIN_INIT) {
+            /* High water mark at or above current data, but below current data
+             * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up
+             * to end of window, whichever is less.
+             */
+            init = (ulg)curr + WIN_INIT - s->high_water;
+            if (init > s->window_size - s->high_water)
+                init = s->window_size - s->high_water;
+            zmemzero(s->window + s->high_water, (unsigned)init);
+            s->high_water += init;
+        }
+    }
+
+    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
+           "not enough room for search");
+}
+
 /* ========================================================================= */
-int ZEXPORT deflateInit_(strm, level, version, stream_size)
-    z_streamp strm;
-    int level;
-    const char *version;
-    int stream_size;
-{
+int ZEXPORT deflateInit_(z_streamp strm, int level, const char *version,
+                         int stream_size) {
     return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL,
                          Z_DEFAULT_STRATEGY, version, stream_size);
     /* To do: ignore strm->next_in if we use it as window */
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
-                  version, stream_size)
-    z_streamp strm;
-    int  level;
-    int  method;
-    int  windowBits;
-    int  memLevel;
-    int  strategy;
-    const char *version;
-    int stream_size;
-{
+int ZEXPORT deflateInit2_(z_streamp strm, int level, int method,
+                          int windowBits, int memLevel, int strategy,
+                          const char *version, int stream_size) {
     unsigned window_padding = 8;
     deflate_state *s;
     int wrap = 1;
     static const char my_version[] = ZLIB_VERSION;
 
-    ushf *overlay;
-    /* We overlay pending_buf and d_buf+l_buf. This works since the average
-     * output size for (length,distance) codes is <= 24 bits.
-     */
-
-    x86_check_features();
+    // Needed to activate optimized insert_string() that helps compression
+    // for all wrapper formats (e.g. RAW, ZLIB, GZIP).
+    // Feature detection is not triggered while using RAW mode (i.e. we never
+    // call crc32() with a NULL buffer).
+#if defined(CRC32_ARMV8_CRC32) || defined(CRC32_SIMD_SSE42_PCLMUL)
+    cpu_check_features();
+#endif
 
     if (version == Z_NULL || version[0] != my_version[0] ||
         stream_size != sizeof(z_stream)) {
@@ -315,6 +429,8 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
 
     if (windowBits < 0) { /* suppress zlib wrapper */
         wrap = 0;
+        if (windowBits < -15)
+            return Z_STREAM_ERROR;
         windowBits = -windowBits;
     }
 #ifdef GZIP
@@ -341,29 +457,77 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
     s->w_size = 1 << s->w_bits;
     s->w_mask = s->w_size - 1;
 
-    if (x86_cpu_enable_simd) {
+    s->chromium_zlib_hash = 1;
+#if defined(USE_ZLIB_RABIN_KARP_ROLLING_HASH)
+    s->chromium_zlib_hash = 0;
+#endif
+
+    s->hash_bits = memLevel + 7;
+    if (s->chromium_zlib_hash && s->hash_bits < 15) {
         s->hash_bits = 15;
-    } else {
-        s->hash_bits = memLevel + 7;
     }
 
     s->hash_size = 1 << s->hash_bits;
     s->hash_mask = s->hash_size - 1;
-    s->hash_shift =  ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);
+    s->hash_shift =  ((s->hash_bits + MIN_MATCH-1) / MIN_MATCH);
 
     s->window = (Bytef *) ZALLOC(strm,
                                  s->w_size + window_padding,
                                  2*sizeof(Byte));
+    /* Avoid use of unitialized values in the window, see crbug.com/1137613 and
+     * crbug.com/1144420 */
+    zmemzero(s->window, (s->w_size + window_padding) * (2 * sizeof(Byte)));
     s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));
+    /* Avoid use of uninitialized value, see:
+     * https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11360
+     */
+    zmemzero(s->prev, s->w_size * sizeof(Pos));
     s->head   = (Posf *)  ZALLOC(strm, s->hash_size, sizeof(Pos));
 
     s->high_water = 0;      /* nothing written to s->window yet */
 
     s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
 
-    overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
-    s->pending_buf = (uchf *) overlay;
-    s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);
+    /* We overlay pending_buf and sym_buf. This works since the average size
+     * for length/distance pairs over any compressed block is assured to be 31
+     * bits or less.
+     *
+     * Analysis: The longest fixed codes are a length code of 8 bits plus 5
+     * extra bits, for lengths 131 to 257. The longest fixed distance codes are
+     * 5 bits plus 13 extra bits, for distances 16385 to 32768. The longest
+     * possible fixed-codes length/distance pair is then 31 bits total.
+     *
+     * sym_buf starts one-fourth of the way into pending_buf. So there are
+     * three bytes in sym_buf for every four bytes in pending_buf. Each symbol
+     * in sym_buf is three bytes -- two for the distance and one for the
+     * literal/length. As each symbol is consumed, the pointer to the next
+     * sym_buf value to read moves forward three bytes. From that symbol, up to
+     * 31 bits are written to pending_buf. The closest the written pending_buf
+     * bits gets to the next sym_buf symbol to read is just before the last
+     * code is written. At that time, 31*(n - 2) bits have been written, just
+     * after 24*(n - 2) bits have been consumed from sym_buf. sym_buf starts at
+     * 8*n bits into pending_buf. (Note that the symbol buffer fills when n - 1
+     * symbols are written.) The closest the writing gets to what is unread is
+     * then n + 14 bits. Here n is lit_bufsize, which is 16384 by default, and
+     * can range from 128 to 32768.
+     *
+     * Therefore, at a minimum, there are 142 bits of space between what is
+     * written and what is read in the overlain buffers, so the symbols cannot
+     * be overwritten by the compressed data. That space is actually 139 bits,
+     * due to the three-bit fixed-code block header.
+     *
+     * That covers the case where either Z_FIXED is specified, forcing fixed
+     * codes, or when the use of fixed codes is chosen, because that choice
+     * results in a smaller compressed block than dynamic codes. That latter
+     * condition then assures that the above analysis also covers all dynamic
+     * blocks. A dynamic-code block will only be chosen to be emitted if it has
+     * fewer bits than a fixed-code block would for the same set of symbols.
+     * Therefore its average symbol length is assured to be less than 31. So
+     * the compressed data for a dynamic block also cannot overwrite the
+     * symbols from which it is being constructed.
+     */
+    s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, 4);
+    s->pending_buf_size = (ulg)s->lit_bufsize * 4;
 
     if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
         s->pending_buf == Z_NULL) {
@@ -372,8 +536,12 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
         deflateEnd (strm);
         return Z_MEM_ERROR;
     }
-    s->d_buf = overlay + s->lit_bufsize/sizeof(ush);
-    s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;
+    s->sym_buf = s->pending_buf + s->lit_bufsize;
+    s->sym_end = (s->lit_bufsize - 1) * 3;
+    /* We avoid equality with lit_bufsize*3 because of wraparound at 64K
+     * on 16 bit machines and because stored blocks are restricted to
+     * 64K-1 bytes.
+     */
 
     s->level = level;
     s->strategy = strategy;
@@ -385,9 +553,7 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
 /* =========================================================================
  * Check for a valid deflate stream state. Return 0 if ok, 1 if not.
  */
-local int deflateStateCheck (strm)
-    z_streamp strm;
-{
+local int deflateStateCheck(z_streamp strm) {
     deflate_state *s;
     if (strm == Z_NULL ||
         strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0)
@@ -408,11 +574,8 @@ local int deflateStateCheck (strm)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
-    z_streamp strm;
-    const Bytef *dictionary;
-    uInt  dictLength;
-{
+int ZEXPORT deflateSetDictionary(z_streamp strm, const Bytef *dictionary,
+                                 uInt  dictLength) {
     deflate_state *s;
     uInt str, n;
     int wrap;
@@ -473,11 +636,8 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateGetDictionary (strm, dictionary, dictLength)
-    z_streamp strm;
-    Bytef *dictionary;
-    uInt  *dictLength;
-{
+int ZEXPORT deflateGetDictionary(z_streamp strm, Bytef *dictionary,
+                                 uInt *dictLength) {
     deflate_state *s;
     uInt len;
 
@@ -495,9 +655,7 @@ int ZEXPORT deflateGetDictionary (strm, dictionary, dictLength)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateResetKeep (strm)
-    z_streamp strm;
-{
+int ZEXPORT deflateResetKeep(z_streamp strm) {
     deflate_state *s;
 
     if (deflateStateCheck(strm)) {
@@ -519,23 +677,45 @@ int ZEXPORT deflateResetKeep (strm)
 #ifdef GZIP
         s->wrap == 2 ? GZIP_STATE :
 #endif
-        s->wrap ? INIT_STATE : BUSY_STATE;
+        INIT_STATE;
     strm->adler =
 #ifdef GZIP
         s->wrap == 2 ? crc32(0L, Z_NULL, 0) :
 #endif
         adler32(0L, Z_NULL, 0);
-    s->last_flush = Z_NO_FLUSH;
+    s->last_flush = -2;
 
     _tr_init(s);
 
     return Z_OK;
 }
 
+/* ===========================================================================
+ * Initialize the "longest match" routines for a new zlib stream
+ */
+local void lm_init(deflate_state *s) {
+    s->window_size = (ulg)2L*s->w_size;
+
+    CLEAR_HASH(s);
+
+    /* Set the default configuration parameters:
+     */
+    s->max_lazy_match   = configuration_table[s->level].max_lazy;
+    s->good_match       = configuration_table[s->level].good_length;
+    s->nice_match       = configuration_table[s->level].nice_length;
+    s->max_chain_length = configuration_table[s->level].max_chain;
+
+    s->strstart = 0;
+    s->block_start = 0L;
+    s->lookahead = 0;
+    s->insert = 0;
+    s->match_length = s->prev_length = MIN_MATCH-1;
+    s->match_available = 0;
+    s->ins_h = 0;
+}
+
 /* ========================================================================= */
-int ZEXPORT deflateReset (strm)
-    z_streamp strm;
-{
+int ZEXPORT deflateReset(z_streamp strm) {
     int ret;
 
     ret = deflateResetKeep(strm);
@@ -545,10 +725,7 @@ int ZEXPORT deflateReset (strm)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateSetHeader (strm, head)
-    z_streamp strm;
-    gz_headerp head;
-{
+int ZEXPORT deflateSetHeader(z_streamp strm, gz_headerp head) {
     if (deflateStateCheck(strm) || strm->state->wrap != 2)
         return Z_STREAM_ERROR;
     strm->state->gzhead = head;
@@ -556,11 +733,7 @@ int ZEXPORT deflateSetHeader (strm, head)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflatePending (strm, pending, bits)
-    unsigned *pending;
-    int *bits;
-    z_streamp strm;
-{
+int ZEXPORT deflatePending(z_streamp strm, unsigned *pending, int *bits) {
     if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
     if (pending != Z_NULL)
         *pending = strm->state->pending;
@@ -570,17 +743,14 @@ int ZEXPORT deflatePending (strm, pending, bits)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflatePrime (strm, bits, value)
-    z_streamp strm;
-    int bits;
-    int value;
-{
+int ZEXPORT deflatePrime(z_streamp strm, int bits, int value) {
     deflate_state *s;
     int put;
 
     if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
     s = strm->state;
-    if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3))
+    if (bits < 0 || bits > 16 ||
+        s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3))
         return Z_BUF_ERROR;
     do {
         put = Buf_size - s->bi_valid;
@@ -596,11 +766,7 @@ int ZEXPORT deflatePrime (strm, bits, value)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateParams(strm, level, strategy)
-    z_streamp strm;
-    int level;
-    int strategy;
-{
+int ZEXPORT deflateParams(z_streamp strm, int level, int strategy) {
     deflate_state *s;
     compress_func func;
 
@@ -618,12 +784,12 @@ int ZEXPORT deflateParams(strm, level, strategy)
     func = configuration_table[s->level].func;
 
     if ((strategy != s->strategy || func != configuration_table[level].func) &&
-        s->high_water) {
+        s->last_flush != -2) {
         /* Flush the last buffer: */
         int err = deflate(strm, Z_BLOCK);
         if (err == Z_STREAM_ERROR)
             return err;
-        if (strm->avail_out == 0)
+        if (strm->avail_in || (s->strstart - s->block_start) + s->lookahead)
             return Z_BUF_ERROR;
     }
     if (s->level != level) {
@@ -645,13 +811,8 @@ int ZEXPORT deflateParams(strm, level, strategy)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain)
-    z_streamp strm;
-    int good_length;
-    int max_lazy;
-    int nice_length;
-    int max_chain;
-{
+int ZEXPORT deflateTune(z_streamp strm, int good_length, int max_lazy,
+                        int nice_length, int max_chain) {
     deflate_state *s;
 
     if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
@@ -664,36 +825,47 @@ int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain)
 }
 
 /* =========================================================================
- * For the default windowBits of 15 and memLevel of 8, this function returns
- * a close to exact, as well as small, upper bound on the compressed size.
- * They are coded as constants here for a reason--if the #define's are
- * changed, then this function needs to be changed as well.  The return
- * value for 15 and 8 only works for those exact settings.
+ * For the default windowBits of 15 and memLevel of 8, this function returns a
+ * close to exact, as well as small, upper bound on the compressed size. This
+ * is an expansion of ~0.03%, plus a small constant.
+ *
+ * For any setting other than those defaults for windowBits and memLevel, one
+ * of two worst case bounds is returned. This is at most an expansion of ~4% or
+ * ~13%, plus a small constant.
+ *
+ * Both the 0.03% and 4% derive from the overhead of stored blocks. The first
+ * one is for stored blocks of 16383 bytes (memLevel == 8), whereas the second
+ * is for stored blocks of 127 bytes (the worst case memLevel == 1). The
+ * expansion results from five bytes of header for each stored block.
  *
- * For any setting other than those defaults for windowBits and memLevel,
- * the value returned is a conservative worst case for the maximum expansion
- * resulting from using fixed blocks instead of stored blocks, which deflate
- * can emit on compressed data for some combinations of the parameters.
+ * The larger expansion of 13% results from a window size less than or equal to
+ * the symbols buffer size (windowBits <= memLevel + 7). In that case some of
+ * the data being compressed may have slid out of the sliding window, impeding
+ * a stored block from being emitted. Then the only choice is a fixed or
+ * dynamic block, where a fixed block limits the maximum expansion to 9 bits
+ * per 8-bit byte, plus 10 bits for every block. The smallest block size for
+ * which this can occur is 255 (memLevel == 2).
  *
- * This function could be more sophisticated to provide closer upper bounds for
- * every combination of windowBits and memLevel.  But even the conservative
- * upper bound of about 14% expansion does not seem onerous for output buffer
- * allocation.
+ * Shifts are used to approximate divisions, for speed.
  */
-uLong ZEXPORT deflateBound(strm, sourceLen)
-    z_streamp strm;
-    uLong sourceLen;
-{
+uLong ZEXPORT deflateBound(z_streamp strm, uLong sourceLen) {
     deflate_state *s;
-    uLong complen, wraplen;
+    uLong fixedlen, storelen, wraplen;
 
-    /* conservative upper bound for compressed data */
-    complen = sourceLen +
-              ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5;
+    /* upper bound for fixed blocks with 9-bit literals and length 255
+       (memLevel == 2, which is the lowest that may not use stored blocks) --
+       ~13% overhead plus a small constant */
+    fixedlen = sourceLen + (sourceLen >> 3) + (sourceLen >> 8) +
+               (sourceLen >> 9) + 4;
 
-    /* if can't get parameters, return conservative bound plus zlib wrapper */
+    /* upper bound for stored blocks with length 127 (memLevel == 1) --
+       ~4% overhead plus a small constant */
+    storelen = sourceLen + (sourceLen >> 5) + (sourceLen >> 7) +
+               (sourceLen >> 11) + 7;
+
+    /* if can't get parameters, return larger bound plus a zlib wrapper */
     if (deflateStateCheck(strm))
-        return complen + 6;
+        return (fixedlen > storelen ? fixedlen : storelen) + 6;
 
     /* compute wrapper length */
     s = strm->state;
@@ -730,11 +902,13 @@ uLong ZEXPORT deflateBound(strm, sourceLen)
         wraplen = 6;
     }
 
-    /* if not default parameters, return conservative bound */
+    /* if not default parameters, return one of the conservative bounds */
     if (s->w_bits != 15 || s->hash_bits != 8 + 7)
-        return complen + wraplen;
+        return (s->w_bits <= s->hash_bits && s->level ? fixedlen : storelen) +
+               wraplen;
 
-    /* default settings: return tight bound for that case */
+    /* default settings: return tight bound for that case -- ~0.03% overhead
+       plus a small constant */
     return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
            (sourceLen >> 25) + 13 - 6 + wraplen;
 }
@@ -744,10 +918,7 @@ uLong ZEXPORT deflateBound(strm, sourceLen)
  * IN assertion: the stream state is correct and there is enough room in
  * pending_buf.
  */
-local void putShortMSB (s, b)
-    deflate_state *s;
-    uInt b;
-{
+local void putShortMSB(deflate_state *s, uInt b) {
     put_byte(s, (Byte)(b >> 8));
     put_byte(s, (Byte)(b & 0xff));
 }
@@ -758,9 +929,7 @@ local void putShortMSB (s, b)
  * applications may wish to modify it to avoid allocating a large
  * strm->next_out buffer and copying into it. (See also read_buf()).
  */
-local void flush_pending(strm)
-    z_streamp strm;
-{
+local void flush_pending(z_streamp strm) {
     unsigned len;
     deflate_state *s = strm->state;
 
@@ -791,10 +960,7 @@ local void flush_pending(strm)
     } while (0)
 
 /* ========================================================================= */
-int ZEXPORT deflate (strm, flush)
-    z_streamp strm;
-    int flush;
-{
+int ZEXPORT deflate(z_streamp strm, int flush) {
     int old_flush; /* value of flush param for previous deflate call */
     deflate_state *s;
 
@@ -842,9 +1008,11 @@ int ZEXPORT deflate (strm, flush)
     }
 
     /* Write the header */
+    if (s->status == INIT_STATE && s->wrap == 0)
+        s->status = BUSY_STATE;
     if (s->status == INIT_STATE) {
         /* zlib header */
-        uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;
+        uInt header = (Z_DEFLATED + ((s->w_bits - 8) << 4)) << 8;
         uInt level_flags;
 
         if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2)
@@ -1105,9 +1273,7 @@ int ZEXPORT deflate (strm, flush)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateEnd (strm)
-    z_streamp strm;
-{
+int ZEXPORT deflateEnd(z_streamp strm) {
     int status;
 
     if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
@@ -1131,16 +1297,14 @@ int ZEXPORT deflateEnd (strm)
  * To simplify the source, this is not supported for 16-bit MSDOS (which
  * doesn't have enough memory anyway to duplicate compression states).
  */
-int ZEXPORT deflateCopy (dest, source)
-    z_streamp dest;
-    z_streamp source;
-{
+int ZEXPORT deflateCopy(z_streamp dest, z_streamp source) {
 #ifdef MAXSEG_64K
+    (void)dest;
+    (void)source;
     return Z_STREAM_ERROR;
 #else
     deflate_state *ds;
     deflate_state *ss;
-    ushf *overlay;
 
 
     if (deflateStateCheck(source) || dest == Z_NULL) {
@@ -1160,8 +1324,7 @@ int ZEXPORT deflateCopy (dest, source)
     ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
     ds->prev   = (Posf *)  ZALLOC(dest, ds->w_size, sizeof(Pos));
     ds->head   = (Posf *)  ZALLOC(dest, ds->hash_size, sizeof(Pos));
-    overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);
-    ds->pending_buf = (uchf *) overlay;
+    ds->pending_buf = (uchf *) ZALLOC(dest, ds->lit_bufsize, 4);
 
     if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
         ds->pending_buf == Z_NULL) {
@@ -1175,8 +1338,7 @@ int ZEXPORT deflateCopy (dest, source)
     zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
 
     ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
-    ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);
-    ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;
+    ds->sym_buf = ds->pending_buf + ds->lit_bufsize;
 
     ds->l_desc.dyn_tree = ds->dyn_ltree;
     ds->d_desc.dyn_tree = ds->dyn_dtree;
@@ -1186,72 +1348,6 @@ int ZEXPORT deflateCopy (dest, source)
 #endif /* MAXSEG_64K */
 }
 
-/* ===========================================================================
- * Read a new buffer from the current input stream, update the adler32
- * and total number of bytes read.  All deflate() input goes through
- * this function so some applications may wish to modify it to avoid
- * allocating a large strm->next_in buffer and copying from it.
- * (See also flush_pending()).
- */
-ZLIB_INTERNAL unsigned read_buf(strm, buf, size)
-    z_streamp strm;
-    Bytef *buf;
-    unsigned size;
-{
-    unsigned len = strm->avail_in;
-
-    if (len > size) len = size;
-    if (len == 0) return 0;
-
-    strm->avail_in  -= len;
-
-#ifdef GZIP
-    if (strm->state->wrap == 2)
-        copy_with_crc(strm, buf, len);
-    else 
-#endif
-    {
-        zmemcpy(buf, strm->next_in, len);
-        if (strm->state->wrap == 1)
-            strm->adler = adler32(strm->adler, buf, len);
-    }
-    strm->next_in  += len;
-    strm->total_in += len;
-
-    return len;
-}
-
-/* ===========================================================================
- * Initialize the "longest match" routines for a new zlib stream
- */
-local void lm_init (s)
-    deflate_state *s;
-{
-    s->window_size = (ulg)2L*s->w_size;
-
-    CLEAR_HASH(s);
-
-    /* Set the default configuration parameters:
-     */
-    s->max_lazy_match   = configuration_table[s->level].max_lazy;
-    s->good_match       = configuration_table[s->level].good_length;
-    s->nice_match       = configuration_table[s->level].nice_length;
-    s->max_chain_length = configuration_table[s->level].max_chain;
-
-    s->strstart = 0;
-    s->block_start = 0L;
-    s->lookahead = 0;
-    s->insert = 0;
-    s->match_length = s->prev_length = MIN_MATCH-1;
-    s->match_available = 0;
-    s->ins_h = 0;
-#ifndef FASTEST
-#ifdef ASMV
-    match_init(); /* initialize the asm code */
-#endif
-#endif
-}
-
 #ifndef FASTEST
 /* ===========================================================================
  * Set match_start to the longest match starting at the given string and
@@ -1262,14 +1358,7 @@ local void lm_init (s)
  *   string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
  * OUT assertion: the match length is not greater than s->lookahead.
  */
-#ifndef ASMV
-/* For 80x86 and 680x0, an optimized version will be provided in match.asm or
- * match.S. The code will be functionally equivalent.
- */
-local uInt longest_match(s, cur_match)
-    deflate_state *s;
-    IPos cur_match;                             /* current match */
-{
+local uInt longest_match(deflate_state *s, IPos cur_match) {
     unsigned chain_length = s->max_chain_length;/* max hash chain length */
     register Bytef *scan = s->window + s->strstart; /* current string */
     register Bytef *match;                      /* matched string */
@@ -1290,10 +1379,10 @@ local uInt longest_match(s, cur_match)
      */
     register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
     register ush scan_start = *(ushf*)scan;
-    register ush scan_end   = *(ushf*)(scan+best_len-1);
+    register ush scan_end   = *(ushf*)(scan + best_len - 1);
 #else
     register Bytef *strend = s->window + s->strstart + MAX_MATCH;
-    register Byte scan_end1  = scan[best_len-1];
+    register Byte scan_end1  = scan[best_len - 1];
     register Byte scan_end   = scan[best_len];
 #endif
 
@@ -1311,7 +1400,8 @@ local uInt longest_match(s, cur_match)
      */
     if ((uInt)nice_match > s->lookahead) nice_match = (int)s->lookahead;
 
-    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
+    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
+           "need lookahead");
 
     do {
         Assert(cur_match < s->strstart, "no future");
@@ -1329,53 +1419,72 @@ local uInt longest_match(s, cur_match)
         /* This code assumes sizeof(unsigned short) == 2. Do not use
          * UNALIGNED_OK if your compiler uses a different size.
          */
-        if (*(ushf*)(match+best_len-1) != scan_end ||
+        if (*(ushf*)(match + best_len - 1) != scan_end ||
             *(ushf*)match != scan_start) continue;
 
         /* It is not necessary to compare scan[2] and match[2] since they are
          * always equal when the other bytes match, given that the hash keys
          * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at
-         * strstart+3, +5, ... up to strstart+257. We check for insufficient
+         * strstart + 3, + 5, up to strstart + 257. We check for insufficient
          * lookahead only every 4th comparison; the 128th check will be made
-         * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is
+         * at strstart + 257. If MAX_MATCH-2 is not a multiple of 8, it is
          * necessary to put more guard bytes at the end of the window, or
          * to check more often for insufficient lookahead.
          */
-        Assert(scan[2] == match[2], "scan[2]?");
+        if (!s->chromium_zlib_hash) {
+          Assert(scan[2] == match[2], "scan[2]?");
+        } else {
+          /* When using CRC hashing, scan[2] and match[2] may mismatch, but in
+           * that case at least one of the other hashed bytes will mismatch
+           * also. Bytes 0 and 1 were already checked above, and we know there
+           * are at least four bytes to check otherwise the mismatch would have
+           * been found by the scan_end comparison above, so: */
+          Assert(scan[2] == match[2] || scan[3] != match[3], "scan[2]??");
+        }
         scan++, match++;
         do {
-        } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+        } while (*(ushf*)(scan += 2) == *(ushf*)(match += 2) &&
+                 *(ushf*)(scan += 2) == *(ushf*)(match += 2) &&
+                 *(ushf*)(scan += 2) == *(ushf*)(match += 2) &&
+                 *(ushf*)(scan += 2) == *(ushf*)(match += 2) &&
                  scan < strend);
         /* The funny "do {}" generates better code on most compilers */
 
-        /* Here, scan <= window+strstart+257 */
-        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+        /* Here, scan <= window + strstart + 257 */
+        Assert(scan <= s->window+(unsigned)(s->window_size - 1),
+               "wild scan");
         if (*scan == *match) scan++;
 
-        len = (MAX_MATCH - 1) - (int)(strend-scan);
+        len = (MAX_MATCH - 1) - (int)(strend - scan);
         scan = strend - (MAX_MATCH-1);
 
 #else /* UNALIGNED_OK */
 
         if (match[best_len]   != scan_end  ||
-            match[best_len-1] != scan_end1 ||
+            match[best_len - 1] != scan_end1 ||
             *match            != *scan     ||
             *++match          != scan[1])      continue;
 
-        /* The check at best_len-1 can be removed because it will be made
+        /* The check at best_len - 1 can be removed because it will be made
          * again later. (This heuristic is not always a win.)
          * It is not necessary to compare scan[2] and match[2] since they
          * are always equal when the other bytes match, given that
          * the hash keys are equal and that HASH_BITS >= 8.
          */
         scan += 2, match++;
-        Assert(*scan == *match, "match[2]?");
+        if (!s->chromium_zlib_hash) {
+          Assert(*scan == *match, "match[2]?");
+        } else {
+          /* When using CRC hashing, scan[2] and match[2] may mismatch, but in
+           * that case at least one of the other hashed bytes will mismatch
+           * also. Bytes 0 and 1 were already checked above, and we know there
+           * are at least four bytes to check otherwise the mismatch would have
+           * been found by the scan_end comparison above, so: */
+          Assert(*scan == *match || scan[1] != match[1], "match[2]??");
+        }
 
         /* We check for insufficient lookahead only every 8th comparison;
-         * the 256th check will be made at strstart+258.
+         * the 256th check will be made at strstart + 258.
          */
         do {
         } while (*++scan == *++match && *++scan == *++match &&
@@ -1384,7 +1493,8 @@ local uInt longest_match(s, cur_match)
                  *++scan == *++match && *++scan == *++match &&
                  scan < strend);
 
-        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+        Assert(scan <= s->window + (unsigned)(s->window_size - 1),
+               "wild scan");
 
         len = MAX_MATCH - (int)(strend - scan);
         scan = strend - MAX_MATCH;
@@ -1396,9 +1506,9 @@ local uInt longest_match(s, cur_match)
             best_len = len;
             if (len >= nice_match) break;
 #ifdef UNALIGNED_OK
-            scan_end = *(ushf*)(scan+best_len-1);
+            scan_end = *(ushf*)(scan + best_len - 1);
 #else
-            scan_end1  = scan[best_len-1];
+            scan_end1  = scan[best_len - 1];
             scan_end   = scan[best_len];
 #endif
         }
@@ -1408,17 +1518,13 @@ local uInt longest_match(s, cur_match)
     if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
     return s->lookahead;
 }
-#endif /* ASMV */
 
 #else /* FASTEST */
 
 /* ---------------------------------------------------------------------------
  * Optimized version for FASTEST only
  */
-local uInt longest_match(s, cur_match)
-    deflate_state *s;
-    IPos cur_match;                             /* current match */
-{
+local uInt longest_match(deflate_state *s, IPos cur_match) {
     register Bytef *scan = s->window + s->strstart; /* current string */
     register Bytef *match;                       /* matched string */
     register int len;                           /* length of current match */
@@ -1429,7 +1535,8 @@ local uInt longest_match(s, cur_match)
      */
     Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
 
-    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
+    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
+           "need lookahead");
 
     Assert(cur_match < s->strstart, "no future");
 
@@ -1439,7 +1546,7 @@ local uInt longest_match(s, cur_match)
      */
     if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1;
 
-    /* The check at best_len-1 can be removed because it will be made
+    /* The check at best_len - 1 can be removed because it will be made
      * again later. (This heuristic is not always a win.)
      * It is not necessary to compare scan[2] and match[2] since they
      * are always equal when the other bytes match, given that
@@ -1449,7 +1556,7 @@ local uInt longest_match(s, cur_match)
     Assert(*scan == *match, "match[2]?");
 
     /* We check for insufficient lookahead only every 8th comparison;
-     * the 256th check will be made at strstart+258.
+     * the 256th check will be made at strstart + 258.
      */
     do {
     } while (*++scan == *++match && *++scan == *++match &&
@@ -1458,7 +1565,7 @@ local uInt longest_match(s, cur_match)
              *++scan == *++match && *++scan == *++match &&
              scan < strend);
 
-    Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+    Assert(scan <= s->window + (unsigned)(s->window_size - 1), "wild scan");
 
     len = MAX_MATCH - (int)(strend - scan);
 
@@ -1478,11 +1585,7 @@ local uInt longest_match(s, cur_match)
 /* ===========================================================================
  * Check that the match at match_start is indeed a match.
  */
-local void check_match(s, start, match, length)
-    deflate_state *s;
-    IPos start, match;
-    int length;
-{
+local void check_match(deflate_state *s, IPos start, IPos match, int length) {
     /* check that the match is indeed a match */
     if (zmemcmp(s->window + match,
                 s->window + start, length) != EQUAL) {
@@ -1494,7 +1597,7 @@ local void check_match(s, start, match, length)
         z_error("invalid match");
     }
     if (z_verbose > 1) {
-        fprintf(stderr,"\\[%d,%d]", start-match, length);
+        fprintf(stderr,"\\[%d,%d]", start - match, length);
         do { putc(s->window[start++], stderr); } while (--length != 0);
     }
 }
@@ -1502,147 +1605,6 @@ local void check_match(s, start, match, length)
 #  define check_match(s, start, match, length)
 #endif /* ZLIB_DEBUG */
 
-/* ===========================================================================
- * Fill the window when the lookahead becomes insufficient.
- * Updates strstart and lookahead.
- *
- * IN assertion: lookahead < MIN_LOOKAHEAD
- * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD
- *    At least one byte has been read, or avail_in == 0; reads are
- *    performed for at least two bytes (required for the zip translate_eol
- *    option -- not supported here).
- */
-local void fill_window_c(deflate_state *s);
-
-local void fill_window(deflate_state *s)
-{
-    if (x86_cpu_enable_simd) {
-        fill_window_sse(s);
-        return;
-    }
-
-    fill_window_c(s);
-}
-
-local void fill_window_c(s)
-    deflate_state *s;
-{
-    unsigned n;
-    unsigned more;    /* Amount of free space at the end of the window. */
-    uInt wsize = s->w_size;
-
-    Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead");
-
-    do {
-        more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
-
-        /* Deal with !@#$% 64K limit: */
-        if (sizeof(int) <= 2) {
-            if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
-                more = wsize;
-
-            } else if (more == (unsigned)(-1)) {
-                /* Very unlikely, but possible on 16 bit machine if
-                 * strstart == 0 && lookahead == 1 (input done a byte at time)
-                 */
-                more--;
-            }
-        }
-
-        /* If the window is almost full and there is insufficient lookahead,
-         * move the upper half to the lower one to make room in the upper half.
-         */
-        if (s->strstart >= wsize+MAX_DIST(s)) {
-
-            zmemcpy(s->window, s->window+wsize, (unsigned)wsize - more);
-            s->match_start -= wsize;
-            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
-            s->block_start -= (long) wsize;
-            slide_hash(s);
-            more += wsize;
-        }
-        if (s->strm->avail_in == 0) break;
-
-        /* If there was no sliding:
-         *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
-         *    more == window_size - lookahead - strstart
-         * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
-         * => more >= window_size - 2*WSIZE + 2
-         * In the BIG_MEM or MMAP case (not yet supported),
-         *   window_size == input_size + MIN_LOOKAHEAD  &&
-         *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
-         * Otherwise, window_size == 2*WSIZE so more >= 2.
-         * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
-         */
-        Assert(more >= 2, "more < 2");
-
-        n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
-        s->lookahead += n;
-
-        /* Initialize the hash value now that we have some input: */
-        if (s->lookahead + s->insert >= MIN_MATCH) {
-            uInt str = s->strstart - s->insert;
-            s->ins_h = s->window[str];
-            UPDATE_HASH(s, s->ins_h, s->window[str + 1]);
-#if MIN_MATCH != 3
-            Call UPDATE_HASH() MIN_MATCH-3 more times
-#endif
-            while (s->insert) {
-                UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
-#ifndef FASTEST
-                s->prev[str & s->w_mask] = s->head[s->ins_h];
-#endif
-                s->head[s->ins_h] = (Pos)str;
-                str++;
-                s->insert--;
-                if (s->lookahead + s->insert < MIN_MATCH)
-                    break;
-            }
-        }
-        /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
-         * but this is not important since only literal bytes will be emitted.
-         */
-
-    } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
-
-    /* If the WIN_INIT bytes after the end of the current data have never been
-     * written, then zero those bytes in order to avoid memory check reports of
-     * the use of uninitialized (or uninitialised as Julian writes) bytes by
-     * the longest match routines.  Update the high water mark for the next
-     * time through here.  WIN_INIT is set to MAX_MATCH since the longest match
-     * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead.
-     */
-    if (s->high_water < s->window_size) {
-        ulg curr = s->strstart + (ulg)(s->lookahead);
-        ulg init;
-
-        if (s->high_water < curr) {
-            /* Previous high water mark below current data -- zero WIN_INIT
-             * bytes or up to end of window, whichever is less.
-             */
-            init = s->window_size - curr;
-            if (init > WIN_INIT)
-                init = WIN_INIT;
-            zmemzero(s->window + curr, (unsigned)init);
-            s->high_water = curr + init;
-        }
-        else if (s->high_water < (ulg)curr + WIN_INIT) {
-            /* High water mark at or above current data, but below current data
-             * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up
-             * to end of window, whichever is less.
-             */
-            init = (ulg)curr + WIN_INIT - s->high_water;
-            if (init > s->window_size - s->high_water)
-                init = s->window_size - s->high_water;
-            zmemzero(s->window + s->high_water, (unsigned)init);
-            s->high_water += init;
-        }
-    }
-
-    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
-           "not enough room for search");
-}
-
 /* ===========================================================================
  * Flush the current block, with given end-of-file flag.
  * IN assertion: strstart is set to the end of the current match.
@@ -1683,12 +1645,9 @@ local void fill_window_c(s)
  *
  * deflate_stored() is written to minimize the number of times an input byte is
  * copied. It is most efficient with large input and output buffers, which
- * maximizes the opportunites to have a single copy from next_in to next_out.
+ * maximizes the opportunities to have a single copy from next_in to next_out.
  */
-local block_state deflate_stored(s, flush)
-    deflate_state *s;
-    int flush;
-{
+local block_state deflate_stored(deflate_state *s, int flush) {
     /* Smallest worthy block size when not flushing or finishing. By default
      * this is 32K. This can be as small as 507 bytes for memLevel == 1. For
      * large input and output buffers, the stored block size will be larger.
@@ -1787,6 +1746,7 @@ local block_state deflate_stored(s, flush)
             s->matches = 2;         /* clear hash */
             zmemcpy(s->window, s->strm->next_in - s->w_size, s->w_size);
             s->strstart = s->w_size;
+            s->insert = s->strstart;
         }
         else {
             if (s->window_size - s->strstart <= used) {
@@ -1795,12 +1755,14 @@ local block_state deflate_stored(s, flush)
                 zmemcpy(s->window, s->window + s->w_size, s->strstart);
                 if (s->matches < 2)
                     s->matches++;   /* add a pending slide_hash() */
+                if (s->insert > s->strstart)
+                    s->insert = s->strstart;
             }
             zmemcpy(s->window + s->strstart, s->strm->next_in - used, used);
             s->strstart += used;
+            s->insert += MIN(used, s->w_size - s->insert);
         }
         s->block_start = s->strstart;
-        s->insert += MIN(used, s->w_size - s->insert);
     }
     if (s->high_water < s->strstart)
         s->high_water = s->strstart;
@@ -1815,7 +1777,7 @@ local block_state deflate_stored(s, flush)
         return block_done;
 
     /* Fill the window with any remaining input. */
-    have = s->window_size - s->strstart - 1;
+    have = s->window_size - s->strstart;
     if (s->strm->avail_in > have && s->block_start >= (long)s->w_size) {
         /* Slide the window down. */
         s->block_start -= s->w_size;
@@ -1824,12 +1786,15 @@ local block_state deflate_stored(s, flush)
         if (s->matches < 2)
             s->matches++;           /* add a pending slide_hash() */
         have += s->w_size;          /* more space now */
+        if (s->insert > s->strstart)
+            s->insert = s->strstart;
     }
     if (have > s->strm->avail_in)
         have = s->strm->avail_in;
     if (have) {
         read_buf(s->strm, s->window + s->strstart, have);
         s->strstart += have;
+        s->insert += MIN(have, s->w_size - s->insert);
     }
     if (s->high_water < s->strstart)
         s->high_water = s->strstart;
@@ -1866,10 +1831,7 @@ local block_state deflate_stored(s, flush)
  * new strings in the dictionary only for unmatched strings or for short
  * matches. It is used only for the fast compression options.
  */
-local block_state deflate_fast(s, flush)
-    deflate_state *s;
-    int flush;
-{
+local block_state deflate_fast(deflate_state *s, int flush) {
     IPos hash_head;       /* head of the hash chain */
     int bflush;           /* set if current block must be flushed */
 
@@ -1887,7 +1849,7 @@ local block_state deflate_fast(s, flush)
             if (s->lookahead == 0) break; /* flush the current block */
         }
 
-        /* Insert the string window[strstart .. strstart+2] in the
+        /* Insert the string window[strstart .. strstart + 2] in the
          * dictionary, and set hash_head to the head of the hash chain:
          */
         hash_head = NIL;
@@ -1934,19 +1896,22 @@ local block_state deflate_fast(s, flush)
             {
                 s->strstart += s->match_length;
                 s->match_length = 0;
-                s->ins_h = s->window[s->strstart];
-                UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
+
+                if (!s->chromium_zlib_hash) {
+                  s->ins_h = s->window[s->strstart];
+                  UPDATE_HASH(s, s->ins_h, s->window[s->strstart + 1]);
 #if MIN_MATCH != 3
-                Call UPDATE_HASH() MIN_MATCH-3 more times
+                  Call UPDATE_HASH() MIN_MATCH-3 more times
 #endif
-                /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not
-                 * matter since it will be recomputed at next deflate call.
-                 */
+                  /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not
+                   * matter since it will be recomputed at next deflate call.
+                   */
+                }
             }
         } else {
             /* No match, output a literal byte */
             Tracevv((stderr,"%c", s->window[s->strstart]));
-            _tr_tally_lit (s, s->window[s->strstart], bflush);
+            _tr_tally_lit(s, s->window[s->strstart], bflush);
             s->lookahead--;
             s->strstart++;
         }
@@ -1957,7 +1922,7 @@ local block_state deflate_fast(s, flush)
         FLUSH_BLOCK(s, 1);
         return finish_done;
     }
-    if (s->last_lit)
+    if (s->sym_next)
         FLUSH_BLOCK(s, 0);
     return block_done;
 }
@@ -1968,10 +1933,7 @@ local block_state deflate_fast(s, flush)
  * evaluation for matches: a match is finally adopted only if there is
  * no better match at the next window position.
  */
-local block_state deflate_slow(s, flush)
-    deflate_state *s;
-    int flush;
-{
+local block_state deflate_slow(deflate_state *s, int flush) {
     IPos hash_head;          /* head of hash chain */
     int bflush;              /* set if current block must be flushed */
 
@@ -1990,7 +1952,7 @@ local block_state deflate_slow(s, flush)
             if (s->lookahead == 0) break; /* flush the current block */
         }
 
-        /* Insert the string window[strstart .. strstart+2] in the
+        /* Insert the string window[strstart .. strstart + 2] in the
          * dictionary, and set hash_head to the head of the hash chain:
          */
         hash_head = NIL;
@@ -2032,17 +1994,23 @@ local block_state deflate_slow(s, flush)
             uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
             /* Do not insert strings in hash table beyond this. */
 
-            check_match(s, s->strstart-1, s->prev_match, s->prev_length);
+            if (s->prev_match == -1) {
+                /* The window has slid one byte past the previous match,
+                 * so the first byte cannot be compared. */
+                check_match(s, s->strstart, s->prev_match + 1, s->prev_length - 1);
+            } else {
+                check_match(s, s->strstart - 1, s->prev_match, s->prev_length);
+            }
 
-            _tr_tally_dist(s, s->strstart -1 - s->prev_match,
+            _tr_tally_dist(s, s->strstart - 1 - s->prev_match,
                            s->prev_length - MIN_MATCH, bflush);
 
             /* Insert in hash table all strings up to the end of the match.
-             * strstart-1 and strstart are already inserted. If there is not
+             * strstart - 1 and strstart are already inserted. If there is not
              * enough lookahead, the last two strings are not inserted in
              * the hash table.
              */
-            s->lookahead -= s->prev_length-1;
+            s->lookahead -= s->prev_length - 1;
             s->prev_length -= 2;
             do {
                 if (++s->strstart <= max_insert) {
@@ -2060,8 +2028,8 @@ local block_state deflate_slow(s, flush)
              * single literal. If there was a match but the current match
              * is longer, truncate the previous match to a single literal.
              */
-            Tracevv((stderr,"%c", s->window[s->strstart-1]));
-            _tr_tally_lit(s, s->window[s->strstart-1], bflush);
+            Tracevv((stderr,"%c", s->window[s->strstart - 1]));
+            _tr_tally_lit(s, s->window[s->strstart - 1], bflush);
             if (bflush) {
                 FLUSH_BLOCK_ONLY(s, 0);
             }
@@ -2079,8 +2047,8 @@ local block_state deflate_slow(s, flush)
     }
     Assert (flush != Z_NO_FLUSH, "no flush?");
     if (s->match_available) {
-        Tracevv((stderr,"%c", s->window[s->strstart-1]));
-        _tr_tally_lit(s, s->window[s->strstart-1], bflush);
+        Tracevv((stderr,"%c", s->window[s->strstart - 1]));
+        _tr_tally_lit(s, s->window[s->strstart - 1], bflush);
         s->match_available = 0;
     }
     s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
@@ -2088,7 +2056,7 @@ local block_state deflate_slow(s, flush)
         FLUSH_BLOCK(s, 1);
         return finish_done;
     }
-    if (s->last_lit)
+    if (s->sym_next)
         FLUSH_BLOCK(s, 0);
     return block_done;
 }
@@ -2099,10 +2067,7 @@ local block_state deflate_slow(s, flush)
  * one.  Do not maintain a hash table.  (It will be regenerated if this run of
  * deflate switches away from Z_RLE.)
  */
-local block_state deflate_rle(s, flush)
-    deflate_state *s;
-    int flush;
-{
+local block_state deflate_rle(deflate_state *s, int flush) {
     int bflush;             /* set if current block must be flushed */
     uInt prev;              /* byte at distance one to match */
     Bytef *scan, *strend;   /* scan goes up to strend for length of run */
@@ -2137,7 +2102,8 @@ local block_state deflate_rle(s, flush)
                 if (s->match_length > s->lookahead)
                     s->match_length = s->lookahead;
             }
-            Assert(scan <= s->window+(uInt)(s->window_size-1), "wild scan");
+            Assert(scan <= s->window + (uInt)(s->window_size - 1),
+                   "wild scan");
         }
 
         /* Emit match if have run of MIN_MATCH or longer, else emit literal */
@@ -2152,7 +2118,7 @@ local block_state deflate_rle(s, flush)
         } else {
             /* No match, output a literal byte */
             Tracevv((stderr,"%c", s->window[s->strstart]));
-            _tr_tally_lit (s, s->window[s->strstart], bflush);
+            _tr_tally_lit(s, s->window[s->strstart], bflush);
             s->lookahead--;
             s->strstart++;
         }
@@ -2163,7 +2129,7 @@ local block_state deflate_rle(s, flush)
         FLUSH_BLOCK(s, 1);
         return finish_done;
     }
-    if (s->last_lit)
+    if (s->sym_next)
         FLUSH_BLOCK(s, 0);
     return block_done;
 }
@@ -2172,10 +2138,7 @@ local block_state deflate_rle(s, flush)
  * For Z_HUFFMAN_ONLY, do not look for matches.  Do not maintain a hash table.
  * (It will be regenerated if this run of deflate switches away from Huffman.)
  */
-local block_state deflate_huff(s, flush)
-    deflate_state *s;
-    int flush;
-{
+local block_state deflate_huff(deflate_state *s, int flush) {
     int bflush;             /* set if current block must be flushed */
 
     for (;;) {
@@ -2192,7 +2155,7 @@ local block_state deflate_huff(s, flush)
         /* Output a literal byte */
         s->match_length = 0;
         Tracevv((stderr,"%c", s->window[s->strstart]));
-        _tr_tally_lit (s, s->window[s->strstart], bflush);
+        _tr_tally_lit(s, s->window[s->strstart], bflush);
         s->lookahead--;
         s->strstart++;
         if (bflush) FLUSH_BLOCK(s, 0);
@@ -2202,41 +2165,7 @@ local block_state deflate_huff(s, flush)
         FLUSH_BLOCK(s, 1);
         return finish_done;
     }
-    if (s->last_lit)
+    if (s->sym_next)
         FLUSH_BLOCK(s, 0);
     return block_done;
 }
-
-/* Safe to inline this as GCC/clang will use inline asm and Visual Studio will
- * use intrinsic without extra params
- */
-local INLINE Pos insert_string_sse(deflate_state *const s, const Pos str)
-{
-    Pos ret;
-    unsigned *ip, val, h = 0;
-
-    ip = (unsigned *)&s->window[str];
-    val = *ip;
-
-    if (s->level >= 6)
-        val &= 0xFFFFFF;
-
-/* Windows clang should use inline asm */
-#if defined(_MSC_VER) && !defined(__clang__)
-    h = _mm_crc32_u32(h, val);
-#elif defined(__i386__) || defined(__amd64__)
-    __asm__ __volatile__ (
-        "crc32 %1,%0\n\t"
-    : "+r" (h)
-    : "r" (val)
-    );
-#else
-    /* This should never happen */
-    assert(0);
-#endif
-
-    ret = s->head[h & s->hash_mask];
-    s->head[h & s->hash_mask] = str;
-    s->prev[str & s->w_mask] = ret;
-    return ret;
-}
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/deflate.h b/extern/crashpad/crashpad/third_party/zlib/zlib/deflate.h
index ab56df7663..f164191106 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/deflate.h
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/deflate.h
@@ -1,5 +1,5 @@
 /* deflate.h -- internal compression state
- * Copyright (C) 1995-2016 Jean-loup Gailly
+ * Copyright (C) 1995-2018 Jean-loup Gailly
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -109,8 +109,8 @@ typedef struct internal_state {
     ulg   gzindex;       /* where in extra, name, or comment */
     Byte  method;        /* can only be DEFLATED */
     int   last_flush;    /* value of flush param for previous deflate call */
-    unsigned zalign(16) crc0[4 * 5];
-                /* used by deflate.c: */
+    unsigned crc0[4 * 5];
+    /* used by deflate.c: */
 
     uInt  w_size;        /* LZ77 window size (32K by default) */
     uInt  w_bits;        /* log2(w_size)  (8..16) */
@@ -217,7 +217,7 @@ typedef struct internal_state {
     /* Depth of each subtree used as tie breaker for trees of equal frequency
      */
 
-    uchf *l_buf;          /* buffer for literals or lengths */
+    uchf *sym_buf;        /* buffer for distances and literals/lengths */
 
     uInt  lit_bufsize;
     /* Size of match buffer for literals/lengths.  There are 4 reasons for
@@ -239,13 +239,8 @@ typedef struct internal_state {
      *   - I can't count above 4
      */
 
-    uInt last_lit;      /* running index in l_buf */
-
-    ushf *d_buf;
-    /* Buffer for distances. To simplify the code, d_buf and l_buf have
-     * the same number of elements. To use different lengths, an extra flag
-     * array would be necessary.
-     */
+    uInt sym_next;      /* running index in sym_buf */
+    uInt sym_end;       /* symbol table full when sym_next reaches this */
 
     ulg opt_len;        /* bit length of current block with optimal trees */
     ulg static_len;     /* bit length of current block with static trees */
@@ -273,6 +268,11 @@ typedef struct internal_state {
      * updated to the new high water mark.
      */
 
+    uInt chromium_zlib_hash;
+    /* 0 if Rabin-Karp rolling hash is enabled, non-zero if chromium zlib
+     * hash is enabled.
+     */
+
 } FAR deflate_state;
 
 /* Output a byte on the stream.
@@ -296,14 +296,14 @@ typedef struct internal_state {
    memory checker errors from longest match routines */
 
         /* in trees.c */
-void ZLIB_INTERNAL _tr_init OF((deflate_state *s));
-int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc));
-void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf,
-                        ulg stored_len, int last));
-void ZLIB_INTERNAL _tr_flush_bits OF((deflate_state *s));
-void ZLIB_INTERNAL _tr_align OF((deflate_state *s));
-void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
-                        ulg stored_len, int last));
+void ZLIB_INTERNAL _tr_init(deflate_state *s);
+int ZLIB_INTERNAL _tr_tally(deflate_state *s, unsigned dist, unsigned lc);
+void ZLIB_INTERNAL _tr_flush_block(deflate_state *s, charf *buf,
+                                   ulg stored_len, int last);
+void ZLIB_INTERNAL _tr_flush_bits(deflate_state *s);
+void ZLIB_INTERNAL _tr_align(deflate_state *s);
+void ZLIB_INTERNAL _tr_stored_block(deflate_state *s, charf *buf,
+                                    ulg stored_len, int last);
 
 #define d_code(dist) \
    ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])
@@ -325,20 +325,22 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
 
 # define _tr_tally_lit(s, c, flush) \
   { uch cc = (c); \
-    s->d_buf[s->last_lit] = 0; \
-    s->l_buf[s->last_lit++] = cc; \
+    s->sym_buf[s->sym_next++] = 0; \
+    s->sym_buf[s->sym_next++] = 0; \
+    s->sym_buf[s->sym_next++] = cc; \
     s->dyn_ltree[cc].Freq++; \
-    flush = (s->last_lit == s->lit_bufsize-1); \
+    flush = (s->sym_next == s->sym_end); \
    }
 # define _tr_tally_dist(s, distance, length, flush) \
   { uch len = (uch)(length); \
     ush dist = (ush)(distance); \
-    s->d_buf[s->last_lit] = dist; \
-    s->l_buf[s->last_lit++] = len; \
+    s->sym_buf[s->sym_next++] = (uch)dist; \
+    s->sym_buf[s->sym_next++] = (uch)(dist >> 8); \
+    s->sym_buf[s->sym_next++] = len; \
     dist--; \
     s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
     s->dyn_dtree[d_code(dist)].Freq++; \
-    flush = (s->last_lit == s->lit_bufsize-1); \
+    flush = (s->sym_next == s->sym_end); \
   }
 #else
 # define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
@@ -354,6 +356,4 @@ void ZLIB_INTERNAL crc_fold_copy(deflate_state* const s,
                                  long len);
 unsigned ZLIB_INTERNAL crc_fold_512to32(deflate_state* const s);
 
-void ZLIB_INTERNAL fill_window_sse(deflate_state* s);
-
 #endif /* DEFLATE_H */
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/fill_window_sse.c b/extern/crashpad/crashpad/third_party/zlib/zlib/fill_window_sse.c
deleted file mode 100644
index 949ccce1ba..0000000000
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/fill_window_sse.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Fill Window with SSE2-optimized hash shifting
- *
- * Copyright (C) 2013 Intel Corporation
- * Authors:
- *  Arjan van de Ven    <arjan@linux.intel.com>
- *  Jim Kukunas         <james.t.kukunas@linux.intel.com>
- *
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include <immintrin.h>
-#include "deflate.h"
-
-#define UPDATE_HASH(s,h,i) \
-    {\
-        if (s->level < 6) { \
-            h = (3483 * (s->window[i]) +\
-                 23081* (s->window[i+1]) +\
-                 6954 * (s->window[i+2]) +\
-                 20947* (s->window[i+3])) & s->hash_mask;\
-        } else {\
-            h = (25881* (s->window[i]) +\
-                 24674* (s->window[i+1]) +\
-                 25811* (s->window[i+2])) & s->hash_mask;\
-        }\
-    }\
-
-extern int read_buf OF((z_streamp strm, Bytef *buf, unsigned size));
-
-void fill_window_sse(deflate_state *s)
-{
-    const __m128i xmm_wsize = _mm_set1_epi16(s->w_size);
-
-    register unsigned n;
-    register Posf *p;
-    unsigned more;    /* Amount of free space at the end of the window. */
-    uInt wsize = s->w_size;
-
-    Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead");
-
-    do {
-        more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
-
-        /* Deal with !@#$% 64K limit: */
-        if (sizeof(int) <= 2) {
-            if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
-                more = wsize;
-
-            } else if (more == (unsigned)(-1)) {
-                /* Very unlikely, but possible on 16 bit machine if
-                 * strstart == 0 && lookahead == 1 (input done a byte at time)
-                 */
-                more--;
-            }
-        }
-
-        /* If the window is almost full and there is insufficient lookahead,
-         * move the upper half to the lower one to make room in the upper half.
-         */
-        if (s->strstart >= wsize+MAX_DIST(s)) {
-
-            zmemcpy(s->window, s->window+wsize, (unsigned)wsize);
-            s->match_start -= wsize;
-            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
-            s->block_start -= (long) wsize;
-
-            /* Slide the hash table (could be avoided with 32 bit values
-               at the expense of memory usage). We slide even when level == 0
-               to keep the hash table consistent if we switch back to level > 0
-               later. (Using level 0 permanently is not an optimal usage of
-               zlib, so we don't care about this pathological case.)
-             */
-            n = s->hash_size;
-            p = &s->head[n];
-            p -= 8;
-            do {
-                __m128i value, result;
-
-                value = _mm_loadu_si128((__m128i *)p);
-                result = _mm_subs_epu16(value, xmm_wsize);
-                _mm_storeu_si128((__m128i *)p, result);
-
-                p -= 8;
-                n -= 8;
-            } while (n > 0);
-
-            n = wsize;
-#ifndef FASTEST
-            p = &s->prev[n];
-            p -= 8;
-            do {
-                __m128i value, result;
-
-                value = _mm_loadu_si128((__m128i *)p);
-                result = _mm_subs_epu16(value, xmm_wsize);
-                _mm_storeu_si128((__m128i *)p, result);
-
-                p -= 8;
-                n -= 8;
-            } while (n > 0);
-#endif
-            more += wsize;
-        }
-        if (s->strm->avail_in == 0) break;
-
-        /* If there was no sliding:
-         *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
-         *    more == window_size - lookahead - strstart
-         * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
-         * => more >= window_size - 2*WSIZE + 2
-         * In the BIG_MEM or MMAP case (not yet supported),
-         *   window_size == input_size + MIN_LOOKAHEAD  &&
-         *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
-         * Otherwise, window_size == 2*WSIZE so more >= 2.
-         * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
-         */
-        Assert(more >= 2, "more < 2");
-
-        n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
-        s->lookahead += n;
-
-        /* Initialize the hash value now that we have some input: */
-        if (s->lookahead >= MIN_MATCH) {
-            uInt str = s->strstart;
-            s->ins_h = s->window[str];
-            if (str >= 1)
-                UPDATE_HASH(s, s->ins_h, str + 1 - (MIN_MATCH-1));
-#if MIN_MATCH != 3
-            Call UPDATE_HASH() MIN_MATCH-3 more times
-#endif
-        }
-        /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
-         * but this is not important since only literal bytes will be emitted.
-         */
-
-    } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
-
-    /* If the WIN_INIT bytes after the end of the current data have never been
-     * written, then zero those bytes in order to avoid memory check reports of
-     * the use of uninitialized (or uninitialised as Julian writes) bytes by
-     * the longest match routines.  Update the high water mark for the next
-     * time through here.  WIN_INIT is set to MAX_MATCH since the longest match
-     * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead.
-     */
-    if (s->high_water < s->window_size) {
-        ulg curr = s->strstart + (ulg)(s->lookahead);
-        ulg init;
-
-        if (s->high_water < curr) {
-            /* Previous high water mark below current data -- zero WIN_INIT
-             * bytes or up to end of window, whichever is less.
-             */
-            init = s->window_size - curr;
-            if (init > WIN_INIT)
-                init = WIN_INIT;
-            zmemzero(s->window + curr, (unsigned)init);
-            s->high_water = curr + init;
-        }
-        else if (s->high_water < (ulg)curr + WIN_INIT) {
-            /* High water mark at or above current data, but below current data
-             * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up
-             * to end of window, whichever is less.
-             */
-            init = (ulg)curr + WIN_INIT - s->high_water;
-            if (init > s->window_size - s->high_water)
-                init = s->window_size - s->high_water;
-            zmemzero(s->window + s->high_water, (unsigned)init);
-            s->high_water += init;
-        }
-    }
-
-    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
-           "not enough room for search");
-}
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/google.patch b/extern/crashpad/crashpad/third_party/zlib/zlib/google.patch
deleted file mode 100644
index f16dacced5..0000000000
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/google.patch
+++ /dev/null
@@ -1,399 +0,0 @@
-diff --git a/contrib/minizip/ioapi.h b/contrib/minizip/ioapi.h
-index 8dcbdb06e35a..c1b7a54847f5 100644
---- a/contrib/minizip/ioapi.h
-+++ b/contrib/minizip/ioapi.h
-@@ -43,7 +43,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
--#include "zlib.h"
-+#include "third_party/zlib/zlib.h"
- 
- #if defined(USE_FILE32API)
- #define fopen64 fopen
-diff --git a/contrib/minizip/iowin32.c b/contrib/minizip/iowin32.c
-index 274f39eb1dd2..246ceb91a139 100644
---- a/contrib/minizip/iowin32.c
-+++ b/contrib/minizip/iowin32.c
-@@ -26,12 +26,19 @@
- #endif
- 
- 
-+#ifdef _WIN32_WINNT
-+#undef _WIN32_WINNT
-+#define _WIN32_WINNT 0x601
-+#endif
-+
-+#if _WIN32_WINNT >= _WIN32_WINNT_WIN8
- // see Include/shared/winapifamily.h in the Windows Kit
- #if defined(WINAPI_FAMILY_PARTITION) && (!(defined(IOWIN32_USING_WINRT_API)))
- #if WINAPI_FAMILY_ONE_PARTITION(WINAPI_FAMILY, WINAPI_PARTITION_APP)
- #define IOWIN32_USING_WINRT_API 1
- #endif
- #endif
-+#endif
- 
- voidpf  ZCALLBACK win32_open_file_func  OF((voidpf opaque, const char* filename, int mode));
- uLong   ZCALLBACK win32_read_file_func  OF((voidpf opaque, voidpf stream, void* buf, uLong size));
-diff --git a/contrib/minizip/mztools.c b/contrib/minizip/mztools.c
-index 96891c2e0b71..8bf9cca32633 100644
---- a/contrib/minizip/mztools.c
-+++ b/contrib/minizip/mztools.c
-@@ -8,7 +8,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include "zlib.h"
-+#include "third_party/zlib/zlib.h"
- #include "unzip.h"
- 
- #define READ_8(adr)  ((unsigned char)*(adr))
-diff --git a/contrib/minizip/mztools.h b/contrib/minizip/mztools.h
-index a49a426ec2fc..f295ffeda6af 100644
---- a/contrib/minizip/mztools.h
-+++ b/contrib/minizip/mztools.h
-@@ -12,7 +12,7 @@ extern "C" {
- #endif
- 
- #ifndef _ZLIB_H
--#include "zlib.h"
-+#include "third_party/zlib/zlib.h"
- #endif
- 
- #include "unzip.h"
-diff --git a/contrib/minizip/unzip.c b/contrib/minizip/unzip.c
-index bcfb9416ec35..199b4723fcfc 100644
---- a/contrib/minizip/unzip.c
-+++ b/contrib/minizip/unzip.c
-@@ -72,7 +72,7 @@
-         #define NOUNCRYPT
- #endif
- 
--#include "zlib.h"
-+#include "third_party/zlib/zlib.h"
- #include "unzip.h"
- 
- #ifdef STDC
-@@ -1705,11 +1705,6 @@ extern int ZEXPORT unzReadCurrentFile  (unzFile file, voidp buf, unsigned len)
- 
-     pfile_in_zip_read_info->stream.avail_out = (uInt)len;
- 
--    if ((len>pfile_in_zip_read_info->rest_read_uncompressed) &&
--        (!(pfile_in_zip_read_info->raw)))
--        pfile_in_zip_read_info->stream.avail_out =
--            (uInt)pfile_in_zip_read_info->rest_read_uncompressed;
--
-     if ((len>pfile_in_zip_read_info->rest_read_compressed+
-            pfile_in_zip_read_info->stream.avail_in) &&
-          (pfile_in_zip_read_info->raw))
-diff --git a/contrib/minizip/unzip.h b/contrib/minizip/unzip.h
-index 2104e3915074..3c0143529b91 100644
---- a/contrib/minizip/unzip.h
-+++ b/contrib/minizip/unzip.h
-@@ -48,7 +48,7 @@ extern "C" {
- #endif
- 
- #ifndef _ZLIB_H
--#include "zlib.h"
-+#include "third_party/zlib/zlib.h"
- #endif
- 
- #ifndef  _ZLIBIOAPI_H
-diff --git a/contrib/minizip/zip.c b/contrib/minizip/zip.c
-index 44e88a9cb989..65c0c7251843 100644
---- a/contrib/minizip/zip.c
-+++ b/contrib/minizip/zip.c
-@@ -26,7 +26,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <time.h>
--#include "zlib.h"
-+#include "third_party/zlib/zlib.h"
- #include "zip.h"
- 
- #ifdef STDC
-diff --git a/contrib/minizip/zip.h b/contrib/minizip/zip.h
-index 8aaebb623430..8c06c0aa7bb0 100644
---- a/contrib/minizip/zip.h
-+++ b/contrib/minizip/zip.h
-@@ -47,7 +47,7 @@ extern "C" {
- //#define HAVE_BZIP2
- 
- #ifndef _ZLIB_H
--#include "zlib.h"
-+#include "third_party/zlib/zlib.h"
- #endif
- 
- #ifndef _ZLIBIOAPI_H
-diff --git a/gzread.c b/gzread.c
-index 956b91ea7d9e..832d3ef98c59 100644
---- a/gzread.c
-+++ b/gzread.c
-@@ -443,7 +443,11 @@ z_size_t ZEXPORT gzfread(buf, size, nitems, file)
- #  undef z_gzgetc
- #else
- #  undef gzgetc
-+#  ifdef Z_CR_PREFIX_SET
-+#    define gzgetc Cr_z_gzgetc
-+#  endif
- #endif
-+
- int ZEXPORT gzgetc(file)
-     gzFile file;
- {
-diff --git a/names.h b/names.h
-new file mode 100644
-index 000000000000..f18df5684dc5
---- /dev/null
-+++ b/names.h
-@@ -0,0 +1,155 @@
-+/* Copyright 2017 The Chromium Authors. All rights reserved.
-+ * Use of this source code is governed by a BSD-style license that can be
-+ * found in the LICENSE file. */
-+
-+#ifndef THIRD_PARTY_ZLIB_NAMES_H_
-+#define THIRD_PARTY_ZLIB_NAMES_H_
-+
-+/* Rename all zlib names with a Cr_z_ prefix. This is based on the Z_PREFIX
-+ * option from zconf.h, but with a custom prefix. Where zconf.h would rename
-+ * both a macro and its underscore-suffixed internal implementation (such as
-+ * deflateInit2 and deflateInit2_), only the implementation is renamed here.
-+ * The Byte type is also omitted.
-+ *
-+ * To generate this list, run
-+ * sed -rn -e 's/^# *define +([^ ]+) +(z_[^ ]+)$/#define \1 Cr_\2/p' zconf.h
-+ * (use -E instead of -r on macOS).
-+ *
-+ * gzread is also addressed by modifications in gzread.c and zlib.h. */
-+
-+#define Z_CR_PREFIX_SET
-+
-+#define _dist_code Cr_z__dist_code
-+#define _length_code Cr_z__length_code
-+#define _tr_align Cr_z__tr_align
-+#define _tr_flush_bits Cr_z__tr_flush_bits
-+#define _tr_flush_block Cr_z__tr_flush_block
-+#define _tr_init Cr_z__tr_init
-+#define _tr_stored_block Cr_z__tr_stored_block
-+#define _tr_tally Cr_z__tr_tally
-+#define adler32 Cr_z_adler32
-+#define adler32_combine Cr_z_adler32_combine
-+#define adler32_combine64 Cr_z_adler32_combine64
-+#define adler32_z Cr_z_adler32_z
-+#define compress Cr_z_compress
-+#define compress2 Cr_z_compress2
-+#define compressBound Cr_z_compressBound
-+#define crc32 Cr_z_crc32
-+#define crc32_combine Cr_z_crc32_combine
-+#define crc32_combine64 Cr_z_crc32_combine64
-+#define crc32_z Cr_z_crc32_z
-+#define deflate Cr_z_deflate
-+#define deflateBound Cr_z_deflateBound
-+#define deflateCopy Cr_z_deflateCopy
-+#define deflateEnd Cr_z_deflateEnd
-+#define deflateGetDictionary Cr_z_deflateGetDictionary
-+/* #undef deflateInit */
-+/* #undef deflateInit2 */
-+#define deflateInit2_ Cr_z_deflateInit2_
-+#define deflateInit_ Cr_z_deflateInit_
-+#define deflateParams Cr_z_deflateParams
-+#define deflatePending Cr_z_deflatePending
-+#define deflatePrime Cr_z_deflatePrime
-+#define deflateReset Cr_z_deflateReset
-+#define deflateResetKeep Cr_z_deflateResetKeep
-+#define deflateSetDictionary Cr_z_deflateSetDictionary
-+#define deflateSetHeader Cr_z_deflateSetHeader
-+#define deflateTune Cr_z_deflateTune
-+#define deflate_copyright Cr_z_deflate_copyright
-+#define get_crc_table Cr_z_get_crc_table
-+#define gz_error Cr_z_gz_error
-+#define gz_intmax Cr_z_gz_intmax
-+#define gz_strwinerror Cr_z_gz_strwinerror
-+#define gzbuffer Cr_z_gzbuffer
-+#define gzclearerr Cr_z_gzclearerr
-+#define gzclose Cr_z_gzclose
-+#define gzclose_r Cr_z_gzclose_r
-+#define gzclose_w Cr_z_gzclose_w
-+#define gzdirect Cr_z_gzdirect
-+#define gzdopen Cr_z_gzdopen
-+#define gzeof Cr_z_gzeof
-+#define gzerror Cr_z_gzerror
-+#define gzflush Cr_z_gzflush
-+#define gzfread Cr_z_gzfread
-+#define gzfwrite Cr_z_gzfwrite
-+#define gzgetc Cr_z_gzgetc
-+#define gzgetc_ Cr_z_gzgetc_
-+#define gzgets Cr_z_gzgets
-+#define gzoffset Cr_z_gzoffset
-+#define gzoffset64 Cr_z_gzoffset64
-+#define gzopen Cr_z_gzopen
-+#define gzopen64 Cr_z_gzopen64
-+#define gzopen_w Cr_z_gzopen_w
-+#define gzprintf Cr_z_gzprintf
-+#define gzputc Cr_z_gzputc
-+#define gzputs Cr_z_gzputs
-+#define gzread Cr_z_gzread
-+#define gzrewind Cr_z_gzrewind
-+#define gzseek Cr_z_gzseek
-+#define gzseek64 Cr_z_gzseek64
-+#define gzsetparams Cr_z_gzsetparams
-+#define gztell Cr_z_gztell
-+#define gztell64 Cr_z_gztell64
-+#define gzungetc Cr_z_gzungetc
-+#define gzvprintf Cr_z_gzvprintf
-+#define gzwrite Cr_z_gzwrite
-+#define inflate Cr_z_inflate
-+#define inflateBack Cr_z_inflateBack
-+#define inflateBackEnd Cr_z_inflateBackEnd
-+/* #undef inflateBackInit */
-+#define inflateBackInit_ Cr_z_inflateBackInit_
-+#define inflateCodesUsed Cr_z_inflateCodesUsed
-+#define inflateCopy Cr_z_inflateCopy
-+#define inflateEnd Cr_z_inflateEnd
-+#define inflateGetDictionary Cr_z_inflateGetDictionary
-+#define inflateGetHeader Cr_z_inflateGetHeader
-+/* #undef inflateInit */
-+/* #undef inflateInit2 */
-+#define inflateInit2_ Cr_z_inflateInit2_
-+#define inflateInit_ Cr_z_inflateInit_
-+#define inflateMark Cr_z_inflateMark
-+#define inflatePrime Cr_z_inflatePrime
-+#define inflateReset Cr_z_inflateReset
-+#define inflateReset2 Cr_z_inflateReset2
-+#define inflateResetKeep Cr_z_inflateResetKeep
-+#define inflateSetDictionary Cr_z_inflateSetDictionary
-+#define inflateSync Cr_z_inflateSync
-+#define inflateSyncPoint Cr_z_inflateSyncPoint
-+#define inflateUndermine Cr_z_inflateUndermine
-+#define inflateValidate Cr_z_inflateValidate
-+#define inflate_copyright Cr_z_inflate_copyright
-+#define inflate_fast Cr_z_inflate_fast
-+#define inflate_table Cr_z_inflate_table
-+#define uncompress Cr_z_uncompress
-+#define uncompress2 Cr_z_uncompress2
-+#define zError Cr_z_zError
-+#define zcalloc Cr_z_zcalloc
-+#define zcfree Cr_z_zcfree
-+#define zlibCompileFlags Cr_z_zlibCompileFlags
-+#define zlibVersion Cr_z_zlibVersion
-+/* #undef Byte */
-+#define Bytef Cr_z_Bytef
-+#define alloc_func Cr_z_alloc_func
-+#define charf Cr_z_charf
-+#define free_func Cr_z_free_func
-+#define gzFile Cr_z_gzFile
-+#define gz_header Cr_z_gz_header
-+#define gz_headerp Cr_z_gz_headerp
-+#define in_func Cr_z_in_func
-+#define intf Cr_z_intf
-+#define out_func Cr_z_out_func
-+#define uInt Cr_z_uInt
-+#define uIntf Cr_z_uIntf
-+#define uLong Cr_z_uLong
-+#define uLongf Cr_z_uLongf
-+#define voidp Cr_z_voidp
-+#define voidpc Cr_z_voidpc
-+#define voidpf Cr_z_voidpf
-+#define gz_header_s Cr_z_gz_header_s
-+#define internal_state Cr_z_internal_state
-+/* #undef z_off64_t */
-+
-+/* An exported symbol that isn't handled by Z_PREFIX in zconf.h */
-+#define z_errmsg Cr_z_z_errmsg
-+
-+#endif  /* THIRD_PARTY_ZLIB_NAMES_H_ */
-diff --git a/zconf.h b/zconf.h
-index 5e1d68a004e9..a7a815f575a7 100644
---- a/zconf.h
-+++ b/zconf.h
-@@ -8,6 +8,9 @@
- #ifndef ZCONF_H
- #define ZCONF_H
- 
-+/* This include does prefixing as below, but with an updated set of names */
-+#include "names.h"
-+
- /*
-  * If you *really* need a unique prefix for all types and library functions,
-  * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
-@@ -431,7 +434,7 @@ typedef uLong FAR uLongf;
-    typedef unsigned long z_crc_t;
- #endif
- 
--#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
-+#if !defined(_WIN32)
- #  define Z_HAVE_UNISTD_H
- #endif
- 
-diff --git a/zlib.h b/zlib.h
-index f09cdaf1e054..99fd467f6b1a 100644
---- a/zlib.h
-+++ b/zlib.h
-@@ -1824,6 +1824,11 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
- #  undef z_gzgetc
- #  define z_gzgetc(g) \
-           ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
-+#elif defined(Z_CR_PREFIX_SET)
-+#    undef gzgetc
-+#    define gzgetc(g) \
-+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) \
-+                     : (Cr_z_gzgetc)(g))
- #else
- #  define gzgetc(g) \
-           ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
-@@ -1853,11 +1858,29 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
- #    define z_adler32_combine z_adler32_combine64
- #    define z_crc32_combine z_crc32_combine64
- #  else
-+#    ifdef gzopen
-+#      undef gzopen
-+#    endif
- #    define gzopen gzopen64
-+#    ifdef gzseek
-+#      undef gzseek
-+#    endif
- #    define gzseek gzseek64
-+#    ifdef gztell
-+#      undef gztell
-+#    endif
- #    define gztell gztell64
-+#    ifdef gzoffset
-+#      undef gzoffset
-+#    endif
- #    define gzoffset gzoffset64
-+#    ifdef adler32_combine
-+#      undef adler32_combine
-+#    endif
- #    define adler32_combine adler32_combine64
-+#    ifdef crc32_combine
-+#      undef crc32_combine
-+#    endif
- #    define crc32_combine crc32_combine64
- #  endif
- #  ifndef Z_LARGE64
-diff --git a/zutil.h b/zutil.h
-index b079ea6a80f5..80375b8b6109 100644
---- a/zutil.h
-+++ b/zutil.h
-@@ -28,6 +28,21 @@
- #  include <string.h>
- #  include <stdlib.h>
- #endif
-+#ifdef NO_ERRNO_H
-+#   ifdef _WIN32_WCE
-+      /* The Microsoft C Run-Time Library for Windows CE doesn't have
-+       * errno.  We define it as a global variable to simplify porting.
-+       * Its value is always 0 and should not be used.  We rename it to
-+       * avoid conflict with other libraries that use the same workaround.
-+       */
-+#     define errno z_errno
-+#   endif
-+    extern int errno;
-+#else
-+#  ifndef _WIN32_WCE
-+#    include <errno.h>
-+#  endif
-+#endif
- 
- #ifdef Z_SOLO
-    typedef long ptrdiff_t;  /* guess -- will be caught if guess is wrong */
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/google/BUILD.gn b/extern/crashpad/crashpad/third_party/zlib/zlib/google/BUILD.gn
new file mode 100644
index 0000000000..122cef573d
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/google/BUILD.gn
@@ -0,0 +1,59 @@
+# Copyright 2017 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build_overrides/build.gni")
+
+if (build_with_chromium && is_ios) {
+  import("//build/config/ios/bundle_data_from_filelist.gni")
+}
+
+if (build_with_chromium) {
+  static_library("zip") {
+    sources = [
+      "redact.h",
+      "zip.cc",
+      "zip.h",
+      "zip_internal.cc",
+      "zip_internal.h",
+      "zip_reader.cc",
+      "zip_reader.h",
+      "zip_writer.cc",
+      "zip_writer.h",
+    ]
+    deps = [
+      "..:minizip",
+      "//base",
+      "//base:i18n",
+    ]
+  }
+
+  static_library("compression_utils") {
+    sources = [
+      "compression_utils.cc",
+      "compression_utils.h",
+    ]
+    deps = [
+      "..",
+      "//base",
+    ]
+    public_deps = [ ":compression_utils_portable" ]
+  }
+
+  if (is_ios) {
+    bundle_data_from_filelist("zlib_pak_bundle_data") {
+      testonly = true
+      filelist_name = "test_data.filelist"
+    }
+  }
+}
+
+# This allows other users of Chromium's zlib library, but don't use Chromium's
+# //base, to reuse some boilerplate code.
+static_library("compression_utils_portable") {
+  sources = [
+    "compression_utils_portable.cc",
+    "compression_utils_portable.h",
+  ]
+  public_deps = [ ".." ]
+}
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/google/DEPS b/extern/crashpad/crashpad/third_party/zlib/zlib/google/DEPS
index 144fbd1492..7ec5343ee2 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/google/DEPS
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/google/DEPS
@@ -2,4 +2,6 @@ include_rules = [
   '+base',
   '+build',
   '+testing',
+  '+third_party/icu/source/i18n/unicode',
+  '+third_party/zlib/zlib.h',
 ]
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/google/OWNERS b/extern/crashpad/crashpad/third_party/zlib/zlib/google/OWNERS
index 1ca2531463..868af3cc66 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/google/OWNERS
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/google/OWNERS
@@ -3,3 +3,4 @@ satorux@chromium.org
 # compression_utils*
 asvitkine@chromium.org
 isherman@chromium.org
+cavalcantii@chromium.org
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/google/compression_utils.cc b/extern/crashpad/crashpad/third_party/zlib/zlib/google/compression_utils.cc
index 575aa12619..279ea07329 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/google/compression_utils.cc
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/google/compression_utils.cc
@@ -1,165 +1,134 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "third_party/zlib/google/compression_utils.h"
 
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
-
-#include <vector>
-
 #include "base/bit_cast.h"
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/process/memory.h"
 #include "base/sys_byteorder.h"
-#include "third_party/zlib/zlib.h"
-
-namespace {
-
-// The difference in bytes between a zlib header and a gzip header.
-const size_t kGzipZlibHeaderDifferenceBytes = 16;
-
-// Pass an integer greater than the following get a gzip header instead of a
-// zlib header when calling deflateInit2() and inflateInit2().
-const int kWindowBitsToGetGzipHeader = 16;
-
-// This describes the amount of memory zlib uses to compress data. It can go
-// from 1 to 9, with 8 being the default. For details, see:
-// http://www.zlib.net/manual.html (search for memLevel).
-const int kZlibMemoryLevel = 8;
-
-// This code is taken almost verbatim from third_party/zlib/compress.c. The only
-// difference is deflateInit2() is called which sets the window bits to be > 16.
-// That causes a gzip header to be emitted rather than a zlib header.
-int GzipCompressHelper(Bytef* dest,
-                       uLongf* dest_length,
-                       const Bytef* source,
-                       uLong source_length) {
-  z_stream stream;
-
-  stream.next_in = bit_cast<Bytef*>(source);
-  stream.avail_in = static_cast<uInt>(source_length);
-  stream.next_out = dest;
-  stream.avail_out = static_cast<uInt>(*dest_length);
-  if (static_cast<uLong>(stream.avail_out) != *dest_length)
-    return Z_BUF_ERROR;
-
-  stream.zalloc = static_cast<alloc_func>(0);
-  stream.zfree = static_cast<free_func>(0);
-  stream.opaque = static_cast<voidpf>(0);
-
-  gz_header gzip_header;
-  memset(&gzip_header, 0, sizeof(gzip_header));
-  int err = deflateInit2(&stream,
-                         Z_DEFAULT_COMPRESSION,
-                         Z_DEFLATED,
-                         MAX_WBITS + kWindowBitsToGetGzipHeader,
-                         kZlibMemoryLevel,
-                         Z_DEFAULT_STRATEGY);
-  if (err != Z_OK)
-    return err;
-
-  err = deflateSetHeader(&stream, &gzip_header);
-  if (err != Z_OK)
-    return err;
-
-  err = deflate(&stream, Z_FINISH);
-  if (err != Z_STREAM_END) {
-    deflateEnd(&stream);
-    return err == Z_OK ? Z_BUF_ERROR : err;
-  }
-  *dest_length = stream.total_out;
 
-  err = deflateEnd(&stream);
-  return err;
-}
+#include "third_party/zlib/google/compression_utils_portable.h"
 
-// This code is taken almost verbatim from third_party/zlib/uncompr.c. The only
-// difference is inflateInit2() is called which sets the window bits to be > 16.
-// That causes a gzip header to be parsed rather than a zlib header.
-int GzipUncompressHelper(Bytef* dest,
-                         uLongf* dest_length,
-                         const Bytef* source,
-                         uLong source_length) {
-  z_stream stream;
-
-  stream.next_in = bit_cast<Bytef*>(source);
-  stream.avail_in = static_cast<uInt>(source_length);
-  if (static_cast<uLong>(stream.avail_in) != source_length)
-    return Z_BUF_ERROR;
-
-  stream.next_out = dest;
-  stream.avail_out = static_cast<uInt>(*dest_length);
-  if (static_cast<uLong>(stream.avail_out) != *dest_length)
-    return Z_BUF_ERROR;
-
-  stream.zalloc = static_cast<alloc_func>(0);
-  stream.zfree = static_cast<free_func>(0);
-
-  int err = inflateInit2(&stream, MAX_WBITS + kWindowBitsToGetGzipHeader);
-  if (err != Z_OK)
-    return err;
-
-  err = inflate(&stream, Z_FINISH);
-  if (err != Z_STREAM_END) {
-    inflateEnd(&stream);
-    if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0))
-      return Z_DATA_ERROR;
-    return err;
-  }
-  *dest_length = stream.total_out;
+namespace compression {
 
-  err = inflateEnd(&stream);
-  return err;
+bool GzipCompress(base::span<const char> input,
+                  char* output_buffer,
+                  size_t output_buffer_size,
+                  size_t* compressed_size,
+                  void* (*malloc_fn)(size_t),
+                  void (*free_fn)(void*)) {
+  static_assert(sizeof(Bytef) == 1, "");
+
+  // uLongf can be larger than size_t.
+  uLongf compressed_size_long = static_cast<uLongf>(output_buffer_size);
+  if (zlib_internal::GzipCompressHelper(
+          base::bit_cast<Bytef*>(output_buffer), &compressed_size_long,
+          base::bit_cast<const Bytef*>(input.data()),
+          static_cast<uLongf>(input.size()), malloc_fn, free_fn) != Z_OK) {
+    return false;
+  }
+  // No overflow, as compressed_size_long <= output.size() which is a size_t.
+  *compressed_size = static_cast<size_t>(compressed_size_long);
+  return true;
 }
 
-// Returns the uncompressed size from GZIP-compressed |compressed_data|.
-uint32_t GetUncompressedSize(const std::string& compressed_data) {
-  // The uncompressed size is stored in the last 4 bytes of |input| in LE.
-  uint32_t size;
-  if (compressed_data.length() < sizeof(size))
-    return 0;
-  memcpy(&size, &compressed_data[compressed_data.length() - sizeof(size)],
-         sizeof(size));
-  return base::ByteSwapToLE32(size);
+bool GzipCompress(base::span<const char> input, std::string* output) {
+  return GzipCompress(base::as_bytes(input), output);
 }
 
-}  // namespace
+bool GzipCompress(base::span<const uint8_t> input, std::string* output) {
+  // Not using std::vector<> because allocation failures are recoverable,
+  // which is hidden by std::vector<>.
+  static_assert(sizeof(Bytef) == 1, "");
+  const uLongf input_size = static_cast<uLongf>(input.size());
 
-namespace compression {
+  uLongf compressed_data_size =
+      zlib_internal::GzipExpectedCompressedSize(input_size);
 
-bool GzipCompress(const std::string& input, std::string* output) {
-  const uLongf input_size = static_cast<uLongf>(input.size());
-  std::vector<Bytef> compressed_data(kGzipZlibHeaderDifferenceBytes +
-                                     compressBound(input_size));
-
-  uLongf compressed_size = static_cast<uLongf>(compressed_data.size());
-  if (GzipCompressHelper(&compressed_data.front(),
-                         &compressed_size,
-                         bit_cast<const Bytef*>(input.data()),
-                         input_size) != Z_OK) {
+  Bytef* compressed_data;
+  if (!base::UncheckedMalloc(compressed_data_size,
+                             reinterpret_cast<void**>(&compressed_data))) {
+    return false;
+  }
+
+  if (zlib_internal::GzipCompressHelper(
+          compressed_data, &compressed_data_size,
+          base::bit_cast<const Bytef*>(input.data()), input_size, nullptr,
+          nullptr) != Z_OK) {
+    free(compressed_data);
     return false;
   }
 
-  compressed_data.resize(compressed_size);
-  output->assign(compressed_data.begin(), compressed_data.end());
+  Bytef* resized_data =
+      reinterpret_cast<Bytef*>(realloc(compressed_data, compressed_data_size));
+  if (!resized_data) {
+    free(compressed_data);
+    return false;
+  }
+  output->assign(resized_data, resized_data + compressed_data_size);
   DCHECK_EQ(input_size, GetUncompressedSize(*output));
+
+  free(resized_data);
   return true;
 }
 
 bool GzipUncompress(const std::string& input, std::string* output) {
   std::string uncompressed_output;
   uLongf uncompressed_size = static_cast<uLongf>(GetUncompressedSize(input));
+  if (size_t{uncompressed_size} > uncompressed_output.max_size())
+    return false;
+
   uncompressed_output.resize(uncompressed_size);
-  if (GzipUncompressHelper(bit_cast<Bytef*>(uncompressed_output.data()),
-                           &uncompressed_size,
-                           bit_cast<const Bytef*>(input.data()),
-                           static_cast<uLongf>(input.length())) == Z_OK) {
+  if (zlib_internal::GzipUncompressHelper(
+          base::bit_cast<Bytef*>(uncompressed_output.data()),
+          &uncompressed_size, base::bit_cast<const Bytef*>(input.data()),
+          static_cast<uLongf>(input.length())) == Z_OK) {
     output->swap(uncompressed_output);
     return true;
   }
   return false;
 }
 
+bool GzipUncompress(base::span<const char> input,
+                    base::span<const char> output) {
+  return GzipUncompress(base::as_bytes(input), base::as_bytes(output));
+}
+
+bool GzipUncompress(base::span<const uint8_t> input,
+                    base::span<const uint8_t> output) {
+  uLongf uncompressed_size = GetUncompressedSize(input);
+  if (uncompressed_size > output.size())
+    return false;
+  return zlib_internal::GzipUncompressHelper(
+             base::bit_cast<Bytef*>(output.data()), &uncompressed_size,
+             base::bit_cast<const Bytef*>(input.data()),
+             static_cast<uLongf>(input.size())) == Z_OK;
+}
+
+bool GzipUncompress(base::span<const char> input, std::string* output) {
+  return GzipUncompress(base::as_bytes(input), output);
+}
+
+bool GzipUncompress(base::span<const uint8_t> input, std::string* output) {
+  // Disallow in-place usage, i.e., |input| using |*output| as underlying data.
+  DCHECK_NE(reinterpret_cast<const char*>(input.data()), output->data());
+  uLongf uncompressed_size = GetUncompressedSize(input);
+  output->resize(uncompressed_size);
+  return zlib_internal::GzipUncompressHelper(
+             base::bit_cast<Bytef*>(output->data()), &uncompressed_size,
+             base::bit_cast<const Bytef*>(input.data()),
+             static_cast<uLongf>(input.size())) == Z_OK;
+}
+
+uint32_t GetUncompressedSize(base::span<const char> compressed_data) {
+  return GetUncompressedSize(base::as_bytes(compressed_data));
+}
+
+uint32_t GetUncompressedSize(base::span<const uint8_t> compressed_data) {
+  return zlib_internal::GetGzipUncompressedSize(
+      base::bit_cast<Bytef*>(compressed_data.data()), compressed_data.size());
+}
+
 }  // namespace compression
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/google/compression_utils.h b/extern/crashpad/crashpad/third_party/zlib/zlib/google/compression_utils.h
index 3bd68c57ec..ea399816f6 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/google/compression_utils.h
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/google/compression_utils.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,16 +7,64 @@
 
 #include <string>
 
+#include "base/containers/span.h"
+
 namespace compression {
 
+// Compresses the data in |input| using gzip, storing the result in
+// |output_buffer|, of size |output_buffer_size|. If the buffer is large enough
+// and compression succeeds, |compressed_size| points to the compressed data
+// size after the call.
+// |malloc_fn| and |free_fn| are pointers to malloc() and free()-like functions,
+// or nullptr to use the standard ones.
+// Returns true for success.
+bool GzipCompress(base::span<const char> input,
+                  char* output_buffer,
+                  size_t output_buffer_size,
+                  size_t* compressed_size,
+                  void* (*malloc_fn)(size_t),
+                  void (*free_fn)(void*));
+
 // Compresses the data in |input| using gzip, storing the result in |output|.
-// |input| and |output| are allowed to be the same string (in-place operation).
-bool GzipCompress(const std::string& input, std::string* output);
+// |input| and |output| are allowed to point to the same string (in-place
+// operation).
+// Returns true for success.
+bool GzipCompress(base::span<const char> input, std::string* output);
+
+// Like the above method, but using uint8_t instead.
+bool GzipCompress(base::span<const uint8_t> input, std::string* output);
 
 // Uncompresses the data in |input| using gzip, storing the result in |output|.
 // |input| and |output| are allowed to be the same string (in-place operation).
+// Returns true for success.
 bool GzipUncompress(const std::string& input, std::string* output);
 
+// Like the above method, but uses base::span to avoid allocations if
+// needed. |output|'s size must be at least as large as the return value from
+// GetUncompressedSize.
+// Returns true for success.
+bool GzipUncompress(base::span<const char> input,
+                    base::span<const char> output);
+
+// Like the above method, but using uint8_t instead.
+bool GzipUncompress(base::span<const uint8_t> input,
+                    base::span<const uint8_t> output);
+
+// Uncompresses the data in |input| using gzip, and writes the results to
+// |output|, which must NOT be the underlying string of |input|, and is resized
+// if necessary.
+// Returns true for success.
+bool GzipUncompress(base::span<const char> input, std::string* output);
+
+// Like the above method, but using uint8_t instead.
+bool GzipUncompress(base::span<const uint8_t> input, std::string* output);
+
+// Returns the uncompressed size from GZIP-compressed |compressed_data|.
+uint32_t GetUncompressedSize(base::span<const char> compressed_data);
+
+// Like the above method, but using uint8_t instead.
+uint32_t GetUncompressedSize(base::span<const uint8_t> compressed_data);
+
 }  // namespace compression
 
 #endif  // THIRD_PARTY_ZLIB_GOOGLE_COMPRESSION_UTILS_H_
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/google/compression_utils_portable.cc b/extern/crashpad/crashpad/third_party/zlib/zlib/google/compression_utils_portable.cc
new file mode 100644
index 0000000000..49d6bfe9ea
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/google/compression_utils_portable.cc
@@ -0,0 +1,205 @@
+/* compression_utils_portable.cc
+ *
+ * Copyright 2019 The Chromium Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the Chromium source repository LICENSE file.
+ */
+
+#include "compression_utils_portable.h"
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+namespace zlib_internal {
+
+// The difference in bytes between a zlib header and a gzip header.
+const size_t kGzipZlibHeaderDifferenceBytes = 16;
+
+// Pass an integer greater than the following get a gzip header instead of a
+// zlib header when calling deflateInit2() and inflateInit2().
+const int kWindowBitsToGetGzipHeader = 16;
+
+// This describes the amount of memory zlib uses to compress data. It can go
+// from 1 to 9, with 8 being the default. For details, see:
+// http://www.zlib.net/manual.html (search for memLevel).
+const int kZlibMemoryLevel = 8;
+
+// The expected compressed size is based on the input size factored by
+// internal Zlib constants (e.g. window size, etc) plus the wrapper
+// header size.
+uLongf GzipExpectedCompressedSize(uLongf input_size) {
+  return kGzipZlibHeaderDifferenceBytes + compressBound(input_size);
+}
+
+// The expected decompressed size is stored in the last
+// 4 bytes of |input| in LE. See https://tools.ietf.org/html/rfc1952#page-5
+uint32_t GetGzipUncompressedSize(const Bytef* compressed_data, size_t length) {
+  uint32_t size;
+  if (length < sizeof(size))
+    return 0;
+
+  memcpy(&size, &compressed_data[length - sizeof(size)], sizeof(size));
+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+  return size;
+#else
+  return __builtin_bswap32(size);
+#endif
+}
+
+// The number of window bits determines the type of wrapper to use - see
+// https://cs.chromium.org/chromium/src/third_party/zlib/zlib.h?l=566
+inline int ZlibStreamWrapperType(WrapperType type) {
+  if (type == ZLIB)  // zlib DEFLATE stream wrapper
+    return MAX_WBITS;
+  if (type == GZIP)  // gzip DEFLATE stream wrapper
+    return MAX_WBITS + kWindowBitsToGetGzipHeader;
+  if (type == ZRAW)  // no wrapper, use raw DEFLATE
+    return -MAX_WBITS;
+  return 0;
+}
+
+int GzipCompressHelper(Bytef* dest,
+                       uLongf* dest_length,
+                       const Bytef* source,
+                       uLong source_length,
+                       void* (*malloc_fn)(size_t),
+                       void (*free_fn)(void*)) {
+  return CompressHelper(GZIP, dest, dest_length, source, source_length,
+                        Z_DEFAULT_COMPRESSION, malloc_fn, free_fn);
+}
+
+// This code is taken almost verbatim from third_party/zlib/compress.c. The only
+// difference is deflateInit2() is called which allows different window bits to
+// be set. > 16 causes a gzip header to be emitted rather than a zlib header,
+// and negative causes no header to emitted.
+//
+// Compression level can be a number from 1-9, with 1 being the fastest, 9 being
+// the best compression. The default, which the GZIP helper uses, is 6.
+int CompressHelper(WrapperType wrapper_type,
+                   Bytef* dest,
+                   uLongf* dest_length,
+                   const Bytef* source,
+                   uLong source_length,
+                   int compression_level,
+                   void* (*malloc_fn)(size_t),
+                   void (*free_fn)(void*)) {
+  if (compression_level < 0 || compression_level > 9) {
+    compression_level = Z_DEFAULT_COMPRESSION;
+  }
+
+  z_stream stream;
+
+  // FIXME(cavalcantii): z_const is not defined as 'const'.
+  stream.next_in = static_cast<z_const Bytef*>(const_cast<Bytef*>(source));
+  stream.avail_in = static_cast<uInt>(source_length);
+  stream.next_out = dest;
+  stream.avail_out = static_cast<uInt>(*dest_length);
+  if (static_cast<uLong>(stream.avail_out) != *dest_length)
+    return Z_BUF_ERROR;
+
+  // Cannot convert capturing lambdas to function pointers directly, hence the
+  // structure.
+  struct MallocFreeFunctions {
+    void* (*malloc_fn)(size_t);
+    void (*free_fn)(void*);
+  } malloc_free = {malloc_fn, free_fn};
+
+  if (malloc_fn) {
+    if (!free_fn)
+      return Z_BUF_ERROR;
+
+    auto zalloc = [](void* opaque, uInt items, uInt size) {
+      return reinterpret_cast<MallocFreeFunctions*>(opaque)->malloc_fn(items *
+                                                                       size);
+    };
+    auto zfree = [](void* opaque, void* address) {
+      return reinterpret_cast<MallocFreeFunctions*>(opaque)->free_fn(address);
+    };
+
+    stream.zalloc = static_cast<alloc_func>(zalloc);
+    stream.zfree = static_cast<free_func>(zfree);
+    stream.opaque = static_cast<voidpf>(&malloc_free);
+  } else {
+    stream.zalloc = static_cast<alloc_func>(0);
+    stream.zfree = static_cast<free_func>(0);
+    stream.opaque = static_cast<voidpf>(0);
+  }
+
+  int err = deflateInit2(&stream, compression_level, Z_DEFLATED,
+                         ZlibStreamWrapperType(wrapper_type), kZlibMemoryLevel,
+                         Z_DEFAULT_STRATEGY);
+  if (err != Z_OK)
+    return err;
+
+  // This has to exist outside of the if statement to prevent it going off the
+  // stack before deflate(), which will use this object.
+  gz_header gzip_header;
+  if (wrapper_type == GZIP) {
+    memset(&gzip_header, 0, sizeof(gzip_header));
+    err = deflateSetHeader(&stream, &gzip_header);
+    if (err != Z_OK)
+      return err;
+  }
+
+  err = deflate(&stream, Z_FINISH);
+  if (err != Z_STREAM_END) {
+    deflateEnd(&stream);
+    return err == Z_OK ? Z_BUF_ERROR : err;
+  }
+  *dest_length = stream.total_out;
+
+  err = deflateEnd(&stream);
+  return err;
+}
+
+int GzipUncompressHelper(Bytef* dest,
+                         uLongf* dest_length,
+                         const Bytef* source,
+                         uLong source_length) {
+  return UncompressHelper(GZIP, dest, dest_length, source, source_length);
+}
+
+// This code is taken almost verbatim from third_party/zlib/uncompr.c. The only
+// difference is inflateInit2() is called which allows different window bits to
+// be set. > 16 causes a gzip header to be emitted rather than a zlib header,
+// and negative causes no header to emitted.
+int UncompressHelper(WrapperType wrapper_type,
+                     Bytef* dest,
+                     uLongf* dest_length,
+                     const Bytef* source,
+                     uLong source_length) {
+  z_stream stream;
+
+  // FIXME(cavalcantii): z_const is not defined as 'const'.
+  stream.next_in = static_cast<z_const Bytef*>(const_cast<Bytef*>(source));
+  stream.avail_in = static_cast<uInt>(source_length);
+  if (static_cast<uLong>(stream.avail_in) != source_length)
+    return Z_BUF_ERROR;
+
+  stream.next_out = dest;
+  stream.avail_out = static_cast<uInt>(*dest_length);
+  if (static_cast<uLong>(stream.avail_out) != *dest_length)
+    return Z_BUF_ERROR;
+
+  stream.zalloc = static_cast<alloc_func>(0);
+  stream.zfree = static_cast<free_func>(0);
+
+  int err = inflateInit2(&stream, ZlibStreamWrapperType(wrapper_type));
+  if (err != Z_OK)
+    return err;
+
+  err = inflate(&stream, Z_FINISH);
+  if (err != Z_STREAM_END) {
+    inflateEnd(&stream);
+    if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0))
+      return Z_DATA_ERROR;
+    return err;
+  }
+  *dest_length = stream.total_out;
+
+  err = inflateEnd(&stream);
+  return err;
+}
+
+}  // namespace zlib_internal
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/google/compression_utils_portable.h b/extern/crashpad/crashpad/third_party/zlib/zlib/google/compression_utils_portable.h
new file mode 100644
index 0000000000..92b033e889
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/google/compression_utils_portable.h
@@ -0,0 +1,63 @@
+/* compression_utils_portable.h
+ *
+ * Copyright 2019 The Chromium Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the Chromium source repository LICENSE file.
+ */
+#ifndef THIRD_PARTY_ZLIB_GOOGLE_COMPRESSION_UTILS_PORTABLE_H_
+#define THIRD_PARTY_ZLIB_GOOGLE_COMPRESSION_UTILS_PORTABLE_H_
+
+#include <stdint.h>
+
+/* TODO(cavalcantii): remove support for Chromium ever building with a system
+ * zlib.
+ */
+#if defined(USE_SYSTEM_ZLIB)
+#include <zlib.h>
+/* AOSP build requires relative paths. */
+#else
+#include "zlib.h"
+#endif
+
+namespace zlib_internal {
+
+enum WrapperType {
+  ZLIB,
+  GZIP,
+  ZRAW,
+};
+
+uLongf GzipExpectedCompressedSize(uLongf input_size);
+
+uint32_t GetGzipUncompressedSize(const Bytef* compressed_data, size_t length);
+
+int GzipCompressHelper(Bytef* dest,
+                       uLongf* dest_length,
+                       const Bytef* source,
+                       uLong source_length,
+                       void* (*malloc_fn)(size_t),
+                       void (*free_fn)(void*));
+
+int CompressHelper(WrapperType wrapper_type,
+                   Bytef* dest,
+                   uLongf* dest_length,
+                   const Bytef* source,
+                   uLong source_length,
+                   int compression_level,
+                   void* (*malloc_fn)(size_t),
+                   void (*free_fn)(void*));
+
+int GzipUncompressHelper(Bytef* dest,
+                         uLongf* dest_length,
+                         const Bytef* source,
+                         uLong source_length);
+
+int UncompressHelper(WrapperType wrapper_type,
+                     Bytef* dest,
+                     uLongf* dest_length,
+                     const Bytef* source,
+                     uLong source_length);
+
+}  // namespace zlib_internal
+
+#endif  // THIRD_PARTY_ZLIB_GOOGLE_COMPRESSION_UTILS_PORTABLE_H_
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/google/compression_utils_unittest.cc b/extern/crashpad/crashpad/third_party/zlib/zlib/google/compression_utils_unittest.cc
index adcb773761..8e24387ee3 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/google/compression_utils_unittest.cc
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/google/compression_utils_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,10 +7,9 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include <iterator>
 #include <string>
 
-#include "base/logging.h"
-#include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace compression {
@@ -34,24 +33,33 @@ const uint8_t kCompressedData[] = {
 }  // namespace
 
 TEST(CompressionUtilsTest, GzipCompression) {
-  std::string data(reinterpret_cast<const char*>(kData), arraysize(kData));
+  std::string data(reinterpret_cast<const char*>(kData), std::size(kData));
   std::string compressed_data;
   EXPECT_TRUE(GzipCompress(data, &compressed_data));
   std::string golden_compressed_data(
       reinterpret_cast<const char*>(kCompressedData),
-      arraysize(kCompressedData));
+      std::size(kCompressedData));
   EXPECT_EQ(golden_compressed_data, compressed_data);
 }
 
 TEST(CompressionUtilsTest, GzipUncompression) {
   std::string compressed_data(reinterpret_cast<const char*>(kCompressedData),
-                              arraysize(kCompressedData));
+                              std::size(kCompressedData));
 
   std::string uncompressed_data;
   EXPECT_TRUE(GzipUncompress(compressed_data, &uncompressed_data));
 
   std::string golden_data(reinterpret_cast<const char*>(kData),
-                          arraysize(kData));
+                          std::size(kData));
+  EXPECT_EQ(golden_data, uncompressed_data);
+}
+
+TEST(CompressionUtilsTest, GzipUncompressionFromSpanToString) {
+  std::string uncompressed_data;
+  EXPECT_TRUE(GzipUncompress(kCompressedData, &uncompressed_data));
+
+  std::string golden_data(reinterpret_cast<const char*>(kData),
+                          std::size(kData));
   EXPECT_EQ(golden_data, uncompressed_data);
 }
 
@@ -76,10 +84,10 @@ TEST(CompressionUtilsTest, LargeInput) {
 
 TEST(CompressionUtilsTest, InPlace) {
   const std::string original_data(reinterpret_cast<const char*>(kData),
-                                  arraysize(kData));
+                                  std::size(kData));
   const std::string golden_compressed_data(
       reinterpret_cast<const char*>(kCompressedData),
-      arraysize(kCompressedData));
+      std::size(kCompressedData));
 
   std::string data(original_data);
   EXPECT_TRUE(GzipCompress(data, &data));
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/google/redact.h b/extern/crashpad/crashpad/third_party/zlib/zlib/google/redact.h
new file mode 100644
index 0000000000..df6bcafc2a
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/google/redact.h
@@ -0,0 +1,31 @@
+// Copyright 2022 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+#ifndef THIRD_PARTY_ZLIB_GOOGLE_REDACT_H_
+#define THIRD_PARTY_ZLIB_GOOGLE_REDACT_H_
+
+#include <ostream>
+
+#include "base/files/file_path.h"
+#include "base/logging.h"
+
+namespace zip {
+
+// Redacts file paths in log messages.
+// Example:
+// LOG(ERROR) << "Cannot open " << Redact(path);
+class Redact {
+ public:
+  explicit Redact(const base::FilePath& path) : path_(path) {}
+
+  friend std::ostream& operator<<(std::ostream& out, const Redact&& r) {
+    return LOG_IS_ON(INFO) ? out << "'" << r.path_ << "'" : out << "(redacted)";
+  }
+
+ private:
+  const base::FilePath& path_;
+};
+
+}  // namespace zip
+
+#endif  // THIRD_PARTY_ZLIB_GOOGLE_REDACT_H_
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/Different Encryptions.zip b/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/Different Encryptions.zip
new file mode 100644
index 0000000000..858e7c74b6
Binary files /dev/null and b/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/Different Encryptions.zip differ
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/Empty Dir Same Name As File.zip b/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/Empty Dir Same Name As File.zip
new file mode 100644
index 0000000000..e26c42d158
Binary files /dev/null and b/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/Empty Dir Same Name As File.zip differ
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/Mixed Paths.zip b/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/Mixed Paths.zip
new file mode 100644
index 0000000000..881f498599
Binary files /dev/null and b/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/Mixed Paths.zip differ
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/Parent Dir Same Name As File.zip b/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/Parent Dir Same Name As File.zip
new file mode 100644
index 0000000000..76cfd906ed
Binary files /dev/null and b/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/Parent Dir Same Name As File.zip differ
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/README.md b/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/README.md
new file mode 100644
index 0000000000..c76648fb08
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/README.md
@@ -0,0 +1,15 @@
+## test\_posix\_permissions.zip
+Rebuild this zip by running:
+```
+rm test_posix_permissions.zip &&
+mkdir z &&
+cd z &&
+touch 0.txt 1.txt 2.txt 3.txt &&
+chmod a+x 0.txt &&
+chmod o+x 1.txt &&
+chmod u+x 2.txt &&
+zip test_posix_permissions.zip * &&
+mv test_posix_permissions.zip .. &&
+cd .. &&
+rm -r z
+```
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/Repeated Dir Name.zip b/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/Repeated Dir Name.zip
new file mode 100644
index 0000000000..2375bc7697
Binary files /dev/null and b/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/Repeated Dir Name.zip differ
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/Repeated File Name With Different Cases.zip b/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/Repeated File Name With Different Cases.zip
new file mode 100644
index 0000000000..9eb44e1a50
Binary files /dev/null and b/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/Repeated File Name With Different Cases.zip differ
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/Repeated File Name.zip b/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/Repeated File Name.zip
new file mode 100644
index 0000000000..4a3e7b13c6
Binary files /dev/null and b/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/Repeated File Name.zip differ
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/SJIS Bug 846195.zip b/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/SJIS Bug 846195.zip
new file mode 100644
index 0000000000..078300284e
Binary files /dev/null and b/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/SJIS Bug 846195.zip differ
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/Windows Special Names.zip b/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/Windows Special Names.zip
new file mode 100644
index 0000000000..4fac907fa7
Binary files /dev/null and b/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/Windows Special Names.zip differ
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/Wrong CRC.zip b/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/Wrong CRC.zip
new file mode 100644
index 0000000000..ee9a1ef054
Binary files /dev/null and b/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/Wrong CRC.zip differ
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/create_test_zip.sh b/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/create_test_zip.sh
old mode 100755
new mode 100644
index e19d675374..620e8f6d6d
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/create_test_zip.sh
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/create_test_zip.sh
@@ -1,15 +1,17 @@
 #!/bin/bash
 #
-# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Copyright 2011 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
-# Run this script in its directory to recreate test.zip
-# and test_nocompress.zip.
+# Run this script in its directory to recreate test.zip, test_nocompress.zip,
+# and test_encrypted.zip
 
 rm test.zip
 rm test_nocompress.zip
+rm test_encrypted.zip
 pushd test
 zip -r ../test.zip .
 zip -r -0 ../test_nocompress.zip .
+zip -P "fake_password" -r ../test_encrypted.zip .
 popd
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/empty.zip b/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/empty.zip
new file mode 100644
index 0000000000..15cb0ecb3e
Binary files /dev/null and b/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/empty.zip differ
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/test_encrypted.zip b/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/test_encrypted.zip
new file mode 100644
index 0000000000..5e2a75759a
Binary files /dev/null and b/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/test_encrypted.zip differ
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/test_posix_permissions.zip b/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/test_posix_permissions.zip
new file mode 100644
index 0000000000..a058ba1744
Binary files /dev/null and b/extern/crashpad/crashpad/third_party/zlib/zlib/google/test/data/test_posix_permissions.zip differ
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/google/test_data.filelist b/extern/crashpad/crashpad/third_party/zlib/zlib/google/test_data.filelist
new file mode 100644
index 0000000000..0a9d20bcea
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/google/test_data.filelist
@@ -0,0 +1,32 @@
+# Copyright 2023 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+# NOTE: this file is generated by build/ios/update_bundle_filelist.py
+#       If it requires updating, you should get a presubmit error with
+#       instructions on how to regenerate. Otherwise, do not edit.
+test/data/Different Encryptions.zip
+test/data/Empty Dir Same Name As File.zip
+test/data/Mixed Paths.zip
+test/data/Parent Dir Same Name As File.zip
+test/data/README.md
+test/data/Repeated Dir Name.zip
+test/data/Repeated File Name With Different Cases.zip
+test/data/Repeated File Name.zip
+test/data/SJIS Bug 846195.zip
+test/data/Windows Special Names.zip
+test/data/Wrong CRC.zip
+test/data/create_test_zip.sh
+test/data/empty.zip
+test/data/evil.zip
+test/data/evil_via_absolute_file_name.zip
+test/data/evil_via_invalid_utf8.zip
+test/data/test.zip
+test/data/test/foo.txt
+test/data/test/foo/bar.txt
+test/data/test/foo/bar/.hidden
+test/data/test/foo/bar/baz.txt
+test/data/test/foo/bar/quux.txt
+test/data/test_encrypted.zip
+test/data/test_mismatch_size.zip
+test/data/test_nocompress.zip
+test/data/test_posix_permissions.zip
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/google/test_data.globlist b/extern/crashpad/crashpad/third_party/zlib/zlib/google/test_data.globlist
new file mode 100644
index 0000000000..117a1e507d
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/google/test_data.globlist
@@ -0,0 +1,8 @@
+# Copyright 2023 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+#
+# See build/ios/update_bundle_filelist.py for details on how .globlist
+# files are used to update their .filelist counterparts.
+test/data/**
+test/data/test/foo/bar/.hidden
\ No newline at end of file
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip.cc b/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip.cc
index f0183d3f36..87065b9188 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip.cc
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,213 +7,268 @@
 #include <string>
 #include <vector>
 
-#include "base/bind.h"
 #include "base/files/file.h"
 #include "base/files/file_enumerator.h"
+#include "base/files/file_util.h"
+#include "base/functional/bind.h"
 #include "base/logging.h"
-#include "base/strings/string16.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
+#include "third_party/zlib/google/redact.h"
 #include "third_party/zlib/google/zip_internal.h"
 #include "third_party/zlib/google/zip_reader.h"
+#include "third_party/zlib/google/zip_writer.h"
 
-#if defined(USE_SYSTEM_MINIZIP)
-#include <minizip/unzip.h>
-#include <minizip/zip.h>
-#else
-#include "third_party/zlib/contrib/minizip/unzip.h"
-#include "third_party/zlib/contrib/minizip/zip.h"
-#endif
-
+namespace zip {
 namespace {
 
-bool AddFileToZip(zipFile zip_file, const base::FilePath& src_dir) {
-  base::File file(src_dir, base::File::FLAG_OPEN | base::File::FLAG_READ);
-  if (!file.IsValid()) {
-    DLOG(ERROR) << "Could not open file for path " << src_dir.value();
-    return false;
-  }
+bool IsHiddenFile(const base::FilePath& file_path) {
+  return file_path.BaseName().value()[0] == '.';
+}
 
-  int num_bytes;
-  char buf[zip::internal::kZipBufSize];
-  do {
-    num_bytes = file.ReadAtCurrentPos(buf, zip::internal::kZipBufSize);
-    if (num_bytes > 0) {
-      if (ZIP_OK != zipWriteInFileInZip(zip_file, buf, num_bytes)) {
-        DLOG(ERROR) << "Could not write data to zip for path "
-                    << src_dir.value();
-        return false;
-      }
-    }
-  } while (num_bytes > 0);
+// Creates a directory at |extract_dir|/|entry_path|, including any parents.
+bool CreateDirectory(const base::FilePath& extract_dir,
+                     const base::FilePath& entry_path) {
+  const base::FilePath dir = extract_dir.Append(entry_path);
+  const bool ok = base::CreateDirectory(dir);
+  PLOG_IF(ERROR, !ok) << "Cannot create directory " << Redact(dir);
+  return ok;
+}
 
-  return true;
+// Creates a WriterDelegate that can write a file at |extract_dir|/|entry_path|.
+std::unique_ptr<WriterDelegate> CreateFilePathWriterDelegate(
+    const base::FilePath& extract_dir,
+    const base::FilePath& entry_path) {
+  return std::make_unique<FilePathWriterDelegate>(
+      extract_dir.Append(entry_path));
 }
 
-bool AddEntryToZip(zipFile zip_file, const base::FilePath& path,
-                   const base::FilePath& root_path) {
-  base::FilePath relative_path;
-  bool result = root_path.AppendRelativePath(path, &relative_path);
-  DCHECK(result);
-  std::string str_path = relative_path.AsUTF8Unsafe();
-#if defined(OS_WIN)
-  base::ReplaceSubstringsAfterOffset(&str_path, 0u, "\\", "/");
-#endif
+class DirectFileAccessor : public FileAccessor {
+ public:
+  explicit DirectFileAccessor(base::FilePath src_dir)
+      : src_dir_(std::move(src_dir)) {}
+
+  ~DirectFileAccessor() override = default;
+
+  bool Open(const Paths paths, std::vector<base::File>* const files) override {
+    DCHECK(files);
+    files->reserve(files->size() + paths.size());
+
+    for (const base::FilePath& path : paths) {
+      DCHECK(!path.IsAbsolute());
+      const base::FilePath absolute_path = src_dir_.Append(path);
+      if (base::DirectoryExists(absolute_path)) {
+        files->emplace_back();
+        LOG(ERROR) << "Cannot open " << Redact(path) << ": It is a directory";
+      } else {
+        const base::File& file = files->emplace_back(
+            absolute_path, base::File::FLAG_OPEN | base::File::FLAG_READ);
+        LOG_IF(ERROR, !file.IsValid())
+            << "Cannot open " << Redact(path) << ": "
+            << base::File::ErrorToString(file.error_details());
+      }
+    }
 
-  bool is_directory = base::DirectoryExists(path);
-  if (is_directory)
-    str_path += "/";
+    return true;
+  }
 
-  zip_fileinfo file_info = zip::internal::GetFileInfoForZipping(path);
-  if (!zip::internal::ZipOpenNewFileInZip(zip_file, str_path, &file_info))
-    return false;
+  bool List(const base::FilePath& path,
+            std::vector<base::FilePath>* const files,
+            std::vector<base::FilePath>* const subdirs) override {
+    DCHECK(!path.IsAbsolute());
+    DCHECK(files);
+    DCHECK(subdirs);
+
+    base::FileEnumerator file_enumerator(
+        src_dir_.Append(path), false /* recursive */,
+        base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES);
+
+    while (!file_enumerator.Next().empty()) {
+      const base::FileEnumerator::FileInfo info = file_enumerator.GetInfo();
+      (info.IsDirectory() ? subdirs : files)
+          ->push_back(path.Append(info.GetName()));
+    }
 
-  bool success = true;
-  if (!is_directory) {
-    success = AddFileToZip(zip_file, path);
+    return true;
   }
 
-  if (ZIP_OK != zipCloseFileInZip(zip_file)) {
-    DLOG(ERROR) << "Could not close zip file entry " << str_path;
-    return false;
-  }
+  bool GetInfo(const base::FilePath& path, Info* const info) override {
+    DCHECK(!path.IsAbsolute());
+    DCHECK(info);
 
-  return success;
-}
+    base::File::Info file_info;
+    if (!base::GetFileInfo(src_dir_.Append(path), &file_info)) {
+      PLOG(ERROR) << "Cannot get info of " << Redact(path);
+      return false;
+    }
 
-bool ExcludeNoFilesFilter(const base::FilePath& file_path) {
-  return true;
-}
+    info->is_directory = file_info.is_directory;
+    info->last_modified = file_info.last_modified;
 
-bool ExcludeHiddenFilesFilter(const base::FilePath& file_path) {
-  return file_path.BaseName().value()[0] != '.';
-}
+    return true;
+  }
 
-}  // namespace
+ private:
+  const base::FilePath src_dir_;
+};
 
-namespace zip {
+}  // namespace
 
-bool Unzip(const base::FilePath& src_file, const base::FilePath& dest_dir) {
-  return UnzipWithFilterCallback(src_file, dest_dir,
-                                 base::Bind(&ExcludeNoFilesFilter), true);
+std::ostream& operator<<(std::ostream& out, const Progress& progress) {
+  return out << progress.bytes << " bytes, " << progress.files << " files, "
+             << progress.directories << " dirs, " << progress.errors
+             << " errors";
 }
 
-bool UnzipWithFilterCallback(const base::FilePath& src_file,
-                             const base::FilePath& dest_dir,
-                             const FilterCallback& filter_cb,
-                             bool log_skipped_files) {
-  ZipReader reader;
-  if (!reader.Open(src_file)) {
-    DLOG(WARNING) << "Failed to open " << src_file.value();
-    return false;
-  }
-  while (reader.HasMore()) {
-    if (!reader.OpenCurrentEntryInZip()) {
-      DLOG(WARNING) << "Failed to open the current file in zip";
+bool Zip(const ZipParams& params) {
+  DirectFileAccessor default_accessor(params.src_dir);
+  FileAccessor* const file_accessor = params.file_accessor ?: &default_accessor;
+
+  std::unique_ptr<internal::ZipWriter> zip_writer;
+
+#if defined(OS_POSIX) || defined(OS_FUCHSIA)
+  if (params.dest_fd != base::kInvalidPlatformFile) {
+    DCHECK(params.dest_file.empty());
+    zip_writer =
+        internal::ZipWriter::CreateWithFd(params.dest_fd, file_accessor);
+    if (!zip_writer)
       return false;
-    }
-    if (reader.current_entry_info()->is_unsafe()) {
-      DLOG(WARNING) << "Found an unsafe file in zip "
-                    << reader.current_entry_info()->file_path().value();
+  }
+#endif
+
+  if (!zip_writer) {
+    zip_writer = internal::ZipWriter::Create(params.dest_file, file_accessor);
+    if (!zip_writer)
       return false;
-    }
-    if (filter_cb.Run(reader.current_entry_info()->file_path())) {
-      if (!reader.ExtractCurrentEntryIntoDirectory(dest_dir)) {
-        DLOG(WARNING) << "Failed to extract "
-                      << reader.current_entry_info()->file_path().value();
-        return false;
-      }
-    } else if (log_skipped_files) {
-      DLOG(WARNING) << "Skipped file "
-                    << reader.current_entry_info()->file_path().value();
-    }
+  }
 
-    if (!reader.AdvanceToNextEntry()) {
-      DLOG(WARNING) << "Failed to advance to the next file";
+  zip_writer->SetProgressCallback(params.progress_callback,
+                                  params.progress_period);
+  zip_writer->SetRecursive(params.recursive);
+  zip_writer->ContinueOnError(params.continue_on_error);
+
+  if (!params.include_hidden_files || params.filter_callback)
+    zip_writer->SetFilterCallback(base::BindRepeating(
+        [](const ZipParams* const params, const base::FilePath& path) -> bool {
+          return (params->include_hidden_files || !IsHiddenFile(path)) &&
+                 (!params->filter_callback ||
+                  params->filter_callback.Run(params->src_dir.Append(path)));
+        },
+        &params));
+
+  if (params.src_files.empty()) {
+    // No source items are specified. Zip the entire source directory.
+    zip_writer->SetRecursive(true);
+    if (!zip_writer->AddDirectoryContents(base::FilePath()))
+      return false;
+  } else {
+    // Only zip the specified source items.
+    if (!zip_writer->AddMixedEntries(params.src_files))
       return false;
-    }
   }
-  return true;
+
+  return zip_writer->Close();
 }
 
-bool ZipWithFilterCallback(const base::FilePath& src_dir,
-                           const base::FilePath& dest_file,
-                           const FilterCallback& filter_cb) {
-  DCHECK(base::DirectoryExists(src_dir));
+bool Unzip(const base::FilePath& src_file,
+           const base::FilePath& dest_dir,
+           UnzipOptions options) {
+  base::File file(src_file, base::File::FLAG_OPEN | base::File::FLAG_READ);
+  if (!file.IsValid()) {
+    PLOG(ERROR) << "Cannot open " << Redact(src_file) << ": "
+                << base::File::ErrorToString(file.error_details());
+    return false;
+  }
 
-  zipFile zip_file = internal::OpenForZipping(dest_file.AsUTF8Unsafe(),
-                                              APPEND_STATUS_CREATE);
+  DLOG_IF(WARNING, !base::IsDirectoryEmpty(dest_dir))
+      << "ZIP extraction directory is not empty: " << dest_dir;
 
-  if (!zip_file) {
-    DLOG(WARNING) << "couldn't create file " << dest_file.value();
+  return Unzip(file.GetPlatformFile(),
+               base::BindRepeating(&CreateFilePathWriterDelegate, dest_dir),
+               base::BindRepeating(&CreateDirectory, dest_dir),
+               std::move(options));
+}
+
+bool Unzip(const base::PlatformFile& src_file,
+           WriterFactory writer_factory,
+           DirectoryCreator directory_creator,
+           UnzipOptions options) {
+  ZipReader reader;
+  reader.SetEncoding(std::move(options.encoding));
+  reader.SetPassword(std::move(options.password));
+
+  if (!reader.OpenFromPlatformFile(src_file)) {
+    LOG(ERROR) << "Cannot open ZIP from file handle " << src_file;
     return false;
   }
 
-  bool success = true;
-  base::FileEnumerator file_enumerator(src_dir, true /* recursive */,
-      base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES);
-  for (base::FilePath path = file_enumerator.Next(); !path.value().empty();
-       path = file_enumerator.Next()) {
-    if (!filter_cb.Run(path)) {
+  while (const ZipReader::Entry* const entry = reader.Next()) {
+    if (entry->is_unsafe) {
+      LOG(ERROR) << "Found unsafe entry " << Redact(entry->path) << " in ZIP";
+      if (!options.continue_on_error)
+        return false;
       continue;
     }
 
-    if (!AddEntryToZip(zip_file, path, src_dir)) {
-      success = false;
-      break;
+    if (options.filter && !options.filter.Run(entry->path)) {
+      VLOG(1) << "Skipped ZIP entry " << Redact(entry->path);
+      continue;
     }
-  }
 
-  if (ZIP_OK != zipClose(zip_file, NULL)) {
-    DLOG(ERROR) << "Error closing zip file " << dest_file.value();
-    return false;
+    if (entry->is_directory) {
+      // It's a directory.
+      if (!directory_creator.Run(entry->path)) {
+        LOG(ERROR) << "Cannot create directory " << Redact(entry->path);
+        if (!options.continue_on_error)
+          return false;
+      }
+
+      continue;
+    }
+
+    // It's a file.
+    std::unique_ptr<WriterDelegate> writer = writer_factory.Run(entry->path);
+    if (!writer ||
+        (options.progress ? !reader.ExtractCurrentEntryWithListener(
+                                writer.get(), options.progress)
+                          : !reader.ExtractCurrentEntry(writer.get()))) {
+      LOG(ERROR) << "Cannot extract file " << Redact(entry->path)
+                 << " from ZIP";
+      if (!options.continue_on_error)
+        return false;
+    }
   }
 
-  return success;
+  return reader.ok();
+}
+
+bool ZipWithFilterCallback(const base::FilePath& src_dir,
+                           const base::FilePath& dest_file,
+                           FilterCallback filter) {
+  DCHECK(base::DirectoryExists(src_dir));
+  return Zip({.src_dir = src_dir,
+              .dest_file = dest_file,
+              .filter_callback = std::move(filter)});
 }
 
-bool Zip(const base::FilePath& src_dir, const base::FilePath& dest_file,
+bool Zip(const base::FilePath& src_dir,
+         const base::FilePath& dest_file,
          bool include_hidden_files) {
-  if (include_hidden_files) {
-    return ZipWithFilterCallback(
-        src_dir, dest_file, base::Bind(&ExcludeNoFilesFilter));
-  } else {
-    return ZipWithFilterCallback(
-        src_dir, dest_file, base::Bind(&ExcludeHiddenFilesFilter));
-  }
+  return Zip({.src_dir = src_dir,
+              .dest_file = dest_file,
+              .include_hidden_files = include_hidden_files});
 }
 
-#if defined(OS_POSIX)
+#if defined(OS_POSIX) || defined(OS_FUCHSIA)
 bool ZipFiles(const base::FilePath& src_dir,
-              const std::vector<base::FilePath>& src_relative_paths,
+              Paths src_relative_paths,
               int dest_fd) {
   DCHECK(base::DirectoryExists(src_dir));
-  zipFile zip_file = internal::OpenFdForZipping(dest_fd, APPEND_STATUS_CREATE);
-
-  if (!zip_file) {
-    DLOG(ERROR) << "couldn't create file for fd " << dest_fd;
-    return false;
-  }
-
-  bool success = true;
-  for (std::vector<base::FilePath>::const_iterator iter =
-           src_relative_paths.begin();
-      iter != src_relative_paths.end(); ++iter) {
-    const base::FilePath& path = src_dir.Append(*iter);
-    if (!AddEntryToZip(zip_file, path, src_dir)) {
-      // TODO(hshi): clean up the partial zip file when error occurs.
-      success = false;
-      break;
-    }
-  }
-
-  if (ZIP_OK != zipClose(zip_file, NULL)) {
-    DLOG(ERROR) << "Error closing zip file for fd " << dest_fd;
-    success = false;
-  }
-
-  return success;
+  return Zip({.src_dir = src_dir,
+              .dest_fd = dest_fd,
+              .src_files = src_relative_paths});
 }
-#endif  // defined(OS_POSIX)
+#endif  // defined(OS_POSIX) || defined(OS_FUCHSIA)
 
 }  // namespace zip
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip.h b/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip.h
index 68bed0b302..ea8778681d 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip.h
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip.h
@@ -1,58 +1,218 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2011 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef THIRD_PARTY_ZLIB_GOOGLE_ZIP_H_
 #define THIRD_PARTY_ZLIB_GOOGLE_ZIP_H_
 
+#include <cstdint>
+#include <ostream>
+#include <utility>
 #include <vector>
 
-#include "base/callback.h"
+#include "base/containers/span.h"
 #include "base/files/file_path.h"
+#include "base/files/platform_file.h"
+#include "base/functional/callback.h"
+#include "base/time/time.h"
 #include "build/build_config.h"
 
+namespace base {
+class File;
+}
+
 namespace zip {
 
+class WriterDelegate;
+
+// Paths passed as span to avoid copying them.
+using Paths = base::span<const base::FilePath>;
+
+// Abstraction for file access operation required by Zip().
+//
+// Can be passed to the ZipParams for providing custom access to the files,
+// for example over IPC.
+//
+// All parameters paths are expected to be relative to the source directory.
+class FileAccessor {
+ public:
+  virtual ~FileAccessor() = default;
+
+  struct Info {
+    bool is_directory = false;
+    base::Time last_modified;
+  };
+
+  // Opens files specified in |paths|.
+  // Directories should be mapped to invalid files.
+  virtual bool Open(Paths paths, std::vector<base::File>* files) = 0;
+
+  // Lists contents of a directory at |path|.
+  virtual bool List(const base::FilePath& path,
+                    std::vector<base::FilePath>* files,
+                    std::vector<base::FilePath>* subdirs) = 0;
+
+  // Gets info about a file or directory.
+  virtual bool GetInfo(const base::FilePath& path, Info* info) = 0;
+};
+
+// Progress of a ZIP creation operation.
+struct Progress {
+  // Total number of bytes read from files getting zipped so far.
+  std::int64_t bytes = 0;
+
+  // Number of file entries added to the ZIP so far.
+  // A file entry is added after its bytes have been processed.
+  int files = 0;
+
+  // Number of directory entries added to the ZIP so far.
+  // A directory entry is added before items in it.
+  int directories = 0;
+
+  // Number of errors encountered so far (files that cannot be opened,
+  // directories that cannot be listed).
+  int errors = 0;
+};
+
+// Prints Progress to output stream.
+std::ostream& operator<<(std::ostream& out, const Progress& progress);
+
+// Callback reporting the progress of a ZIP creation operation.
+//
+// This callback returns a boolean indicating whether the ZIP creation operation
+// should continue. If it returns false once, then the ZIP creation operation is
+// immediately cancelled and the callback won't be called again.
+using ProgressCallback = base::RepeatingCallback<bool(const Progress&)>;
+
+using FilterCallback = base::RepeatingCallback<bool(const base::FilePath&)>;
+
+// ZIP creation parameters and options.
+struct ZipParams {
+  // Source directory. Ignored if |file_accessor| is set.
+  base::FilePath src_dir;
+
+  // Abstraction around file system access used to read files.
+  // If left null, an implementation that accesses files directly is used.
+  FileAccessor* file_accessor = nullptr;  // Not owned
+
+  // Destination file path.
+  // Either dest_file or dest_fd should be set, but not both.
+  base::FilePath dest_file;
+
+#if defined(OS_POSIX) || defined(OS_FUCHSIA)
+  // Destination file passed a file descriptor.
+  // Either dest_file or dest_fd should be set, but not both.
+  int dest_fd = base::kInvalidPlatformFile;
+#endif
+
+  // The relative paths to the files and directories that should be included in
+  // the ZIP file. If this is empty, the whole contents of |src_dir| are
+  // included.
+  //
+  // These paths must be relative to |src_dir| and will be used as the file
+  // names in the created ZIP file. All files must be under |src_dir| in the
+  // file system hierarchy.
+  //
+  // All the paths in |src_files| are included in the created ZIP file,
+  // irrespective of |include_hidden_files| and |filter_callback|.
+  Paths src_files;
+
+  // Filter used to exclude files from the ZIP file. This is only taken in
+  // account when recursively adding subdirectory contents.
+  FilterCallback filter_callback;
+
+  // Optional progress reporting callback.
+  ProgressCallback progress_callback;
+
+  // Progress reporting period. The final callback is always called when the ZIP
+  // creation operation completes.
+  base::TimeDelta progress_period;
+
+  // Should add hidden files? This is only taken in account when recursively
+  // adding subdirectory contents.
+  bool include_hidden_files = true;
+
+  // Should recursively add subdirectory contents?
+  bool recursive = false;
+
+  // Should ignore errors when discovering files and zipping them?
+  bool continue_on_error = false;
+};
+
+// Zip files specified into a ZIP archives. The source files and ZIP destination
+// files (as well as other settings) are specified in |params|.
+bool Zip(const ZipParams& params);
+
 // Zip the contents of src_dir into dest_file. src_path must be a directory.
 // An entry will *not* be created in the zip for the root folder -- children
 // of src_dir will be at the root level of the created zip. For each file in
 // src_dir, include it only if the callback |filter_cb| returns true. Otherwise
 // omit it.
-typedef base::Callback<bool(const base::FilePath&)> FilterCallback;
 bool ZipWithFilterCallback(const base::FilePath& src_dir,
                            const base::FilePath& dest_file,
-                           const FilterCallback& filter_cb);
+                           FilterCallback filter_cb);
 
 // Convenience method for callers who don't need to set up the filter callback.
 // If |include_hidden_files| is true, files starting with "." are included.
 // Otherwise they are omitted.
-bool Zip(const base::FilePath& src_dir, const base::FilePath& dest_file,
+bool Zip(const base::FilePath& src_dir,
+         const base::FilePath& dest_file,
          bool include_hidden_files);
 
-#if defined(OS_POSIX)
+#if defined(OS_POSIX) || defined(OS_FUCHSIA)
 // Zips files listed in |src_relative_paths| to destination specified by file
 // descriptor |dest_fd|, without taking ownership of |dest_fd|. The paths listed
 // in |src_relative_paths| are relative to the |src_dir| and will be used as the
 // file names in the created zip file. All source paths must be under |src_dir|
 // in the file system hierarchy.
 bool ZipFiles(const base::FilePath& src_dir,
-              const std::vector<base::FilePath>& src_relative_paths,
+              Paths src_relative_paths,
               int dest_fd);
-#endif  // defined(OS_POSIX)
-
-// Unzip the contents of zip_file into dest_dir.
-// For each file in zip_file, include it only if the callback |filter_cb|
-// returns true. Otherwise omit it.
-// If |log_skipped_files| is true, files skipped during extraction are printed
-// to debug log.
-typedef base::Callback<bool(const base::FilePath&)> FilterCallback;
-bool UnzipWithFilterCallback(const base::FilePath& zip_file,
-                             const base::FilePath& dest_dir,
-                             const FilterCallback& filter_cb,
-                             bool log_skipped_files);
-
-// Unzip the contents of zip_file into dest_dir.
-bool Unzip(const base::FilePath& zip_file, const base::FilePath& dest_dir);
+#endif  // defined(OS_POSIX) || defined(OS_FUCHSIA)
+
+// Callback reporting the number of bytes written during Unzip.
+using UnzipProgressCallback = base::RepeatingCallback<void(uint64_t bytes)>;
+
+// Options of the Unzip function, with valid default values.
+struct UnzipOptions {
+  // Encoding of entry paths in the ZIP archive. By default, paths are assumed
+  // to be in UTF-8.
+  std::string encoding;
+
+  // Only extract the entries for which |filter_cb| returns true. By default,
+  // everything gets extracted.
+  FilterCallback filter;
+
+  // Callback to report bytes extracted from the ZIP.
+  UnzipProgressCallback progress;
+
+  // Password to decrypt the encrypted files.
+  std::string password;
+
+  // Should ignore errors when extracting files?
+  bool continue_on_error = false;
+};
+
+typedef base::RepeatingCallback<std::unique_ptr<WriterDelegate>(
+    const base::FilePath&)>
+    WriterFactory;
+
+typedef base::RepeatingCallback<bool(const base::FilePath&)> DirectoryCreator;
+
+// Unzips the contents of |zip_file|, using the writers provided by
+// |writer_factory|.
+bool Unzip(const base::PlatformFile& zip_file,
+           WriterFactory writer_factory,
+           DirectoryCreator directory_creator,
+           UnzipOptions options = {});
+
+// Unzips the contents of |zip_file| into |dest_dir|.
+// This function does not overwrite any existing file.
+// A filename collision will result in an error.
+// Therefore, |dest_dir| should initially be an empty directory.
+bool Unzip(const base::FilePath& zip_file,
+           const base::FilePath& dest_dir,
+           UnzipOptions options = {});
 
 }  // namespace zip
 
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip_internal.cc b/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip_internal.cc
index 77f2b17481..b9976d63ee 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip_internal.cc
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip_internal.cc
@@ -1,18 +1,21 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2011 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "third_party/zlib/google/zip_internal.h"
 
 #include <stddef.h>
+#include <string.h>
 
 #include <algorithm>
 
-#include "base/files/file_util.h"
+#include "base/containers/fixed_flat_set.h"
+#include "base/files/file_path.h"
 #include "base/logging.h"
+#include "base/notreached.h"
+#include "base/strings/string_piece.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/time/time.h"
-#include "build/build_config.h"
 
 #if defined(USE_SYSTEM_MINIZIP)
 #include <minizip/ioapi.h>
@@ -37,9 +40,9 @@ typedef struct {
 } WIN32FILE_IOWIN;
 
 // This function is derived from third_party/minizip/iowin32.c.
-// Its only difference is that it treats the char* as UTF8 and
+// Its only difference is that it treats the filename as UTF-8 and
 // uses the Unicode version of CreateFile.
-void* ZipOpenFunc(void *opaque, const char* filename, int mode) {
+void* ZipOpenFunc(void* opaque, const void* filename, int mode) {
   DWORD desired_access = 0, creation_disposition = 0;
   DWORD share_mode = 0, flags_and_attributes = 0;
   HANDLE file = 0;
@@ -57,10 +60,11 @@ void* ZipOpenFunc(void *opaque, const char* filename, int mode) {
     creation_disposition = CREATE_ALWAYS;
   }
 
-  base::string16 filename16 = base::UTF8ToUTF16(filename);
-  if ((filename != NULL) && (desired_access != 0)) {
-    file = CreateFile(filename16.c_str(), desired_access, share_mode,
-        NULL, creation_disposition, flags_and_attributes, NULL);
+  if (filename != nullptr && desired_access != 0) {
+    file = CreateFileW(
+        base::UTF8ToWide(static_cast<const char*>(filename)).c_str(),
+        desired_access, share_mode, nullptr, creation_disposition,
+        flags_and_attributes, nullptr);
   }
 
   if (file == INVALID_HANDLE_VALUE)
@@ -80,11 +84,11 @@ void* ZipOpenFunc(void *opaque, const char* filename, int mode) {
 }
 #endif
 
-#if defined(OS_POSIX)
+#if defined(OS_POSIX) || defined(OS_FUCHSIA)
 // Callback function for zlib that opens a file stream from a file descriptor.
 // Since we do not own the file descriptor, dup it so that we can fdopen/fclose
 // a file stream.
-void* FdOpenFileFunc(void* opaque, const char* filename, int mode) {
+void* FdOpenFileFunc(void* opaque, const void* filename, int mode) {
   FILE* file = NULL;
   const char* mode_fopen = NULL;
 
@@ -106,15 +110,15 @@ void* FdOpenFileFunc(void* opaque, const char* filename, int mode) {
 
 int FdCloseFileFunc(void* opaque, void* stream) {
   fclose(static_cast<FILE*>(stream));
-  free(opaque); // malloc'ed in FillFdOpenFileFunc()
+  free(opaque);  // malloc'ed in FillFdOpenFileFunc()
   return 0;
 }
 
 // Fills |pzlib_filecunc_def| appropriately to handle the zip file
 // referred to by |fd|.
-void FillFdOpenFileFunc(zlib_filefunc_def* pzlib_filefunc_def, int fd) {
-  fill_fopen_filefunc(pzlib_filefunc_def);
-  pzlib_filefunc_def->zopen_file = FdOpenFileFunc;
+void FillFdOpenFileFunc(zlib_filefunc64_def* pzlib_filefunc_def, int fd) {
+  fill_fopen64_filefunc(pzlib_filefunc_def);
+  pzlib_filefunc_def->zopen64_file = FdOpenFileFunc;
   pzlib_filefunc_def->zclose_file = FdCloseFileFunc;
   int* ptr_fd = static_cast<int*>(malloc(sizeof(fd)));
   *ptr_fd = fd;
@@ -125,7 +129,7 @@ void FillFdOpenFileFunc(zlib_filefunc_def* pzlib_filefunc_def, int fd) {
 #if defined(OS_WIN)
 // Callback function for zlib that opens a file stream from a Windows handle.
 // Does not take ownership of the handle.
-void* HandleOpenFileFunc(void* opaque, const char* filename, int mode) {
+void* HandleOpenFileFunc(void* opaque, const void* /*filename*/, int mode) {
   WIN32FILE_IOWIN file_ret;
   file_ret.hf = static_cast<HANDLE>(opaque);
   file_ret.error = 0;
@@ -139,7 +143,7 @@ void* HandleOpenFileFunc(void* opaque, const char* filename, int mode) {
 }
 
 int HandleCloseFileFunc(void* opaque, void* stream) {
-  free(stream); // malloc'ed in HandleOpenFileFunc()
+  free(stream);  // malloc'ed in HandleOpenFileFunc()
   return 0;
 }
 #endif
@@ -149,8 +153,8 @@ int HandleCloseFileFunc(void* opaque, void* stream) {
 // expect their opaque parameters refer to this struct.
 struct ZipBuffer {
   const char* data;  // weak
-  size_t length;
-  size_t offset;
+  ZPOS64_T length;
+  ZPOS64_T offset;
 };
 
 // Opens the specified file. When this function returns a non-NULL pointer, zlib
@@ -159,7 +163,7 @@ struct ZipBuffer {
 // given opaque parameter and returns it because this parameter stores all
 // information needed for uncompressing data. (This function does not support
 // writing compressed data and it returns NULL for this case.)
-void* OpenZipBuffer(void* opaque, const char* /*filename*/, int mode) {
+void* OpenZipBuffer(void* opaque, const void* /*filename*/, int mode) {
   if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER) != ZLIB_FILEFUNC_MODE_READ) {
     NOTREACHED();
     return NULL;
@@ -176,10 +180,11 @@ void* OpenZipBuffer(void* opaque, const char* /*filename*/, int mode) {
 uLong ReadZipBuffer(void* opaque, void* /*stream*/, void* buf, uLong size) {
   ZipBuffer* buffer = static_cast<ZipBuffer*>(opaque);
   DCHECK_LE(buffer->offset, buffer->length);
-  size_t remaining_bytes = buffer->length - buffer->offset;
+  ZPOS64_T remaining_bytes = buffer->length - buffer->offset;
   if (!buffer || !buffer->data || !remaining_bytes)
     return 0;
-  size = std::min(size, static_cast<uLong>(remaining_bytes));
+  if (size > remaining_bytes)
+    size = remaining_bytes;
   memcpy(buf, &buffer->data[buffer->offset], size);
   buffer->offset += size;
   return size;
@@ -196,21 +201,23 @@ uLong WriteZipBuffer(void* /*opaque*/,
 }
 
 // Returns the offset from the beginning of the data.
-long GetOffsetOfZipBuffer(void* opaque, void* /*stream*/) {
+ZPOS64_T GetOffsetOfZipBuffer(void* opaque, void* /*stream*/) {
   ZipBuffer* buffer = static_cast<ZipBuffer*>(opaque);
   if (!buffer)
     return -1;
-  return static_cast<long>(buffer->offset);
+  return buffer->offset;
 }
 
 // Moves the current offset to the specified position.
-long SeekZipBuffer(void* opaque, void* /*stream*/, uLong offset, int origin) {
+long SeekZipBuffer(void* opaque,
+                   void* /*stream*/,
+                   ZPOS64_T offset,
+                   int origin) {
   ZipBuffer* buffer = static_cast<ZipBuffer*>(opaque);
   if (!buffer)
     return -1;
   if (origin == ZLIB_FILEFUNC_SEEK_CUR) {
-    buffer->offset = std::min(buffer->offset + static_cast<size_t>(offset),
-                              buffer->length);
+    buffer->offset = std::min(buffer->offset + offset, buffer->length);
     return 0;
   }
   if (origin == ZLIB_FILEFUNC_SEEK_END) {
@@ -218,7 +225,7 @@ long SeekZipBuffer(void* opaque, void* /*stream*/, uLong offset, int origin) {
     return 0;
   }
   if (origin == ZLIB_FILEFUNC_SEEK_SET) {
-    buffer->offset = std::min(buffer->length, static_cast<size_t>(offset));
+    buffer->offset = std::min(buffer->length, offset);
     return 0;
   }
   NOTREACHED();
@@ -244,7 +251,7 @@ int GetErrorOfZipBuffer(void* /*opaque*/, void* /*stream*/) {
 // Returns a zip_fileinfo struct with the time represented by |file_time|.
 zip_fileinfo TimeToZipFileInfo(const base::Time& file_time) {
   base::Time::Exploded file_time_parts;
-  file_time.LocalExplode(&file_time_parts);
+  file_time.UTCExplode(&file_time_parts);
 
   zip_fileinfo zip_info = {};
   if (file_time_parts.year >= 1980) {
@@ -253,12 +260,13 @@ zip_fileinfo TimeToZipFileInfo(const base::Time& file_time) {
     // It assumes that dates below 1980 are in the double digit format.
     // Hence the fail safe option is to leave the date unset. Some programs
     // might show the unset date as 1980-0-0 which is invalid.
-    zip_info.tmz_date.tm_year = file_time_parts.year;
-    zip_info.tmz_date.tm_mon = file_time_parts.month - 1;
-    zip_info.tmz_date.tm_mday = file_time_parts.day_of_month;
-    zip_info.tmz_date.tm_hour = file_time_parts.hour;
-    zip_info.tmz_date.tm_min = file_time_parts.minute;
-    zip_info.tmz_date.tm_sec = file_time_parts.second;
+    zip_info.tmz_date = {
+        .tm_sec = static_cast<uInt>(file_time_parts.second),
+        .tm_min = static_cast<uInt>(file_time_parts.minute),
+        .tm_hour = static_cast<uInt>(file_time_parts.hour),
+        .tm_mday = static_cast<uInt>(file_time_parts.day_of_month),
+        .tm_mon = static_cast<uInt>(file_time_parts.month - 1),
+        .tm_year = static_cast<uInt>(file_time_parts.year)};
   }
 
   return zip_info;
@@ -269,33 +277,33 @@ namespace zip {
 namespace internal {
 
 unzFile OpenForUnzipping(const std::string& file_name_utf8) {
-  zlib_filefunc_def* zip_func_ptrs = NULL;
+  zlib_filefunc64_def* zip_func_ptrs = nullptr;
 #if defined(OS_WIN)
-  zlib_filefunc_def zip_funcs;
-  fill_win32_filefunc(&zip_funcs);
-  zip_funcs.zopen_file = ZipOpenFunc;
+  zlib_filefunc64_def zip_funcs;
+  fill_win32_filefunc64(&zip_funcs);
+  zip_funcs.zopen64_file = ZipOpenFunc;
   zip_func_ptrs = &zip_funcs;
 #endif
-  return unzOpen2(file_name_utf8.c_str(), zip_func_ptrs);
+  return unzOpen2_64(file_name_utf8.c_str(), zip_func_ptrs);
 }
 
-#if defined(OS_POSIX)
+#if defined(OS_POSIX) || defined(OS_FUCHSIA)
 unzFile OpenFdForUnzipping(int zip_fd) {
-  zlib_filefunc_def zip_funcs;
+  zlib_filefunc64_def zip_funcs;
   FillFdOpenFileFunc(&zip_funcs, zip_fd);
   // Passing dummy "fd" filename to zlib.
-  return unzOpen2("fd", &zip_funcs);
+  return unzOpen2_64("fd", &zip_funcs);
 }
 #endif
 
 #if defined(OS_WIN)
 unzFile OpenHandleForUnzipping(HANDLE zip_handle) {
-  zlib_filefunc_def zip_funcs;
-  fill_win32_filefunc(&zip_funcs);
-  zip_funcs.zopen_file = HandleOpenFileFunc;
+  zlib_filefunc64_def zip_funcs;
+  fill_win32_filefunc64(&zip_funcs);
+  zip_funcs.zopen64_file = HandleOpenFileFunc;
   zip_funcs.zclose_file = HandleCloseFileFunc;
   zip_funcs.opaque = zip_handle;
-  return unzOpen2("fd", &zip_funcs);
+  return unzOpen2_64("fd", &zip_funcs);
 }
 #endif
 
@@ -311,80 +319,151 @@ unzFile PrepareMemoryForUnzipping(const std::string& data) {
   buffer->length = data.length();
   buffer->offset = 0;
 
-  zlib_filefunc_def zip_functions;
-  zip_functions.zopen_file = OpenZipBuffer;
+  zlib_filefunc64_def zip_functions;
+  zip_functions.zopen64_file = OpenZipBuffer;
   zip_functions.zread_file = ReadZipBuffer;
   zip_functions.zwrite_file = WriteZipBuffer;
-  zip_functions.ztell_file = GetOffsetOfZipBuffer;
-  zip_functions.zseek_file = SeekZipBuffer;
+  zip_functions.ztell64_file = GetOffsetOfZipBuffer;
+  zip_functions.zseek64_file = SeekZipBuffer;
   zip_functions.zclose_file = CloseZipBuffer;
   zip_functions.zerror_file = GetErrorOfZipBuffer;
-  zip_functions.opaque = static_cast<void*>(buffer);
-  return unzOpen2(NULL, &zip_functions);
+  zip_functions.opaque = buffer;
+  return unzOpen2_64(nullptr, &zip_functions);
 }
 
 zipFile OpenForZipping(const std::string& file_name_utf8, int append_flag) {
-  zlib_filefunc_def* zip_func_ptrs = NULL;
+  zlib_filefunc64_def* zip_func_ptrs = nullptr;
 #if defined(OS_WIN)
-  zlib_filefunc_def zip_funcs;
-  fill_win32_filefunc(&zip_funcs);
-  zip_funcs.zopen_file = ZipOpenFunc;
+  zlib_filefunc64_def zip_funcs;
+  fill_win32_filefunc64(&zip_funcs);
+  zip_funcs.zopen64_file = ZipOpenFunc;
   zip_func_ptrs = &zip_funcs;
 #endif
-  return zipOpen2(file_name_utf8.c_str(),
-                  append_flag,
-                  NULL,  // global comment
-                  zip_func_ptrs);
+  return zipOpen2_64(file_name_utf8.c_str(), append_flag, nullptr,
+                     zip_func_ptrs);
 }
 
-#if defined(OS_POSIX)
+#if defined(OS_POSIX) || defined(OS_FUCHSIA)
 zipFile OpenFdForZipping(int zip_fd, int append_flag) {
-  zlib_filefunc_def zip_funcs;
+  zlib_filefunc64_def zip_funcs;
   FillFdOpenFileFunc(&zip_funcs, zip_fd);
   // Passing dummy "fd" filename to zlib.
-  return zipOpen2("fd", append_flag, NULL, &zip_funcs);
+  return zipOpen2_64("fd", append_flag, nullptr, &zip_funcs);
 }
 #endif
 
-zip_fileinfo GetFileInfoForZipping(const base::FilePath& path) {
-  base::Time file_time;
-  base::File::Info file_info;
-  if (base::GetFileInfo(path, &file_info))
-    file_time = file_info.last_modified;
-  return TimeToZipFileInfo(file_time);
-}
-
 bool ZipOpenNewFileInZip(zipFile zip_file,
                          const std::string& str_path,
-                         const zip_fileinfo* file_info) {
+                         base::Time last_modified_time,
+                         Compression compression) {
   // Section 4.4.4 http://www.pkware.com/documents/casestudies/APPNOTE.TXT
   // Setting the Language encoding flag so the file is told to be in utf-8.
   const uLong LANGUAGE_ENCODING_FLAG = 0x1 << 11;
 
-  if (ZIP_OK != zipOpenNewFileInZip4(
-                    zip_file,  // file
-                    str_path.c_str(),  // filename
-                    file_info,  // zipfi
-                    NULL,  // extrafield_local,
-                    0u,  // size_extrafield_local
-                    NULL,  // extrafield_global
-                    0u,  // size_extrafield_global
-                    NULL,  // comment
-                    Z_DEFLATED,  // method
-                    Z_DEFAULT_COMPRESSION,  // level
-                    0,  // raw
-                    -MAX_WBITS,  // windowBits
-                    DEF_MEM_LEVEL,  // memLevel
-                    Z_DEFAULT_STRATEGY,  // strategy
-                    NULL,  // password
-                    0,  // crcForCrypting
-                    0,  // versionMadeBy
-                    LANGUAGE_ENCODING_FLAG)) {  // flagBase
-    DLOG(ERROR) << "Could not open zip file entry " << str_path;
+  const zip_fileinfo file_info = TimeToZipFileInfo(last_modified_time);
+  const int err = zipOpenNewFileInZip4_64(
+      /*file=*/zip_file,
+      /*filename=*/str_path.c_str(),
+      /*zip_fileinfo=*/&file_info,
+      /*extrafield_local=*/nullptr,
+      /*size_extrafield_local=*/0u,
+      /*extrafield_global=*/nullptr,
+      /*size_extrafield_global=*/0u,
+      /*comment=*/nullptr,
+      /*method=*/compression,
+      /*level=*/Z_DEFAULT_COMPRESSION,
+      /*raw=*/0,
+      /*windowBits=*/-MAX_WBITS,
+      /*memLevel=*/DEF_MEM_LEVEL,
+      /*strategy=*/Z_DEFAULT_STRATEGY,
+      /*password=*/nullptr,
+      /*crcForCrypting=*/0,
+      /*versionMadeBy=*/0,
+      /*flagBase=*/LANGUAGE_ENCODING_FLAG,
+      /*zip64=*/1);
+
+  if (err != ZIP_OK) {
+    DLOG(ERROR) << "Cannot open ZIP file entry '" << str_path
+                << "': zipOpenNewFileInZip4_64 returned " << err;
     return false;
   }
+
   return true;
 }
 
+Compression GetCompressionMethod(const base::FilePath& path) {
+  // Get the filename extension in lower case.
+  const base::FilePath::StringType ext =
+      base::ToLowerASCII(path.FinalExtension());
+
+  if (ext.empty())
+    return kDeflated;
+
+  using StringPiece = base::FilePath::StringPieceType;
+
+  // Skip the leading dot.
+  StringPiece ext_without_dot = ext;
+  DCHECK_EQ(ext_without_dot.front(), FILE_PATH_LITERAL('.'));
+  ext_without_dot.remove_prefix(1);
+
+  // Well known filename extensions of files that a likely to be already
+  // compressed. The extensions are in lower case without the leading dot.
+  static constexpr auto kExts = base::MakeFixedFlatSet<StringPiece>({
+      FILE_PATH_LITERAL("3g2"),   //
+      FILE_PATH_LITERAL("3gp"),   //
+      FILE_PATH_LITERAL("7z"),    //
+      FILE_PATH_LITERAL("7zip"),  //
+      FILE_PATH_LITERAL("aac"),   //
+      FILE_PATH_LITERAL("avi"),   //
+      FILE_PATH_LITERAL("bz"),    //
+      FILE_PATH_LITERAL("bz2"),   //
+      FILE_PATH_LITERAL("crx"),   //
+      FILE_PATH_LITERAL("gif"),   //
+      FILE_PATH_LITERAL("gz"),    //
+      FILE_PATH_LITERAL("jar"),   //
+      FILE_PATH_LITERAL("jpeg"),  //
+      FILE_PATH_LITERAL("jpg"),   //
+      FILE_PATH_LITERAL("lz"),    //
+      FILE_PATH_LITERAL("m2v"),   //
+      FILE_PATH_LITERAL("m4p"),   //
+      FILE_PATH_LITERAL("m4v"),   //
+      FILE_PATH_LITERAL("mng"),   //
+      FILE_PATH_LITERAL("mov"),   //
+      FILE_PATH_LITERAL("mp2"),   //
+      FILE_PATH_LITERAL("mp3"),   //
+      FILE_PATH_LITERAL("mp4"),   //
+      FILE_PATH_LITERAL("mpe"),   //
+      FILE_PATH_LITERAL("mpeg"),  //
+      FILE_PATH_LITERAL("mpg"),   //
+      FILE_PATH_LITERAL("mpv"),   //
+      FILE_PATH_LITERAL("ogg"),   //
+      FILE_PATH_LITERAL("ogv"),   //
+      FILE_PATH_LITERAL("png"),   //
+      FILE_PATH_LITERAL("qt"),    //
+      FILE_PATH_LITERAL("rar"),   //
+      FILE_PATH_LITERAL("taz"),   //
+      FILE_PATH_LITERAL("tb2"),   //
+      FILE_PATH_LITERAL("tbz"),   //
+      FILE_PATH_LITERAL("tbz2"),  //
+      FILE_PATH_LITERAL("tgz"),   //
+      FILE_PATH_LITERAL("tlz"),   //
+      FILE_PATH_LITERAL("tz"),    //
+      FILE_PATH_LITERAL("tz2"),   //
+      FILE_PATH_LITERAL("vob"),   //
+      FILE_PATH_LITERAL("webm"),  //
+      FILE_PATH_LITERAL("wma"),   //
+      FILE_PATH_LITERAL("wmv"),   //
+      FILE_PATH_LITERAL("xz"),    //
+      FILE_PATH_LITERAL("z"),     //
+      FILE_PATH_LITERAL("zip"),   //
+  });
+
+  if (kExts.count(ext_without_dot)) {
+    return kStored;
+  }
+
+  return kDeflated;
+}
+
 }  // namespace internal
 }  // namespace zip
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip_internal.h b/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip_internal.h
index 0ebf0c94ac..f107d7fe88 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip_internal.h
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip_internal.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2011 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/time/time.h"
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
@@ -34,7 +35,7 @@ namespace internal {
 // Windows.
 unzFile OpenForUnzipping(const std::string& file_name_utf8);
 
-#if defined(OS_POSIX)
+#if defined(OS_POSIX) || defined(OS_FUCHSIA)
 // Opens the file referred to by |zip_fd| for unzipping.
 unzFile OpenFdForUnzipping(int zip_fd);
 #endif
@@ -53,19 +54,30 @@ unzFile PrepareMemoryForUnzipping(const std::string& data);
 // Windows. |append_flag| will be passed to zipOpen2().
 zipFile OpenForZipping(const std::string& file_name_utf8, int append_flag);
 
-#if defined(OS_POSIX)
+#if defined(OS_POSIX) || defined(OS_FUCHSIA)
 // Opens the file referred to by |zip_fd| for zipping. |append_flag| will be
 // passed to zipOpen2().
 zipFile OpenFdForZipping(int zip_fd, int append_flag);
 #endif
 
-// Returns a zip_fileinfo with the last modification date of |path| set.
-zip_fileinfo GetFileInfoForZipping(const base::FilePath& path);
+// Compression methods.
+enum Compression {
+  kStored = 0,             // Stored (no compression)
+  kDeflated = Z_DEFLATED,  // Deflated
+};
 
-// Wrapper around zipOpenNewFileInZip4 which passes most common options.
+// Adds a file (or directory) entry to the ZIP archive.
 bool ZipOpenNewFileInZip(zipFile zip_file,
                          const std::string& str_path,
-                         const zip_fileinfo* file_info);
+                         base::Time last_modified_time,
+                         Compression compression);
+
+// Selects the best compression method for the given file. The heuristic is
+// based on the filename extension. By default, the compression method is
+// kDeflated. But if the given path has an extension indicating a well known
+// file format which is likely to be already compressed (eg ZIP, RAR, JPG,
+// PNG...) then the compression method is simply kStored.
+Compression GetCompressionMethod(const base::FilePath& path);
 
 const int kZipMaxPath = 256;
 const int kZipBufSize = 8192;
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip_reader.cc b/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip_reader.cc
index ff5a39514a..34a815e5f5 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip_reader.cc
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip_reader.cc
@@ -1,20 +1,26 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "third_party/zlib/google/zip_reader.h"
 
+#include <algorithm>
 #include <utility>
 
-#include "base/bind.h"
+#include "base/check.h"
 #include "base/files/file.h"
+#include "base/files/file_util.h"
+#include "base/functional/bind.h"
+#include "base/i18n/icu_string_conversions.h"
 #include "base/logging.h"
-#include "base/macros.h"
-#include "base/single_thread_task_runner.h"
+#include "base/numerics/safe_conversions.h"
+#include "base/strings/strcat.h"
+#include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/threading/thread_task_runner_handle.h"
+#include "base/task/sequenced_task_runner.h"
 #include "build/build_config.h"
+#include "third_party/zlib/google/redact.h"
 #include "third_party/zlib/google/zip_internal.h"
 
 #if defined(USE_SYSTEM_MINIZIP)
@@ -26,153 +32,94 @@
 #endif  // defined(OS_WIN)
 #endif  // defined(USE_SYSTEM_MINIZIP)
 
-namespace zip {
+#if defined(OS_POSIX)
+#include <sys/stat.h>
+#endif
 
+namespace zip {
 namespace {
 
-// FilePathWriterDelegate ------------------------------------------------------
-
-// A writer delegate that writes a file at a given path.
-class FilePathWriterDelegate : public WriterDelegate {
- public:
-  explicit FilePathWriterDelegate(const base::FilePath& output_file_path);
-  ~FilePathWriterDelegate() override;
-
-  // WriterDelegate methods:
-
-  // Creates the output file and any necessary intermediate directories.
-  bool PrepareOutput() override;
-
-  // Writes |num_bytes| bytes of |data| to the file, returning false if not all
-  // bytes could be written.
-  bool WriteBytes(const char* data, int num_bytes) override;
-
- private:
-  base::FilePath output_file_path_;
-  base::File file_;
-
-  DISALLOW_COPY_AND_ASSIGN(FilePathWriterDelegate);
-};
-
-FilePathWriterDelegate::FilePathWriterDelegate(
-    const base::FilePath& output_file_path)
-    : output_file_path_(output_file_path) {
-}
-
-FilePathWriterDelegate::~FilePathWriterDelegate() {
+enum UnzipError : int;
+
+std::ostream& operator<<(std::ostream& out, UnzipError error) {
+#define SWITCH_ERR(X) \
+  case X:             \
+    return out << #X;
+  switch (error) {
+    SWITCH_ERR(UNZ_OK);
+    SWITCH_ERR(UNZ_END_OF_LIST_OF_FILE);
+    SWITCH_ERR(UNZ_ERRNO);
+    SWITCH_ERR(UNZ_PARAMERROR);
+    SWITCH_ERR(UNZ_BADZIPFILE);
+    SWITCH_ERR(UNZ_INTERNALERROR);
+    SWITCH_ERR(UNZ_CRCERROR);
+    default:
+      return out << "UNZ" << static_cast<int>(error);
+  }
+#undef SWITCH_ERR
 }
 
-bool FilePathWriterDelegate::PrepareOutput() {
-  // We can't rely on parent directory entries being specified in the
-  // zip, so we make sure they are created.
-  if (!base::CreateDirectory(output_file_path_.DirName()))
+bool IsValidFileNameCharacterOnWindows(char16_t c) {
+  if (c < 32)
     return false;
 
-  file_.Initialize(output_file_path_,
-                   base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_WRITE);
-  return file_.IsValid();
-}
+  switch (c) {
+    case '<':   // Less than
+    case '>':   // Greater than
+    case ':':   // Colon
+    case '"':   // Double quote
+    case '|':   // Vertical bar or pipe
+    case '?':   // Question mark
+    case '*':   // Asterisk
+    case '/':   // Forward slash
+    case '\\':  // Backslash
+      return false;
+  }
 
-bool FilePathWriterDelegate::WriteBytes(const char* data, int num_bytes) {
-  return num_bytes == file_.WriteAtCurrentPos(data, num_bytes);
+  return true;
 }
 
-
-// StringWriterDelegate --------------------------------------------------------
-
-// A writer delegate that writes no more than |max_read_bytes| to a given
-// std::string.
+// A writer delegate that writes to a given string.
 class StringWriterDelegate : public WriterDelegate {
  public:
-  StringWriterDelegate(size_t max_read_bytes, std::string* output);
-  ~StringWriterDelegate() override;
+  explicit StringWriterDelegate(std::string* output) : output_(output) {}
 
   // WriterDelegate methods:
-
-  // Returns true.
-  bool PrepareOutput() override;
-
-  // Appends |num_bytes| bytes from |data| to the output string. Returns false
-  // if |num_bytes| will cause the string to exceed |max_read_bytes|.
-  bool WriteBytes(const char* data, int num_bytes) override;
+  bool WriteBytes(const char* data, int num_bytes) override {
+    output_->append(data, num_bytes);
+    return true;
+  }
 
  private:
-  size_t max_read_bytes_;
-  std::string* output_;
-
-  DISALLOW_COPY_AND_ASSIGN(StringWriterDelegate);
+  std::string* const output_;
 };
 
-StringWriterDelegate::StringWriterDelegate(size_t max_read_bytes,
-                                           std::string* output)
-    : max_read_bytes_(max_read_bytes),
-      output_(output) {
-}
-
-StringWriterDelegate::~StringWriterDelegate() {
-}
-
-bool StringWriterDelegate::PrepareOutput() {
-  return true;
-}
-
-bool StringWriterDelegate::WriteBytes(const char* data, int num_bytes) {
-  if (output_->size() + num_bytes > max_read_bytes_)
-    return false;
-  output_->append(data, num_bytes);
-  return true;
+#if defined(OS_POSIX)
+void SetPosixFilePermissions(int fd, int mode) {
+  base::stat_wrapper_t sb;
+  if (base::File::Fstat(fd, &sb)) {
+    return;
+  }
+  mode_t new_mode = sb.st_mode;
+  // Transfer the executable bit only if the file is readable.
+  if ((sb.st_mode & S_IRUSR) == S_IRUSR && (mode & S_IXUSR) == S_IXUSR) {
+    new_mode |= S_IXUSR;
+  }
+  if ((sb.st_mode & S_IRGRP) == S_IRGRP && (mode & S_IXGRP) == S_IXGRP) {
+    new_mode |= S_IXGRP;
+  }
+  if ((sb.st_mode & S_IROTH) == S_IROTH && (mode & S_IXOTH) == S_IXOTH) {
+    new_mode |= S_IXOTH;
+  }
+  if (new_mode != sb.st_mode) {
+    fchmod(fd, new_mode);
+  }
 }
+#endif
 
 }  // namespace
 
-// TODO(satorux): The implementation assumes that file names in zip files
-// are encoded in UTF-8. This is true for zip files created by Zip()
-// function in zip.h, but not true for user-supplied random zip files.
-ZipReader::EntryInfo::EntryInfo(const std::string& file_name_in_zip,
-                                const unz_file_info& raw_file_info)
-    : file_path_(base::FilePath::FromUTF8Unsafe(file_name_in_zip)),
-      is_directory_(false) {
-  original_size_ = raw_file_info.uncompressed_size;
-
-  // Directory entries in zip files end with "/".
-  is_directory_ = base::EndsWith(file_name_in_zip, "/",
-                                 base::CompareCase::INSENSITIVE_ASCII);
-
-  // Check the file name here for directory traversal issues.
-  is_unsafe_ = file_path_.ReferencesParent();
-
-  // We also consider that the file name is unsafe, if it's invalid UTF-8.
-  base::string16 file_name_utf16;
-  if (!base::UTF8ToUTF16(file_name_in_zip.data(), file_name_in_zip.size(),
-                         &file_name_utf16)) {
-    is_unsafe_ = true;
-  }
-
-  // We also consider that the file name is unsafe, if it's absolute.
-  // On Windows, IsAbsolute() returns false for paths starting with "/".
-  if (file_path_.IsAbsolute() ||
-      base::StartsWith(file_name_in_zip, "/",
-                       base::CompareCase::INSENSITIVE_ASCII))
-    is_unsafe_ = true;
-
-  // Construct the last modified time. The timezone info is not present in
-  // zip files, so we construct the time as local time.
-  base::Time::Exploded exploded_time = {};  // Zero-clear.
-  exploded_time.year = raw_file_info.tmu_date.tm_year;
-  // The month in zip file is 0-based, whereas ours is 1-based.
-  exploded_time.month = raw_file_info.tmu_date.tm_mon + 1;
-  exploded_time.day_of_month = raw_file_info.tmu_date.tm_mday;
-  exploded_time.hour = raw_file_info.tmu_date.tm_hour;
-  exploded_time.minute = raw_file_info.tmu_date.tm_min;
-  exploded_time.second = raw_file_info.tmu_date.tm_sec;
-  exploded_time.millisecond = 0;
-
-  if (!base::Time::FromLocalExploded(exploded_time, &last_modified_))
-    last_modified_ = base::Time::UnixEpoch();
-}
-
-ZipReader::ZipReader()
-    : weak_ptr_factory_(this) {
+ZipReader::ZipReader() {
   Reset();
 }
 
@@ -180,13 +127,14 @@ ZipReader::~ZipReader() {
   Close();
 }
 
-bool ZipReader::Open(const base::FilePath& zip_file_path) {
+bool ZipReader::Open(const base::FilePath& zip_path) {
   DCHECK(!zip_file_);
 
   // Use of "Unsafe" function does not look good, but there is no way to do
   // this safely on Linux. See file_util.h for details.
-  zip_file_ = internal::OpenForUnzipping(zip_file_path.AsUTF8Unsafe());
+  zip_file_ = internal::OpenForUnzipping(zip_path.AsUTF8Unsafe());
   if (!zip_file_) {
+    LOG(ERROR) << "Cannot open ZIP archive " << Redact(zip_path);
     return false;
   }
 
@@ -196,12 +144,13 @@ bool ZipReader::Open(const base::FilePath& zip_file_path) {
 bool ZipReader::OpenFromPlatformFile(base::PlatformFile zip_fd) {
   DCHECK(!zip_file_);
 
-#if defined(OS_POSIX)
+#if defined(OS_POSIX) || defined(OS_FUCHSIA)
   zip_file_ = internal::OpenFdForUnzipping(zip_fd);
 #elif defined(OS_WIN)
   zip_file_ = internal::OpenHandleForUnzipping(zip_fd);
 #endif
   if (!zip_file_) {
+    LOG(ERROR) << "Cannot open ZIP from file handle " << zip_fd;
     return false;
   }
 
@@ -217,167 +166,329 @@ bool ZipReader::OpenFromString(const std::string& data) {
 
 void ZipReader::Close() {
   if (zip_file_) {
-    unzClose(zip_file_);
+    if (const UnzipError err{unzClose(zip_file_)}; err != UNZ_OK) {
+      LOG(ERROR) << "Error while closing ZIP archive: " << err;
+    }
   }
   Reset();
 }
 
-bool ZipReader::HasMore() {
-  return !reached_end_;
-}
-
-bool ZipReader::AdvanceToNextEntry() {
+const ZipReader::Entry* ZipReader::Next() {
   DCHECK(zip_file_);
 
-  // Should not go further if we already reached the end.
   if (reached_end_)
-    return false;
+    return nullptr;
 
-  unz_file_pos position = {};
-  if (unzGetFilePos(zip_file_, &position) != UNZ_OK)
-    return false;
-  const int current_entry_index = position.num_of_file;
-  // If we are currently at the last entry, then the next position is the
-  // end of the zip file, so mark that we reached the end.
-  if (current_entry_index + 1 == num_entries_) {
-    reached_end_ = true;
-  } else {
-    DCHECK_LT(current_entry_index + 1, num_entries_);
-    if (unzGoToNextFile(zip_file_) != UNZ_OK) {
-      return false;
+  DCHECK(ok_);
+
+  // Move to the next entry if we're not trying to open the first entry.
+  if (next_index_ > 0) {
+    if (const UnzipError err{unzGoToNextFile(zip_file_)}; err != UNZ_OK) {
+      reached_end_ = true;
+      if (err != UNZ_END_OF_LIST_OF_FILE) {
+        LOG(ERROR) << "Cannot go to next entry in ZIP: " << err;
+        ok_ = false;
+      }
+      return nullptr;
     }
   }
-  current_entry_info_.reset();
-  return true;
+
+  next_index_++;
+
+  if (!OpenEntry()) {
+    reached_end_ = true;
+    ok_ = false;
+    return nullptr;
+  }
+
+  return &entry_;
 }
 
-bool ZipReader::OpenCurrentEntryInZip() {
+bool ZipReader::OpenEntry() {
   DCHECK(zip_file_);
 
-  unz_file_info raw_file_info = {};
-  char raw_file_name_in_zip[internal::kZipMaxPath] = {};
-  const int result = unzGetCurrentFileInfo(zip_file_,
-                                           &raw_file_info,
-                                           raw_file_name_in_zip,
-                                           sizeof(raw_file_name_in_zip) - 1,
-                                           NULL,  // extraField.
-                                           0,  // extraFieldBufferSize.
-                                           NULL,  // szComment.
-                                           0);  // commentBufferSize.
-  if (result != UNZ_OK)
+  // Get entry info.
+  unz_file_info64 info = {};
+  char path_in_zip[internal::kZipMaxPath] = {};
+  if (const UnzipError err{unzGetCurrentFileInfo64(
+          zip_file_, &info, path_in_zip, sizeof(path_in_zip) - 1, nullptr, 0,
+          nullptr, 0)};
+      err != UNZ_OK) {
+    LOG(ERROR) << "Cannot get entry from ZIP: " << err;
     return false;
-  if (raw_file_name_in_zip[0] == '\0')
+  }
+
+  entry_.path_in_original_encoding = path_in_zip;
+
+  // Convert path from original encoding to Unicode.
+  std::u16string path_in_utf16;
+  const char* const encoding = encoding_.empty() ? "UTF-8" : encoding_.c_str();
+  if (!base::CodepageToUTF16(entry_.path_in_original_encoding, encoding,
+                             base::OnStringConversionError::SUBSTITUTE,
+                             &path_in_utf16)) {
+    LOG(ERROR) << "Cannot convert path from encoding " << encoding;
     return false;
-  current_entry_info_.reset(
-      new EntryInfo(raw_file_name_in_zip, raw_file_info));
+  }
+
+  // Normalize path.
+  Normalize(path_in_utf16);
+
+  entry_.original_size = info.uncompressed_size;
+
+  // The file content of this entry is encrypted if flag bit 0 is set.
+  entry_.is_encrypted = info.flag & 1;
+  if (entry_.is_encrypted) {
+    // Is the entry AES encrypted.
+    entry_.uses_aes_encryption = info.compression_method == 99;
+  } else {
+    entry_.uses_aes_encryption = false;
+  }
+
+  // Construct the last modified time. The timezone info is not present in ZIP
+  // archives, so we construct the time as UTC.
+  const base::Time::Exploded exploded_time = {
+      .year = static_cast<int>(info.tmu_date.tm_year),
+      .month =
+          static_cast<int>(info.tmu_date.tm_mon + 1),  // 0-based vs 1-based
+      .day_of_month = static_cast<int>(info.tmu_date.tm_mday),
+      .hour = static_cast<int>(info.tmu_date.tm_hour),
+      .minute = static_cast<int>(info.tmu_date.tm_min),
+      .second = static_cast<int>(info.tmu_date.tm_sec)};
+
+  if (!base::Time::FromUTCExploded(exploded_time, &entry_.last_modified))
+    entry_.last_modified = base::Time::UnixEpoch();
+
+#if defined(OS_POSIX)
+  entry_.posix_mode = (info.external_fa >> 16L) & (S_IRWXU | S_IRWXG | S_IRWXO);
+#else
+  entry_.posix_mode = 0;
+#endif
+
   return true;
 }
 
-bool ZipReader::LocateAndOpenEntry(const base::FilePath& path_in_zip) {
-  DCHECK(zip_file_);
+void ZipReader::Normalize(base::StringPiece16 in) {
+  entry_.is_unsafe = true;
 
-  current_entry_info_.reset();
-  reached_end_ = false;
-  const int kDefaultCaseSensivityOfOS = 0;
-  const int result = unzLocateFile(zip_file_,
-                                   path_in_zip.AsUTF8Unsafe().c_str(),
-                                   kDefaultCaseSensivityOfOS);
-  if (result != UNZ_OK)
-    return false;
+  // Directory entries in ZIP have a path ending with "/".
+  entry_.is_directory = base::EndsWith(in, u"/");
+
+  std::u16string normalized_path;
+  if (base::StartsWith(in, u"/")) {
+    normalized_path = u"ROOT";
+    entry_.is_unsafe = false;
+  }
+
+  for (;;) {
+    // Consume initial path separators.
+    const base::StringPiece16::size_type i = in.find_first_not_of(u'/');
+    if (i == base::StringPiece16::npos)
+      break;
 
-  // Then Open the entry.
-  return OpenCurrentEntryInZip();
+    in.remove_prefix(i);
+    DCHECK(!in.empty());
+
+    // Isolate next path component.
+    const base::StringPiece16 part = in.substr(0, in.find_first_of(u'/'));
+    DCHECK(!part.empty());
+
+    in.remove_prefix(part.size());
+
+    if (!normalized_path.empty())
+      normalized_path += u'/';
+
+    if (part == u".") {
+      normalized_path += u"DOT";
+      entry_.is_unsafe = true;
+      continue;
+    }
+
+    if (part == u"..") {
+      normalized_path += u"UP";
+      entry_.is_unsafe = true;
+      continue;
+    }
+
+    // Windows has more restrictions than other systems when it comes to valid
+    // file paths. Replace Windows-invalid characters on all systems for
+    // consistency. In particular, this prevents a path component containing
+    // colon and backslash from being misinterpreted as an absolute path on
+    // Windows.
+    for (const char16_t c : part) {
+      normalized_path += IsValidFileNameCharacterOnWindows(c) ? c : 0xFFFD;
+    }
+
+    entry_.is_unsafe = false;
+  }
+
+  // If the entry is a directory, add the final path separator to the entry
+  // path.
+  if (entry_.is_directory && !normalized_path.empty()) {
+    normalized_path += u'/';
+    entry_.is_unsafe = false;
+  }
+
+  entry_.path = base::FilePath::FromUTF16Unsafe(normalized_path);
+
+  // By construction, we should always get a relative path.
+  DCHECK(!entry_.path.IsAbsolute()) << entry_.path;
 }
 
-bool ZipReader::ExtractCurrentEntry(WriterDelegate* delegate) const {
-  DCHECK(zip_file_);
+void ZipReader::ReportProgress(ListenerCallback listener_callback,
+                               uint64_t bytes) const {
+  delta_bytes_read_ += bytes;
+
+  const base::TimeTicks now = base::TimeTicks::Now();
+  if (next_progress_report_time_ > now)
+    return;
+
+  next_progress_report_time_ = now + progress_period_;
+  listener_callback.Run(delta_bytes_read_);
+  delta_bytes_read_ = 0;
+}
 
-  const int open_result = unzOpenCurrentFile(zip_file_);
-  if (open_result != UNZ_OK)
+bool ZipReader::ExtractCurrentEntry(WriterDelegate* delegate,
+                                    ListenerCallback listener_callback,
+                                    uint64_t num_bytes_to_extract) const {
+  DCHECK(zip_file_);
+  DCHECK_LT(0, next_index_);
+  DCHECK(ok_);
+  DCHECK(!reached_end_);
+
+  // Use password only for encrypted files. For non-encrypted files, no password
+  // is needed, and must be nullptr.
+  const char* const password =
+      entry_.is_encrypted ? password_.c_str() : nullptr;
+  if (const UnzipError err{unzOpenCurrentFilePassword(zip_file_, password)};
+      err != UNZ_OK) {
+    LOG(ERROR) << "Cannot open file " << Redact(entry_.path)
+               << " from ZIP: " << err;
     return false;
+  }
 
+  DCHECK(delegate);
   if (!delegate->PrepareOutput())
     return false;
 
-  bool success = true;  // This becomes false when something bad happens.
-  std::unique_ptr<char[]> buf(new char[internal::kZipBufSize]);
-  while (true) {
-    const int num_bytes_read = unzReadCurrentFile(zip_file_, buf.get(),
-                                                  internal::kZipBufSize);
+  uint64_t remaining_capacity = num_bytes_to_extract;
+  bool entire_file_extracted = false;
+
+  while (remaining_capacity > 0) {
+    char buf[internal::kZipBufSize];
+    const int num_bytes_read =
+        unzReadCurrentFile(zip_file_, buf, internal::kZipBufSize);
+
     if (num_bytes_read == 0) {
-      // Reached the end of the file.
+      entire_file_extracted = true;
       break;
-    } else if (num_bytes_read < 0) {
-      // If num_bytes_read < 0, then it's a specific UNZ_* error code.
-      success = false;
+    }
+
+    if (num_bytes_read < 0) {
+      LOG(ERROR) << "Cannot read file " << Redact(entry_.path)
+                 << " from ZIP: " << UnzipError(num_bytes_read);
       break;
-    } else if (num_bytes_read > 0) {
-      // Some data is read.
-      if (!delegate->WriteBytes(buf.get(), num_bytes_read)) {
-        success = false;
-        break;
-      }
     }
-  }
 
-  unzCloseCurrentFile(zip_file_);
+    if (listener_callback) {
+      ReportProgress(listener_callback, num_bytes_read);
+    }
 
-  return success;
-}
+    DCHECK_LT(0, num_bytes_read);
+    CHECK_LE(num_bytes_read, internal::kZipBufSize);
 
-bool ZipReader::ExtractCurrentEntryToFilePath(
-    const base::FilePath& output_file_path) const {
-  DCHECK(zip_file_);
+    uint64_t num_bytes_to_write = std::min<uint64_t>(
+        remaining_capacity, base::checked_cast<uint64_t>(num_bytes_read));
+    if (!delegate->WriteBytes(buf, num_bytes_to_write))
+      break;
 
-  // If this is a directory, just create it and return.
-  if (current_entry_info()->is_directory())
-    return base::CreateDirectory(output_file_path);
+    if (remaining_capacity == base::checked_cast<uint64_t>(num_bytes_read)) {
+      // Ensures function returns true if the entire file has been read.
+      const int n = unzReadCurrentFile(zip_file_, buf, 1);
+      entire_file_extracted = (n == 0);
+      LOG_IF(ERROR, n < 0) << "Cannot read file " << Redact(entry_.path)
+                           << " from ZIP: " << UnzipError(n);
+    }
+
+    CHECK_GE(remaining_capacity, num_bytes_to_write);
+    remaining_capacity -= num_bytes_to_write;
+  }
 
-  bool success = false;
-  {
-    FilePathWriterDelegate writer(output_file_path);
-    success = ExtractCurrentEntry(&writer);
+  if (const UnzipError err{unzCloseCurrentFile(zip_file_)}; err != UNZ_OK) {
+    LOG(ERROR) << "Cannot extract file " << Redact(entry_.path)
+               << " from ZIP: " << err;
+    entire_file_extracted = false;
+  }
+
+  if (entire_file_extracted) {
+    delegate->SetPosixFilePermissions(entry_.posix_mode);
+    if (entry_.last_modified != base::Time::UnixEpoch()) {
+      delegate->SetTimeModified(entry_.last_modified);
+    }
+  } else {
+    delegate->OnError();
   }
 
-  if (success &&
-      current_entry_info()->last_modified() != base::Time::UnixEpoch()) {
-    base::TouchFile(output_file_path,
-                    base::Time::Now(),
-                    current_entry_info()->last_modified());
+  if (listener_callback) {
+    listener_callback.Run(delta_bytes_read_);
+    delta_bytes_read_ = 0;
   }
 
-  return success;
+  return entire_file_extracted;
+}
+
+bool ZipReader::ExtractCurrentEntry(WriterDelegate* delegate,
+                                    uint64_t num_bytes_to_extract) const {
+  return ExtractCurrentEntry(delegate, ListenerCallback(),
+                             num_bytes_to_extract);
+}
+
+bool ZipReader::ExtractCurrentEntryWithListener(
+    WriterDelegate* delegate,
+    ListenerCallback listener_callback) const {
+  return ExtractCurrentEntry(delegate, listener_callback);
 }
 
 void ZipReader::ExtractCurrentEntryToFilePathAsync(
     const base::FilePath& output_file_path,
-    const SuccessCallback& success_callback,
-    const FailureCallback& failure_callback,
-    const ProgressCallback& progress_callback) {
+    SuccessCallback success_callback,
+    FailureCallback failure_callback,
+    ProgressCallback progress_callback) {
   DCHECK(zip_file_);
-  DCHECK(current_entry_info_.get());
+  DCHECK_LT(0, next_index_);
+  DCHECK(ok_);
+  DCHECK(!reached_end_);
 
   // If this is a directory, just create it and return.
-  if (current_entry_info()->is_directory()) {
+  if (entry_.is_directory) {
     if (base::CreateDirectory(output_file_path)) {
-      base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, success_callback);
+      base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
+          FROM_HERE, std::move(success_callback));
     } else {
-      DVLOG(1) << "Unzip failed: unable to create directory.";
-      base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, failure_callback);
+      LOG(ERROR) << "Cannot create directory " << Redact(output_file_path);
+      base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
+          FROM_HERE, std::move(failure_callback));
     }
     return;
   }
 
-  if (unzOpenCurrentFile(zip_file_) != UNZ_OK) {
-    DVLOG(1) << "Unzip failed: unable to open current zip entry.";
-    base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, failure_callback);
+  // Use password only for encrypted files. For non-encrypted files, no password
+  // is needed, and must be nullptr.
+  const char* const password =
+      entry_.is_encrypted ? password_.c_str() : nullptr;
+  if (const UnzipError err{unzOpenCurrentFilePassword(zip_file_, password)};
+      err != UNZ_OK) {
+    LOG(ERROR) << "Cannot open file " << Redact(entry_.path)
+               << " from ZIP: " << err;
+    base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
+        FROM_HERE, std::move(failure_callback));
     return;
   }
 
   base::FilePath output_dir_path = output_file_path.DirName();
   if (!base::CreateDirectory(output_dir_path)) {
-    DVLOG(1) << "Unzip failed: unable to create containing directory.";
-    base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, failure_callback);
+    LOG(ERROR) << "Cannot create directory " << Redact(output_dir_path);
+    base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
+        FROM_HERE, std::move(failure_callback));
     return;
   }
 
@@ -385,142 +496,155 @@ void ZipReader::ExtractCurrentEntryToFilePathAsync(
   base::File output_file(output_file_path, flags);
 
   if (!output_file.IsValid()) {
-    DVLOG(1) << "Unzip failed: unable to create platform file at "
-             << output_file_path.value();
-    base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, failure_callback);
+    LOG(ERROR) << "Cannot create file " << Redact(output_file_path);
+    base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
+        FROM_HERE, std::move(failure_callback));
     return;
   }
 
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
+  base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
       FROM_HERE,
-      base::Bind(&ZipReader::ExtractChunk, weak_ptr_factory_.GetWeakPtr(),
-                 Passed(std::move(output_file)), success_callback,
-                 failure_callback, progress_callback, 0 /* initial offset */));
-}
-
-bool ZipReader::ExtractCurrentEntryIntoDirectory(
-    const base::FilePath& output_directory_path) const {
-  DCHECK(current_entry_info_.get());
-
-  base::FilePath output_file_path = output_directory_path.Append(
-      current_entry_info()->file_path());
-  return ExtractCurrentEntryToFilePath(output_file_path);
-}
-
-bool ZipReader::ExtractCurrentEntryToFile(base::File* file) const {
-  DCHECK(zip_file_);
-
-  // If this is a directory, there's nothing to extract to the file, so return
-  // false.
-  if (current_entry_info()->is_directory())
-    return false;
-
-  FileWriterDelegate writer(file);
-  return ExtractCurrentEntry(&writer);
+      base::BindOnce(&ZipReader::ExtractChunk, weak_ptr_factory_.GetWeakPtr(),
+                     std::move(output_file), std::move(success_callback),
+                     std::move(failure_callback), std::move(progress_callback),
+                     0 /* initial offset */));
 }
 
-bool ZipReader::ExtractCurrentEntryToString(size_t max_read_bytes,
+bool ZipReader::ExtractCurrentEntryToString(uint64_t max_read_bytes,
                                             std::string* output) const {
   DCHECK(output);
   DCHECK(zip_file_);
-  DCHECK_NE(0U, max_read_bytes);
+  DCHECK_LT(0, next_index_);
+  DCHECK(ok_);
+  DCHECK(!reached_end_);
+
+  output->clear();
 
-  if (current_entry_info()->is_directory()) {
-    output->clear();
+  if (max_read_bytes == 0)
     return true;
-  }
 
-  // The original_size() is the best hint for the real size, so it saves
-  // doing reallocations for the common case when the uncompressed size is
-  // correct. However, we need to assume that the uncompressed size could be
-  // incorrect therefore this function needs to read as much data as possible.
-  std::string contents;
-  contents.reserve(
-      static_cast<size_t>(std::min(static_cast<int64_t>(max_read_bytes),
-                                   current_entry_info()->original_size())));
+  if (entry_.is_directory)
+    return true;
 
-  StringWriterDelegate writer(max_read_bytes, &contents);
-  if (!ExtractCurrentEntry(&writer))
-    return false;
-  output->swap(contents);
-  return true;
+  // The original_size is the best hint for the real size, so it saves doing
+  // reallocations for the common case when the uncompressed size is correct.
+  // However, we need to assume that the uncompressed size could be incorrect
+  // therefore this function needs to read as much data as possible.
+  output->reserve(base::checked_cast<size_t>(std::min<uint64_t>(
+      max_read_bytes, base::checked_cast<uint64_t>(entry_.original_size))));
+
+  StringWriterDelegate writer(output);
+  return ExtractCurrentEntry(&writer, max_read_bytes);
 }
 
 bool ZipReader::OpenInternal() {
   DCHECK(zip_file_);
 
   unz_global_info zip_info = {};  // Zero-clear.
-  if (unzGetGlobalInfo(zip_file_, &zip_info) != UNZ_OK) {
+  if (const UnzipError err{unzGetGlobalInfo(zip_file_, &zip_info)};
+      err != UNZ_OK) {
+    LOG(ERROR) << "Cannot get ZIP info: " << err;
     return false;
   }
-  num_entries_ = zip_info.number_entry;
-  if (num_entries_ < 0)
-    return false;
 
-  // We are already at the end if the zip file is empty.
-  reached_end_ = (num_entries_ == 0);
+  num_entries_ = zip_info.number_entry;
+  reached_end_ = (num_entries_ <= 0);
+  ok_ = true;
   return true;
 }
 
 void ZipReader::Reset() {
-  zip_file_ = NULL;
+  zip_file_ = nullptr;
   num_entries_ = 0;
-  reached_end_ = false;
-  current_entry_info_.reset();
+  next_index_ = 0;
+  reached_end_ = true;
+  ok_ = false;
+  delta_bytes_read_ = 0;
+  entry_ = {};
 }
 
 void ZipReader::ExtractChunk(base::File output_file,
-                             const SuccessCallback& success_callback,
-                             const FailureCallback& failure_callback,
-                             const ProgressCallback& progress_callback,
-                             const int64_t offset) {
+                             SuccessCallback success_callback,
+                             FailureCallback failure_callback,
+                             ProgressCallback progress_callback,
+                             int64_t offset) {
   char buffer[internal::kZipBufSize];
 
-  const int num_bytes_read = unzReadCurrentFile(zip_file_,
-                                                buffer,
-                                                internal::kZipBufSize);
+  const int num_bytes_read =
+      unzReadCurrentFile(zip_file_, buffer, internal::kZipBufSize);
 
   if (num_bytes_read == 0) {
-    unzCloseCurrentFile(zip_file_);
-    success_callback.Run();
-  } else if (num_bytes_read < 0) {
-    DVLOG(1) << "Unzip failed: error while reading zipfile "
-             << "(" << num_bytes_read << ")";
-    failure_callback.Run();
-  } else {
-    if (num_bytes_read != output_file.Write(offset, buffer, num_bytes_read)) {
-      DVLOG(1) << "Unzip failed: unable to write all bytes to target.";
-      failure_callback.Run();
+    if (const UnzipError err{unzCloseCurrentFile(zip_file_)}; err != UNZ_OK) {
+      LOG(ERROR) << "Cannot extract file " << Redact(entry_.path)
+                 << " from ZIP: " << err;
+      std::move(failure_callback).Run();
       return;
     }
 
-    int64_t current_progress = offset + num_bytes_read;
+    std::move(success_callback).Run();
+    return;
+  }
 
-    progress_callback.Run(current_progress);
+  if (num_bytes_read < 0) {
+    LOG(ERROR) << "Cannot read file " << Redact(entry_.path)
+               << " from ZIP: " << UnzipError(num_bytes_read);
+    std::move(failure_callback).Run();
+    return;
+  }
 
-    base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE,
-        base::Bind(&ZipReader::ExtractChunk, weak_ptr_factory_.GetWeakPtr(),
-                   Passed(std::move(output_file)), success_callback,
-                   failure_callback, progress_callback, current_progress));
+  if (num_bytes_read != output_file.Write(offset, buffer, num_bytes_read)) {
+    LOG(ERROR) << "Cannot write " << num_bytes_read
+               << " bytes to file at offset " << offset;
+    std::move(failure_callback).Run();
+    return;
   }
+
+  offset += num_bytes_read;
+  progress_callback.Run(offset);
+
+  base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
+      FROM_HERE,
+      base::BindOnce(&ZipReader::ExtractChunk, weak_ptr_factory_.GetWeakPtr(),
+                     std::move(output_file), std::move(success_callback),
+                     std::move(failure_callback), std::move(progress_callback),
+                     offset));
 }
 
 // FileWriterDelegate ----------------------------------------------------------
 
-FileWriterDelegate::FileWriterDelegate(base::File* file)
-    : file_(file),
-      file_length_(0) {
+FileWriterDelegate::FileWriterDelegate(base::File* file) : file_(file) {
+  DCHECK(file_);
 }
 
-FileWriterDelegate::~FileWriterDelegate() {
-  if (!file_->SetLength(file_length_)) {
-    DPLOG(ERROR) << "Failed updating length of written file";
-  }
+FileWriterDelegate::FileWriterDelegate(base::File owned_file)
+    : owned_file_(std::move(owned_file)) {
+  DCHECK_EQ(file_, &owned_file_);
 }
 
+FileWriterDelegate::~FileWriterDelegate() {}
+
 bool FileWriterDelegate::PrepareOutput() {
-  return file_->Seek(base::File::FROM_BEGIN, 0) >= 0;
+  DCHECK(file_);
+
+  if (!file_->IsValid()) {
+    LOG(ERROR) << "File is not valid";
+    return false;
+  }
+
+  const int64_t length = file_->GetLength();
+  if (length < 0) {
+    PLOG(ERROR) << "Cannot get length of file handle "
+                << file_->GetPlatformFile();
+    return false;
+  }
+
+  // Just log a warning if the file is not empty.
+  // See crbug.com/1309879 and crbug.com/774762.
+  LOG_IF(WARNING, length > 0)
+      << "File handle " << file_->GetPlatformFile()
+      << " is not empty: Its length is " << length << " bytes";
+
+  return true;
 }
 
 bool FileWriterDelegate::WriteBytes(const char* data, int num_bytes) {
@@ -530,4 +654,69 @@ bool FileWriterDelegate::WriteBytes(const char* data, int num_bytes) {
   return bytes_written == num_bytes;
 }
 
+void FileWriterDelegate::SetTimeModified(const base::Time& time) {
+  file_->SetTimes(base::Time::Now(), time);
+}
+
+void FileWriterDelegate::SetPosixFilePermissions(int mode) {
+#if defined(OS_POSIX)
+  zip::SetPosixFilePermissions(file_->GetPlatformFile(), mode);
+#endif
+}
+
+void FileWriterDelegate::OnError() {
+  file_length_ = 0;
+  file_->SetLength(0);
+}
+
+// FilePathWriterDelegate ------------------------------------------------------
+
+FilePathWriterDelegate::FilePathWriterDelegate(base::FilePath output_file_path)
+    : FileWriterDelegate(base::File()),
+      output_file_path_(std::move(output_file_path)) {}
+
+FilePathWriterDelegate::~FilePathWriterDelegate() {}
+
+bool FilePathWriterDelegate::PrepareOutput() {
+  // We can't rely on parent directory entries being specified in the
+  // zip, so we make sure they are created.
+  if (const base::FilePath dir = output_file_path_.DirName();
+      !base::CreateDirectory(dir)) {
+    PLOG(ERROR) << "Cannot create directory " << Redact(dir);
+    return false;
+  }
+
+  owned_file_.Initialize(output_file_path_,
+                         base::File::FLAG_CREATE | base::File::FLAG_WRITE);
+  if (!owned_file_.IsValid()) {
+    PLOG(ERROR) << "Cannot create file " << Redact(output_file_path_) << ": "
+                << base::File::ErrorToString(owned_file_.error_details());
+    return false;
+  }
+
+  const int64_t length = owned_file_.GetLength();
+  if (length < 0) {
+    PLOG(ERROR) << "Cannot get length of file " << Redact(output_file_path_);
+    return false;
+  }
+
+  if (length > 0) {
+    LOG(ERROR) << "File " << Redact(output_file_path_)
+               << " is not empty: Its length is " << length << " bytes";
+    return false;
+  }
+
+  return true;
+}
+
+void FilePathWriterDelegate::OnError() {
+  FileWriterDelegate::OnError();
+  owned_file_.Close();
+
+  if (!base::DeleteFile(output_file_path_)) {
+    LOG(ERROR) << "Cannot delete partially extracted file "
+               << Redact(output_file_path_);
+  }
+}
+
 }  // namespace zip
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip_reader.h b/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip_reader.h
index c1b6fb3364..b7680cc839 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip_reader.h
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip_reader.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2011 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 #ifndef THIRD_PARTY_ZLIB_GOOGLE_ZIP_READER_H_
@@ -7,15 +7,15 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include <limits>
 #include <memory>
 #include <string>
 
-#include "base/callback.h"
 #include "base/files/file.h"
 #include "base/files/file_path.h"
-#include "base/files/file_util.h"
-#include "base/macros.h"
+#include "base/functional/callback.h"
 #include "base/memory/weak_ptr.h"
+#include "base/numerics/safe_conversions.h"
 #include "base/time/time.h"
 
 #if defined(USE_SYSTEM_MINIZIP)
@@ -34,93 +34,128 @@ class WriterDelegate {
 
   // Invoked once before any data is streamed out to pave the way (e.g., to open
   // the output file). Return false on failure to cancel extraction.
-  virtual bool PrepareOutput() = 0;
+  virtual bool PrepareOutput() { return true; }
 
   // Invoked to write the next chunk of data. Return false on failure to cancel
   // extraction.
-  virtual bool WriteBytes(const char* data, int num_bytes) = 0;
+  virtual bool WriteBytes(const char* data, int num_bytes) { return true; }
+
+  // Sets the last-modified time of the data.
+  virtual void SetTimeModified(const base::Time& time) {}
+
+  // Called with the POSIX file permissions of the data; POSIX implementations
+  // may apply some of the permissions (for example, the executable bit) to the
+  // output file.
+  virtual void SetPosixFilePermissions(int mode) {}
+
+  // Called if an error occurred while extracting the file. The WriterDelegate
+  // can then remove and clean up the partially extracted data.
+  virtual void OnError() {}
 };
 
-// This class is used for reading zip files. A typical use case of this
-// class is to scan entries in a zip file and extract them. The code will
-// look like:
+// This class is used for reading ZIP archives. A typical use case of this class
+// is to scan entries in a ZIP archive and extract them. The code will look
+// like:
 //
 //   ZipReader reader;
-//   reader.Open(zip_file_path);
-//   while (reader.HasMore()) {
-//     reader.OpenCurrentEntryInZip();
-//     reader.ExtractCurrentEntryToDirectory(output_directory_path);
-//     reader.AdvanceToNextEntry();
+//   if (!reader.Open(zip_path)) {
+//     // Cannot open
+//     return;
 //   }
 //
-// For simplicity, error checking is omitted in the example code above. The
-// production code should check return values from all of these functions.
+//   while (const ZipReader::entry* entry = reader.Next()) {
+//     auto writer = CreateFilePathWriterDelegate(extract_dir, entry->path);
+//     if (!reader.ExtractCurrentEntry(writer)) {
+//           // Cannot extract
+//           return;
+//     }
+//   }
 //
-// This calls can also be used for random access of contents in a zip file
-// using LocateAndOpenEntry().
+//   if (!reader.ok()) {
+//     // Error while enumerating entries
+//     return;
+//   }
 //
 class ZipReader {
  public:
   // A callback that is called when the operation is successful.
-  typedef base::Closure SuccessCallback;
+  using SuccessCallback = base::OnceClosure;
   // A callback that is called when the operation fails.
-  typedef base::Closure FailureCallback;
+  using FailureCallback = base::OnceClosure;
   // A callback that is called periodically during the operation with the number
   // of bytes that have been processed so far.
-  typedef base::Callback<void(int64_t)> ProgressCallback;
-
-  // This class represents information of an entry (file or directory) in
-  // a zip file.
-  class EntryInfo {
-   public:
-    EntryInfo(const std::string& filename_in_zip,
-              const unz_file_info& raw_file_info);
-
-    // Returns the file path. The path is usually relative like
-    // "foo/bar.txt", but if it's absolute, is_unsafe() returns true.
-    const base::FilePath& file_path() const { return file_path_; }
-
-    // Returns the size of the original file (i.e. after uncompressed).
-    // Returns 0 if the entry is a directory.
-    // Note: this value should not be trusted, because it is stored as metadata
-    // in the zip archive and can be different from the real uncompressed size.
-    int64_t original_size() const { return original_size_; }
-
-    // Returns the last modified time. If the time stored in the zip file was
-    // not valid, the unix epoch will be returned.
+  using ProgressCallback = base::RepeatingCallback<void(int64_t)>;
+  // A callback that is called periodically during the operation with the number
+  // of bytes that have been processed since the previous call (i.e. delta).
+  using ListenerCallback = base::RepeatingCallback<void(uint64_t)>;
+
+  // Information of an entry (file or directory) in a ZIP archive.
+  struct Entry {
+    // Path of this entry, in its original encoding as it is stored in the ZIP
+    // archive. The encoding is not specified here. It might or might not be
+    // UTF-8, and the caller needs to use other means to determine the encoding
+    // if it wants to interpret this path correctly.
+    std::string path_in_original_encoding;
+
+    // Path of the entry, converted to Unicode. This path is relative (eg
+    // "foo/bar.txt"). Absolute paths (eg "/foo/bar.txt") or paths containing
+    // ".." or "." components (eg "../foo/bar.txt") are converted to safe
+    // relative paths. Eg:
+    // (In ZIP) -> (Entry.path)
+    // /foo/bar -> ROOT/foo/bar
+    // ../a     -> UP/a
+    // ./a      -> DOT/a
+    base::FilePath path;
+
+    // Size of the original uncompressed file, or 0 if the entry is a directory.
+    // This value should not be trusted, because it is stored as metadata in the
+    // ZIP archive and can be different from the real uncompressed size.
+    int64_t original_size;
+
+    // Last modified time. If the timestamp stored in the ZIP archive is not
+    // valid, the Unix epoch will be returned.
+    //
+    // The timestamp stored in the ZIP archive uses the MS-DOS date and time
+    // format.
     //
-    // The time stored in the zip archive uses the MS-DOS date and time format.
     // http://msdn.microsoft.com/en-us/library/ms724247(v=vs.85).aspx
+    //
     // As such the following limitations apply:
-    // * only years from 1980 to 2107 can be represented.
-    // * the time stamp has a 2 second resolution.
-    // * there's no timezone information, so the time is interpreted as local.
-    base::Time last_modified() const { return last_modified_; }
-
-    // Returns true if the entry is a directory.
-    bool is_directory() const { return is_directory_; }
-
-    // Returns true if the entry is unsafe, like having ".." or invalid
-    // UTF-8 characters in its file name, or the file path is absolute.
-    bool is_unsafe() const { return is_unsafe_; }
-
-   private:
-    const base::FilePath file_path_;
-    int64_t original_size_;
-    base::Time last_modified_;
-    bool is_directory_;
-    bool is_unsafe_;
-    DISALLOW_COPY_AND_ASSIGN(EntryInfo);
+    // * Only years from 1980 to 2107 can be represented.
+    // * The timestamp has a 2-second resolution.
+    // * There is no timezone information, so the time is interpreted as UTC.
+    base::Time last_modified;
+
+    // True if the entry is a directory.
+    // False if the entry is a file.
+    bool is_directory = false;
+
+    // True if the entry path cannot be converted to a safe relative path. This
+    // happens if a file entry (not a directory) has a filename "." or "..".
+    bool is_unsafe = false;
+
+    // True if the file content is encrypted.
+    bool is_encrypted = false;
+
+    // True if the encryption scheme is AES.
+    bool uses_aes_encryption = false;
+
+    // Entry POSIX permissions (POSIX systems only).
+    int posix_mode;
   };
 
   ZipReader();
+
+  ZipReader(const ZipReader&) = delete;
+  ZipReader& operator=(const ZipReader&) = delete;
+
   ~ZipReader();
 
-  // Opens the zip file specified by |zip_file_path|. Returns true on
+  // Opens the ZIP archive specified by |zip_path|. Returns true on
   // success.
-  bool Open(const base::FilePath& zip_file_path);
+  bool Open(const base::FilePath& zip_path);
 
-  // Opens the zip file referred to by the platform file |zip_fd|, without
+  // Opens the ZIP archive referred to by the platform file |zip_fd|, without
   // taking ownership of |zip_fd|. Returns true on success.
   bool OpenFromPlatformFile(base::PlatformFile zip_fd);
 
@@ -129,102 +164,105 @@ class ZipReader {
   // string until it finishes extracting files.
   bool OpenFromString(const std::string& data);
 
-  // Closes the currently opened zip file. This function is called in the
+  // Closes the currently opened ZIP archive. This function is called in the
   // destructor of the class, so you usually don't need to call this.
   void Close();
 
-  // Returns true if there is at least one entry to read. This function is
-  // used to scan entries with AdvanceToNextEntry(), like:
+  // Sets the encoding of entry paths in the ZIP archive.
+  // By default, paths are assumed to be in UTF-8.
+  void SetEncoding(std::string encoding) { encoding_ = std::move(encoding); }
+
+  // Sets the decryption password that will be used to decrypt encrypted file in
+  // the ZIP archive.
+  void SetPassword(std::string password) { password_ = std::move(password); }
+
+  // Gets the next entry. Returns null if there is no more entry, or if an error
+  // occurred while scanning entries. The returned Entry is owned by this
+  // ZipReader, and is valid until Next() is called again or until this
+  // ZipReader is closed.
+  //
+  // This function should be called before operations over the current entry
+  // like ExtractCurrentEntryToFile().
   //
-  // while (reader.HasMore()) {
-  //   // Do something with the current file here.
-  //   reader.AdvanceToNextEntry();
+  // while (const ZipReader::Entry* entry = reader.Next()) {
+  //   // Do something with the current entry here.
+  //   ...
   // }
-  bool HasMore();
+  //
+  // // Finished scanning entries.
+  // // Check if the scanning stopped because of an error.
+  // if (!reader.ok()) {
+  //   // There was an error.
+  //   ...
+  // }
+  const Entry* Next();
 
-  // Advances the next entry. Returns true on success.
-  bool AdvanceToNextEntry();
+  // Returns true if the enumeration of entries was successful, or false if it
+  // stopped because of an error.
+  bool ok() const { return ok_; }
 
-  // Opens the current entry in the zip file. On success, returns true and
-  // updates the the current entry state (i.e. current_entry_info() is
-  // updated). This function should be called before operations over the
-  // current entry like ExtractCurrentEntryToFile().
+  // Extracts |num_bytes_to_extract| bytes of the current entry to |delegate|,
+  // starting from the beginning of the entry.
+  //
+  // Returns true if the entire file was extracted without error.
   //
-  // Note that there is no CloseCurrentEntryInZip(). The the current entry
-  // state is reset automatically as needed.
-  bool OpenCurrentEntryInZip();
-
-  // Locates an entry in the zip file and opens it. Returns true on
-  // success. This function internally calls OpenCurrentEntryInZip() on
-  // success. On failure, current_entry_info() becomes NULL.
-  bool LocateAndOpenEntry(const base::FilePath& path_in_zip);
-
-  // Extracts the current entry in chunks to |delegate|.
-  bool ExtractCurrentEntry(WriterDelegate* delegate) const;
-
-  // Extracts the current entry to the given output file path. If the
-  // current file is a directory, just creates a directory
-  // instead. Returns true on success. OpenCurrentEntryInZip() must be
-  // called beforehand.
+  // Precondition: Next() returned a non-null Entry.
+  bool ExtractCurrentEntry(WriterDelegate* delegate,
+                           uint64_t num_bytes_to_extract =
+                               std::numeric_limits<uint64_t>::max()) const;
+
+  // Extracts the current entry to |delegate|, starting from the beginning
+  // of the entry, calling |listener_callback| regularly with the number of
+  // bytes extracted.
   //
-  // This function preserves the timestamp of the original entry. If that
-  // timestamp is not valid, the timestamp will be set to the current time.
-  bool ExtractCurrentEntryToFilePath(
-      const base::FilePath& output_file_path) const;
-
-  // Asynchronously extracts the current entry to the given output file path.
-  // If the current entry is a directory it just creates the directory
-  // synchronously instead.  OpenCurrentEntryInZip() must be called beforehand.
-  // success_callback will be called on success and failure_callback will be
-  // called on failure.  progress_callback will be called at least once.
+  // Returns true if the entire file was extracted without error.
+  //
+  // Precondition: Next() returned a non-null Entry.
+  bool ExtractCurrentEntryWithListener(
+      WriterDelegate* delegate,
+      ListenerCallback listener_callback) const;
+
+  // Asynchronously extracts the current entry to the given output file path. If
+  // the current entry is a directory it just creates the directory
+  // synchronously instead.
+  //
+  // |success_callback| will be called on success and |failure_callback| will be
+  // called on failure. |progress_callback| will be called at least once.
   // Callbacks will be posted to the current MessageLoop in-order.
+  //
+  // Precondition: Next() returned a non-null Entry.
   void ExtractCurrentEntryToFilePathAsync(
       const base::FilePath& output_file_path,
-      const SuccessCallback& success_callback,
-      const FailureCallback& failure_callback,
-      const ProgressCallback& progress_callback);
-
-  // Extracts the current entry to the given output directory path using
-  // ExtractCurrentEntryToFilePath(). Sub directories are created as needed
-  // based on the file path of the current entry. For example, if the file
-  // path in zip is "foo/bar.txt", and the output directory is "output",
-  // "output/foo/bar.txt" will be created.
+      SuccessCallback success_callback,
+      FailureCallback failure_callback,
+      ProgressCallback progress_callback);
+
+  // Extracts the current entry into memory. If the current entry is a
+  // directory, |*output| is set to the empty string. If the current entry is a
+  // file, |*output| is filled with its contents.
   //
-  // Returns true on success. OpenCurrentEntryInZip() must be called
-  // beforehand.
+  // The value in |Entry::original_size| cannot be trusted, so the real size of
+  // the uncompressed contents can be different. |max_read_bytes| limits the
+  // amount of memory used to carry the entry.
   //
-  // This function preserves the timestamp of the original entry. If that
-  // timestamp is not valid, the timestamp will be set to the current time.
-  bool ExtractCurrentEntryIntoDirectory(
-      const base::FilePath& output_directory_path) const;
-
-  // Extracts the current entry by writing directly to a platform file.
-  // Does not close the file. Returns true on success.
-  bool ExtractCurrentEntryToFile(base::File* file) const;
-
-  // Extracts the current entry into memory. If the current entry is a directory
-  // the |output| parameter is set to the empty string. If the current entry is
-  // a file, the |output| parameter is filled with its contents. Returns true on
-  // success. OpenCurrentEntryInZip() must be called beforehand.
-  // Note: the |output| parameter can be filled with a big amount of data, avoid
-  // passing it around by value, but by reference or pointer.
-  // Note: the value returned by EntryInfo::original_size() cannot be
-  // trusted, so the real size of the uncompressed contents can be different.
-  // Use max_read_bytes to limit the ammount of memory used to carry the entry.
-  // If the real size of the uncompressed data is bigger than max_read_bytes
-  // then false is returned. |max_read_bytes| must be non-zero.
-  bool ExtractCurrentEntryToString(
-      size_t max_read_bytes,
-      std::string* output) const;
-
-  // Returns the current entry info. Returns NULL if the current entry is
-  // not yet opened. OpenCurrentEntryInZip() must be called beforehand.
-  EntryInfo* current_entry_info() const {
-    return current_entry_info_.get();
+  // Returns true if the entire content is read without error. If the content is
+  // bigger than |max_read_bytes|, this function returns false and |*output| is
+  // filled with |max_read_bytes| of data. If an error occurs, this function
+  // returns false and |*output| contains the content extracted so far, which
+  // might be garbage data.
+  //
+  // Precondition: Next() returned a non-null Entry.
+  bool ExtractCurrentEntryToString(uint64_t max_read_bytes,
+                                   std::string* output) const;
+
+  bool ExtractCurrentEntryToString(std::string* output) const {
+    return ExtractCurrentEntryToString(
+        base::checked_cast<uint64_t>(output->max_size()), output);
   }
 
-  // Returns the number of entries in the zip file.
-  // Open() must be called beforehand.
+  // Returns the number of entries in the ZIP archive.
+  //
+  // Precondition: one of the Open() methods returned true.
   int num_entries() const { return num_entries_; }
 
  private:
@@ -234,46 +272,131 @@ class ZipReader {
   // Resets the internal state.
   void Reset();
 
+  // Opens the current entry in the ZIP archive. On success, returns true and
+  // updates the current entry state |entry_|.
+  //
+  // Note that there is no matching CloseEntry(). The current entry state is
+  // reset automatically as needed.
+  bool OpenEntry();
+
+  // Normalizes the given path passed as UTF-16 string piece. Sets entry_.path,
+  // entry_.is_directory and entry_.is_unsafe.
+  void Normalize(base::StringPiece16 in);
+
+  // Runs the ListenerCallback at a throttled rate.
+  void ReportProgress(ListenerCallback listener_callback, uint64_t bytes) const;
+
+  // Extracts |num_bytes_to_extract| bytes of the current entry to |delegate|,
+  // starting from the beginning of the entry calling |listener_callback| if
+  // its supplied.
+  //
+  // Returns true if the entire file was extracted without error.
+  //
+  // Precondition: Next() returned a non-null Entry.
+  bool ExtractCurrentEntry(WriterDelegate* delegate,
+                           ListenerCallback listener_callback,
+                           uint64_t num_bytes_to_extract =
+                               std::numeric_limits<uint64_t>::max()) const;
+
   // Extracts a chunk of the file to the target.  Will post a task for the next
   // chunk and success/failure/progress callbacks as necessary.
   void ExtractChunk(base::File target_file,
-                    const SuccessCallback& success_callback,
-                    const FailureCallback& failure_callback,
-                    const ProgressCallback& progress_callback,
+                    SuccessCallback success_callback,
+                    FailureCallback failure_callback,
+                    ProgressCallback progress_callback,
                     const int64_t offset);
 
+  std::string encoding_;
+  std::string password_;
   unzFile zip_file_;
   int num_entries_;
+  int next_index_;
   bool reached_end_;
-  std::unique_ptr<EntryInfo> current_entry_info_;
+  bool ok_;
+  Entry entry_;
 
-  base::WeakPtrFactory<ZipReader> weak_ptr_factory_;
+  // Next time to report progress.
+  mutable base::TimeTicks next_progress_report_time_ = base::TimeTicks::Now();
 
-  DISALLOW_COPY_AND_ASSIGN(ZipReader);
+  // Progress time delta.
+  // TODO(crbug.com/953256) Add this as parameter to the unzip options.
+  base::TimeDelta progress_period_ = base::Milliseconds(1000);
+
+  // Number of bytes read since last progress report callback executed.
+  mutable uint64_t delta_bytes_read_ = 0;
+
+  base::WeakPtrFactory<ZipReader> weak_ptr_factory_{this};
 };
 
-// A writer delegate that writes to a given File.
+// A writer delegate that writes to a given File. It is recommended that this
+// file be initially empty.
 class FileWriterDelegate : public WriterDelegate {
  public:
+  // Constructs a FileWriterDelegate that manipulates |file|. The delegate will
+  // not own |file|, therefore the caller must guarantee |file| will outlive the
+  // delegate.
   explicit FileWriterDelegate(base::File* file);
 
-  // Truncates the file to the number of bytes written.
-  ~FileWriterDelegate() override;
+  // Constructs a FileWriterDelegate that takes ownership of |file|.
+  explicit FileWriterDelegate(base::File owned_file);
 
-  // WriterDelegate methods:
+  FileWriterDelegate(const FileWriterDelegate&) = delete;
+  FileWriterDelegate& operator=(const FileWriterDelegate&) = delete;
 
-  // Seeks to the beginning of the file, returning false if the seek fails.
+  ~FileWriterDelegate() override;
+
+  // Returns true if the file handle passed to the constructor is valid.
   bool PrepareOutput() override;
 
   // Writes |num_bytes| bytes of |data| to the file, returning false on error or
   // if not all bytes could be written.
   bool WriteBytes(const char* data, int num_bytes) override;
 
- private:
-  base::File* file_;
-  int64_t file_length_;
+  // Sets the last-modified time of the data.
+  void SetTimeModified(const base::Time& time) override;
+
+  // On POSIX systems, sets the file to be executable if the source file was
+  // executable.
+  void SetPosixFilePermissions(int mode) override;
 
-  DISALLOW_COPY_AND_ASSIGN(FileWriterDelegate);
+  // Empties the file to avoid leaving garbage data in it.
+  void OnError() override;
+
+  // Gets the number of bytes written into the file.
+  int64_t file_length() { return file_length_; }
+
+ protected:
+  // The delegate can optionally own the file it modifies, in which case
+  // owned_file_ is set and file_ is an alias for owned_file_.
+  base::File owned_file_;
+
+  // The file the delegate modifies.
+  base::File* const file_ = &owned_file_;
+
+  int64_t file_length_ = 0;
+};
+
+// A writer delegate that creates and writes a file at a given path. This does
+// not overwrite any existing file.
+class FilePathWriterDelegate : public FileWriterDelegate {
+ public:
+  explicit FilePathWriterDelegate(base::FilePath output_file_path);
+
+  FilePathWriterDelegate(const FilePathWriterDelegate&) = delete;
+  FilePathWriterDelegate& operator=(const FilePathWriterDelegate&) = delete;
+
+  ~FilePathWriterDelegate() override;
+
+  // Creates the output file and any necessary intermediate directories. Does
+  // not overwrite any existing file, and returns false if the output file
+  // cannot be created because another file conflicts with it.
+  bool PrepareOutput() override;
+
+  // Deletes the output file.
+  void OnError() override;
+
+ private:
+  const base::FilePath output_file_path_;
 };
 
 }  // namespace zip
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip_reader_unittest.cc b/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip_reader_unittest.cc
index 4e023dc283..6086c97c49 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip_reader_unittest.cc
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip_reader_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2011 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -8,28 +8,38 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <set>
+#include <iterator>
 #include <string>
+#include <vector>
 
-#include "base/bind.h"
+#include "base/check.h"
 #include "base/files/file.h"
+#include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
-#include "base/logging.h"
-#include "base/macros.h"
-#include "base/md5.h"
+#include "base/functional/bind.h"
+#include "base/hash/md5.h"
+#include "base/i18n/time_formatting.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
+#include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/test/bind.h"
+#include "base/test/task_environment.h"
 #include "base/time/time.h"
+#include "build/build_config.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
+#include "third_party/icu/source/i18n/unicode/timezone.h"
 #include "third_party/zlib/google/zip_internal.h"
 
-using ::testing::Return;
 using ::testing::_;
+using ::testing::ElementsAre;
+using ::testing::ElementsAreArray;
+using ::testing::Return;
+using ::testing::SizeIs;
 
 namespace {
 
@@ -37,10 +47,7 @@ const static std::string kQuuxExpectedMD5 = "d1ae4ac8a17a0e09317113ab284b57a6";
 
 class FileWrapper {
  public:
-  typedef enum {
-    READ_ONLY,
-    READ_WRITE
-  } AccessMode;
+  typedef enum { READ_ONLY, READ_WRITE } AccessMode;
 
   FileWrapper(const base::FilePath& path, AccessMode mode) {
     int flags = base::File::FLAG_READ;
@@ -71,18 +78,13 @@ class MockUnzipListener : public base::SupportsWeakPtr<MockUnzipListener> {
       : success_calls_(0),
         failure_calls_(0),
         progress_calls_(0),
-        current_progress_(0) {
-  }
+        current_progress_(0) {}
 
   // Success callback for async functions.
-  void OnUnzipSuccess() {
-    success_calls_++;
-  }
+  void OnUnzipSuccess() { success_calls_++; }
 
   // Failure callback for async functions.
-  void OnUnzipFailure() {
-    failure_calls_++;
-  }
+  void OnUnzipFailure() { failure_calls_++; }
 
   // Progress callback for async functions.
   void OnUnzipProgress(int64_t progress) {
@@ -108,340 +110,375 @@ class MockWriterDelegate : public zip::WriterDelegate {
  public:
   MOCK_METHOD0(PrepareOutput, bool());
   MOCK_METHOD2(WriteBytes, bool(const char*, int));
+  MOCK_METHOD1(SetTimeModified, void(const base::Time&));
+  MOCK_METHOD1(SetPosixFilePermissions, void(int));
+  MOCK_METHOD0(OnError, void());
 };
 
-}   // namespace
+bool ExtractCurrentEntryToFilePath(zip::ZipReader* reader,
+                                   base::FilePath path) {
+  zip::FilePathWriterDelegate writer(path);
+  return reader->ExtractCurrentEntry(&writer);
+}
+
+const zip::ZipReader::Entry* LocateAndOpenEntry(
+    zip::ZipReader* const reader,
+    const base::FilePath& path_in_zip) {
+  DCHECK(reader);
+  EXPECT_TRUE(reader->ok());
+
+  // The underlying library can do O(1) access, but ZipReader does not expose
+  // that. O(N) access is acceptable for these tests.
+  while (const zip::ZipReader::Entry* const entry = reader->Next()) {
+    EXPECT_TRUE(reader->ok());
+    if (entry->path == path_in_zip)
+      return entry;
+  }
+
+  EXPECT_TRUE(reader->ok());
+  return nullptr;
+}
+
+using Paths = std::vector<base::FilePath>;
+
+}  // namespace
 
 namespace zip {
 
 // Make the test a PlatformTest to setup autorelease pools properly on Mac.
 class ZipReaderTest : public PlatformTest {
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     PlatformTest::SetUp();
 
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     test_dir_ = temp_dir_.GetPath();
-
-    ASSERT_TRUE(GetTestDataDirectory(&test_data_dir_));
-
-    test_zip_file_ = test_data_dir_.AppendASCII("test.zip");
-    evil_zip_file_ = test_data_dir_.AppendASCII("evil.zip");
-    evil_via_invalid_utf8_zip_file_ = test_data_dir_.AppendASCII(
-        "evil_via_invalid_utf8.zip");
-    evil_via_absolute_file_name_zip_file_ = test_data_dir_.AppendASCII(
-        "evil_via_absolute_file_name.zip");
-
-    test_zip_contents_.insert(base::FilePath(FILE_PATH_LITERAL("foo/")));
-    test_zip_contents_.insert(base::FilePath(FILE_PATH_LITERAL("foo/bar/")));
-    test_zip_contents_.insert(
-        base::FilePath(FILE_PATH_LITERAL("foo/bar/baz.txt")));
-    test_zip_contents_.insert(
-        base::FilePath(FILE_PATH_LITERAL("foo/bar/quux.txt")));
-    test_zip_contents_.insert(
-        base::FilePath(FILE_PATH_LITERAL("foo/bar.txt")));
-    test_zip_contents_.insert(base::FilePath(FILE_PATH_LITERAL("foo.txt")));
-    test_zip_contents_.insert(
-        base::FilePath(FILE_PATH_LITERAL("foo/bar/.hidden")));
   }
 
-  virtual void TearDown() {
-    PlatformTest::TearDown();
+  static base::FilePath GetTestDataDirectory() {
+    base::FilePath path;
+    CHECK(base::PathService::Get(base::DIR_SOURCE_ROOT, &path));
+    return path.AppendASCII("third_party")
+        .AppendASCII("zlib")
+        .AppendASCII("google")
+        .AppendASCII("test")
+        .AppendASCII("data");
   }
 
-  bool GetTestDataDirectory(base::FilePath* path) {
-    bool success = PathService::Get(base::DIR_SOURCE_ROOT, path);
-    EXPECT_TRUE(success);
-    if (!success)
-      return false;
-    *path = path->AppendASCII("third_party");
-    *path = path->AppendASCII("zlib");
-    *path = path->AppendASCII("google");
-    *path = path->AppendASCII("test");
-    *path = path->AppendASCII("data");
-    return true;
-  }
+  static Paths GetPaths(const base::FilePath& zip_path,
+                        base::StringPiece encoding = {}) {
+    Paths paths;
+
+    if (ZipReader reader; reader.Open(zip_path)) {
+      if (!encoding.empty())
+        reader.SetEncoding(std::string(encoding));
+
+      while (const ZipReader::Entry* const entry = reader.Next()) {
+        EXPECT_TRUE(reader.ok());
+        paths.push_back(entry->path);
+      }
 
-  bool CompareFileAndMD5(const base::FilePath& path,
-                         const std::string expected_md5) {
-    // Read the output file and compute the MD5.
-    std::string output;
-    if (!base::ReadFileToString(path, &output))
-      return false;
-    const std::string md5 = base::MD5String(output);
-    return expected_md5 == md5;
+      EXPECT_TRUE(reader.ok());
+    }
+
+    return paths;
   }
 
   // The path to temporary directory used to contain the test operations.
   base::FilePath test_dir_;
   // The path to the test data directory where test.zip etc. are located.
-  base::FilePath test_data_dir_;
+  const base::FilePath data_dir_ = GetTestDataDirectory();
   // The path to test.zip in the test data directory.
-  base::FilePath test_zip_file_;
-  // The path to evil.zip in the test data directory.
-  base::FilePath evil_zip_file_;
-  // The path to evil_via_invalid_utf8.zip in the test data directory.
-  base::FilePath evil_via_invalid_utf8_zip_file_;
-  // The path to evil_via_absolute_file_name.zip in the test data directory.
-  base::FilePath evil_via_absolute_file_name_zip_file_;
-  std::set<base::FilePath> test_zip_contents_;
-
+  const base::FilePath test_zip_file_ = data_dir_.AppendASCII("test.zip");
+  const Paths test_zip_contents_ = {
+      base::FilePath(FILE_PATH_LITERAL("foo/")),
+      base::FilePath(FILE_PATH_LITERAL("foo/bar/")),
+      base::FilePath(FILE_PATH_LITERAL("foo/bar/baz.txt")),
+      base::FilePath(FILE_PATH_LITERAL("foo/bar/quux.txt")),
+      base::FilePath(FILE_PATH_LITERAL("foo/bar.txt")),
+      base::FilePath(FILE_PATH_LITERAL("foo.txt")),
+      base::FilePath(FILE_PATH_LITERAL("foo/bar/.hidden")),
+  };
   base::ScopedTempDir temp_dir_;
-
-  base::MessageLoop message_loop_;
+  base::test::TaskEnvironment task_environment_;
 };
 
 TEST_F(ZipReaderTest, Open_ValidZipFile) {
   ZipReader reader;
-  ASSERT_TRUE(reader.Open(test_zip_file_));
+  EXPECT_TRUE(reader.Open(test_zip_file_));
+  EXPECT_TRUE(reader.ok());
 }
 
 TEST_F(ZipReaderTest, Open_ValidZipPlatformFile) {
   ZipReader reader;
+  EXPECT_FALSE(reader.ok());
   FileWrapper zip_fd_wrapper(test_zip_file_, FileWrapper::READ_ONLY);
-  ASSERT_TRUE(reader.OpenFromPlatformFile(zip_fd_wrapper.platform_file()));
+  EXPECT_TRUE(reader.OpenFromPlatformFile(zip_fd_wrapper.platform_file()));
+  EXPECT_TRUE(reader.ok());
 }
 
 TEST_F(ZipReaderTest, Open_NonExistentFile) {
   ZipReader reader;
-  ASSERT_FALSE(reader.Open(test_data_dir_.AppendASCII("nonexistent.zip")));
+  EXPECT_FALSE(reader.ok());
+  EXPECT_FALSE(reader.Open(data_dir_.AppendASCII("nonexistent.zip")));
+  EXPECT_FALSE(reader.ok());
 }
 
 TEST_F(ZipReaderTest, Open_ExistentButNonZipFile) {
   ZipReader reader;
-  ASSERT_FALSE(reader.Open(test_data_dir_.AppendASCII("create_test_zip.sh")));
+  EXPECT_FALSE(reader.ok());
+  EXPECT_FALSE(reader.Open(data_dir_.AppendASCII("create_test_zip.sh")));
+  EXPECT_FALSE(reader.ok());
 }
 
-// Iterate through the contents in the test zip file, and compare that the
-// contents collected from the zip reader matches the expected contents.
+TEST_F(ZipReaderTest, Open_EmptyFile) {
+  ZipReader reader;
+  EXPECT_FALSE(reader.ok());
+  EXPECT_FALSE(reader.Open(data_dir_.AppendASCII("empty.zip")));
+  EXPECT_FALSE(reader.ok());
+}
+
+// Iterate through the contents in the test ZIP archive, and compare that the
+// contents collected from the ZipReader matches the expected contents.
 TEST_F(ZipReaderTest, Iteration) {
-  std::set<base::FilePath> actual_contents;
+  Paths actual_contents;
   ZipReader reader;
-  ASSERT_TRUE(reader.Open(test_zip_file_));
-  while (reader.HasMore()) {
-    ASSERT_TRUE(reader.OpenCurrentEntryInZip());
-    actual_contents.insert(reader.current_entry_info()->file_path());
-    ASSERT_TRUE(reader.AdvanceToNextEntry());
+  EXPECT_FALSE(reader.ok());
+  EXPECT_TRUE(reader.Open(test_zip_file_));
+  EXPECT_TRUE(reader.ok());
+  while (const ZipReader::Entry* const entry = reader.Next()) {
+    EXPECT_TRUE(reader.ok());
+    actual_contents.push_back(entry->path);
   }
-  EXPECT_FALSE(reader.AdvanceToNextEntry());  // Shouldn't go further.
-  EXPECT_EQ(test_zip_contents_.size(),
-            static_cast<size_t>(reader.num_entries()));
-  EXPECT_EQ(test_zip_contents_.size(), actual_contents.size());
-  EXPECT_EQ(test_zip_contents_, actual_contents);
+
+  EXPECT_TRUE(reader.ok());
+  EXPECT_FALSE(reader.Next());  // Shouldn't go further.
+  EXPECT_TRUE(reader.ok());
+
+  EXPECT_THAT(actual_contents, SizeIs(reader.num_entries()));
+  EXPECT_THAT(actual_contents, ElementsAreArray(test_zip_contents_));
 }
 
-// Open the test zip file from a file descriptor, iterate through its contents,
-// and compare that they match the expected contents.
+// Open the test ZIP archive from a file descriptor, iterate through its
+// contents, and compare that they match the expected contents.
 TEST_F(ZipReaderTest, PlatformFileIteration) {
-  std::set<base::FilePath> actual_contents;
+  Paths actual_contents;
   ZipReader reader;
   FileWrapper zip_fd_wrapper(test_zip_file_, FileWrapper::READ_ONLY);
-  ASSERT_TRUE(reader.OpenFromPlatformFile(zip_fd_wrapper.platform_file()));
-  while (reader.HasMore()) {
-    ASSERT_TRUE(reader.OpenCurrentEntryInZip());
-    actual_contents.insert(reader.current_entry_info()->file_path());
-    ASSERT_TRUE(reader.AdvanceToNextEntry());
+  EXPECT_TRUE(reader.OpenFromPlatformFile(zip_fd_wrapper.platform_file()));
+  EXPECT_TRUE(reader.ok());
+  while (const ZipReader::Entry* const entry = reader.Next()) {
+    EXPECT_TRUE(reader.ok());
+    actual_contents.push_back(entry->path);
   }
-  EXPECT_FALSE(reader.AdvanceToNextEntry());  // Shouldn't go further.
-  EXPECT_EQ(test_zip_contents_.size(),
-            static_cast<size_t>(reader.num_entries()));
-  EXPECT_EQ(test_zip_contents_.size(), actual_contents.size());
-  EXPECT_EQ(test_zip_contents_, actual_contents);
+
+  EXPECT_TRUE(reader.ok());
+  EXPECT_FALSE(reader.Next());  // Shouldn't go further.
+  EXPECT_TRUE(reader.ok());
+
+  EXPECT_THAT(actual_contents, SizeIs(reader.num_entries()));
+  EXPECT_THAT(actual_contents, ElementsAreArray(test_zip_contents_));
 }
 
-TEST_F(ZipReaderTest, LocateAndOpenEntry_ValidFile) {
-  std::set<base::FilePath> actual_contents;
+TEST_F(ZipReaderTest, RegularFile) {
   ZipReader reader;
   ASSERT_TRUE(reader.Open(test_zip_file_));
   base::FilePath target_path(FILE_PATH_LITERAL("foo/bar/quux.txt"));
-  ASSERT_TRUE(reader.LocateAndOpenEntry(target_path));
-  EXPECT_EQ(target_path, reader.current_entry_info()->file_path());
+
+  const ZipReader::Entry* entry = LocateAndOpenEntry(&reader, target_path);
+  ASSERT_TRUE(entry);
+
+  EXPECT_EQ(target_path, entry->path);
+  EXPECT_EQ(13527, entry->original_size);
+  EXPECT_EQ("2009-05-29 06:22:20.000",
+            base::UnlocalizedTimeFormatWithPattern(entry->last_modified,
+                                                   "y-MM-dd HH:mm:ss.SSS",
+                                                   icu::TimeZone::getGMT()));
+  EXPECT_FALSE(entry->is_unsafe);
+  EXPECT_FALSE(entry->is_directory);
 }
 
-TEST_F(ZipReaderTest, LocateAndOpenEntry_NonExistentFile) {
-  std::set<base::FilePath> actual_contents;
+TEST_F(ZipReaderTest, DotDotFile) {
   ZipReader reader;
-  ASSERT_TRUE(reader.Open(test_zip_file_));
-  base::FilePath target_path(FILE_PATH_LITERAL("nonexistent.txt"));
-  ASSERT_FALSE(reader.LocateAndOpenEntry(target_path));
-  EXPECT_EQ(NULL, reader.current_entry_info());
+  ASSERT_TRUE(reader.Open(data_dir_.AppendASCII("evil.zip")));
+  base::FilePath target_path(FILE_PATH_LITERAL(
+      "UP/levilevilevilevilevilevilevilevilevilevilevilevil"));
+  const ZipReader::Entry* entry = LocateAndOpenEntry(&reader, target_path);
+  ASSERT_TRUE(entry);
+  EXPECT_EQ(target_path, entry->path);
+  EXPECT_FALSE(entry->is_unsafe);
+  EXPECT_FALSE(entry->is_directory);
 }
 
-TEST_F(ZipReaderTest, ExtractCurrentEntryToFilePath_RegularFile) {
+TEST_F(ZipReaderTest, InvalidUTF8File) {
   ZipReader reader;
-  ASSERT_TRUE(reader.Open(test_zip_file_));
-  base::FilePath target_path(FILE_PATH_LITERAL("foo/bar/quux.txt"));
-  ASSERT_TRUE(reader.LocateAndOpenEntry(target_path));
-  ASSERT_TRUE(reader.ExtractCurrentEntryToFilePath(
-      test_dir_.AppendASCII("quux.txt")));
-  // Read the output file ans compute the MD5.
-  std::string output;
-  ASSERT_TRUE(base::ReadFileToString(test_dir_.AppendASCII("quux.txt"),
-                                     &output));
-  const std::string md5 = base::MD5String(output);
-  EXPECT_EQ(kQuuxExpectedMD5, md5);
-  // quux.txt should be larger than kZipBufSize so that we can exercise
-  // the loop in ExtractCurrentEntry().
-  EXPECT_LT(static_cast<size_t>(internal::kZipBufSize), output.size());
+  ASSERT_TRUE(reader.Open(data_dir_.AppendASCII("evil_via_invalid_utf8.zip")));
+  base::FilePath target_path = base::FilePath::FromUTF8Unsafe(".�.�evil.txt");
+  const ZipReader::Entry* entry = LocateAndOpenEntry(&reader, target_path);
+  ASSERT_TRUE(entry);
+  EXPECT_EQ(target_path, entry->path);
+  EXPECT_FALSE(entry->is_unsafe);
+  EXPECT_FALSE(entry->is_directory);
 }
 
-TEST_F(ZipReaderTest, PlatformFileExtractCurrentEntryToFilePath_RegularFile) {
-  ZipReader reader;
-  FileWrapper zip_fd_wrapper(test_zip_file_, FileWrapper::READ_ONLY);
-  ASSERT_TRUE(reader.OpenFromPlatformFile(zip_fd_wrapper.platform_file()));
-  base::FilePath target_path(FILE_PATH_LITERAL("foo/bar/quux.txt"));
-  ASSERT_TRUE(reader.LocateAndOpenEntry(target_path));
-  ASSERT_TRUE(reader.ExtractCurrentEntryToFilePath(
-      test_dir_.AppendASCII("quux.txt")));
-  // Read the output file and compute the MD5.
-  std::string output;
-  ASSERT_TRUE(base::ReadFileToString(test_dir_.AppendASCII("quux.txt"),
-                                     &output));
-  const std::string md5 = base::MD5String(output);
-  EXPECT_EQ(kQuuxExpectedMD5, md5);
-  // quux.txt should be larger than kZipBufSize so that we can exercise
-  // the loop in ExtractCurrentEntry().
-  EXPECT_LT(static_cast<size_t>(internal::kZipBufSize), output.size());
+// By default, file paths in ZIPs are interpreted as UTF-8. But in this test,
+// the ZIP archive contains file paths that are actually encoded in Shift JIS.
+// The SJIS-encoded paths are thus wrongly interpreted as UTF-8, resulting in
+// garbled paths. Invalid UTF-8 sequences are safely converted to the
+// replacement character �.
+TEST_F(ZipReaderTest, EncodingSjisAsUtf8) {
+  EXPECT_THAT(
+      GetPaths(data_dir_.AppendASCII("SJIS Bug 846195.zip")),
+      ElementsAre(
+          base::FilePath::FromUTF8Unsafe("�V�����t�H���_/SJIS_835C_��.txt"),
+          base::FilePath::FromUTF8Unsafe(
+              "�V�����t�H���_/�V�����e�L�X�g �h�L�������g.txt")));
 }
 
-TEST_F(ZipReaderTest, PlatformFileExtractCurrentEntryToFile_RegularFile) {
-  ZipReader reader;
-  FileWrapper zip_fd_wrapper(test_zip_file_, FileWrapper::READ_ONLY);
-  ASSERT_TRUE(reader.OpenFromPlatformFile(zip_fd_wrapper.platform_file()));
-  base::FilePath target_path(FILE_PATH_LITERAL("foo/bar/quux.txt"));
-  base::FilePath out_path = test_dir_.AppendASCII("quux.txt");
-  FileWrapper out_fd_w(out_path, FileWrapper::READ_WRITE);
-  ASSERT_TRUE(reader.LocateAndOpenEntry(target_path));
-  ASSERT_TRUE(reader.ExtractCurrentEntryToFile(out_fd_w.file()));
-  // Read the output file and compute the MD5.
-  std::string output;
-  ASSERT_TRUE(base::ReadFileToString(out_path, &output));
-  const std::string md5 = base::MD5String(output);
-  EXPECT_EQ(kQuuxExpectedMD5, md5);
-  // quux.txt should be larger than kZipBufSize so that we can exercise
-  // the loop in ExtractCurrentEntry().
-  EXPECT_LT(static_cast<size_t>(internal::kZipBufSize), output.size());
+// In this test, SJIS-encoded paths are interpreted as Code Page 1252. This
+// results in garbled paths. Note the presence of C1 control codes U+0090 and
+// U+0081 in the garbled paths.
+TEST_F(ZipReaderTest, EncodingSjisAs1252) {
+  EXPECT_THAT(
+      GetPaths(data_dir_.AppendASCII("SJIS Bug 846195.zip"), "windows-1252"),
+      ElementsAre(base::FilePath::FromUTF8Unsafe(
+                      "\u0090V‚µ‚¢ƒtƒHƒ‹ƒ_/SJIS_835C_ƒ�.txt"),
+                  base::FilePath::FromUTF8Unsafe(
+                      "\u0090V‚µ‚¢ƒtƒHƒ‹ƒ_/\u0090V‚µ‚¢ƒeƒLƒXƒg "
+                      "ƒhƒLƒ…ƒ\u0081ƒ“ƒg.txt")));
 }
 
-TEST_F(ZipReaderTest, ExtractCurrentEntryToFilePath_Directory) {
-  ZipReader reader;
-  ASSERT_TRUE(reader.Open(test_zip_file_));
-  base::FilePath target_path(FILE_PATH_LITERAL("foo/"));
-  ASSERT_TRUE(reader.LocateAndOpenEntry(target_path));
-  ASSERT_TRUE(reader.ExtractCurrentEntryToFilePath(
-      test_dir_.AppendASCII("foo")));
-  // The directory should be created.
-  ASSERT_TRUE(base::DirectoryExists(test_dir_.AppendASCII("foo")));
+// In this test, SJIS-encoded paths are interpreted as Code Page 866. This
+// results in garbled paths.
+TEST_F(ZipReaderTest, EncodingSjisAsIbm866) {
+  EXPECT_THAT(
+      GetPaths(data_dir_.AppendASCII("SJIS Bug 846195.zip"), "IBM866"),
+      ElementsAre(
+          base::FilePath::FromUTF8Unsafe("РVВ╡ВвГtГHГЛГ_/SJIS_835C_Г�.txt"),
+          base::FilePath::FromUTF8Unsafe(
+              "РVВ╡ВвГtГHГЛГ_/РVВ╡ВвГeГLГXГg ГhГLГЕГБГУГg.txt")));
 }
 
-TEST_F(ZipReaderTest, ExtractCurrentEntryIntoDirectory_RegularFile) {
-  ZipReader reader;
-  ASSERT_TRUE(reader.Open(test_zip_file_));
-  base::FilePath target_path(FILE_PATH_LITERAL("foo/bar/quux.txt"));
-  ASSERT_TRUE(reader.LocateAndOpenEntry(target_path));
-  ASSERT_TRUE(reader.ExtractCurrentEntryIntoDirectory(test_dir_));
-  // Sub directories should be created.
-  ASSERT_TRUE(base::DirectoryExists(test_dir_.AppendASCII("foo/bar")));
-  // And the file should be created.
-  std::string output;
-  ASSERT_TRUE(base::ReadFileToString(
-      test_dir_.AppendASCII("foo/bar/quux.txt"), &output));
-  const std::string md5 = base::MD5String(output);
-  EXPECT_EQ(kQuuxExpectedMD5, md5);
+// Tests that SJIS-encoded paths are correctly converted to Unicode.
+TEST_F(ZipReaderTest, EncodingSjis) {
+  EXPECT_THAT(
+      GetPaths(data_dir_.AppendASCII("SJIS Bug 846195.zip"), "Shift_JIS"),
+      ElementsAre(
+          base::FilePath::FromUTF8Unsafe("新しいフォルダ/SJIS_835C_ソ.txt"),
+          base::FilePath::FromUTF8Unsafe(
+              "新しいフォルダ/新しいテキスト ドキュメント.txt")));
 }
 
-TEST_F(ZipReaderTest, current_entry_info_RegularFile) {
+TEST_F(ZipReaderTest, AbsoluteFile) {
   ZipReader reader;
-  ASSERT_TRUE(reader.Open(test_zip_file_));
-  base::FilePath target_path(FILE_PATH_LITERAL("foo/bar/quux.txt"));
-  ASSERT_TRUE(reader.LocateAndOpenEntry(target_path));
-  ZipReader::EntryInfo* current_entry_info = reader.current_entry_info();
-
-  EXPECT_EQ(target_path, current_entry_info->file_path());
-  EXPECT_EQ(13527, current_entry_info->original_size());
-
-  // The expected time stamp: 2009-05-29 06:22:20
-  base::Time::Exploded exploded = {};  // Zero-clear.
-  current_entry_info->last_modified().LocalExplode(&exploded);
-  EXPECT_EQ(2009, exploded.year);
-  EXPECT_EQ(5, exploded.month);
-  EXPECT_EQ(29, exploded.day_of_month);
-  EXPECT_EQ(6, exploded.hour);
-  EXPECT_EQ(22, exploded.minute);
-  EXPECT_EQ(20, exploded.second);
-  EXPECT_EQ(0, exploded.millisecond);
-
-  EXPECT_FALSE(current_entry_info->is_unsafe());
-  EXPECT_FALSE(current_entry_info->is_directory());
+  ASSERT_TRUE(
+      reader.Open(data_dir_.AppendASCII("evil_via_absolute_file_name.zip")));
+  base::FilePath target_path(FILE_PATH_LITERAL("ROOT/evil.txt"));
+  const ZipReader::Entry* entry = LocateAndOpenEntry(&reader, target_path);
+  ASSERT_TRUE(entry);
+  EXPECT_EQ(target_path, entry->path);
+  EXPECT_FALSE(entry->is_unsafe);
+  EXPECT_FALSE(entry->is_directory);
 }
 
-TEST_F(ZipReaderTest, current_entry_info_DotDotFile) {
+TEST_F(ZipReaderTest, Directory) {
   ZipReader reader;
-  ASSERT_TRUE(reader.Open(evil_zip_file_));
-  base::FilePath target_path(FILE_PATH_LITERAL(
-      "../levilevilevilevilevilevilevilevilevilevilevilevil"));
-  ASSERT_TRUE(reader.LocateAndOpenEntry(target_path));
-  ZipReader::EntryInfo* current_entry_info = reader.current_entry_info();
-  EXPECT_EQ(target_path, current_entry_info->file_path());
-
-  // This file is unsafe because of ".." in the file name.
-  EXPECT_TRUE(current_entry_info->is_unsafe());
-  EXPECT_FALSE(current_entry_info->is_directory());
+  ASSERT_TRUE(reader.Open(test_zip_file_));
+  base::FilePath target_path(FILE_PATH_LITERAL("foo/bar/"));
+  const ZipReader::Entry* entry = LocateAndOpenEntry(&reader, target_path);
+  ASSERT_TRUE(entry);
+  EXPECT_EQ(target_path, entry->path);
+  // The directory size should be zero.
+  EXPECT_EQ(0, entry->original_size);
+  EXPECT_EQ("2009-05-31 15:49:52.000",
+            base::UnlocalizedTimeFormatWithPattern(entry->last_modified,
+                                                   "y-MM-dd HH:mm:ss.SSS",
+                                                   icu::TimeZone::getGMT()));
+  EXPECT_FALSE(entry->is_unsafe);
+  EXPECT_TRUE(entry->is_directory);
 }
 
-TEST_F(ZipReaderTest, current_entry_info_InvalidUTF8File) {
+TEST_F(ZipReaderTest, EncryptedFile_WrongPassword) {
   ZipReader reader;
-  ASSERT_TRUE(reader.Open(evil_via_invalid_utf8_zip_file_));
-  // The evil file is the 2nd file in the zip file.
-  // We cannot locate by the file name ".\x80.\\evil.txt",
-  // as FilePath may internally convert the string.
-  ASSERT_TRUE(reader.AdvanceToNextEntry());
-  ASSERT_TRUE(reader.OpenCurrentEntryInZip());
-  ZipReader::EntryInfo* current_entry_info = reader.current_entry_info();
+  ASSERT_TRUE(reader.Open(data_dir_.AppendASCII("Different Encryptions.zip")));
+  reader.SetPassword("wrong password");
 
-  // This file is unsafe because of invalid UTF-8 in the file name.
-  EXPECT_TRUE(current_entry_info->is_unsafe());
-  EXPECT_FALSE(current_entry_info->is_directory());
-}
+  {
+    const ZipReader::Entry* entry = reader.Next();
+    ASSERT_TRUE(entry);
+    EXPECT_EQ(base::FilePath::FromASCII("ClearText.txt"), entry->path);
+    EXPECT_FALSE(entry->is_directory);
+    EXPECT_FALSE(entry->is_encrypted);
+    std::string contents = "dummy";
+    EXPECT_TRUE(reader.ExtractCurrentEntryToString(&contents));
+    EXPECT_EQ("This is not encrypted.\n", contents);
+  }
 
-TEST_F(ZipReaderTest, current_entry_info_AbsoluteFile) {
-  ZipReader reader;
-  ASSERT_TRUE(reader.Open(evil_via_absolute_file_name_zip_file_));
-  base::FilePath target_path(FILE_PATH_LITERAL("/evil.txt"));
-  ASSERT_TRUE(reader.LocateAndOpenEntry(target_path));
-  ZipReader::EntryInfo* current_entry_info = reader.current_entry_info();
-  EXPECT_EQ(target_path, current_entry_info->file_path());
+  for (const base::StringPiece path : {
+           "Encrypted AES-128.txt",
+           "Encrypted AES-192.txt",
+           "Encrypted AES-256.txt",
+           "Encrypted ZipCrypto.txt",
+       }) {
+    const ZipReader::Entry* entry = reader.Next();
+    ASSERT_TRUE(entry);
+    EXPECT_EQ(base::FilePath::FromASCII(path), entry->path);
+    EXPECT_FALSE(entry->is_directory);
+    EXPECT_TRUE(entry->is_encrypted);
+    std::string contents = "dummy";
+    EXPECT_FALSE(reader.ExtractCurrentEntryToString(&contents));
+  }
 
-  // This file is unsafe because of the absolute file name.
-  EXPECT_TRUE(current_entry_info->is_unsafe());
-  EXPECT_FALSE(current_entry_info->is_directory());
+  EXPECT_FALSE(reader.Next());
+  EXPECT_TRUE(reader.ok());
 }
 
-TEST_F(ZipReaderTest, current_entry_info_Directory) {
+TEST_F(ZipReaderTest, EncryptedFile_RightPassword) {
   ZipReader reader;
-  ASSERT_TRUE(reader.Open(test_zip_file_));
-  base::FilePath target_path(FILE_PATH_LITERAL("foo/bar/"));
-  ASSERT_TRUE(reader.LocateAndOpenEntry(target_path));
-  ZipReader::EntryInfo* current_entry_info = reader.current_entry_info();
+  ASSERT_TRUE(reader.Open(data_dir_.AppendASCII("Different Encryptions.zip")));
+  reader.SetPassword("password");
 
-  EXPECT_EQ(base::FilePath(FILE_PATH_LITERAL("foo/bar/")),
-            current_entry_info->file_path());
-  // The directory size should be zero.
-  EXPECT_EQ(0, current_entry_info->original_size());
+  {
+    const ZipReader::Entry* entry = reader.Next();
+    ASSERT_TRUE(entry);
+    EXPECT_EQ(base::FilePath::FromASCII("ClearText.txt"), entry->path);
+    EXPECT_FALSE(entry->is_directory);
+    EXPECT_FALSE(entry->is_encrypted);
+    std::string contents = "dummy";
+    EXPECT_TRUE(reader.ExtractCurrentEntryToString(&contents));
+    EXPECT_EQ("This is not encrypted.\n", contents);
+  }
+
+  // TODO(crbug.com/1296838) Support AES encryption.
+  for (const base::StringPiece path : {
+           "Encrypted AES-128.txt",
+           "Encrypted AES-192.txt",
+           "Encrypted AES-256.txt",
+       }) {
+    const ZipReader::Entry* entry = reader.Next();
+    ASSERT_TRUE(entry);
+    EXPECT_EQ(base::FilePath::FromASCII(path), entry->path);
+    EXPECT_FALSE(entry->is_directory);
+    EXPECT_TRUE(entry->is_encrypted);
+    std::string contents = "dummy";
+    EXPECT_FALSE(reader.ExtractCurrentEntryToString(&contents));
+    EXPECT_EQ("", contents);
+  }
 
-  // The expected time stamp: 2009-05-31 15:49:52
-  base::Time::Exploded exploded = {};  // Zero-clear.
-  current_entry_info->last_modified().LocalExplode(&exploded);
-  EXPECT_EQ(2009, exploded.year);
-  EXPECT_EQ(5, exploded.month);
-  EXPECT_EQ(31, exploded.day_of_month);
-  EXPECT_EQ(15, exploded.hour);
-  EXPECT_EQ(49, exploded.minute);
-  EXPECT_EQ(52, exploded.second);
-  EXPECT_EQ(0, exploded.millisecond);
+  {
+    const ZipReader::Entry* entry = reader.Next();
+    ASSERT_TRUE(entry);
+    EXPECT_EQ(base::FilePath::FromASCII("Encrypted ZipCrypto.txt"),
+              entry->path);
+    EXPECT_FALSE(entry->is_directory);
+    EXPECT_TRUE(entry->is_encrypted);
+    std::string contents = "dummy";
+    EXPECT_TRUE(reader.ExtractCurrentEntryToString(&contents));
+    EXPECT_EQ("This is encrypted with ZipCrypto.\n", contents);
+  }
 
-  EXPECT_FALSE(current_entry_info->is_unsafe());
-  EXPECT_TRUE(current_entry_info->is_directory());
+  EXPECT_FALSE(reader.Next());
+  EXPECT_TRUE(reader.ok());
 }
 
 // Verifies that the ZipReader class can extract a file from a zip archive
@@ -464,17 +501,17 @@ TEST_F(ZipReaderTest, OpenFromString) {
       "\x50\x75\x78\x0b\x00\x01\x04\x8e\xf0\x00\x00\x04\x88\x13\x00\x00"
       "\x50\x4b\x05\x06\x00\x00\x00\x00\x01\x00\x01\x00\x4e\x00\x00\x00"
       "\x52\x00\x00\x00\x00\x00";
-  std::string data(kTestData, arraysize(kTestData));
+  std::string data(kTestData, std::size(kTestData));
   ZipReader reader;
   ASSERT_TRUE(reader.OpenFromString(data));
   base::FilePath target_path(FILE_PATH_LITERAL("test.txt"));
-  ASSERT_TRUE(reader.LocateAndOpenEntry(target_path));
-  ASSERT_TRUE(reader.ExtractCurrentEntryToFilePath(
-      test_dir_.AppendASCII("test.txt")));
+  ASSERT_TRUE(LocateAndOpenEntry(&reader, target_path));
+  ASSERT_TRUE(ExtractCurrentEntryToFilePath(&reader,
+                                            test_dir_.AppendASCII("test.txt")));
 
   std::string actual;
-  ASSERT_TRUE(base::ReadFileToString(
-      test_dir_.AppendASCII("test.txt"), &actual));
+  ASSERT_TRUE(
+      base::ReadFileToString(test_dir_.AppendASCII("test.txt"), &actual));
   EXPECT_EQ(std::string("This is a test.\n"), actual);
 }
 
@@ -486,15 +523,13 @@ TEST_F(ZipReaderTest, ExtractToFileAsync_RegularFile) {
   base::FilePath target_file = test_dir_.AppendASCII("quux.txt");
   base::FilePath target_path(FILE_PATH_LITERAL("foo/bar/quux.txt"));
   ASSERT_TRUE(reader.Open(test_zip_file_));
-  ASSERT_TRUE(reader.LocateAndOpenEntry(target_path));
+  ASSERT_TRUE(LocateAndOpenEntry(&reader, target_path));
   reader.ExtractCurrentEntryToFilePathAsync(
       target_file,
-      base::Bind(&MockUnzipListener::OnUnzipSuccess,
-                 listener.AsWeakPtr()),
-      base::Bind(&MockUnzipListener::OnUnzipFailure,
-                 listener.AsWeakPtr()),
-      base::Bind(&MockUnzipListener::OnUnzipProgress,
-                 listener.AsWeakPtr()));
+      base::BindOnce(&MockUnzipListener::OnUnzipSuccess, listener.AsWeakPtr()),
+      base::BindOnce(&MockUnzipListener::OnUnzipFailure, listener.AsWeakPtr()),
+      base::BindRepeating(&MockUnzipListener::OnUnzipProgress,
+                          listener.AsWeakPtr()));
 
   EXPECT_EQ(0, listener.success_calls());
   EXPECT_EQ(0, listener.failure_calls());
@@ -507,8 +542,8 @@ TEST_F(ZipReaderTest, ExtractToFileAsync_RegularFile) {
   EXPECT_LE(1, listener.progress_calls());
 
   std::string output;
-  ASSERT_TRUE(base::ReadFileToString(test_dir_.AppendASCII("quux.txt"),
-                                     &output));
+  ASSERT_TRUE(
+      base::ReadFileToString(test_dir_.AppendASCII("quux.txt"), &output));
   const std::string md5 = base::MD5String(output);
   EXPECT_EQ(kQuuxExpectedMD5, md5);
 
@@ -518,6 +553,103 @@ TEST_F(ZipReaderTest, ExtractToFileAsync_RegularFile) {
   EXPECT_EQ(file_size, listener.current_progress());
 }
 
+TEST_F(ZipReaderTest, ExtractToFileAsync_Encrypted_NoPassword) {
+  MockUnzipListener listener;
+
+  ZipReader reader;
+  ASSERT_TRUE(reader.Open(data_dir_.AppendASCII("Different Encryptions.zip")));
+  ASSERT_TRUE(LocateAndOpenEntry(
+      &reader, base::FilePath::FromASCII("Encrypted ZipCrypto.txt")));
+  const base::FilePath target_path = test_dir_.AppendASCII("extracted");
+  reader.ExtractCurrentEntryToFilePathAsync(
+      target_path,
+      base::BindOnce(&MockUnzipListener::OnUnzipSuccess, listener.AsWeakPtr()),
+      base::BindOnce(&MockUnzipListener::OnUnzipFailure, listener.AsWeakPtr()),
+      base::BindRepeating(&MockUnzipListener::OnUnzipProgress,
+                          listener.AsWeakPtr()));
+
+  EXPECT_EQ(0, listener.success_calls());
+  EXPECT_EQ(0, listener.failure_calls());
+  EXPECT_EQ(0, listener.progress_calls());
+
+  base::RunLoop().RunUntilIdle();
+
+  EXPECT_EQ(0, listener.success_calls());
+  EXPECT_EQ(1, listener.failure_calls());
+  EXPECT_LE(1, listener.progress_calls());
+
+  // The extracted file contains rubbish data.
+  // We probably shouldn't even look at it.
+  std::string contents;
+  ASSERT_TRUE(base::ReadFileToString(target_path, &contents));
+  EXPECT_NE("", contents);
+  EXPECT_EQ(contents.size(), listener.current_progress());
+}
+
+TEST_F(ZipReaderTest, ExtractToFileAsync_Encrypted_RightPassword) {
+  MockUnzipListener listener;
+
+  ZipReader reader;
+  reader.SetPassword("password");
+  ASSERT_TRUE(reader.Open(data_dir_.AppendASCII("Different Encryptions.zip")));
+  ASSERT_TRUE(LocateAndOpenEntry(
+      &reader, base::FilePath::FromASCII("Encrypted ZipCrypto.txt")));
+  const base::FilePath target_path = test_dir_.AppendASCII("extracted");
+  reader.ExtractCurrentEntryToFilePathAsync(
+      target_path,
+      base::BindOnce(&MockUnzipListener::OnUnzipSuccess, listener.AsWeakPtr()),
+      base::BindOnce(&MockUnzipListener::OnUnzipFailure, listener.AsWeakPtr()),
+      base::BindRepeating(&MockUnzipListener::OnUnzipProgress,
+                          listener.AsWeakPtr()));
+
+  EXPECT_EQ(0, listener.success_calls());
+  EXPECT_EQ(0, listener.failure_calls());
+  EXPECT_EQ(0, listener.progress_calls());
+
+  base::RunLoop().RunUntilIdle();
+
+  EXPECT_EQ(1, listener.success_calls());
+  EXPECT_EQ(0, listener.failure_calls());
+  EXPECT_LE(1, listener.progress_calls());
+
+  std::string contents;
+  ASSERT_TRUE(base::ReadFileToString(target_path, &contents));
+  EXPECT_EQ("This is encrypted with ZipCrypto.\n", contents);
+  EXPECT_EQ(contents.size(), listener.current_progress());
+}
+
+TEST_F(ZipReaderTest, ExtractToFileAsync_WrongCrc) {
+  MockUnzipListener listener;
+
+  ZipReader reader;
+  ASSERT_TRUE(reader.Open(data_dir_.AppendASCII("Wrong CRC.zip")));
+  ASSERT_TRUE(
+      LocateAndOpenEntry(&reader, base::FilePath::FromASCII("Corrupted.txt")));
+  const base::FilePath target_path = test_dir_.AppendASCII("extracted");
+  reader.ExtractCurrentEntryToFilePathAsync(
+      target_path,
+      base::BindOnce(&MockUnzipListener::OnUnzipSuccess, listener.AsWeakPtr()),
+      base::BindOnce(&MockUnzipListener::OnUnzipFailure, listener.AsWeakPtr()),
+      base::BindRepeating(&MockUnzipListener::OnUnzipProgress,
+                          listener.AsWeakPtr()));
+
+  EXPECT_EQ(0, listener.success_calls());
+  EXPECT_EQ(0, listener.failure_calls());
+  EXPECT_EQ(0, listener.progress_calls());
+
+  base::RunLoop().RunUntilIdle();
+
+  EXPECT_EQ(0, listener.success_calls());
+  EXPECT_EQ(1, listener.failure_calls());
+  EXPECT_LE(1, listener.progress_calls());
+
+  std::string contents;
+  ASSERT_TRUE(base::ReadFileToString(target_path, &contents));
+  EXPECT_EQ("This file has been changed after its CRC was computed.\n",
+            contents);
+  EXPECT_EQ(contents.size(), listener.current_progress());
+}
+
 // Verifies that the asynchronous extraction to a file works.
 TEST_F(ZipReaderTest, ExtractToFileAsync_Directory) {
   MockUnzipListener listener;
@@ -526,15 +658,13 @@ TEST_F(ZipReaderTest, ExtractToFileAsync_Directory) {
   base::FilePath target_file = test_dir_.AppendASCII("foo");
   base::FilePath target_path(FILE_PATH_LITERAL("foo/"));
   ASSERT_TRUE(reader.Open(test_zip_file_));
-  ASSERT_TRUE(reader.LocateAndOpenEntry(target_path));
+  ASSERT_TRUE(LocateAndOpenEntry(&reader, target_path));
   reader.ExtractCurrentEntryToFilePathAsync(
       target_file,
-      base::Bind(&MockUnzipListener::OnUnzipSuccess,
-                 listener.AsWeakPtr()),
-      base::Bind(&MockUnzipListener::OnUnzipFailure,
-                 listener.AsWeakPtr()),
-      base::Bind(&MockUnzipListener::OnUnzipProgress,
-                 listener.AsWeakPtr()));
+      base::BindOnce(&MockUnzipListener::OnUnzipSuccess, listener.AsWeakPtr()),
+      base::BindOnce(&MockUnzipListener::OnUnzipFailure, listener.AsWeakPtr()),
+      base::BindRepeating(&MockUnzipListener::OnUnzipProgress,
+                          listener.AsWeakPtr()));
 
   EXPECT_EQ(0, listener.success_calls());
   EXPECT_EQ(0, listener.failure_calls());
@@ -554,7 +684,7 @@ TEST_F(ZipReaderTest, ExtractCurrentEntryToString) {
   // sizes from 0 to 7 bytes respectively, being the contents of each file a
   // substring of "0123456" starting at '0'.
   base::FilePath test_zip_file =
-      test_data_dir_.AppendASCII("test_mismatch_size.zip");
+      data_dir_.AppendASCII("test_mismatch_size.zip");
 
   ZipReader reader;
   std::string contents;
@@ -565,7 +695,7 @@ TEST_F(ZipReaderTest, ExtractCurrentEntryToString) {
 
     base::FilePath file_name = base::FilePath::FromUTF8Unsafe(
         base::StringPrintf("%d.txt", static_cast<int>(i)));
-    ASSERT_TRUE(reader.LocateAndOpenEntry(file_name));
+    ASSERT_TRUE(LocateAndOpenEntry(&reader, file_name));
 
     if (i > 1) {
       // Off by one byte read limit: must fail.
@@ -575,16 +705,88 @@ TEST_F(ZipReaderTest, ExtractCurrentEntryToString) {
     if (i > 0) {
       // Exact byte read limit: must pass.
       EXPECT_TRUE(reader.ExtractCurrentEntryToString(i, &contents));
-      EXPECT_EQ(i, contents.size());
-      EXPECT_EQ(0, memcmp(contents.c_str(), "0123456", i));
+      EXPECT_EQ(std::string(base::StringPiece("0123456", i)), contents);
     }
 
     // More than necessary byte read limit: must pass.
-    EXPECT_TRUE(reader.ExtractCurrentEntryToString(16, &contents));
-    EXPECT_EQ(i, contents.size());
-    EXPECT_EQ(0, memcmp(contents.c_str(), "0123456", i));
+    EXPECT_TRUE(reader.ExtractCurrentEntryToString(&contents));
+    EXPECT_EQ(std::string(base::StringPiece("0123456", i)), contents);
+  }
+  reader.Close();
+}
+
+TEST_F(ZipReaderTest, ExtractPartOfCurrentEntry) {
+  // test_mismatch_size.zip contains files with names from 0.txt to 7.txt with
+  // sizes from 0 to 7 bytes respectively, being the contents of each file a
+  // substring of "0123456" starting at '0'.
+  base::FilePath test_zip_file =
+      data_dir_.AppendASCII("test_mismatch_size.zip");
+
+  ZipReader reader;
+  std::string contents;
+  ASSERT_TRUE(reader.Open(test_zip_file));
+
+  base::FilePath file_name0 = base::FilePath::FromUTF8Unsafe("0.txt");
+  ASSERT_TRUE(LocateAndOpenEntry(&reader, file_name0));
+  EXPECT_TRUE(reader.ExtractCurrentEntryToString(0, &contents));
+  EXPECT_EQ("", contents);
+  EXPECT_TRUE(reader.ExtractCurrentEntryToString(1, &contents));
+  EXPECT_EQ("", contents);
+
+  base::FilePath file_name1 = base::FilePath::FromUTF8Unsafe("1.txt");
+  ASSERT_TRUE(LocateAndOpenEntry(&reader, file_name1));
+  EXPECT_TRUE(reader.ExtractCurrentEntryToString(0, &contents));
+  EXPECT_EQ("", contents);
+  EXPECT_TRUE(reader.ExtractCurrentEntryToString(1, &contents));
+  EXPECT_EQ("0", contents);
+  EXPECT_TRUE(reader.ExtractCurrentEntryToString(2, &contents));
+  EXPECT_EQ("0", contents);
+
+  base::FilePath file_name4 = base::FilePath::FromUTF8Unsafe("4.txt");
+  ASSERT_TRUE(LocateAndOpenEntry(&reader, file_name4));
+  EXPECT_TRUE(reader.ExtractCurrentEntryToString(0, &contents));
+  EXPECT_EQ("", contents);
+  EXPECT_FALSE(reader.ExtractCurrentEntryToString(2, &contents));
+  EXPECT_EQ("01", contents);
+  EXPECT_TRUE(reader.ExtractCurrentEntryToString(4, &contents));
+  EXPECT_EQ("0123", contents);
+  // Checks that entire file is extracted and function returns true when
+  // |max_read_bytes| is larger than file size.
+  EXPECT_TRUE(reader.ExtractCurrentEntryToString(5, &contents));
+  EXPECT_EQ("0123", contents);
+
+  reader.Close();
+}
+
+TEST_F(ZipReaderTest, ExtractPosixPermissions) {
+  base::ScopedTempDir temp_dir;
+  ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
+
+  ZipReader reader;
+  ASSERT_TRUE(reader.Open(data_dir_.AppendASCII("test_posix_permissions.zip")));
+  for (auto entry : {"0.txt", "1.txt", "2.txt", "3.txt"}) {
+    ASSERT_TRUE(LocateAndOpenEntry(&reader, base::FilePath::FromASCII(entry)));
+    FilePathWriterDelegate delegate(temp_dir.GetPath().AppendASCII(entry));
+    ASSERT_TRUE(reader.ExtractCurrentEntry(&delegate));
   }
   reader.Close();
+
+#if defined(OS_POSIX)
+  // This assumes a umask of at least 0400.
+  int mode = 0;
+  EXPECT_TRUE(base::GetPosixFilePermissions(
+      temp_dir.GetPath().AppendASCII("0.txt"), &mode));
+  EXPECT_EQ(mode & 0700, 0700);
+  EXPECT_TRUE(base::GetPosixFilePermissions(
+      temp_dir.GetPath().AppendASCII("1.txt"), &mode));
+  EXPECT_EQ(mode & 0700, 0600);
+  EXPECT_TRUE(base::GetPosixFilePermissions(
+      temp_dir.GetPath().AppendASCII("2.txt"), &mode));
+  EXPECT_EQ(mode & 0700, 0700);
+  EXPECT_TRUE(base::GetPosixFilePermissions(
+      temp_dir.GetPath().AppendASCII("3.txt"), &mode));
+  EXPECT_EQ(mode & 0700, 0600);
+#endif
 }
 
 // This test exposes http://crbug.com/430959, at least on OS X
@@ -601,32 +803,30 @@ TEST_F(ZipReaderTest, DISABLED_LeakDetectionTest) {
 TEST_F(ZipReaderTest, ExtractCurrentEntryPrepareFailure) {
   testing::StrictMock<MockWriterDelegate> mock_writer;
 
-  EXPECT_CALL(mock_writer, PrepareOutput())
-      .WillOnce(Return(false));
+  EXPECT_CALL(mock_writer, PrepareOutput()).WillOnce(Return(false));
 
   base::FilePath target_path(FILE_PATH_LITERAL("foo/bar/quux.txt"));
   ZipReader reader;
 
   ASSERT_TRUE(reader.Open(test_zip_file_));
-  ASSERT_TRUE(reader.LocateAndOpenEntry(target_path));
+  ASSERT_TRUE(LocateAndOpenEntry(&reader, target_path));
   ASSERT_FALSE(reader.ExtractCurrentEntry(&mock_writer));
 }
 
-// Test that when WriterDelegate::WriteBytes returns false, no other methods on
-// the delegate are called and the extraction fails.
+// Test that when WriterDelegate::WriteBytes returns false, only the OnError
+// method on the delegate is called and the extraction fails.
 TEST_F(ZipReaderTest, ExtractCurrentEntryWriteBytesFailure) {
   testing::StrictMock<MockWriterDelegate> mock_writer;
 
-  EXPECT_CALL(mock_writer, PrepareOutput())
-      .WillOnce(Return(true));
-  EXPECT_CALL(mock_writer, WriteBytes(_, _))
-      .WillOnce(Return(false));
+  EXPECT_CALL(mock_writer, PrepareOutput()).WillOnce(Return(true));
+  EXPECT_CALL(mock_writer, WriteBytes(_, _)).WillOnce(Return(false));
+  EXPECT_CALL(mock_writer, OnError());
 
   base::FilePath target_path(FILE_PATH_LITERAL("foo/bar/quux.txt"));
   ZipReader reader;
 
   ASSERT_TRUE(reader.Open(test_zip_file_));
-  ASSERT_TRUE(reader.LocateAndOpenEntry(target_path));
+  ASSERT_TRUE(LocateAndOpenEntry(&reader, target_path));
   ASSERT_FALSE(reader.ExtractCurrentEntry(&mock_writer));
 }
 
@@ -634,59 +834,94 @@ TEST_F(ZipReaderTest, ExtractCurrentEntryWriteBytesFailure) {
 TEST_F(ZipReaderTest, ExtractCurrentEntrySuccess) {
   testing::StrictMock<MockWriterDelegate> mock_writer;
 
-  EXPECT_CALL(mock_writer, PrepareOutput())
-      .WillOnce(Return(true));
-  EXPECT_CALL(mock_writer, WriteBytes(_, _))
-      .WillRepeatedly(Return(true));
+  EXPECT_CALL(mock_writer, PrepareOutput()).WillOnce(Return(true));
+  EXPECT_CALL(mock_writer, WriteBytes(_, _)).WillRepeatedly(Return(true));
+  EXPECT_CALL(mock_writer, SetPosixFilePermissions(_));
+  EXPECT_CALL(mock_writer, SetTimeModified(_));
 
   base::FilePath target_path(FILE_PATH_LITERAL("foo/bar/quux.txt"));
   ZipReader reader;
 
   ASSERT_TRUE(reader.Open(test_zip_file_));
-  ASSERT_TRUE(reader.LocateAndOpenEntry(target_path));
+  ASSERT_TRUE(LocateAndOpenEntry(&reader, target_path));
   ASSERT_TRUE(reader.ExtractCurrentEntry(&mock_writer));
 }
 
+TEST_F(ZipReaderTest, WrongCrc) {
+  ZipReader reader;
+  ASSERT_TRUE(reader.Open(data_dir_.AppendASCII("Wrong CRC.zip")));
+
+  const ZipReader::Entry* const entry =
+      LocateAndOpenEntry(&reader, base::FilePath::FromASCII("Corrupted.txt"));
+  ASSERT_TRUE(entry);
+
+  std::string contents = "dummy";
+  EXPECT_FALSE(reader.ExtractCurrentEntryToString(&contents));
+  EXPECT_EQ("This file has been changed after its CRC was computed.\n",
+            contents);
+
+  contents = "dummy";
+  EXPECT_FALSE(
+      reader.ExtractCurrentEntryToString(entry->original_size + 1, &contents));
+  EXPECT_EQ("This file has been changed after its CRC was computed.\n",
+            contents);
+
+  contents = "dummy";
+  EXPECT_FALSE(
+      reader.ExtractCurrentEntryToString(entry->original_size, &contents));
+  EXPECT_EQ("This file has been changed after its CRC was computed.\n",
+            contents);
+
+  contents = "dummy";
+  EXPECT_FALSE(
+      reader.ExtractCurrentEntryToString(entry->original_size - 1, &contents));
+  EXPECT_EQ("This file has been changed after its CRC was computed.", contents);
+}
+
 class FileWriterDelegateTest : public ::testing::Test {
  protected:
   void SetUp() override {
     ASSERT_TRUE(base::CreateTemporaryFile(&temp_file_path_));
-    file_.Initialize(temp_file_path_, (base::File::FLAG_CREATE_ALWAYS |
-                                       base::File::FLAG_READ |
-                                       base::File::FLAG_WRITE |
-                                       base::File::FLAG_TEMPORARY |
-                                       base::File::FLAG_DELETE_ON_CLOSE));
+    file_.Initialize(temp_file_path_,
+                     (base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_READ |
+                      base::File::FLAG_WRITE | base::File::FLAG_WIN_TEMPORARY |
+                      base::File::FLAG_DELETE_ON_CLOSE));
     ASSERT_TRUE(file_.IsValid());
   }
 
-  // Writes data to the file, leaving the current position at the end of the
-  // write.
-  void PopulateFile() {
-    static const char kSomeData[] = "this sure is some data.";
-    static const size_t kSomeDataLen = sizeof(kSomeData) - 1;
-    ASSERT_NE(-1LL, file_.Write(0LL, kSomeData, kSomeDataLen));
-  }
-
   base::FilePath temp_file_path_;
   base::File file_;
 };
 
-TEST_F(FileWriterDelegateTest, WriteToStartAndTruncate) {
-  // Write stuff and advance.
-  PopulateFile();
+TEST_F(FileWriterDelegateTest, WriteToEnd) {
+  const std::string payload = "This is the actualy payload data.\n";
+
+  {
+    FileWriterDelegate writer(&file_);
+    EXPECT_EQ(0, writer.file_length());
+    ASSERT_TRUE(writer.PrepareOutput());
+    ASSERT_TRUE(writer.WriteBytes(payload.data(), payload.size()));
+    EXPECT_EQ(payload.size(), writer.file_length());
+  }
+
+  EXPECT_EQ(payload.size(), file_.GetLength());
+}
+
+TEST_F(FileWriterDelegateTest, EmptyOnError) {
+  const std::string payload = "This is the actualy payload data.\n";
 
-  // This should rewind, write, then truncate.
-  static const char kSomeData[] = "short";
-  static const int kSomeDataLen = sizeof(kSomeData) - 1;
   {
     FileWriterDelegate writer(&file_);
+    EXPECT_EQ(0, writer.file_length());
     ASSERT_TRUE(writer.PrepareOutput());
-    ASSERT_TRUE(writer.WriteBytes(kSomeData, kSomeDataLen));
+    ASSERT_TRUE(writer.WriteBytes(payload.data(), payload.size()));
+    EXPECT_EQ(payload.size(), writer.file_length());
+    EXPECT_EQ(payload.size(), file_.GetLength());
+    writer.OnError();
+    EXPECT_EQ(0, writer.file_length());
   }
-  ASSERT_EQ(kSomeDataLen, file_.GetLength());
-  char buf[kSomeDataLen] = {};
-  ASSERT_EQ(kSomeDataLen, file_.Read(0LL, buf, kSomeDataLen));
-  ASSERT_EQ(std::string(kSomeData), std::string(buf, kSomeDataLen));
+
+  EXPECT_EQ(0, file_.GetLength());
 }
 
 }  // namespace zip
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip_unittest.cc b/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip_unittest.cc
index 2d969d7d91..d0fc02fd93 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip_unittest.cc
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip_unittest.cc
@@ -1,12 +1,15 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2011 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 #include <stdint.h>
 
-#include <set>
+#include <iomanip>
+#include <limits>
 #include <string>
+#include <unordered_map>
+#include <unordered_set>
 #include <vector>
 
 #include "base/files/file.h"
@@ -14,24 +17,217 @@
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
+#include "base/functional/bind.h"
+#include "base/logging.h"
 #include "base/path_service.h"
+#include "base/strings/strcat.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
+#include "base/test/bind.h"
+#include "base/time/time.h"
 #include "build/build_config.h"
+#include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #include "third_party/zlib/google/zip.h"
+#include "third_party/zlib/google/zip_internal.h"
 #include "third_party/zlib/google/zip_reader.h"
 
+// Convenience macro to create a file path from a string literal.
+#define FP(path) base::FilePath(FILE_PATH_LITERAL(path))
+
 namespace {
 
+using testing::UnorderedElementsAre;
+using testing::UnorderedElementsAreArray;
+
+std::vector<std::string> GetRelativePaths(const base::FilePath& dir,
+                                          base::FileEnumerator::FileType type) {
+  std::vector<std::string> got_paths;
+  base::FileEnumerator files(dir, true, type);
+  for (base::FilePath path = files.Next(); !path.empty(); path = files.Next()) {
+    base::FilePath relative;
+    EXPECT_TRUE(dir.AppendRelativePath(path, &relative));
+    got_paths.push_back(relative.NormalizePathSeparatorsTo('/').AsUTF8Unsafe());
+  }
+
+  EXPECT_EQ(base::File::FILE_OK, files.GetError());
+  return got_paths;
+}
+
+bool CreateFile(const std::string& content,
+                base::FilePath* file_path,
+                base::File* file) {
+  if (!base::CreateTemporaryFile(file_path))
+    return false;
+
+  if (base::WriteFile(*file_path, content.data(), content.size()) == -1)
+    return false;
+
+  *file = base::File(
+      *file_path, base::File::Flags::FLAG_OPEN | base::File::Flags::FLAG_READ);
+  return file->IsValid();
+}
+
+// A WriterDelegate that logs progress once per second.
+class ProgressWriterDelegate : public zip::WriterDelegate {
+ public:
+  explicit ProgressWriterDelegate(int64_t expected_size)
+      : expected_size_(expected_size) {
+    CHECK_GT(expected_size_, 0);
+  }
+
+  bool WriteBytes(const char* data, int num_bytes) override {
+    received_bytes_ += num_bytes;
+    LogProgressIfNecessary();
+    return true;
+  }
+
+  void SetTimeModified(const base::Time& time) override { LogProgress(); }
+
+  int64_t received_bytes() const { return received_bytes_; }
+
+ private:
+  void LogProgressIfNecessary() {
+    const base::TimeTicks now = base::TimeTicks::Now();
+    if (next_progress_report_time_ > now)
+      return;
+
+    next_progress_report_time_ = now + progress_period_;
+    LogProgress();
+  }
+
+  void LogProgress() const {
+    LOG(INFO) << "Unzipping... " << std::setw(3)
+              << (100 * received_bytes_ / expected_size_) << "%";
+  }
+
+  const base::TimeDelta progress_period_ = base::Seconds(1);
+  base::TimeTicks next_progress_report_time_ =
+      base::TimeTicks::Now() + progress_period_;
+  const uint64_t expected_size_;
+  int64_t received_bytes_ = 0;
+};
+
+// A virtual file system containing:
+// /test
+// /test/foo.txt
+// /test/bar/bar1.txt
+// /test/bar/bar2.txt
+// Used to test providing a custom zip::FileAccessor when unzipping.
+class VirtualFileSystem : public zip::FileAccessor {
+ public:
+  static constexpr char kFooContent[] = "This is foo.";
+  static constexpr char kBar1Content[] = "This is bar.";
+  static constexpr char kBar2Content[] = "This is bar too.";
+
+  VirtualFileSystem() {
+    base::FilePath test_dir;
+    base::FilePath foo_txt_path = test_dir.AppendASCII("foo.txt");
+
+    base::FilePath file_path;
+    base::File file;
+    bool success = CreateFile(kFooContent, &file_path, &file);
+    DCHECK(success);
+    files_[foo_txt_path] = std::move(file);
+
+    base::FilePath bar_dir = test_dir.AppendASCII("bar");
+    base::FilePath bar1_txt_path = bar_dir.AppendASCII("bar1.txt");
+    success = CreateFile(kBar1Content, &file_path, &file);
+    DCHECK(success);
+    files_[bar1_txt_path] = std::move(file);
+
+    base::FilePath bar2_txt_path = bar_dir.AppendASCII("bar2.txt");
+    success = CreateFile(kBar2Content, &file_path, &file);
+    DCHECK(success);
+    files_[bar2_txt_path] = std::move(file);
+
+    file_tree_[base::FilePath()] = {{foo_txt_path}, {bar_dir}};
+    file_tree_[bar_dir] = {{bar1_txt_path, bar2_txt_path}};
+    file_tree_[foo_txt_path] = {};
+    file_tree_[bar1_txt_path] = {};
+    file_tree_[bar2_txt_path] = {};
+  }
+
+  VirtualFileSystem(const VirtualFileSystem&) = delete;
+  VirtualFileSystem& operator=(const VirtualFileSystem&) = delete;
+
+  ~VirtualFileSystem() override = default;
+
+ private:
+  bool Open(const zip::Paths paths,
+            std::vector<base::File>* const files) override {
+    DCHECK(files);
+    files->reserve(files->size() + paths.size());
+
+    for (const base::FilePath& path : paths) {
+      const auto it = files_.find(path);
+      if (it == files_.end()) {
+        files->emplace_back();
+      } else {
+        EXPECT_TRUE(it->second.IsValid());
+        files->push_back(std::move(it->second));
+      }
+    }
+
+    return true;
+  }
+
+  bool List(const base::FilePath& path,
+            std::vector<base::FilePath>* const files,
+            std::vector<base::FilePath>* const subdirs) override {
+    DCHECK(!path.IsAbsolute());
+    DCHECK(files);
+    DCHECK(subdirs);
+
+    const auto it = file_tree_.find(path);
+    if (it == file_tree_.end())
+      return false;
+
+    for (const base::FilePath& file : it->second.files) {
+      DCHECK(!file.empty());
+      files->push_back(file);
+    }
+
+    for (const base::FilePath& subdir : it->second.subdirs) {
+      DCHECK(!subdir.empty());
+      subdirs->push_back(subdir);
+    }
+
+    return true;
+  }
+
+  bool GetInfo(const base::FilePath& path, Info* const info) override {
+    DCHECK(!path.IsAbsolute());
+    DCHECK(info);
+
+    if (!file_tree_.count(path))
+      return false;
+
+    info->is_directory = !files_.count(path);
+    info->last_modified =
+        base::Time::FromDoubleT(172097977);  // Some random date.
+
+    return true;
+  }
+
+  struct DirContents {
+    std::vector<base::FilePath> files, subdirs;
+  };
+
+  std::unordered_map<base::FilePath, DirContents> file_tree_;
+  std::unordered_map<base::FilePath, base::File> files_;
+};
+
+// static
+constexpr char VirtualFileSystem::kFooContent[];
+constexpr char VirtualFileSystem::kBar1Content[];
+constexpr char VirtualFileSystem::kBar2Content[];
+
 // Make the test a PlatformTest to setup autorelease pools properly on Mac.
 class ZipTest : public PlatformTest {
  protected:
-  enum ValidYearType {
-    VALID_YEAR,
-    INVALID_YEAR
-  };
+  enum ValidYearType { VALID_YEAR, INVALID_YEAR };
 
   virtual void SetUp() {
     PlatformTest::SetUp();
@@ -51,59 +247,66 @@ class ZipTest : public PlatformTest {
     zip_contents_.insert(zip_path.AppendASCII(".hidden"));
 
     // Include a subset of files in |zip_file_list_| to test ZipFiles().
-    zip_file_list_.push_back(base::FilePath(FILE_PATH_LITERAL("foo.txt")));
-    zip_file_list_.push_back(
-        base::FilePath(FILE_PATH_LITERAL("foo/bar/quux.txt")));
-    zip_file_list_.push_back(
-        base::FilePath(FILE_PATH_LITERAL("foo/bar/.hidden")));
+    zip_file_list_.push_back(FP("foo.txt"));
+    zip_file_list_.push_back(FP("foo/bar/quux.txt"));
+    zip_file_list_.push_back(FP("foo/bar/.hidden"));
   }
 
-  virtual void TearDown() {
-    PlatformTest::TearDown();
-  }
+  virtual void TearDown() { PlatformTest::TearDown(); }
 
-  bool GetTestDataDirectory(base::FilePath* path) {
-    bool success = PathService::Get(base::DIR_SOURCE_ROOT, path);
+  static base::FilePath GetDataDirectory() {
+    base::FilePath path;
+    bool success = base::PathService::Get(base::DIR_SOURCE_ROOT, &path);
     EXPECT_TRUE(success);
-    if (!success)
-      return false;
-    *path = path->AppendASCII("third_party");
-    *path = path->AppendASCII("zlib");
-    *path = path->AppendASCII("google");
-    *path = path->AppendASCII("test");
-    *path = path->AppendASCII("data");
-    return true;
+    return std::move(path)
+        .AppendASCII("third_party")
+        .AppendASCII("zlib")
+        .AppendASCII("google")
+        .AppendASCII("test")
+        .AppendASCII("data");
   }
 
   void TestUnzipFile(const base::FilePath::StringType& filename,
                      bool expect_hidden_files) {
-    base::FilePath test_dir;
-    ASSERT_TRUE(GetTestDataDirectory(&test_dir));
-    TestUnzipFile(test_dir.Append(filename), expect_hidden_files);
+    TestUnzipFile(GetDataDirectory().Append(filename), expect_hidden_files);
   }
 
   void TestUnzipFile(const base::FilePath& path, bool expect_hidden_files) {
-    ASSERT_TRUE(base::PathExists(path)) << "no file " << path.value();
+    ASSERT_TRUE(base::PathExists(path)) << "no file " << path;
     ASSERT_TRUE(zip::Unzip(path, test_dir_));
 
-    base::FileEnumerator files(test_dir_, true,
+    base::FilePath original_dir = GetDataDirectory().AppendASCII("test");
+
+    base::FileEnumerator files(
+        test_dir_, true,
         base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES);
-    base::FilePath next_path = files.Next();
+
     size_t count = 0;
-    while (!next_path.value().empty()) {
-      if (next_path.value().find(FILE_PATH_LITERAL(".svn")) ==
-          base::FilePath::StringType::npos) {
-        EXPECT_EQ(zip_contents_.count(next_path), 1U) <<
-            "Couldn't find " << next_path.value();
-        count++;
+    for (base::FilePath unzipped_entry_path = files.Next();
+         !unzipped_entry_path.empty(); unzipped_entry_path = files.Next()) {
+      EXPECT_EQ(zip_contents_.count(unzipped_entry_path), 1U)
+          << "Couldn't find " << unzipped_entry_path;
+      count++;
+
+      if (base::PathExists(unzipped_entry_path) &&
+          !base::DirectoryExists(unzipped_entry_path)) {
+        // It's a file, check its contents are what we zipped.
+        base::FilePath relative_path;
+        ASSERT_TRUE(
+            test_dir_.AppendRelativePath(unzipped_entry_path, &relative_path))
+            << "Cannot append relative path failed, params: '" << test_dir_
+            << "' and '" << unzipped_entry_path << "'";
+        base::FilePath original_path = original_dir.Append(relative_path);
+        EXPECT_TRUE(base::ContentsEqual(original_path, unzipped_entry_path))
+            << "Original file '" << original_path << "' and unzipped file '"
+            << unzipped_entry_path << "' have different contents";
       }
-      next_path = files.Next();
     }
+    EXPECT_EQ(base::File::FILE_OK, files.GetError());
 
     size_t expected_count = 0;
-    for (std::set<base::FilePath>::iterator iter = zip_contents_.begin();
-         iter != zip_contents_.end(); ++iter) {
-      if (expect_hidden_files || iter->BaseName().value()[0] != '.')
+    for (const base::FilePath& path : zip_contents_) {
+      if (expect_hidden_files || path.BaseName().value()[0] != '.')
         ++expected_count;
     }
 
@@ -139,11 +342,11 @@ class ZipTest : public PlatformTest {
     // supports, which is 2 seconds. Note that between this call to Time::Now()
     // and zip::Zip() the clock can advance a bit, hence the use of EXPECT_GE.
     base::Time::Exploded now_parts;
-    base::Time::Now().LocalExplode(&now_parts);
+    base::Time::Now().UTCExplode(&now_parts);
     now_parts.second = now_parts.second & ~1;
     now_parts.millisecond = 0;
     base::Time now_time;
-    EXPECT_TRUE(base::Time::FromLocalExploded(now_parts, &now_time));
+    EXPECT_TRUE(base::Time::FromUTCExploded(now_parts, &now_time));
 
     EXPECT_EQ(1, base::WriteFile(src_file, "1", 1));
     EXPECT_TRUE(base::TouchFile(src_file, base::Time::Now(), test_mtime));
@@ -169,12 +372,23 @@ class ZipTest : public PlatformTest {
   base::ScopedTempDir temp_dir_;
 
   // Hard-coded contents of a known zip file.
-  std::set<base::FilePath> zip_contents_;
+  std::unordered_set<base::FilePath> zip_contents_;
 
   // Hard-coded list of relative paths for a zip file created with ZipFiles.
   std::vector<base::FilePath> zip_file_list_;
 };
 
+TEST_F(ZipTest, UnzipNoSuchFile) {
+  EXPECT_FALSE(zip::Unzip(GetDataDirectory().AppendASCII("No Such File.zip"),
+                          test_dir_));
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::FILES),
+      UnorderedElementsAre());
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::DIRECTORIES),
+      UnorderedElementsAre());
+}
+
 TEST_F(ZipTest, Unzip) {
   TestUnzipFile(FILE_PATH_LITERAL("test.zip"), true);
 }
@@ -184,65 +398,639 @@ TEST_F(ZipTest, UnzipUncompressed) {
 }
 
 TEST_F(ZipTest, UnzipEvil) {
-  base::FilePath path;
-  ASSERT_TRUE(GetTestDataDirectory(&path));
-  path = path.AppendASCII("evil.zip");
+  base::FilePath path = GetDataDirectory().AppendASCII("evil.zip");
   // Unzip the zip file into a sub directory of test_dir_ so evil.zip
   // won't create a persistent file outside test_dir_ in case of a
   // failure.
   base::FilePath output_dir = test_dir_.AppendASCII("out");
-  ASSERT_FALSE(zip::Unzip(path, output_dir));
-  base::FilePath evil_file = output_dir;
-  evil_file = evil_file.AppendASCII(
-      "../levilevilevilevilevilevilevilevilevilevilevilevil");
-  ASSERT_FALSE(base::PathExists(evil_file));
+  EXPECT_TRUE(zip::Unzip(path, output_dir));
+  EXPECT_TRUE(base::PathExists(output_dir.AppendASCII(
+      "UP/levilevilevilevilevilevilevilevilevilevilevilevil")));
 }
 
 TEST_F(ZipTest, UnzipEvil2) {
-  base::FilePath path;
-  ASSERT_TRUE(GetTestDataDirectory(&path));
-  // The zip file contains an evil file with invalid UTF-8 in its file
-  // name.
-  path = path.AppendASCII("evil_via_invalid_utf8.zip");
+  // The ZIP file contains a file with invalid UTF-8 in its file name.
+  base::FilePath path =
+      GetDataDirectory().AppendASCII("evil_via_invalid_utf8.zip");
   // See the comment at UnzipEvil() for why we do this.
   base::FilePath output_dir = test_dir_.AppendASCII("out");
-  // This should fail as it contains an evil file.
-  ASSERT_FALSE(zip::Unzip(path, output_dir));
-  base::FilePath evil_file = output_dir;
-  evil_file = evil_file.AppendASCII("../evil.txt");
-  ASSERT_FALSE(base::PathExists(evil_file));
+  ASSERT_TRUE(zip::Unzip(path, output_dir));
+  ASSERT_TRUE(base::PathExists(
+      output_dir.Append(base::FilePath::FromUTF8Unsafe(".�.�evil.txt"))));
+  ASSERT_FALSE(base::PathExists(output_dir.AppendASCII("../evil.txt")));
+}
+
+TEST_F(ZipTest, UnzipWithFilter) {
+  auto filter = base::BindRepeating([](const base::FilePath& path) {
+    return path.BaseName().MaybeAsASCII() == "foo.txt";
+  });
+  ASSERT_TRUE(zip::Unzip(GetDataDirectory().AppendASCII("test.zip"), test_dir_,
+                         {.filter = std::move(filter)}));
+  // Only foo.txt should have been extracted.
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::FILES),
+      UnorderedElementsAre("foo.txt"));
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::DIRECTORIES),
+      UnorderedElementsAre());
+}
+
+TEST_F(ZipTest, UnzipEncryptedWithRightPassword) {
+  // TODO(crbug.com/1296838) Also check the AES-encrypted files.
+  auto filter = base::BindRepeating([](const base::FilePath& path) {
+    return !base::StartsWith(path.MaybeAsASCII(), "Encrypted AES");
+  });
+
+  ASSERT_TRUE(zip::Unzip(
+      GetDataDirectory().AppendASCII("Different Encryptions.zip"), test_dir_,
+      {.filter = std::move(filter), .password = "password"}));
+
+  std::string contents;
+  ASSERT_TRUE(base::ReadFileToString(test_dir_.AppendASCII("ClearText.txt"),
+                                     &contents));
+  EXPECT_EQ("This is not encrypted.\n", contents);
+
+  ASSERT_TRUE(base::ReadFileToString(
+      test_dir_.AppendASCII("Encrypted ZipCrypto.txt"), &contents));
+  EXPECT_EQ("This is encrypted with ZipCrypto.\n", contents);
+}
+
+TEST_F(ZipTest, UnzipEncryptedWithWrongPassword) {
+  // TODO(crbug.com/1296838) Also check the AES-encrypted files.
+  auto filter = base::BindRepeating([](const base::FilePath& path) {
+    return !base::StartsWith(path.MaybeAsASCII(), "Encrypted AES");
+  });
+
+  ASSERT_FALSE(zip::Unzip(
+      GetDataDirectory().AppendASCII("Different Encryptions.zip"), test_dir_,
+      {.filter = std::move(filter), .password = "wrong"}));
+
+  std::string contents;
+  ASSERT_TRUE(base::ReadFileToString(test_dir_.AppendASCII("ClearText.txt"),
+                                     &contents));
+  EXPECT_EQ("This is not encrypted.\n", contents);
+
+  // No rubbish file should be left behind.
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::FILES),
+      UnorderedElementsAre("ClearText.txt"));
+}
+
+TEST_F(ZipTest, UnzipEncryptedWithNoPassword) {
+  // TODO(crbug.com/1296838) Also check the AES-encrypted files.
+  auto filter = base::BindRepeating([](const base::FilePath& path) {
+    return !base::StartsWith(path.MaybeAsASCII(), "Encrypted AES");
+  });
+
+  ASSERT_FALSE(
+      zip::Unzip(GetDataDirectory().AppendASCII("Different Encryptions.zip"),
+                 test_dir_, {.filter = std::move(filter)}));
+
+  std::string contents;
+  ASSERT_TRUE(base::ReadFileToString(test_dir_.AppendASCII("ClearText.txt"),
+                                     &contents));
+  EXPECT_EQ("This is not encrypted.\n", contents);
+
+  // No rubbish file should be left behind.
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::FILES),
+      UnorderedElementsAre("ClearText.txt"));
+}
+
+TEST_F(ZipTest, UnzipEncryptedContinueOnError) {
+  EXPECT_TRUE(
+      zip::Unzip(GetDataDirectory().AppendASCII("Different Encryptions.zip"),
+                 test_dir_, {.continue_on_error = true}));
+
+  std::string contents;
+  EXPECT_TRUE(base::ReadFileToString(test_dir_.AppendASCII("ClearText.txt"),
+                                     &contents));
+  EXPECT_EQ("This is not encrypted.\n", contents);
+
+  // No rubbish file should be left behind.
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::FILES),
+      UnorderedElementsAre("ClearText.txt"));
+}
+
+TEST_F(ZipTest, UnzipWrongCrc) {
+  ASSERT_FALSE(
+      zip::Unzip(GetDataDirectory().AppendASCII("Wrong CRC.zip"), test_dir_));
+
+  // No rubbish file should be left behind.
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::FILES),
+      UnorderedElementsAre());
+}
+
+TEST_F(ZipTest, UnzipRepeatedDirName) {
+  EXPECT_TRUE(zip::Unzip(
+      GetDataDirectory().AppendASCII("Repeated Dir Name.zip"), test_dir_));
+
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::FILES),
+      UnorderedElementsAre());
+
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::DIRECTORIES),
+      UnorderedElementsAre("repeated"));
+}
+
+TEST_F(ZipTest, UnzipRepeatedFileName) {
+  EXPECT_FALSE(zip::Unzip(
+      GetDataDirectory().AppendASCII("Repeated File Name.zip"), test_dir_));
+
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::FILES),
+      UnorderedElementsAre("repeated"));
+
+  std::string contents;
+  EXPECT_TRUE(
+      base::ReadFileToString(test_dir_.AppendASCII("repeated"), &contents));
+  EXPECT_EQ("First file", contents);
+}
+
+TEST_F(ZipTest, UnzipCannotCreateEmptyDir) {
+  EXPECT_FALSE(zip::Unzip(
+      GetDataDirectory().AppendASCII("Empty Dir Same Name As File.zip"),
+      test_dir_));
+
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::FILES),
+      UnorderedElementsAre("repeated"));
+
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::DIRECTORIES),
+      UnorderedElementsAre());
+
+  std::string contents;
+  EXPECT_TRUE(
+      base::ReadFileToString(test_dir_.AppendASCII("repeated"), &contents));
+  EXPECT_EQ("First file", contents);
+}
+
+TEST_F(ZipTest, UnzipCannotCreateParentDir) {
+  EXPECT_FALSE(zip::Unzip(
+      GetDataDirectory().AppendASCII("Parent Dir Same Name As File.zip"),
+      test_dir_));
+
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::FILES),
+      UnorderedElementsAre("repeated"));
+
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::DIRECTORIES),
+      UnorderedElementsAre());
+
+  std::string contents;
+  EXPECT_TRUE(
+      base::ReadFileToString(test_dir_.AppendASCII("repeated"), &contents));
+  EXPECT_EQ("First file", contents);
+}
+
+// TODO(crbug.com/1311140) Detect and rename reserved file names on Windows.
+TEST_F(ZipTest, UnzipWindowsSpecialNames) {
+  EXPECT_TRUE(
+      zip::Unzip(GetDataDirectory().AppendASCII("Windows Special Names.zip"),
+                 test_dir_, {.continue_on_error = true}));
+
+  std::unordered_set<std::string> want_paths = {
+      "First",
+      "Last",
+      "CLOCK$",
+      " NUL.txt",
+#ifndef OS_WIN
+      "NUL",
+      "NUL ",
+      "NUL.",
+      "NUL .",
+      "NUL.txt",
+      "NUL.tar.gz",
+      "NUL..txt",
+      "NUL...txt",
+      "NUL .txt",
+      "NUL  .txt",
+      "NUL  ..txt",
+#ifndef OS_APPLE
+      "Nul.txt",
+#endif
+      "nul.very long extension",
+      "a/NUL",
+      "CON",
+      "PRN",
+      "AUX",
+      "COM1",
+      "COM2",
+      "COM3",
+      "COM4",
+      "COM5",
+      "COM6",
+      "COM7",
+      "COM8",
+      "COM9",
+      "LPT1",
+      "LPT2",
+      "LPT3",
+      "LPT4",
+      "LPT5",
+      "LPT6",
+      "LPT7",
+      "LPT8",
+      "LPT9",
+#endif
+  };
+
+  const std::vector<std::string> got_paths =
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::FILES);
+
+  for (const std::string& path : got_paths) {
+    const bool ok = want_paths.erase(path);
+
+#ifdef OS_WIN
+    if (!ok) {
+      // See crbug.com/1313991: Different versions of Windows treat these
+      // filenames differently. No hard error here if there is an unexpected
+      // file.
+      LOG(WARNING) << "Found unexpected file: " << std::quoted(path);
+      continue;
+    }
+#else
+    EXPECT_TRUE(ok) << "Found unexpected file: " << std::quoted(path);
+#endif
+
+    std::string contents;
+    EXPECT_TRUE(base::ReadFileToString(test_dir_.AppendASCII(path), &contents));
+    EXPECT_EQ(base::StrCat({"This is: ", path}), contents);
+  }
+
+  for (const std::string& path : want_paths) {
+    EXPECT_TRUE(false) << "Cannot find expected file: " << std::quoted(path);
+  }
+}
+
+TEST_F(ZipTest, UnzipDifferentCases) {
+#if defined(OS_WIN) || defined(OS_APPLE)
+  // Only the first file (with mixed case) is extracted.
+  EXPECT_FALSE(zip::Unzip(GetDataDirectory().AppendASCII(
+                              "Repeated File Name With Different Cases.zip"),
+                          test_dir_));
+
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::FILES),
+      UnorderedElementsAre("Case"));
+
+  std::string contents;
+  EXPECT_TRUE(base::ReadFileToString(test_dir_.AppendASCII("Case"), &contents));
+  EXPECT_EQ("Mixed case 111", contents);
+#else
+  // All the files are extracted.
+  EXPECT_TRUE(zip::Unzip(GetDataDirectory().AppendASCII(
+                             "Repeated File Name With Different Cases.zip"),
+                         test_dir_));
+
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::FILES),
+      UnorderedElementsAre("Case", "case", "CASE"));
+
+  std::string contents;
+  EXPECT_TRUE(base::ReadFileToString(test_dir_.AppendASCII("Case"), &contents));
+  EXPECT_EQ("Mixed case 111", contents);
+
+  EXPECT_TRUE(base::ReadFileToString(test_dir_.AppendASCII("case"), &contents));
+  EXPECT_EQ("Lower case 22", contents);
+
+  EXPECT_TRUE(base::ReadFileToString(test_dir_.AppendASCII("CASE"), &contents));
+  EXPECT_EQ("Upper case 3", contents);
+#endif
+}
+
+TEST_F(ZipTest, UnzipDifferentCasesContinueOnError) {
+  EXPECT_TRUE(zip::Unzip(GetDataDirectory().AppendASCII(
+                             "Repeated File Name With Different Cases.zip"),
+                         test_dir_, {.continue_on_error = true}));
+
+  std::string contents;
+
+#if defined(OS_WIN) || defined(OS_APPLE)
+  // Only the first file (with mixed case) has been extracted.
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::FILES),
+      UnorderedElementsAre("Case"));
+
+  EXPECT_TRUE(base::ReadFileToString(test_dir_.AppendASCII("Case"), &contents));
+  EXPECT_EQ("Mixed case 111", contents);
+#else
+  // All the files have been extracted.
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::FILES),
+      UnorderedElementsAre("Case", "case", "CASE"));
+
+  EXPECT_TRUE(base::ReadFileToString(test_dir_.AppendASCII("Case"), &contents));
+  EXPECT_EQ("Mixed case 111", contents);
+
+  EXPECT_TRUE(base::ReadFileToString(test_dir_.AppendASCII("case"), &contents));
+  EXPECT_EQ("Lower case 22", contents);
+
+  EXPECT_TRUE(base::ReadFileToString(test_dir_.AppendASCII("CASE"), &contents));
+  EXPECT_EQ("Upper case 3", contents);
+#endif
+}
+
+TEST_F(ZipTest, UnzipMixedPaths) {
+  EXPECT_TRUE(zip::Unzip(GetDataDirectory().AppendASCII("Mixed Paths.zip"),
+                         test_dir_, {.continue_on_error = true}));
+
+  std::unordered_set<std::string> want_paths = {
+#ifdef OS_WIN
+      "Dot",     //
+      "Space→",  //
+#else
+      " ",                        //
+      "AUX",                      // Disappears on Windows
+      "COM1",                     // Disappears on Windows
+      "COM2",                     // Disappears on Windows
+      "COM3",                     // Disappears on Windows
+      "COM4",                     // Disappears on Windows
+      "COM5",                     // Disappears on Windows
+      "COM6",                     // Disappears on Windows
+      "COM7",                     // Disappears on Windows
+      "COM8",                     // Disappears on Windows
+      "COM9",                     // Disappears on Windows
+      "CON",                      // Disappears on Windows
+      "Dot .",                    //
+      "LPT1",                     // Disappears on Windows
+      "LPT2",                     // Disappears on Windows
+      "LPT3",                     // Disappears on Windows
+      "LPT4",                     // Disappears on Windows
+      "LPT5",                     // Disappears on Windows
+      "LPT6",                     // Disappears on Windows
+      "LPT7",                     // Disappears on Windows
+      "LPT8",                     // Disappears on Windows
+      "LPT9",                     // Disappears on Windows
+      "NUL  ..txt",               // Disappears on Windows
+      "NUL  .txt",                // Disappears on Windows
+      "NUL ",                     // Disappears on Windows
+      "NUL .",                    // Disappears on Windows
+      "NUL .txt",                 // Disappears on Windows
+      "NUL",                      // Disappears on Windows
+      "NUL.",                     // Disappears on Windows
+      "NUL...txt",                // Disappears on Windows
+      "NUL..txt",                 // Disappears on Windows
+      "NUL.tar.gz",               // Disappears on Windows
+      "NUL.txt",                  // Disappears on Windows
+      "PRN",                      // Disappears on Windows
+      "Space→ ",                  //
+      "c/NUL",                    // Disappears on Windows
+      "nul.very long extension",  // Disappears on Windows
+#ifndef OS_APPLE
+      "CASE",                     // Conflicts with "Case"
+      "case",                     // Conflicts with "Case"
+#endif
+#endif
+      " NUL.txt",                  //
+      " ←Space",                   //
+      "$HOME",                     //
+      "%TMP",                      //
+      "-",                         //
+      "...Three",                  //
+      "..Two",                     //
+      ".One",                      //
+      "Ampersand &",               //
+      "Angle ��",                  //
+      "At @",                      //
+      "Backslash1→�",              //
+      "Backslash3→�←Backslash4",   //
+      "Backspace �",               //
+      "Backtick `",                //
+      "Bell �",                    //
+      "CLOCK$",                    //
+      "Caret ^",                   //
+      "Carriage Return �",         //
+      "Case",                      //
+      "Colon �",                   //
+      "Comma ,",                   //
+      "Curly {}",                  //
+      "C�",                        //
+      "C��",                       //
+      "C��Temp",                   //
+      "C��Temp�",                  //
+      "C��Temp�File",              //
+      "Dash -",                    //
+      "Delete \x7F",               //
+      "Dollar $",                  //
+      "Double quote �",            //
+      "Equal =",                   //
+      "Escape �",                  //
+      "Euro €",                    //
+      "Exclamation !",             //
+      "FileOrDir",                 //
+      "First",                     //
+      "Hash #",                    //
+      "Last",                      //
+      "Line Feed �",               //
+      "Percent %",                 //
+      "Pipe �",                    //
+      "Plus +",                    //
+      "Question �",                //
+      "Quote '",                   //
+      "ROOT/At The Top",           //
+      "ROOT/UP/Over The Top",      //
+      "ROOT/dev/null",             //
+      "Round ()",                  //
+      "Semicolon ;",               //
+      "Smile \U0001F642",          //
+      "Square []",                 //
+      "Star �",                    //
+      "String Terminator \u009C",  //
+      "Tab �",                     //
+      "Tilde ~",                   //
+      "UP/One Level Up",           //
+      "UP/UP/Two Levels Up",       //
+      "Underscore _",              //
+      "a/DOT/b",                   //
+      "a/UP/b",                    //
+      "u/v/w/x/y/z",               //
+      "~",                         //
+      "�←Backslash2",              //
+      "��server�share�file",       //
+  };
+
+  const std::vector<std::string> got_paths =
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::FILES);
+
+  for (const std::string& path : got_paths) {
+    const bool ok = want_paths.erase(path);
+#ifdef OS_WIN
+    // See crbug.com/1313991: Different versions of Windows treat reserved
+    // Windows filenames differently. No hard error here if there is an
+    // unexpected file.
+    LOG_IF(WARNING, !ok) << "Found unexpected file: " << std::quoted(path);
+#else
+    EXPECT_TRUE(ok) << "Found unexpected file: " << std::quoted(path);
+#endif
+  }
+
+  for (const std::string& path : want_paths) {
+    EXPECT_TRUE(false) << "Cannot find expected file: " << std::quoted(path);
+  }
+
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::DIRECTORIES),
+      UnorderedElementsAreArray({
+          "Empty",
+          "ROOT",
+          "ROOT/Empty",
+          "ROOT/UP",
+          "ROOT/dev",
+          "UP",
+          "UP/UP",
+          "a",
+          "a/DOT",
+          "a/UP",
+          "c",
+          "u",
+          "u/v",
+          "u/v/w",
+          "u/v/w/x",
+          "u/v/w/x/y",
+      }));
+}
+
+TEST_F(ZipTest, UnzipWithDelegates) {
+  auto dir_creator =
+      base::BindLambdaForTesting([this](const base::FilePath& entry_path) {
+        return base::CreateDirectory(test_dir_.Append(entry_path));
+      });
+  auto writer =
+      base::BindLambdaForTesting([this](const base::FilePath& entry_path)
+                                     -> std::unique_ptr<zip::WriterDelegate> {
+        return std::make_unique<zip::FilePathWriterDelegate>(
+            test_dir_.Append(entry_path));
+      });
+
+  base::File file(GetDataDirectory().AppendASCII("test.zip"),
+                  base::File::Flags::FLAG_OPEN | base::File::Flags::FLAG_READ);
+  EXPECT_TRUE(zip::Unzip(file.GetPlatformFile(), writer, dir_creator));
+  base::FilePath dir = test_dir_;
+  base::FilePath dir_foo = dir.AppendASCII("foo");
+  base::FilePath dir_foo_bar = dir_foo.AppendASCII("bar");
+  EXPECT_TRUE(base::PathExists(dir.AppendASCII("foo.txt")));
+  EXPECT_TRUE(base::DirectoryExists(dir_foo));
+  EXPECT_TRUE(base::PathExists(dir_foo.AppendASCII("bar.txt")));
+  EXPECT_TRUE(base::DirectoryExists(dir_foo_bar));
+  EXPECT_TRUE(base::PathExists(dir_foo_bar.AppendASCII(".hidden")));
+  EXPECT_TRUE(base::PathExists(dir_foo_bar.AppendASCII("baz.txt")));
+  EXPECT_TRUE(base::PathExists(dir_foo_bar.AppendASCII("quux.txt")));
+}
+
+TEST_F(ZipTest, UnzipOnlyDirectories) {
+  auto dir_creator =
+      base::BindLambdaForTesting([this](const base::FilePath& entry_path) {
+        return base::CreateDirectory(test_dir_.Append(entry_path));
+      });
+
+  // Always return a null WriterDelegate.
+  auto writer =
+      base::BindLambdaForTesting([](const base::FilePath& entry_path) {
+        return std::unique_ptr<zip::WriterDelegate>();
+      });
+
+  base::File file(GetDataDirectory().AppendASCII("test.zip"),
+                  base::File::Flags::FLAG_OPEN | base::File::Flags::FLAG_READ);
+  EXPECT_TRUE(zip::Unzip(file.GetPlatformFile(), writer, dir_creator,
+                         {.continue_on_error = true}));
+  base::FilePath dir = test_dir_;
+  base::FilePath dir_foo = dir.AppendASCII("foo");
+  base::FilePath dir_foo_bar = dir_foo.AppendASCII("bar");
+  EXPECT_FALSE(base::PathExists(dir.AppendASCII("foo.txt")));
+  EXPECT_TRUE(base::DirectoryExists(dir_foo));
+  EXPECT_FALSE(base::PathExists(dir_foo.AppendASCII("bar.txt")));
+  EXPECT_TRUE(base::DirectoryExists(dir_foo_bar));
+  EXPECT_FALSE(base::PathExists(dir_foo_bar.AppendASCII(".hidden")));
+  EXPECT_FALSE(base::PathExists(dir_foo_bar.AppendASCII("baz.txt")));
+  EXPECT_FALSE(base::PathExists(dir_foo_bar.AppendASCII("quux.txt")));
+}
+
+// Tests that a ZIP archive containing SJIS-encoded file names can be correctly
+// extracted if the encoding is specified.
+TEST_F(ZipTest, UnzipSjis) {
+  ASSERT_TRUE(zip::Unzip(GetDataDirectory().AppendASCII("SJIS Bug 846195.zip"),
+                         test_dir_, {.encoding = "Shift_JIS"}));
+
+  const base::FilePath dir =
+      test_dir_.Append(base::FilePath::FromUTF8Unsafe("新しいフォルダ"));
+  EXPECT_TRUE(base::DirectoryExists(dir));
+
+  std::string contents;
+  ASSERT_TRUE(base::ReadFileToString(
+      dir.Append(base::FilePath::FromUTF8Unsafe("SJIS_835C_ソ.txt")),
+      &contents));
+  EXPECT_EQ(
+      "This file's name contains 0x5c (backslash) as the 2nd byte of Japanese "
+      "characater \"\x83\x5c\" when encoded in Shift JIS.",
+      contents);
+
+  ASSERT_TRUE(base::ReadFileToString(dir.Append(base::FilePath::FromUTF8Unsafe(
+                                         "新しいテキスト ドキュメント.txt")),
+                                     &contents));
+  EXPECT_EQ("This file name is coded in Shift JIS in the archive.", contents);
+}
+
+// Tests that a ZIP archive containing SJIS-encoded file names can be extracted
+// even if the encoding is not specified. In this case, file names are
+// interpreted as UTF-8, which leads to garbled names where invalid UTF-8
+// sequences are replaced with the character �. Nevertheless, the files are
+// safely extracted and readable.
+TEST_F(ZipTest, UnzipSjisAsUtf8) {
+  ASSERT_TRUE(zip::Unzip(GetDataDirectory().AppendASCII("SJIS Bug 846195.zip"),
+                         test_dir_));
+
+  EXPECT_FALSE(base::DirectoryExists(
+      test_dir_.Append(base::FilePath::FromUTF8Unsafe("新しいフォルダ"))));
+
+  const base::FilePath dir =
+      test_dir_.Append(base::FilePath::FromUTF8Unsafe("�V�����t�H���_"));
+  EXPECT_TRUE(base::DirectoryExists(dir));
+
+  std::string contents;
+  ASSERT_TRUE(base::ReadFileToString(
+      dir.Append(base::FilePath::FromUTF8Unsafe("SJIS_835C_��.txt")),
+      &contents));
+  EXPECT_EQ(
+      "This file's name contains 0x5c (backslash) as the 2nd byte of Japanese "
+      "characater \"\x83\x5c\" when encoded in Shift JIS.",
+      contents);
+
+  ASSERT_TRUE(base::ReadFileToString(dir.Append(base::FilePath::FromUTF8Unsafe(
+                                         "�V�����e�L�X�g �h�L�������g.txt")),
+                                     &contents));
+  EXPECT_EQ("This file name is coded in Shift JIS in the archive.", contents);
 }
 
 TEST_F(ZipTest, Zip) {
-  base::FilePath src_dir;
-  ASSERT_TRUE(GetTestDataDirectory(&src_dir));
-  src_dir = src_dir.AppendASCII("test");
+  base::FilePath src_dir = GetDataDirectory().AppendASCII("test");
 
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   base::FilePath zip_file = temp_dir.GetPath().AppendASCII("out.zip");
 
-  EXPECT_TRUE(zip::Zip(src_dir, zip_file, true));
+  EXPECT_TRUE(zip::Zip(src_dir, zip_file, /*include_hidden_files=*/true));
   TestUnzipFile(zip_file, true);
 }
 
 TEST_F(ZipTest, ZipIgnoreHidden) {
-  base::FilePath src_dir;
-  ASSERT_TRUE(GetTestDataDirectory(&src_dir));
-  src_dir = src_dir.AppendASCII("test");
+  base::FilePath src_dir = GetDataDirectory().AppendASCII("test");
 
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   base::FilePath zip_file = temp_dir.GetPath().AppendASCII("out.zip");
 
-  EXPECT_TRUE(zip::Zip(src_dir, zip_file, false));
+  EXPECT_TRUE(zip::Zip(src_dir, zip_file, /*include_hidden_files=*/false));
   TestUnzipFile(zip_file, false);
 }
 
 TEST_F(ZipTest, ZipNonASCIIDir) {
-  base::FilePath src_dir;
-  ASSERT_TRUE(GetTestDataDirectory(&src_dir));
-  src_dir = src_dir.AppendASCII("test");
+  base::FilePath src_dir = GetDataDirectory().AppendASCII("test");
 
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
@@ -278,11 +1066,9 @@ TEST_F(ZipTest, ZipTimeStamp) {
   TestTimeStamp("02 Jan 2038 23:59:58", VALID_YEAR);
 }
 
-#if defined(OS_POSIX)
+#if defined(OS_POSIX) || defined(OS_FUCHSIA)
 TEST_F(ZipTest, ZipFiles) {
-  base::FilePath src_dir;
-  ASSERT_TRUE(GetTestDataDirectory(&src_dir));
-  src_dir = src_dir.AppendASCII("test");
+  base::FilePath src_dir = GetDataDirectory().AppendASCII("test");
 
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
@@ -291,32 +1077,28 @@ TEST_F(ZipTest, ZipFiles) {
   base::File zip_file(zip_name,
                       base::File::FLAG_CREATE | base::File::FLAG_WRITE);
   ASSERT_TRUE(zip_file.IsValid());
-  EXPECT_TRUE(zip::ZipFiles(src_dir, zip_file_list_,
-                            zip_file.GetPlatformFile()));
+  EXPECT_TRUE(
+      zip::ZipFiles(src_dir, zip_file_list_, zip_file.GetPlatformFile()));
   zip_file.Close();
 
   zip::ZipReader reader;
   EXPECT_TRUE(reader.Open(zip_name));
   EXPECT_EQ(zip_file_list_.size(), static_cast<size_t>(reader.num_entries()));
   for (size_t i = 0; i < zip_file_list_.size(); ++i) {
-    EXPECT_TRUE(reader.LocateAndOpenEntry(zip_file_list_[i]));
-    // Check the path in the entry just in case.
-    const zip::ZipReader::EntryInfo* entry_info = reader.current_entry_info();
-    EXPECT_EQ(entry_info->file_path(), zip_file_list_[i]);
+    const zip::ZipReader::Entry* const entry = reader.Next();
+    ASSERT_TRUE(entry);
+    EXPECT_EQ(entry->path, zip_file_list_[i]);
   }
 }
-#endif  // defined(OS_POSIX)
+#endif  // defined(OS_POSIX) || defined(OS_FUCHSIA)
 
 TEST_F(ZipTest, UnzipFilesWithIncorrectSize) {
-  base::FilePath test_data_folder;
-  ASSERT_TRUE(GetTestDataDirectory(&test_data_folder));
-
   // test_mismatch_size.zip contains files with names from 0.txt to 7.txt with
   // sizes from 0 to 7 bytes respectively, but the metadata in the zip file says
   // the uncompressed size is 3 bytes. The ZipReader and minizip code needs to
   // be clever enough to get all the data out.
   base::FilePath test_zip_file =
-      test_data_folder.AppendASCII("test_mismatch_size.zip");
+      GetDataDirectory().AppendASCII("test_mismatch_size.zip");
 
   base::ScopedTempDir scoped_temp_dir;
   ASSERT_TRUE(scoped_temp_dir.CreateUniqueTempDir());
@@ -327,12 +1109,320 @@ TEST_F(ZipTest, UnzipFilesWithIncorrectSize) {
 
   for (int i = 0; i < 8; i++) {
     SCOPED_TRACE(base::StringPrintf("Processing %d.txt", i));
-    base::FilePath file_path = temp_dir.AppendASCII(
-        base::StringPrintf("%d.txt", i));
+    base::FilePath file_path =
+        temp_dir.AppendASCII(base::StringPrintf("%d.txt", i));
     int64_t file_size = -1;
     EXPECT_TRUE(base::GetFileSize(file_path, &file_size));
     EXPECT_EQ(static_cast<int64_t>(i), file_size);
   }
 }
 
+TEST_F(ZipTest, ZipWithFileAccessor) {
+  base::FilePath zip_file;
+  ASSERT_TRUE(base::CreateTemporaryFile(&zip_file));
+  VirtualFileSystem file_accessor;
+  const zip::ZipParams params{.file_accessor = &file_accessor,
+                              .dest_file = zip_file};
+  ASSERT_TRUE(zip::Zip(params));
+
+  base::ScopedTempDir scoped_temp_dir;
+  ASSERT_TRUE(scoped_temp_dir.CreateUniqueTempDir());
+  const base::FilePath& temp_dir = scoped_temp_dir.GetPath();
+  ASSERT_TRUE(zip::Unzip(zip_file, temp_dir));
+  base::FilePath bar_dir = temp_dir.AppendASCII("bar");
+  EXPECT_TRUE(base::DirectoryExists(bar_dir));
+  std::string file_content;
+  EXPECT_TRUE(
+      base::ReadFileToString(temp_dir.AppendASCII("foo.txt"), &file_content));
+  EXPECT_EQ(VirtualFileSystem::kFooContent, file_content);
+  EXPECT_TRUE(
+      base::ReadFileToString(bar_dir.AppendASCII("bar1.txt"), &file_content));
+  EXPECT_EQ(VirtualFileSystem::kBar1Content, file_content);
+  EXPECT_TRUE(
+      base::ReadFileToString(bar_dir.AppendASCII("bar2.txt"), &file_content));
+  EXPECT_EQ(VirtualFileSystem::kBar2Content, file_content);
+}
+
+// Tests progress reporting while zipping files.
+TEST_F(ZipTest, ZipProgress) {
+  base::FilePath src_dir = GetDataDirectory().AppendASCII("test");
+
+  base::ScopedTempDir temp_dir;
+  ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
+  base::FilePath zip_file = temp_dir.GetPath().AppendASCII("out.zip");
+
+  int progress_count = 0;
+  zip::Progress last_progress;
+
+  zip::ProgressCallback progress_callback =
+      base::BindLambdaForTesting([&](const zip::Progress& progress) {
+        progress_count++;
+        LOG(INFO) << "Progress #" << progress_count << ": " << progress;
+
+        // Progress should only go forwards.
+        EXPECT_GE(progress.bytes, last_progress.bytes);
+        EXPECT_GE(progress.files, last_progress.files);
+        EXPECT_GE(progress.directories, last_progress.directories);
+
+        last_progress = progress;
+        return true;
+      });
+
+  EXPECT_TRUE(zip::Zip({.src_dir = src_dir,
+                        .dest_file = zip_file,
+                        .progress_callback = std::move(progress_callback)}));
+
+  EXPECT_EQ(progress_count, 14);
+  EXPECT_EQ(last_progress.bytes, 13546);
+  EXPECT_EQ(last_progress.files, 5);
+  EXPECT_EQ(last_progress.directories, 2);
+
+  TestUnzipFile(zip_file, true);
+}
+
+// Tests throttling of progress reporting while zipping files.
+TEST_F(ZipTest, ZipProgressPeriod) {
+  base::FilePath src_dir = GetDataDirectory().AppendASCII("test");
+
+  base::ScopedTempDir temp_dir;
+  ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
+  base::FilePath zip_file = temp_dir.GetPath().AppendASCII("out.zip");
+
+  int progress_count = 0;
+  zip::Progress last_progress;
+
+  zip::ProgressCallback progress_callback =
+      base::BindLambdaForTesting([&](const zip::Progress& progress) {
+        progress_count++;
+        LOG(INFO) << "Progress #" << progress_count << ": " << progress;
+
+        // Progress should only go forwards.
+        EXPECT_GE(progress.bytes, last_progress.bytes);
+        EXPECT_GE(progress.files, last_progress.files);
+        EXPECT_GE(progress.directories, last_progress.directories);
+
+        last_progress = progress;
+        return true;
+      });
+
+  EXPECT_TRUE(zip::Zip({.src_dir = src_dir,
+                        .dest_file = zip_file,
+                        .progress_callback = std::move(progress_callback),
+                        .progress_period = base::Hours(1)}));
+
+  // We expect only 2 progress reports: the first one, and the last one.
+  EXPECT_EQ(progress_count, 2);
+  EXPECT_EQ(last_progress.bytes, 13546);
+  EXPECT_EQ(last_progress.files, 5);
+  EXPECT_EQ(last_progress.directories, 2);
+
+  TestUnzipFile(zip_file, true);
+}
+
+// Tests cancellation while zipping files.
+TEST_F(ZipTest, ZipCancel) {
+  base::FilePath src_dir = GetDataDirectory().AppendASCII("test");
+
+  base::ScopedTempDir temp_dir;
+  ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
+  base::FilePath zip_file = temp_dir.GetPath().AppendASCII("out.zip");
+
+  // First: establish the number of possible interruption points.
+  int progress_count = 0;
+
+  EXPECT_TRUE(zip::Zip({.src_dir = src_dir,
+                        .dest_file = zip_file,
+                        .progress_callback = base::BindLambdaForTesting(
+                            [&progress_count](const zip::Progress&) {
+                              progress_count++;
+                              return true;
+                            })}));
+
+  EXPECT_EQ(progress_count, 14);
+
+  // Second: exercise each and every interruption point.
+  for (int i = progress_count; i > 0; i--) {
+    int j = 0;
+    EXPECT_FALSE(zip::Zip({.src_dir = src_dir,
+                           .dest_file = zip_file,
+                           .progress_callback = base::BindLambdaForTesting(
+                               [i, &j](const zip::Progress&) {
+                                 j++;
+                                 // Callback shouldn't be called again after
+                                 // having returned false once.
+                                 EXPECT_LE(j, i);
+                                 return j < i;
+                               })}));
+
+    EXPECT_EQ(j, i);
+  }
+}
+
+// Tests zip::internal::GetCompressionMethod()
+TEST_F(ZipTest, GetCompressionMethod) {
+  using zip::internal::GetCompressionMethod;
+  using zip::internal::kDeflated;
+  using zip::internal::kStored;
+
+  EXPECT_EQ(GetCompressionMethod(FP("")), kDeflated);
+  EXPECT_EQ(GetCompressionMethod(FP("NoExtension")), kDeflated);
+  EXPECT_EQ(GetCompressionMethod(FP("Folder.zip").Append(FP("NoExtension"))),
+            kDeflated);
+  EXPECT_EQ(GetCompressionMethod(FP("Name.txt")), kDeflated);
+  EXPECT_EQ(GetCompressionMethod(FP("Name.zip")), kStored);
+  EXPECT_EQ(GetCompressionMethod(FP("Name....zip")), kStored);
+  EXPECT_EQ(GetCompressionMethod(FP("Name.zip")), kStored);
+  EXPECT_EQ(GetCompressionMethod(FP("NAME.ZIP")), kStored);
+  EXPECT_EQ(GetCompressionMethod(FP("Name.gz")), kStored);
+  EXPECT_EQ(GetCompressionMethod(FP("Name.tar.gz")), kStored);
+  EXPECT_EQ(GetCompressionMethod(FP("Name.tar")), kDeflated);
+
+  // This one is controversial.
+  EXPECT_EQ(GetCompressionMethod(FP(".zip")), kStored);
+}
+
+// Tests that files put inside a ZIP are effectively compressed.
+TEST_F(ZipTest, Compressed) {
+  base::ScopedTempDir temp_dir;
+  ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
+
+  const base::FilePath src_dir = temp_dir.GetPath().AppendASCII("input");
+  EXPECT_TRUE(base::CreateDirectory(src_dir));
+
+  // Create some dummy source files.
+  for (const base::StringPiece s : {"foo", "bar.txt", ".hidden"}) {
+    base::File f(src_dir.AppendASCII(s),
+                 base::File::FLAG_CREATE | base::File::FLAG_WRITE);
+    ASSERT_TRUE(f.SetLength(5000));
+  }
+
+  // Zip the source files.
+  const base::FilePath dest_file = temp_dir.GetPath().AppendASCII("dest.zip");
+  EXPECT_TRUE(zip::Zip({.src_dir = src_dir,
+                        .dest_file = dest_file,
+                        .include_hidden_files = true}));
+
+  // Since the source files compress well, the destination ZIP file should be
+  // smaller than the source files.
+  int64_t dest_file_size;
+  ASSERT_TRUE(base::GetFileSize(dest_file, &dest_file_size));
+  EXPECT_GT(dest_file_size, 300);
+  EXPECT_LT(dest_file_size, 1000);
+}
+
+// Tests that a ZIP put inside a ZIP is simply stored instead of being
+// compressed.
+TEST_F(ZipTest, NestedZip) {
+  base::ScopedTempDir temp_dir;
+  ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
+
+  const base::FilePath src_dir = temp_dir.GetPath().AppendASCII("input");
+  EXPECT_TRUE(base::CreateDirectory(src_dir));
+
+  // Create a dummy ZIP file. This is not a valid ZIP file, but for the purpose
+  // of this test, it doesn't really matter.
+  const int64_t src_size = 5000;
+
+  {
+    base::File f(src_dir.AppendASCII("src.zip"),
+                 base::File::FLAG_CREATE | base::File::FLAG_WRITE);
+    ASSERT_TRUE(f.SetLength(src_size));
+  }
+
+  // Zip the dummy ZIP file.
+  const base::FilePath dest_file = temp_dir.GetPath().AppendASCII("dest.zip");
+  EXPECT_TRUE(zip::Zip({.src_dir = src_dir, .dest_file = dest_file}));
+
+  // Since the dummy source (inner) ZIP file should simply be stored in the
+  // destination (outer) ZIP file, the destination file should be bigger than
+  // the source file, but not much bigger.
+  int64_t dest_file_size;
+  ASSERT_TRUE(base::GetFileSize(dest_file, &dest_file_size));
+  EXPECT_GT(dest_file_size, src_size + 100);
+  EXPECT_LT(dest_file_size, src_size + 300);
+}
+
+// Tests that there is no 2GB or 4GB limits. Tests that big files can be zipped
+// (crbug.com/1207737) and that big ZIP files can be created
+// (crbug.com/1221447). Tests that the big ZIP can be opened, that its entries
+// are correctly enumerated (crbug.com/1298347), and that the big file can be
+// extracted.
+//
+// Because this test is dealing with big files, it tends to take a lot of disk
+// space and time (crbug.com/1299736). Therefore, it only gets run on a few bots
+// (ChromeOS and Windows).
+//
+// This test is too slow with TSAN.
+// OS Fuchsia does not seem to support large files.
+// Some 32-bit Android waterfall and CQ try bots are running out of space when
+// performing this test (android-asan, android-11-x86-rel,
+// android-marshmallow-x86-rel-non-cq).
+// Some Mac, Linux and Debug (dbg) bots tend to time out when performing this
+// test (crbug.com/1299736, crbug.com/1300448, crbug.com/1369958).
+#if defined(THREAD_SANITIZER) || BUILDFLAG(IS_FUCHSIA) ||                \
+    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+    BUILDFLAG(IS_CHROMEOS) || !defined(NDEBUG)
+TEST_F(ZipTest, DISABLED_BigFile) {
+#else
+TEST_F(ZipTest, BigFile) {
+#endif
+  base::ScopedTempDir temp_dir;
+  ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
+
+  const base::FilePath src_dir = temp_dir.GetPath().AppendASCII("input");
+  EXPECT_TRUE(base::CreateDirectory(src_dir));
+
+  // Create a big dummy ZIP file. This is not a valid ZIP file, but for the
+  // purpose of this test, it doesn't really matter.
+  const int64_t src_size = 5'000'000'000;
+
+  const base::FilePath src_file = src_dir.AppendASCII("src.zip");
+  LOG(INFO) << "Creating big file " << src_file;
+  {
+    base::File f(src_file, base::File::FLAG_CREATE | base::File::FLAG_WRITE);
+    ASSERT_TRUE(f.SetLength(src_size));
+  }
+
+  // Zip the dummy ZIP file.
+  const base::FilePath dest_file = temp_dir.GetPath().AppendASCII("dest.zip");
+  LOG(INFO) << "Zipping big file into " << dest_file;
+  zip::ProgressCallback progress_callback =
+      base::BindLambdaForTesting([&](const zip::Progress& progress) {
+        LOG(INFO) << "Zipping... " << std::setw(3)
+                  << (100 * progress.bytes / src_size) << "%";
+        return true;
+      });
+  EXPECT_TRUE(zip::Zip({.src_dir = src_dir,
+                        .dest_file = dest_file,
+                        .progress_callback = std::move(progress_callback),
+                        .progress_period = base::Seconds(1)}));
+
+  // Since the dummy source (inner) ZIP file should simply be stored in the
+  // destination (outer) ZIP file, the destination file should be bigger than
+  // the source file, but not much bigger.
+  int64_t dest_file_size;
+  ASSERT_TRUE(base::GetFileSize(dest_file, &dest_file_size));
+  EXPECT_GT(dest_file_size, src_size + 100);
+  EXPECT_LT(dest_file_size, src_size + 300);
+
+  LOG(INFO) << "Reading big ZIP " << dest_file;
+  zip::ZipReader reader;
+  ASSERT_TRUE(reader.Open(dest_file));
+
+  const zip::ZipReader::Entry* const entry = reader.Next();
+  ASSERT_TRUE(entry);
+  EXPECT_EQ(FP("src.zip"), entry->path);
+  EXPECT_EQ(src_size, entry->original_size);
+  EXPECT_FALSE(entry->is_directory);
+  EXPECT_FALSE(entry->is_encrypted);
+
+  ProgressWriterDelegate writer(src_size);
+  EXPECT_TRUE(reader.ExtractCurrentEntry(&writer,
+                                         std::numeric_limits<uint64_t>::max()));
+  EXPECT_EQ(src_size, writer.received_bytes());
+
+  EXPECT_FALSE(reader.Next());
+  EXPECT_TRUE(reader.ok());
+}
+
 }  // namespace
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip_writer.cc b/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip_writer.cc
new file mode 100644
index 0000000000..31161ae86c
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip_writer.cc
@@ -0,0 +1,308 @@
+// Copyright 2017 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "third_party/zlib/google/zip_writer.h"
+
+#include <algorithm>
+
+#include "base/files/file.h"
+#include "base/logging.h"
+#include "base/strings/strcat.h"
+#include "base/strings/string_util.h"
+#include "third_party/zlib/google/redact.h"
+#include "third_party/zlib/google/zip_internal.h"
+
+namespace zip {
+namespace internal {
+
+bool ZipWriter::ShouldContinue() {
+  if (!progress_callback_)
+    return true;
+
+  const base::TimeTicks now = base::TimeTicks::Now();
+  if (next_progress_report_time_ > now)
+    return true;
+
+  next_progress_report_time_ = now + progress_period_;
+  if (progress_callback_.Run(progress_))
+    return true;
+
+  LOG(ERROR) << "Cancelling ZIP creation";
+  return false;
+}
+
+bool ZipWriter::AddFileContent(const base::FilePath& path, base::File file) {
+  char buf[zip::internal::kZipBufSize];
+
+  while (ShouldContinue()) {
+    const int num_bytes =
+        file.ReadAtCurrentPos(buf, zip::internal::kZipBufSize);
+
+    if (num_bytes < 0) {
+      PLOG(ERROR) << "Cannot read file " << Redact(path);
+      return false;
+    }
+
+    if (num_bytes == 0)
+      return true;
+
+    if (zipWriteInFileInZip(zip_file_, buf, num_bytes) != ZIP_OK) {
+      PLOG(ERROR) << "Cannot write data from file " << Redact(path)
+                  << " to ZIP";
+      return false;
+    }
+
+    progress_.bytes += num_bytes;
+  }
+
+  return false;
+}
+
+bool ZipWriter::OpenNewFileEntry(const base::FilePath& path,
+                                 bool is_directory,
+                                 base::Time last_modified) {
+  std::string str_path = path.AsUTF8Unsafe();
+
+#if defined(OS_WIN)
+  base::ReplaceSubstringsAfterOffset(&str_path, 0u, "\\", "/");
+#endif
+
+  Compression compression = kDeflated;
+
+  if (is_directory) {
+    str_path += "/";
+  } else {
+    compression = GetCompressionMethod(path);
+  }
+
+  return zip::internal::ZipOpenNewFileInZip(zip_file_, str_path, last_modified,
+                                            compression);
+}
+
+bool ZipWriter::CloseNewFileEntry() {
+  return zipCloseFileInZip(zip_file_) == ZIP_OK;
+}
+
+bool ZipWriter::AddFileEntry(const base::FilePath& path, base::File file) {
+  base::File::Info info;
+  if (!file.GetInfo(&info))
+    return false;
+
+  if (!OpenNewFileEntry(path, /*is_directory=*/false, info.last_modified))
+    return false;
+
+  if (!AddFileContent(path, std::move(file)))
+    return false;
+
+  progress_.files++;
+  return CloseNewFileEntry();
+}
+
+bool ZipWriter::AddDirectoryEntry(const base::FilePath& path) {
+  FileAccessor::Info info;
+  if (!file_accessor_->GetInfo(path, &info) || !info.is_directory) {
+    LOG(ERROR) << "Not a directory: " << Redact(path);
+    progress_.errors++;
+    return continue_on_error_;
+  }
+
+  if (!OpenNewFileEntry(path, /*is_directory=*/true, info.last_modified))
+    return false;
+
+  if (!CloseNewFileEntry())
+    return false;
+
+  progress_.directories++;
+  if (!ShouldContinue())
+    return false;
+
+  if (!recursive_)
+    return true;
+
+  return AddDirectoryContents(path);
+}
+
+#if defined(OS_POSIX) || defined(OS_FUCHSIA)
+// static
+std::unique_ptr<ZipWriter> ZipWriter::CreateWithFd(
+    int zip_file_fd,
+    FileAccessor* file_accessor) {
+  DCHECK(zip_file_fd != base::kInvalidPlatformFile);
+  zipFile zip_file =
+      internal::OpenFdForZipping(zip_file_fd, APPEND_STATUS_CREATE);
+
+  if (!zip_file) {
+    DLOG(ERROR) << "Cannot create ZIP file for FD " << zip_file_fd;
+    return nullptr;
+  }
+
+  return std::unique_ptr<ZipWriter>(new ZipWriter(zip_file, file_accessor));
+}
+#endif
+
+// static
+std::unique_ptr<ZipWriter> ZipWriter::Create(
+    const base::FilePath& zip_file_path,
+    FileAccessor* file_accessor) {
+  DCHECK(!zip_file_path.empty());
+  zipFile zip_file = internal::OpenForZipping(zip_file_path.AsUTF8Unsafe(),
+                                              APPEND_STATUS_CREATE);
+
+  if (!zip_file) {
+    PLOG(ERROR) << "Cannot create ZIP file " << Redact(zip_file_path);
+    return nullptr;
+  }
+
+  return std::unique_ptr<ZipWriter>(new ZipWriter(zip_file, file_accessor));
+}
+
+ZipWriter::ZipWriter(zipFile zip_file, FileAccessor* file_accessor)
+    : zip_file_(zip_file), file_accessor_(file_accessor) {}
+
+ZipWriter::~ZipWriter() {
+  if (zip_file_)
+    zipClose(zip_file_, nullptr);
+}
+
+bool ZipWriter::Close() {
+  const bool success = zipClose(zip_file_, nullptr) == ZIP_OK;
+  zip_file_ = nullptr;
+
+  // Call the progress callback one last time with the final progress status.
+  if (progress_callback_ && !progress_callback_.Run(progress_)) {
+    LOG(ERROR) << "Cancelling ZIP creation at the end";
+    return false;
+  }
+
+  return success;
+}
+
+bool ZipWriter::AddMixedEntries(Paths paths) {
+  // Pointers to directory paths in |paths|.
+  std::vector<const base::FilePath*> directories;
+
+  // Declared outside loop to reuse internal buffer.
+  std::vector<base::File> files;
+
+  // First pass. We don't know which paths are files and which ones are
+  // directories, and we want to avoid making a call to file_accessor_ for each
+  // path. Try to open all of the paths as files. We'll get invalid file
+  // descriptors for directories, and we'll process these directories in the
+  // second pass.
+  while (!paths.empty()) {
+    // Work with chunks of 50 paths at most.
+    const size_t n = std::min<size_t>(paths.size(), 50);
+    const Paths relative_paths = paths.subspan(0, n);
+    paths = paths.subspan(n, paths.size() - n);
+
+    files.clear();
+    if (!file_accessor_->Open(relative_paths, &files) || files.size() != n)
+      return false;
+
+    for (size_t i = 0; i < n; i++) {
+      const base::FilePath& relative_path = relative_paths[i];
+      DCHECK(!relative_path.empty());
+      base::File& file = files[i];
+
+      if (file.IsValid()) {
+        // It's a file.
+        if (!AddFileEntry(relative_path, std::move(file)))
+          return false;
+      } else {
+        // It's probably a directory. Remember its path for the second pass.
+        directories.push_back(&relative_path);
+      }
+    }
+  }
+
+  // Second pass for directories discovered during the first pass.
+  for (const base::FilePath* const path : directories) {
+    DCHECK(path);
+    if (!AddDirectoryEntry(*path))
+      return false;
+  }
+
+  return true;
+}
+
+bool ZipWriter::AddFileEntries(Paths paths) {
+  // Declared outside loop to reuse internal buffer.
+  std::vector<base::File> files;
+
+  while (!paths.empty()) {
+    // Work with chunks of 50 paths at most.
+    const size_t n = std::min<size_t>(paths.size(), 50);
+    const Paths relative_paths = paths.subspan(0, n);
+    paths = paths.subspan(n, paths.size() - n);
+
+    DCHECK_EQ(relative_paths.size(), n);
+
+    files.clear();
+    if (!file_accessor_->Open(relative_paths, &files) || files.size() != n)
+      return false;
+
+    for (size_t i = 0; i < n; i++) {
+      const base::FilePath& relative_path = relative_paths[i];
+      DCHECK(!relative_path.empty());
+      base::File& file = files[i];
+
+      if (!file.IsValid()) {
+        LOG(ERROR) << "Cannot open " << Redact(relative_path);
+        progress_.errors++;
+
+        if (continue_on_error_)
+          continue;
+
+        return false;
+      }
+
+      if (!AddFileEntry(relative_path, std::move(file)))
+        return false;
+    }
+  }
+
+  return true;
+}
+
+bool ZipWriter::AddDirectoryEntries(Paths paths) {
+  for (const base::FilePath& path : paths) {
+    if (!AddDirectoryEntry(path))
+      return false;
+  }
+
+  return true;
+}
+
+bool ZipWriter::AddDirectoryContents(const base::FilePath& path) {
+  std::vector<base::FilePath> files, subdirs;
+
+  if (!file_accessor_->List(path, &files, &subdirs)) {
+    progress_.errors++;
+    return continue_on_error_;
+  }
+
+  Filter(&files);
+  Filter(&subdirs);
+
+  if (!AddFileEntries(files))
+    return false;
+
+  return AddDirectoryEntries(subdirs);
+}
+
+void ZipWriter::Filter(std::vector<base::FilePath>* const paths) {
+  DCHECK(paths);
+
+  if (!filter_callback_)
+    return;
+
+  const auto end = std::remove_if(paths->begin(), paths->end(),
+                                  [this](const base::FilePath& path) {
+                                    return !filter_callback_.Run(path);
+                                  });
+  paths->erase(end, paths->end());
+}
+
+}  // namespace internal
+}  // namespace zip
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip_writer.h b/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip_writer.h
new file mode 100644
index 0000000000..dd109293da
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/google/zip_writer.h
@@ -0,0 +1,154 @@
+// Copyright 2017 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef THIRD_PARTY_ZLIB_GOOGLE_ZIP_WRITER_H_
+#define THIRD_PARTY_ZLIB_GOOGLE_ZIP_WRITER_H_
+
+#include <memory>
+#include <vector>
+
+#include "base/files/file_path.h"
+#include "base/time/time.h"
+#include "build/build_config.h"
+#include "third_party/zlib/google/zip.h"
+
+#if defined(USE_SYSTEM_MINIZIP)
+#include <minizip/unzip.h>
+#include <minizip/zip.h>
+#else
+#include "third_party/zlib/contrib/minizip/unzip.h"
+#include "third_party/zlib/contrib/minizip/zip.h"
+#endif
+
+namespace zip {
+namespace internal {
+
+// A class used to write entries to a ZIP file and buffering the reading of
+// files to limit the number of calls to the FileAccessor. This is for
+// performance reasons as these calls may be expensive when IPC based).
+// This class is so far internal and only used by zip.cc, but could be made
+// public if needed.
+//
+// All methods returning a bool return true on success and false on error.
+class ZipWriter {
+ public:
+// Creates a writer that will write a ZIP file to |zip_file_fd| or |zip_file|
+// and which entries are relative to |file_accessor|'s source directory.
+// All file reads are performed using |file_accessor|.
+#if defined(OS_POSIX) || defined(OS_FUCHSIA)
+  static std::unique_ptr<ZipWriter> CreateWithFd(int zip_file_fd,
+                                                 FileAccessor* file_accessor);
+#endif
+
+  static std::unique_ptr<ZipWriter> Create(const base::FilePath& zip_file,
+                                           FileAccessor* file_accessor);
+
+  ZipWriter(const ZipWriter&) = delete;
+  ZipWriter& operator=(const ZipWriter&) = delete;
+
+  ~ZipWriter();
+
+  // Sets the optional progress callback. The callback is called once for each
+  // time |period|. The final callback is always called when the ZIP operation
+  // completes.
+  void SetProgressCallback(ProgressCallback callback, base::TimeDelta period) {
+    progress_callback_ = std::move(callback);
+    progress_period_ = std::move(period);
+  }
+
+  // Should ignore missing files and directories?
+  void ContinueOnError(bool continue_on_error) {
+    continue_on_error_ = continue_on_error;
+  }
+
+  // Sets the recursive flag, indicating whether the contents of subdirectories
+  // should be included.
+  void SetRecursive(bool b) { recursive_ = b; }
+
+  // Sets the filter callback.
+  void SetFilterCallback(FilterCallback callback) {
+    filter_callback_ = std::move(callback);
+  }
+
+  // Adds the contents of a directory. If the recursive flag is set, the
+  // contents of subdirectories are also added.
+  bool AddDirectoryContents(const base::FilePath& path);
+
+  // Adds the entries at |paths| to the ZIP file. These can be a mixed bag of
+  // files and directories. If the recursive flag is set, the contents of
+  // subdirectories is also added.
+  bool AddMixedEntries(Paths paths);
+
+  // Closes the ZIP file.
+  bool Close();
+
+ private:
+  // Takes ownership of |zip_file|.
+  ZipWriter(zipFile zip_file, FileAccessor* file_accessor);
+
+  // Regularly called during processing to check whether zipping should continue
+  // or should be cancelled.
+  bool ShouldContinue();
+
+  // Adds file content to currently open file entry.
+  bool AddFileContent(const base::FilePath& path, base::File file);
+
+  // Adds a file entry (including file contents).
+  bool AddFileEntry(const base::FilePath& path, base::File file);
+
+  // Adds file entries. All the paths should be existing files.
+  bool AddFileEntries(Paths paths);
+
+  // Adds a directory entry. If the recursive flag is set, the contents of this
+  // directory are also added.
+  bool AddDirectoryEntry(const base::FilePath& path);
+
+  // Adds directory entries. All the paths should be existing directories. If
+  // the recursive flag is set, the contents of these directories are also
+  // added.
+  bool AddDirectoryEntries(Paths paths);
+
+  // Opens a file or directory entry.
+  bool OpenNewFileEntry(const base::FilePath& path,
+                        bool is_directory,
+                        base::Time last_modified);
+
+  // Closes the currently open entry.
+  bool CloseNewFileEntry();
+
+  // Filters entries.
+  void Filter(std::vector<base::FilePath>* paths);
+
+  // The actual zip file.
+  zipFile zip_file_;
+
+  // Abstraction over file access methods used to read files.
+  FileAccessor* const file_accessor_;
+
+  // Progress stats.
+  Progress progress_;
+
+  // Optional progress callback.
+  ProgressCallback progress_callback_;
+
+  // Optional progress reporting period.
+  base::TimeDelta progress_period_;
+
+  // Next time to report progress.
+  base::TimeTicks next_progress_report_time_ = base::TimeTicks::Now();
+
+  // Filter used to exclude files from the ZIP file.
+  FilterCallback filter_callback_;
+
+  // Should recursively add directories?
+  bool recursive_ = false;
+
+  // Should ignore missing files and directories?
+  bool continue_on_error_ = false;
+};
+
+}  // namespace internal
+}  // namespace zip
+
+#endif  // THIRD_PARTY_ZLIB_GOOGLE_ZIP_WRITER_H_
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/gzclose.c b/extern/crashpad/crashpad/third_party/zlib/zlib/gzclose.c
index caeb99a317..48d6a86f04 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/gzclose.c
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/gzclose.c
@@ -8,9 +8,7 @@
 /* gzclose() is in a separate file so that it is linked in only if it is used.
    That way the other gzclose functions can be used instead to avoid linking in
    unneeded compression or decompression routines. */
-int ZEXPORT gzclose(file)
-    gzFile file;
-{
+int ZEXPORT gzclose(gzFile file) {
 #ifndef NO_GZCOMPRESS
     gz_statep state;
 
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/gzguts.h b/extern/crashpad/crashpad/third_party/zlib/zlib/gzguts.h
index 990a4d2514..e23f831f53 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/gzguts.h
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/gzguts.h
@@ -1,5 +1,5 @@
 /* gzguts.h -- zlib internal header definitions for gz* operations
- * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler
+ * Copyright (C) 2004-2019 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -39,7 +39,7 @@
 #  include <io.h>
 #endif
 
-#if defined(_WIN32) || defined(__CYGWIN__)
+#if defined(_WIN32)
 #  define WIDECHAR
 #endif
 
@@ -119,8 +119,8 @@
 
 /* gz* functions always use library allocation functions */
 #ifndef STDC
-  extern voidp  malloc OF((uInt size));
-  extern void   free   OF((voidpf ptr));
+  extern voidp  malloc(uInt size);
+  extern void   free(voidpf ptr);
 #endif
 
 /* get errno and strerror definition */
@@ -138,10 +138,10 @@
 
 /* provide prototypes for these when building zlib without LFS */
 #if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0
-    ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-    ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
-    ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
-    ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
+    ZEXTERN gzFile ZEXPORT gzopen64(const char *, const char *);
+    ZEXTERN z_off64_t ZEXPORT gzseek64(gzFile, z_off64_t, int);
+    ZEXTERN z_off64_t ZEXPORT gztell64(gzFile);
+    ZEXTERN z_off64_t ZEXPORT gzoffset64(gzFile);
 #endif
 
 /* default memLevel */
@@ -190,6 +190,7 @@ typedef struct {
         /* just for writing */
     int level;              /* compression level */
     int strategy;           /* compression strategy */
+    int reset;              /* true if a reset is pending after a Z_FINISH */
         /* seek request */
     z_off64_t skip;         /* amount to skip (already rewound if backwards) */
     int seek;               /* true if seek request pending */
@@ -202,9 +203,9 @@ typedef struct {
 typedef gz_state FAR *gz_statep;
 
 /* shared functions */
-void ZLIB_INTERNAL gz_error OF((gz_statep, int, const char *));
+void ZLIB_INTERNAL gz_error(gz_statep, int, const char *);
 #if defined UNDER_CE
-char ZLIB_INTERNAL *gz_strwinerror OF((DWORD error));
+char ZLIB_INTERNAL *gz_strwinerror(DWORD error);
 #endif
 
 /* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t
@@ -213,6 +214,6 @@ char ZLIB_INTERNAL *gz_strwinerror OF((DWORD error));
 #ifdef INT_MAX
 #  define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX)
 #else
-unsigned ZLIB_INTERNAL gz_intmax OF((void));
+unsigned ZLIB_INTERNAL gz_intmax(void);
 #  define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax())
 #endif
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/gzlib.c b/extern/crashpad/crashpad/third_party/zlib/zlib/gzlib.c
index 4105e6aff9..9810e3553e 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/gzlib.c
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/gzlib.c
@@ -1,24 +1,23 @@
 /* gzlib.c -- zlib functions common to reading and writing gzip files
- * Copyright (C) 2004-2017 Mark Adler
+ * Copyright (C) 2004-2019 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
 #include "gzguts.h"
 
-#if defined(_WIN32) && !defined(__BORLANDC__) && !defined(__MINGW32__)
+#if defined(_WIN32) && !defined(__BORLANDC__)
 #  define LSEEK _lseeki64
+#  define OPEN  open
 #else
 #if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
 #  define LSEEK lseek64
+#  define OPEN  open64
 #else
 #  define LSEEK lseek
+#  define OPEN  open
 #endif
 #endif
 
-/* Local functions */
-local void gz_reset OF((gz_statep));
-local gzFile gz_open OF((const void *, int, const char *));
-
 #if defined UNDER_CE
 
 /* Map the Windows error number in ERROR to a locale-dependent error message
@@ -30,9 +29,7 @@ local gzFile gz_open OF((const void *, int, const char *));
 
    The gz_strwinerror function does not change the current setting of
    GetLastError. */
-char ZLIB_INTERNAL *gz_strwinerror (error)
-     DWORD error;
-{
+char ZLIB_INTERNAL *gz_strwinerror(DWORD error) {
     static char buf[1024];
 
     wchar_t *msgbuf;
@@ -72,15 +69,15 @@ char ZLIB_INTERNAL *gz_strwinerror (error)
 #endif /* UNDER_CE */
 
 /* Reset gzip file state */
-local void gz_reset(state)
-    gz_statep state;
-{
+local void gz_reset(gz_statep state) {
     state->x.have = 0;              /* no output data available */
     if (state->mode == GZ_READ) {   /* for reading ... */
         state->eof = 0;             /* not at end of file */
         state->past = 0;            /* have not read past end yet */
         state->how = LOOK;          /* look for gzip header */
     }
+    else                            /* for writing ... */
+        state->reset = 0;           /* no deflateReset pending */
     state->seek = 0;                /* no seek request pending */
     gz_error(state, Z_OK, NULL);    /* clear error */
     state->x.pos = 0;               /* no uncompressed data yet */
@@ -88,11 +85,7 @@ local void gz_reset(state)
 }
 
 /* Open a gzip file either by name or file descriptor. */
-local gzFile gz_open(path, fd, mode)
-    const void *path;
-    int fd;
-    const char *mode;
-{
+local gzFile gz_open(const void *path, int fd, const char *mode) {
     gz_statep state;
     z_size_t len;
     int oflag;
@@ -242,7 +235,7 @@ local gzFile gz_open(path, fd, mode)
 #ifdef WIDECHAR
         fd == -2 ? _wopen(path, oflag, 0666) :
 #endif
-        open((const char *)path, oflag, 0666));
+        OPEN((const char *)path, oflag, 0666));
     if (state->fd == -1) {
         free(state->path);
         free(state);
@@ -267,26 +260,17 @@ local gzFile gz_open(path, fd, mode)
 }
 
 /* -- see zlib.h -- */
-gzFile ZEXPORT gzopen(path, mode)
-    const char *path;
-    const char *mode;
-{
+gzFile ZEXPORT gzopen(const char *path, const char *mode) {
     return gz_open(path, -1, mode);
 }
 
 /* -- see zlib.h -- */
-gzFile ZEXPORT gzopen64(path, mode)
-    const char *path;
-    const char *mode;
-{
+gzFile ZEXPORT gzopen64(const char *path, const char *mode) {
     return gz_open(path, -1, mode);
 }
 
 /* -- see zlib.h -- */
-gzFile ZEXPORT gzdopen(fd, mode)
-    int fd;
-    const char *mode;
-{
+gzFile ZEXPORT gzdopen(int fd, const char *mode) {
     char *path;         /* identifier for error messages */
     gzFile gz;
 
@@ -304,19 +288,13 @@ gzFile ZEXPORT gzdopen(fd, mode)
 
 /* -- see zlib.h -- */
 #ifdef WIDECHAR
-gzFile ZEXPORT gzopen_w(path, mode)
-    const wchar_t *path;
-    const char *mode;
-{
+gzFile ZEXPORT gzopen_w(const wchar_t *path, const char *mode) {
     return gz_open(path, -2, mode);
 }
 #endif
 
 /* -- see zlib.h -- */
-int ZEXPORT gzbuffer(file, size)
-    gzFile file;
-    unsigned size;
-{
+int ZEXPORT gzbuffer(gzFile file, unsigned size) {
     gz_statep state;
 
     /* get internal structure and check integrity */
@@ -340,9 +318,7 @@ int ZEXPORT gzbuffer(file, size)
 }
 
 /* -- see zlib.h -- */
-int ZEXPORT gzrewind(file)
-    gzFile file;
-{
+int ZEXPORT gzrewind(gzFile file) {
     gz_statep state;
 
     /* get internal structure */
@@ -363,11 +339,7 @@ int ZEXPORT gzrewind(file)
 }
 
 /* -- see zlib.h -- */
-z_off64_t ZEXPORT gzseek64(file, offset, whence)
-    gzFile file;
-    z_off64_t offset;
-    int whence;
-{
+z_off64_t ZEXPORT gzseek64(gzFile file, z_off64_t offset, int whence) {
     unsigned n;
     z_off64_t ret;
     gz_statep state;
@@ -397,7 +369,7 @@ z_off64_t ZEXPORT gzseek64(file, offset, whence)
     /* if within raw area while reading, just go there */
     if (state->mode == GZ_READ && state->how == COPY &&
             state->x.pos + offset >= 0) {
-        ret = LSEEK(state->fd, offset - state->x.have, SEEK_CUR);
+        ret = LSEEK(state->fd, offset - (z_off64_t)state->x.have, SEEK_CUR);
         if (ret == -1)
             return -1;
         state->x.have = 0;
@@ -440,11 +412,7 @@ z_off64_t ZEXPORT gzseek64(file, offset, whence)
 }
 
 /* -- see zlib.h -- */
-z_off_t ZEXPORT gzseek(file, offset, whence)
-    gzFile file;
-    z_off_t offset;
-    int whence;
-{
+z_off_t ZEXPORT gzseek(gzFile file, z_off_t offset, int whence) {
     z_off64_t ret;
 
     ret = gzseek64(file, (z_off64_t)offset, whence);
@@ -452,9 +420,7 @@ z_off_t ZEXPORT gzseek(file, offset, whence)
 }
 
 /* -- see zlib.h -- */
-z_off64_t ZEXPORT gztell64(file)
-    gzFile file;
-{
+z_off64_t ZEXPORT gztell64(gzFile file) {
     gz_statep state;
 
     /* get internal structure and check integrity */
@@ -469,9 +435,7 @@ z_off64_t ZEXPORT gztell64(file)
 }
 
 /* -- see zlib.h -- */
-z_off_t ZEXPORT gztell(file)
-    gzFile file;
-{
+z_off_t ZEXPORT gztell(gzFile file) {
     z_off64_t ret;
 
     ret = gztell64(file);
@@ -479,9 +443,7 @@ z_off_t ZEXPORT gztell(file)
 }
 
 /* -- see zlib.h -- */
-z_off64_t ZEXPORT gzoffset64(file)
-    gzFile file;
-{
+z_off64_t ZEXPORT gzoffset64(gzFile file) {
     z_off64_t offset;
     gz_statep state;
 
@@ -502,9 +464,7 @@ z_off64_t ZEXPORT gzoffset64(file)
 }
 
 /* -- see zlib.h -- */
-z_off_t ZEXPORT gzoffset(file)
-    gzFile file;
-{
+z_off_t ZEXPORT gzoffset(gzFile file) {
     z_off64_t ret;
 
     ret = gzoffset64(file);
@@ -512,9 +472,7 @@ z_off_t ZEXPORT gzoffset(file)
 }
 
 /* -- see zlib.h -- */
-int ZEXPORT gzeof(file)
-    gzFile file;
-{
+int ZEXPORT gzeof(gzFile file) {
     gz_statep state;
 
     /* get internal structure and check integrity */
@@ -529,10 +487,7 @@ int ZEXPORT gzeof(file)
 }
 
 /* -- see zlib.h -- */
-const char * ZEXPORT gzerror(file, errnum)
-    gzFile file;
-    int *errnum;
-{
+const char * ZEXPORT gzerror(gzFile file, int *errnum) {
     gz_statep state;
 
     /* get internal structure and check integrity */
@@ -550,9 +505,7 @@ const char * ZEXPORT gzerror(file, errnum)
 }
 
 /* -- see zlib.h -- */
-void ZEXPORT gzclearerr(file)
-    gzFile file;
-{
+void ZEXPORT gzclearerr(gzFile file) {
     gz_statep state;
 
     /* get internal structure and check integrity */
@@ -576,11 +529,7 @@ void ZEXPORT gzclearerr(file)
    memory).  Simply save the error message as a static string.  If there is an
    allocation failure constructing the error message, then convert the error to
    out of memory. */
-void ZLIB_INTERNAL gz_error(state, err, msg)
-    gz_statep state;
-    int err;
-    const char *msg;
-{
+void ZLIB_INTERNAL gz_error(gz_statep state, int err, const char *msg) {
     /* free previously allocated message and clear */
     if (state->msg != NULL) {
         if (state->err != Z_MEM_ERROR)
@@ -622,8 +571,7 @@ void ZLIB_INTERNAL gz_error(state, err, msg)
    available) -- we need to do this to cover cases where 2's complement not
    used, since C standard permits 1's complement and sign-bit representations,
    otherwise we could just use ((unsigned)-1) >> 1 */
-unsigned ZLIB_INTERNAL gz_intmax()
-{
+unsigned ZLIB_INTERNAL gz_intmax(void) {
     unsigned p, q;
 
     p = 1;
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/gzread.c b/extern/crashpad/crashpad/third_party/zlib/zlib/gzread.c
index 832d3ef98c..9a9f7847ce 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/gzread.c
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/gzread.c
@@ -1,29 +1,16 @@
 /* gzread.c -- zlib functions for reading gzip files
- * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler
+ * Copyright (C) 2004-2017 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
 #include "gzguts.h"
 
-/* Local functions */
-local int gz_load OF((gz_statep, unsigned char *, unsigned, unsigned *));
-local int gz_avail OF((gz_statep));
-local int gz_look OF((gz_statep));
-local int gz_decomp OF((gz_statep));
-local int gz_fetch OF((gz_statep));
-local int gz_skip OF((gz_statep, z_off64_t));
-local z_size_t gz_read OF((gz_statep, voidp, z_size_t));
-
 /* Use read() to load a buffer -- return -1 on error, otherwise 0.  Read from
    state->fd, and update state->eof, state->err, and state->msg as appropriate.
    This function needs to loop on read(), since read() is not guaranteed to
    read the number of bytes requested, depending on the type of descriptor. */
-local int gz_load(state, buf, len, have)
-    gz_statep state;
-    unsigned char *buf;
-    unsigned len;
-    unsigned *have;
-{
+local int gz_load(gz_statep state, unsigned char *buf, unsigned len,
+                  unsigned *have) {
     int ret;
     unsigned get, max = ((unsigned)-1 >> 2) + 1;
 
@@ -53,9 +40,7 @@ local int gz_load(state, buf, len, have)
    If strm->avail_in != 0, then the current data is moved to the beginning of
    the input buffer, and then the remainder of the buffer is loaded with the
    available data from the input file. */
-local int gz_avail(state)
-    gz_statep state;
-{
+local int gz_avail(gz_statep state) {
     unsigned got;
     z_streamp strm = &(state->strm);
 
@@ -88,9 +73,7 @@ local int gz_avail(state)
    case, all further file reads will be directly to either the output buffer or
    a user buffer.  If decompressing, the inflate state will be initialized.
    gz_look() will return 0 on success or -1 on failure. */
-local int gz_look(state)
-    gz_statep state;
-{
+local int gz_look(gz_statep state) {
     z_streamp strm = &(state->strm);
 
     /* allocate read buffers and inflate memory */
@@ -157,11 +140,9 @@ local int gz_look(state)
        the output buffer is larger than the input buffer, which also assures
        space for gzungetc() */
     state->x.next = state->out;
-    if (strm->avail_in) {
-        memcpy(state->x.next, strm->next_in, strm->avail_in);
-        state->x.have = strm->avail_in;
-        strm->avail_in = 0;
-    }
+    memcpy(state->x.next, strm->next_in, strm->avail_in);
+    state->x.have = strm->avail_in;
+    strm->avail_in = 0;
     state->how = COPY;
     state->direct = 1;
     return 0;
@@ -172,9 +153,7 @@ local int gz_look(state)
    data.  If the gzip stream completes, state->how is reset to LOOK to look for
    the next gzip stream or raw data, once state->x.have is depleted.  Returns 0
    on success, -1 on failure. */
-local int gz_decomp(state)
-    gz_statep state;
-{
+local int gz_decomp(gz_statep state) {
     int ret = Z_OK;
     unsigned had;
     z_streamp strm = &(state->strm);
@@ -226,9 +205,7 @@ local int gz_decomp(state)
    looked for to determine whether to copy or decompress.  Returns -1 on error,
    otherwise 0.  gz_fetch() will leave state->how as COPY or GZIP unless the
    end of the input file has been reached and all data has been processed.  */
-local int gz_fetch(state)
-    gz_statep state;
-{
+local int gz_fetch(gz_statep state) {
     z_streamp strm = &(state->strm);
 
     do {
@@ -256,10 +233,7 @@ local int gz_fetch(state)
 }
 
 /* Skip len uncompressed bytes of output.  Return -1 on error, 0 on success. */
-local int gz_skip(state, len)
-    gz_statep state;
-    z_off64_t len;
-{
+local int gz_skip(gz_statep state, z_off64_t len) {
     unsigned n;
 
     /* skip over len bytes or reach end-of-file, whichever comes first */
@@ -291,11 +265,7 @@ local int gz_skip(state, len)
    input.  Return the number of bytes read.  If zero is returned, either the
    end of file was reached, or there was an error.  state->err must be
    consulted in that case to determine which. */
-local z_size_t gz_read(state, buf, len)
-    gz_statep state;
-    voidp buf;
-    z_size_t len;
-{
+local z_size_t gz_read(gz_statep state, voidp buf, z_size_t len) {
     z_size_t got;
     unsigned n;
 
@@ -314,9 +284,9 @@ local z_size_t gz_read(state, buf, len)
     got = 0;
     do {
         /* set n to the maximum amount of len that fits in an unsigned int */
-        n = -1;
+        n = (unsigned)-1;
         if (n > len)
-            n = len;
+            n = (unsigned)len;
 
         /* first just try copying data from the output buffer */
         if (state->x.have) {
@@ -372,11 +342,7 @@ local z_size_t gz_read(state, buf, len)
 }
 
 /* -- see zlib.h -- */
-int ZEXPORT gzread(file, buf, len)
-    gzFile file;
-    voidp buf;
-    unsigned len;
-{
+int ZEXPORT gzread(gzFile file, voidp buf, unsigned len) {
     gz_statep state;
 
     /* get internal structure */
@@ -397,7 +363,7 @@ int ZEXPORT gzread(file, buf, len)
     }
 
     /* read len or fewer bytes to buf */
-    len = gz_read(state, buf, len);
+    len = (unsigned)gz_read(state, buf, len);
 
     /* check for an error */
     if (len == 0 && state->err != Z_OK && state->err != Z_BUF_ERROR)
@@ -408,12 +374,7 @@ int ZEXPORT gzread(file, buf, len)
 }
 
 /* -- see zlib.h -- */
-z_size_t ZEXPORT gzfread(buf, size, nitems, file)
-    voidp buf;
-    z_size_t size;
-    z_size_t nitems;
-    gzFile file;
-{
+z_size_t ZEXPORT gzfread(voidp buf, z_size_t size, z_size_t nitems, gzFile file) {
     z_size_t len;
     gz_statep state;
 
@@ -448,10 +409,7 @@ z_size_t ZEXPORT gzfread(buf, size, nitems, file)
 #  endif
 #endif
 
-int ZEXPORT gzgetc(file)
-    gzFile file;
-{
-    int ret;
+int ZEXPORT gzgetc(gzFile file) {
     unsigned char buf[1];
     gz_statep state;
 
@@ -473,21 +431,15 @@ int ZEXPORT gzgetc(file)
     }
 
     /* nothing there -- try gz_read() */
-    ret = gz_read(state, buf, 1);
-    return ret < 1 ? -1 : buf[0];
+    return gz_read(state, buf, 1) < 1 ? -1 : buf[0];
 }
 
-int ZEXPORT gzgetc_(file)
-gzFile file;
-{
+int ZEXPORT gzgetc_(gzFile file) {
     return gzgetc(file);
 }
 
 /* -- see zlib.h -- */
-int ZEXPORT gzungetc(c, file)
-    int c;
-    gzFile file;
-{
+int ZEXPORT gzungetc(int c, gzFile file) {
     gz_statep state;
 
     /* get internal structure */
@@ -544,11 +496,7 @@ int ZEXPORT gzungetc(c, file)
 }
 
 /* -- see zlib.h -- */
-char * ZEXPORT gzgets(file, buf, len)
-    gzFile file;
-    char *buf;
-    int len;
-{
+char * ZEXPORT gzgets(gzFile file, char *buf, int len) {
     unsigned left, n;
     char *str;
     unsigned char *eol;
@@ -608,9 +556,7 @@ char * ZEXPORT gzgets(file, buf, len)
 }
 
 /* -- see zlib.h -- */
-int ZEXPORT gzdirect(file)
-    gzFile file;
-{
+int ZEXPORT gzdirect(gzFile file) {
     gz_statep state;
 
     /* get internal structure */
@@ -628,9 +574,7 @@ int ZEXPORT gzdirect(file)
 }
 
 /* -- see zlib.h -- */
-int ZEXPORT gzclose_r(file)
-    gzFile file;
-{
+int ZEXPORT gzclose_r(gzFile file) {
     int ret, err;
     gz_statep state;
 
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/gzwrite.c b/extern/crashpad/crashpad/third_party/zlib/zlib/gzwrite.c
index c7b5651d70..435b4621b5 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/gzwrite.c
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/gzwrite.c
@@ -1,22 +1,14 @@
 /* gzwrite.c -- zlib functions for writing gzip files
- * Copyright (C) 2004-2017 Mark Adler
+ * Copyright (C) 2004-2019 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
 #include "gzguts.h"
 
-/* Local functions */
-local int gz_init OF((gz_statep));
-local int gz_comp OF((gz_statep, int));
-local int gz_zero OF((gz_statep, z_off64_t));
-local z_size_t gz_write OF((gz_statep, voidpc, z_size_t));
-
 /* Initialize state for writing a gzip file.  Mark initialization by setting
    state->size to non-zero.  Return -1 on a memory allocation failure, or 0 on
    success. */
-local int gz_init(state)
-    gz_statep state;
-{
+local int gz_init(gz_statep state) {
     int ret;
     z_streamp strm = &(state->strm);
 
@@ -70,10 +62,7 @@ local int gz_init(state)
    deflate() flush value.  If flush is Z_FINISH, then the deflate() state is
    reset to start a new gzip stream.  If gz->direct is true, then simply write
    to the output file without compressing, and ignore flush. */
-local int gz_comp(state, flush)
-    gz_statep state;
-    int flush;
-{
+local int gz_comp(gz_statep state, int flush) {
     int ret, writ;
     unsigned have, put, max = ((unsigned)-1 >> 2) + 1;
     z_streamp strm = &(state->strm);
@@ -97,6 +86,15 @@ local int gz_comp(state, flush)
         return 0;
     }
 
+    /* check for a pending reset */
+    if (state->reset) {
+        /* don't start a new gzip member unless there is data to write */
+        if (strm->avail_in == 0)
+            return 0;
+        deflateReset(strm);
+        state->reset = 0;
+    }
+
     /* run deflate() on provided input until it produces no more output */
     ret = Z_OK;
     do {
@@ -134,7 +132,7 @@ local int gz_comp(state, flush)
 
     /* if that completed a deflate stream, allow another to start */
     if (flush == Z_FINISH)
-        deflateReset(strm);
+        state->reset = 1;
 
     /* all done, no errors */
     return 0;
@@ -142,10 +140,7 @@ local int gz_comp(state, flush)
 
 /* Compress len zeros to output.  Return -1 on a write error or memory
    allocation failure by gz_comp(), or 0 on success. */
-local int gz_zero(state, len)
-    gz_statep state;
-    z_off64_t len;
-{
+local int gz_zero(gz_statep state, z_off64_t len) {
     int first;
     unsigned n;
     z_streamp strm = &(state->strm);
@@ -175,11 +170,7 @@ local int gz_zero(state, len)
 
 /* Write len bytes from buf to file.  Return the number of bytes written.  If
    the returned value is less than len, then there was an error. */
-local z_size_t gz_write(state, buf, len)
-    gz_statep state;
-    voidpc buf;
-    z_size_t len;
-{
+local z_size_t gz_write(gz_statep state, voidpc buf, z_size_t len) {
     z_size_t put = len;
 
     /* if len is zero, avoid unnecessary operations */
@@ -209,7 +200,7 @@ local z_size_t gz_write(state, buf, len)
                               state->in);
             copy = state->size - have;
             if (copy > len)
-                copy = len;
+                copy = (unsigned)len;
             memcpy(state->in + have, buf, copy);
             state->strm.avail_in += copy;
             state->x.pos += copy;
@@ -229,7 +220,7 @@ local z_size_t gz_write(state, buf, len)
         do {
             unsigned n = (unsigned)-1;
             if (n > len)
-                n = len;
+                n = (unsigned)len;
             state->strm.avail_in = n;
             state->x.pos += n;
             if (gz_comp(state, Z_NO_FLUSH) == -1)
@@ -243,11 +234,7 @@ local z_size_t gz_write(state, buf, len)
 }
 
 /* -- see zlib.h -- */
-int ZEXPORT gzwrite(file, buf, len)
-    gzFile file;
-    voidpc buf;
-    unsigned len;
-{
+int ZEXPORT gzwrite(gzFile file, voidpc buf, unsigned len) {
     gz_statep state;
 
     /* get internal structure */
@@ -271,12 +258,8 @@ int ZEXPORT gzwrite(file, buf, len)
 }
 
 /* -- see zlib.h -- */
-z_size_t ZEXPORT gzfwrite(buf, size, nitems, file)
-    voidpc buf;
-    z_size_t size;
-    z_size_t nitems;
-    gzFile file;
-{
+z_size_t ZEXPORT gzfwrite(voidpc buf, z_size_t size, z_size_t nitems,
+                          gzFile file) {
     z_size_t len;
     gz_statep state;
 
@@ -301,10 +284,7 @@ z_size_t ZEXPORT gzfwrite(buf, size, nitems, file)
 }
 
 /* -- see zlib.h -- */
-int ZEXPORT gzputc(file, c)
-    gzFile file;
-    int c;
-{
+int ZEXPORT gzputc(gzFile file, int c) {
     unsigned have;
     unsigned char buf[1];
     gz_statep state;
@@ -349,12 +329,8 @@ int ZEXPORT gzputc(file, c)
 }
 
 /* -- see zlib.h -- */
-int ZEXPORT gzputs(file, str)
-    gzFile file;
-    const char *str;
-{
-    int ret;
-    z_size_t len;
+int ZEXPORT gzputs(gzFile file, const char *s) {
+    z_size_t len, put;
     gz_statep state;
 
     /* get internal structure */
@@ -367,17 +343,20 @@ int ZEXPORT gzputs(file, str)
         return -1;
 
     /* write string */
-    len = strlen(str);
-    ret = gz_write(state, str, len);
-    return ret == 0 && len != 0 ? -1 : ret;
+    len = strlen(s);
+    if ((int)len < 0 || (unsigned)len != len) {
+        gz_error(state, Z_STREAM_ERROR, "string length does not fit in int");
+        return -1;
+    }
+    put = gz_write(state, s, len);
+    return put < len ? -1 : (int)len;
 }
 
 #if defined(STDC) || defined(Z_HAVE_STDARG_H)
 #include <stdarg.h>
 
 /* -- see zlib.h -- */
-int ZEXPORTVA gzvprintf(gzFile file, const char *format, va_list va)
-{
+int ZEXPORTVA gzvprintf(gzFile file, const char *format, va_list va) {
     int len;
     unsigned left;
     char *next;
@@ -441,15 +420,14 @@ int ZEXPORTVA gzvprintf(gzFile file, const char *format, va_list va)
         strm->avail_in = state->size;
         if (gz_comp(state, Z_NO_FLUSH) == -1)
             return state->err;
-        memcpy(state->in, state->in + state->size, left);
+        memmove(state->in, state->in + state->size, left);
         strm->next_in = state->in;
         strm->avail_in = left;
     }
     return len;
 }
 
-int ZEXPORTVA gzprintf(gzFile file, const char *format, ...)
-{
+int ZEXPORTVA gzprintf(gzFile file, const char *format, ...) {
     va_list va;
     int ret;
 
@@ -462,13 +440,10 @@ int ZEXPORTVA gzprintf(gzFile file, const char *format, ...)
 #else /* !STDC && !Z_HAVE_STDARG_H */
 
 /* -- see zlib.h -- */
-int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
-                       a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
-    gzFile file;
-    const char *format;
-    int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
-        a11, a12, a13, a14, a15, a16, a17, a18, a19, a20;
-{
+int ZEXPORTVA gzprintf(gzFile file, const char *format, int a1, int a2, int a3,
+                       int a4, int a5, int a6, int a7, int a8, int a9, int a10,
+                       int a11, int a12, int a13, int a14, int a15, int a16,
+                       int a17, int a18, int a19, int a20) {
     unsigned len, left;
     char *next;
     gz_statep state;
@@ -540,7 +515,7 @@ int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
         strm->avail_in = state->size;
         if (gz_comp(state, Z_NO_FLUSH) == -1)
             return state->err;
-        memcpy(state->in, state->in + state->size, left);
+        memmove(state->in, state->in + state->size, left);
         strm->next_in = state->in;
         strm->avail_in = left;
     }
@@ -550,10 +525,7 @@ int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
 #endif
 
 /* -- see zlib.h -- */
-int ZEXPORT gzflush(file, flush)
-    gzFile file;
-    int flush;
-{
+int ZEXPORT gzflush(gzFile file, int flush) {
     gz_statep state;
 
     /* get internal structure */
@@ -582,11 +554,7 @@ int ZEXPORT gzflush(file, flush)
 }
 
 /* -- see zlib.h -- */
-int ZEXPORT gzsetparams(file, level, strategy)
-    gzFile file;
-    int level;
-    int strategy;
-{
+int ZEXPORT gzsetparams(gzFile file, int level, int strategy) {
     gz_statep state;
     z_streamp strm;
 
@@ -597,7 +565,7 @@ int ZEXPORT gzsetparams(file, level, strategy)
     strm = &(state->strm);
 
     /* check that we're writing and that there's no error */
-    if (state->mode != GZ_WRITE || state->err != Z_OK)
+    if (state->mode != GZ_WRITE || state->err != Z_OK || state->direct)
         return Z_STREAM_ERROR;
 
     /* if no change is requested, then do nothing */
@@ -624,9 +592,7 @@ int ZEXPORT gzsetparams(file, level, strategy)
 }
 
 /* -- see zlib.h -- */
-int ZEXPORT gzclose_w(file)
-    gzFile file;
-{
+int ZEXPORT gzclose_w(gzFile file) {
     int ret = Z_OK;
     gz_statep state;
 
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/infback.c b/extern/crashpad/crashpad/third_party/zlib/zlib/infback.c
index 59679ecbfc..9bfc30fe55 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/infback.c
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/infback.c
@@ -1,5 +1,5 @@
 /* infback.c -- inflate using a call-back interface
- * Copyright (C) 1995-2016 Mark Adler
+ * Copyright (C) 1995-2022 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -15,9 +15,6 @@
 #include "inflate.h"
 #include "inffast.h"
 
-/* function prototypes */
-local void fixedtables OF((struct inflate_state FAR *state));
-
 /*
    strm provides memory allocation functions in zalloc and zfree, or
    Z_NULL to use the library memory allocation functions.
@@ -25,13 +22,9 @@ local void fixedtables OF((struct inflate_state FAR *state));
    windowBits is in the range 8..15, and window is a user-supplied
    window and output buffer that is 2**windowBits bytes.
  */
-int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size)
-z_streamp strm;
-int windowBits;
-unsigned char FAR *window;
-const char *version;
-int stream_size;
-{
+int ZEXPORT inflateBackInit_(z_streamp strm, int windowBits,
+                             unsigned char FAR *window, const char *version,
+                             int stream_size) {
     struct inflate_state FAR *state;
 
     if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
@@ -66,6 +59,7 @@ int stream_size;
     state->window = window;
     state->wnext = 0;
     state->whave = 0;
+    state->sane = 1;
     return Z_OK;
 }
 
@@ -79,9 +73,7 @@ int stream_size;
    used for threaded applications, since the rewriting of the tables and virgin
    may not be thread-safe.
  */
-local void fixedtables(state)
-struct inflate_state FAR *state;
-{
+local void fixedtables(struct inflate_state FAR *state) {
 #ifdef BUILDFIXED
     static int virgin = 1;
     static code *lenfix, *distfix;
@@ -247,13 +239,8 @@ struct inflate_state FAR *state;
    inflateBack() can also return Z_STREAM_ERROR if the input parameters
    are not correct, i.e. strm is Z_NULL or the state was not initialized.
  */
-int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc)
-z_streamp strm;
-in_func in;
-void FAR *in_desc;
-out_func out;
-void FAR *out_desc;
-{
+int ZEXPORT inflateBack(z_streamp strm, in_func in, void FAR *in_desc,
+                        out_func out, void FAR *out_desc) {
     struct inflate_state FAR *state;
     z_const unsigned char FAR *next;    /* next input */
     unsigned char FAR *put;     /* next output */
@@ -454,11 +441,11 @@ void FAR *out_desc;
             }
 
             /* build code tables -- note: do not change the lenbits or distbits
-               values here (9 and 6) without reading the comments in inftrees.h
+               values here (10 and 9) without reading the comments in inftrees.h
                concerning the ENOUGH constants, which depend on those values */
             state->next = state->codes;
             state->lencode = (code const FAR *)(state->next);
-            state->lenbits = 9;
+            state->lenbits = 10;
             ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
                                 &(state->lenbits), state->work);
             if (ret) {
@@ -467,7 +454,7 @@ void FAR *out_desc;
                 break;
             }
             state->distcode = (code const FAR *)(state->next);
-            state->distbits = 6;
+            state->distbits = 9;
             ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
                             &(state->next), &(state->distbits), state->work);
             if (ret) {
@@ -477,10 +464,12 @@ void FAR *out_desc;
             }
             Tracev((stderr, "inflate:       codes ok\n"));
             state->mode = LEN;
+                /* fallthrough */
 
         case LEN:
             /* use inflate_fast() if we have enough input and output */
-            if (have >= 6 && left >= 258) {
+            if (have >= INFLATE_FAST_MIN_INPUT &&
+                left >= INFLATE_FAST_MIN_OUTPUT) {
                 RESTORE();
                 if (state->whave < state->wsize)
                     state->whave = state->wsize - left;
@@ -604,33 +593,33 @@ void FAR *out_desc;
             break;
 
         case DONE:
-            /* inflate stream terminated properly -- write leftover output */
+            /* inflate stream terminated properly */
             ret = Z_STREAM_END;
-            if (left < state->wsize) {
-                if (out(out_desc, state->window, state->wsize - left))
-                    ret = Z_BUF_ERROR;
-            }
             goto inf_leave;
 
         case BAD:
             ret = Z_DATA_ERROR;
             goto inf_leave;
 
-        default:                /* can't happen, but makes compilers happy */
+        default:
+            /* can't happen, but makes compilers happy */
             ret = Z_STREAM_ERROR;
             goto inf_leave;
         }
 
-    /* Return unused input */
+    /* Write leftover output and return unused input */
   inf_leave:
+    if (left < state->wsize) {
+        if (out(out_desc, state->window, state->wsize - left) &&
+            ret == Z_STREAM_END)
+            ret = Z_BUF_ERROR;
+    }
     strm->next_in = next;
     strm->avail_in = have;
     return ret;
 }
 
-int ZEXPORT inflateBackEnd(strm)
-z_streamp strm;
-{
+int ZEXPORT inflateBackEnd(z_streamp strm) {
     if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
         return Z_STREAM_ERROR;
     ZFREE(strm, strm->state);
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/inffast.c b/extern/crashpad/crashpad/third_party/zlib/zlib/inffast.c
index 0dbd1dbc09..52ed8ca2df 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/inffast.c
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/inffast.c
@@ -18,13 +18,13 @@
    available, an end-of-block is encountered, or a data error is encountered.
    When large enough input and output buffers are supplied to inflate(), for
    example, a 16K input buffer and a 64K output buffer, more than 95% of the
-   inflate execution time is spent in this routine.
+   inflate() execution time is spent in this routine.
 
    Entry assumptions:
 
         state->mode == LEN
-        strm->avail_in >= 6
-        strm->avail_out >= 258
+        strm->avail_in >= INFLATE_FAST_MIN_INPUT (6 bytes)
+        strm->avail_out >= INFLATE_FAST_MIN_OUTPUT (258 bytes)
         start >= strm->avail_out
         state->bits < 8
 
@@ -36,21 +36,22 @@
 
    Notes:
 
+    INFLATE_FAST_MIN_INPUT: 6 bytes
+
     - The maximum input bits used by a length/distance pair is 15 bits for the
       length code, 5 bits for the length extra, 15 bits for the distance code,
       and 13 bits for the distance extra.  This totals 48 bits, or six bytes.
       Therefore if strm->avail_in >= 6, then there is enough input to avoid
       checking for available input while decoding.
 
+    INFLATE_FAST_MIN_OUTPUT: 258 bytes
+
     - The maximum bytes that a single length/distance pair can output is 258
       bytes, which is the maximum length that can be coded.  inflate_fast()
       requires strm->avail_out >= 258 for each loop to avoid checking for
-      output space.
+      available output space while decoding.
  */
-void ZLIB_INTERNAL inflate_fast(strm, start)
-z_streamp strm;
-unsigned start;         /* inflate()'s starting value for strm->avail_out */
-{
+void ZLIB_INTERNAL inflate_fast(z_streamp strm, unsigned start) {
     struct inflate_state FAR *state;
     z_const unsigned char FAR *in;      /* local strm->next_in */
     z_const unsigned char FAR *last;    /* have enough input while in < last */
@@ -70,7 +71,7 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
     code const FAR *dcode;      /* local strm->distcode */
     unsigned lmask;             /* mask for first level of length codes */
     unsigned dmask;             /* mask for first level of distance codes */
-    code here;                  /* retrieved table entry */
+    code const *here;           /* retrieved table entry */
     unsigned op;                /* code bits, operation, extra bits, or */
                                 /*  window position, window bytes to copy */
     unsigned len;               /* match length, unused bytes */
@@ -80,10 +81,10 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
     /* copy state to local variables */
     state = (struct inflate_state FAR *)strm->state;
     in = strm->next_in;
-    last = in + (strm->avail_in - 5);
+    last = in + (strm->avail_in - (INFLATE_FAST_MIN_INPUT - 1));
     out = strm->next_out;
     beg = out - (start - strm->avail_out);
-    end = out + (strm->avail_out - 257);
+    end = out + (strm->avail_out - (INFLATE_FAST_MIN_OUTPUT - 1));
 #ifdef INFLATE_STRICT
     dmax = state->dmax;
 #endif
@@ -107,20 +108,20 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
             hold += (unsigned long)(*in++) << bits;
             bits += 8;
         }
-        here = lcode[hold & lmask];
+        here = lcode + (hold & lmask);
       dolen:
-        op = (unsigned)(here.bits);
+        op = (unsigned)(here->bits);
         hold >>= op;
         bits -= op;
-        op = (unsigned)(here.op);
+        op = (unsigned)(here->op);
         if (op == 0) {                          /* literal */
-            Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
+            Tracevv((stderr, here->val >= 0x20 && here->val < 0x7f ?
                     "inflate:         literal '%c'\n" :
-                    "inflate:         literal 0x%02x\n", here.val));
-            *out++ = (unsigned char)(here.val);
+                    "inflate:         literal 0x%02x\n", here->val));
+            *out++ = (unsigned char)(here->val);
         }
         else if (op & 16) {                     /* length base */
-            len = (unsigned)(here.val);
+            len = (unsigned)(here->val);
             op &= 15;                           /* number of extra bits */
             if (op) {
                 if (bits < op) {
@@ -138,14 +139,14 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
                 hold += (unsigned long)(*in++) << bits;
                 bits += 8;
             }
-            here = dcode[hold & dmask];
+            here = dcode + (hold & dmask);
           dodist:
-            op = (unsigned)(here.bits);
+            op = (unsigned)(here->bits);
             hold >>= op;
             bits -= op;
-            op = (unsigned)(here.op);
+            op = (unsigned)(here->op);
             if (op & 16) {                      /* distance base */
-                dist = (unsigned)(here.val);
+                dist = (unsigned)(here->val);
                 op &= 15;                       /* number of extra bits */
                 if (bits < op) {
                     hold += (unsigned long)(*in++) << bits;
@@ -264,7 +265,7 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
                 }
             }
             else if ((op & 64) == 0) {          /* 2nd level distance code */
-                here = dcode[here.val + (hold & ((1U << op) - 1))];
+                here = dcode + here->val + (hold & ((1U << op) - 1));
                 goto dodist;
             }
             else {
@@ -274,7 +275,7 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
             }
         }
         else if ((op & 64) == 0) {              /* 2nd level length code */
-            here = lcode[here.val + (hold & ((1U << op) - 1))];
+            here = lcode + here->val + (hold & ((1U << op) - 1));
             goto dolen;
         }
         else if (op & 32) {                     /* end-of-block */
@@ -298,9 +299,12 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
     /* update state and return */
     strm->next_in = in;
     strm->next_out = out;
-    strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last));
+    strm->avail_in = (unsigned)(in < last ?
+        (INFLATE_FAST_MIN_INPUT - 1) + (last - in) :
+        (INFLATE_FAST_MIN_INPUT - 1) - (in - last));
     strm->avail_out = (unsigned)(out < end ?
-                                 257 + (end - out) : 257 - (out - end));
+        (INFLATE_FAST_MIN_OUTPUT - 1) + (end - out) :
+        (INFLATE_FAST_MIN_OUTPUT - 1) - (out - end));
     state->hold = hold;
     state->bits = bits;
     return;
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/inffast.h b/extern/crashpad/crashpad/third_party/zlib/zlib/inffast.h
index e5c1aa4ca8..9ff6ce3b6a 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/inffast.h
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/inffast.h
@@ -8,4 +8,19 @@
    subject to change. Applications should only use zlib.h.
  */
 
-void ZLIB_INTERNAL inflate_fast OF((z_streamp strm, unsigned start));
+/* INFLATE_FAST_MIN_INPUT: the minimum number of input bytes needed so that
+   we can safely call inflate_fast() with only one up-front bounds check. One
+   length/distance code pair (15 bits for the length code, 5 bits for length
+   extra, 15 bits for the distance code, 13 bits for distance extra) requires
+   reading up to 48 input bits (6 bytes).
+*/
+#define INFLATE_FAST_MIN_INPUT 6
+
+/* INFLATE_FAST_MIN_OUTPUT: the minimum number of output bytes needed so that
+   we can safely call inflate_fast() with only one up-front bounds check. One
+   length/distance code pair can output up to 258 bytes, which is the maximum
+   length that can be coded.
+ */
+#define INFLATE_FAST_MIN_OUTPUT 258
+
+void ZLIB_INTERNAL inflate_fast(z_streamp strm, unsigned start);
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/inflate.c b/extern/crashpad/crashpad/third_party/zlib/zlib/inflate.c
index ac333e8c2e..5abbd07464 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/inflate.c
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/inflate.c
@@ -1,5 +1,5 @@
 /* inflate.c -- zlib decompression
- * Copyright (C) 1995-2016 Mark Adler
+ * Copyright (C) 1995-2022 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -91,20 +91,7 @@
 #  endif
 #endif
 
-/* function prototypes */
-local int inflateStateCheck OF((z_streamp strm));
-local void fixedtables OF((struct inflate_state FAR *state));
-local int updatewindow OF((z_streamp strm, const unsigned char FAR *end,
-                           unsigned copy));
-#ifdef BUILDFIXED
-   void makefixed OF((void));
-#endif
-local unsigned syncsearch OF((unsigned FAR *have, const unsigned char FAR *buf,
-                              unsigned len));
-
-local int inflateStateCheck(strm)
-z_streamp strm;
-{
+local int inflateStateCheck(z_streamp strm) {
     struct inflate_state FAR *state;
     if (strm == Z_NULL ||
         strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0)
@@ -116,9 +103,7 @@ z_streamp strm;
     return 0;
 }
 
-int ZEXPORT inflateResetKeep(strm)
-z_streamp strm;
-{
+int ZEXPORT inflateResetKeep(z_streamp strm) {
     struct inflate_state FAR *state;
 
     if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
@@ -130,6 +115,7 @@ z_streamp strm;
     state->mode = HEAD;
     state->last = 0;
     state->havedict = 0;
+    state->flags = -1;
     state->dmax = 32768U;
     state->head = Z_NULL;
     state->hold = 0;
@@ -141,9 +127,7 @@ z_streamp strm;
     return Z_OK;
 }
 
-int ZEXPORT inflateReset(strm)
-z_streamp strm;
-{
+int ZEXPORT inflateReset(z_streamp strm) {
     struct inflate_state FAR *state;
 
     if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
@@ -154,10 +138,7 @@ z_streamp strm;
     return inflateResetKeep(strm);
 }
 
-int ZEXPORT inflateReset2(strm, windowBits)
-z_streamp strm;
-int windowBits;
-{
+int ZEXPORT inflateReset2(z_streamp strm, int windowBits) {
     int wrap;
     struct inflate_state FAR *state;
 
@@ -167,6 +148,8 @@ int windowBits;
 
     /* extract wrap request from windowBits parameter */
     if (windowBits < 0) {
+        if (windowBits < -15)
+            return Z_STREAM_ERROR;
         wrap = 0;
         windowBits = -windowBits;
     }
@@ -192,12 +175,8 @@ int windowBits;
     return inflateReset(strm);
 }
 
-int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size)
-z_streamp strm;
-int windowBits;
-const char *version;
-int stream_size;
-{
+int ZEXPORT inflateInit2_(z_streamp strm, int windowBits,
+                          const char *version, int stream_size) {
     int ret;
     struct inflate_state FAR *state;
 
@@ -228,6 +207,7 @@ int stream_size;
     state->strm = strm;
     state->window = Z_NULL;
     state->mode = HEAD;     /* to pass state test in inflateReset2() */
+    state->check = 1L;      /* 1L is the result of adler32() zero length data */
     ret = inflateReset2(strm, windowBits);
     if (ret != Z_OK) {
         ZFREE(strm, state);
@@ -236,22 +216,17 @@ int stream_size;
     return ret;
 }
 
-int ZEXPORT inflateInit_(strm, version, stream_size)
-z_streamp strm;
-const char *version;
-int stream_size;
-{
+int ZEXPORT inflateInit_(z_streamp strm, const char *version,
+                         int stream_size) {
     return inflateInit2_(strm, DEF_WBITS, version, stream_size);
 }
 
-int ZEXPORT inflatePrime(strm, bits, value)
-z_streamp strm;
-int bits;
-int value;
-{
+int ZEXPORT inflatePrime(z_streamp strm, int bits, int value) {
     struct inflate_state FAR *state;
 
     if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    if (bits == 0)
+        return Z_OK;
     state = (struct inflate_state FAR *)strm->state;
     if (bits < 0) {
         state->hold = 0;
@@ -275,9 +250,7 @@ int value;
    used for threaded applications, since the rewriting of the tables and virgin
    may not be thread-safe.
  */
-local void fixedtables(state)
-struct inflate_state FAR *state;
-{
+local void fixedtables(struct inflate_state FAR *state) {
 #ifdef BUILDFIXED
     static int virgin = 1;
     static code *lenfix, *distfix;
@@ -339,7 +312,7 @@ struct inflate_state FAR *state;
 
     a.out > inffixed.h
  */
-void makefixed()
+void makefixed(void)
 {
     unsigned low, size;
     struct inflate_state state;
@@ -393,11 +366,7 @@ void makefixed()
    output will fall in the output data, making match copies simpler and faster.
    The advantage may be dependent on the size of the processor's data caches.
  */
-local int updatewindow(strm, end, copy)
-z_streamp strm;
-const Bytef *end;
-unsigned copy;
-{
+local int updatewindow(z_streamp strm, const Bytef *end, unsigned copy) {
     struct inflate_state FAR *state;
     unsigned dist;
 
@@ -447,10 +416,10 @@ unsigned copy;
 
 /* check function to use adler32() for zlib or crc32() for gzip */
 #ifdef GUNZIP
-#  define UPDATE(check, buf, len) \
+#  define UPDATE_CHECK(check, buf, len) \
     (state->flags ? crc32(check, buf, len) : adler32(check, buf, len))
 #else
-#  define UPDATE(check, buf, len) adler32(check, buf, len)
+#  define UPDATE_CHECK(check, buf, len) adler32(check, buf, len)
 #endif
 
 /* check macros for header crc */
@@ -619,10 +588,7 @@ unsigned copy;
    will return Z_BUF_ERROR if it has not reached the end of the stream.
  */
 
-int ZEXPORT inflate(strm, flush)
-z_streamp strm;
-int flush;
-{
+int ZEXPORT inflate(z_streamp strm, int flush) {
     struct inflate_state FAR *state;
     z_const unsigned char FAR *next;    /* next input */
     unsigned char FAR *put;     /* next output */
@@ -670,7 +636,6 @@ int flush;
                 state->mode = FLAGS;
                 break;
             }
-            state->flags = 0;           /* expect zlib header */
             if (state->head != Z_NULL)
                 state->head->done = -1;
             if (!(state->wrap & 1) ||   /* check if zlib header allowed */
@@ -697,6 +662,7 @@ int flush;
                 break;
             }
             state->dmax = 1U << len;
+            state->flags = 0;               /* indicate zlib header */
             Tracev((stderr, "inflate:   zlib header ok\n"));
             strm->adler = state->check = adler32(0L, Z_NULL, 0);
             state->mode = hold & 0x200 ? DICTID : TYPE;
@@ -722,6 +688,7 @@ int flush;
                 CRC2(state->check, hold);
             INITBITS();
             state->mode = TIME;
+                /* fallthrough */
         case TIME:
             NEEDBITS(32);
             if (state->head != Z_NULL)
@@ -730,6 +697,7 @@ int flush;
                 CRC4(state->check, hold);
             INITBITS();
             state->mode = OS;
+                /* fallthrough */
         case OS:
             NEEDBITS(16);
             if (state->head != Z_NULL) {
@@ -740,6 +708,7 @@ int flush;
                 CRC2(state->check, hold);
             INITBITS();
             state->mode = EXLEN;
+                /* fallthrough */
         case EXLEN:
             if (state->flags & 0x0400) {
                 NEEDBITS(16);
@@ -753,14 +722,16 @@ int flush;
             else if (state->head != Z_NULL)
                 state->head->extra = Z_NULL;
             state->mode = EXTRA;
+                /* fallthrough */
         case EXTRA:
             if (state->flags & 0x0400) {
                 copy = state->length;
                 if (copy > have) copy = have;
                 if (copy) {
                     if (state->head != Z_NULL &&
-                        state->head->extra != Z_NULL) {
-                        len = state->head->extra_len - state->length;
+                        state->head->extra != Z_NULL &&
+                        (len = state->head->extra_len - state->length) <
+                            state->head->extra_max) {
                         zmemcpy(state->head->extra + len, next,
                                 len + copy > state->head->extra_max ?
                                 state->head->extra_max - len : copy);
@@ -775,6 +746,7 @@ int flush;
             }
             state->length = 0;
             state->mode = NAME;
+                /* fallthrough */
         case NAME:
             if (state->flags & 0x0800) {
                 if (have == 0) goto inf_leave;
@@ -796,6 +768,7 @@ int flush;
                 state->head->name = Z_NULL;
             state->length = 0;
             state->mode = COMMENT;
+                /* fallthrough */
         case COMMENT:
             if (state->flags & 0x1000) {
                 if (have == 0) goto inf_leave;
@@ -816,6 +789,7 @@ int flush;
             else if (state->head != Z_NULL)
                 state->head->comment = Z_NULL;
             state->mode = HCRC;
+                /* fallthrough */
         case HCRC:
             if (state->flags & 0x0200) {
                 NEEDBITS(16);
@@ -839,6 +813,7 @@ int flush;
             strm->adler = state->check = ZSWAP32(hold);
             INITBITS();
             state->mode = DICT;
+                /* fallthrough */
         case DICT:
             if (state->havedict == 0) {
                 RESTORE();
@@ -846,8 +821,10 @@ int flush;
             }
             strm->adler = state->check = adler32(0L, Z_NULL, 0);
             state->mode = TYPE;
+                /* fallthrough */
         case TYPE:
             if (flush == Z_BLOCK || flush == Z_TREES) goto inf_leave;
+                /* fallthrough */
         case TYPEDO:
             if (state->last) {
                 BYTEBITS();
@@ -898,8 +875,10 @@ int flush;
             INITBITS();
             state->mode = COPY_;
             if (flush == Z_TREES) goto inf_leave;
+                /* fallthrough */
         case COPY_:
             state->mode = COPY;
+                /* fallthrough */
         case COPY:
             copy = state->length;
             if (copy) {
@@ -935,6 +914,7 @@ int flush;
             Tracev((stderr, "inflate:       table sizes ok\n"));
             state->have = 0;
             state->mode = LENLENS;
+                /* fallthrough */
         case LENLENS:
             while (state->have < state->ncode) {
                 NEEDBITS(3);
@@ -956,6 +936,7 @@ int flush;
             Tracev((stderr, "inflate:       code lengths ok\n"));
             state->have = 0;
             state->mode = CODELENS;
+                /* fallthrough */
         case CODELENS:
             while (state->have < state->nlen + state->ndist) {
                 for (;;) {
@@ -1015,11 +996,11 @@ int flush;
             }
 
             /* build code tables -- note: do not change the lenbits or distbits
-               values here (9 and 6) without reading the comments in inftrees.h
+               values here (10 and 9) without reading the comments in inftrees.h
                concerning the ENOUGH constants, which depend on those values */
             state->next = state->codes;
             state->lencode = (const code FAR *)(state->next);
-            state->lenbits = 9;
+            state->lenbits = 10;
             ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
                                 &(state->lenbits), state->work);
             if (ret) {
@@ -1028,7 +1009,7 @@ int flush;
                 break;
             }
             state->distcode = (const code FAR *)(state->next);
-            state->distbits = 6;
+            state->distbits = 9;
             ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
                             &(state->next), &(state->distbits), state->work);
             if (ret) {
@@ -1039,10 +1020,13 @@ int flush;
             Tracev((stderr, "inflate:       codes ok\n"));
             state->mode = LEN_;
             if (flush == Z_TREES) goto inf_leave;
+                /* fallthrough */
         case LEN_:
             state->mode = LEN;
+                /* fallthrough */
         case LEN:
-            if (have >= 6 && left >= 258) {
+            if (have >= INFLATE_FAST_MIN_INPUT &&
+                left >= INFLATE_FAST_MIN_OUTPUT) {
                 RESTORE();
                 inflate_fast(strm, out);
                 LOAD();
@@ -1090,6 +1074,7 @@ int flush;
             }
             state->extra = (unsigned)(here.op) & 15;
             state->mode = LENEXT;
+                /* fallthrough */
         case LENEXT:
             if (state->extra) {
                 NEEDBITS(state->extra);
@@ -1100,6 +1085,7 @@ int flush;
             Tracevv((stderr, "inflate:         length %u\n", state->length));
             state->was = state->length;
             state->mode = DIST;
+                /* fallthrough */
         case DIST:
             for (;;) {
                 here = state->distcode[BITS(state->distbits)];
@@ -1127,6 +1113,7 @@ int flush;
             state->offset = (unsigned)here.val;
             state->extra = (unsigned)(here.op) & 15;
             state->mode = DISTEXT;
+                /* fallthrough */
         case DISTEXT:
             if (state->extra) {
                 NEEDBITS(state->extra);
@@ -1143,6 +1130,7 @@ int flush;
 #endif
             Tracevv((stderr, "inflate:         distance %u\n", state->offset));
             state->mode = MATCH;
+                /* fallthrough */
         case MATCH:
             if (left == 0) goto inf_leave;
             copy = out - left;
@@ -1202,7 +1190,7 @@ int flush;
                 state->total += out;
                 if ((state->wrap & 4) && out)
                     strm->adler = state->check =
-                        UPDATE(state->check, put - out, out);
+                        UPDATE_CHECK(state->check, put - out, out);
                 out = left;
                 if ((state->wrap & 4) && (
 #ifdef GUNZIP
@@ -1218,10 +1206,11 @@ int flush;
             }
 #ifdef GUNZIP
             state->mode = LENGTH;
+                /* fallthrough */
         case LENGTH:
             if (state->wrap && state->flags) {
                 NEEDBITS(32);
-                if (hold != (state->total & 0xffffffffUL)) {
+                if ((state->wrap & 4) && hold != (state->total & 0xffffffff)) {
                     strm->msg = (char *)"incorrect length check";
                     state->mode = BAD;
                     break;
@@ -1231,6 +1220,7 @@ int flush;
             }
 #endif
             state->mode = DONE;
+                /* fallthrough */
         case DONE:
             ret = Z_STREAM_END;
             goto inf_leave;
@@ -1240,6 +1230,7 @@ int flush;
         case MEM:
             return Z_MEM_ERROR;
         case SYNC:
+                /* fallthrough */
         default:
             return Z_STREAM_ERROR;
         }
@@ -1265,7 +1256,7 @@ int flush;
     state->total += out;
     if ((state->wrap & 4) && out)
         strm->adler = state->check =
-            UPDATE(state->check, strm->next_out - out, out);
+            UPDATE_CHECK(state->check, strm->next_out - out, out);
     strm->data_type = (int)state->bits + (state->last ? 64 : 0) +
                       (state->mode == TYPE ? 128 : 0) +
                       (state->mode == LEN_ || state->mode == COPY_ ? 256 : 0);
@@ -1274,9 +1265,7 @@ int flush;
     return ret;
 }
 
-int ZEXPORT inflateEnd(strm)
-z_streamp strm;
-{
+int ZEXPORT inflateEnd(z_streamp strm) {
     struct inflate_state FAR *state;
     if (inflateStateCheck(strm))
         return Z_STREAM_ERROR;
@@ -1288,11 +1277,8 @@ z_streamp strm;
     return Z_OK;
 }
 
-int ZEXPORT inflateGetDictionary(strm, dictionary, dictLength)
-z_streamp strm;
-Bytef *dictionary;
-uInt *dictLength;
-{
+int ZEXPORT inflateGetDictionary(z_streamp strm, Bytef *dictionary,
+                                 uInt *dictLength) {
     struct inflate_state FAR *state;
 
     /* check state */
@@ -1311,11 +1297,8 @@ uInt *dictLength;
     return Z_OK;
 }
 
-int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength)
-z_streamp strm;
-const Bytef *dictionary;
-uInt dictLength;
-{
+int ZEXPORT inflateSetDictionary(z_streamp strm, const Bytef *dictionary,
+                                 uInt dictLength) {
     struct inflate_state FAR *state;
     unsigned long dictid;
     int ret;
@@ -1346,10 +1329,7 @@ uInt dictLength;
     return Z_OK;
 }
 
-int ZEXPORT inflateGetHeader(strm, head)
-z_streamp strm;
-gz_headerp head;
-{
+int ZEXPORT inflateGetHeader(z_streamp strm, gz_headerp head) {
     struct inflate_state FAR *state;
 
     /* check state */
@@ -1374,11 +1354,8 @@ gz_headerp head;
    called again with more data and the *have state.  *have is initialized to
    zero for the first call.
  */
-local unsigned syncsearch(have, buf, len)
-unsigned FAR *have;
-const unsigned char FAR *buf;
-unsigned len;
-{
+local unsigned syncsearch(unsigned FAR *have, const unsigned char FAR *buf,
+                          unsigned len) {
     unsigned got;
     unsigned next;
 
@@ -1397,10 +1374,9 @@ unsigned len;
     return next;
 }
 
-int ZEXPORT inflateSync(strm)
-z_streamp strm;
-{
+int ZEXPORT inflateSync(z_streamp strm) {
     unsigned len;               /* number of bytes to look at or looked at */
+    int flags;                  /* temporary to save header status */
     unsigned long in, out;      /* temporary to save total_in and total_out */
     unsigned char buf[4];       /* to restore bit buffer to byte string */
     struct inflate_state FAR *state;
@@ -1433,9 +1409,15 @@ z_streamp strm;
 
     /* return no joy or set up to restart inflate() on a new block */
     if (state->have != 4) return Z_DATA_ERROR;
+    if (state->flags == -1)
+        state->wrap = 0;    /* if no header yet, treat as raw */
+    else
+        state->wrap &= ~4;  /* no point in computing a check value now */
+    flags = state->flags;
     in = strm->total_in;  out = strm->total_out;
     inflateReset(strm);
     strm->total_in = in;  strm->total_out = out;
+    state->flags = flags;
     state->mode = TYPE;
     return Z_OK;
 }
@@ -1448,9 +1430,7 @@ z_streamp strm;
    block. When decompressing, PPP checks that at the end of input packet,
    inflate is waiting for these length bytes.
  */
-int ZEXPORT inflateSyncPoint(strm)
-z_streamp strm;
-{
+int ZEXPORT inflateSyncPoint(z_streamp strm) {
     struct inflate_state FAR *state;
 
     if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
@@ -1458,10 +1438,7 @@ z_streamp strm;
     return state->mode == STORED && state->bits == 0;
 }
 
-int ZEXPORT inflateCopy(dest, source)
-z_streamp dest;
-z_streamp source;
-{
+int ZEXPORT inflateCopy(z_streamp dest, z_streamp source) {
     struct inflate_state FAR *state;
     struct inflate_state FAR *copy;
     unsigned char FAR *window;
@@ -1505,10 +1482,7 @@ z_streamp source;
     return Z_OK;
 }
 
-int ZEXPORT inflateUndermine(strm, subvert)
-z_streamp strm;
-int subvert;
-{
+int ZEXPORT inflateUndermine(z_streamp strm, int subvert) {
     struct inflate_state FAR *state;
 
     if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
@@ -1523,24 +1497,19 @@ int subvert;
 #endif
 }
 
-int ZEXPORT inflateValidate(strm, check)
-z_streamp strm;
-int check;
-{
+int ZEXPORT inflateValidate(z_streamp strm, int check) {
     struct inflate_state FAR *state;
 
     if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
     state = (struct inflate_state FAR *)strm->state;
-    if (check)
+    if (check && state->wrap)
         state->wrap |= 4;
     else
         state->wrap &= ~4;
     return Z_OK;
 }
 
-long ZEXPORT inflateMark(strm)
-z_streamp strm;
-{
+long ZEXPORT inflateMark(z_streamp strm) {
     struct inflate_state FAR *state;
 
     if (inflateStateCheck(strm))
@@ -1551,9 +1520,7 @@ z_streamp strm;
             (state->mode == MATCH ? state->was - state->length : 0));
 }
 
-unsigned long ZEXPORT inflateCodesUsed(strm)
-z_streamp strm;
-{
+unsigned long ZEXPORT inflateCodesUsed(z_streamp strm) {
     struct inflate_state FAR *state;
     if (inflateStateCheck(strm)) return (unsigned long)-1;
     state = (struct inflate_state FAR *)strm->state;
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/inflate.h b/extern/crashpad/crashpad/third_party/zlib/zlib/inflate.h
index a46cce6b6d..f127b6b1fa 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/inflate.h
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/inflate.h
@@ -1,5 +1,5 @@
 /* inflate.h -- internal inflate state definition
- * Copyright (C) 1995-2016 Mark Adler
+ * Copyright (C) 1995-2019 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -86,7 +86,8 @@ struct inflate_state {
     int wrap;                   /* bit 0 true for zlib, bit 1 true for gzip,
                                    bit 2 true to validate check value */
     int havedict;               /* true if dictionary provided */
-    int flags;                  /* gzip header method and flags (0 if zlib) */
+    int flags;                  /* gzip header method and flags, 0 if zlib, or
+                                   -1 if raw or no header yet */
     unsigned dmax;              /* zlib header max distance (INFLATE_STRICT) */
     unsigned long check;        /* protected copy of check value */
     unsigned long total;        /* protected copy of output count */
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/inftrees.c b/extern/crashpad/crashpad/third_party/zlib/zlib/inftrees.c
index 2ea08fc13e..afc4c4212d 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/inftrees.c
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/inftrees.c
@@ -1,5 +1,5 @@
 /* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2017 Mark Adler
+ * Copyright (C) 1995-2022 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -9,7 +9,7 @@
 #define MAXBITS 15
 
 const char inflate_copyright[] =
-   " inflate 1.2.11 Copyright 1995-2017 Mark Adler ";
+   " inflate 1.2.13.1 Copyright 1995-2022 Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -29,14 +29,9 @@ const char inflate_copyright[] =
    table index bits.  It will differ if the request is greater than the
    longest code or if it is less than the shortest code.
  */
-int ZLIB_INTERNAL inflate_table(type, lens, codes, table, bits, work)
-codetype type;
-unsigned short FAR *lens;
-unsigned codes;
-code FAR * FAR *table;
-unsigned FAR *bits;
-unsigned short FAR *work;
-{
+int ZLIB_INTERNAL inflate_table(codetype type, unsigned short FAR *lens,
+                                unsigned codes, code FAR * FAR *table,
+                                unsigned FAR *bits, unsigned short FAR *work) {
     unsigned len;               /* a code's length in bits */
     unsigned sym;               /* index of code symbols */
     unsigned min, max;          /* minimum and maximum code lengths */
@@ -62,7 +57,7 @@ unsigned short FAR *work;
         35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
     static const unsigned short lext[31] = { /* Length codes 257..285 extra */
         16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
-        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 77, 202};
+        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 77, 76};
     static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
         1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
         257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/inftrees.h b/extern/crashpad/crashpad/third_party/zlib/zlib/inftrees.h
index baa53a0b1a..f11f29c076 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/inftrees.h
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/inftrees.h
@@ -36,17 +36,17 @@ typedef struct {
  */
 
 /* Maximum size of the dynamic table.  The maximum number of code structures is
-   1444, which is the sum of 852 for literal/length codes and 592 for distance
+   1924, which is the sum of 1332 for literal/length codes and 592 for distance
    codes.  These values were found by exhaustive searches using the program
-   examples/enough.c found in the zlib distribtution.  The arguments to that
+   examples/enough.c found in the zlib distribution.  The arguments to that
    program are the number of symbols, the initial root table size, and the
-   maximum bit length of a code.  "enough 286 9 15" for literal/length codes
-   returns returns 852, and "enough 30 6 15" for distance codes returns 592.
-   The initial root table size (9 or 6) is found in the fifth argument of the
+   maximum bit length of a code.  "enough 286 10 15" for literal/length codes
+   returns returns 1332, and "enough 30 9 15" for distance codes returns 592.
+   The initial root table size (10 or 9) is found in the fifth argument of the
    inflate_table() calls in inflate.c and infback.c.  If the root table size is
    changed, then these maximum sizes would be need to be recalculated and
    updated. */
-#define ENOUGH_LENS 852
+#define ENOUGH_LENS 1332
 #define ENOUGH_DISTS 592
 #define ENOUGH (ENOUGH_LENS+ENOUGH_DISTS)
 
@@ -57,6 +57,6 @@ typedef enum {
     DISTS
 } codetype;
 
-int ZLIB_INTERNAL inflate_table OF((codetype type, unsigned short FAR *lens,
-                             unsigned codes, code FAR * FAR *table,
-                             unsigned FAR *bits, unsigned short FAR *work));
+int ZLIB_INTERNAL inflate_table(codetype type, unsigned short FAR *lens,
+                                unsigned codes, code FAR * FAR *table,
+                                unsigned FAR *bits, unsigned short FAR *work);
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0000-build.patch b/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0000-build.patch
new file mode 100644
index 0000000000..6119f09c05
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0000-build.patch
@@ -0,0 +1,160 @@
+diff --git a/contrib/minizip/iowin32.c b/contrib/minizip/iowin32.c
+index 274f39eb1dd2..246ceb91a139 100644
+--- a/contrib/minizip/iowin32.c
++++ b/contrib/minizip/iowin32.c
+@@ -26,12 +26,19 @@
+ #endif
+ 
+ 
++#ifdef _WIN32_WINNT
++#undef _WIN32_WINNT
++#define _WIN32_WINNT 0x601
++#endif
++
++#if _WIN32_WINNT >= _WIN32_WINNT_WIN8
+ // see Include/shared/winapifamily.h in the Windows Kit
+ #if defined(WINAPI_FAMILY_PARTITION) && (!(defined(IOWIN32_USING_WINRT_API)))
+ #if WINAPI_FAMILY_ONE_PARTITION(WINAPI_FAMILY, WINAPI_PARTITION_APP)
+ #define IOWIN32_USING_WINRT_API 1
+ #endif
+ #endif
++#endif
+ 
+ voidpf  ZCALLBACK win32_open_file_func  OF((voidpf opaque, const char* filename, int mode));
+ uLong   ZCALLBACK win32_read_file_func  OF((voidpf opaque, voidpf stream, void* buf, uLong size));
+diff --git a/contrib/minizip/unzip.c b/contrib/minizip/unzip.c
+index bcfb9416ec35..199b4723fcfc 100644
+--- a/contrib/minizip/unzip.c
++++ b/contrib/minizip/unzip.c
+@@ -1705,11 +1705,6 @@ extern int ZEXPORT unzReadCurrentFile  (unzFile file, voidp buf, unsigned len)
+ 
+     pfile_in_zip_read_info->stream.avail_out = (uInt)len;
+ 
+-    if ((len>pfile_in_zip_read_info->rest_read_uncompressed) &&
+-        (!(pfile_in_zip_read_info->raw)))
+-        pfile_in_zip_read_info->stream.avail_out =
+-            (uInt)pfile_in_zip_read_info->rest_read_uncompressed;
+-
+     if ((len>pfile_in_zip_read_info->rest_read_compressed+
+            pfile_in_zip_read_info->stream.avail_in) &&
+          (pfile_in_zip_read_info->raw))
+diff --git a/gzread.c b/gzread.c
+index 956b91ea7d9e..832d3ef98c59 100644
+--- a/gzread.c
++++ b/gzread.c
+@@ -443,7 +443,11 @@ z_size_t ZEXPORT gzfread(buf, size, nitems, file)
+ #  undef z_gzgetc
+ #else
+ #  undef gzgetc
++#  ifdef Z_CR_PREFIX_SET
++#    define gzgetc Cr_z_gzgetc
++#  endif
+ #endif
++
+ int ZEXPORT gzgetc(file)
+     gzFile file;
+ {
+diff --git a/zconf.h b/zconf.h
+index 5e1d68a004e9..a7a815f575a7 100644
+--- a/zconf.h
++++ b/zconf.h
+@@ -8,6 +8,10 @@
+ #ifndef ZCONF_H
+ #define ZCONF_H
+ 
++/*
++ * This library is also built as a part of AOSP, which does not need to include
++ * chromeconf.h. This config does not want chromeconf.h, so it can set this
++ * macro to opt out. While this works today, there's no guarantee that building
++ * zlib outside of Chromium keeps working in the future.
++ */
++#if !defined(CHROMIUM_ZLIB_NO_CHROMECONF)
++/* This include does prefixing as below, but with an updated set of names.  Also
++ * sets up export macros in component builds. */
++#include "chromeconf.h"
++#endif
++
+ /*
+  * If you *really* need a unique prefix for all types and library functions,
+  * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
+@@ -431,7 +434,7 @@ typedef uLong FAR uLongf;
+    typedef unsigned long z_crc_t;
+ #endif
+ 
+-#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
++#if !defined(_WIN32)
+ #  define Z_HAVE_UNISTD_H
+ #endif
+ 
+diff --git a/zlib.h b/zlib.h
+index f09cdaf1e054..99fd467f6b1a 100644
+--- a/zlib.h
++++ b/zlib.h
+@@ -1824,6 +1824,11 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
+ #  undef z_gzgetc
+ #  define z_gzgetc(g) \
+           ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
++#elif defined(Z_CR_PREFIX_SET)
++#    undef gzgetc
++#    define gzgetc(g) \
++          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) \
++                     : (Cr_z_gzgetc)(g))
+ #else
+ #  define gzgetc(g) \
+           ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
+@@ -1853,11 +1858,29 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
+ #    define z_adler32_combine z_adler32_combine64
+ #    define z_crc32_combine z_crc32_combine64
+ #  else
++#    ifdef gzopen
++#      undef gzopen
++#    endif
+ #    define gzopen gzopen64
++#    ifdef gzseek
++#      undef gzseek
++#    endif
+ #    define gzseek gzseek64
++#    ifdef gztell
++#      undef gztell
++#    endif
+ #    define gztell gztell64
++#    ifdef gzoffset
++#      undef gzoffset
++#    endif
+ #    define gzoffset gzoffset64
++#    ifdef adler32_combine
++#      undef adler32_combine
++#    endif
+ #    define adler32_combine adler32_combine64
++#    ifdef crc32_combine
++#      undef crc32_combine
++#    endif
+ #    define crc32_combine crc32_combine64
+ #  endif
+ #  ifndef Z_LARGE64
+diff --git a/zutil.h b/zutil.h
+index b079ea6a80f5..80375b8b6109 100644
+--- a/zutil.h
++++ b/zutil.h
+@@ -28,6 +28,21 @@
+ #  include <string.h>
+ #  include <stdlib.h>
+ #endif
++#ifdef NO_ERRNO_H
++#   ifdef _WIN32_WCE
++      /* The Microsoft C Run-Time Library for Windows CE doesn't have
++       * errno.  We define it as a global variable to simplify porting.
++       * Its value is always 0 and should not be used.  We rename it to
++       * avoid conflict with other libraries that use the same workaround.
++       */
++#     define errno z_errno
++#   endif
++    extern int errno;
++#else
++#  ifndef _WIN32_WCE
++#    include <errno.h>
++#  endif
++#endif
+ 
+ #ifdef Z_SOLO
+    typedef long ptrdiff_t;  /* guess -- will be caught if guess is wrong */
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/simd.patch b/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0001-simd.patch
similarity index 97%
rename from extern/crashpad/crashpad/third_party/zlib/zlib/simd.patch
rename to extern/crashpad/crashpad/third_party/zlib/zlib/patches/0001-simd.patch
index 75828d26ea..9434ca0cc4 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/simd.patch
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0001-simd.patch
@@ -559,7 +559,7 @@ index 1ec761448de9..aa0c9c67a6dc 100644
  local void putShortMSB    OF((deflate_state *s, uInt b));
  local void flush_pending  OF((z_streamp strm));
 -local unsigned read_buf   OF((z_streamp strm, Bytef *buf, unsigned size));
-+unsigned ZLIB_INTERNAL read_buf OF((z_streamp strm, Bytef *buf, unsigned size));
++unsigned ZLIB_INTERNAL deflate_read_buf OF((z_streamp strm, Bytef *buf, unsigned size));
  #ifdef ASMV
  #  pragma message("Assembler code may have bugs -- use at your own risk")
        void match_init OF((void)); /* asm code initialization */
@@ -703,7 +703,7 @@ index 1ec761448de9..aa0c9c67a6dc 100644
   * (See also flush_pending()).
   */
 -local unsigned read_buf(strm, buf, size)
-+ZLIB_INTERNAL unsigned read_buf(strm, buf, size)
++ZLIB_INTERNAL unsigned deflate_read_buf(strm, buf, size)
      z_streamp strm;
      Bytef *buf;
      unsigned size;
@@ -859,7 +859,7 @@ new file mode 100644
 index 000000000000..949ccce1ba9c
 --- /dev/null
 +++ b/fill_window_sse.c
-@@ -0,0 +1,175 @@
+@@ -0,0 +1,177 @@
 +/*
 + * Fill Window with SSE2-optimized hash shifting
 + *
@@ -888,7 +888,7 @@ index 000000000000..949ccce1ba9c
 +        }\
 +    }\
 +
-+extern int read_buf OF((z_streamp strm, Bytef *buf, unsigned size));
++extern int deflate_read_buf OF((z_streamp strm, Bytef *buf, unsigned size));
 +
 +void fill_window_sse(deflate_state *s)
 +{
@@ -979,7 +979,9 @@ index 000000000000..949ccce1ba9c
 +         */
 +        Assert(more >= 2, "more < 2");
 +
-+        n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
++        n = deflate_read_buf(s->strm,
++                             s->window + s->strstart + s->lookahead,
++                             more);
 +        s->lookahead += n;
 +
 +        /* Initialize the hash value now that we have some input: */
@@ -1035,27 +1037,6 @@ index 000000000000..949ccce1ba9c
 +    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
 +           "not enough room for search");
 +}
-diff --git a/names.h b/names.h
-index f18df5684dc5..3436baa4eb57 100644
---- a/names.h
-+++ b/names.h
-@@ -152,4 +152,16 @@
- /* An exported symbol that isn't handled by Z_PREFIX in zconf.h */
- #define z_errmsg Cr_z_z_errmsg
- 
-+/* Symbols added in simd.patch */
-+#define copy_with_crc Cr_z_copy_with_crc
-+#define crc_finalize Cr_z_crc_finalize
-+#define crc_fold_512to32 Cr_z_crc_fold_512to32
-+#define crc_fold_copy Cr_z_crc_fold_copy
-+#define crc_fold_init Cr_z_crc_fold_init
-+#define crc_reset Cr_z_crc_reset
-+#define fill_window_sse Cr_z_fill_window_sse
-+#define read_buf Cr_z_read_buf
-+#define x86_check_features Cr_z_x86_check_features
-+#define x86_cpu_enable_simd Cr_z_x86_cpu_enable_simd
-+
- #endif  /* THIRD_PARTY_ZLIB_NAMES_H_ */
 diff --git a/simd_stub.c b/simd_stub.c
 new file mode 100644
 index 000000000000..c6d46051498f
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0002-uninitializedcheck.patch b/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0002-uninitializedcheck.patch
new file mode 100644
index 0000000000..7c497839d3
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0002-uninitializedcheck.patch
@@ -0,0 +1,27 @@
+From 1a03e7aec95d89c659fd91f195b99893b6458cd7 Mon Sep 17 00:00:00 2001
+From: Adenilson Cavalcanti <adenilson.cavalcanti@arm.com>
+Date: Wed, 27 Sep 2017 13:59:04 -0700
+Subject: [PATCH] Zlib patch: prevent uninitialized use of state->check
+
+No need to call the Adler32 checksum function, just set
+the struct field to the expected value.
+
+Upstream bug: madler/zlib#245
+---
+ third_party/zlib/inflate.c                             |  2 +-
+ 1 files changed, 1 insertion(+), 1 deletions(-)
+ delete mode 100644 third_party/zlib/patches/0002-uninitializedcheck.patch
+
+diff --git a/third_party/zlib/inflate.c b/third_party/zlib/inflate.c
+index bec9497..5c40cf1 100644
+--- a/third_party/zlib/inflate.c
++++ b/third_party/zlib/inflate.c
+@@ -228,7 +228,7 @@ int stream_size;
+     state->strm = strm;
+     state->window = Z_NULL;
+     state->mode = HEAD;     /* to pass state test in inflateReset2() */
+-    state->check = adler32(0L, Z_NULL, 0);
++    state->check = 1L;      /* 1L is the result of adler32() zero length data */
+     ret = inflateReset2(strm, windowBits);
+     if (ret != Z_OK) {
+         ZFREE(strm, state);
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0003-uninitializedjump.patch b/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0003-uninitializedjump.patch
new file mode 100644
index 0000000000..7aae3238a5
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0003-uninitializedjump.patch
@@ -0,0 +1,15 @@
+diff --git a/third_party/zlib/deflate.c b/third_party/zlib/deflate.c
+index a39e62787862..c6053fd1c7ea 100644
+--- a/third_party/zlib/deflate.c
++++ b/third_party/zlib/deflate.c
+@@ -318,6 +318,10 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+                                  s->w_size + window_padding,
+                                  2*sizeof(Byte));
+     s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));
++    /* Avoid use of uninitialized value, see:
++     * https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11360
++     */
++    zmemzero(s->prev, s->w_size * sizeof(Pos));
+     s->head   = (Posf *)  ZALLOC(strm, s->hash_size, sizeof(Pos));
+ 
+     s->high_water = 0;      /* nothing written to s->window yet */
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0004-fix-uwp.patch b/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0004-fix-uwp.patch
new file mode 100644
index 0000000000..23145a7ae5
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0004-fix-uwp.patch
@@ -0,0 +1,22 @@
+diff --git a/third_party/zlib/contrib/minizip/iowin32.c b/third_party/zlib/contrib/minizip/iowin32.c
+index 246ceb91a139..c6bc314b3c28 100644
+--- a/third_party/zlib/contrib/minizip/iowin32.c
++++ b/third_party/zlib/contrib/minizip/iowin32.c
+@@ -31,14 +31,12 @@
+ #define _WIN32_WINNT 0x601
+ #endif
+ 
+-#if _WIN32_WINNT >= _WIN32_WINNT_WIN8
+-// see Include/shared/winapifamily.h in the Windows Kit
+-#if defined(WINAPI_FAMILY_PARTITION) && (!(defined(IOWIN32_USING_WINRT_API)))
+-#if WINAPI_FAMILY_ONE_PARTITION(WINAPI_FAMILY, WINAPI_PARTITION_APP)
++#if !defined(IOWIN32_USING_WINRT_API)
++#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
++// Windows Store or Universal Windows Platform
+ #define IOWIN32_USING_WINRT_API 1
+ #endif
+ #endif
+-#endif
+ 
+ voidpf  ZCALLBACK win32_open_file_func  OF((voidpf opaque, const char* filename, int mode));
+ uLong   ZCALLBACK win32_read_file_func  OF((voidpf opaque, voidpf stream, void* buf, uLong size));
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0005-infcover-gtest.patch b/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0005-infcover-gtest.patch
new file mode 100644
index 0000000000..f5443bd7d8
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0005-infcover-gtest.patch
@@ -0,0 +1,405 @@
+From 409594639f15d825202971db7a275023e05772ff Mon Sep 17 00:00:00 2001
+From: Adenilson Cavalcanti <adenilson.cavalcanti@arm.com>
+Date: Tue, 28 Apr 2020 10:48:01 -0700
+Subject: [PATCH] Local Changes:   - make C tests build as C++ code so we can
+ use gtest.   - use gtest EXPECT_TRUE instead of C assert.   - replace C
+ streams for C++ (portability issues).
+
+---
+ test/infcover.c | 167 ++++++++++++++++++++++++++----------------------
+ 1 file changed, 90 insertions(+), 77 deletions(-)
+
+diff --git a/test/infcover.c b/test/infcover.c
+index 2be0164..a8c51c7 100644
+--- a/test/infcover.c
++++ b/test/infcover.c
+@@ -4,11 +4,12 @@
+  */
+ 
+ /* to use, do: ./configure --cover && make cover */
+-
++// clang-format off
++#include "infcover.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <assert.h>
++
+ #include "zlib.h"
+ 
+ /* get definition of internal structure so we can mess with it (see pull()),
+@@ -17,8 +18,22 @@
+ #include "inftrees.h"
+ #include "inflate.h"
+ 
++/* XXX: use C++ streams instead of printf/fputs/etc due to portability
++ * as type sizes can vary between platforms.
++ */
++#include <iostream>
+ #define local static
+ 
++/* XXX: hacking C assert and plugging into GTest. */
++#include "gtest.h"
++#if defined(assert)
++#undef assert
++#define assert EXPECT_TRUE
++#endif
++
++/* XXX: handle what is a reserved word in C++. */
++#define try try_f
++
+ /* -- memory tracking routines -- */
+ 
+ /*
+@@ -72,7 +87,7 @@ local void *mem_alloc(void *mem, unsigned count, unsigned size)
+ {
+     void *ptr;
+     struct mem_item *item;
+-    struct mem_zone *zone = mem;
++    struct mem_zone *zone = static_cast<struct mem_zone *>(mem);
+     size_t len = count * (size_t)size;
+ 
+     /* induced allocation failure */
+@@ -87,7 +102,7 @@ local void *mem_alloc(void *mem, unsigned count, unsigned size)
+     memset(ptr, 0xa5, len);
+ 
+     /* create a new item for the list */
+-    item = malloc(sizeof(struct mem_item));
++    item = static_cast<struct mem_item *>(malloc(sizeof(struct mem_item)));
+     if (item == NULL) {
+         free(ptr);
+         return NULL;
+@@ -112,7 +127,7 @@ local void *mem_alloc(void *mem, unsigned count, unsigned size)
+ local void mem_free(void *mem, void *ptr)
+ {
+     struct mem_item *item, *next;
+-    struct mem_zone *zone = mem;
++    struct mem_zone *zone = static_cast<struct mem_zone *>(mem);
+ 
+     /* if no zone, just do a free */
+     if (zone == NULL) {
+@@ -159,7 +174,7 @@ local void mem_setup(z_stream *strm)
+ {
+     struct mem_zone *zone;
+ 
+-    zone = malloc(sizeof(struct mem_zone));
++    zone = static_cast<struct mem_zone *>(malloc(sizeof(struct mem_zone)));
+     assert(zone != NULL);
+     zone->first = NULL;
+     zone->total = 0;
+@@ -175,33 +190,33 @@ local void mem_setup(z_stream *strm)
+ /* set a limit on the total memory allocation, or 0 to remove the limit */
+ local void mem_limit(z_stream *strm, size_t limit)
+ {
+-    struct mem_zone *zone = strm->opaque;
++    struct mem_zone *zone = static_cast<struct mem_zone *>(strm->opaque);
+ 
+     zone->limit = limit;
+ }
+ 
+ /* show the current total requested allocations in bytes */
+-local void mem_used(z_stream *strm, char *prefix)
++local void mem_used(z_stream *strm, const char *prefix)
+ {
+-    struct mem_zone *zone = strm->opaque;
++    struct mem_zone *zone = static_cast<struct mem_zone *>(strm->opaque);
+ 
+-    fprintf(stderr, "%s: %lu allocated\n", prefix, zone->total);
++    std::cout << prefix << ": " << zone->total << " allocated" << std::endl;
+ }
+ 
+ /* show the high water allocation in bytes */
+-local void mem_high(z_stream *strm, char *prefix)
++local void mem_high(z_stream *strm, const char *prefix)
+ {
+-    struct mem_zone *zone = strm->opaque;
++    struct mem_zone *zone = static_cast<struct mem_zone *>(strm->opaque);
+ 
+-    fprintf(stderr, "%s: %lu high water mark\n", prefix, zone->highwater);
++    std::cout << prefix << ": " << zone->highwater << " high water mark" << std::endl;
+ }
+ 
+ /* release the memory allocation zone -- if there are any surprises, notify */
+-local void mem_done(z_stream *strm, char *prefix)
++local void mem_done(z_stream *strm, const char *prefix)
+ {
+     int count = 0;
+     struct mem_item *item, *next;
+-    struct mem_zone *zone = strm->opaque;
++    struct mem_zone *zone = static_cast<struct mem_zone *>(strm->opaque);
+ 
+     /* show high water mark */
+     mem_high(strm, prefix);
+@@ -218,13 +233,20 @@ local void mem_done(z_stream *strm, char *prefix)
+ 
+     /* issue alerts about anything unexpected */
+     if (count || zone->total)
+-        fprintf(stderr, "** %s: %lu bytes in %d blocks not freed\n",
+-                prefix, zone->total, count);
++        std::cout << "** " << prefix << ": "
++                  << zone->total << " bytes in "
++                  << count << " blocks not freed"
++                  << std::endl;
++
+     if (zone->notlifo)
+-        fprintf(stderr, "** %s: %d frees not LIFO\n", prefix, zone->notlifo);
++        std::cout << "** " << prefix << ": "
++                  << zone->notlifo << " frees not LIFO"
++                  << std::endl;
++
+     if (zone->rogue)
+-        fprintf(stderr, "** %s: %d frees not recognized\n",
+-                prefix, zone->rogue);
++        std::cout << "** " << prefix << ": "
++                  << zone->rogue << " frees not recognized"
++                  << std::endl;
+ 
+     /* free the zone and delete from the stream */
+     free(zone);
+@@ -247,7 +269,7 @@ local unsigned char *h2b(const char *hex, unsigned *len)
+     unsigned char *in, *re;
+     unsigned next, val;
+ 
+-    in = malloc((strlen(hex) + 1) >> 1);
++    in = static_cast<unsigned char *>(malloc((strlen(hex) + 1) >> 1));
+     if (in == NULL)
+         return NULL;
+     next = 0;
+@@ -268,7 +290,7 @@ local unsigned char *h2b(const char *hex, unsigned *len)
+     } while (*hex++);       /* go through the loop with the terminating null */
+     if (len != NULL)
+         *len = next;
+-    re = realloc(in, next);
++    re = static_cast<unsigned char *>(realloc(in, next));
+     return re == NULL ? in : re;
+ }
+ 
+@@ -281,7 +303,7 @@ local unsigned char *h2b(const char *hex, unsigned *len)
+    header information is collected with inflateGetHeader().  If a zlib stream
+    is looking for a dictionary, then an empty dictionary is provided.
+    inflate() is run until all of the input data is consumed. */
+-local void inf(char *hex, char *what, unsigned step, int win, unsigned len,
++local void inf(const char *hex, const char *what, unsigned step, int win, unsigned len,
+                int err)
+ {
+     int ret;
+@@ -298,7 +320,7 @@ local void inf(char *hex, char *what, unsigned step, int win, unsigned len,
+         mem_done(&strm, what);
+         return;
+     }
+-    out = malloc(len);                          assert(out != NULL);
++    out = static_cast<unsigned char *>(malloc(len));                          assert(out != NULL);
+     if (win == 47) {
+         head.extra = out;
+         head.extra_max = len;
+@@ -347,7 +369,7 @@ local void inf(char *hex, char *what, unsigned step, int win, unsigned len,
+ }
+ 
+ /* cover all of the lines in inflate.c up to inflate() */
+-local void cover_support(void)
++void cover_support(void)
+ {
+     int ret;
+     z_stream strm;
+@@ -381,11 +403,11 @@ local void cover_support(void)
+     strm.next_in = Z_NULL;
+     ret = inflateInit(&strm);                   assert(ret == Z_OK);
+     ret = inflateEnd(&strm);                    assert(ret == Z_OK);
+-    fputs("inflate built-in memory routines\n", stderr);
++    std::cout << "inflate built-in memory routines" << std::endl;;
+ }
+ 
+ /* cover all inflate() header and trailer cases and code after inflate() */
+-local void cover_wrap(void)
++void cover_wrap(void)
+ {
+     int ret;
+     z_stream strm, copy;
+@@ -394,7 +416,7 @@ local void cover_wrap(void)
+     ret = inflate(Z_NULL, 0);                   assert(ret == Z_STREAM_ERROR);
+     ret = inflateEnd(Z_NULL);                   assert(ret == Z_STREAM_ERROR);
+     ret = inflateCopy(Z_NULL, Z_NULL);          assert(ret == Z_STREAM_ERROR);
+-    fputs("inflate bad parameters\n", stderr);
++    std::cout << "inflate bad parameters" << std::endl;
+ 
+     inf("1f 8b 0 0", "bad gzip method", 0, 31, 0, Z_DATA_ERROR);
+     inf("1f 8b 8 80", "bad gzip flags", 0, 31, 0, Z_DATA_ERROR);
+@@ -415,9 +437,9 @@ local void cover_wrap(void)
+     strm.next_in = Z_NULL;
+     ret = inflateInit2(&strm, -8);
+     strm.avail_in = 2;
+-    strm.next_in = (void *)"\x63";
++    strm.next_in = (Bytef *)"\x63";
+     strm.avail_out = 1;
+-    strm.next_out = (void *)&ret;
++    strm.next_out = (Bytef *)&ret;
+     mem_limit(&strm, 1);
+     ret = inflate(&strm, Z_NO_FLUSH);           assert(ret == Z_MEM_ERROR);
+     ret = inflate(&strm, Z_NO_FLUSH);           assert(ret == Z_MEM_ERROR);
+@@ -428,11 +450,11 @@ local void cover_wrap(void)
+     mem_limit(&strm, (sizeof(struct inflate_state) << 1) + 256);
+     ret = inflatePrime(&strm, 16, 0);           assert(ret == Z_OK);
+     strm.avail_in = 2;
+-    strm.next_in = (void *)"\x80";
++    strm.next_in = (Bytef *)"\x80";
+     ret = inflateSync(&strm);                   assert(ret == Z_DATA_ERROR);
+     ret = inflate(&strm, Z_NO_FLUSH);           assert(ret == Z_STREAM_ERROR);
+     strm.avail_in = 4;
+-    strm.next_in = (void *)"\0\0\xff\xff";
++    strm.next_in = (Bytef *)"\0\0\xff\xff";
+     ret = inflateSync(&strm);                   assert(ret == Z_OK);
+     (void)inflateSyncPoint(&strm);
+     ret = inflateCopy(&copy, &strm);            assert(ret == Z_MEM_ERROR);
+@@ -454,7 +476,7 @@ local unsigned pull(void *desc, unsigned char **buf)
+         next = 0;
+         return 0;   /* no input (already provided at next_in) */
+     }
+-    state = (void *)((z_stream *)desc)->state;
++    state = reinterpret_cast<struct inflate_state *>(((z_stream *)desc)->state);
+     if (state != Z_NULL)
+         state->mode = SYNC;     /* force an otherwise impossible situation */
+     return next < sizeof(dat) ? (*buf = dat + next++, 1) : 0;
+@@ -467,7 +489,7 @@ local int push(void *desc, unsigned char *buf, unsigned len)
+ }
+ 
+ /* cover inflateBack() up to common deflate data cases and after those */
+-local void cover_back(void)
++void cover_back(void)
+ {
+     int ret;
+     z_stream strm;
+@@ -479,17 +501,17 @@ local void cover_back(void)
+     ret = inflateBack(Z_NULL, Z_NULL, Z_NULL, Z_NULL, Z_NULL);
+                                                 assert(ret == Z_STREAM_ERROR);
+     ret = inflateBackEnd(Z_NULL);               assert(ret == Z_STREAM_ERROR);
+-    fputs("inflateBack bad parameters\n", stderr);
++    std::cout << "inflateBack bad parameters" << std::endl;;
+ 
+     mem_setup(&strm);
+     ret = inflateBackInit(&strm, 15, win);      assert(ret == Z_OK);
+     strm.avail_in = 2;
+-    strm.next_in = (void *)"\x03";
++    strm.next_in = (Bytef *)"\x03";
+     ret = inflateBack(&strm, pull, Z_NULL, push, Z_NULL);
+                                                 assert(ret == Z_STREAM_END);
+         /* force output error */
+     strm.avail_in = 3;
+-    strm.next_in = (void *)"\x63\x00";
++    strm.next_in = (Bytef *)"\x63\x00";
+     ret = inflateBack(&strm, pull, Z_NULL, push, &strm);
+                                                 assert(ret == Z_BUF_ERROR);
+         /* force mode error by mucking with state */
+@@ -500,11 +522,11 @@ local void cover_back(void)
+ 
+     ret = inflateBackInit(&strm, 15, win);      assert(ret == Z_OK);
+     ret = inflateBackEnd(&strm);                assert(ret == Z_OK);
+-    fputs("inflateBack built-in memory routines\n", stderr);
++    std::cout << "inflateBack built-in memory routines" << std::endl;;
+ }
+ 
+ /* do a raw inflate of data in hexadecimal with both inflate and inflateBack */
+-local int try(char *hex, char *id, int err)
++local int try(const char *hex, const char *id, int err)
+ {
+     int ret;
+     unsigned len, size;
+@@ -518,11 +540,11 @@ local int try(char *hex, char *id, int err)
+ 
+     /* allocate work areas */
+     size = len << 3;
+-    out = malloc(size);
++    out = static_cast<unsigned char *>(malloc(size));
+     assert(out != NULL);
+-    win = malloc(32768);
++    win = static_cast<unsigned char *>(malloc(32768));
+     assert(win != NULL);
+-    prefix = malloc(strlen(id) + 6);
++    prefix = static_cast<char *>(malloc(strlen(id) + 6));
+     assert(prefix != NULL);
+ 
+     /* first with inflate */
+@@ -578,7 +600,7 @@ local int try(char *hex, char *id, int err)
+ }
+ 
+ /* cover deflate data cases in both inflate() and inflateBack() */
+-local void cover_inflate(void)
++void cover_inflate(void)
+ {
+     try("0 0 0 0 0", "invalid stored block lengths", 1);
+     try("3 0", "fixed", 0);
+@@ -613,32 +635,33 @@ local void cover_inflate(void)
+     inf("63 18 5 40 c 0", "window wrap", 3, -8, 300, Z_OK);
+ }
+ 
++/* XXX(cavalcantii): fix linking error due inflate_table. */
+ /* cover remaining lines in inftrees.c */
+-local void cover_trees(void)
+-{
+-    int ret;
+-    unsigned bits;
+-    unsigned short lens[16], work[16];
+-    code *next, table[ENOUGH_DISTS];
+-
+-    /* we need to call inflate_table() directly in order to manifest not-
+-       enough errors, since zlib insures that enough is always enough */
+-    for (bits = 0; bits < 15; bits++)
+-        lens[bits] = (unsigned short)(bits + 1);
+-    lens[15] = 15;
+-    next = table;
+-    bits = 15;
+-    ret = inflate_table(DISTS, lens, 16, &next, &bits, work);
+-                                                assert(ret == 1);
+-    next = table;
+-    bits = 1;
+-    ret = inflate_table(DISTS, lens, 16, &next, &bits, work);
+-                                                assert(ret == 1);
+-    fputs("inflate_table not enough errors\n", stderr);
+-}
++/* void cover_trees(void) */
++/* { */
++/*     int ret; */
++/*     unsigned bits; */
++/*     unsigned short lens[16], work[16]; */
++/*     code *next, table[ENOUGH_DISTS]; */
++
++/*     /\* we need to call inflate_table() directly in order to manifest not- */
++/*        enough errors, since zlib insures that enough is always enough *\/ */
++/*     for (bits = 0; bits < 15; bits++) */
++/*         lens[bits] = (unsigned short)(bits + 1); */
++/*     lens[15] = 15; */
++/*     next = table; */
++/*     bits = 15; */
++/*     ret = inflate_table(DISTS, lens, 16, &next, &bits, work); */
++/*                                                 assert(ret == 1); */
++/*     next = table; */
++/*     bits = 1; */
++/*     ret = inflate_table(DISTS, lens, 16, &next, &bits, work); */
++/*                                                 assert(ret == 1); */
++/*     fputs("inflate_table not enough errors\n", stderr); */
++/* } */
+ 
+ /* cover remaining inffast.c decoding and window copying */
+-local void cover_fast(void)
++void cover_fast(void)
+ {
+     inf("e5 e0 81 ad 6d cb b2 2c c9 01 1e 59 63 ae 7d ee fb 4d fd b5 35 41 68"
+         " ff 7f 0f 0 0 0", "fast length extra bits", 0, -8, 258, Z_DATA_ERROR);
+@@ -658,14 +681,4 @@ local void cover_fast(void)
+         Z_STREAM_END);
+ }
+ 
+-int main(void)
+-{
+-    fprintf(stderr, "%s\n", zlibVersion());
+-    cover_support();
+-    cover_wrap();
+-    cover_back();
+-    cover_inflate();
+-    cover_trees();
+-    cover_fast();
+-    return 0;
+-}
++// clang-format on
+-- 
+2.21.1 (Apple Git-122.3)
+
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0006-fix-check_match.patch b/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0006-fix-check_match.patch
new file mode 100644
index 0000000000..b21c363b1e
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0006-fix-check_match.patch
@@ -0,0 +1,42 @@
+From 8304bdda5293ffd5b3efce8e4f54904b387029d6 Mon Sep 17 00:00:00 2001
+From: Hans Wennborg <hans@chromium.org>
+Date: Wed, 23 Sep 2020 16:36:38 +0200
+Subject: [PATCH] Avoid crashing in check_match when prev_match == -1
+
+prev_match can be set to -1 after sliding the window. In that case, the
+window has slid past the first byte of the last match, which means it
+cannot be compared in check_match.
+
+This would cause zlib to crash on some inputs to deflate when built
+with ZLIB_DEBUG enabled.
+
+Check for this situation and avoid crashing by not trying to compare
+the first byte.
+
+Bug: 1113142
+---
+ third_party/zlib/deflate.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/third_party/zlib/deflate.c b/third_party/zlib/deflate.c
+index cfdd2f46b230..d70732ec6fc2 100644
+--- a/third_party/zlib/deflate.c
++++ b/third_party/zlib/deflate.c
+@@ -2060,7 +2060,13 @@ local block_state deflate_slow(s, flush)
+             uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
+             /* Do not insert strings in hash table beyond this. */
+ 
+-            check_match(s, s->strstart-1, s->prev_match, s->prev_length);
++            if (s->prev_match == -1) {
++                /* The window has slid one byte past the previous match,
++                 * so the first byte cannot be compared. */
++                check_match(s, s->strstart, s->prev_match+1, s->prev_length-1);
++            } else {
++                check_match(s, s->strstart-1, s->prev_match, s->prev_length);
++            }
+ 
+             _tr_tally_dist(s, s->strstart -1 - s->prev_match,
+                            s->prev_length - MIN_MATCH, bflush);
+-- 
+2.28.0.681.g6f77f65b4e-goog
+
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0007-zero-init-deflate-window.patch b/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0007-zero-init-deflate-window.patch
new file mode 100644
index 0000000000..9dbbf53a8c
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0007-zero-init-deflate-window.patch
@@ -0,0 +1,40 @@
+From 92537ee19784e0e545f06d89b7d89ab532a18cff Mon Sep 17 00:00:00 2001
+From: Hans Wennborg <hans@chromium.org>
+Date: Tue, 3 Nov 2020 15:54:09 +0100
+Subject: [PATCH] [zlib] Zero-initialize the window used for deflation
+
+Otherwise MSan complains about use-of-uninitialized values in the
+window.
+This happens in both regular deflate's longest_match and deflate_rle.
+
+Before crrev.com/822755 we used to suppress those reports, but it seems
+better to fix it properly. That will also allow us to catch other
+potential issues with MSan in these functions.
+
+The instances of this that we've seen only reproduce with
+fill_window_sse(), not with the regular fill_window() function. Since
+the former doesn't exist in upstream zlib, I'm not planning to send this
+patch upstream.
+
+Bug: 1137613, 1144420
+---
+ third_party/zlib/deflate.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/third_party/zlib/deflate.c b/third_party/zlib/deflate.c
+index 8bf93e524875..fc7ae45905ff 100644
+--- a/third_party/zlib/deflate.c
++++ b/third_party/zlib/deflate.c
+@@ -321,6 +321,9 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+     s->window = (Bytef *) ZALLOC(strm,
+                                  s->w_size + window_padding,
+                                  2*sizeof(Byte));
++    /* Avoid use of unitialized values in the window, see crbug.com/1137613 and
++     * crbug.com/1144420 */
++    zmemzero(s->window, (s->w_size + window_padding) * (2 * sizeof(Byte)));
+     s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));
+     /* Avoid use of uninitialized value, see:
+      * https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11360
+-- 
+2.29.1.341.ge80a0c044ae-goog
+
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0008-minizip-zip-unzip-tools.patch b/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0008-minizip-zip-unzip-tools.patch
new file mode 100644
index 0000000000..48ceb02d4c
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0008-minizip-zip-unzip-tools.patch
@@ -0,0 +1,98 @@
+From 0c7de17000659f4f79de878296892c46be0aff77 Mon Sep 17 00:00:00 2001
+From: Noel Gordon <noel@chromium.org>
+Date: Wed, 26 May 2021 21:57:43 +1000
+Subject: [PATCH] Build minizip zip and unzip tools
+
+---
+ third_party/zlib/contrib/minizip/miniunz.c | 13 ++++++-------
+ third_party/zlib/contrib/minizip/minizip.c |  7 +++----
+ 2 files changed, 9 insertions(+), 11 deletions(-)
+
+diff --git a/third_party/zlib/contrib/minizip/miniunz.c b/third_party/zlib/contrib/minizip/miniunz.c
+index 3d65401be5cd..08737f689a96 100644
+--- a/third_party/zlib/contrib/minizip/miniunz.c
++++ b/third_party/zlib/contrib/minizip/miniunz.c
+@@ -12,7 +12,7 @@
+          Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+ */
+
+-#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
++#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__)) && (!defined(__ANDROID_API__))
+         #ifndef __USE_FILE_OFFSET64
+                 #define __USE_FILE_OFFSET64
+         #endif
+@@ -27,7 +27,7 @@
+         #endif
+ #endif
+
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__Fuchsia__) || defined(__ANDROID_API__)
+ // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
+ #define FOPEN_FUNC(filename, mode) fopen(filename, mode)
+ #define FTELLO_FUNC(stream) ftello(stream)
+@@ -45,6 +45,7 @@
+ #include <time.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#include <sys/stat.h>
+
+ #ifdef _WIN32
+ # include <direct.h>
+@@ -97,7 +98,7 @@ void change_file_date(filename,dosdate,tmu_date)
+   SetFileTime(hFile,&ftm,&ftLastAcc,&ftm);
+   CloseHandle(hFile);
+ #else
+-#ifdef unix || __APPLE__
++#if defined(unix) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__ANDROID_API__)
+   struct utimbuf ut;
+   struct tm newdate;
+   newdate.tm_sec = tmu_date.tm_sec;
+@@ -125,11 +126,9 @@ int mymkdir(dirname)
+     const char* dirname;
+ {
+     int ret=0;
+-#ifdef _WIN32
++#if defined(_WIN32)
+     ret = _mkdir(dirname);
+-#elif unix
+-    ret = mkdir (dirname,0775);
+-#elif __APPLE__
++#elif defined(unix) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__ANDROID_API__)
+     ret = mkdir (dirname,0775);
+ #endif
+     return ret;
+diff --git a/third_party/zlib/contrib/minizip/minizip.c b/third_party/zlib/contrib/minizip/minizip.c
+index 4288962ecef0..b794953c5c23 100644
+--- a/third_party/zlib/contrib/minizip/minizip.c
++++ b/third_party/zlib/contrib/minizip/minizip.c
+@@ -12,8 +12,7 @@
+          Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+ */
+
+-
+-#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
++#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__)) && (!defined(__ANDROID_API__))
+         #ifndef __USE_FILE_OFFSET64
+                 #define __USE_FILE_OFFSET64
+         #endif
+@@ -28,7 +27,7 @@
+         #endif
+ #endif
+
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__Fuchsia__) || defined(__ANDROID_API__)
+ // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
+ #define FOPEN_FUNC(filename, mode) fopen(filename, mode)
+ #define FTELLO_FUNC(stream) ftello(stream)
+@@ -94,7 +93,7 @@ uLong filetime(f, tmzip, dt)
+   return ret;
+ }
+ #else
+-#ifdef unix || __APPLE__
++#if defined(unix) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__ANDROID_API__)
+ uLong filetime(f, tmzip, dt)
+     char *f;               /* name of file to get info on */
+     tm_zip *tmzip;         /* return value: access, modific. and creation times */
+--
+2.31.1.818.g46aad6cb9e-goog
+
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0009-infcover-oob.patch b/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0009-infcover-oob.patch
new file mode 100644
index 0000000000..648360f332
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0009-infcover-oob.patch
@@ -0,0 +1,24 @@
+From 75690b2683667be5535ac6243438115dc9c40f6a Mon Sep 17 00:00:00 2001
+From: Florian Mayer <fmayer@google.com>
+Date: Wed, 16 Mar 2022 16:38:36 -0700
+Subject: [PATCH] Fix out of bounds in infcover.c.
+
+---
+ test/infcover.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/test/infcover.c b/test/infcover.c
+index 2be01646c..a6d83693c 100644
+--- a/test/infcover.c
++++ b/test/infcover.c
+@@ -373,7 +373,9 @@ local void cover_support(void)
+     mem_setup(&strm);
+     strm.avail_in = 0;
+     strm.next_in = Z_NULL;
+-    ret = inflateInit_(&strm, ZLIB_VERSION - 1, (int)sizeof(z_stream));
++    char versioncpy[] = ZLIB_VERSION;
++    versioncpy[0] -= 1;
++    ret = inflateInit_(&strm, versioncpy, (int)sizeof(z_stream));
+                                                 assert(ret == Z_VERSION_ERROR);
+     mem_done(&strm, "wrong version");
+ 
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0010-cmake-enable-simd.patch b/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0010-cmake-enable-simd.patch
new file mode 100644
index 0000000000..3893101b7c
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0010-cmake-enable-simd.patch
@@ -0,0 +1,96 @@
+diff --git a/third_party/zlib/CMakeLists.txt b/third_party/zlib/CMakeLists.txt
+index b412dc7feb732..0431278405046 100644
+--- a/third_party/zlib/CMakeLists.txt
++++ b/third_party/zlib/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.4.4)
++cmake_minimum_required(VERSION 3.0)
+ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
+ 
+ project(zlib C)
+@@ -21,6 +21,26 @@ check_include_file(sys/types.h HAVE_SYS_TYPES_H)
+ check_include_file(stdint.h    HAVE_STDINT_H)
+ check_include_file(stddef.h    HAVE_STDDEF_H)
+ 
++option(ENABLE_SIMD_OPTIMIZATIONS "Enable all SIMD optimizations" OFF)
++
++# TODO(cavalcantii): add support for other OSes (e.g. Android, fuchsia, osx)
++# and architectures (e.g. Arm).
++if (ENABLE_SIMD_OPTIMIZATIONS)
++   add_definitions(-DINFLATE_CHUNK_SIMD_SSE2)
++   add_definitions(-DADLER32_SIMD_SSSE3)
++   add_definitions(-DINFLATE_CHUNK_READ_64LE)
++   add_definitions(-DCRC32_SIMD_SSE42_PCLMUL)
++   add_definitions(-DDEFLATE_SLIDE_HASH_SSE2)
++   add_compile_options(-msse4.2 -mpclmul)
++   # Required by CPU features detection code.
++   add_definitions(-DX86_NOT_WINDOWS)
++   # Apparently some environments (e.g. CentOS) require to explicitly link
++   # with pthread and that is required by the CPU features detection code.
++   find_package (Threads REQUIRED)
++   SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")
++   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
++endif()
++
+ #
+ # Check to see if we have large file support
+ #
+@@ -120,10 +140,25 @@ set(ZLIB_SRCS
+     zutil.c
+ )
+ 
+-if(NOT MINGW)
+-    set(ZLIB_DLL_SRCS
+-        win32/zlib1.rc # If present will override custom build rule below.
+-    )
++
++#============================================================================
++# Update list of source files if optimizations were enabled
++#============================================================================
++if (ENABLE_SIMD_OPTIMIZATIONS)
++  list(REMOVE_ITEM ZLIB_SRCS inflate.c)
++
++  list(APPEND ZLIB_PRIVATE_HDRS ${CMAKE_CURRENT_SOURCE_DIR}/adler32_simd.h)
++  list(APPEND ZLIB_PRIVATE_HDRS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/optimizations/chunkcopy.h)
++  list(APPEND ZLIB_PRIVATE_HDRS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/optimizations/inffast_chunk.h)
++  list(APPEND ZLIB_PRIVATE_HDRS ${CMAKE_CURRENT_SOURCE_DIR}/cpu_features.h)
++  list(APPEND ZLIB_PRIVATE_HDRS ${CMAKE_CURRENT_SOURCE_DIR}/crc32_simd.h)
++
++  list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/adler32_simd.c)
++  list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/optimizations/inffast_chunk.c)
++  list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/optimizations/inflate.c)
++  list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/cpu_features.c)
++  list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/crc32_simd.c)
++  list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/crc_folding.c)
+ endif()
+ 
+ # parse the full version number from zlib.h and include in ZLIB_FULL_VERSION
+@@ -191,23 +226,9 @@ if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
+ endif()
+ 
+ #============================================================================
+-# Example binaries
++# Benchmarker
+ #============================================================================
+-
+-add_executable(example test/example.c)
+-target_link_libraries(example zlib)
+-add_test(example example)
+-
+-add_executable(minigzip test/minigzip.c)
+-target_link_libraries(minigzip zlib)
+-
+-if(HAVE_OFF64_T)
+-    add_executable(example64 test/example.c)
+-    target_link_libraries(example64 zlib)
+-    set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
+-    add_test(example64 example64)
+-
+-    add_executable(minigzip64 test/minigzip.c)
+-    target_link_libraries(minigzip64 zlib)
+-    set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
+-endif()
++enable_language(CXX)
++set(CMAKE_CXX_STANDARD 14) # workaround for older compilers (e.g. g++ 5.4).
++add_executable(zlib_bench contrib/bench/zlib_bench.cc)
++target_link_libraries(zlib_bench zlib)
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0011-avx512.patch b/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0011-avx512.patch
new file mode 100644
index 0000000000..6d409b7738
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0011-avx512.patch
@@ -0,0 +1,357 @@
+From 87fc8e3e38323cfdabf8da3927488e3e57073b02 Mon Sep 17 00:00:00 2001
+From: Jia Liu <jia3.liu@intel.com>
+Date: Thu, 30 Mar 2023 11:13:16 +0800
+Subject: [PATCH] Enabled AVX512 for CRC32
+
+Enabled AVX512 for CRC32 that provide best of known performance
+beyond current SSE SIMD optimization. It enables multiple folding
+operations and AVX512 new instructions, providing ~3.5X CRC32
+performance and ~3.7% gain on Zlib_bench gzip performance.
+---
+ CMakeLists.txt |   8 +-
+ cpu_features.c |   9 +++
+ cpu_features.h |   1 +
+ crc32.c        |  14 +++-
+ crc32_simd.c   | 198 ++++++++++++++++++++++++++++++++++++++++++++++++-
+ crc32_simd.h   |   6 ++
+ 6 files changed, 230 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f06e193..d45b902 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -22,6 +22,7 @@ check_include_file(stdint.h    HAVE_STDINT_H)
+ check_include_file(stddef.h    HAVE_STDDEF_H)
+ 
+ option(ENABLE_SIMD_OPTIMIZATIONS "Enable all SIMD optimizations" OFF)
++option(ENABLE_SIMD_AVX512 "Enable SIMD AXV512 optimizations" OFF)
+ 
+ # TODO(cavalcantii): add support for other OSes (e.g. Android, fuchsia, osx)
+ # and architectures (e.g. Arm).
+@@ -30,8 +31,13 @@ if (ENABLE_SIMD_OPTIMIZATIONS)
+    add_definitions(-DADLER32_SIMD_SSSE3)
+    add_definitions(-DINFLATE_CHUNK_READ_64LE)
+    add_definitions(-DCRC32_SIMD_SSE42_PCLMUL)
++   if (ENABLE_SIMD_AVX512)
++    add_definitions(-DCRC32_SIMD_AVX512_PCLMUL)
++    add_compile_options(-mvpclmulqdq -msse2 -mavx512f -mpclmul)
++   else()
++    add_compile_options(-msse4.2 -mpclmul)
++   endif()
+    add_definitions(-DDEFLATE_SLIDE_HASH_SSE2)
+-   add_compile_options(-msse4.2 -mpclmul)
+    # Required by CPU features detection code.
+    add_definitions(-DX86_NOT_WINDOWS)
+    # Apparently some environments (e.g. CentOS) require to explicitly link
+diff --git a/cpu_features.c b/cpu_features.c
+index 877d5f2..ac6ee88 100644
+--- a/cpu_features.c
++++ b/cpu_features.c
+@@ -31,6 +31,7 @@ int ZLIB_INTERNAL arm_cpu_enable_pmull = 0;
+ int ZLIB_INTERNAL x86_cpu_enable_sse2 = 0;
+ int ZLIB_INTERNAL x86_cpu_enable_ssse3 = 0;
+ int ZLIB_INTERNAL x86_cpu_enable_simd = 0;
++int ZLIB_INTERNAL x86_cpu_enable_avx512 = 0;
+ 
+ #ifndef CPU_NO_SIMD
+ 
+@@ -138,6 +139,10 @@ static void _cpu_check_features(void)
+ /* On x86 we simply use a instruction to check the CPU features.
+  * (i.e. CPUID).
+  */
++#ifdef CRC32_SIMD_AVX512_PCLMUL
++#include <immintrin.h>
++#include <xsaveintrin.h>
++#endif
+ static void _cpu_check_features(void)
+ {
+     int x86_cpu_has_sse2;
+@@ -164,6 +169,10 @@ static void _cpu_check_features(void)
+     x86_cpu_enable_simd = x86_cpu_has_sse2 &&
+                           x86_cpu_has_sse42 &&
+                           x86_cpu_has_pclmulqdq;
++
++#ifdef CRC32_SIMD_AVX512_PCLMUL
++    x86_cpu_enable_avx512 = _xgetbv(0) & 0x00000040;
++#endif
+ }
+ #endif
+ #endif
+diff --git a/cpu_features.h b/cpu_features.h
+index 279246c..aed3e83 100644
+--- a/cpu_features.h
++++ b/cpu_features.h
+@@ -14,5 +14,6 @@ extern int arm_cpu_enable_pmull;
+ extern int x86_cpu_enable_sse2;
+ extern int x86_cpu_enable_ssse3;
+ extern int x86_cpu_enable_simd;
++extern int x86_cpu_enable_avx512;
+ 
+ void cpu_check_features(void);
+diff --git a/crc32.c b/crc32.c
+index 4486098..acb6972 100644
+--- a/crc32.c
++++ b/crc32.c
+@@ -773,7 +773,19 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
+     }
+ 
+ #endif
+-#if defined(CRC32_SIMD_SSE42_PCLMUL)
++#if defined(CRC32_SIMD_AVX512_PCLMUL)
++    if (x86_cpu_enable_avx512 && len >= Z_CRC32_AVX512_MINIMUM_LENGTH) {
++        /* crc32 64-byte chunks */
++        z_size_t chunk_size = len & ~Z_CRC32_AVX512_CHUNKSIZE_MASK;
++        crc = ~crc32_avx512_simd_(buf, chunk_size, ~(uint32_t)crc);
++        /* check remaining data */
++        len -= chunk_size;
++        if (!len)
++            return crc;
++        /* Fall into the default crc32 for the remaining data. */
++        buf += chunk_size;
++    }
++#elif defined(CRC32_SIMD_SSE42_PCLMUL)
+     if (x86_cpu_enable_simd && len >= Z_CRC32_SSE42_MINIMUM_LENGTH) {
+         /* crc32 16-byte chunks */
+         z_size_t chunk_size = len & ~Z_CRC32_SSE42_CHUNKSIZE_MASK;
+diff --git a/crc32_simd.c b/crc32_simd.c
+index d80beba..7428270 100644
+--- a/crc32_simd.c
++++ b/crc32_simd.c
+@@ -6,17 +6,207 @@
+  */
+ 
+ #include "crc32_simd.h"
+-
+-#if defined(CRC32_SIMD_SSE42_PCLMUL)
++#if defined(CRC32_SIMD_AVX512_PCLMUL)
+ 
+ /*
+- * crc32_sse42_simd_(): compute the crc32 of the buffer, where the buffer
+- * length must be at least 64, and a multiple of 16. Based on:
++ * crc32_avx512_simd_(): compute the crc32 of the buffer, where the buffer
++ * length must be at least 256, and a multiple of 64. Based on:
+  *
+  * "Fast CRC Computation for Generic Polynomials Using PCLMULQDQ Instruction"
+  *  V. Gopal, E. Ozturk, et al., 2009, http://intel.ly/2ySEwL0
+  */
+ 
++#include <emmintrin.h>
++#include <smmintrin.h>
++#include <wmmintrin.h>
++#include <immintrin.h>
++
++uint32_t ZLIB_INTERNAL crc32_avx512_simd_(  /* AVX512+PCLMUL */
++    const unsigned char *buf,
++    z_size_t len,
++    uint32_t crc)
++{
++    /*
++     * Definitions of the bit-reflected domain constants k1,k2,k3,k4
++     * are similar to those given at the end of the paper, and remaining
++     * constants and CRC32+Barrett polynomials remain unchanged.
++     *
++     * Replace the index of x from 128 to 512. As follows:
++     * k1 = ( x ^ ( 512 * 4 + 32 ) mod P(x) << 32 )' << 1 = 0x011542778a
++     * k2 = ( x ^ ( 512 * 4 - 32 ) mod P(x) << 32 )' << 1 = 0x01322d1430
++     * k3 = ( x ^ ( 512 + 32 ) mod P(x) << 32 )' << 1 = 0x0154442bd4
++     * k4 = ( x ^ ( 512 - 32 ) mod P(x) << 32 )' << 1 = 0x01c6e41596
++     */
++    static const uint64_t zalign(64) k1k2[] = { 0x011542778a, 0x01322d1430,
++                                                0x011542778a, 0x01322d1430,
++                                                0x011542778a, 0x01322d1430,
++                                                0x011542778a, 0x01322d1430 };
++    static const uint64_t zalign(64) k3k4[] = { 0x0154442bd4, 0x01c6e41596,
++                                                0x0154442bd4, 0x01c6e41596,
++                                                0x0154442bd4, 0x01c6e41596,
++                                                0x0154442bd4, 0x01c6e41596 };
++    static const uint64_t zalign(16) k5k6[] = { 0x01751997d0, 0x00ccaa009e };
++    static const uint64_t zalign(16) k7k8[] = { 0x0163cd6124, 0x0000000000 };
++    static const uint64_t zalign(16) poly[] = { 0x01db710641, 0x01f7011641 };
++    __m512i x0, x1, x2, x3, x4, x5, x6, x7, x8, y5, y6, y7, y8;
++    __m128i a0, a1, a2, a3;
++
++    /*
++     * There's at least one block of 256.
++     */
++    x1 = _mm512_loadu_si512((__m512i *)(buf + 0x00));
++    x2 = _mm512_loadu_si512((__m512i *)(buf + 0x40));
++    x3 = _mm512_loadu_si512((__m512i *)(buf + 0x80));
++    x4 = _mm512_loadu_si512((__m512i *)(buf + 0xC0));
++
++    x1 = _mm512_xor_si512(x1, _mm512_castsi128_si512(_mm_cvtsi32_si128(crc)));
++
++    x0 = _mm512_load_si512((__m512i *)k1k2);
++
++    buf += 256;
++    len -= 256;
++
++    /*
++     * Parallel fold blocks of 256, if any.
++     */
++    while (len >= 256)
++    {
++        x5 = _mm512_clmulepi64_epi128(x1, x0, 0x00);
++        x6 = _mm512_clmulepi64_epi128(x2, x0, 0x00);
++        x7 = _mm512_clmulepi64_epi128(x3, x0, 0x00);
++        x8 = _mm512_clmulepi64_epi128(x4, x0, 0x00);
++
++
++        x1 = _mm512_clmulepi64_epi128(x1, x0, 0x11);
++        x2 = _mm512_clmulepi64_epi128(x2, x0, 0x11);
++        x3 = _mm512_clmulepi64_epi128(x3, x0, 0x11);
++        x4 = _mm512_clmulepi64_epi128(x4, x0, 0x11);
++
++        y5 = _mm512_loadu_si512((__m512i *)(buf + 0x00));
++        y6 = _mm512_loadu_si512((__m512i *)(buf + 0x40));
++        y7 = _mm512_loadu_si512((__m512i *)(buf + 0x80));
++        y8 = _mm512_loadu_si512((__m512i *)(buf + 0xC0));
++
++        x1 = _mm512_xor_si512(x1, x5);
++        x2 = _mm512_xor_si512(x2, x6);
++        x3 = _mm512_xor_si512(x3, x7);
++        x4 = _mm512_xor_si512(x4, x8);
++
++        x1 = _mm512_xor_si512(x1, y5);
++        x2 = _mm512_xor_si512(x2, y6);
++        x3 = _mm512_xor_si512(x3, y7);
++        x4 = _mm512_xor_si512(x4, y8);
++
++        buf += 256;
++        len -= 256;
++    }
++
++    /*
++     * Fold into 512-bits.
++     */
++    x0 = _mm512_load_si512((__m512i *)k3k4);
++
++    x5 = _mm512_clmulepi64_epi128(x1, x0, 0x00);
++    x1 = _mm512_clmulepi64_epi128(x1, x0, 0x11);
++    x1 = _mm512_xor_si512(x1, x2);
++    x1 = _mm512_xor_si512(x1, x5);
++
++    x5 = _mm512_clmulepi64_epi128(x1, x0, 0x00);
++    x1 = _mm512_clmulepi64_epi128(x1, x0, 0x11);
++    x1 = _mm512_xor_si512(x1, x3);
++    x1 = _mm512_xor_si512(x1, x5);
++
++    x5 = _mm512_clmulepi64_epi128(x1, x0, 0x00);
++    x1 = _mm512_clmulepi64_epi128(x1, x0, 0x11);
++    x1 = _mm512_xor_si512(x1, x4);
++    x1 = _mm512_xor_si512(x1, x5);
++
++    /*
++     * Single fold blocks of 64, if any.
++     */
++    while (len >= 64)
++    {
++        x2 = _mm512_loadu_si512((__m512i *)buf);
++
++        x5 = _mm512_clmulepi64_epi128(x1, x0, 0x00);
++        x1 = _mm512_clmulepi64_epi128(x1, x0, 0x11);
++        x1 = _mm512_xor_si512(x1, x2);
++        x1 = _mm512_xor_si512(x1, x5);
++
++        buf += 64;
++        len -= 64;
++    }
++
++    /*
++     * Fold 512-bits to 384-bits.
++     */
++    a0 = _mm_load_si128((__m128i *)k5k6);
++
++    a1 = _mm512_extracti32x4_epi32(x1, 0);
++    a2 = _mm512_extracti32x4_epi32(x1, 1);
++
++    a3 = _mm_clmulepi64_si128(a1, a0, 0x00);
++    a1 = _mm_clmulepi64_si128(a1, a0, 0x11);
++
++    a1 = _mm_xor_si128(a1, a3);
++    a1 = _mm_xor_si128(a1, a2);
++
++    /*
++     * Fold 384-bits to 256-bits.
++     */
++    a2 = _mm512_extracti32x4_epi32(x1, 2);
++    a3 = _mm_clmulepi64_si128(a1, a0, 0x00);
++    a1 = _mm_clmulepi64_si128(a1, a0, 0x11);
++    a1 = _mm_xor_si128(a1, a3);
++    a1 = _mm_xor_si128(a1, a2);
++
++    /*
++     * Fold 256-bits to 128-bits.
++     */
++    a2 = _mm512_extracti32x4_epi32(x1, 3);
++    a3 = _mm_clmulepi64_si128(a1, a0, 0x00);
++    a1 = _mm_clmulepi64_si128(a1, a0, 0x11);
++    a1 = _mm_xor_si128(a1, a3);
++    a1 = _mm_xor_si128(a1, a2);
++
++    /*
++     * Fold 128-bits to 64-bits.
++     */
++    a2 = _mm_clmulepi64_si128(a1, a0, 0x10);
++    a3 = _mm_setr_epi32(~0, 0, ~0, 0);
++    a1 = _mm_srli_si128(a1, 8);
++    a1 = _mm_xor_si128(a1, a2);
++
++    a0 = _mm_loadl_epi64((__m128i*)k7k8);
++    a2 = _mm_srli_si128(a1, 4);
++    a1 = _mm_and_si128(a1, a3);
++    a1 = _mm_clmulepi64_si128(a1, a0, 0x00);
++    a1 = _mm_xor_si128(a1, a2);
++
++    /*
++     * Barret reduce to 32-bits.
++     */
++    a0 = _mm_load_si128((__m128i*)poly);
++
++    a2 = _mm_and_si128(a1, a3);
++    a2 = _mm_clmulepi64_si128(a2, a0, 0x10);
++    a2 = _mm_and_si128(a2, a3);
++    a2 = _mm_clmulepi64_si128(a2, a0, 0x00);
++    a1 = _mm_xor_si128(a1, a2);
++
++    /*
++     * Return the crc32.
++     */
++    return _mm_extract_epi32(a1, 1);
++}
++
++#elif defined(CRC32_SIMD_SSE42_PCLMUL)
++
++/*
++ * crc32_sse42_simd_(): compute the crc32 of the buffer, where the buffer
++ * length must be at least 64, and a multiple of 16.
++ */
++
+ #include <emmintrin.h>
+ #include <smmintrin.h>
+ #include <wmmintrin.h>
+diff --git a/crc32_simd.h b/crc32_simd.h
+index c0346dc..8462464 100644
+--- a/crc32_simd.h
++++ b/crc32_simd.h
+@@ -19,12 +19,18 @@ uint32_t ZLIB_INTERNAL crc32_sse42_simd_(const unsigned char* buf,
+                                          z_size_t len,
+                                          uint32_t crc);
+ 
++uint32_t ZLIB_INTERNAL crc32_avx512_simd_(const unsigned char* buf,
++                                          z_size_t len,
++                                          uint32_t crc);
++
+ /*
+  * crc32_sse42_simd_ buffer size constraints: see the use in zlib/crc32.c
+  * for computing the crc32 of an arbitrary length buffer.
+  */
+ #define Z_CRC32_SSE42_MINIMUM_LENGTH 64
+ #define Z_CRC32_SSE42_CHUNKSIZE_MASK 15
++#define Z_CRC32_AVX512_MINIMUM_LENGTH 256
++#define Z_CRC32_AVX512_CHUNKSIZE_MASK 63
+ 
+ /*
+  * CRC32 checksums using ARMv8-a crypto instructions.
+-- 
+2.34.1
+
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0012-lfs-open64.patch b/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0012-lfs-open64.patch
new file mode 100644
index 0000000000..70e7b687a7
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0012-lfs-open64.patch
@@ -0,0 +1,40 @@
+From 6f21cb4b209d750486ede5472fdf7e35cf5ac3aa Mon Sep 17 00:00:00 2001
+From: Ramin Halavati <rhalavati@chromium.org>
+Date: Wed, 17 May 2023 15:21:43 +0200
+Subject: [PATCH] Add open64 for Large File System support to gzlib.
+
+---
+ third_party/zlib/gzlib.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/third_party/zlib/gzlib.c b/third_party/zlib/gzlib.c
+index 55da46a453fd1..bbdb797e8079d 100644
+--- a/third_party/zlib/gzlib.c
++++ b/third_party/zlib/gzlib.c
+@@ -7,11 +7,14 @@
+ 
+ #if defined(_WIN32) && !defined(__BORLANDC__)
+ #  define LSEEK _lseeki64
++#  define OPEN  open
+ #else
+ #if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
+ #  define LSEEK lseek64
++#  define OPEN  open64
+ #else
+ #  define LSEEK lseek
++#  define OPEN  open
+ #endif
+ #endif
+ 
+@@ -244,7 +247,7 @@ local gzFile gz_open(path, fd, mode)
+ #ifdef WIDECHAR
+         fd == -2 ? _wopen(path, oflag, 0666) :
+ #endif
+-        open((const char *)path, oflag, 0666));
++        OPEN((const char *)path, oflag, 0666));
+     if (state->fd == -1) {
+         free(state->path);
+         free(state);
+-- 
+2.40.1.606.ga4b1b128d6-goog
+
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0013-cpu-feature-detection-for-arm.patch b/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0013-cpu-feature-detection-for-arm.patch
new file mode 100644
index 0000000000..0547851fe5
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/patches/0013-cpu-feature-detection-for-arm.patch
@@ -0,0 +1,30 @@
+From c43ba7a55f091c0dcbfd8d89f7a5121269ce1b81 Mon Sep 17 00:00:00 2001
+From: Ho Cheung <uioptt24@gmail.com>
+Date: Thu, 27 Jul 2023 09:47:52 +0800
+Subject: [PATCH] [zlib] Perform CPU feature detection for ARM inside adler32()
+
+Perform CPU feature detection for ARM within adler32() to have the same
+behavior as x86.
+
+---
+ third_party/zlib/adler32.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/third_party/zlib/adler32.c b/third_party/zlib/adler32.c
+index 81c584f68e233..99a294496f7eb 100644
+--- a/third_party/zlib/adler32.c
++++ b/third_party/zlib/adler32.c
+@@ -90,9 +90,9 @@ uLong ZEXPORT adler32_z(uLong adler, const Bytef *buf, z_size_t len) {
+         return adler | (sum2 << 16);
+     }
+
+-#if defined(ADLER32_SIMD_SSSE3)
++#if defined(ADLER32_SIMD_SSSE3) || defined(ADLER32_SIMD_NEON)
+     /*
+-     * Use SSSE3 to compute the adler32. Since this routine can be
++     * Use SIMD to compute the adler32. Since this function can be
+      * freely used, check CPU features here. zlib convention is to
+      * call adler32(0, NULL, 0), before making calls to adler32().
+      * So this is a good early (and infrequent) place to cache CPU
+--
+2.41.0.windows.3
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/patches/README b/extern/crashpad/crashpad/third_party/zlib/zlib/patches/README
new file mode 100644
index 0000000000..b21d309ff9
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/patches/README
@@ -0,0 +1,43 @@
+== Patches applied on top of zlib ==
+
+ - 0000-build.patch: changes from the upstream version, mostly related to the
+   build.
+ - 0001-simd.patch: integrate Intel SIMD optimizations from
+   https://github.com/jtkukunas/zlib/
+ - 0002-uninitializedcheck.patch: prevent uninitialized use of state->check
+
+== Procedure to create a patch file ==
+
+  Assuming you are working in a new feature branch:
+ - git format-patch master --stdout > foo.patch # where naming follows a growing
+                                                # number plus patch description.
+ - git add foo.patch
+ - git commit -a -m "Local patch."
+ - git rebase -i HEAD~2 # Squashing the second commit
+
+  As patches created in this way will feature a ChangeLog, there is no longer
+the need to append this file with a description of what the patch does. This
+should help to solve frequent conflicts in pending new patches on
+Chromium's zlib.
+
+  The plan for the near future is to better insulate the platform specific
+changes to ease update adoption with new releases of zlib. This insulation
+happens by making changes inside contrib/ rather than the root directory
+(where conflicts can happen).
+
+  If a change modifies enough things inside the root directory that the
+intention is not immediately clear, generate a .patch file to go with your
+change. If the change's modifications in the root directory are small, like:
+
+#ifdef FEATURE_FLAG
+use_special_feature();
+#elif
+use_default_behavior();
+#endif
+
+  then the intent is clear and a .patch file doesn't need to be generated (since
+it would not provide much value).
+
+  Ideally local changes should have a merge request featured in either:
+ - canonical zlib: https://github.com/madler/zlib/
+ - zlib-ng: https://github.com/Dead2/zlib-ng
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/simd_stub.c b/extern/crashpad/crashpad/third_party/zlib/zlib/simd_stub.c
deleted file mode 100644
index c6d4605149..0000000000
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/simd_stub.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* simd_stub.c -- stub implementations
-* Copyright (C) 2014 Intel Corporation
-* For conditions of distribution and use, see copyright notice in zlib.h
-*/
-#include <assert.h>
-
-#include "deflate.h"
-#include "x86.h"
-
-int ZLIB_INTERNAL x86_cpu_enable_simd = 0;
-
-void ZLIB_INTERNAL crc_fold_init(deflate_state *const s) {
-    assert(0);
-}
-
-void ZLIB_INTERNAL crc_fold_copy(deflate_state *const s,
-                                 unsigned char *dst,
-                                 const unsigned char *src,
-                                 long len) {
-    assert(0);
-}
-
-unsigned ZLIB_INTERNAL crc_fold_512to32(deflate_state *const s) {
-    assert(0);
-    return 0;
-}
-
-void ZLIB_INTERNAL fill_window_sse(deflate_state *s)
-{
-    assert(0);
-}
-
-void x86_check_features(void)
-{
-}
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/slide_hash_simd.h b/extern/crashpad/crashpad/third_party/zlib/zlib/slide_hash_simd.h
new file mode 100644
index 0000000000..1000b774cc
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/slide_hash_simd.h
@@ -0,0 +1,116 @@
+/* slide_hash_simd.h
+ *
+ * Copyright 2022 The Chromium Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the Chromium source repository LICENSE file.
+ */
+
+#ifndef SLIDE_HASH_SIMD_H
+#define SLIDE_HASH_SIMD_H
+
+#include "deflate.h"
+
+#ifndef INLINE
+#if defined(_MSC_VER) && !defined(__clang__)
+#define INLINE __inline
+#else
+#define INLINE inline
+#endif
+#endif
+
+#if defined(CPU_NO_SIMD)
+
+#error SIMD has been disabled for your build target
+
+#elif defined(DEFLATE_SLIDE_HASH_SSE2)
+
+#include <emmintrin.h>  /* SSE2 */
+
+#define Z_SLIDE_INIT_SIMD(wsize) _mm_set1_epi16((ush)(wsize))
+
+#define Z_SLIDE_HASH_SIMD(table, size, vector_wsize) \
+    for (const Posf* const end = table + size; table != end;) { \
+        __m128i vO = _mm_loadu_si128((__m128i *)(table + 0)); \
+        vO = _mm_subs_epu16(vO, vector_wsize); \
+        _mm_storeu_si128((__m128i *)(table + 0), vO); \
+        table += 8; \
+    }
+
+typedef __m128i z_vec128i_u16x8_t;
+
+#elif defined(DEFLATE_SLIDE_HASH_NEON)
+
+#include <arm_neon.h>  /* NEON */
+
+#define Z_SLIDE_INIT_SIMD(wsize) vdupq_n_u16((ush)(wsize))
+
+#define Z_SLIDE_HASH_SIMD(table, size, vector_wsize) \
+    for (const Posf* const end = table + size; table != end;) { \
+        uint16x8_t vO = vld1q_u16(table + 0); \
+        uint16x8_t v8 = vld1q_u16(table + 8); \
+        vO = vqsubq_u16(vO, vector_wsize); \
+        v8 = vqsubq_u16(v8, vector_wsize); \
+        vst1q_u16(table + 0, vO); \
+        vst1q_u16(table + 8, v8); \
+        table += 8 + 8; \
+    }
+
+typedef uint16x8_t z_vec128i_u16x8_t;
+
+#else
+
+#error slide_hash_simd is not defined for your build target
+
+#endif
+
+/* ===========================================================================
+ * Slide the hash table when sliding the window down (could be avoided with 32
+ * bit values at the expense of memory usage). We slide even when level == 0 to
+ * keep the hash table consistent if we switch back to level > 0 later.
+ */
+local INLINE void slide_hash_simd(
+    Posf *head, Posf *prev, const uInt w_size, const uInt hash_size) {
+    /*
+     * The SIMD implementation of the hash table slider assumes:
+     *
+     * 1. hash chain offset is 2 bytes. Should be true as Pos is "ush" type.
+     */
+    Assert(sizeof(Pos) == 2, "Pos type size error: should be 2 bytes");
+    Assert(sizeof(ush) == 2, "ush type size error: should be 2 bytes");
+
+    Assert(hash_size <= (1 << 16), "Hash table maximum size error");
+    Assert(hash_size >= (1 << 8), "Hash table minimum size error");
+    Assert(w_size == (ush)w_size, "Prev table size error");
+
+    /*
+     * 2. The hash & prev table sizes are a multiple of 32 bytes (256 bits),
+     * since the NEON table slider moves two 128-bit items per loop (loop is
+     * unrolled on NEON for performance, see http://crbug.com/863257).
+     */
+    Assert(!((hash_size * sizeof(head[0])) & (32 - 1)),
+        "Hash table size error: should be a multiple of 32 bytes");
+    Assert(!((w_size * sizeof(prev[0])) & (32 - 1)),
+        "Prev table size error: should be a multiple of 32 bytes");
+
+    /*
+     * Duplicate (ush)w_size in each uint16_t component of a 128-bit vector.
+     */
+    const z_vec128i_u16x8_t vec_wsize = Z_SLIDE_INIT_SIMD(w_size);
+
+    /*
+     * Slide {head,prev} hash chain values: subtracts (ush)w_size from every
+     * value with a saturating SIMD subtract, to clamp the result to 0(NIL),
+     * to implement slide_hash() `(m >= wsize ? m - wsize : NIL);` code.
+     */
+    Z_SLIDE_HASH_SIMD(head, hash_size, vec_wsize);
+#ifndef FASTEST
+    Z_SLIDE_HASH_SIMD(prev, w_size, vec_wsize);
+#endif
+
+}
+
+#undef z_vec128i_u16x8_t
+#undef Z_SLIDE_HASH_SIMD
+#undef Z_SLIDE_INIT_SIMD
+
+#endif  /* SLIDE_HASH_SIMD_H */
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/trees.c b/extern/crashpad/crashpad/third_party/zlib/zlib/trees.c
index 50cf4b4571..8dbdc40bac 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/trees.c
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/trees.c
@@ -1,5 +1,5 @@
 /* trees.c -- output deflated data using Huffman coding
- * Copyright (C) 1995-2017 Jean-loup Gailly
+ * Copyright (C) 1995-2021 Jean-loup Gailly
  * detect_data_type() function provided freely by Cosmin Truta, 2006
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
@@ -122,39 +122,116 @@ struct static_tree_desc_s {
     int     max_length;          /* max bit length for the codes */
 };
 
-local const static_tree_desc  static_l_desc =
+#ifdef NO_INIT_GLOBAL_POINTERS
+#  define TCONST
+#else
+#  define TCONST const
+#endif
+
+local TCONST static_tree_desc static_l_desc =
 {static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS};
 
-local const static_tree_desc  static_d_desc =
+local TCONST static_tree_desc static_d_desc =
 {static_dtree, extra_dbits, 0,          D_CODES, MAX_BITS};
 
-local const static_tree_desc  static_bl_desc =
+local TCONST static_tree_desc static_bl_desc =
 {(const ct_data *)0, extra_blbits, 0,   BL_CODES, MAX_BL_BITS};
 
 /* ===========================================================================
- * Local (static) routines in this file.
+ * Output a short LSB first on the stream.
+ * IN assertion: there is enough room in pendingBuf.
  */
+#define put_short(s, w) { \
+    put_byte(s, (uch)((w) & 0xff)); \
+    put_byte(s, (uch)((ush)(w) >> 8)); \
+}
 
-local void tr_static_init OF((void));
-local void init_block     OF((deflate_state *s));
-local void pqdownheap     OF((deflate_state *s, ct_data *tree, int k));
-local void gen_bitlen     OF((deflate_state *s, tree_desc *desc));
-local void gen_codes      OF((ct_data *tree, int max_code, ushf *bl_count));
-local void build_tree     OF((deflate_state *s, tree_desc *desc));
-local void scan_tree      OF((deflate_state *s, ct_data *tree, int max_code));
-local void send_tree      OF((deflate_state *s, ct_data *tree, int max_code));
-local int  build_bl_tree  OF((deflate_state *s));
-local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes,
-                              int blcodes));
-local void compress_block OF((deflate_state *s, const ct_data *ltree,
-                              const ct_data *dtree));
-local int  detect_data_type OF((deflate_state *s));
-local unsigned bi_reverse OF((unsigned value, int length));
-local void bi_windup      OF((deflate_state *s));
-local void bi_flush       OF((deflate_state *s));
+/* ===========================================================================
+ * Reverse the first len bits of a code, using straightforward code (a faster
+ * method would use a table)
+ * IN assertion: 1 <= len <= 15
+ */
+local unsigned bi_reverse(unsigned code, int len) {
+    register unsigned res = 0;
+    do {
+        res |= code & 1;
+        code >>= 1, res <<= 1;
+    } while (--len > 0);
+    return res >> 1;
+}
+
+/* ===========================================================================
+ * Flush the bit buffer, keeping at most 7 bits in it.
+ */
+local void bi_flush(deflate_state *s) {
+    if (s->bi_valid == 16) {
+        put_short(s, s->bi_buf);
+        s->bi_buf = 0;
+        s->bi_valid = 0;
+    } else if (s->bi_valid >= 8) {
+        put_byte(s, (Byte)s->bi_buf);
+        s->bi_buf >>= 8;
+        s->bi_valid -= 8;
+    }
+}
+
+/* ===========================================================================
+ * Flush the bit buffer and align the output on a byte boundary
+ */
+local void bi_windup(deflate_state *s) {
+    if (s->bi_valid > 8) {
+        put_short(s, s->bi_buf);
+    } else if (s->bi_valid > 0) {
+        put_byte(s, (Byte)s->bi_buf);
+    }
+    s->bi_buf = 0;
+    s->bi_valid = 0;
+#ifdef ZLIB_DEBUG
+    s->bits_sent = (s->bits_sent + 7) & ~7;
+#endif
+}
+
+/* ===========================================================================
+ * Generate the codes for a given tree and bit counts (which need not be
+ * optimal).
+ * IN assertion: the array bl_count contains the bit length statistics for
+ * the given tree and the field len is set for all tree elements.
+ * OUT assertion: the field code is set for all tree elements of non
+ *     zero code length.
+ */
+local void gen_codes(ct_data *tree, int max_code, ushf *bl_count) {
+    ush next_code[MAX_BITS+1]; /* next code value for each bit length */
+    unsigned code = 0;         /* running code value */
+    int bits;                  /* bit index */
+    int n;                     /* code index */
+
+    /* The distribution counts are first used to generate the code values
+     * without bit reversal.
+     */
+    for (bits = 1; bits <= MAX_BITS; bits++) {
+        code = (code + bl_count[bits - 1]) << 1;
+        next_code[bits] = (ush)code;
+    }
+    /* Check that the bit counts in bl_count are consistent. The last code
+     * must be all ones.
+     */
+    Assert (code + bl_count[MAX_BITS] - 1 == (1 << MAX_BITS) - 1,
+            "inconsistent bit counts");
+    Tracev((stderr,"\ngen_codes: max_code %d ", max_code));
+
+    for (n = 0;  n <= max_code; n++) {
+        int len = tree[n].Len;
+        if (len == 0) continue;
+        /* Now reverse the bits */
+        tree[n].Code = (ush)bi_reverse(next_code[len]++, len);
+
+        Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
+            n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len] - 1));
+    }
+}
 
 #ifdef GEN_TREES_H
-local void gen_trees_header OF((void));
+local void gen_trees_header(void);
 #endif
 
 #ifndef ZLIB_DEBUG
@@ -167,33 +244,18 @@ local void gen_trees_header OF((void));
        send_bits(s, tree[c].Code, tree[c].Len); }
 #endif
 
-/* ===========================================================================
- * Output a short LSB first on the stream.
- * IN assertion: there is enough room in pendingBuf.
- */
-#define put_short(s, w) { \
-    put_byte(s, (uch)((w) & 0xff)); \
-    put_byte(s, (uch)((ush)(w) >> 8)); \
-}
-
 /* ===========================================================================
  * Send a value on a given number of bits.
  * IN assertion: length <= 16 and value fits in length bits.
  */
 #ifdef ZLIB_DEBUG
-local void send_bits      OF((deflate_state *s, int value, int length));
-
-local void send_bits(s, value, length)
-    deflate_state *s;
-    int value;  /* value to send */
-    int length; /* number of bits */
-{
+local void send_bits(deflate_state *s, int value, int length) {
     Tracevv((stderr," l %2d v %4x ", length, value));
     Assert(length > 0 && length <= 15, "invalid length");
     s->bits_sent += (ulg)length;
 
     /* If not enough room in bi_buf, use (valid) bits from bi_buf and
-     * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))
+     * (16 - bi_valid) bits from value, leaving (width - (16 - bi_valid))
      * unused bits in value.
      */
     if (s->bi_valid > (int)Buf_size - length) {
@@ -229,8 +291,7 @@ local void send_bits(s, value, length)
 /* ===========================================================================
  * Initialize the various 'constant' tables.
  */
-local void tr_static_init()
-{
+local void tr_static_init(void) {
 #if defined(GEN_TREES_H) || !defined(STDC)
     static int static_init_done = 0;
     int n;        /* iterates over tree elements */
@@ -256,7 +317,7 @@ local void tr_static_init()
     length = 0;
     for (code = 0; code < LENGTH_CODES-1; code++) {
         base_length[code] = length;
-        for (n = 0; n < (1<<extra_lbits[code]); n++) {
+        for (n = 0; n < (1 << extra_lbits[code]); n++) {
             _length_code[length++] = (uch)code;
         }
     }
@@ -265,13 +326,13 @@ local void tr_static_init()
      * in two different ways: code 284 + 5 bits or code 285, so we
      * overwrite length_code[255] to use the best encoding:
      */
-    _length_code[length-1] = (uch)code;
+    _length_code[length - 1] = (uch)code;
 
     /* Initialize the mapping dist (0..32K) -> dist code (0..29) */
     dist = 0;
     for (code = 0 ; code < 16; code++) {
         base_dist[code] = dist;
-        for (n = 0; n < (1<<extra_dbits[code]); n++) {
+        for (n = 0; n < (1 << extra_dbits[code]); n++) {
             _dist_code[dist++] = (uch)code;
         }
     }
@@ -279,11 +340,11 @@ local void tr_static_init()
     dist >>= 7; /* from now on, all distances are divided by 128 */
     for ( ; code < D_CODES; code++) {
         base_dist[code] = dist << 7;
-        for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) {
+        for (n = 0; n < (1 << (extra_dbits[code] - 7)); n++) {
             _dist_code[256 + dist++] = (uch)code;
         }
     }
-    Assert (dist == 256, "tr_static_init: 256+dist != 512");
+    Assert (dist == 256, "tr_static_init: 256 + dist != 512");
 
     /* Construct the codes of the static literal tree */
     for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0;
@@ -312,7 +373,7 @@ local void tr_static_init()
 }
 
 /* ===========================================================================
- * Genererate the file trees.h describing the static trees.
+ * Generate the file trees.h describing the static trees.
  */
 #ifdef GEN_TREES_H
 #  ifndef ZLIB_DEBUG
@@ -321,10 +382,9 @@ local void tr_static_init()
 
 #  define SEPARATOR(i, last, width) \
       ((i) == (last)? "\n};\n\n" :    \
-       ((i) % (width) == (width)-1 ? ",\n" : ", "))
+       ((i) % (width) == (width) - 1 ? ",\n" : ", "))
 
-void gen_trees_header()
-{
+void gen_trees_header(void) {
     FILE *header = fopen("trees.h", "w");
     int i;
 
@@ -373,12 +433,26 @@ void gen_trees_header()
 }
 #endif /* GEN_TREES_H */
 
+/* ===========================================================================
+ * Initialize a new block.
+ */
+local void init_block(deflate_state *s) {
+    int n; /* iterates over tree elements */
+
+    /* Initialize the trees. */
+    for (n = 0; n < L_CODES;  n++) s->dyn_ltree[n].Freq = 0;
+    for (n = 0; n < D_CODES;  n++) s->dyn_dtree[n].Freq = 0;
+    for (n = 0; n < BL_CODES; n++) s->bl_tree[n].Freq = 0;
+
+    s->dyn_ltree[END_BLOCK].Freq = 1;
+    s->opt_len = s->static_len = 0L;
+    s->sym_next = s->matches = 0;
+}
+
 /* ===========================================================================
  * Initialize the tree data structures for a new zlib stream.
  */
-void ZLIB_INTERNAL _tr_init(s)
-    deflate_state *s;
-{
+void ZLIB_INTERNAL _tr_init(deflate_state *s) {
     tr_static_init();
 
     s->l_desc.dyn_tree = s->dyn_ltree;
@@ -401,24 +475,6 @@ void ZLIB_INTERNAL _tr_init(s)
     init_block(s);
 }
 
-/* ===========================================================================
- * Initialize a new block.
- */
-local void init_block(s)
-    deflate_state *s;
-{
-    int n; /* iterates over tree elements */
-
-    /* Initialize the trees. */
-    for (n = 0; n < L_CODES;  n++) s->dyn_ltree[n].Freq = 0;
-    for (n = 0; n < D_CODES;  n++) s->dyn_dtree[n].Freq = 0;
-    for (n = 0; n < BL_CODES; n++) s->bl_tree[n].Freq = 0;
-
-    s->dyn_ltree[END_BLOCK].Freq = 1;
-    s->opt_len = s->static_len = 0L;
-    s->last_lit = s->matches = 0;
-}
-
 #define SMALLEST 1
 /* Index within the heap array of least frequent node in the Huffman tree */
 
@@ -448,17 +504,13 @@ local void init_block(s)
  * when the heap property is re-established (each father smaller than its
  * two sons).
  */
-local void pqdownheap(s, tree, k)
-    deflate_state *s;
-    ct_data *tree;  /* the tree to restore */
-    int k;               /* node to move down */
-{
+local void pqdownheap(deflate_state *s, ct_data *tree, int k) {
     int v = s->heap[k];
     int j = k << 1;  /* left son of k */
     while (j <= s->heap_len) {
         /* Set j to the smallest of the two sons: */
         if (j < s->heap_len &&
-            smaller(tree, s->heap[j+1], s->heap[j], s->depth)) {
+            smaller(tree, s->heap[j + 1], s->heap[j], s->depth)) {
             j++;
         }
         /* Exit if v is smaller than both sons */
@@ -483,10 +535,7 @@ local void pqdownheap(s, tree, k)
  *     The length opt_len is updated; static_len is also updated if stree is
  *     not null.
  */
-local void gen_bitlen(s, desc)
-    deflate_state *s;
-    tree_desc *desc;    /* the tree descriptor */
-{
+local void gen_bitlen(deflate_state *s, tree_desc *desc) {
     ct_data *tree        = desc->dyn_tree;
     int max_code         = desc->max_code;
     const ct_data *stree = desc->stat_desc->static_tree;
@@ -507,7 +556,7 @@ local void gen_bitlen(s, desc)
      */
     tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */
 
-    for (h = s->heap_max+1; h < HEAP_SIZE; h++) {
+    for (h = s->heap_max + 1; h < HEAP_SIZE; h++) {
         n = s->heap[h];
         bits = tree[tree[n].Dad].Len + 1;
         if (bits > max_length) bits = max_length, overflow++;
@@ -518,7 +567,7 @@ local void gen_bitlen(s, desc)
 
         s->bl_count[bits]++;
         xbits = 0;
-        if (n >= base) xbits = extra[n-base];
+        if (n >= base) xbits = extra[n - base];
         f = tree[n].Freq;
         s->opt_len += (ulg)f * (unsigned)(bits + xbits);
         if (stree) s->static_len += (ulg)f * (unsigned)(stree[n].Len + xbits);
@@ -530,10 +579,10 @@ local void gen_bitlen(s, desc)
 
     /* Find the first bit length which could increase: */
     do {
-        bits = max_length-1;
+        bits = max_length - 1;
         while (s->bl_count[bits] == 0) bits--;
-        s->bl_count[bits]--;      /* move one leaf down the tree */
-        s->bl_count[bits+1] += 2; /* move one overflow item as its brother */
+        s->bl_count[bits]--;        /* move one leaf down the tree */
+        s->bl_count[bits + 1] += 2; /* move one overflow item as its brother */
         s->bl_count[max_length]--;
         /* The brother of the overflow item also moves one step up,
          * but this does not affect bl_count[max_length]
@@ -561,48 +610,9 @@ local void gen_bitlen(s, desc)
     }
 }
 
-/* ===========================================================================
- * Generate the codes for a given tree and bit counts (which need not be
- * optimal).
- * IN assertion: the array bl_count contains the bit length statistics for
- * the given tree and the field len is set for all tree elements.
- * OUT assertion: the field code is set for all tree elements of non
- *     zero code length.
- */
-local void gen_codes (tree, max_code, bl_count)
-    ct_data *tree;             /* the tree to decorate */
-    int max_code;              /* largest code with non zero frequency */
-    ushf *bl_count;            /* number of codes at each bit length */
-{
-    ush next_code[MAX_BITS+1]; /* next code value for each bit length */
-    unsigned code = 0;         /* running code value */
-    int bits;                  /* bit index */
-    int n;                     /* code index */
-
-    /* The distribution counts are first used to generate the code values
-     * without bit reversal.
-     */
-    for (bits = 1; bits <= MAX_BITS; bits++) {
-        code = (code + bl_count[bits-1]) << 1;
-        next_code[bits] = (ush)code;
-    }
-    /* Check that the bit counts in bl_count are consistent. The last code
-     * must be all ones.
-     */
-    Assert (code + bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1,
-            "inconsistent bit counts");
-    Tracev((stderr,"\ngen_codes: max_code %d ", max_code));
-
-    for (n = 0;  n <= max_code; n++) {
-        int len = tree[n].Len;
-        if (len == 0) continue;
-        /* Now reverse the bits */
-        tree[n].Code = (ush)bi_reverse(next_code[len]++, len);
-
-        Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
-             n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));
-    }
-}
+#ifdef DUMP_BL_TREE
+#  include <stdio.h>
+#endif
 
 /* ===========================================================================
  * Construct one Huffman tree and assigns the code bit strings and lengths.
@@ -612,10 +622,7 @@ local void gen_codes (tree, max_code, bl_count)
  *     and corresponding code. The length opt_len is updated; static_len is
  *     also updated if stree is not null. The field max_code is set.
  */
-local void build_tree(s, desc)
-    deflate_state *s;
-    tree_desc *desc; /* the tree descriptor */
-{
+local void build_tree(deflate_state *s, tree_desc *desc) {
     ct_data *tree         = desc->dyn_tree;
     const ct_data *stree  = desc->stat_desc->static_tree;
     int elems             = desc->stat_desc->elems;
@@ -624,7 +631,7 @@ local void build_tree(s, desc)
     int node;          /* new node being created */
 
     /* Construct the initial heap, with least frequent element in
-     * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].
+     * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n + 1].
      * heap[0] is not used.
      */
     s->heap_len = 0, s->heap_max = HEAP_SIZE;
@@ -652,7 +659,7 @@ local void build_tree(s, desc)
     }
     desc->max_code = max_code;
 
-    /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,
+    /* The elements heap[heap_len/2 + 1 .. heap_len] are leaves of the tree,
      * establish sub-heaps of increasing lengths:
      */
     for (n = s->heap_len/2; n >= 1; n--) pqdownheap(s, tree, n);
@@ -700,11 +707,7 @@ local void build_tree(s, desc)
  * Scan a literal or distance tree to determine the frequencies of the codes
  * in the bit length tree.
  */
-local void scan_tree (s, tree, max_code)
-    deflate_state *s;
-    ct_data *tree;   /* the tree to be scanned */
-    int max_code;    /* and its largest code of non zero frequency */
-{
+local void scan_tree(deflate_state *s, ct_data *tree, int max_code) {
     int n;                     /* iterates over all tree elements */
     int prevlen = -1;          /* last emitted length */
     int curlen;                /* length of current code */
@@ -714,10 +717,10 @@ local void scan_tree (s, tree, max_code)
     int min_count = 4;         /* min repeat count */
 
     if (nextlen == 0) max_count = 138, min_count = 3;
-    tree[max_code+1].Len = (ush)0xffff; /* guard */
+    tree[max_code + 1].Len = (ush)0xffff; /* guard */
 
     for (n = 0; n <= max_code; n++) {
-        curlen = nextlen; nextlen = tree[n+1].Len;
+        curlen = nextlen; nextlen = tree[n + 1].Len;
         if (++count < max_count && curlen == nextlen) {
             continue;
         } else if (count < min_count) {
@@ -745,11 +748,7 @@ local void scan_tree (s, tree, max_code)
  * Send a literal or distance tree in compressed form, using the codes in
  * bl_tree.
  */
-local void send_tree (s, tree, max_code)
-    deflate_state *s;
-    ct_data *tree; /* the tree to be scanned */
-    int max_code;       /* and its largest code of non zero frequency */
-{
+local void send_tree(deflate_state *s, ct_data *tree, int max_code) {
     int n;                     /* iterates over all tree elements */
     int prevlen = -1;          /* last emitted length */
     int curlen;                /* length of current code */
@@ -758,11 +757,11 @@ local void send_tree (s, tree, max_code)
     int max_count = 7;         /* max repeat count */
     int min_count = 4;         /* min repeat count */
 
-    /* tree[max_code+1].Len = -1; */  /* guard already set */
+    /* tree[max_code + 1].Len = -1; */  /* guard already set */
     if (nextlen == 0) max_count = 138, min_count = 3;
 
     for (n = 0; n <= max_code; n++) {
-        curlen = nextlen; nextlen = tree[n+1].Len;
+        curlen = nextlen; nextlen = tree[n + 1].Len;
         if (++count < max_count && curlen == nextlen) {
             continue;
         } else if (count < min_count) {
@@ -773,13 +772,13 @@ local void send_tree (s, tree, max_code)
                 send_code(s, curlen, s->bl_tree); count--;
             }
             Assert(count >= 3 && count <= 6, " 3_6?");
-            send_code(s, REP_3_6, s->bl_tree); send_bits(s, count-3, 2);
+            send_code(s, REP_3_6, s->bl_tree); send_bits(s, count - 3, 2);
 
         } else if (count <= 10) {
-            send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count-3, 3);
+            send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count - 3, 3);
 
         } else {
-            send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count-11, 7);
+            send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count - 11, 7);
         }
         count = 0; prevlen = curlen;
         if (nextlen == 0) {
@@ -796,9 +795,7 @@ local void send_tree (s, tree, max_code)
  * Construct the Huffman tree for the bit lengths and return the index in
  * bl_order of the last bit length code to send.
  */
-local int build_bl_tree(s)
-    deflate_state *s;
-{
+local int build_bl_tree(deflate_state *s) {
     int max_blindex;  /* index of last bit length code of non zero freq */
 
     /* Determine the bit length frequencies for literal and distance trees */
@@ -807,8 +804,8 @@ local int build_bl_tree(s)
 
     /* Build the bit length tree: */
     build_tree(s, (tree_desc *)(&(s->bl_desc)));
-    /* opt_len now includes the length of the tree representations, except
-     * the lengths of the bit lengths codes and the 5+5+4 bits for the counts.
+    /* opt_len now includes the length of the tree representations, except the
+     * lengths of the bit lengths codes and the 5 + 5 + 4 bits for the counts.
      */
 
     /* Determine the number of bit length codes to send. The pkzip format
@@ -819,7 +816,7 @@ local int build_bl_tree(s)
         if (s->bl_tree[bl_order[max_blindex]].Len != 0) break;
     }
     /* Update opt_len to include the bit length tree and counts */
-    s->opt_len += 3*((ulg)max_blindex+1) + 5+5+4;
+    s->opt_len += 3*((ulg)max_blindex + 1) + 5 + 5 + 4;
     Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
             s->opt_len, s->static_len));
 
@@ -831,61 +828,54 @@ local int build_bl_tree(s)
  * lengths of the bit length codes, the literal tree and the distance tree.
  * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4.
  */
-local void send_all_trees(s, lcodes, dcodes, blcodes)
-    deflate_state *s;
-    int lcodes, dcodes, blcodes; /* number of codes for each tree */
-{
+local void send_all_trees(deflate_state *s, int lcodes, int dcodes,
+                          int blcodes) {
     int rank;                    /* index in bl_order */
 
     Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes");
     Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES,
             "too many codes");
     Tracev((stderr, "\nbl counts: "));
-    send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */
-    send_bits(s, dcodes-1,   5);
-    send_bits(s, blcodes-4,  4); /* not -3 as stated in appnote.txt */
+    send_bits(s, lcodes - 257, 5);  /* not +255 as stated in appnote.txt */
+    send_bits(s, dcodes - 1,   5);
+    send_bits(s, blcodes - 4,  4);  /* not -3 as stated in appnote.txt */
     for (rank = 0; rank < blcodes; rank++) {
         Tracev((stderr, "\nbl code %2d ", bl_order[rank]));
         send_bits(s, s->bl_tree[bl_order[rank]].Len, 3);
     }
     Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent));
 
-    send_tree(s, (ct_data *)s->dyn_ltree, lcodes-1); /* literal tree */
+    send_tree(s, (ct_data *)s->dyn_ltree, lcodes - 1);  /* literal tree */
     Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent));
 
-    send_tree(s, (ct_data *)s->dyn_dtree, dcodes-1); /* distance tree */
+    send_tree(s, (ct_data *)s->dyn_dtree, dcodes - 1);  /* distance tree */
     Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent));
 }
 
 /* ===========================================================================
  * Send a stored block
  */
-void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last)
-    deflate_state *s;
-    charf *buf;       /* input block */
-    ulg stored_len;   /* length of input block */
-    int last;         /* one if this is the last block for a file */
-{
-    send_bits(s, (STORED_BLOCK<<1)+last, 3);    /* send block type */
+void ZLIB_INTERNAL _tr_stored_block(deflate_state *s, charf *buf,
+                                    ulg stored_len, int last) {
+    send_bits(s, (STORED_BLOCK<<1) + last, 3);  /* send block type */
     bi_windup(s);        /* align on byte boundary */
     put_short(s, (ush)stored_len);
     put_short(s, (ush)~stored_len);
-    zmemcpy(s->pending_buf + s->pending, (Bytef *)buf, stored_len);
+    if (stored_len)
+        zmemcpy(s->pending_buf + s->pending, (Bytef *)buf, stored_len);
     s->pending += stored_len;
 #ifdef ZLIB_DEBUG
     s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;
     s->compressed_len += (stored_len + 4) << 3;
     s->bits_sent += 2*16;
-    s->bits_sent += stored_len<<3;
+    s->bits_sent += stored_len << 3;
 #endif
 }
 
 /* ===========================================================================
  * Flush the bits in the bit buffer to pending output (leaves at most 7 bits)
  */
-void ZLIB_INTERNAL _tr_flush_bits(s)
-    deflate_state *s;
-{
+void ZLIB_INTERNAL _tr_flush_bits(deflate_state *s) {
     bi_flush(s);
 }
 
@@ -893,9 +883,7 @@ void ZLIB_INTERNAL _tr_flush_bits(s)
  * Send one empty static block to give enough lookahead for inflate.
  * This takes 10 bits, of which 7 may remain in the bit buffer.
  */
-void ZLIB_INTERNAL _tr_align(s)
-    deflate_state *s;
-{
+void ZLIB_INTERNAL _tr_align(deflate_state *s) {
     send_bits(s, STATIC_TREES<<1, 3);
     send_code(s, END_BLOCK, static_ltree);
 #ifdef ZLIB_DEBUG
@@ -904,16 +892,99 @@ void ZLIB_INTERNAL _tr_align(s)
     bi_flush(s);
 }
 
+/* ===========================================================================
+ * Send the block data compressed using the given Huffman trees
+ */
+local void compress_block(deflate_state *s, const ct_data *ltree,
+                          const ct_data *dtree) {
+    unsigned dist;      /* distance of matched string */
+    int lc;             /* match length or unmatched char (if dist == 0) */
+    unsigned sx = 0;    /* running index in sym_buf */
+    unsigned code;      /* the code to send */
+    int extra;          /* number of extra bits to send */
+
+    if (s->sym_next != 0) do {
+        dist = s->sym_buf[sx++] & 0xff;
+        dist += (unsigned)(s->sym_buf[sx++] & 0xff) << 8;
+        lc = s->sym_buf[sx++];
+        if (dist == 0) {
+            send_code(s, lc, ltree); /* send a literal byte */
+            Tracecv(isgraph(lc), (stderr," '%c' ", lc));
+        } else {
+            /* Here, lc is the match length - MIN_MATCH */
+            code = _length_code[lc];
+            send_code(s, code + LITERALS + 1, ltree);   /* send length code */
+            extra = extra_lbits[code];
+            if (extra != 0) {
+                lc -= base_length[code];
+                send_bits(s, lc, extra);       /* send the extra length bits */
+            }
+            dist--; /* dist is now the match distance - 1 */
+            code = d_code(dist);
+            Assert (code < D_CODES, "bad d_code");
+
+            send_code(s, code, dtree);       /* send the distance code */
+            extra = extra_dbits[code];
+            if (extra != 0) {
+                dist -= (unsigned)base_dist[code];
+                send_bits(s, dist, extra);   /* send the extra distance bits */
+            }
+        } /* literal or match pair ? */
+
+        /* Check that the overlay between pending_buf and sym_buf is ok: */
+        Assert(s->pending < s->lit_bufsize + sx, "pendingBuf overflow");
+
+    } while (sx < s->sym_next);
+
+    send_code(s, END_BLOCK, ltree);
+}
+
+/* ===========================================================================
+ * Check if the data type is TEXT or BINARY, using the following algorithm:
+ * - TEXT if the two conditions below are satisfied:
+ *    a) There are no non-portable control characters belonging to the
+ *       "block list" (0..6, 14..25, 28..31).
+ *    b) There is at least one printable character belonging to the
+ *       "allow list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255).
+ * - BINARY otherwise.
+ * - The following partially-portable control characters form a
+ *   "gray list" that is ignored in this detection algorithm:
+ *   (7 {BEL}, 8 {BS}, 11 {VT}, 12 {FF}, 26 {SUB}, 27 {ESC}).
+ * IN assertion: the fields Freq of dyn_ltree are set.
+ */
+local int detect_data_type(deflate_state *s) {
+    /* block_mask is the bit mask of block-listed bytes
+     * set bits 0..6, 14..25, and 28..31
+     * 0xf3ffc07f = binary 11110011111111111100000001111111
+     */
+    unsigned long block_mask = 0xf3ffc07fUL;
+    int n;
+
+    /* Check for non-textual ("block-listed") bytes. */
+    for (n = 0; n <= 31; n++, block_mask >>= 1)
+        if ((block_mask & 1) && (s->dyn_ltree[n].Freq != 0))
+            return Z_BINARY;
+
+    /* Check for textual ("allow-listed") bytes. */
+    if (s->dyn_ltree[9].Freq != 0 || s->dyn_ltree[10].Freq != 0
+            || s->dyn_ltree[13].Freq != 0)
+        return Z_TEXT;
+    for (n = 32; n < LITERALS; n++)
+        if (s->dyn_ltree[n].Freq != 0)
+            return Z_TEXT;
+
+    /* There are no "block-listed" or "allow-listed" bytes:
+     * this stream either is empty or has tolerated ("gray-listed") bytes only.
+     */
+    return Z_BINARY;
+}
+
 /* ===========================================================================
  * Determine the best encoding for the current block: dynamic trees, static
  * trees or store, and write out the encoded block.
  */
-void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
-    deflate_state *s;
-    charf *buf;       /* input block, or NULL if too old */
-    ulg stored_len;   /* length of input block */
-    int last;         /* one if this is the last block for a file */
-{
+void ZLIB_INTERNAL _tr_flush_block(deflate_state *s, charf *buf,
+                                   ulg stored_len, int last) {
     ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
     int max_blindex = 0;  /* index of last bit length code of non zero freq */
 
@@ -942,14 +1013,17 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
         max_blindex = build_bl_tree(s);
 
         /* Determine the best encoding. Compute the block lengths in bytes. */
-        opt_lenb = (s->opt_len+3+7)>>3;
-        static_lenb = (s->static_len+3+7)>>3;
+        opt_lenb = (s->opt_len + 3 + 7) >> 3;
+        static_lenb = (s->static_len + 3 + 7) >> 3;
 
         Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
                 opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
-                s->last_lit));
+                s->sym_next / 3));
 
-        if (static_lenb <= opt_lenb) opt_lenb = static_lenb;
+#ifndef FORCE_STATIC
+        if (static_lenb <= opt_lenb || s->strategy == Z_FIXED)
+#endif
+            opt_lenb = static_lenb;
 
     } else {
         Assert(buf != (char*)0, "lost buf");
@@ -959,7 +1033,7 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
 #ifdef FORCE_STORED
     if (buf != (char*)0) { /* force stored block */
 #else
-    if (stored_len+4 <= opt_lenb && buf != (char*)0) {
+    if (stored_len + 4 <= opt_lenb && buf != (char*)0) {
                        /* 4: two words for the lengths */
 #endif
         /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.
@@ -970,21 +1044,17 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
          */
         _tr_stored_block(s, buf, stored_len, last);
 
-#ifdef FORCE_STATIC
-    } else if (static_lenb >= 0) { /* force static trees */
-#else
-    } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) {
-#endif
-        send_bits(s, (STATIC_TREES<<1)+last, 3);
+    } else if (static_lenb == opt_lenb) {
+        send_bits(s, (STATIC_TREES<<1) + last, 3);
         compress_block(s, (const ct_data *)static_ltree,
                        (const ct_data *)static_dtree);
 #ifdef ZLIB_DEBUG
         s->compressed_len += 3 + s->static_len;
 #endif
     } else {
-        send_bits(s, (DYN_TREES<<1)+last, 3);
-        send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1,
-                       max_blindex+1);
+        send_bits(s, (DYN_TREES<<1) + last, 3);
+        send_all_trees(s, s->l_desc.max_code + 1, s->d_desc.max_code + 1,
+                       max_blindex + 1);
         compress_block(s, (const ct_data *)s->dyn_ltree,
                        (const ct_data *)s->dyn_dtree);
 #ifdef ZLIB_DEBUG
@@ -1003,21 +1073,18 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
         s->compressed_len += 7;  /* align on byte boundary */
 #endif
     }
-    Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3,
-           s->compressed_len-7*last));
+    Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len >> 3,
+           s->compressed_len - 7*last));
 }
 
 /* ===========================================================================
  * Save the match info and tally the frequency counts. Return true if
  * the current block must be flushed.
  */
-int ZLIB_INTERNAL _tr_tally (s, dist, lc)
-    deflate_state *s;
-    unsigned dist;  /* distance of matched string */
-    unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */
-{
-    s->d_buf[s->last_lit] = (ush)dist;
-    s->l_buf[s->last_lit++] = (uch)lc;
+int ZLIB_INTERNAL _tr_tally(deflate_state *s, unsigned dist, unsigned lc) {
+    s->sym_buf[s->sym_next++] = (uch)dist;
+    s->sym_buf[s->sym_next++] = (uch)(dist >> 8);
+    s->sym_buf[s->sym_next++] = (uch)lc;
     if (dist == 0) {
         /* lc is the unmatched char */
         s->dyn_ltree[lc].Freq++;
@@ -1029,175 +1096,8 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc)
                (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&
                (ush)d_code(dist) < (ush)D_CODES,  "_tr_tally: bad match");
 
-        s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++;
+        s->dyn_ltree[_length_code[lc] + LITERALS + 1].Freq++;
         s->dyn_dtree[d_code(dist)].Freq++;
     }
-
-#ifdef TRUNCATE_BLOCK
-    /* Try to guess if it is profitable to stop the current block here */
-    if ((s->last_lit & 0x1fff) == 0 && s->level > 2) {
-        /* Compute an upper bound for the compressed length */
-        ulg out_length = (ulg)s->last_lit*8L;
-        ulg in_length = (ulg)((long)s->strstart - s->block_start);
-        int dcode;
-        for (dcode = 0; dcode < D_CODES; dcode++) {
-            out_length += (ulg)s->dyn_dtree[dcode].Freq *
-                (5L+extra_dbits[dcode]);
-        }
-        out_length >>= 3;
-        Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",
-               s->last_lit, in_length, out_length,
-               100L - out_length*100L/in_length));
-        if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1;
-    }
-#endif
-    return (s->last_lit == s->lit_bufsize-1);
-    /* We avoid equality with lit_bufsize because of wraparound at 64K
-     * on 16 bit machines and because stored blocks are restricted to
-     * 64K-1 bytes.
-     */
-}
-
-/* ===========================================================================
- * Send the block data compressed using the given Huffman trees
- */
-local void compress_block(s, ltree, dtree)
-    deflate_state *s;
-    const ct_data *ltree; /* literal tree */
-    const ct_data *dtree; /* distance tree */
-{
-    unsigned dist;      /* distance of matched string */
-    int lc;             /* match length or unmatched char (if dist == 0) */
-    unsigned lx = 0;    /* running index in l_buf */
-    unsigned code;      /* the code to send */
-    int extra;          /* number of extra bits to send */
-
-    if (s->last_lit != 0) do {
-        dist = s->d_buf[lx];
-        lc = s->l_buf[lx++];
-        if (dist == 0) {
-            send_code(s, lc, ltree); /* send a literal byte */
-            Tracecv(isgraph(lc), (stderr," '%c' ", lc));
-        } else {
-            /* Here, lc is the match length - MIN_MATCH */
-            code = _length_code[lc];
-            send_code(s, code+LITERALS+1, ltree); /* send the length code */
-            extra = extra_lbits[code];
-            if (extra != 0) {
-                lc -= base_length[code];
-                send_bits(s, lc, extra);       /* send the extra length bits */
-            }
-            dist--; /* dist is now the match distance - 1 */
-            code = d_code(dist);
-            Assert (code < D_CODES, "bad d_code");
-
-            send_code(s, code, dtree);       /* send the distance code */
-            extra = extra_dbits[code];
-            if (extra != 0) {
-                dist -= (unsigned)base_dist[code];
-                send_bits(s, dist, extra);   /* send the extra distance bits */
-            }
-        } /* literal or match pair ? */
-
-        /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */
-        Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx,
-               "pendingBuf overflow");
-
-    } while (lx < s->last_lit);
-
-    send_code(s, END_BLOCK, ltree);
-}
-
-/* ===========================================================================
- * Check if the data type is TEXT or BINARY, using the following algorithm:
- * - TEXT if the two conditions below are satisfied:
- *    a) There are no non-portable control characters belonging to the
- *       "black list" (0..6, 14..25, 28..31).
- *    b) There is at least one printable character belonging to the
- *       "white list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255).
- * - BINARY otherwise.
- * - The following partially-portable control characters form a
- *   "gray list" that is ignored in this detection algorithm:
- *   (7 {BEL}, 8 {BS}, 11 {VT}, 12 {FF}, 26 {SUB}, 27 {ESC}).
- * IN assertion: the fields Freq of dyn_ltree are set.
- */
-local int detect_data_type(s)
-    deflate_state *s;
-{
-    /* black_mask is the bit mask of black-listed bytes
-     * set bits 0..6, 14..25, and 28..31
-     * 0xf3ffc07f = binary 11110011111111111100000001111111
-     */
-    unsigned long black_mask = 0xf3ffc07fUL;
-    int n;
-
-    /* Check for non-textual ("black-listed") bytes. */
-    for (n = 0; n <= 31; n++, black_mask >>= 1)
-        if ((black_mask & 1) && (s->dyn_ltree[n].Freq != 0))
-            return Z_BINARY;
-
-    /* Check for textual ("white-listed") bytes. */
-    if (s->dyn_ltree[9].Freq != 0 || s->dyn_ltree[10].Freq != 0
-            || s->dyn_ltree[13].Freq != 0)
-        return Z_TEXT;
-    for (n = 32; n < LITERALS; n++)
-        if (s->dyn_ltree[n].Freq != 0)
-            return Z_TEXT;
-
-    /* There are no "black-listed" or "white-listed" bytes:
-     * this stream either is empty or has tolerated ("gray-listed") bytes only.
-     */
-    return Z_BINARY;
-}
-
-/* ===========================================================================
- * Reverse the first len bits of a code, using straightforward code (a faster
- * method would use a table)
- * IN assertion: 1 <= len <= 15
- */
-local unsigned bi_reverse(code, len)
-    unsigned code; /* the value to invert */
-    int len;       /* its bit length */
-{
-    register unsigned res = 0;
-    do {
-        res |= code & 1;
-        code >>= 1, res <<= 1;
-    } while (--len > 0);
-    return res >> 1;
-}
-
-/* ===========================================================================
- * Flush the bit buffer, keeping at most 7 bits in it.
- */
-local void bi_flush(s)
-    deflate_state *s;
-{
-    if (s->bi_valid == 16) {
-        put_short(s, s->bi_buf);
-        s->bi_buf = 0;
-        s->bi_valid = 0;
-    } else if (s->bi_valid >= 8) {
-        put_byte(s, (Byte)s->bi_buf);
-        s->bi_buf >>= 8;
-        s->bi_valid -= 8;
-    }
-}
-
-/* ===========================================================================
- * Flush the bit buffer and align the output on a byte boundary
- */
-local void bi_windup(s)
-    deflate_state *s;
-{
-    if (s->bi_valid > 8) {
-        put_short(s, s->bi_buf);
-    } else if (s->bi_valid > 0) {
-        put_byte(s, (Byte)s->bi_buf);
-    }
-    s->bi_buf = 0;
-    s->bi_valid = 0;
-#ifdef ZLIB_DEBUG
-    s->bits_sent = (s->bits_sent+7) & ~7;
-#endif
+    return (s->sym_next == s->sym_end);
 }
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/uncompr.c b/extern/crashpad/crashpad/third_party/zlib/zlib/uncompr.c
index f03a1a865e..5e256663b4 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/uncompr.c
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/uncompr.c
@@ -24,12 +24,8 @@
    Z_DATA_ERROR if the input data was corrupted, including if the input data is
    an incomplete zlib stream.
 */
-int ZEXPORT uncompress2 (dest, destLen, source, sourceLen)
-    Bytef *dest;
-    uLongf *destLen;
-    const Bytef *source;
-    uLong *sourceLen;
-{
+int ZEXPORT uncompress2(Bytef *dest, uLongf *destLen, const Bytef *source,
+                        uLong *sourceLen) {
     z_stream stream;
     int err;
     const uInt max = (uInt)-1;
@@ -83,11 +79,7 @@ int ZEXPORT uncompress2 (dest, destLen, source, sourceLen)
            err;
 }
 
-int ZEXPORT uncompress (dest, destLen, source, sourceLen)
-    Bytef *dest;
-    uLongf *destLen;
-    const Bytef *source;
-    uLong sourceLen;
-{
+int ZEXPORT uncompress(Bytef *dest, uLongf *destLen, const Bytef *source,
+                       uLong sourceLen) {
     return uncompress2(dest, destLen, source, &sourceLen);
 }
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/x86.c b/extern/crashpad/crashpad/third_party/zlib/zlib/x86.c
deleted file mode 100644
index e56fe8b85a..0000000000
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/x86.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * x86 feature check
- *
- * Copyright (C) 2013 Intel Corporation. All rights reserved.
- * Author:
- *  Jim Kukunas
- * 
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "x86.h"
-#include "zutil.h"
-
-int ZLIB_INTERNAL x86_cpu_enable_simd = 0;
-
-#ifndef _MSC_VER
-#include <pthread.h>
-
-pthread_once_t cpu_check_inited_once = PTHREAD_ONCE_INIT;
-static void _x86_check_features(void);
-
-void x86_check_features(void)
-{
-  pthread_once(&cpu_check_inited_once, _x86_check_features);
-}
-
-static void _x86_check_features(void)
-{
-    int x86_cpu_has_sse2;
-    int x86_cpu_has_sse42;
-    int x86_cpu_has_pclmulqdq;
-    unsigned eax, ebx, ecx, edx;
-
-    eax = 1;
-#ifdef __i386__
-    __asm__ __volatile__ (
-        "xchg %%ebx, %1\n\t"
-        "cpuid\n\t"
-        "xchg %1, %%ebx\n\t"
-    : "+a" (eax), "=S" (ebx), "=c" (ecx), "=d" (edx)
-    );
-#else
-    __asm__ __volatile__ (
-        "cpuid\n\t"
-    : "+a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)
-    );
-#endif  /* (__i386__) */
-
-    x86_cpu_has_sse2 = edx & 0x4000000;
-    x86_cpu_has_sse42 = ecx & 0x100000;
-    x86_cpu_has_pclmulqdq = ecx & 0x2;
-
-    x86_cpu_enable_simd = x86_cpu_has_sse2 &&
-                          x86_cpu_has_sse42 &&
-                          x86_cpu_has_pclmulqdq;
-}
-#else
-#include <intrin.h>
-#include <windows.h>
-
-static BOOL CALLBACK _x86_check_features(PINIT_ONCE once,
-                                         PVOID param,
-                                         PVOID *context);
-static INIT_ONCE cpu_check_inited_once = INIT_ONCE_STATIC_INIT;
-
-void x86_check_features(void)
-{
-    InitOnceExecuteOnce(&cpu_check_inited_once, _x86_check_features,
-                        NULL, NULL);
-}
-
-static BOOL CALLBACK _x86_check_features(PINIT_ONCE once,
-                                         PVOID param,
-                                         PVOID *context)
-{
-    int x86_cpu_has_sse2;
-    int x86_cpu_has_sse42;
-    int x86_cpu_has_pclmulqdq;
-    int regs[4];
-
-    __cpuid(regs, 1);
-
-    x86_cpu_has_sse2 = regs[3] & 0x4000000;
-    x86_cpu_has_sse42= regs[2] & 0x100000;
-    x86_cpu_has_pclmulqdq = regs[2] & 0x2;
-
-    x86_cpu_enable_simd = x86_cpu_has_sse2 &&
-                          x86_cpu_has_sse42 &&
-                          x86_cpu_has_pclmulqdq;
-    return TRUE;
-}
-#endif  /* _MSC_VER */
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/x86.h b/extern/crashpad/crashpad/third_party/zlib/zlib/x86.h
deleted file mode 100644
index ebcf10ab09..0000000000
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/x86.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* x86.h -- check for x86 CPU features
-* Copyright (C) 2013 Intel Corporation Jim Kukunas
-* For conditions of distribution and use, see copyright notice in zlib.h
-*/
-
-#ifndef X86_H
-#define X86_H
-
-#include "zlib.h"
-
-extern int x86_cpu_enable_simd;
-
-void x86_check_features(void);
-
-#endif  /* X86_H */
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/zconf.h b/extern/crashpad/crashpad/third_party/zlib/zlib/zconf.h
index a7a815f575..55fe101da6 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/zconf.h
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/zconf.h
@@ -8,8 +8,17 @@
 #ifndef ZCONF_H
 #define ZCONF_H
 
-/* This include does prefixing as below, but with an updated set of names */
-#include "names.h"
+/*
+ * This library is also built as a part of AOSP, which does not need to include
+ * chromeconf.h. This config does not want chromeconf.h, so it can set this
+ * macro to opt out. While this works today, there's no guarantee that building
+ * zlib outside of Chromium keeps working in the future.
+ */
+#if !defined(CHROMIUM_ZLIB_NO_CHROMECONF)
+/* This include does prefixing as below, but with an updated set of names.  Also
+ * sets up export macros in component builds. */
+#include "chromeconf.h"
+#endif
 
 /*
  * If you *really* need a unique prefix for all types and library functions,
@@ -41,6 +50,9 @@
 #  define crc32                 z_crc32
 #  define crc32_combine         z_crc32_combine
 #  define crc32_combine64       z_crc32_combine64
+#  define crc32_combine_gen     z_crc32_combine_gen
+#  define crc32_combine_gen64   z_crc32_combine_gen64
+#  define crc32_combine_op      z_crc32_combine_op
 #  define crc32_z               z_crc32_z
 #  define deflate               z_deflate
 #  define deflateBound          z_deflateBound
@@ -241,7 +253,11 @@
 #endif
 
 #ifdef Z_SOLO
-   typedef unsigned long z_size_t;
+#  ifdef _WIN64
+     typedef unsigned long long z_size_t;
+#  else
+     typedef unsigned long z_size_t;
+#  endif
 #else
 #  define z_longlong long long
 #  if defined(NO_SIZE_T)
@@ -352,6 +368,9 @@
 #    ifdef FAR
 #      undef FAR
 #    endif
+#    ifndef WIN32_LEAN_AND_MEAN
+#      define WIN32_LEAN_AND_MEAN
+#    endif
 #    include <windows.h>
      /* No need for _export, use ZLIB.DEF instead. */
      /* For complete Windows compatibility, use WINAPI, not __stdcall. */
@@ -389,6 +408,9 @@
 #ifndef FAR
 #  define FAR
 #endif
+#ifndef far
+#  define far
+#endif
 
 #if !defined(__MACTYPES__)
 typedef unsigned char  Byte;  /* 8 bits */
@@ -470,11 +492,18 @@ typedef uLong FAR uLongf;
 #  undef _LARGEFILE64_SOURCE
 #endif
 
-#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
-#  define Z_HAVE_UNISTD_H
+#ifndef Z_HAVE_UNISTD_H
+#  ifdef __WATCOMC__
+#    define Z_HAVE_UNISTD_H
+#  endif
+#endif
+#ifndef Z_HAVE_UNISTD_H
+#  if defined(_LARGEFILE64_SOURCE) && !defined(_WIN32)
+#    define Z_HAVE_UNISTD_H
+#  endif
 #endif
 #ifndef Z_SOLO
-#  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
+#  if defined(Z_HAVE_UNISTD_H)
 #    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
 #    ifdef VMS
 #      include <unixio.h>       /* for off_t */
@@ -510,7 +539,7 @@ typedef uLong FAR uLongf;
 #if !defined(_WIN32) && defined(Z_LARGE64)
 #  define z_off64_t off64_t
 #else
-#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
+#  if defined(_WIN32) && !defined(__GNUC__)
 #    define z_off64_t __int64
 #  else
 #    define z_off64_t z_off_t
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/zconf.h.cmakein b/extern/crashpad/crashpad/third_party/zlib/zlib/zconf.h.cmakein
new file mode 100644
index 0000000000..310c43928a
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/zconf.h.cmakein
@@ -0,0 +1,553 @@
+/* zconf.h -- configuration of the zlib compression library
+ * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#ifndef ZCONF_H
+#define ZCONF_H
+#cmakedefine Z_PREFIX
+#cmakedefine Z_HAVE_UNISTD_H
+
+/*
+ * If you *really* need a unique prefix for all types and library functions,
+ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
+ * Even better than compiling with -DZ_PREFIX would be to use configure to set
+ * this permanently in zconf.h using "./configure --zprefix".
+ */
+#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
+#  define Z_PREFIX_SET
+
+/* all linked symbols and init macros */
+#  define _dist_code            z__dist_code
+#  define _length_code          z__length_code
+#  define _tr_align             z__tr_align
+#  define _tr_flush_bits        z__tr_flush_bits
+#  define _tr_flush_block       z__tr_flush_block
+#  define _tr_init              z__tr_init
+#  define _tr_stored_block      z__tr_stored_block
+#  define _tr_tally             z__tr_tally
+#  define adler32               z_adler32
+#  define adler32_combine       z_adler32_combine
+#  define adler32_combine64     z_adler32_combine64
+#  define adler32_z             z_adler32_z
+#  ifndef Z_SOLO
+#    define compress              z_compress
+#    define compress2             z_compress2
+#    define compressBound         z_compressBound
+#  endif
+#  define crc32                 z_crc32
+#  define crc32_combine         z_crc32_combine
+#  define crc32_combine64       z_crc32_combine64
+#  define crc32_combine_gen     z_crc32_combine_gen
+#  define crc32_combine_gen64   z_crc32_combine_gen64
+#  define crc32_combine_op      z_crc32_combine_op
+#  define crc32_z               z_crc32_z
+#  define deflate               z_deflate
+#  define deflateBound          z_deflateBound
+#  define deflateCopy           z_deflateCopy
+#  define deflateEnd            z_deflateEnd
+#  define deflateGetDictionary  z_deflateGetDictionary
+#  define deflateInit           z_deflateInit
+#  define deflateInit2          z_deflateInit2
+#  define deflateInit2_         z_deflateInit2_
+#  define deflateInit_          z_deflateInit_
+#  define deflateParams         z_deflateParams
+#  define deflatePending        z_deflatePending
+#  define deflatePrime          z_deflatePrime
+#  define deflateReset          z_deflateReset
+#  define deflateResetKeep      z_deflateResetKeep
+#  define deflateSetDictionary  z_deflateSetDictionary
+#  define deflateSetHeader      z_deflateSetHeader
+#  define deflateTune           z_deflateTune
+#  define deflate_copyright     z_deflate_copyright
+#  define get_crc_table         z_get_crc_table
+#  ifndef Z_SOLO
+#    define gz_error              z_gz_error
+#    define gz_intmax             z_gz_intmax
+#    define gz_strwinerror        z_gz_strwinerror
+#    define gzbuffer              z_gzbuffer
+#    define gzclearerr            z_gzclearerr
+#    define gzclose               z_gzclose
+#    define gzclose_r             z_gzclose_r
+#    define gzclose_w             z_gzclose_w
+#    define gzdirect              z_gzdirect
+#    define gzdopen               z_gzdopen
+#    define gzeof                 z_gzeof
+#    define gzerror               z_gzerror
+#    define gzflush               z_gzflush
+#    define gzfread               z_gzfread
+#    define gzfwrite              z_gzfwrite
+#    define gzgetc                z_gzgetc
+#    define gzgetc_               z_gzgetc_
+#    define gzgets                z_gzgets
+#    define gzoffset              z_gzoffset
+#    define gzoffset64            z_gzoffset64
+#    define gzopen                z_gzopen
+#    define gzopen64              z_gzopen64
+#    ifdef _WIN32
+#      define gzopen_w              z_gzopen_w
+#    endif
+#    define gzprintf              z_gzprintf
+#    define gzputc                z_gzputc
+#    define gzputs                z_gzputs
+#    define gzread                z_gzread
+#    define gzrewind              z_gzrewind
+#    define gzseek                z_gzseek
+#    define gzseek64              z_gzseek64
+#    define gzsetparams           z_gzsetparams
+#    define gztell                z_gztell
+#    define gztell64              z_gztell64
+#    define gzungetc              z_gzungetc
+#    define gzvprintf             z_gzvprintf
+#    define gzwrite               z_gzwrite
+#  endif
+#  define inflate               z_inflate
+#  define inflateBack           z_inflateBack
+#  define inflateBackEnd        z_inflateBackEnd
+#  define inflateBackInit       z_inflateBackInit
+#  define inflateBackInit_      z_inflateBackInit_
+#  define inflateCodesUsed      z_inflateCodesUsed
+#  define inflateCopy           z_inflateCopy
+#  define inflateEnd            z_inflateEnd
+#  define inflateGetDictionary  z_inflateGetDictionary
+#  define inflateGetHeader      z_inflateGetHeader
+#  define inflateInit           z_inflateInit
+#  define inflateInit2          z_inflateInit2
+#  define inflateInit2_         z_inflateInit2_
+#  define inflateInit_          z_inflateInit_
+#  define inflateMark           z_inflateMark
+#  define inflatePrime          z_inflatePrime
+#  define inflateReset          z_inflateReset
+#  define inflateReset2         z_inflateReset2
+#  define inflateResetKeep      z_inflateResetKeep
+#  define inflateSetDictionary  z_inflateSetDictionary
+#  define inflateSync           z_inflateSync
+#  define inflateSyncPoint      z_inflateSyncPoint
+#  define inflateUndermine      z_inflateUndermine
+#  define inflateValidate       z_inflateValidate
+#  define inflate_copyright     z_inflate_copyright
+#  define inflate_fast          z_inflate_fast
+#  define inflate_table         z_inflate_table
+#  ifndef Z_SOLO
+#    define uncompress            z_uncompress
+#    define uncompress2           z_uncompress2
+#  endif
+#  define zError                z_zError
+#  ifndef Z_SOLO
+#    define zcalloc               z_zcalloc
+#    define zcfree                z_zcfree
+#  endif
+#  define zlibCompileFlags      z_zlibCompileFlags
+#  define zlibVersion           z_zlibVersion
+
+/* all zlib typedefs in zlib.h and zconf.h */
+#  define Byte                  z_Byte
+#  define Bytef                 z_Bytef
+#  define alloc_func            z_alloc_func
+#  define charf                 z_charf
+#  define free_func             z_free_func
+#  ifndef Z_SOLO
+#    define gzFile                z_gzFile
+#  endif
+#  define gz_header             z_gz_header
+#  define gz_headerp            z_gz_headerp
+#  define in_func               z_in_func
+#  define intf                  z_intf
+#  define out_func              z_out_func
+#  define uInt                  z_uInt
+#  define uIntf                 z_uIntf
+#  define uLong                 z_uLong
+#  define uLongf                z_uLongf
+#  define voidp                 z_voidp
+#  define voidpc                z_voidpc
+#  define voidpf                z_voidpf
+
+/* all zlib structs in zlib.h and zconf.h */
+#  define gz_header_s           z_gz_header_s
+#  define internal_state        z_internal_state
+
+#endif
+
+#if defined(__MSDOS__) && !defined(MSDOS)
+#  define MSDOS
+#endif
+#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
+#  define OS2
+#endif
+#if defined(_WINDOWS) && !defined(WINDOWS)
+#  define WINDOWS
+#endif
+#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
+#  ifndef WIN32
+#    define WIN32
+#  endif
+#endif
+#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
+#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
+#    ifndef SYS16BIT
+#      define SYS16BIT
+#    endif
+#  endif
+#endif
+
+/*
+ * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
+ * than 64k bytes at a time (needed on systems with 16-bit int).
+ */
+#ifdef SYS16BIT
+#  define MAXSEG_64K
+#endif
+#ifdef MSDOS
+#  define UNALIGNED_OK
+#endif
+
+#ifdef __STDC_VERSION__
+#  ifndef STDC
+#    define STDC
+#  endif
+#  if __STDC_VERSION__ >= 199901L
+#    ifndef STDC99
+#      define STDC99
+#    endif
+#  endif
+#endif
+#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
+#  define STDC
+#endif
+
+#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
+#  define STDC
+#endif
+
+#ifndef STDC
+#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
+#    define const       /* note: need a more gentle solution here */
+#  endif
+#endif
+
+#if defined(ZLIB_CONST) && !defined(z_const)
+#  define z_const const
+#else
+#  define z_const
+#endif
+
+#ifdef Z_SOLO
+#  ifdef _WIN64
+     typedef unsigned long long z_size_t;
+#  else
+     typedef unsigned long z_size_t;
+#  endif
+#else
+#  define z_longlong long long
+#  if defined(NO_SIZE_T)
+     typedef unsigned NO_SIZE_T z_size_t;
+#  elif defined(STDC)
+#    include <stddef.h>
+     typedef size_t z_size_t;
+#  else
+     typedef unsigned long z_size_t;
+#  endif
+#  undef z_longlong
+#endif
+
+/* Maximum value for memLevel in deflateInit2 */
+#ifndef MAX_MEM_LEVEL
+#  ifdef MAXSEG_64K
+#    define MAX_MEM_LEVEL 8
+#  else
+#    define MAX_MEM_LEVEL 9
+#  endif
+#endif
+
+/* Maximum value for windowBits in deflateInit2 and inflateInit2.
+ * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
+ * created by gzip. (Files created by minigzip can still be extracted by
+ * gzip.)
+ */
+#ifndef MAX_WBITS
+#  define MAX_WBITS   15 /* 32K LZ77 window */
+#endif
+
+/* The memory requirements for deflate are (in bytes):
+            (1 << (windowBits+2)) +  (1 << (memLevel+9))
+ that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
+ plus a few kilobytes for small objects. For example, if you want to reduce
+ the default memory requirements from 256K to 128K, compile with
+     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
+ Of course this will generally degrade compression (there's no free lunch).
+
+   The memory requirements for inflate are (in bytes) 1 << windowBits
+ that is, 32K for windowBits=15 (default value) plus about 7 kilobytes
+ for small objects.
+*/
+
+                        /* Type declarations */
+
+#ifndef OF /* function prototypes */
+#  ifdef STDC
+#    define OF(args)  args
+#  else
+#    define OF(args)  ()
+#  endif
+#endif
+
+#ifndef Z_ARG /* function prototypes for stdarg */
+#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#    define Z_ARG(args)  args
+#  else
+#    define Z_ARG(args)  ()
+#  endif
+#endif
+
+/* The following definitions for FAR are needed only for MSDOS mixed
+ * model programming (small or medium model with some far allocations).
+ * This was tested only with MSC; for other MSDOS compilers you may have
+ * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
+ * just define FAR to be empty.
+ */
+#ifdef SYS16BIT
+#  if defined(M_I86SM) || defined(M_I86MM)
+     /* MSC small or medium model */
+#    define SMALL_MEDIUM
+#    ifdef _MSC_VER
+#      define FAR _far
+#    else
+#      define FAR far
+#    endif
+#  endif
+#  if (defined(__SMALL__) || defined(__MEDIUM__))
+     /* Turbo C small or medium model */
+#    define SMALL_MEDIUM
+#    ifdef __BORLANDC__
+#      define FAR _far
+#    else
+#      define FAR far
+#    endif
+#  endif
+#endif
+
+#if defined(WINDOWS) || defined(WIN32)
+   /* If building or using zlib as a DLL, define ZLIB_DLL.
+    * This is not mandatory, but it offers a little performance increase.
+    */
+#  ifdef ZLIB_DLL
+#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
+#      ifdef ZLIB_INTERNAL
+#        define ZEXTERN extern __declspec(dllexport)
+#      else
+#        define ZEXTERN extern __declspec(dllimport)
+#      endif
+#    endif
+#  endif  /* ZLIB_DLL */
+   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
+    * define ZLIB_WINAPI.
+    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
+    */
+#  ifdef ZLIB_WINAPI
+#    ifdef FAR
+#      undef FAR
+#    endif
+#    ifndef WIN32_LEAN_AND_MEAN
+#      define WIN32_LEAN_AND_MEAN
+#    endif
+#    include <windows.h>
+     /* No need for _export, use ZLIB.DEF instead. */
+     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
+#    define ZEXPORT WINAPI
+#    ifdef WIN32
+#      define ZEXPORTVA WINAPIV
+#    else
+#      define ZEXPORTVA FAR CDECL
+#    endif
+#  endif
+#endif
+
+#if defined (__BEOS__)
+#  ifdef ZLIB_DLL
+#    ifdef ZLIB_INTERNAL
+#      define ZEXPORT   __declspec(dllexport)
+#      define ZEXPORTVA __declspec(dllexport)
+#    else
+#      define ZEXPORT   __declspec(dllimport)
+#      define ZEXPORTVA __declspec(dllimport)
+#    endif
+#  endif
+#endif
+
+#ifndef ZEXTERN
+#  define ZEXTERN extern
+#endif
+#ifndef ZEXPORT
+#  define ZEXPORT
+#endif
+#ifndef ZEXPORTVA
+#  define ZEXPORTVA
+#endif
+
+#ifndef FAR
+#  define FAR
+#endif
+
+#if !defined(__MACTYPES__)
+typedef unsigned char  Byte;  /* 8 bits */
+#endif
+typedef unsigned int   uInt;  /* 16 bits or more */
+typedef unsigned long  uLong; /* 32 bits or more */
+
+#ifdef SMALL_MEDIUM
+   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
+#  define Bytef Byte FAR
+#else
+   typedef Byte  FAR Bytef;
+#endif
+typedef char  FAR charf;
+typedef int   FAR intf;
+typedef uInt  FAR uIntf;
+typedef uLong FAR uLongf;
+
+#ifdef STDC
+   typedef void const *voidpc;
+   typedef void FAR   *voidpf;
+   typedef void       *voidp;
+#else
+   typedef Byte const *voidpc;
+   typedef Byte FAR   *voidpf;
+   typedef Byte       *voidp;
+#endif
+
+#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
+#  include <limits.h>
+#  if (UINT_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned
+#  elif (ULONG_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned long
+#  elif (USHRT_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned short
+#  endif
+#endif
+
+#ifdef Z_U4
+   typedef Z_U4 z_crc_t;
+#else
+   typedef unsigned long z_crc_t;
+#endif
+
+#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
+#  define Z_HAVE_UNISTD_H
+#endif
+
+#ifdef HAVE_STDARG_H    /* may be set to #if 1 by ./configure */
+#  define Z_HAVE_STDARG_H
+#endif
+
+#ifdef STDC
+#  ifndef Z_SOLO
+#    include <sys/types.h>      /* for off_t */
+#  endif
+#endif
+
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#  ifndef Z_SOLO
+#    include <stdarg.h>         /* for va_list */
+#  endif
+#endif
+
+#ifdef _WIN32
+#  ifndef Z_SOLO
+#    include <stddef.h>         /* for wchar_t */
+#  endif
+#endif
+
+/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
+ * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
+ * though the former does not conform to the LFS document), but considering
+ * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
+ * equivalently requesting no 64-bit operations
+ */
+#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
+#  undef _LARGEFILE64_SOURCE
+#endif
+
+#ifndef Z_HAVE_UNISTD_H
+#  ifdef __WATCOMC__
+#    define Z_HAVE_UNISTD_H
+#  endif
+#endif
+#ifndef Z_HAVE_UNISTD_H
+#  if defined(_LARGEFILE64_SOURCE) && !defined(_WIN32)
+#    define Z_HAVE_UNISTD_H
+#  endif
+#endif
+#ifndef Z_SOLO
+#  if defined(Z_HAVE_UNISTD_H)
+#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
+#    ifdef VMS
+#      include <unixio.h>       /* for off_t */
+#    endif
+#    ifndef z_off_t
+#      define z_off_t off_t
+#    endif
+#  endif
+#endif
+
+#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
+#  define Z_LFS64
+#endif
+
+#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
+#  define Z_LARGE64
+#endif
+
+#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
+#  define Z_WANT64
+#endif
+
+#if !defined(SEEK_SET) && !defined(Z_SOLO)
+#  define SEEK_SET        0       /* Seek from beginning of file.  */
+#  define SEEK_CUR        1       /* Seek from current position.  */
+#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
+#endif
+
+#ifndef z_off_t
+#  define z_off_t long
+#endif
+
+#if !defined(_WIN32) && defined(Z_LARGE64)
+#  define z_off64_t off64_t
+#else
+#  if defined(_WIN32) && !defined(__GNUC__)
+#    define z_off64_t __int64
+#  else
+#    define z_off64_t z_off_t
+#  endif
+#endif
+
+/* MVS linker does not support external names larger than 8 bytes */
+#if defined(__MVS__)
+  #pragma map(deflateInit_,"DEIN")
+  #pragma map(deflateInit2_,"DEIN2")
+  #pragma map(deflateEnd,"DEEND")
+  #pragma map(deflateBound,"DEBND")
+  #pragma map(inflateInit_,"ININ")
+  #pragma map(inflateInit2_,"ININ2")
+  #pragma map(inflateEnd,"INEND")
+  #pragma map(inflateSync,"INSY")
+  #pragma map(inflateSetDictionary,"INSEDI")
+  #pragma map(compressBound,"CMBND")
+  #pragma map(inflate_table,"INTABL")
+  #pragma map(inflate_fast,"INFA")
+  #pragma map(inflate_copyright,"INCOPY")
+#endif
+
+#endif /* ZCONF_H */
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/zconf.h.in b/extern/crashpad/crashpad/third_party/zlib/zlib/zconf.h.in
new file mode 100644
index 0000000000..fb76ffe312
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/zconf.h.in
@@ -0,0 +1,551 @@
+/* zconf.h -- configuration of the zlib compression library
+ * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#ifndef ZCONF_H
+#define ZCONF_H
+
+/*
+ * If you *really* need a unique prefix for all types and library functions,
+ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
+ * Even better than compiling with -DZ_PREFIX would be to use configure to set
+ * this permanently in zconf.h using "./configure --zprefix".
+ */
+#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
+#  define Z_PREFIX_SET
+
+/* all linked symbols and init macros */
+#  define _dist_code            z__dist_code
+#  define _length_code          z__length_code
+#  define _tr_align             z__tr_align
+#  define _tr_flush_bits        z__tr_flush_bits
+#  define _tr_flush_block       z__tr_flush_block
+#  define _tr_init              z__tr_init
+#  define _tr_stored_block      z__tr_stored_block
+#  define _tr_tally             z__tr_tally
+#  define adler32               z_adler32
+#  define adler32_combine       z_adler32_combine
+#  define adler32_combine64     z_adler32_combine64
+#  define adler32_z             z_adler32_z
+#  ifndef Z_SOLO
+#    define compress              z_compress
+#    define compress2             z_compress2
+#    define compressBound         z_compressBound
+#  endif
+#  define crc32                 z_crc32
+#  define crc32_combine         z_crc32_combine
+#  define crc32_combine64       z_crc32_combine64
+#  define crc32_combine_gen     z_crc32_combine_gen
+#  define crc32_combine_gen64   z_crc32_combine_gen64
+#  define crc32_combine_op      z_crc32_combine_op
+#  define crc32_z               z_crc32_z
+#  define deflate               z_deflate
+#  define deflateBound          z_deflateBound
+#  define deflateCopy           z_deflateCopy
+#  define deflateEnd            z_deflateEnd
+#  define deflateGetDictionary  z_deflateGetDictionary
+#  define deflateInit           z_deflateInit
+#  define deflateInit2          z_deflateInit2
+#  define deflateInit2_         z_deflateInit2_
+#  define deflateInit_          z_deflateInit_
+#  define deflateParams         z_deflateParams
+#  define deflatePending        z_deflatePending
+#  define deflatePrime          z_deflatePrime
+#  define deflateReset          z_deflateReset
+#  define deflateResetKeep      z_deflateResetKeep
+#  define deflateSetDictionary  z_deflateSetDictionary
+#  define deflateSetHeader      z_deflateSetHeader
+#  define deflateTune           z_deflateTune
+#  define deflate_copyright     z_deflate_copyright
+#  define get_crc_table         z_get_crc_table
+#  ifndef Z_SOLO
+#    define gz_error              z_gz_error
+#    define gz_intmax             z_gz_intmax
+#    define gz_strwinerror        z_gz_strwinerror
+#    define gzbuffer              z_gzbuffer
+#    define gzclearerr            z_gzclearerr
+#    define gzclose               z_gzclose
+#    define gzclose_r             z_gzclose_r
+#    define gzclose_w             z_gzclose_w
+#    define gzdirect              z_gzdirect
+#    define gzdopen               z_gzdopen
+#    define gzeof                 z_gzeof
+#    define gzerror               z_gzerror
+#    define gzflush               z_gzflush
+#    define gzfread               z_gzfread
+#    define gzfwrite              z_gzfwrite
+#    define gzgetc                z_gzgetc
+#    define gzgetc_               z_gzgetc_
+#    define gzgets                z_gzgets
+#    define gzoffset              z_gzoffset
+#    define gzoffset64            z_gzoffset64
+#    define gzopen                z_gzopen
+#    define gzopen64              z_gzopen64
+#    ifdef _WIN32
+#      define gzopen_w              z_gzopen_w
+#    endif
+#    define gzprintf              z_gzprintf
+#    define gzputc                z_gzputc
+#    define gzputs                z_gzputs
+#    define gzread                z_gzread
+#    define gzrewind              z_gzrewind
+#    define gzseek                z_gzseek
+#    define gzseek64              z_gzseek64
+#    define gzsetparams           z_gzsetparams
+#    define gztell                z_gztell
+#    define gztell64              z_gztell64
+#    define gzungetc              z_gzungetc
+#    define gzvprintf             z_gzvprintf
+#    define gzwrite               z_gzwrite
+#  endif
+#  define inflate               z_inflate
+#  define inflateBack           z_inflateBack
+#  define inflateBackEnd        z_inflateBackEnd
+#  define inflateBackInit       z_inflateBackInit
+#  define inflateBackInit_      z_inflateBackInit_
+#  define inflateCodesUsed      z_inflateCodesUsed
+#  define inflateCopy           z_inflateCopy
+#  define inflateEnd            z_inflateEnd
+#  define inflateGetDictionary  z_inflateGetDictionary
+#  define inflateGetHeader      z_inflateGetHeader
+#  define inflateInit           z_inflateInit
+#  define inflateInit2          z_inflateInit2
+#  define inflateInit2_         z_inflateInit2_
+#  define inflateInit_          z_inflateInit_
+#  define inflateMark           z_inflateMark
+#  define inflatePrime          z_inflatePrime
+#  define inflateReset          z_inflateReset
+#  define inflateReset2         z_inflateReset2
+#  define inflateResetKeep      z_inflateResetKeep
+#  define inflateSetDictionary  z_inflateSetDictionary
+#  define inflateSync           z_inflateSync
+#  define inflateSyncPoint      z_inflateSyncPoint
+#  define inflateUndermine      z_inflateUndermine
+#  define inflateValidate       z_inflateValidate
+#  define inflate_copyright     z_inflate_copyright
+#  define inflate_fast          z_inflate_fast
+#  define inflate_table         z_inflate_table
+#  ifndef Z_SOLO
+#    define uncompress            z_uncompress
+#    define uncompress2           z_uncompress2
+#  endif
+#  define zError                z_zError
+#  ifndef Z_SOLO
+#    define zcalloc               z_zcalloc
+#    define zcfree                z_zcfree
+#  endif
+#  define zlibCompileFlags      z_zlibCompileFlags
+#  define zlibVersion           z_zlibVersion
+
+/* all zlib typedefs in zlib.h and zconf.h */
+#  define Byte                  z_Byte
+#  define Bytef                 z_Bytef
+#  define alloc_func            z_alloc_func
+#  define charf                 z_charf
+#  define free_func             z_free_func
+#  ifndef Z_SOLO
+#    define gzFile                z_gzFile
+#  endif
+#  define gz_header             z_gz_header
+#  define gz_headerp            z_gz_headerp
+#  define in_func               z_in_func
+#  define intf                  z_intf
+#  define out_func              z_out_func
+#  define uInt                  z_uInt
+#  define uIntf                 z_uIntf
+#  define uLong                 z_uLong
+#  define uLongf                z_uLongf
+#  define voidp                 z_voidp
+#  define voidpc                z_voidpc
+#  define voidpf                z_voidpf
+
+/* all zlib structs in zlib.h and zconf.h */
+#  define gz_header_s           z_gz_header_s
+#  define internal_state        z_internal_state
+
+#endif
+
+#if defined(__MSDOS__) && !defined(MSDOS)
+#  define MSDOS
+#endif
+#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
+#  define OS2
+#endif
+#if defined(_WINDOWS) && !defined(WINDOWS)
+#  define WINDOWS
+#endif
+#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
+#  ifndef WIN32
+#    define WIN32
+#  endif
+#endif
+#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
+#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
+#    ifndef SYS16BIT
+#      define SYS16BIT
+#    endif
+#  endif
+#endif
+
+/*
+ * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
+ * than 64k bytes at a time (needed on systems with 16-bit int).
+ */
+#ifdef SYS16BIT
+#  define MAXSEG_64K
+#endif
+#ifdef MSDOS
+#  define UNALIGNED_OK
+#endif
+
+#ifdef __STDC_VERSION__
+#  ifndef STDC
+#    define STDC
+#  endif
+#  if __STDC_VERSION__ >= 199901L
+#    ifndef STDC99
+#      define STDC99
+#    endif
+#  endif
+#endif
+#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
+#  define STDC
+#endif
+
+#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
+#  define STDC
+#endif
+
+#ifndef STDC
+#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
+#    define const       /* note: need a more gentle solution here */
+#  endif
+#endif
+
+#if defined(ZLIB_CONST) && !defined(z_const)
+#  define z_const const
+#else
+#  define z_const
+#endif
+
+#ifdef Z_SOLO
+#  ifdef _WIN64
+     typedef unsigned long long z_size_t;
+#  else
+     typedef unsigned long z_size_t;
+#  endif
+#else
+#  define z_longlong long long
+#  if defined(NO_SIZE_T)
+     typedef unsigned NO_SIZE_T z_size_t;
+#  elif defined(STDC)
+#    include <stddef.h>
+     typedef size_t z_size_t;
+#  else
+     typedef unsigned long z_size_t;
+#  endif
+#  undef z_longlong
+#endif
+
+/* Maximum value for memLevel in deflateInit2 */
+#ifndef MAX_MEM_LEVEL
+#  ifdef MAXSEG_64K
+#    define MAX_MEM_LEVEL 8
+#  else
+#    define MAX_MEM_LEVEL 9
+#  endif
+#endif
+
+/* Maximum value for windowBits in deflateInit2 and inflateInit2.
+ * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
+ * created by gzip. (Files created by minigzip can still be extracted by
+ * gzip.)
+ */
+#ifndef MAX_WBITS
+#  define MAX_WBITS   15 /* 32K LZ77 window */
+#endif
+
+/* The memory requirements for deflate are (in bytes):
+            (1 << (windowBits+2)) +  (1 << (memLevel+9))
+ that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
+ plus a few kilobytes for small objects. For example, if you want to reduce
+ the default memory requirements from 256K to 128K, compile with
+     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
+ Of course this will generally degrade compression (there's no free lunch).
+
+   The memory requirements for inflate are (in bytes) 1 << windowBits
+ that is, 32K for windowBits=15 (default value) plus about 7 kilobytes
+ for small objects.
+*/
+
+                        /* Type declarations */
+
+#ifndef OF /* function prototypes */
+#  ifdef STDC
+#    define OF(args)  args
+#  else
+#    define OF(args)  ()
+#  endif
+#endif
+
+#ifndef Z_ARG /* function prototypes for stdarg */
+#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#    define Z_ARG(args)  args
+#  else
+#    define Z_ARG(args)  ()
+#  endif
+#endif
+
+/* The following definitions for FAR are needed only for MSDOS mixed
+ * model programming (small or medium model with some far allocations).
+ * This was tested only with MSC; for other MSDOS compilers you may have
+ * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
+ * just define FAR to be empty.
+ */
+#ifdef SYS16BIT
+#  if defined(M_I86SM) || defined(M_I86MM)
+     /* MSC small or medium model */
+#    define SMALL_MEDIUM
+#    ifdef _MSC_VER
+#      define FAR _far
+#    else
+#      define FAR far
+#    endif
+#  endif
+#  if (defined(__SMALL__) || defined(__MEDIUM__))
+     /* Turbo C small or medium model */
+#    define SMALL_MEDIUM
+#    ifdef __BORLANDC__
+#      define FAR _far
+#    else
+#      define FAR far
+#    endif
+#  endif
+#endif
+
+#if defined(WINDOWS) || defined(WIN32)
+   /* If building or using zlib as a DLL, define ZLIB_DLL.
+    * This is not mandatory, but it offers a little performance increase.
+    */
+#  ifdef ZLIB_DLL
+#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
+#      ifdef ZLIB_INTERNAL
+#        define ZEXTERN extern __declspec(dllexport)
+#      else
+#        define ZEXTERN extern __declspec(dllimport)
+#      endif
+#    endif
+#  endif  /* ZLIB_DLL */
+   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
+    * define ZLIB_WINAPI.
+    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
+    */
+#  ifdef ZLIB_WINAPI
+#    ifdef FAR
+#      undef FAR
+#    endif
+#    ifndef WIN32_LEAN_AND_MEAN
+#      define WIN32_LEAN_AND_MEAN
+#    endif
+#    include <windows.h>
+     /* No need for _export, use ZLIB.DEF instead. */
+     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
+#    define ZEXPORT WINAPI
+#    ifdef WIN32
+#      define ZEXPORTVA WINAPIV
+#    else
+#      define ZEXPORTVA FAR CDECL
+#    endif
+#  endif
+#endif
+
+#if defined (__BEOS__)
+#  ifdef ZLIB_DLL
+#    ifdef ZLIB_INTERNAL
+#      define ZEXPORT   __declspec(dllexport)
+#      define ZEXPORTVA __declspec(dllexport)
+#    else
+#      define ZEXPORT   __declspec(dllimport)
+#      define ZEXPORTVA __declspec(dllimport)
+#    endif
+#  endif
+#endif
+
+#ifndef ZEXTERN
+#  define ZEXTERN extern
+#endif
+#ifndef ZEXPORT
+#  define ZEXPORT
+#endif
+#ifndef ZEXPORTVA
+#  define ZEXPORTVA
+#endif
+
+#ifndef FAR
+#  define FAR
+#endif
+
+#if !defined(__MACTYPES__)
+typedef unsigned char  Byte;  /* 8 bits */
+#endif
+typedef unsigned int   uInt;  /* 16 bits or more */
+typedef unsigned long  uLong; /* 32 bits or more */
+
+#ifdef SMALL_MEDIUM
+   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
+#  define Bytef Byte FAR
+#else
+   typedef Byte  FAR Bytef;
+#endif
+typedef char  FAR charf;
+typedef int   FAR intf;
+typedef uInt  FAR uIntf;
+typedef uLong FAR uLongf;
+
+#ifdef STDC
+   typedef void const *voidpc;
+   typedef void FAR   *voidpf;
+   typedef void       *voidp;
+#else
+   typedef Byte const *voidpc;
+   typedef Byte FAR   *voidpf;
+   typedef Byte       *voidp;
+#endif
+
+#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
+#  include <limits.h>
+#  if (UINT_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned
+#  elif (ULONG_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned long
+#  elif (USHRT_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned short
+#  endif
+#endif
+
+#ifdef Z_U4
+   typedef Z_U4 z_crc_t;
+#else
+   typedef unsigned long z_crc_t;
+#endif
+
+#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
+#  define Z_HAVE_UNISTD_H
+#endif
+
+#ifdef HAVE_STDARG_H    /* may be set to #if 1 by ./configure */
+#  define Z_HAVE_STDARG_H
+#endif
+
+#ifdef STDC
+#  ifndef Z_SOLO
+#    include <sys/types.h>      /* for off_t */
+#  endif
+#endif
+
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#  ifndef Z_SOLO
+#    include <stdarg.h>         /* for va_list */
+#  endif
+#endif
+
+#ifdef _WIN32
+#  ifndef Z_SOLO
+#    include <stddef.h>         /* for wchar_t */
+#  endif
+#endif
+
+/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
+ * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
+ * though the former does not conform to the LFS document), but considering
+ * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
+ * equivalently requesting no 64-bit operations
+ */
+#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
+#  undef _LARGEFILE64_SOURCE
+#endif
+
+#ifndef Z_HAVE_UNISTD_H
+#  ifdef __WATCOMC__
+#    define Z_HAVE_UNISTD_H
+#  endif
+#endif
+#ifndef Z_HAVE_UNISTD_H
+#  if defined(_LARGEFILE64_SOURCE) && !defined(_WIN32)
+#    define Z_HAVE_UNISTD_H
+#  endif
+#endif
+#ifndef Z_SOLO
+#  if defined(Z_HAVE_UNISTD_H)
+#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
+#    ifdef VMS
+#      include <unixio.h>       /* for off_t */
+#    endif
+#    ifndef z_off_t
+#      define z_off_t off_t
+#    endif
+#  endif
+#endif
+
+#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
+#  define Z_LFS64
+#endif
+
+#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
+#  define Z_LARGE64
+#endif
+
+#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
+#  define Z_WANT64
+#endif
+
+#if !defined(SEEK_SET) && !defined(Z_SOLO)
+#  define SEEK_SET        0       /* Seek from beginning of file.  */
+#  define SEEK_CUR        1       /* Seek from current position.  */
+#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
+#endif
+
+#ifndef z_off_t
+#  define z_off_t long
+#endif
+
+#if !defined(_WIN32) && defined(Z_LARGE64)
+#  define z_off64_t off64_t
+#else
+#  if defined(_WIN32) && !defined(__GNUC__)
+#    define z_off64_t __int64
+#  else
+#    define z_off64_t z_off_t
+#  endif
+#endif
+
+/* MVS linker does not support external names larger than 8 bytes */
+#if defined(__MVS__)
+  #pragma map(deflateInit_,"DEIN")
+  #pragma map(deflateInit2_,"DEIN2")
+  #pragma map(deflateEnd,"DEEND")
+  #pragma map(deflateBound,"DEBND")
+  #pragma map(inflateInit_,"ININ")
+  #pragma map(inflateInit2_,"ININ2")
+  #pragma map(inflateEnd,"INEND")
+  #pragma map(inflateSync,"INSY")
+  #pragma map(inflateSetDictionary,"INSEDI")
+  #pragma map(compressBound,"CMBND")
+  #pragma map(inflate_table,"INTABL")
+  #pragma map(inflate_fast,"INFA")
+  #pragma map(inflate_copyright,"INCOPY")
+#endif
+
+#endif /* ZCONF_H */
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/zlib.3 b/extern/crashpad/crashpad/third_party/zlib/zlib/zlib.3
new file mode 100644
index 0000000000..e733b5ab65
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/zlib.3
@@ -0,0 +1,149 @@
+.TH ZLIB 3 "xx Oct 2022"
+.SH NAME
+zlib \- compression/decompression library
+.SH SYNOPSIS
+[see
+.I zlib.h
+for full description]
+.SH DESCRIPTION
+The
+.I zlib
+library is a general purpose data compression library.
+The code is thread safe, assuming that the standard library functions
+used are thread safe, such as memory allocation routines.
+It provides in-memory compression and decompression functions,
+including integrity checks of the uncompressed data.
+This version of the library supports only one compression method (deflation)
+but other algorithms may be added later
+with the same stream interface.
+.LP
+Compression can be done in a single step if the buffers are large enough
+or can be done by repeated calls of the compression function.
+In the latter case,
+the application must provide more input and/or consume the output
+(providing more output space) before each call.
+.LP
+The library also supports reading and writing files in
+.IR gzip (1)
+(.gz) format
+with an interface similar to that of stdio.
+.LP
+The library does not install any signal handler.
+The decoder checks the consistency of the compressed data,
+so the library should never crash even in the case of corrupted input.
+.LP
+All functions of the compression library are documented in the file
+.IR zlib.h .
+The distribution source includes examples of use of the library
+in the files
+.I test/example.c
+and
+.IR test/minigzip.c,
+as well as other examples in the
+.IR examples/
+directory.
+.LP
+Changes to this version are documented in the file
+.I ChangeLog
+that accompanies the source.
+.LP
+.I zlib
+is built in to many languages and operating systems, including but not limited to
+Java, Python, .NET, PHP, Perl, Ruby, Swift, and Go.
+.LP
+An experimental package to read and write files in the .zip format,
+written on top of
+.I zlib
+by Gilles Vollant (info@winimage.com),
+is available at:
+.IP
+http://www.winimage.com/zLibDll/minizip.html
+and also in the
+.I contrib/minizip
+directory of the main
+.I zlib
+source distribution.
+.SH "SEE ALSO"
+The
+.I zlib
+web site can be found at:
+.IP
+http://zlib.net/
+.LP
+The data format used by the
+.I zlib
+library is described by RFC
+(Request for Comments) 1950 to 1952 in the files:
+.IP
+http://tools.ietf.org/html/rfc1950 (for the zlib header and trailer format)
+.br
+http://tools.ietf.org/html/rfc1951 (for the deflate compressed data format)
+.br
+http://tools.ietf.org/html/rfc1952 (for the gzip header and trailer format)
+.LP
+Mark Nelson wrote an article about
+.I zlib
+for the Jan. 1997 issue of  Dr. Dobb's Journal;
+a copy of the article is available at:
+.IP
+http://marknelson.us/1997/01/01/zlib-engine/
+.SH "REPORTING PROBLEMS"
+Before reporting a problem,
+please check the
+.I zlib
+web site to verify that you have the latest version of
+.IR zlib ;
+otherwise,
+obtain the latest version and see if the problem still exists.
+Please read the
+.I zlib
+FAQ at:
+.IP
+http://zlib.net/zlib_faq.html
+.LP
+before asking for help.
+Send questions and/or comments to zlib@gzip.org,
+or (for the Windows DLL version) to Gilles Vollant (info@winimage.com).
+.SH AUTHORS AND LICENSE
+Version 1.2.13.1
+.LP
+Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
+.LP
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+.LP
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+.LP
+.nr step 1 1
+.IP \n[step]. 3
+The origin of this software must not be misrepresented; you must not
+claim that you wrote the original software. If you use this software
+in a product, an acknowledgment in the product documentation would be
+appreciated but is not required.
+.IP \n+[step].
+Altered source versions must be plainly marked as such, and must not be
+misrepresented as being the original software.
+.IP \n+[step].
+This notice may not be removed or altered from any source distribution.
+.LP
+Jean-loup Gailly        Mark Adler
+.br
+jloup@gzip.org          madler@alumni.caltech.edu
+.LP
+The deflate format used by
+.I zlib
+was defined by Phil Katz.
+The deflate and
+.I zlib
+specifications were written by L. Peter Deutsch.
+Thanks to all the people who reported problems and suggested various
+improvements in
+.IR zlib ;
+who are too numerous to cite here.
+.LP
+UNIX manual page by R. P. C. Rodgers,
+U.S. National Library of Medicine (rodgers@nlm.nih.gov).
+.\" end of man page
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/zlib.h b/extern/crashpad/crashpad/third_party/zlib/zlib/zlib.h
index 99fd467f6b..014331fc8d 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/zlib.h
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/zlib.h
@@ -1,7 +1,7 @@
 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.11, January 15th, 2017
+  version 1.2.13.1, October xxth, 2022
 
-  Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
+  Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -37,12 +37,12 @@
 extern "C" {
 #endif
 
-#define ZLIB_VERSION "1.2.11"
-#define ZLIB_VERNUM 0x12b0
+#define ZLIB_VERSION "1.2.13.1-motley"
+#define ZLIB_VERNUM 0x12d1
 #define ZLIB_VER_MAJOR 1
 #define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 11
-#define ZLIB_VER_SUBREVISION 0
+#define ZLIB_VER_REVISION 13
+#define ZLIB_VER_SUBREVISION 1
 
 /*
     The 'zlib' compression library provides in-memory compression and
@@ -78,8 +78,8 @@ extern "C" {
   even in the case of corrupted input.
 */
 
-typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
-typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
+typedef voidpf (*alloc_func)(voidpf opaque, uInt items, uInt size);
+typedef void   (*free_func)(voidpf opaque, voidpf address);
 
 struct internal_state;
 
@@ -217,7 +217,7 @@ typedef gz_header FAR *gz_headerp;
 
                         /* basic functions */
 
-ZEXTERN const char * ZEXPORT zlibVersion OF((void));
+ZEXTERN const char * ZEXPORT zlibVersion(void);
 /* The application can compare zlibVersion and ZLIB_VERSION for consistency.
    If the first character differs, the library code actually used is not
    compatible with the zlib.h header file used by the application.  This check
@@ -225,7 +225,7 @@ ZEXTERN const char * ZEXPORT zlibVersion OF((void));
  */
 
 /*
-ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
+ZEXTERN int ZEXPORT deflateInit(z_streamp strm, int level);
 
      Initializes the internal stream state for compression.  The fields
    zalloc, zfree and opaque must be initialized before by the caller.  If
@@ -247,7 +247,7 @@ ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
 */
 
 
-ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
+ZEXTERN int ZEXPORT deflate(z_streamp strm, int flush);
 /*
     deflate compresses as much data as possible, and stops when the input
   buffer becomes empty or the output buffer becomes full.  It may introduce
@@ -276,7 +276,7 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
   == 0), or after each call of deflate().  If deflate returns Z_OK and with
   zero avail_out, it must be called again after making room in the output
   buffer because there might be more output pending. See deflatePending(),
-  which can be used if desired to determine whether or not there is more ouput
+  which can be used if desired to determine whether or not there is more output
   in that case.
 
     Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
@@ -359,8 +359,7 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
   continue compressing.
 */
 
-
-ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
+ZEXTERN int ZEXPORT deflateEnd(z_streamp strm);
 /*
      All dynamically allocated data structures for this stream are freed.
    This function discards any unprocessed input and does not flush any pending
@@ -375,7 +374,7 @@ ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
 
 
 /*
-ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
+ZEXTERN int ZEXPORT inflateInit(z_streamp strm);
 
      Initializes the internal stream state for decompression.  The fields
    next_in, avail_in, zalloc, zfree and opaque must be initialized before by
@@ -397,7 +396,7 @@ ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
 */
 
 
-ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
+ZEXTERN int ZEXPORT inflate(z_streamp strm, int flush);
 /*
     inflate decompresses as much data as possible, and stops when the input
   buffer becomes empty or the output buffer becomes full.  It may introduce
@@ -517,7 +516,7 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
 */
 
 
-ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
+ZEXTERN int ZEXPORT inflateEnd(z_streamp strm);
 /*
      All dynamically allocated data structures for this stream are freed.
    This function discards any unprocessed input and does not flush any pending
@@ -535,16 +534,15 @@ ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
 */
 
 /*
-ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
-                                     int  level,
-                                     int  method,
-                                     int  windowBits,
-                                     int  memLevel,
-                                     int  strategy));
+ZEXTERN int ZEXPORT deflateInit2(z_streamp strm,
+                                 int level,
+                                 int method,
+                                 int windowBits,
+                                 int memLevel,
+                                 int strategy);
 
      This is another version of deflateInit with more compression options.  The
-   fields next_in, zalloc, zfree and opaque must be initialized before by the
-   caller.
+   fields zalloc, zfree and opaque must be initialized before by the caller.
 
      The method parameter is the compression method.  It must be Z_DEFLATED in
    this version of the library.
@@ -608,9 +606,9 @@ ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
    compression: this will be done by deflate().
 */
 
-ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
+ZEXTERN int ZEXPORT deflateSetDictionary(z_streamp strm,
+                                         const Bytef *dictionary,
+                                         uInt  dictLength);
 /*
      Initializes the compression dictionary from the given byte sequence
    without producing any compressed output.  When using the zlib format, this
@@ -652,16 +650,16 @@ ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
    not perform any compression: this will be done by deflate().
 */
 
-ZEXTERN int ZEXPORT deflateGetDictionary OF((z_streamp strm,
-                                             Bytef *dictionary,
-                                             uInt  *dictLength));
+ZEXTERN int ZEXPORT deflateGetDictionary(z_streamp strm,
+                                         Bytef *dictionary,
+                                         uInt  *dictLength);
 /*
      Returns the sliding dictionary being maintained by deflate.  dictLength is
    set to the number of bytes in the dictionary, and that many bytes are copied
    to dictionary.  dictionary must have enough space, where 32768 bytes is
    always enough.  If deflateGetDictionary() is called with dictionary equal to
    Z_NULL, then only the dictionary length is returned, and nothing is copied.
-   Similary, if dictLength is Z_NULL, then it is not set.
+   Similarly, if dictLength is Z_NULL, then it is not set.
 
      deflateGetDictionary() may return a length less than the window size, even
    when more than the window size in input has been provided. It may return up
@@ -674,8 +672,8 @@ ZEXTERN int ZEXPORT deflateGetDictionary OF((z_streamp strm,
    stream state is inconsistent.
 */
 
-ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
-                                    z_streamp source));
+ZEXTERN int ZEXPORT deflateCopy(z_streamp dest,
+                                z_streamp source);
 /*
      Sets the destination stream as a complete copy of the source stream.
 
@@ -692,7 +690,7 @@ ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
    destination.
 */
 
-ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
+ZEXTERN int ZEXPORT deflateReset(z_streamp strm);
 /*
      This function is equivalent to deflateEnd followed by deflateInit, but
    does not free and reallocate the internal compression state.  The stream
@@ -703,20 +701,21 @@ ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
    stream state was inconsistent (such as zalloc or state being Z_NULL).
 */
 
-ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
-                                      int level,
-                                      int strategy));
+ZEXTERN int ZEXPORT deflateParams(z_streamp strm,
+                                  int level,
+                                  int strategy);
 /*
      Dynamically update the compression level and compression strategy.  The
    interpretation of level and strategy is as in deflateInit2().  This can be
    used to switch between compression and straight copy of the input data, or
    to switch to a different kind of input data requiring a different strategy.
    If the compression approach (which is a function of the level) or the
-   strategy is changed, and if any input has been consumed in a previous
-   deflate() call, then the input available so far is compressed with the old
-   level and strategy using deflate(strm, Z_BLOCK).  There are three approaches
-   for the compression levels 0, 1..3, and 4..9 respectively.  The new level
-   and strategy will take effect at the next call of deflate().
+   strategy is changed, and if there have been any deflate() calls since the
+   state was initialized or reset, then the input available so far is
+   compressed with the old level and strategy using deflate(strm, Z_BLOCK).
+   There are three approaches for the compression levels 0, 1..3, and 4..9
+   respectively.  The new level and strategy will take effect at the next call
+   of deflate().
 
      If a deflate(strm, Z_BLOCK) is performed by deflateParams(), and it does
    not have enough output space to complete, then the parameter change will not
@@ -729,7 +728,7 @@ ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
    Then no more input data should be provided before the deflateParams() call.
    If this is done, the old level and strategy will be applied to the data
    compressed before deflateParams(), and the new level and strategy will be
-   applied to the the data compressed after deflateParams().
+   applied to the data compressed after deflateParams().
 
      deflateParams returns Z_OK on success, Z_STREAM_ERROR if the source stream
    state was inconsistent or if a parameter was invalid, or Z_BUF_ERROR if
@@ -740,11 +739,11 @@ ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
    retried with more output space.
 */
 
-ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
-                                    int good_length,
-                                    int max_lazy,
-                                    int nice_length,
-                                    int max_chain));
+ZEXTERN int ZEXPORT deflateTune(z_streamp strm,
+                                int good_length,
+                                int max_lazy,
+                                int nice_length,
+                                int max_chain);
 /*
      Fine tune deflate's internal compression parameters.  This should only be
    used by someone who understands the algorithm used by zlib's deflate for
@@ -757,8 +756,8 @@ ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
    returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
  */
 
-ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
-                                       uLong sourceLen));
+ZEXTERN uLong ZEXPORT deflateBound(z_streamp strm,
+                                   uLong sourceLen);
 /*
      deflateBound() returns an upper bound on the compressed size after
    deflation of sourceLen bytes.  It must be called after deflateInit() or
@@ -772,9 +771,9 @@ ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
    than Z_FINISH or Z_NO_FLUSH are used.
 */
 
-ZEXTERN int ZEXPORT deflatePending OF((z_streamp strm,
-                                       unsigned *pending,
-                                       int *bits));
+ZEXTERN int ZEXPORT deflatePending(z_streamp strm,
+                                   unsigned *pending,
+                                   int *bits);
 /*
      deflatePending() returns the number of bytes and bits of output that have
    been generated, but not yet provided in the available output.  The bytes not
@@ -787,9 +786,9 @@ ZEXTERN int ZEXPORT deflatePending OF((z_streamp strm,
    stream state was inconsistent.
  */
 
-ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
-                                     int bits,
-                                     int value));
+ZEXTERN int ZEXPORT deflatePrime(z_streamp strm,
+                                 int bits,
+                                 int value);
 /*
      deflatePrime() inserts bits in the deflate output stream.  The intent
    is that this function is used to start off the deflate output with the bits
@@ -804,8 +803,8 @@ ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
    source stream state was inconsistent.
 */
 
-ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
-                                         gz_headerp head));
+ZEXTERN int ZEXPORT deflateSetHeader(z_streamp strm,
+                                     gz_headerp head);
 /*
      deflateSetHeader() provides gzip header information for when a gzip
    stream is requested by deflateInit2().  deflateSetHeader() may be called
@@ -829,8 +828,8 @@ ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
 */
 
 /*
-ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
-                                     int  windowBits));
+ZEXTERN int ZEXPORT inflateInit2(z_streamp strm,
+                                 int windowBits);
 
      This is another version of inflateInit with an extra parameter.  The
    fields next_in, avail_in, zalloc, zfree and opaque must be initialized
@@ -865,9 +864,11 @@ ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
    detection, or add 16 to decode only the gzip format (the zlib format will
    return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is a
    CRC-32 instead of an Adler-32.  Unlike the gunzip utility and gzread() (see
-   below), inflate() will not automatically decode concatenated gzip streams.
-   inflate() will return Z_STREAM_END at the end of the gzip stream.  The state
-   would need to be reset to continue decoding a subsequent gzip stream.
+   below), inflate() will *not* automatically decode concatenated gzip members.
+   inflate() will return Z_STREAM_END at the end of the gzip member.  The state
+   would need to be reset to continue decoding a subsequent gzip member.  This
+   *must* be done if there is more data after a gzip member, in order for the
+   decompression to be compliant with the gzip standard (RFC 1952).
 
      inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
    memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
@@ -881,9 +882,9 @@ ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
    deferred until inflate() is called.
 */
 
-ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
+ZEXTERN int ZEXPORT inflateSetDictionary(z_streamp strm,
+                                         const Bytef *dictionary,
+                                         uInt  dictLength);
 /*
      Initializes the decompression dictionary from the given uncompressed byte
    sequence.  This function must be called immediately after a call of inflate,
@@ -904,22 +905,22 @@ ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
    inflate().
 */
 
-ZEXTERN int ZEXPORT inflateGetDictionary OF((z_streamp strm,
-                                             Bytef *dictionary,
-                                             uInt  *dictLength));
+ZEXTERN int ZEXPORT inflateGetDictionary(z_streamp strm,
+                                         Bytef *dictionary,
+                                         uInt  *dictLength);
 /*
      Returns the sliding dictionary being maintained by inflate.  dictLength is
    set to the number of bytes in the dictionary, and that many bytes are copied
    to dictionary.  dictionary must have enough space, where 32768 bytes is
    always enough.  If inflateGetDictionary() is called with dictionary equal to
    Z_NULL, then only the dictionary length is returned, and nothing is copied.
-   Similary, if dictLength is Z_NULL, then it is not set.
+   Similarly, if dictLength is Z_NULL, then it is not set.
 
      inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
    stream state is inconsistent.
 */
 
-ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
+ZEXTERN int ZEXPORT inflateSync(z_streamp strm);
 /*
      Skips invalid compressed data until a possible full flush point (see above
    for the description of deflate with Z_FULL_FLUSH) can be found, or until all
@@ -938,8 +939,8 @@ ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
    input each time, until success or end of the input data.
 */
 
-ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
-                                    z_streamp source));
+ZEXTERN int ZEXPORT inflateCopy(z_streamp dest,
+                                z_streamp source);
 /*
      Sets the destination stream as a complete copy of the source stream.
 
@@ -954,7 +955,7 @@ ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
    destination.
 */
 
-ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
+ZEXTERN int ZEXPORT inflateReset(z_streamp strm);
 /*
      This function is equivalent to inflateEnd followed by inflateInit,
    but does not free and reallocate the internal decompression state.  The
@@ -964,8 +965,8 @@ ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
    stream state was inconsistent (such as zalloc or state being Z_NULL).
 */
 
-ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm,
-                                      int windowBits));
+ZEXTERN int ZEXPORT inflateReset2(z_streamp strm,
+                                  int windowBits);
 /*
      This function is the same as inflateReset, but it also permits changing
    the wrap and window size requests.  The windowBits parameter is interpreted
@@ -978,9 +979,9 @@ ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm,
    the windowBits parameter is invalid.
 */
 
-ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
-                                     int bits,
-                                     int value));
+ZEXTERN int ZEXPORT inflatePrime(z_streamp strm,
+                                 int bits,
+                                 int value);
 /*
      This function inserts bits in the inflate input stream.  The intent is
    that this function is used to start inflating at a bit position in the
@@ -999,7 +1000,7 @@ ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
    stream state was inconsistent.
 */
 
-ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm));
+ZEXTERN long ZEXPORT inflateMark(z_streamp strm);
 /*
      This function returns two values, one in the lower 16 bits of the return
    value, and the other in the remaining upper bits, obtained by shifting the
@@ -1027,8 +1028,8 @@ ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm));
    source stream state was inconsistent.
 */
 
-ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
-                                         gz_headerp head));
+ZEXTERN int ZEXPORT inflateGetHeader(z_streamp strm,
+                                     gz_headerp head);
 /*
      inflateGetHeader() requests that gzip header information be stored in the
    provided gz_header structure.  inflateGetHeader() may be called after
@@ -1068,8 +1069,8 @@ ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
 */
 
 /*
-ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
-                                        unsigned char FAR *window));
+ZEXTERN int ZEXPORT inflateBackInit(z_streamp strm, int windowBits,
+                                    unsigned char FAR *window);
 
      Initialize the internal stream state for decompression using inflateBack()
    calls.  The fields zalloc, zfree and opaque in strm must be initialized
@@ -1089,13 +1090,13 @@ ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
    the version of the header file.
 */
 
-typedef unsigned (*in_func) OF((void FAR *,
-                                z_const unsigned char FAR * FAR *));
-typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
+typedef unsigned (*in_func)(void FAR *,
+                            z_const unsigned char FAR * FAR *);
+typedef int (*out_func)(void FAR *, unsigned char FAR *, unsigned);
 
-ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
-                                    in_func in, void FAR *in_desc,
-                                    out_func out, void FAR *out_desc));
+ZEXTERN int ZEXPORT inflateBack(z_streamp strm,
+                                in_func in, void FAR *in_desc,
+                                out_func out, void FAR *out_desc);
 /*
      inflateBack() does a raw inflate with a single call using a call-back
    interface for input and output.  This is potentially more efficient than
@@ -1163,7 +1164,7 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
    cannot return Z_OK.
 */
 
-ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
+ZEXTERN int ZEXPORT inflateBackEnd(z_streamp strm);
 /*
      All memory allocated by inflateBackInit() is freed.
 
@@ -1171,7 +1172,7 @@ ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
    state was inconsistent.
 */
 
-ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
+ZEXTERN uLong ZEXPORT zlibCompileFlags(void);
 /* Return flags indicating compile-time options.
 
     Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
@@ -1224,8 +1225,8 @@ ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
    you need special options.
 */
 
-ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
-                                 const Bytef *source, uLong sourceLen));
+ZEXTERN int ZEXPORT compress(Bytef *dest,   uLongf *destLen,
+                             const Bytef *source, uLong sourceLen);
 /*
      Compresses the source buffer into the destination buffer.  sourceLen is
    the byte length of the source buffer.  Upon entry, destLen is the total size
@@ -1239,9 +1240,9 @@ ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
    buffer.
 */
 
-ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
-                                  const Bytef *source, uLong sourceLen,
-                                  int level));
+ZEXTERN int ZEXPORT compress2(Bytef *dest,   uLongf *destLen,
+                              const Bytef *source, uLong sourceLen,
+                              int level);
 /*
      Compresses the source buffer into the destination buffer.  The level
    parameter has the same meaning as in deflateInit.  sourceLen is the byte
@@ -1255,15 +1256,15 @@ ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
    Z_STREAM_ERROR if the level parameter is invalid.
 */
 
-ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
+ZEXTERN uLong ZEXPORT compressBound(uLong sourceLen);
 /*
      compressBound() returns an upper bound on the compressed size after
    compress() or compress2() on sourceLen bytes.  It would be used before a
    compress() or compress2() call to allocate the destination buffer.
 */
 
-ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
-                                   const Bytef *source, uLong sourceLen));
+ZEXTERN int ZEXPORT uncompress(Bytef *dest,   uLongf *destLen,
+                               const Bytef *source, uLong sourceLen);
 /*
      Decompresses the source buffer into the destination buffer.  sourceLen is
    the byte length of the source buffer.  Upon entry, destLen is the total size
@@ -1280,8 +1281,8 @@ ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
    buffer with the uncompressed data up to that point.
 */
 
-ZEXTERN int ZEXPORT uncompress2 OF((Bytef *dest,   uLongf *destLen,
-                                    const Bytef *source, uLong *sourceLen));
+ZEXTERN int ZEXPORT uncompress2(Bytef *dest,   uLongf *destLen,
+                                const Bytef *source, uLong *sourceLen);
 /*
      Same as uncompress, except that sourceLen is a pointer, where the
    length of the source is *sourceLen.  On return, *sourceLen is the number of
@@ -1300,16 +1301,16 @@ ZEXTERN int ZEXPORT uncompress2 OF((Bytef *dest,   uLongf *destLen,
 typedef struct gzFile_s *gzFile;    /* semi-opaque gzip file descriptor */
 
 /*
-ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
+ZEXTERN gzFile ZEXPORT gzopen(const char *path, const char *mode);
 
-     Opens a gzip (.gz) file for reading or writing.  The mode parameter is as
-   in fopen ("rb" or "wb") but can also include a compression level ("wb9") or
-   a strategy: 'f' for filtered data as in "wb6f", 'h' for Huffman-only
-   compression as in "wb1h", 'R' for run-length encoding as in "wb1R", or 'F'
-   for fixed code compression as in "wb9F".  (See the description of
-   deflateInit2 for more information about the strategy parameter.)  'T' will
-   request transparent writing or appending with no compression and not using
-   the gzip format.
+     Open the gzip (.gz) file at path for reading and decompressing, or
+   compressing and writing.  The mode parameter is as in fopen ("rb" or "wb")
+   but can also include a compression level ("wb9") or a strategy: 'f' for
+   filtered data as in "wb6f", 'h' for Huffman-only compression as in "wb1h",
+   'R' for run-length encoding as in "wb1R", or 'F' for fixed code compression
+   as in "wb9F".  (See the description of deflateInit2 for more information
+   about the strategy parameter.)  'T' will request transparent writing or
+   appending with no compression and not using the gzip format.
 
      "a" can be used instead of "w" to request that the gzip stream that will
    be written be appended to the file.  "+" will result in an error, since
@@ -1337,11 +1338,11 @@ ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
    file could not be opened.
 */
 
-ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));
+ZEXTERN gzFile ZEXPORT gzdopen(int fd, const char *mode);
 /*
-     gzdopen associates a gzFile with the file descriptor fd.  File descriptors
-   are obtained from calls like open, dup, creat, pipe or fileno (if the file
-   has been previously opened with fopen).  The mode parameter is as in gzopen.
+     Associate a gzFile with the file descriptor fd.  File descriptors are
+   obtained from calls like open, dup, creat, pipe or fileno (if the file has
+   been previously opened with fopen).  The mode parameter is as in gzopen.
 
      The next call of gzclose on the returned gzFile will also close the file
    descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor
@@ -1360,15 +1361,15 @@ ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));
    will not detect if fd is invalid (unless fd is -1).
 */
 
-ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size));
+ZEXTERN int ZEXPORT gzbuffer(gzFile file, unsigned size);
 /*
-     Set the internal buffer size used by this library's functions.  The
-   default buffer size is 8192 bytes.  This function must be called after
-   gzopen() or gzdopen(), and before any other calls that read or write the
-   file.  The buffer memory allocation is always deferred to the first read or
-   write.  Three times that size in buffer space is allocated.  A larger buffer
-   size of, for example, 64K or 128K bytes will noticeably increase the speed
-   of decompression (reading).
+     Set the internal buffer size used by this library's functions for file to
+   size.  The default buffer size is 8192 bytes.  This function must be called
+   after gzopen() or gzdopen(), and before any other calls that read or write
+   the file.  The buffer memory allocation is always deferred to the first read
+   or write.  Three times that size in buffer space is allocated.  A larger
+   buffer size of, for example, 64K or 128K bytes will noticeably increase the
+   speed of decompression (reading).
 
      The new buffer size also affects the maximum length for gzprintf().
 
@@ -1376,20 +1377,20 @@ ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size));
    too late.
 */
 
-ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
+ZEXTERN int ZEXPORT gzsetparams(gzFile file, int level, int strategy);
 /*
-     Dynamically update the compression level or strategy.  See the description
-   of deflateInit2 for the meaning of these parameters.  Previously provided
-   data is flushed before the parameter change.
+     Dynamically update the compression level and strategy for file.  See the
+   description of deflateInit2 for the meaning of these parameters. Previously
+   provided data is flushed before applying the parameter changes.
 
      gzsetparams returns Z_OK if success, Z_STREAM_ERROR if the file was not
    opened for writing, Z_ERRNO if there is an error writing the flushed data,
    or Z_MEM_ERROR if there is a memory allocation error.
 */
 
-ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
+ZEXTERN int ZEXPORT gzread(gzFile file, voidp buf, unsigned len);
 /*
-     Reads the given number of uncompressed bytes from the compressed file.  If
+     Read and decompress up to len uncompressed bytes from file into buf.  If
    the input file is not in gzip format, gzread copies the given number of
    bytes into the buffer directly from the file.
 
@@ -1417,14 +1418,14 @@ ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
    Z_STREAM_ERROR.
 */
 
-ZEXTERN z_size_t ZEXPORT gzfread OF((voidp buf, z_size_t size, z_size_t nitems,
-                                     gzFile file));
+ZEXTERN z_size_t ZEXPORT gzfread(voidp buf, z_size_t size, z_size_t nitems,
+                                 gzFile file);
 /*
-     Read up to nitems items of size size from file to buf, otherwise operating
-   as gzread() does.  This duplicates the interface of stdio's fread(), with
-   size_t request and return types.  If the library defines size_t, then
-   z_size_t is identical to size_t.  If not, then z_size_t is an unsigned
-   integer type that can contain a pointer.
+     Read and decompress up to nitems items of size size from file into buf,
+   otherwise operating as gzread() does.  This duplicates the interface of
+   stdio's fread(), with size_t request and return types.  If the library
+   defines size_t, then z_size_t is identical to size_t.  If not, then z_size_t
+   is an unsigned integer type that can contain a pointer.
 
      gzfread() returns the number of full items read of size size, or zero if
    the end of the file was reached and a full item could not be read, or if
@@ -1435,26 +1436,24 @@ ZEXTERN z_size_t ZEXPORT gzfread OF((voidp buf, z_size_t size, z_size_t nitems,
 
      In the event that the end of file is reached and only a partial item is
    available at the end, i.e. the remaining uncompressed data length is not a
-   multiple of size, then the final partial item is nevetheless read into buf
+   multiple of size, then the final partial item is nevertheless read into buf
    and the end-of-file flag is set.  The length of the partial item read is not
    provided, but could be inferred from the result of gztell().  This behavior
    is the same as the behavior of fread() implementations in common libraries,
    but it prevents the direct use of gzfread() to read a concurrently written
-   file, reseting and retrying on end-of-file, when size is not 1.
+   file, resetting and retrying on end-of-file, when size is not 1.
 */
 
-ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
-                                voidpc buf, unsigned len));
+ZEXTERN int ZEXPORT gzwrite(gzFile file, voidpc buf, unsigned len);
 /*
-     Writes the given number of uncompressed bytes into the compressed file.
-   gzwrite returns the number of uncompressed bytes written or 0 in case of
-   error.
+     Compress and write the len uncompressed bytes at buf to file. gzwrite
+   returns the number of uncompressed bytes written or 0 in case of error.
 */
 
-ZEXTERN z_size_t ZEXPORT gzfwrite OF((voidpc buf, z_size_t size,
-                                      z_size_t nitems, gzFile file));
+ZEXTERN z_size_t ZEXPORT gzfwrite(voidpc buf, z_size_t size,
+                                  z_size_t nitems, gzFile file);
 /*
-     gzfwrite() writes nitems items of size size from buf to file, duplicating
+     Compress and write nitems items of size size from buf to file, duplicating
    the interface of stdio's fwrite(), with size_t request and return types.  If
    the library defines size_t, then z_size_t is identical to size_t.  If not,
    then z_size_t is an unsigned integer type that can contain a pointer.
@@ -1465,61 +1464,62 @@ ZEXTERN z_size_t ZEXPORT gzfwrite OF((voidpc buf, z_size_t size,
    is returned, and the error state is set to Z_STREAM_ERROR.
 */
 
-ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...));
+ZEXTERN int ZEXPORTVA gzprintf(gzFile file, const char *format, ...);
 /*
-     Converts, formats, and writes the arguments to the compressed file under
-   control of the format string, as in fprintf.  gzprintf returns the number of
+     Convert, format, compress, and write the arguments (...) to file under
+   control of the string format, as in fprintf.  gzprintf returns the number of
    uncompressed bytes actually written, or a negative zlib error code in case
    of error.  The number of uncompressed bytes written is limited to 8191, or
    one less than the buffer size given to gzbuffer().  The caller should assure
    that this limit is not exceeded.  If it is exceeded, then gzprintf() will
    return an error (0) with nothing written.  In this case, there may also be a
    buffer overflow with unpredictable consequences, which is possible only if
-   zlib was compiled with the insecure functions sprintf() or vsprintf()
+   zlib was compiled with the insecure functions sprintf() or vsprintf(),
    because the secure snprintf() or vsnprintf() functions were not available.
    This can be determined using zlibCompileFlags().
 */
 
-ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
+ZEXTERN int ZEXPORT gzputs(gzFile file, const char *s);
 /*
-     Writes the given null-terminated string to the compressed file, excluding
+     Compress and write the given null-terminated string s to file, excluding
    the terminating null character.
 
      gzputs returns the number of characters written, or -1 in case of error.
 */
 
-ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
+ZEXTERN char * ZEXPORT gzgets(gzFile file, char *buf, int len);
 /*
-     Reads bytes from the compressed file until len-1 characters are read, or a
-   newline character is read and transferred to buf, or an end-of-file
-   condition is encountered.  If any characters are read or if len == 1, the
-   string is terminated with a null character.  If no characters are read due
-   to an end-of-file or len < 1, then the buffer is left untouched.
+     Read and decompress bytes from file into buf, until len-1 characters are
+   read, or until a newline character is read and transferred to buf, or an
+   end-of-file condition is encountered.  If any characters are read or if len
+   is one, the string is terminated with a null character.  If no characters
+   are read due to an end-of-file or len is less than one, then the buffer is
+   left untouched.
 
      gzgets returns buf which is a null-terminated string, or it returns NULL
    for end-of-file or in case of error.  If there was an error, the contents at
    buf are indeterminate.
 */
 
-ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c));
+ZEXTERN int ZEXPORT gzputc(gzFile file, int c);
 /*
-     Writes c, converted to an unsigned char, into the compressed file.  gzputc
+     Compress and write c, converted to an unsigned char, into file.  gzputc
    returns the value that was written, or -1 in case of error.
 */
 
-ZEXTERN int ZEXPORT gzgetc OF((gzFile file));
+ZEXTERN int ZEXPORT gzgetc(gzFile file);
 /*
-     Reads one byte from the compressed file.  gzgetc returns this byte or -1
+     Read and decompress one byte from file.  gzgetc returns this byte or -1
    in case of end of file or error.  This is implemented as a macro for speed.
    As such, it does not do all of the checking the other functions do.  I.e.
    it does not check to see if file is NULL, nor whether the structure file
    points to has been clobbered or not.
 */
 
-ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file));
+ZEXTERN int ZEXPORT gzungetc(int c, gzFile file);
 /*
-     Push one character back onto the stream to be read as the first character
-   on the next read.  At least one character of push-back is allowed.
+     Push c back onto the stream for file to be read as the first character on
+   the next read.  At least one character of push-back is always allowed.
    gzungetc() returns the character pushed, or -1 on failure.  gzungetc() will
    fail if c is -1, and may fail if a character has been pushed but not read
    yet.  If gzungetc is used immediately after gzopen or gzdopen, at least the
@@ -1528,11 +1528,11 @@ ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file));
    gzseek() or gzrewind().
 */
 
-ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));
+ZEXTERN int ZEXPORT gzflush(gzFile file, int flush);
 /*
-     Flushes all pending output into the compressed file.  The parameter flush
-   is as in the deflate() function.  The return value is the zlib error number
-   (see function gzerror below).  gzflush is only permitted when writing.
+     Flush all pending output to file.  The parameter flush is as in the
+   deflate() function.  The return value is the zlib error number (see function
+   gzerror below).  gzflush is only permitted when writing.
 
      If the flush parameter is Z_FINISH, the remaining data is written and the
    gzip stream is completed in the output.  If gzwrite() is called again, a new
@@ -1544,11 +1544,11 @@ ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));
 */
 
 /*
-ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file,
-                                   z_off_t offset, int whence));
+ZEXTERN z_off_t ZEXPORT gzseek(gzFile file,
+                               z_off_t offset, int whence);
 
-     Sets the starting position for the next gzread or gzwrite on the given
-   compressed file.  The offset represents a number of bytes in the
+     Set the starting position to offset relative to whence for the next gzread
+   or gzwrite on file.  The offset represents a number of bytes in the
    uncompressed data stream.  The whence parameter is defined as in lseek(2);
    the value SEEK_END is not supported.
 
@@ -1563,52 +1563,52 @@ ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file,
    would be before the current position.
 */
 
-ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
+ZEXTERN int ZEXPORT    gzrewind(gzFile file);
 /*
-     Rewinds the given file. This function is supported only for reading.
+     Rewind file. This function is supported only for reading.
 
-     gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
+     gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET).
 */
 
 /*
-ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
+ZEXTERN z_off_t ZEXPORT    gztell(gzFile file);
 
-     Returns the starting position for the next gzread or gzwrite on the given
-   compressed file.  This position represents a number of bytes in the
-   uncompressed data stream, and is zero when starting, even if appending or
-   reading a gzip stream from the middle of a file using gzdopen().
+     Return the starting position for the next gzread or gzwrite on file.
+   This position represents a number of bytes in the uncompressed data stream,
+   and is zero when starting, even if appending or reading a gzip stream from
+   the middle of a file using gzdopen().
 
      gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
 */
 
 /*
-ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile file));
+ZEXTERN z_off_t ZEXPORT gzoffset(gzFile file);
 
-     Returns the current offset in the file being read or written.  This offset
-   includes the count of bytes that precede the gzip stream, for example when
-   appending or when using gzdopen() for reading.  When reading, the offset
-   does not include as yet unused buffered input.  This information can be used
-   for a progress indicator.  On error, gzoffset() returns -1.
+     Return the current compressed (actual) read or write offset of file.  This
+   offset includes the count of bytes that precede the gzip stream, for example
+   when appending or when using gzdopen() for reading.  When reading, the
+   offset does not include as yet unused buffered input.  This information can
+   be used for a progress indicator.  On error, gzoffset() returns -1.
 */
 
-ZEXTERN int ZEXPORT gzeof OF((gzFile file));
+ZEXTERN int ZEXPORT gzeof(gzFile file);
 /*
-     Returns true (1) if the end-of-file indicator has been set while reading,
-   false (0) otherwise.  Note that the end-of-file indicator is set only if the
-   read tried to go past the end of the input, but came up short.  Therefore,
-   just like feof(), gzeof() may return false even if there is no more data to
-   read, in the event that the last read request was for the exact number of
-   bytes remaining in the input file.  This will happen if the input file size
-   is an exact multiple of the buffer size.
+     Return true (1) if the end-of-file indicator for file has been set while
+   reading, false (0) otherwise.  Note that the end-of-file indicator is set
+   only if the read tried to go past the end of the input, but came up short.
+   Therefore, just like feof(), gzeof() may return false even if there is no
+   more data to read, in the event that the last read request was for the exact
+   number of bytes remaining in the input file.  This will happen if the input
+   file size is an exact multiple of the buffer size.
 
      If gzeof() returns true, then the read functions will return no more data,
    unless the end-of-file indicator is reset by gzclearerr() and the input file
    has grown since the previous end of file was detected.
 */
 
-ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
+ZEXTERN int ZEXPORT gzdirect(gzFile file);
 /*
-     Returns true (1) if file is being copied directly while reading, or false
+     Return true (1) if file is being copied directly while reading, or false
    (0) if file is a gzip stream being decompressed.
 
      If the input file is empty, gzdirect() will return true, since the input
@@ -1627,10 +1627,10 @@ ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
    gzip file reading and decompression, which may not be desired.)
 */
 
-ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
+ZEXTERN int ZEXPORT    gzclose(gzFile file);
 /*
-     Flushes all pending output if necessary, closes the compressed file and
-   deallocates the (de)compression state.  Note that once file is closed, you
+     Flush all pending output for file, if necessary, close file and
+   deallocate the (de)compression state.  Note that once file is closed, you
    cannot call gzerror with file, since its structures have been deallocated.
    gzclose must not be called more than once on the same file, just as free
    must not be called more than once on the same allocation.
@@ -1640,8 +1640,8 @@ ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
    last read ended in the middle of a gzip stream, or Z_OK on success.
 */
 
-ZEXTERN int ZEXPORT gzclose_r OF((gzFile file));
-ZEXTERN int ZEXPORT gzclose_w OF((gzFile file));
+ZEXTERN int ZEXPORT gzclose_r(gzFile file);
+ZEXTERN int ZEXPORT gzclose_w(gzFile file);
 /*
      Same as gzclose(), but gzclose_r() is only for use when reading, and
    gzclose_w() is only for use when writing or appending.  The advantage to
@@ -1652,12 +1652,12 @@ ZEXTERN int ZEXPORT gzclose_w OF((gzFile file));
    zlib library.
 */
 
-ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
+ZEXTERN const char * ZEXPORT gzerror(gzFile file, int *errnum);
 /*
-     Returns the error message for the last error which occurred on the given
-   compressed file.  errnum is set to zlib error number.  If an error occurred
-   in the file system and not in the compression library, errnum is set to
-   Z_ERRNO and the application may consult errno to get the exact error code.
+     Return the error message for the last error which occurred on file.
+   errnum is set to zlib error number.  If an error occurred in the file system
+   and not in the compression library, errnum is set to Z_ERRNO and the
+   application may consult errno to get the exact error code.
 
      The application must not modify the returned string.  Future calls to
    this function may invalidate the previously returned string.  If file is
@@ -1668,9 +1668,9 @@ ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
    functions above that do not distinguish those cases in their return values.
 */
 
-ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
+ZEXTERN void ZEXPORT gzclearerr(gzFile file);
 /*
-     Clears the error and end-of-file flags for file.  This is analogous to the
+     Clear the error and end-of-file flags for file.  This is analogous to the
    clearerr() function in stdio.  This is useful for continuing to read a gzip
    file that is being written concurrently.
 */
@@ -1685,11 +1685,12 @@ ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
    library.
 */
 
-ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
+ZEXTERN uLong ZEXPORT adler32(uLong adler, const Bytef *buf, uInt len);
 /*
      Update a running Adler-32 checksum with the bytes buf[0..len-1] and
-   return the updated checksum.  If buf is Z_NULL, this function returns the
-   required initial value for the checksum.
+   return the updated checksum. An Adler-32 value is in the range of a 32-bit
+   unsigned integer. If buf is Z_NULL, this function returns the required
+   initial value for the checksum.
 
      An Adler-32 checksum is almost as reliable as a CRC-32 but can be computed
    much faster.
@@ -1704,15 +1705,15 @@ ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
      if (adler != original_adler) error();
 */
 
-ZEXTERN uLong ZEXPORT adler32_z OF((uLong adler, const Bytef *buf,
-                                    z_size_t len));
+ZEXTERN uLong ZEXPORT adler32_z(uLong adler, const Bytef *buf,
+                                z_size_t len);
 /*
      Same as adler32(), but with a size_t length.
 */
 
 /*
-ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
-                                          z_off_t len2));
+ZEXTERN uLong ZEXPORT adler32_combine(uLong adler1, uLong adler2,
+                                      z_off_t len2);
 
      Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
    and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
@@ -1722,12 +1723,13 @@ ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
    negative, the result has no meaning or utility.
 */
 
-ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
+ZEXTERN uLong ZEXPORT crc32(uLong crc, const Bytef *buf, uInt len);
 /*
      Update a running CRC-32 with the bytes buf[0..len-1] and return the
-   updated CRC-32.  If buf is Z_NULL, this function returns the required
-   initial value for the crc.  Pre- and post-conditioning (one's complement) is
-   performed within this function so it shouldn't be done by the application.
+   updated CRC-32. A CRC-32 value is in the range of a 32-bit unsigned integer.
+   If buf is Z_NULL, this function returns the required initial value for the
+   crc. Pre- and post-conditioning (one's complement) is performed within this
+   function so it shouldn't be done by the application.
 
    Usage example:
 
@@ -1739,14 +1741,14 @@ ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
      if (crc != original_crc) error();
 */
 
-ZEXTERN uLong ZEXPORT crc32_z OF((uLong adler, const Bytef *buf,
-                                  z_size_t len));
+ZEXTERN uLong ZEXPORT crc32_z(uLong crc, const Bytef *buf,
+                              z_size_t len);
 /*
      Same as crc32(), but with a size_t length.
 */
 
 /*
-ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
+ZEXTERN uLong ZEXPORT crc32_combine(uLong crc1, uLong crc2, z_off_t len2);
 
      Combine two CRC-32 check values into one.  For two sequences of bytes,
    seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
@@ -1755,26 +1757,40 @@ ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
    len2.
 */
 
+/*
+ZEXTERN uLong ZEXPORT crc32_combine_gen(z_off_t len2);
+
+     Return the operator corresponding to length len2, to be used with
+   crc32_combine_op().
+*/
+
+ZEXTERN uLong ZEXPORT crc32_combine_op(uLong crc1, uLong crc2, uLong op);
+/*
+     Give the same result as crc32_combine(), using op in place of len2. op is
+   is generated from len2 by crc32_combine_gen(). This will be faster than
+   crc32_combine() if the generated op is used more than once.
+*/
+
 
                         /* various hacks, don't look :) */
 
 /* deflateInit and inflateInit are macros to allow checking the zlib version
  * and the compiler's view of z_stream:
  */
-ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
-                                      int windowBits, int memLevel,
-                                      int strategy, const char *version,
-                                      int stream_size));
-ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
-                                      const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
-                                         unsigned char FAR *window,
-                                         const char *version,
-                                         int stream_size));
+ZEXTERN int ZEXPORT deflateInit_(z_streamp strm, int level,
+                                 const char *version, int stream_size);
+ZEXTERN int ZEXPORT inflateInit_(z_streamp strm,
+                                 const char *version, int stream_size);
+ZEXTERN int ZEXPORT deflateInit2_(z_streamp strm, int  level, int  method,
+                                  int windowBits, int memLevel,
+                                  int strategy, const char *version,
+                                  int stream_size);
+ZEXTERN int ZEXPORT inflateInit2_(z_streamp strm, int  windowBits,
+                                  const char *version, int stream_size);
+ZEXTERN int ZEXPORT inflateBackInit_(z_streamp strm, int windowBits,
+                                     unsigned char FAR *window,
+                                     const char *version,
+                                     int stream_size);
 #ifdef Z_PREFIX_SET
 #  define z_deflateInit(strm, level) \
           deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
@@ -1819,7 +1835,7 @@ struct gzFile_s {
     unsigned char *next;
     z_off64_t pos;
 };
-ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
+ZEXTERN int ZEXPORT gzgetc_(gzFile file);       /* backward compatibility */
 #ifdef Z_PREFIX_SET
 #  undef z_gzgetc
 #  define z_gzgetc(g) \
@@ -1841,12 +1857,13 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
  * without large file support, _LFS64_LARGEFILE must also be true
  */
 #ifdef Z_LARGE64
-   ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-   ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
-   ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
-   ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
-   ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t));
-   ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
+   ZEXTERN gzFile ZEXPORT gzopen64(const char *, const char *);
+   ZEXTERN z_off64_t ZEXPORT gzseek64(gzFile, z_off64_t, int);
+   ZEXTERN z_off64_t ZEXPORT gztell64(gzFile);
+   ZEXTERN z_off64_t ZEXPORT gzoffset64(gzFile);
+   ZEXTERN uLong ZEXPORT adler32_combine64(uLong, uLong, z_off64_t);
+   ZEXTERN uLong ZEXPORT crc32_combine64(uLong, uLong, z_off64_t);
+   ZEXTERN uLong ZEXPORT crc32_combine_gen64(z_off64_t);
 #endif
 
 #if !defined(ZLIB_INTERNAL) && defined(Z_WANT64)
@@ -1857,6 +1874,7 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
 #    define z_gzoffset z_gzoffset64
 #    define z_adler32_combine z_adler32_combine64
 #    define z_crc32_combine z_crc32_combine64
+#    define z_crc32_combine_gen z_crc32_combine_gen64
 #  else
 #    ifdef gzopen
 #      undef gzopen
@@ -1881,50 +1899,61 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
 #    ifdef crc32_combine
 #      undef crc32_combine
 #    endif
-#    define crc32_combine crc32_combine64
+#    ifdef crc32_combine64
+#      undef crc32_combine64
+#    endif
+#    ifdef crc32_combine_gen
+#      undef crc32_combine_gen
+#    endif
+#    ifdef crc32_combine_op
+#      undef crc32_combine_op
+#    endif
 #  endif
 #  ifndef Z_LARGE64
-     ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-     ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
-     ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
-     ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
-     ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
-     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
+     ZEXTERN gzFile ZEXPORT gzopen64(const char *, const char *);
+     ZEXTERN z_off_t ZEXPORT gzseek64(gzFile, z_off_t, int);
+     ZEXTERN z_off_t ZEXPORT gztell64(gzFile);
+     ZEXTERN z_off_t ZEXPORT gzoffset64(gzFile);
+     ZEXTERN uLong ZEXPORT adler32_combine64(uLong, uLong, z_off_t);
+     ZEXTERN uLong ZEXPORT crc32_combine64(uLong, uLong, z_off_t);
+     ZEXTERN uLong ZEXPORT crc32_combine_gen64(z_off_t);
 #  endif
 #else
-   ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
-   ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));
-   ZEXTERN z_off_t ZEXPORT gztell OF((gzFile));
-   ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile));
-   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
-   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
+   ZEXTERN gzFile ZEXPORT gzopen(const char *, const char *);
+   ZEXTERN z_off_t ZEXPORT gzseek(gzFile, z_off_t, int);
+   ZEXTERN z_off_t ZEXPORT gztell(gzFile);
+   ZEXTERN z_off_t ZEXPORT gzoffset(gzFile);
+   ZEXTERN uLong ZEXPORT adler32_combine(uLong, uLong, z_off_t);
+   ZEXTERN uLong ZEXPORT crc32_combine(uLong, uLong, z_off_t);
+   ZEXTERN uLong ZEXPORT crc32_combine_gen(z_off_t);
 #endif
 
 #else /* Z_SOLO */
 
-   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
-   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
+   ZEXTERN uLong ZEXPORT adler32_combine(uLong, uLong, z_off_t);
+   ZEXTERN uLong ZEXPORT crc32_combine(uLong, uLong, z_off_t);
+   ZEXTERN uLong ZEXPORT crc32_combine_gen(z_off_t);
 
 #endif /* !Z_SOLO */
 
 /* undocumented functions */
-ZEXTERN const char   * ZEXPORT zError           OF((int));
-ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));
-ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table    OF((void));
-ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
-ZEXTERN int            ZEXPORT inflateValidate OF((z_streamp, int));
-ZEXTERN unsigned long  ZEXPORT inflateCodesUsed OF ((z_streamp));
-ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp));
-ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
-#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(Z_SOLO)
-ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
-                                            const char *mode));
+ZEXTERN const char   * ZEXPORT zError(int);
+ZEXTERN int            ZEXPORT inflateSyncPoint(z_streamp);
+ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table(void);
+ZEXTERN int            ZEXPORT inflateUndermine(z_streamp, int);
+ZEXTERN int            ZEXPORT inflateValidate(z_streamp, int);
+ZEXTERN unsigned long  ZEXPORT inflateCodesUsed(z_streamp);
+ZEXTERN int            ZEXPORT inflateResetKeep(z_streamp);
+ZEXTERN int            ZEXPORT deflateResetKeep(z_streamp);
+#if defined(_WIN32) && !defined(Z_SOLO)
+ZEXTERN gzFile         ZEXPORT gzopen_w(const wchar_t *path,
+                                        const char *mode);
 #endif
 #if defined(STDC) || defined(Z_HAVE_STDARG_H)
 #  ifndef Z_SOLO
-ZEXTERN int            ZEXPORTVA gzvprintf Z_ARG((gzFile file,
-                                                  const char *format,
-                                                  va_list va));
+ZEXTERN int            ZEXPORTVA gzvprintf(gzFile file,
+                                           const char *format,
+                                           va_list va);
 #  endif
 #endif
 
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/zlib.map b/extern/crashpad/crashpad/third_party/zlib/zlib/zlib.map
new file mode 100644
index 0000000000..31544f2e93
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/zlib.map
@@ -0,0 +1,100 @@
+ZLIB_1.2.0 {
+  global:
+    compressBound;
+    deflateBound;
+    inflateBack;
+    inflateBackEnd;
+    inflateBackInit_;
+    inflateCopy;
+  local:
+    deflate_copyright;
+    inflate_copyright;
+    inflate_fast;
+    inflate_table;
+    zcalloc;
+    zcfree;
+    z_errmsg;
+    gz_error;
+    gz_intmax;
+    _*;
+};
+
+ZLIB_1.2.0.2 {
+    gzclearerr;
+    gzungetc;
+    zlibCompileFlags;
+} ZLIB_1.2.0;
+
+ZLIB_1.2.0.8 {
+    deflatePrime;
+} ZLIB_1.2.0.2;
+
+ZLIB_1.2.2 {
+    adler32_combine;
+    crc32_combine;
+    deflateSetHeader;
+    inflateGetHeader;
+} ZLIB_1.2.0.8;
+
+ZLIB_1.2.2.3 {
+    deflateTune;
+    gzdirect;
+} ZLIB_1.2.2;
+
+ZLIB_1.2.2.4 {
+    inflatePrime;
+} ZLIB_1.2.2.3;
+
+ZLIB_1.2.3.3 {
+    adler32_combine64;
+    crc32_combine64;
+    gzopen64;
+    gzseek64;
+    gztell64;
+    inflateUndermine;
+} ZLIB_1.2.2.4;
+
+ZLIB_1.2.3.4 {
+    inflateReset2;
+    inflateMark;
+} ZLIB_1.2.3.3;
+
+ZLIB_1.2.3.5 {
+    gzbuffer;
+    gzoffset;
+    gzoffset64;
+    gzclose_r;
+    gzclose_w;
+} ZLIB_1.2.3.4;
+
+ZLIB_1.2.5.1 {
+    deflatePending;
+} ZLIB_1.2.3.5;
+
+ZLIB_1.2.5.2 {
+    deflateResetKeep;
+    gzgetc_;
+    inflateResetKeep;
+} ZLIB_1.2.5.1;
+
+ZLIB_1.2.7.1 {
+    inflateGetDictionary;
+    gzvprintf;
+} ZLIB_1.2.5.2;
+
+ZLIB_1.2.9 {
+    inflateCodesUsed;
+    inflateValidate;
+    uncompress2;
+    gzfread;
+    gzfwrite;
+    deflateGetDictionary;
+    adler32_z;
+    crc32_z;
+} ZLIB_1.2.7.1;
+
+ZLIB_1.2.12 {
+	crc32_combine_gen;
+	crc32_combine_gen64;
+	crc32_combine_op;
+} ZLIB_1.2.9;
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/zlib.pc.cmakein b/extern/crashpad/crashpad/third_party/zlib/zlib/zlib.pc.cmakein
new file mode 100644
index 0000000000..a5e642938c
--- /dev/null
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/zlib.pc.cmakein
@@ -0,0 +1,13 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=@CMAKE_INSTALL_PREFIX@
+libdir=@INSTALL_LIB_DIR@
+sharedlibdir=@INSTALL_LIB_DIR@
+includedir=@INSTALL_INC_DIR@
+
+Name: zlib
+Description: zlib compression library
+Version: @VERSION@
+
+Requires:
+Libs: -L${libdir} -L${sharedlibdir} -lz
+Cflags: -I${includedir}
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/zutil.c b/extern/crashpad/crashpad/third_party/zlib/zlib/zutil.c
index a76c6b0c7e..b1c5d2d3c6 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/zutil.c
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/zutil.c
@@ -24,13 +24,11 @@ z_const char * const z_errmsg[10] = {
 };
 
 
-const char * ZEXPORT zlibVersion()
-{
+const char * ZEXPORT zlibVersion(void) {
     return ZLIB_VERSION;
 }
 
-uLong ZEXPORT zlibCompileFlags()
-{
+uLong ZEXPORT zlibCompileFlags(void) {
     uLong flags;
 
     flags = 0;
@@ -61,9 +59,11 @@ uLong ZEXPORT zlibCompileFlags()
 #ifdef ZLIB_DEBUG
     flags += 1 << 8;
 #endif
+    /*
 #if defined(ASMV) || defined(ASMINF)
     flags += 1 << 9;
 #endif
+     */
 #ifdef ZLIB_WINAPI
     flags += 1 << 10;
 #endif
@@ -119,9 +119,7 @@ uLong ZEXPORT zlibCompileFlags()
 #  endif
 int ZLIB_INTERNAL z_verbose = verbose;
 
-void ZLIB_INTERNAL z_error (m)
-    char *m;
-{
+void ZLIB_INTERNAL z_error(char *m) {
     fprintf(stderr, "%s\n", m);
     exit(1);
 }
@@ -130,14 +128,12 @@ void ZLIB_INTERNAL z_error (m)
 /* exported to allow conversion of error code to string for compress() and
  * uncompress()
  */
-const char * ZEXPORT zError(err)
-    int err;
-{
+const char * ZEXPORT zError(int err) {
     return ERR_MSG(err);
 }
 
-#if defined(_WIN32_WCE)
-    /* The Microsoft C Run-Time Library for Windows CE doesn't have
+#if defined(_WIN32_WCE) && _WIN32_WCE < 0x800
+    /* The older Microsoft C Run-Time Library for Windows CE doesn't have
      * errno.  We define it as a global variable to simplify porting.
      * Its value is always 0 and should not be used.
      */
@@ -146,22 +142,14 @@ const char * ZEXPORT zError(err)
 
 #ifndef HAVE_MEMCPY
 
-void ZLIB_INTERNAL zmemcpy(dest, source, len)
-    Bytef* dest;
-    const Bytef* source;
-    uInt  len;
-{
+void ZLIB_INTERNAL zmemcpy(Bytef* dest, const Bytef* source, uInt len) {
     if (len == 0) return;
     do {
         *dest++ = *source++; /* ??? to be unrolled */
     } while (--len != 0);
 }
 
-int ZLIB_INTERNAL zmemcmp(s1, s2, len)
-    const Bytef* s1;
-    const Bytef* s2;
-    uInt  len;
-{
+int ZLIB_INTERNAL zmemcmp(const Bytef* s1, const Bytef* s2, uInt len) {
     uInt j;
 
     for (j = 0; j < len; j++) {
@@ -170,10 +158,7 @@ int ZLIB_INTERNAL zmemcmp(s1, s2, len)
     return 0;
 }
 
-void ZLIB_INTERNAL zmemzero(dest, len)
-    Bytef* dest;
-    uInt  len;
-{
+void ZLIB_INTERNAL zmemzero(Bytef* dest, uInt len) {
     if (len == 0) return;
     do {
         *dest++ = 0;  /* ??? to be unrolled */
@@ -214,8 +199,7 @@ local ptr_table table[MAX_PTR];
  * a protected system like OS/2. Use Microsoft C instead.
  */
 
-voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
-{
+voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, unsigned items, unsigned size) {
     voidpf buf;
     ulg bsize = (ulg)items*size;
 
@@ -240,8 +224,7 @@ voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
     return buf;
 }
 
-void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
-{
+void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr) {
     int n;
 
     (void)opaque;
@@ -277,14 +260,12 @@ void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
 #  define _hfree   hfree
 #endif
 
-voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size)
-{
+voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, uInt items, uInt size) {
     (void)opaque;
     return _halloc((long)items, size);
 }
 
-void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
-{
+void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr) {
     (void)opaque;
     _hfree(ptr);
 }
@@ -297,25 +278,18 @@ void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
 #ifndef MY_ZCALLOC /* Any system without a special alloc function */
 
 #ifndef STDC
-extern voidp  malloc OF((uInt size));
-extern voidp  calloc OF((uInt items, uInt size));
-extern void   free   OF((voidpf ptr));
+extern voidp malloc(uInt size);
+extern voidp calloc(uInt items, uInt size);
+extern void free(voidpf ptr);
 #endif
 
-voidpf ZLIB_INTERNAL zcalloc (opaque, items, size)
-    voidpf opaque;
-    unsigned items;
-    unsigned size;
-{
+voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, unsigned items, unsigned size) {
     (void)opaque;
     return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :
                               (voidpf)calloc(items, size);
 }
 
-void ZLIB_INTERNAL zcfree (opaque, ptr)
-    voidpf opaque;
-    voidpf ptr;
-{
+void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr) {
     (void)opaque;
     free(ptr);
 }
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib/zutil.h b/extern/crashpad/crashpad/third_party/zlib/zlib/zutil.h
index 4425bcf75e..6980a5f4ea 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib/zutil.h
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib/zutil.h
@@ -1,5 +1,5 @@
 /* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
+ * Copyright (C) 1995-2022 Jean-loup Gailly, Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -44,10 +44,6 @@
 #  endif
 #endif
 
-#ifdef Z_SOLO
-   typedef long ptrdiff_t;  /* guess -- will be caught if guess is wrong */
-#endif
-
 #ifndef local
 #  define local static
 #endif
@@ -61,6 +57,17 @@ typedef unsigned short ush;
 typedef ush FAR ushf;
 typedef unsigned long  ulg;
 
+#if !defined(Z_U8) && !defined(Z_SOLO) && defined(STDC)
+#  include <limits.h>
+#  if (ULONG_MAX == 0xffffffffffffffff)
+#    define Z_U8 unsigned long
+#  elif (ULLONG_MAX == 0xffffffffffffffff)
+#    define Z_U8 unsigned long long
+#  elif (UINT_MAX == 0xffffffffffffffff)
+#    define Z_U8 unsigned
+#  endif
+#endif
+
 extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 /* (size given to avoid silly warnings with Visual C++) */
 
@@ -185,10 +192,6 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX
 #  if defined(_WIN32_WCE)
 #    define fdopen(fd,mode) NULL /* No fdopen() */
-#    ifndef _PTRDIFF_T_DEFINED
-       typedef int ptrdiff_t;
-#      define _PTRDIFF_T_DEFINED
-#    endif
 #  else
 #    define fdopen(fd,type)  _fdopen(fd,type)
 #  endif
@@ -203,8 +206,9 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 /* provide prototypes for these when building zlib without LFS */
 #if !defined(_WIN32) && \
     (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
-    ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
-    ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
+    ZEXTERN uLong ZEXPORT adler32_combine64(uLong, uLong, z_off_t);
+    ZEXTERN uLong ZEXPORT crc32_combine64(uLong, uLong, z_off_t);
+    ZEXTERN uLong ZEXPORT crc32_combine_gen64(z_off_t);
 #endif
 
         /* common defaults */
@@ -243,16 +247,16 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #    define zmemzero(dest, len) memset(dest, 0, len)
 #  endif
 #else
-   void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len));
-   int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len));
-   void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len));
+   void ZLIB_INTERNAL zmemcpy(Bytef* dest, const Bytef* source, uInt len);
+   int ZLIB_INTERNAL zmemcmp(const Bytef* s1, const Bytef* s2, uInt len);
+   void ZLIB_INTERNAL zmemzero(Bytef* dest, uInt len);
 #endif
 
 /* Diagnostic functions */
 #ifdef ZLIB_DEBUG
 #  include <stdio.h>
    extern int ZLIB_INTERNAL z_verbose;
-   extern void ZLIB_INTERNAL z_error OF((char *m));
+   extern void ZLIB_INTERNAL z_error(char *m);
 #  define Assert(cond,msg) {if(!(cond)) z_error(msg);}
 #  define Trace(x) {if (z_verbose>=0) fprintf x ;}
 #  define Tracev(x) {if (z_verbose>0) fprintf x ;}
@@ -269,9 +273,9 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #endif
 
 #ifndef Z_SOLO
-   voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,
-                                    unsigned size));
-   void ZLIB_INTERNAL zcfree  OF((voidpf opaque, voidpf ptr));
+   voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, unsigned items,
+                                unsigned size);
+   void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr);
 #endif
 
 #define ZALLOC(strm, items, size) \
diff --git a/extern/crashpad/crashpad/third_party/zlib/zlib_crashpad.h b/extern/crashpad/crashpad/third_party/zlib/zlib_crashpad.h
index 7d1fc27b9d..c720872210 100644
--- a/extern/crashpad/crashpad/third_party/zlib/zlib_crashpad.h
+++ b/extern/crashpad/crashpad/third_party/zlib/zlib_crashpad.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/tools/BUILD.gn b/extern/crashpad/crashpad/tools/BUILD.gn
index 91e20a03df..157ee92912 100644
--- a/extern/crashpad/crashpad/tools/BUILD.gn
+++ b/extern/crashpad/crashpad/tools/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2015 The Crashpad Authors. All rights reserved.
+# Copyright 2015 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -25,16 +25,31 @@ source_set("tool_support") {
   deps = [ "$mini_chromium_source_parent:base" ]
 }
 
-if (!crashpad_is_ios) {
+crashpad_executable("dump_minidump_annotations") {
+  sources = [ "dump_minidump_annotations.cc" ]
+
+  deps = [
+    ":tool_support",
+    "../client",
+    "../snapshot",
+    "../util",
+  ]
+
+  if (crashpad_is_win) {
+    cflags = [ "/wd4201" ]  # nonstandard extension used : nameless struct/union
+  }
+}
+
+if (!crashpad_is_ios && !crashpad_is_fuchsia) {
   crashpad_executable("crashpad_database_util") {
     sources = [ "crashpad_database_util.cc" ]
 
     deps = [
       ":tool_support",
+      "$mini_chromium_source_parent:base",
       "../build:default_exe_manifest_win",
       "../client",
       "../compat",
-      "$mini_chromium_source_parent:base",
       "../util",
     ]
   }
@@ -44,10 +59,11 @@ if (!crashpad_is_ios) {
 
     deps = [
       ":tool_support",
+      "$mini_chromium_source_parent:base",
       "../build:default_exe_manifest_win",
       "../compat",
-      "$mini_chromium_source_parent:base",
       "../util",
+      "../util:net",
     ]
   }
 }
@@ -56,8 +72,8 @@ crashpad_executable("base94_encoder") {
   sources = [ "base94_encoder.cc" ]
   deps = [
     ":tool_support",
-    "../build:default_exe_manifest_win",
     "$mini_chromium_source_parent:base",
+    "../build:default_exe_manifest_win",
     "../util",
   ]
 }
@@ -68,11 +84,11 @@ if (!crashpad_is_fuchsia && !crashpad_is_ios) {
 
     deps = [
       ":tool_support",
+      "$mini_chromium_source_parent:base",
       "../build:default_exe_manifest_win",
       "../compat",
       "../minidump",
       "../snapshot",
-      "$mini_chromium_source_parent:base",
       "../util",
     ]
 
@@ -102,9 +118,9 @@ if (crashpad_is_mac || crashpad_is_fuchsia) {
 
     deps = [
       ":tool_support",
+      "$mini_chromium_source_parent:base",
       "../client",
       "../compat",
-      "$mini_chromium_source_parent:base",
       "../util",
     ]
   }
@@ -116,8 +132,8 @@ if (crashpad_is_mac) {
 
     deps = [
       ":tool_support",
-      "../compat",
       "$mini_chromium_source_parent:base",
+      "../compat",
       "../util",
     ]
   }
@@ -137,8 +153,8 @@ if (crashpad_is_mac) {
 
     deps = [
       ":tool_support",
-      "../compat",
       "$mini_chromium_source_parent:base",
+      "../compat",
       "../util",
     ]
   }
@@ -153,8 +169,9 @@ if (crashpad_is_mac) {
 
     deps = [
       ":tool_support",
-      "../compat",
       "$mini_chromium_source_parent:base",
+      "../build:apple_enable_arc",
+      "../compat",
       "../util",
     ]
   }
diff --git a/extern/crashpad/crashpad/tools/base94_encoder.cc b/extern/crashpad/crashpad/tools/base94_encoder.cc
index 1b184e9fb8..31cabe79dd 100644
--- a/extern/crashpad/crashpad/tools/base94_encoder.cc
+++ b/extern/crashpad/crashpad/tools/base94_encoder.cc
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,6 +14,7 @@
 
 #include <getopt.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "base/files/file_path.h"
 #include "build/build_config.h"
@@ -24,6 +25,7 @@ namespace crashpad {
 namespace {
 
 void Usage(const base::FilePath& me) {
+  // clang-format off
   fprintf(stderr,
 "Usage: %" PRFilePath " [options] <input-file> <output-file>\n"
 "Encode/Decode the given file\n"
@@ -34,6 +36,7 @@ void Usage(const base::FilePath& me) {
 "      --help     display this help and exit\n"
 "      --version  output version information and exit\n",
           me.value().c_str());
+  // clang-format on
   ToolSupport::UsageTail(me);
 }
 
@@ -117,12 +120,12 @@ int Base94EncoderMain(int argc, char* argv[]) {
 }  // namespace
 }  // namespace crashpad
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 int main(int argc, char* argv[]) {
   return crashpad::Base94EncoderMain(argc, argv);
 }
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 int wmain(int argc, wchar_t* argv[]) {
   return crashpad::ToolSupport::Wmain(argc, argv, crashpad::Base94EncoderMain);
 }
-#endif  // OS_POSIX
+#endif  // BUILDFLAG(IS_POSIX)
diff --git a/extern/crashpad/crashpad/tools/base94_encoder.md b/extern/crashpad/crashpad/tools/base94_encoder.md
index 292c7a63de..8e20d44b9f 100644
--- a/extern/crashpad/crashpad/tools/base94_encoder.md
+++ b/extern/crashpad/crashpad/tools/base94_encoder.md
@@ -1,5 +1,5 @@
 <!--
-Copyright 2020 The Crashpad Authors. All rights reserved.
+Copyright 2020 The Crashpad Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -83,7 +83,7 @@ Report bugs at https://crashpad.chromium.org/bug/new.
 ## Copyright
 
 Copyright 2020 [The Crashpad
-Authors](https://chromium.googlesource.com/crashpad/crashpad/+/master/AUTHORS).
+Authors](https://chromium.googlesource.com/crashpad/crashpad/+/main/AUTHORS).
 
 ## License
 
diff --git a/extern/crashpad/crashpad/tools/crashpad_database_util.cc b/extern/crashpad/crashpad/tools/crashpad_database_util.cc
index e9927bd40c..7ca89d6e35 100644
--- a/extern/crashpad/crashpad/tools/crashpad_database_util.cc
+++ b/extern/crashpad/crashpad/tools/crashpad_database_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,13 +21,13 @@
 #include <sys/types.h>
 #include <time.h>
 
+#include <iterator>
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/check_op.h"
-#include "base/cxx17_backports.h"
 #include "base/files/file_path.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ -44,6 +44,7 @@ namespace crashpad {
 namespace {
 
 void Usage(const base::FilePath& me) {
+  // clang-format off
   fprintf(stderr,
 "Usage: %" PRFilePath " [OPTION]... PID\n"
 "Operate on Crashpad crash report databases.\n"
@@ -66,6 +67,7 @@ void Usage(const base::FilePath& me) {
 "      --help                      display this help and exit\n"
 "      --version                   output version information and exit\n",
           me.value().c_str());
+  // clang-format on
   ToolSupport::UsageTail(me);
 }
 
@@ -109,14 +111,14 @@ bool StringToBool(const char* string, bool* boolean) {
       "set",
   };
 
-  for (size_t index = 0; index < base::size(kFalseWords); ++index) {
+  for (size_t index = 0; index < std::size(kFalseWords); ++index) {
     if (strcasecmp(string, kFalseWords[index]) == 0) {
       *boolean = false;
       return true;
     }
   }
 
-  for (size_t index = 0; index < base::size(kTrueWords); ++index) {
+  for (size_t index = 0; index < std::size(kTrueWords); ++index) {
     if (strcasecmp(string, kTrueWords[index]) == 0) {
       *boolean = true;
       return true;
@@ -159,7 +161,7 @@ bool StringToTime(const char* string, time_t* out_time, bool utc) {
       "%+",
   };
 
-  for (size_t index = 0; index < base::size(kFormats); ++index) {
+  for (size_t index = 0; index < std::size(kFormats); ++index) {
     tm time_tm;
     const char* strptime_result = strptime(string, kFormats[index], &time_tm);
     if (strptime_result == end) {
@@ -214,7 +216,7 @@ std::string TimeToString(time_t out_time, bool utc) {
 
   char string[64];
   CHECK_NE(
-      strftime(string, base::size(string), "%Y-%m-%d %H:%M:%S %Z", &time_tm),
+      strftime(string, std::size(string), "%Y-%m-%d %H:%M:%S %Z", &time_tm),
       0u);
 
   return std::string(string);
@@ -619,12 +621,12 @@ int DatabaseUtilMain(int argc, char* argv[]) {
 }  // namespace
 }  // namespace crashpad
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 int main(int argc, char* argv[]) {
   return crashpad::DatabaseUtilMain(argc, argv);
 }
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 int wmain(int argc, wchar_t* argv[]) {
   return crashpad::ToolSupport::Wmain(argc, argv, crashpad::DatabaseUtilMain);
 }
-#endif  // OS_POSIX
+#endif  // BUILDFLAG(IS_POSIX)
diff --git a/extern/crashpad/crashpad/tools/crashpad_database_util.md b/extern/crashpad/crashpad/tools/crashpad_database_util.md
index a63d9a6803..c5b8f95c32 100644
--- a/extern/crashpad/crashpad/tools/crashpad_database_util.md
+++ b/extern/crashpad/crashpad/tools/crashpad_database_util.md
@@ -1,5 +1,5 @@
 <!--
-Copyright 2015 The Crashpad Authors. All rights reserved.
+Copyright 2015 The Crashpad Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -191,7 +191,7 @@ Report bugs at https://crashpad.chromium.org/bug/new.
 ## Copyright
 
 Copyright 2015 [The Crashpad
-Authors](https://chromium.googlesource.com/crashpad/crashpad/+/master/AUTHORS).
+Authors](https://chromium.googlesource.com/crashpad/crashpad/+/main/AUTHORS).
 
 ## License
 
diff --git a/extern/crashpad/crashpad/tools/crashpad_http_upload.cc b/extern/crashpad/crashpad/tools/crashpad_http_upload.cc
index 624aaa715e..52e8bbf10d 100644
--- a/extern/crashpad/crashpad/tools/crashpad_http_upload.cc
+++ b/extern/crashpad/crashpad/tools/crashpad_http_upload.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 #include <vector>
 
 #include "base/files/file_path.h"
+#include "build/build_config.h"
 #include "tools/tool_support.h"
 #include "util/file/file_reader.h"
 #include "util/file/file_writer.h"
@@ -34,6 +35,7 @@ namespace crashpad {
 namespace {
 
 void Usage(const base::FilePath& me) {
+  // clang-format off
   fprintf(stderr,
 "Usage: %" PRFilePath " [OPTION]...\n"
 "Send an HTTP POST request.\n"
@@ -45,6 +47,7 @@ void Usage(const base::FilePath& me) {
 "      --help              display this help and exit\n"
 "      --version           output version information and exit\n",
           me.value().c_str());
+  // clang-format on
   ToolSupport::UsageTail(me);
 }
 
@@ -205,12 +208,12 @@ int HTTPUploadMain(int argc, char* argv[]) {
 }  // namespace
 }  // namespace crashpad
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 int main(int argc, char* argv[]) {
   return crashpad::HTTPUploadMain(argc, argv);
 }
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 int wmain(int argc, wchar_t* argv[]) {
   return crashpad::ToolSupport::Wmain(argc, argv, crashpad::HTTPUploadMain);
 }
-#endif  // OS_POSIX
+#endif  // BUILDFLAG(IS_POSIX)
diff --git a/extern/crashpad/crashpad/tools/crashpad_http_upload.md b/extern/crashpad/crashpad/tools/crashpad_http_upload.md
index 93b8752259..94af6aef2e 100644
--- a/extern/crashpad/crashpad/tools/crashpad_http_upload.md
+++ b/extern/crashpad/crashpad/tools/crashpad_http_upload.md
@@ -1,5 +1,5 @@
 <!--
-Copyright 2017 The Crashpad Authors. All rights reserved.
+Copyright 2017 The Crashpad Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -115,7 +115,7 @@ Report bugs at https://crashpad.chromium.org/bug/new.
 ## Copyright
 
 Copyright 2017 [The Crashpad
-Authors](https://chromium.googlesource.com/crashpad/crashpad/+/master/AUTHORS).
+Authors](https://chromium.googlesource.com/crashpad/crashpad/+/main/AUTHORS).
 
 ## License
 
diff --git a/extern/crashpad/crashpad/tools/dump_minidump_annotations.cc b/extern/crashpad/crashpad/tools/dump_minidump_annotations.cc
new file mode 100644
index 0000000000..59c2d264e2
--- /dev/null
+++ b/extern/crashpad/crashpad/tools/dump_minidump_annotations.cc
@@ -0,0 +1,153 @@
+// Copyright 2023 The Crashpad Authors
+//
+// 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.
+
+#include <getopt.h>
+
+#include "base/files/file_path.h"
+#include "client/annotation.h"
+#include "util/file/file_reader.h"
+#include "snapshot/minidump/process_snapshot_minidump.h"
+#include "tools/tool_support.h"
+
+namespace crashpad {
+namespace {
+
+void Usage(const base::FilePath& me) {
+  // clang-format off
+  fprintf(stderr,
+"Usage: %" PRFilePath " [OPTION]... PATH\n"
+"Dump annotations from minidumps.\n"
+"\n"
+"      --help                      display this help and exit\n"
+"      --version                   output version information and exit\n",
+          me.value().c_str());
+  // clang-format on
+  ToolSupport::UsageTail(me);
+}
+
+struct Options {
+  const char* minidump;
+};
+
+int DumpMinidumpAnnotationsMain(int argc, char* argv[]) {
+  const base::FilePath argv0(
+      ToolSupport::CommandLineArgumentToFilePathStringType(argv[0]));
+  const base::FilePath me(argv0.BaseName());
+
+  enum OptionFlags {
+    // Long options without short equivalents.
+    kOptionLastChar = 255,
+    kOptionMinidump,
+
+    // Standard options.
+    kOptionHelp = -2,
+    kOptionVersion = -3,
+  };
+
+  static constexpr option long_options[] = {
+      {"minidump", required_argument, nullptr, kOptionMinidump},
+      {"help", no_argument, nullptr, kOptionHelp},
+      {"version", no_argument, nullptr, kOptionVersion},
+      {nullptr, 0, nullptr, 0},
+  };
+
+  Options options = {};
+
+  int opt;
+  while ((opt = getopt_long(argc, argv, "", long_options, nullptr)) != -1) {
+    switch (opt) {
+      case kOptionMinidump: {
+        options.minidump = optarg;
+        break;
+      }
+      case kOptionHelp: {
+        Usage(me);
+        return EXIT_SUCCESS;
+      }
+      case kOptionVersion: {
+        ToolSupport::Version(me);
+        return EXIT_SUCCESS;
+      }
+      default: {
+        ToolSupport::UsageHint(me, nullptr);
+        return EXIT_FAILURE;
+      }
+    }
+  }
+  argc -= optind;
+  argv += optind;
+
+  if (!options.minidump) {
+    ToolSupport::UsageHint(me, "--minidump is required");
+    return EXIT_FAILURE;
+  }
+
+  FileReader reader;
+  if (!reader.Open(base::FilePath(
+      ToolSupport::CommandLineArgumentToFilePathStringType(
+          options.minidump)))) {
+    return EXIT_FAILURE;
+  }
+
+  ProcessSnapshotMinidump snapshot;
+  if (!snapshot.Initialize(&reader)) {
+    return EXIT_FAILURE;
+  }
+
+  printf("Snapshot Annotations\n");
+  for (const auto& kv : snapshot.AnnotationsSimpleMap()) {
+    printf("  snapshot_annotations[\"%s\"] = %s\n",
+           kv.first.c_str(), kv.second.c_str());
+  }
+
+  for (const ModuleSnapshot* module : snapshot.Modules()) {
+    printf("Module: %s\n", module->Name().c_str());
+    printf("  Simple Annotations\n");
+    for (const auto& kv : module->AnnotationsSimpleMap()) {
+      printf("    simple_annotations[\"%s\"] = %s\n",
+             kv.first.c_str(), kv.second.c_str());
+    }
+
+    printf("  Vectored Annotations\n");
+    int index = 0;
+    for (const std::string& annotation : module->AnnotationsVector()) {
+      printf("    vectored_annotations[%d] = %s\n", index, annotation.c_str());
+      index++;
+    }
+
+    printf("  Annotation Objects\n");
+    for (const AnnotationSnapshot& annotation : module->AnnotationObjects()) {
+      printf("    annotation_objects[\"%s\"] = ", annotation.name.c_str());
+      if (annotation.type != static_cast<uint16_t>(Annotation::Type::kString)) {
+
+        printf("<non-string value, not printing>\n");
+        continue;
+      }
+
+      std::string value(reinterpret_cast<const char*>(annotation.value.data()),
+                        annotation.value.size());
+
+      printf("%s\n", value.c_str());
+    }
+  }
+
+  return EXIT_SUCCESS;
+}
+
+}  // namespace
+}  // namespace crashpad
+
+int main(int argc, char* argv[]) {
+  return crashpad::DumpMinidumpAnnotationsMain(argc, argv);
+}
diff --git a/extern/crashpad/crashpad/tools/generate_dump.cc b/extern/crashpad/crashpad/tools/generate_dump.cc
index e22f92a5f4..75e0e5351b 100644
--- a/extern/crashpad/crashpad/tools/generate_dump.cc
+++ b/extern/crashpad/crashpad/tools/generate_dump.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -29,32 +29,34 @@
 #include "util/process/process_id.h"
 #include "util/stdlib/string_number_conversion.h"
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 #include <unistd.h>
 
 #include "util/posix/drop_privileges.h"
 #endif
 
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
 #include <mach/mach.h>
 
-#include "base/mac/scoped_mach_port.h"
+#include "base/apple/scoped_mach_port.h"
 #include "snapshot/mac/process_snapshot_mac.h"
 #include "util/mach/scoped_task_suspend.h"
 #include "util/mach/task_for_pid.h"
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 #include "base/strings/utf_string_conversions.h"
 #include "snapshot/win/process_snapshot_win.h"
 #include "util/win/scoped_process_suspend.h"
 #include "util/win/xp_compat.h"
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
 #include "snapshot/linux/process_snapshot_linux.h"
-#endif  // OS_APPLE
+#include "util/linux/direct_ptrace_connection.h"
+#endif  // BUILDFLAG(IS_APPLE)
 
 namespace crashpad {
 namespace {
 
 void Usage(const base::FilePath& me) {
+  // clang-format off
   fprintf(stderr,
 "Usage: %" PRFilePath " [OPTION]... PID\n"
 "Generate a minidump file containing a snapshot of a running process.\n"
@@ -64,6 +66,7 @@ void Usage(const base::FilePath& me) {
 "      --help         display this help and exit\n"
 "      --version      output version information and exit\n",
           me.value().c_str());
+  // clang-format on
   ToolSupport::UsageTail(me);
 }
 
@@ -136,12 +139,12 @@ int GenerateDumpMain(int argc, char* argv[]) {
     return EXIT_FAILURE;
   }
 
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
   task_t task = TaskForPID(options.pid);
   if (task == TASK_NULL) {
     return EXIT_FAILURE;
   }
-  base::mac::ScopedMachSendRight task_owner(task);
+  base::apple::ScopedMachSendRight task_owner(task);
 
   // This tool may have been installed as a setuid binary so that TaskForPID()
   // could succeed. Drop any privileges now that they’re no longer necessary.
@@ -154,14 +157,14 @@ int GenerateDumpMain(int argc, char* argv[]) {
     }
     LOG(WARNING) << "operating on myself";
   }
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   ScopedKernelHANDLE process(
       OpenProcess(kXPProcessAllAccess, false, options.pid));
   if (!process.is_valid()) {
     PLOG(ERROR) << "could not open process " << options.pid;
     return EXIT_FAILURE;
   }
-#endif  // OS_APPLE
+#endif  // BUILDFLAG(IS_APPLE)
 
   if (options.dump_path.empty()) {
     options.dump_path = base::StringPrintf("minidump.%" PRI_PROCESS_ID,
@@ -169,24 +172,24 @@ int GenerateDumpMain(int argc, char* argv[]) {
   }
 
   {
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
     std::unique_ptr<ScopedTaskSuspend> suspend;
     if (options.suspend) {
       suspend.reset(new ScopedTaskSuspend(task));
     }
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
     std::unique_ptr<ScopedProcessSuspend> suspend;
     if (options.suspend) {
       suspend.reset(new ScopedProcessSuspend(process.get()));
     }
-#endif  // OS_APPLE
+#endif  // BUILDFLAG(IS_APPLE)
 
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
     ProcessSnapshotMac process_snapshot;
     if (!process_snapshot.Initialize(task)) {
       return EXIT_FAILURE;
     }
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
     ProcessSnapshotWin process_snapshot;
     if (!process_snapshot.Initialize(process.get(),
                                      options.suspend
@@ -196,13 +199,17 @@ int GenerateDumpMain(int argc, char* argv[]) {
                                      0)) {
       return EXIT_FAILURE;
     }
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
     // TODO(jperaza): https://crashpad.chromium.org/bug/30.
+    DirectPtraceConnection task;
+    if (!task.Initialize(options.pid)) {
+      return EXIT_FAILURE;
+    }
     ProcessSnapshotLinux process_snapshot;
-    if (!process_snapshot.Initialize(nullptr)) {
+    if (!process_snapshot.Initialize(&task)) {
       return EXIT_FAILURE;
     }
-#endif  // OS_APPLE
+#endif  // BUILDFLAG(IS_APPLE)
 
     FileWriter file_writer;
     base::FilePath dump_path(
@@ -231,12 +238,12 @@ int GenerateDumpMain(int argc, char* argv[]) {
 }  // namespace
 }  // namespace crashpad
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 int main(int argc, char* argv[]) {
   return crashpad::GenerateDumpMain(argc, argv);
 }
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 int wmain(int argc, wchar_t* argv[]) {
   return crashpad::ToolSupport::Wmain(argc, argv, crashpad::GenerateDumpMain);
 }
-#endif  // OS_POSIX
+#endif  // BUILDFLAG(IS_POSIX)
diff --git a/extern/crashpad/crashpad/tools/generate_dump.md b/extern/crashpad/crashpad/tools/generate_dump.md
index c58ecbc3dc..333d8086be 100644
--- a/extern/crashpad/crashpad/tools/generate_dump.md
+++ b/extern/crashpad/crashpad/tools/generate_dump.md
@@ -1,5 +1,5 @@
 <!--
-Copyright 2014 The Crashpad Authors. All rights reserved.
+Copyright 2014 The Crashpad Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -110,7 +110,7 @@ Report bugs at https://crashpad.chromium.org/bug/new.
 ## Copyright
 
 Copyright 2014 [The Crashpad
-Authors](https://chromium.googlesource.com/crashpad/crashpad/+/master/AUTHORS).
+Authors](https://chromium.googlesource.com/crashpad/crashpad/+/main/AUTHORS).
 
 ## License
 
diff --git a/extern/crashpad/crashpad/tools/mac/catch_exception_tool.cc b/extern/crashpad/crashpad/tools/mac/catch_exception_tool.cc
index 06fda23d4e..3f2265972f 100644
--- a/extern/crashpad/crashpad/tools/mac/catch_exception_tool.cc
+++ b/extern/crashpad/crashpad/tools/mac/catch_exception_tool.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -24,9 +24,9 @@
 #include <string>
 #include <vector>
 
+#include "base/apple/mach_logging.h"
 #include "base/files/scoped_file.h"
 #include "base/logging.h"
-#include "base/mac/mach_logging.h"
 #include "tools/tool_support.h"
 #include "util/mach/bootstrap.h"
 #include "util/mach/exc_server_variants.h"
@@ -181,6 +181,7 @@ class ExceptionServer final : public UniversalMachExcServer::Interface {
 };
 
 void Usage(const std::string& me) {
+  // clang-format off
   fprintf(stderr,
 "Usage: %s -m SERVICE [OPTION]...\n"
 "Catch Mach exceptions and display information about them.\n"
@@ -192,6 +193,7 @@ void Usage(const std::string& me) {
 "      --help                  display this help and exit\n"
 "      --version               output version information and exit\n",
           me.c_str());
+  // clang-format on
   ToolSupport::UsageTail(me);
 }
 
@@ -265,8 +267,8 @@ int CatchExceptionToolMain(int argc, char* argv[]) {
     return EXIT_FAILURE;
   }
 
-  base::mac::ScopedMachReceiveRight
-      service_port(BootstrapCheckIn(options.mach_service));
+  base::apple::ScopedMachReceiveRight service_port(
+      BootstrapCheckIn(options.mach_service));
   if (service_port == kMachPortNull) {
     return EXIT_FAILURE;
   }
diff --git a/extern/crashpad/crashpad/tools/mac/catch_exception_tool.md b/extern/crashpad/crashpad/tools/mac/catch_exception_tool.md
index 3c71decf63..ece49bf573 100644
--- a/extern/crashpad/crashpad/tools/mac/catch_exception_tool.md
+++ b/extern/crashpad/crashpad/tools/mac/catch_exception_tool.md
@@ -1,5 +1,5 @@
 <!--
-Copyright 2014 The Crashpad Authors. All rights reserved.
+Copyright 2014 The Crashpad Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -123,7 +123,7 @@ Report bugs at https://crashpad.chromium.org/bug/new.
 ## Copyright
 
 Copyright 2014 [The Crashpad
-Authors](https://chromium.googlesource.com/crashpad/crashpad/+/master/AUTHORS).
+Authors](https://chromium.googlesource.com/crashpad/crashpad/+/main/AUTHORS).
 
 ## License
 
diff --git a/extern/crashpad/crashpad/tools/mac/exception_port_tool.cc b/extern/crashpad/crashpad/tools/mac/exception_port_tool.cc
index 2fdc580018..437c15f488 100644
--- a/extern/crashpad/crashpad/tools/mac/exception_port_tool.cc
+++ b/extern/crashpad/crashpad/tools/mac/exception_port_tool.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -25,8 +25,8 @@
 #include <string>
 #include <vector>
 
-#include "base/mac/mach_logging.h"
-#include "base/mac/scoped_mach_port.h"
+#include "base/apple/mach_logging.h"
+#include "base/apple/scoped_mach_port.h"
 #include "tools/tool_support.h"
 #include "util/mach/bootstrap.h"
 #include "util/mach/exception_ports.h"
@@ -43,7 +43,7 @@ namespace {
 //!     destruction.
 //!
 //! This class effectively implements what a vector of
-//! base::mac::ScopedMachSendRight objects would be.
+//! base::apple::ScopedMachSendRight objects would be.
 //!
 //! The various “show” operations performed by this program display Mach ports
 //! by their names as they are known in this task. For this to be useful, rights
@@ -191,7 +191,7 @@ bool ParseHandlerString(const char* handler_string_ro,
 // |mach_send_right_pool|.
 void ShowBootstrapService(const std::string& service_name,
                           MachSendRightPool* mach_send_right_pool) {
-  base::mac::ScopedMachSendRight service_port(BootstrapLookUp(service_name));
+  base::apple::ScopedMachSendRight service_port(BootstrapLookUp(service_name));
   if (service_port == kMachPortNull) {
     return;
   }
@@ -283,7 +283,7 @@ void ShowExceptionPorts(const ExceptionPorts& exception_ports,
 // desired.
 bool SetExceptionPort(const ExceptionHandlerDescription* description,
                       mach_port_t target_port) {
-  base::mac::ScopedMachSendRight service_port;
+  base::apple::ScopedMachSendRight service_port;
   if (description->handler.compare(
           0, strlen(kHandlerBootstrapColon), kHandlerBootstrapColon) == 0) {
     const char* service_name =
@@ -311,6 +311,7 @@ bool SetExceptionPort(const ExceptionHandlerDescription* description,
 }
 
 void Usage(const std::string& me) {
+  // clang-format off
   fprintf(stderr,
 "Usage: %s [OPTION]... [COMMAND [ARG]...]\n"
 "View and change Mach exception ports, and run COMMAND if supplied.\n"
@@ -343,6 +344,7 @@ void Usage(const std::string& me) {
 "The default DESCRIPTION is\n"
 "  target=task,mask=CRASH,behavior=DEFAULT|MACH,flavor=NONE,handler=NULL\n",
           me.c_str());
+  // clang-format on
   ToolSupport::UsageTail(me);
 }
 
@@ -488,7 +490,7 @@ int ExceptionPortToolMain(int argc, char* argv[]) {
     return kExitFailure;
   }
 
-  base::mac::ScopedMachSendRight alternate_task_owner;
+  base::apple::ScopedMachSendRight alternate_task_owner;
   if (options.pid) {
     if (argc) {
       ToolSupport::UsageHint(me, "cannot combine -p with COMMAND");
diff --git a/extern/crashpad/crashpad/tools/mac/exception_port_tool.md b/extern/crashpad/crashpad/tools/mac/exception_port_tool.md
index 1743e42071..33f302f0fa 100644
--- a/extern/crashpad/crashpad/tools/mac/exception_port_tool.md
+++ b/extern/crashpad/crashpad/tools/mac/exception_port_tool.md
@@ -1,5 +1,5 @@
 <!--
-Copyright 2014 The Crashpad Authors. All rights reserved.
+Copyright 2014 The Crashpad Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -217,7 +217,7 @@ Report bugs at https://crashpad.chromium.org/bug/new.
 ## Copyright
 
 Copyright 2014 [The Crashpad
-Authors](https://chromium.googlesource.com/crashpad/crashpad/+/master/AUTHORS).
+Authors](https://chromium.googlesource.com/crashpad/crashpad/+/main/AUTHORS).
 
 ## License
 
diff --git a/extern/crashpad/crashpad/tools/mac/on_demand_service_tool.md b/extern/crashpad/crashpad/tools/mac/on_demand_service_tool.md
index 5a85035264..c77c1902fa 100644
--- a/extern/crashpad/crashpad/tools/mac/on_demand_service_tool.md
+++ b/extern/crashpad/crashpad/tools/mac/on_demand_service_tool.md
@@ -1,5 +1,5 @@
 <!--
-Copyright 2014 The Crashpad Authors. All rights reserved.
+Copyright 2014 The Crashpad Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -116,7 +116,7 @@ Report bugs at https://crashpad.chromium.org/bug/new.
 ## Copyright
 
 Copyright 2014 [The Crashpad
-Authors](https://chromium.googlesource.com/crashpad/crashpad/+/master/AUTHORS).
+Authors](https://chromium.googlesource.com/crashpad/crashpad/+/main/AUTHORS).
 
 ## License
 
diff --git a/extern/crashpad/crashpad/tools/mac/on_demand_service_tool.mm b/extern/crashpad/crashpad/tools/mac/on_demand_service_tool.mm
index 7b3e104169..05ddae1d4c 100644
--- a/extern/crashpad/crashpad/tools/mac/on_demand_service_tool.mm
+++ b/extern/crashpad/crashpad/tools/mac/on_demand_service_tool.mm
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
 #include <string>
 #include <vector>
 
-#include "base/mac/foundation_util.h"
+#include "base/apple/bridging.h"
 #include "base/strings/sys_string_conversions.h"
 #include "tools/tool_support.h"
 #include "util/mac/service_management.h"
@@ -34,6 +34,7 @@
 namespace {
 
 void Usage(const std::string& me) {
+  // clang-format off
   fprintf(stderr,
 "Usage: %s -L -l LABEL [OPTION]... COMMAND [ARG]...\n"
 "       %s -U -l LABEL\n"
@@ -48,6 +49,7 @@ void Usage(const std::string& me) {
 "      --version               output version information and exit\n",
           me.c_str(),
           me.c_str());
+  // clang-format on
   ToolSupport::UsageTail(me);
 }
 
@@ -156,13 +158,13 @@ int OnDemandServiceToolMain(int argc, char* argv[]) {
           }
 
           NSMutableDictionary* mutable_job_dictionary =
-              [[job_dictionary mutableCopy] autorelease];
+              [job_dictionary mutableCopy];
           mutable_job_dictionary[@LAUNCH_JOBKEY_MACHSERVICES] = mach_services;
           job_dictionary = mutable_job_dictionary;
         }
 
         CFDictionaryRef job_dictionary_cf =
-            base::mac::NSToCFCast(job_dictionary);
+            base::apple::NSToCFPtrCast(job_dictionary);
         if (!ServiceManagementSubmitJob(job_dictionary_cf)) {
           fprintf(stderr, "%s: failed to submit job\n", me.c_str());
           return EXIT_FAILURE;
diff --git a/extern/crashpad/crashpad/tools/run_with_crashpad.cc b/extern/crashpad/crashpad/tools/run_with_crashpad.cc
index 5ef0edb685..1f60081d6d 100644
--- a/extern/crashpad/crashpad/tools/run_with_crashpad.cc
+++ b/extern/crashpad/crashpad/tools/run_with_crashpad.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@
 #include "util/stdlib/map_insert.h"
 #include "util/string/split_string.h"
 
-#if defined(OS_FUCHSIA)
+#if BUILDFLAG(IS_FUCHSIA)
 #include <lib/fdio/spawn.h>
 #include <zircon/process.h>
 #include <zircon/syscalls.h>
@@ -43,16 +43,23 @@ namespace crashpad {
 namespace {
 
 void Usage(const std::string& me) {
+  // clang-format off
   fprintf(stderr,
 "Usage: %s [OPTION]... COMMAND [ARG]...\n"
 "Start a Crashpad handler and have it handle crashes from COMMAND.\n"
 "\n"
-#if defined(OS_FUCHSIA)
+  // clang-format on
+#if BUILDFLAG(IS_FUCHSIA)
+          // clang-format off
 "COMMAND is run via fdio_spawn, so must be a qualified path to the subprocess to\n"
 "be executed.\n"
+  // clang-format on
 #else
+          // clang-format off
 "COMMAND is run via execvp() so the PATH will be searched.\n"
+  // clang-format on
 #endif
+          // clang-format off
 "\n"
 "  -h, --handler=HANDLER       invoke HANDLER instead of crashpad_handler\n"
 "      --annotation=KEY=VALUE  passed to the handler as an --annotation argument\n"
@@ -62,6 +69,7 @@ void Usage(const std::string& me) {
 "      --help                  display this help and exit\n"
 "      --version               output version information and exit\n",
           me.c_str());
+  // clang-format on
   ToolSupport::UsageTail(me);
 }
 
@@ -189,7 +197,7 @@ int RunWithCrashpadMain(int argc, char* argv[]) {
     return kExitFailure;
   }
 
-#if defined(OS_FUCHSIA)
+#if BUILDFLAG(IS_FUCHSIA)
   // Fuchsia doesn't implement execvp(), launch with fdio_spawn here.
   zx_handle_t child = ZX_HANDLE_INVALID;
   zx_status_t status = fdio_spawn(
diff --git a/extern/crashpad/crashpad/tools/run_with_crashpad.md b/extern/crashpad/crashpad/tools/run_with_crashpad.md
index 9758f9af8b..84d748c55e 100644
--- a/extern/crashpad/crashpad/tools/run_with_crashpad.md
+++ b/extern/crashpad/crashpad/tools/run_with_crashpad.md
@@ -1,5 +1,5 @@
 <!--
-Copyright 2014 The Crashpad Authors. All rights reserved.
+Copyright 2014 The Crashpad Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -27,15 +27,15 @@ run_with_crashpad—Run a program with a Crashpad exception handler
 ## Description
 
 Starts a Crashpad exception handler server such as
-[crashpad_handler(8)](../../handler/crashpad_handler.md) and becomes its client,
+[crashpad_handler(8)](../handler/crashpad_handler.md) and becomes its client,
 setting an exception port referencing the handler. Then, executes _COMMAND_
 along with any arguments specified (_ARG…_) with the new exception port in
 effect.
 
 On macOS, the exception port is configured to receive exceptions of type
-`EXC_CRASH`, `EXC_RESOURCE`, and `EXC_GUARD`. The exception behavior is
-configured as `EXCEPTION_STATE_IDENTITY | MACH_EXCEPTION_CODES`. The thread
-state flavor is set to `MACHINE_THREAD_STATE`.
+`EXC_CRASH`, `EXC_RESOURCE`, and `EXC_GUARD` (until macOS 13). The exception
+behavior is configured as `EXCEPTION_STATE_IDENTITY | MACH_EXCEPTION_CODES`. The
+thread state flavor is set to `MACHINE_THREAD_STATE`.
 
 Programs that use the Crashpad client library directly will not normally use
 this tool. This tool exists to allow programs that are unaware of Crashpad to be
@@ -88,7 +88,7 @@ Illegal instruction: 4
 ```
 
 Starts a Crashpad exception handler server at a nonstandard path, and runs
-[exception_port_tool(1)](exception_port_tool.md) to show the task-level
+[exception_port_tool(1)](mac/exception_port_tool.md) to show the task-level
 exception ports.
 
 ```
@@ -118,8 +118,8 @@ task exception port 0, mask 0x1c00 (CRASH|RESOURCE|GUARD), port 0x30b, behavior
 
 ## See Also
 
-[crashpad_handler(8)](../../handler/crashpad_handler.md),
-[exception_port_tool(1)](exception_port_tool.md)
+[crashpad_handler(8)](../handler/crashpad_handler.md),
+[exception_port_tool(1)](mac/exception_port_tool.md)
 
 ## Resources
 
@@ -130,7 +130,7 @@ Report bugs at https://crashpad.chromium.org/bug/new.
 ## Copyright
 
 Copyright 2014 [The Crashpad
-Authors](https://chromium.googlesource.com/crashpad/crashpad/+/master/AUTHORS).
+Authors](https://chromium.googlesource.com/crashpad/crashpad/+/main/AUTHORS).
 
 ## License
 
diff --git a/extern/crashpad/crashpad/tools/tool_support.cc b/extern/crashpad/crashpad/tools/tool_support.cc
index b453f6e87b..7092682573 100644
--- a/extern/crashpad/crashpad/tools/tool_support.cc
+++ b/extern/crashpad/crashpad/tools/tool_support.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,11 +16,12 @@
 
 #include <stdio.h>
 
-#include <memory>
+#include <string_view>
 #include <vector>
 
-#include "base/strings/string_piece.h"
+#include "base/containers/heap_array.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "package.h"
 
 namespace crashpad {
@@ -55,7 +56,7 @@ void ToolSupport::UsageHint(const base::FilePath& me, const char* hint) {
           me.value().c_str());
 }
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 // static
 void ToolSupport::Version(const std::string& me) {
   Version(base::FilePath(me));
@@ -70,13 +71,13 @@ void ToolSupport::UsageTail(const std::string& me) {
 void ToolSupport::UsageHint(const std::string& me, const char* hint) {
   UsageHint(base::FilePath(me), hint);
 }
-#endif  // OS_POSIX
+#endif  // BUILDFLAG(IS_POSIX)
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 
 // static
 int ToolSupport::Wmain(int argc, wchar_t* argv[], int (*entry)(int, char* [])) {
-  std::unique_ptr<char* []> argv_as_utf8(new char*[argc + 1]);
+  auto argv_as_utf8 = base::HeapArray<char*>::Uninit(argc + 1);
   std::vector<std::string> storage;
   storage.reserve(argc);
   for (int i = 0; i < argc; ++i) {
@@ -84,29 +85,29 @@ int ToolSupport::Wmain(int argc, wchar_t* argv[], int (*entry)(int, char* [])) {
     argv_as_utf8[i] = &storage[i][0];
   }
   argv_as_utf8[argc] = nullptr;
-  return entry(argc, argv_as_utf8.get());
+  return entry(argc, argv_as_utf8.data());
 }
 
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
 
 // static
 base::FilePath::StringType ToolSupport::CommandLineArgumentToFilePathStringType(
-    const base::StringPiece& path) {
-#if defined(OS_POSIX)
+    std::string_view path) {
+#if BUILDFLAG(IS_POSIX)
   return std::string(path.data(), path.size());
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   return base::UTF8ToWide(path);
-#endif  // OS_POSIX
+#endif  // BUILDFLAG(IS_POSIX)
 }
 
 // static
 std::string ToolSupport::FilePathToCommandLineArgument(
     const base::FilePath& file_path) {
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
   return file_path.value();
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   return base::WideToUTF8(file_path.value());
-#endif  // OS_POSIX
+#endif  // BUILDFLAG(IS_POSIX)
 }
 
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/tools/tool_support.h b/extern/crashpad/crashpad/tools/tool_support.h
index fd4955e432..d117deb501 100644
--- a/extern/crashpad/crashpad/tools/tool_support.h
+++ b/extern/crashpad/crashpad/tools/tool_support.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,9 +16,9 @@
 #define CRASHPAD_TOOLS_TOOL_SUPPORT_H_
 
 #include <string>
+#include <string_view>
 
 #include "base/files/file_path.h"
-#include "base/strings/string_piece.h"
 #include "build/build_config.h"
 
 namespace crashpad {
@@ -48,7 +48,7 @@ class ToolSupport {
   //!     Optional, may be `nullptr`, in which case no hint will be presented.
   static void UsageHint(const base::FilePath& me, const char* hint);
 
-#if defined(OS_POSIX) || DOXYGEN
+#if BUILDFLAG(IS_POSIX) || DOXYGEN
   //! \copydoc Version
   static void Version(const std::string& me);
 
@@ -57,15 +57,15 @@ class ToolSupport {
 
   //! \copydoc UsageHint
   static void UsageHint(const std::string& me, const char* hint);
-#endif  // OS_POSIX
+#endif  // BUILDFLAG(IS_POSIX)
 
-#if defined(OS_WIN) || DOXYGEN
+#if BUILDFLAG(IS_WIN) || DOXYGEN
   //! \brief Converts \a argv `wchar_t` UTF-16 to UTF-8, and passes onwards to a
   //!     UTF-8 entry point.
   //!
   //! \return The return value of \a entry.
   static int Wmain(int argc, wchar_t* argv[], int (*entry)(int, char*[]));
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
 
   //! \brief Converts a command line argument to the string type suitable for
   //!     base::FilePath.
@@ -77,7 +77,7 @@ class ToolSupport {
   //! \sa Wmain()
   //! \sa FilePathToCommandLineArgument()
   static base::FilePath::StringType CommandLineArgumentToFilePathStringType(
-      const base::StringPiece& arg);
+      std::string_view arg);
 
   //! \brief Converts a base::FilePath to a command line argument.
   //!
diff --git a/extern/crashpad/crashpad/util/BUILD.gn b/extern/crashpad/crashpad/util/BUILD.gn
index affa4e9e6f..3bbbd275a5 100644
--- a/extern/crashpad/crashpad/util/BUILD.gn
+++ b/extern/crashpad/crashpad/util/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2015 The Crashpad Authors. All rights reserved.
+# Copyright 2015 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ if (crashpad_is_in_chromium) {
   import("//build/config/sanitizers/sanitizers.gni")
 }
 
-if (crashpad_is_mac || crashpad_is_ios) {
+if (crashpad_is_apple && !crashpad_is_tvos) {
   if (crashpad_is_in_chromium || crashpad_is_in_fuchsia) {
     import("//build/config/sysroot.gni")
   } else {
@@ -33,12 +33,6 @@ if (crashpad_is_mac || crashpad_is_ios) {
       "mach/mig_gen.py",
     ]
 
-    if (crashpad_is_in_fuchsia) {
-      # TODO(https://fxbug.dev/68780): Remove suppression when fixed.
-      hermetic_deps = false
-      all_outputs_fresh = false
-    }
-
     if (crashpad_is_mac) {
       sources = [
         "$sysroot/usr/include/mach/exc.defs",
@@ -62,7 +56,6 @@ if (crashpad_is_mac || crashpad_is_ios) {
     ]
 
     args = [ "{{source}}" ]
-    args += rebase_path(outputs, root_build_dir)
     if (crashpad_is_in_chromium) {
       if (!use_system_xcode) {
         import("//build/config/clang/clang.gni")
@@ -103,18 +96,6 @@ if (crashpad_is_mac || crashpad_is_ios) {
         ]
       }
     }
-    args += [
-      "--include",
-      rebase_path("..", root_build_dir),
-      "--include",
-      rebase_path("../compat/mac", root_build_dir),
-    ]
-    if (crashpad_is_ios) {
-      args += [
-        "--include",
-        rebase_path("../compat/ios", root_build_dir),
-      ]
-    }
     if (current_cpu == "x86") {
       args += [
         "--arch",
@@ -145,6 +126,22 @@ if (crashpad_is_mac || crashpad_is_ios) {
     } else {
       assert(false, "Unsupported architecture")
     }
+    args += rebase_path(outputs, root_build_dir)
+    args += [
+      "--",
+      "-I" + rebase_path("..", root_build_dir),
+      "-I" + rebase_path("../compat/mac", root_build_dir),
+    ]
+    if (crashpad_is_ios) {
+      args += [ "-I" + rebase_path("../compat/ios", root_build_dir) ]
+    }
+    if (crashpad_is_mac || crashpad_is_ios) {
+      # Needed for mach_exception_raise_*_protected
+      args += [
+        "-DMACH_EXC_SERVER_TASKIDTOKEN",
+        "-DMACH_EXC_SERVER_TASKIDTOKEN_STATE",
+      ]
+    }
   }
 
   static_library("mig_output") {
@@ -159,6 +156,19 @@ if (crashpad_is_mac || crashpad_is_ios) {
   }
 }
 
+# Used by crashpad_wer_handler to avoid linking all of :util.
+if (crashpad_is_win) {
+  source_set("util_registration_protocol") {
+    sources = [
+      "misc/address_types.h",
+      "win/address_types.h",
+      "win/registration_protocol_win_structs.h",
+    ]
+    public_deps = [ "../third_party/mini_chromium:build" ]
+    public_configs = [ "..:crashpad_config" ]
+  }
+}
+
 crashpad_static_library("util") {
   sources = [
     "file/delimited_file_reader.cc",
@@ -217,17 +227,6 @@ crashpad_static_library("util") {
     "misc/uuid.h",
     "misc/zlib.cc",
     "misc/zlib.h",
-    "net/http_body.cc",
-    "net/http_body.h",
-    "net/http_body_gzip.cc",
-    "net/http_body_gzip.h",
-    "net/http_headers.h",
-    "net/http_multipart_builder.cc",
-    "net/http_multipart_builder.h",
-    "net/http_transport.cc",
-    "net/http_transport.h",
-    "net/url.cc",
-    "net/url.h",
     "numeric/checked_address_range.cc",
     "numeric/checked_address_range.h",
     "numeric/checked_range.h",
@@ -265,6 +264,7 @@ crashpad_static_library("util") {
     "stream/zlib_output_stream.h",
     "string/split_string.cc",
     "string/split_string.h",
+    "synchronization/scoped_spin_guard.h",
     "synchronization/semaphore.h",
     "thread/stoppable.h",
     "thread/thread.cc",
@@ -299,8 +299,6 @@ crashpad_static_library("util") {
       sources += [
         "posix/close_multiple.cc",
         "posix/close_multiple.h",
-        "posix/double_fork_and_exec.cc",
-        "posix/double_fork_and_exec.h",
         "posix/drop_privileges.cc",
         "posix/drop_privileges.h",
         "posix/process_info.h",
@@ -311,36 +309,53 @@ crashpad_static_library("util") {
         "posix/symbolic_constants_posix.cc",
         "posix/symbolic_constants_posix.h",
       ]
+
+      if (crashpad_is_android || crashpad_is_linux || crashpad_is_mac) {
+        sources += [
+          "posix/spawn_subprocess.cc",
+          "posix/spawn_subprocess.h",
+        ]
+      }
     }
   }
 
-  if (crashpad_is_mac || crashpad_is_ios) {
+  if (crashpad_is_apple) {
     sources += [
+      "mac/sysctl.cc",
+      "mac/sysctl.h",
       "mac/xattr.cc",
       "mac/xattr.h",
-      "mach/composite_mach_message_server.cc",
-      "mach/composite_mach_message_server.h",
-      "mach/exc_client_variants.cc",
-      "mach/exc_client_variants.h",
-      "mach/exc_server_variants.cc",
-      "mach/exc_server_variants.h",
-      "mach/exception_behaviors.cc",
-      "mach/exception_behaviors.h",
-      "mach/exception_ports.cc",
-      "mach/exception_ports.h",
       "mach/mach_extensions.cc",
       "mach/mach_extensions.h",
-      "mach/mach_message.cc",
-      "mach/mach_message.h",
-      "mach/mach_message_server.cc",
-      "mach/mach_message_server.h",
-      "mach/symbolic_constants_mach.cc",
-      "mach/symbolic_constants_mach.h",
       "misc/capture_context_mac.S",
       "misc/clock_mac.cc",
       "misc/paths_mac.cc",
       "synchronization/semaphore_mac.cc",
     ]
+
+    # Exclude files related to Mach exceptions when building for tvOS. Mach
+    # messaging APIs are not available to third-party applications on tvOS so
+    # crashes are handled via POSIX signals.
+    if (!crashpad_is_tvos) {
+      sources += [
+        "mach/composite_mach_message_server.cc",
+        "mach/composite_mach_message_server.h",
+        "mach/exc_client_variants.cc",
+        "mach/exc_client_variants.h",
+        "mach/exc_server_variants.cc",
+        "mach/exc_server_variants.h",
+        "mach/exception_behaviors.cc",
+        "mach/exception_behaviors.h",
+        "mach/exception_ports.cc",
+        "mach/exception_ports.h",
+        "mach/mach_message.cc",
+        "mach/mach_message.h",
+        "mach/mach_message_server.cc",
+        "mach/mach_message_server.h",
+        "mach/symbolic_constants_mach.cc",
+        "mach/symbolic_constants_mach.h",
+      ]
+    }
   }
 
   if (crashpad_is_mac && !crashpad_is_in_fuchsia) {
@@ -352,8 +367,6 @@ crashpad_static_library("util") {
       "mac/mac_util.h",
       "mac/service_management.cc",
       "mac/service_management.h",
-      "mac/sysctl.cc",
-      "mac/sysctl.h",
       "mach/bootstrap.cc",
       "mach/bootstrap.h",
       "mach/child_port_handshake.cc",
@@ -369,7 +382,6 @@ crashpad_static_library("util") {
       "mach/scoped_task_suspend.h",
       "mach/task_for_pid.cc",
       "mach/task_for_pid.h",
-      "net/http_transport_mac.mm",
       "posix/process_info_mac.cc",
       "process/process_memory_mac.cc",
       "process/process_memory_mac.h",
@@ -381,6 +393,8 @@ crashpad_static_library("util") {
       "ios/ios_intermediate_dump_data.cc",
       "ios/ios_intermediate_dump_data.h",
       "ios/ios_intermediate_dump_format.h",
+      "ios/ios_intermediate_dump_interface.cc",
+      "ios/ios_intermediate_dump_interface.h",
       "ios/ios_intermediate_dump_list.cc",
       "ios/ios_intermediate_dump_list.h",
       "ios/ios_intermediate_dump_map.cc",
@@ -395,6 +409,10 @@ crashpad_static_library("util") {
       "ios/ios_system_data_collector.mm",
       "ios/raw_logging.cc",
       "ios/raw_logging.h",
+      "ios/scoped_background_task.h",
+      "ios/scoped_background_task.mm",
+      "ios/scoped_vm_map.cc",
+      "ios/scoped_vm_map.h",
       "ios/scoped_vm_read.cc",
       "ios/scoped_vm_read.h",
     ]
@@ -402,28 +420,6 @@ crashpad_static_library("util") {
 
   deps = []
 
-  if (crashpad_http_transport_impl == "socket") {
-    sources += [ "net/http_transport_socket.cc" ]
-    if (crashpad_use_boringssl_for_http_transport_socket) {
-      defines += [ "CRASHPAD_USE_BORINGSSL" ]
-
-      if (crashpad_is_in_chromium || crashpad_is_in_fuchsia) {
-        deps += [ "//third_party/boringssl" ]
-      } else {
-        libs = [
-          "crypto",
-          "ssl",
-        ]
-      }
-    }
-  } else if (crashpad_http_transport_impl == "libcurl") {
-    sources += [ "net/http_transport_libcurl.cc" ]
-    if (crashpad_is_in_fuchsia) {
-      # Host Linux builds in Fuchsia don't have libcurl in a sysroot.
-      deps += [ "//third_party/curl:libcurl" ]
-    }
-  }
-
   if (crashpad_is_android) {
     sources += [
       "linux/initial_signal_dispositions.cc",
@@ -446,6 +442,8 @@ crashpad_static_library("util") {
       "linux/exception_information.h",
       "linux/memory_map.cc",
       "linux/memory_map.h",
+      "linux/pac_helper.cc",
+      "linux/pac_helper.h",
       "linux/proc_stat_reader.cc",
       "linux/proc_stat_reader.h",
       "linux/proc_task_reader.cc",
@@ -487,7 +485,6 @@ crashpad_static_library("util") {
       "misc/clock_win.cc",
       "misc/paths_win.cc",
       "misc/time_win.cc",
-      "net/http_transport_win.cc",
       "process/process_memory_win.cc",
       "process/process_memory_win.h",
       "synchronization/semaphore_win.cc",
@@ -499,6 +496,7 @@ crashpad_static_library("util") {
       "win/context_wrappers.h",
       "win/critical_section_with_debug_info.cc",
       "win/critical_section_with_debug_info.h",
+      "win/exception_codes.h",
       "win/exception_handler_server.cc",
       "win/exception_handler_server.h",
       "win/get_function.cc",
@@ -522,6 +520,7 @@ crashpad_static_library("util") {
       "win/process_structs.h",
       "win/registration_protocol_win.cc",
       "win/registration_protocol_win.h",
+      "win/registration_protocol_win_structs.h",
       "win/safe_terminate_process.h",
       "win/scoped_handle.cc",
       "win/scoped_handle.h",
@@ -539,40 +538,22 @@ crashpad_static_library("util") {
       "win/xp_compat.h",
     ]
 
-    # There's no ml.exe yet in cross builds, so provide broken-but-not-asm
-    # versions of the functions defined in .asm files.
-    #
-    # CaptureContext() in capture_context_broken.cc just calls CHECK(false).
-    # SafeTerminateProcess() in safe_terminate_process.cc just calls regular
-    # TerminateProcess() without the protection against broken third-party
-    # patching of TerminateProcess().
-    #
-    # TODO(thakis): Use the .asm file in cross builds somehow,
-    # https://crbug.com/762167.
-    if (host_os == "win") {
-      if (current_cpu != "arm64") {
-        sources += [
-          "misc/capture_context_win.asm",
-          "win/safe_terminate_process.asm",
-        ]
-      } else {
-        # Most Crashpad builds use Microsoft's armasm64.exe macro assembler for
-        # .asm source files. When building in Chromium, clang-cl is used as the
-        # assembler instead. Since the two assemblers recognize different
-        # assembly dialects, the same .asm file can't be used for each. As a
-        # workaround, use a prebuilt .obj file when the Microsoft-dialect
-        # assembler isn't available.
-        if (crashpad_is_in_chromium) {
-          sources += [ "misc/capture_context_win_arm64.obj" ]
-        } else {
-          sources += [ "misc/capture_context_win_arm64.asm" ]
-        }
-      }
-    } else {
+    if (current_cpu != "arm64") {
       sources += [
-        "misc/capture_context_broken.cc",
-        "win/safe_terminate_process_broken.cc",
+        "misc/capture_context_win.asm",
+        "win/safe_terminate_process.asm",
       ]
+    } else {
+      # When building with clang, clang-cl is used as the assembler. Since
+      # clang-cl recognizes a different assembly dialect than Microsoft’s
+      # armasm64 macro assembler, the same .asm file can’t be used for each. As
+      # a workaround, use a prebuilt .obj file when the Microsoft-dialect
+      # assembler isn’t available.
+      if (crashpad_is_clang) {
+        sources += [ "misc/capture_context_win_arm64.obj" ]
+      } else {
+        sources += [ "misc/capture_context_win_arm64.asm" ]
+      }
     }
   }
 
@@ -583,18 +564,20 @@ crashpad_static_library("util") {
       "fuchsia/scoped_task_suspend.cc",
       "fuchsia/scoped_task_suspend.h",
       "fuchsia/traits.h",
-      "misc/capture_context_fuchsia.S",
       "misc/paths_fuchsia.cc",
       "process/process_memory_fuchsia.cc",
       "process/process_memory_fuchsia.h",
     ]
+
+    sources -= [ "misc/capture_context.h" ]
   }
 
   public_configs = [ "..:crashpad_config" ]
 
   # Include generated files starting with "util".
   if (crashpad_is_in_fuchsia) {
-    include_dirs = [ "$root_gen_dir/third_party/crashpad" ]
+    include_dirs =
+        [ "$root_gen_dir/" + rebase_path(fuchsia_crashpad_root, "//") ]
   } else {
     include_dirs = [ "$root_gen_dir/third_party/crashpad/crashpad" ]
   }
@@ -605,14 +588,17 @@ crashpad_static_library("util") {
     "../third_party/zlib",
   ]
 
-  deps += [
-    "$mini_chromium_source_parent:base",
-    "$mini_chromium_source_parent:chromeos_buildflags",
-  ]
+  deps = [ "$mini_chromium_source_parent:base" ]
+
+  configs = [ "../build:flock_always_supported_defines" ]
+
+  if (crashpad_is_apple) {
+    include_dirs += [ "$root_gen_dir" ]
+    deps += [ "../build:apple_enable_arc" ]
 
-  if (crashpad_is_mac || crashpad_is_ios) {
-    include_dirs += [ "$root_build_dir/gen" ]
-    deps += [ ":mig_output" ]
+    if (!crashpad_is_tvos) {
+      deps += [ ":mig_output" ]
+    }
   }
 
   if (crashpad_is_mac && !crashpad_is_in_fuchsia) {
@@ -622,7 +608,10 @@ crashpad_static_library("util") {
       "Foundation.framework",
       "IOKit.framework",
     ]
-    deps += [ "../third_party/apple_cf:apple_cf" ]
+  }
+
+  if (crashpad_is_ios) {
+    configs += [ "../build:crashpad_is_ios_app_extension" ]
   }
 
   if (crashpad_is_win) {
@@ -652,15 +641,73 @@ crashpad_static_library("util") {
   }
 }
 
+# net is split into a separate target from util so that client code does
+# not have to depend on it.
+crashpad_static_library("net") {
+  sources = [
+    "net/http_body.cc",
+    "net/http_body.h",
+    "net/http_body_gzip.cc",
+    "net/http_body_gzip.h",
+    "net/http_headers.h",
+    "net/http_multipart_builder.cc",
+    "net/http_multipart_builder.h",
+    "net/http_transport.cc",
+    "net/http_transport.h",
+    "net/url.cc",
+    "net/url.h",
+  ]
+
+  deps = [
+    ":util",
+    "$mini_chromium_source_parent:base",
+  ]
+
+  if (crashpad_is_apple) {
+    deps += [ "../build:apple_enable_arc" ]
+  }
+
+  if (crashpad_is_mac && !crashpad_is_in_fuchsia) {
+    sources += [ "net/http_transport_mac.mm" ]
+  }
+
+  if (crashpad_is_ios) {
+    sources += [ "net/http_transport_mac.mm" ]
+  }
+
+  if (crashpad_is_win) {
+    sources += [ "net/http_transport_win.cc" ]
+  }
+
+  if (crashpad_http_transport_impl == "socket") {
+    sources += [ "net/http_transport_socket.cc" ]
+    if (crashpad_use_boringssl_for_http_transport_socket) {
+      defines = [ "CRASHPAD_USE_BORINGSSL" ]
+
+      if (crashpad_is_in_chromium || crashpad_is_in_fuchsia) {
+        deps += [ "//third_party/boringssl" ]
+      } else {
+        libs = [
+          "crypto",
+          "ssl",
+        ]
+      }
+    }
+  } else if (crashpad_http_transport_impl == "libcurl") {
+    sources += [ "net/http_transport_libcurl.cc" ]
+  }
+}
+
 if (!crashpad_is_android && !crashpad_is_ios) {
   crashpad_executable("http_transport_test_server") {
     testonly = true
     sources = [ "net/http_transport_test_server.cc" ]
 
     deps = [
+      ":net",
       ":util",
-      "../third_party/cpp-httplib",
       "$mini_chromium_source_parent:base",
+      "../third_party/cpp-httplib",
       "../third_party/zlib",
       "../tools:tool_support",
     ]
@@ -696,7 +743,10 @@ if (!crashpad_is_android && !crashpad_is_ios) {
 source_set("no_cfi_icall") {
   sources = [ "misc/no_cfi_icall.h" ]
   public_configs = [ "..:crashpad_config" ]
-  public_deps = [ "$mini_chromium_source_parent:build" ]
+  public_deps = [
+    "$mini_chromium_source_parent:base",
+    "$mini_chromium_source_parent:build",
+  ]
 }
 
 source_set("util_test") {
@@ -749,13 +799,14 @@ source_set("util_test") {
     "stream/test_output_stream.h",
     "stream/zlib_output_stream_test.cc",
     "string/split_string_test.cc",
+    "synchronization/scoped_spin_guard_test.cc",
     "synchronization/semaphore_test.cc",
     "thread/thread_log_messages_test.cc",
     "thread/thread_test.cc",
     "thread/worker_thread_test.cc",
   ]
 
-  if (!crashpad_is_android && !crashpad_is_ios) {
+  if (!crashpad_is_android && !crashpad_is_ios && !crashpad_is_fuchsia) {
     # Android requires an HTTPTransport implementation.
     sources += [ "net/http_transport_test.cc" ]
   }
@@ -771,17 +822,22 @@ source_set("util_test") {
     sources += [ "posix/scoped_mmap_test.cc" ]
   }
 
-  if (crashpad_is_mac || crashpad_is_ios) {
+  if (crashpad_is_apple) {
     sources += [
       "mac/xattr_test.cc",
-      "mach/composite_mach_message_server_test.cc",
-      "mach/exc_server_variants_test.cc",
-      "mach/exception_behaviors_test.cc",
-      "mach/mach_extensions_test.cc",
-      "mach/mach_message_test.cc",
-      "mach/symbolic_constants_mach_test.cc",
       "misc/capture_context_test_util_mac.cc",
     ]
+
+    if (!crashpad_is_tvos) {
+      sources += [
+        "mach/composite_mach_message_server_test.cc",
+        "mach/exc_server_variants_test.cc",
+        "mach/exception_behaviors_test.cc",
+        "mach/mach_extensions_test.cc",
+        "mach/mach_message_test.cc",
+        "mach/symbolic_constants_mach_test.cc",
+      ]
+    }
   }
 
   if (crashpad_is_mac) {
@@ -807,6 +863,7 @@ source_set("util_test") {
     sources += [
       "ios/ios_intermediate_dump_reader_test.cc",
       "ios/ios_intermediate_dump_writer_test.cc",
+      "ios/scoped_vm_map_test.cc",
       "ios/scoped_vm_read_test.cc",
     ]
 
@@ -832,7 +889,10 @@ source_set("util_test") {
   }
 
   if (crashpad_is_fuchsia) {
-    sources += [ "misc/capture_context_test_util_fuchsia.cc" ]
+    sources -= [
+      "misc/capture_context_test.cc",
+      "misc/capture_context_test_util.h",
+    ]
   }
 
   if (crashpad_is_win) {
@@ -866,17 +926,18 @@ source_set("util_test") {
   ]
 
   deps = [
+    ":net",
     ":util",
+    "$mini_chromium_source_parent:base",
     "../client",
     "../compat",
     "../test",
+    "../third_party/googletest",
     "../third_party/googletest:googlemock",
-    "../third_party/googletest:googletest",
-    "$mini_chromium_source_parent:base",
     "../third_party/zlib",
   ]
 
-  if (!crashpad_is_android && !crashpad_is_ios) {
+  if (!crashpad_is_android && !crashpad_is_ios && !crashpad_is_fuchsia) {
     data_deps = [ ":http_transport_test_server" ]
 
     if (crashpad_use_boringssl_for_http_transport_socket) {
@@ -884,6 +945,10 @@ source_set("util_test") {
     }
   }
 
+  if (crashpad_is_apple) {
+    deps += [ "../build:apple_enable_arc" ]
+  }
+
   if (crashpad_is_mac) {
     frameworks = [ "Foundation.framework" ]
   }
diff --git a/extern/crashpad/crashpad/util/file/delimited_file_reader.cc b/extern/crashpad/crashpad/util/file/delimited_file_reader.cc
index f899dbf340..fa5737a7a4 100644
--- a/extern/crashpad/crashpad/util/file/delimited_file_reader.cc
+++ b/extern/crashpad/crashpad/util/file/delimited_file_reader.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,10 +17,10 @@
 #include <sys/types.h>
 
 #include <algorithm>
+#include <iterator>
 #include <limits>
 
 #include "base/check_op.h"
-#include "base/cxx17_backports.h"
 #include "base/numerics/safe_conversions.h"
 
 namespace crashpad {
@@ -76,7 +76,7 @@ DelimitedFileReader::Result DelimitedFileReader::GetDelim(char delimiter,
         return Result::kEndOfFile;
       }
 
-      DCHECK_LE(static_cast<size_t>(read_result), base::size(buf_));
+      DCHECK_LE(static_cast<size_t>(read_result), std::size(buf_));
       DCHECK(
           base::IsValueInRangeForNumericType<decltype(buf_len_)>(read_result));
       buf_len_ = static_cast<decltype(buf_len_)>(read_result);
diff --git a/extern/crashpad/crashpad/util/file/delimited_file_reader.h b/extern/crashpad/crashpad/util/file/delimited_file_reader.h
index 16bef2566f..cd909d0a5b 100644
--- a/extern/crashpad/crashpad/util/file/delimited_file_reader.h
+++ b/extern/crashpad/crashpad/util/file/delimited_file_reader.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/file/delimited_file_reader_test.cc b/extern/crashpad/crashpad/util/file/delimited_file_reader_test.cc
index 05e610119d..90804e477a 100644
--- a/extern/crashpad/crashpad/util/file/delimited_file_reader_test.cc
+++ b/extern/crashpad/crashpad/util/file/delimited_file_reader_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
 
 #include "util/file/delimited_file_reader.h"
 
+#include <iterator>
 #include <vector>
 
-#include "base/cxx17_backports.h"
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
@@ -260,7 +260,7 @@ TEST(DelimitedFileReader, ReallyLongMultiLineFile) {
 TEST(DelimitedFileReader, EmbeddedNUL) {
   static constexpr char kString[] = "embedded\0NUL\n";
   StringFile string_file;
-  string_file.SetString(std::string(kString, base::size(kString) - 1));
+  string_file.SetString(std::string(kString, std::size(kString) - 1));
   DelimitedFileReader delimited_file_reader(&string_file);
 
   std::string line;
@@ -278,7 +278,7 @@ TEST(DelimitedFileReader, EmbeddedNUL) {
 TEST(DelimitedFileReader, NULDelimiter) {
   static constexpr char kString[] = "aa\0b\0ccc\0";
   StringFile string_file;
-  string_file.SetString(std::string(kString, base::size(kString) - 1));
+  string_file.SetString(std::string(kString, std::size(kString) - 1));
   DelimitedFileReader delimited_file_reader(&string_file);
 
   std::string field;
@@ -302,7 +302,7 @@ TEST(DelimitedFileReader, NULDelimiter) {
 TEST(DelimitedFileReader, EdgeCases) {
   static constexpr size_t kSizes[] =
       {4094, 4095, 4096, 4097, 8190, 8191, 8192, 8193};
-  for (size_t index = 0; index < base::size(kSizes); ++index) {
+  for (size_t index = 0; index < std::size(kSizes); ++index) {
     size_t size = kSizes[index];
     SCOPED_TRACE(
         base::StringPrintf("index %" PRIuS ", size %" PRIuS, index, size));
diff --git a/extern/crashpad/crashpad/util/file/directory_reader.h b/extern/crashpad/crashpad/util/file/directory_reader.h
index 096d120d63..0a425ddd00 100644
--- a/extern/crashpad/crashpad/util/file/directory_reader.h
+++ b/extern/crashpad/crashpad/util/file/directory_reader.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,13 +18,13 @@
 #include "base/files/file_path.h"
 #include "build/build_config.h"
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 #include "util/posix/scoped_dir.h"
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 #include <windows.h>
 
 #include "util/win/scoped_handle.h"
-#endif  // OS_POSIX
+#endif  // BUILDFLAG(IS_POSIX)
 
 namespace crashpad {
 
@@ -67,20 +67,20 @@ class DirectoryReader {
   //!     logged.
   Result NextFile(base::FilePath* filename);
 
-#if defined(OS_POSIX) || DOXYGEN
+#if BUILDFLAG(IS_POSIX) || DOXYGEN
   //! \brief Returns the file descriptor associated with this reader, logging a
   //!     message and returning -1 on error.
   int DirectoryFD();
 #endif
 
  private:
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
   ScopedDIR dir_;
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   WIN32_FIND_DATA find_data_;
   ScopedSearchHANDLE handle_;
   bool first_entry_;
-#endif  // OS_POSIX
+#endif  // BUILDFLAG(IS_POSIX)
 };
 
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/util/file/directory_reader_posix.cc b/extern/crashpad/crashpad/util/file/directory_reader_posix.cc
index 475b0b188c..352991d61a 100644
--- a/extern/crashpad/crashpad/util/file/directory_reader_posix.cc
+++ b/extern/crashpad/crashpad/util/file/directory_reader_posix.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 #include <string.h>
 #include <sys/types.h>
 
+#include "base/check.h"
 #include "base/logging.h"
 
 namespace crashpad {
diff --git a/extern/crashpad/crashpad/util/file/directory_reader_test.cc b/extern/crashpad/crashpad/util/file/directory_reader_test.cc
index 5d09c6fb3d..2498ba738b 100644
--- a/extern/crashpad/crashpad/util/file/directory_reader_test.cc
+++ b/extern/crashpad/crashpad/util/file/directory_reader_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 #include "base/files/file_path.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "gtest/gtest.h"
 #include "test/filesystem.h"
 #include "test/scoped_temp_dir.h"
@@ -42,7 +43,7 @@ TEST(DirectoryReader, BadPaths) {
       reader.Open(temp_dir.path().Append(FILE_PATH_LITERAL("doesntexist"))));
 }
 
-#if !defined(OS_FUCHSIA)
+#if !BUILDFLAG(IS_FUCHSIA)
 
 TEST(DirectoryReader, BadPaths_SymbolicLinks) {
   if (!CanCreateSymbolicLinks()) {
@@ -63,7 +64,7 @@ TEST(DirectoryReader, BadPaths_SymbolicLinks) {
   EXPECT_FALSE(reader.Open(link));
 }
 
-#endif  // !OS_FUCHSIA
+#endif  // !BUILDFLAG(IS_FUCHSIA)
 
 TEST(DirectoryReader, EmptyDirectory) {
   ScopedTempDir temp_dir;
@@ -103,7 +104,7 @@ void TestFilesAndDirectories(bool symbolic_links) {
   ASSERT_TRUE(
       CreateFile(temp_dir.path().Append(directory).Append(nested_file)));
 
-#if !defined(OS_FUCHSIA)
+#if !BUILDFLAG(IS_FUCHSIA)
 
   if (symbolic_links) {
     base::FilePath link(FILE_PATH_LITERAL("link"));
@@ -118,7 +119,7 @@ void TestFilesAndDirectories(bool symbolic_links) {
     EXPECT_TRUE(expected_files.insert(dangling).second);
   }
 
-#endif  // !OS_FUCHSIA
+#endif  // !BUILDFLAG(IS_FUCHSIA)
 
   std::set<base::FilePath> files;
   DirectoryReader reader;
@@ -138,7 +139,7 @@ TEST(DirectoryReader, FilesAndDirectories) {
   TestFilesAndDirectories(false);
 }
 
-#if !defined(OS_FUCHSIA)
+#if !BUILDFLAG(IS_FUCHSIA)
 
 TEST(DirectoryReader, FilesAndDirectories_SymbolicLinks) {
   if (!CanCreateSymbolicLinks()) {
@@ -148,7 +149,7 @@ TEST(DirectoryReader, FilesAndDirectories_SymbolicLinks) {
   TestFilesAndDirectories(true);
 }
 
-#endif  // !OS_FUCHSIA
+#endif  // !BUILDFLAG(IS_FUCHSIA)
 
 }  // namespace
 }  // namespace test
diff --git a/extern/crashpad/crashpad/util/file/directory_reader_win.cc b/extern/crashpad/crashpad/util/file/directory_reader_win.cc
index 503a51904f..952511831e 100644
--- a/extern/crashpad/crashpad/util/file/directory_reader_win.cc
+++ b/extern/crashpad/crashpad/util/file/directory_reader_win.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 #include <string.h>
 
+#include "base/check.h"
 #include "base/logging.h"
 
 namespace crashpad {
diff --git a/extern/crashpad/crashpad/util/file/file_helper.cc b/extern/crashpad/crashpad/util/file/file_helper.cc
index 652b1911bd..67c886f3e1 100644
--- a/extern/crashpad/crashpad/util/file/file_helper.cc
+++ b/extern/crashpad/crashpad/util/file/file_helper.cc
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/file/file_helper.h b/extern/crashpad/crashpad/util/file/file_helper.h
index 52c64b91a5..9da6efebeb 100644
--- a/extern/crashpad/crashpad/util/file/file_helper.h
+++ b/extern/crashpad/crashpad/util/file/file_helper.h
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/file/file_io.cc b/extern/crashpad/crashpad/util/file/file_io.cc
index 48da6383db..c8219f9596 100644
--- a/extern/crashpad/crashpad/util/file/file_io.cc
+++ b/extern/crashpad/crashpad/util/file/file_io.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,6 +14,8 @@
 
 #include "util/file/file_io.h"
 
+#include <functional>
+
 #include "base/check_op.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
@@ -22,29 +24,17 @@ namespace crashpad {
 
 namespace {
 
-class FileIOReadExactly final : public internal::ReadExactlyInternal {
- public:
-  explicit FileIOReadExactly(FileHandle file)
-      : ReadExactlyInternal(), file_(file) {}
-
-  FileIOReadExactly(const FileIOReadExactly&) = delete;
-  FileIOReadExactly& operator=(const FileIOReadExactly&) = delete;
-
-  ~FileIOReadExactly() {}
-
- private:
-  // ReadExactlyInternal:
-  FileOperationResult Read(void* buffer, size_t size, bool can_log) override {
-    FileOperationResult rv = ReadFile(file_, buffer, size);
-    if (rv < 0) {
-      PLOG_IF(ERROR, can_log) << internal::kNativeReadFunctionName;
-      return -1;
-    }
-    return rv;
+FileOperationResult FileIORead(FileHandle file,
+                               bool can_log,
+                               void* buffer,
+                               size_t size) {
+  FileOperationResult rv = ReadFile(file, buffer, size);
+  if (rv < 0) {
+    PLOG_IF(ERROR, can_log) << internal::kNativeReadFunctionName;
+    return -1;
   }
-
-  FileHandle file_;
-};
+  return rv;
+}
 
 class FileIOWriteAll final : public internal::WriteAllInternal {
  public:
@@ -64,19 +54,21 @@ class FileIOWriteAll final : public internal::WriteAllInternal {
   FileHandle file_;
 };
 
-}  // namespace
-
-namespace internal {
-
-bool ReadExactlyInternal::ReadExactly(void* buffer, size_t size, bool can_log) {
+FileOperationResult ReadUntil(
+    std::function<FileOperationResult(void*, size_t)> read_function,
+    void* buffer,
+    size_t size) {
+  // Ensure bytes read fit within int32_t::max to make sure that they also fit
+  // into FileOperationResult on all platforms.
+  DCHECK_LE(size, size_t{std::numeric_limits<int32_t>::max()});
   uintptr_t buffer_int = reinterpret_cast<uintptr_t>(buffer);
   size_t total_bytes = 0;
   size_t remaining = size;
   while (remaining > 0) {
-    FileOperationResult bytes_read =
-        Read(reinterpret_cast<char*>(buffer_int), remaining, can_log);
+    const FileOperationResult bytes_read =
+        read_function(reinterpret_cast<char*>(buffer_int), remaining);
     if (bytes_read < 0) {
-      return false;
+      return bytes_read;
     }
 
     DCHECK_LE(static_cast<size_t>(bytes_read), remaining);
@@ -89,10 +81,27 @@ bool ReadExactlyInternal::ReadExactly(void* buffer, size_t size, bool can_log) {
     remaining -= bytes_read;
     total_bytes += bytes_read;
   }
+  return total_bytes;
+}
+
+}  // namespace
+
+namespace internal {
+
+bool ReadExactly(
+    std::function<FileOperationResult(bool, void*, size_t)> read_function,
+    bool can_log,
+    void* buffer,
+    size_t size) {
+  const FileOperationResult result =
+      ReadUntil(std::bind_front(read_function, can_log), buffer, size);
+  if (result < 0) {
+    return false;
+  }
 
-  if (total_bytes != size) {
+  if (static_cast<size_t>(result) != size) {
     LOG_IF(ERROR, can_log) << "ReadExactly: expected " << size << ", observed "
-                           << total_bytes;
+                           << result;
     return false;
   }
 
@@ -121,13 +130,23 @@ bool WriteAllInternal::WriteAll(const void* buffer, size_t size) {
 }  // namespace internal
 
 bool ReadFileExactly(FileHandle file, void* buffer, size_t size) {
-  FileIOReadExactly read_exactly(file);
-  return read_exactly.ReadExactly(buffer, size, false);
+  return internal::ReadExactly(
+      std::bind_front(&FileIORead, file), false, buffer, size);
+}
+
+FileOperationResult ReadFileUntil(FileHandle file, void* buffer, size_t size) {
+  return ReadUntil(std::bind_front(&FileIORead, file, false), buffer, size);
 }
 
 bool LoggingReadFileExactly(FileHandle file, void* buffer, size_t size) {
-  FileIOReadExactly read_exactly(file);
-  return read_exactly.ReadExactly(buffer, size, true);
+  return internal::ReadExactly(
+      std::bind_front(&FileIORead, file), true, buffer, size);
+}
+
+FileOperationResult LoggingReadFileUntil(FileHandle file,
+                                         void* buffer,
+                                         size_t size) {
+  return ReadUntil(std::bind_front(&FileIORead, file, true), buffer, size);
 }
 
 bool WriteFile(FileHandle file, const void* buffer, size_t size) {
diff --git a/extern/crashpad/crashpad/util/file/file_io.h b/extern/crashpad/crashpad/util/file/file_io.h
index 526debddae..c0dc9e16ef 100644
--- a/extern/crashpad/crashpad/util/file/file_io.h
+++ b/extern/crashpad/crashpad/util/file/file_io.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,13 +17,14 @@
 
 #include <sys/types.h>
 
+#include <functional>
 #include <string>
 
 #include "build/build_config.h"
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 #include "base/files/scoped_file.h"
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 #include <windows.h>
 #include "util/win/scoped_handle.h"
 #endif
@@ -34,7 +35,7 @@ class FilePath;
 
 namespace crashpad {
 
-#if defined(OS_POSIX) || DOXYGEN
+#if BUILDFLAG(IS_POSIX) || DOXYGEN
 
 //! \brief Platform-specific alias for a low-level file handle.
 using FileHandle = int;
@@ -51,7 +52,7 @@ using FileOperationResult = ssize_t;
 //! \brief A value that can never be a valid FileHandle.
 const FileHandle kInvalidFileHandle = -1;
 
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 
 using FileHandle = HANDLE;
 using FileOffset = LONGLONG;
@@ -132,7 +133,7 @@ enum class StdioStream {
 
 namespace internal {
 
-#if defined(OS_POSIX) || DOXYGEN
+#if BUILDFLAG(IS_POSIX) || DOXYGEN
 
 //! \brief The name of the native read function used by ReadFile().
 //!
@@ -148,7 +149,7 @@ constexpr char kNativeReadFunctionName[] = "read";
 //! \sa kNativeReadFunctionName
 constexpr char kNativeWriteFunctionName[] = "write";
 
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 
 constexpr char kNativeReadFunctionName[] = "ReadFile";
 constexpr char kNativeWriteFunctionName[] = "WriteFile";
@@ -162,30 +163,11 @@ constexpr char kNativeWriteFunctionName[] = "WriteFile";
 //! intended to be used more generally. Use ReadFileExactly(),
 //! LoggingReadFileExactly(), CheckedReadFileExactly(), or
 //! FileReaderInterface::ReadExactly() instead.
-class ReadExactlyInternal {
- public:
-  ReadExactlyInternal(const ReadExactlyInternal&) = delete;
-  ReadExactlyInternal& operator=(const ReadExactlyInternal&) = delete;
-
-  //! \brief Calls Read(), retrying following a short read, ensuring that
-  //!     exactly \a size bytes are read.
-  //!
-  //! \return `true` on success. `false` if the underlying Read() fails or if
-  //!     fewer than \a size bytes were read. When returning `false`, if \a
-  //!     can_log is `true`, logs a message.
-  bool ReadExactly(void* buffer, size_t size, bool can_log);
-
- protected:
-  ReadExactlyInternal() {}
-  ~ReadExactlyInternal() {}
-
- private:
-  //! \brief Wraps a read operation, such as ReadFile().
-  //!
-  //! \return The number of bytes read and placed into \a buffer, or `-1` on
-  //!     error. When returning `-1`, if \a can_log is `true`, logs a message.
-  virtual FileOperationResult Read(void* buffer, size_t size, bool can_log) = 0;
-};
+bool ReadExactly(
+    std::function<FileOperationResult(bool, void*, size_t)> read_function,
+    bool can_log,
+    void* buffer,
+    size_t size);
 
 //! \brief The internal implementation of WriteFile() and its wrappers.
 //!
@@ -252,7 +234,9 @@ FileOperationResult NativeWriteFile(FileHandle file,
 //!
 //! \sa WriteFile
 //! \sa ReadFileExactly
+//! \sa ReadFileUntil
 //! \sa LoggingReadFileExactly
+//! \sa LoggingReadFileUntil
 //! \sa CheckedReadFileExactly
 //! \sa CheckedReadFileAtEOF
 FileOperationResult ReadFile(FileHandle file, void* buffer, size_t size);
@@ -273,33 +257,62 @@ FileOperationResult ReadFile(FileHandle file, void* buffer, size_t size);
 bool WriteFile(FileHandle file, const void* buffer, size_t size);
 
 //! \brief Wraps ReadFile(), retrying following a short read, ensuring that
-//!     exactly \a size bytes are read.
+//!     exactly \a size bytes are read. Does not log on failure.
 //!
-//! \return `true` on success. If the underlying ReadFile() fails, or if fewer
-//!     than \a size bytes were read, this function logs a message and
-//!     returns `false`.
+//! \return `true` on success. Returns `false` if the underlying ReadFile()
+//!     fails or if fewer than \a size bytes were read.
 //!
 //! \sa LoggingWriteFile
 //! \sa ReadFile
+//! \sa ReadFileUntil
 //! \sa LoggingReadFileExactly
+//! \sa LoggingReadFileUntil
 //! \sa CheckedReadFileExactly
 //! \sa CheckedReadFileAtEOF
 bool ReadFileExactly(FileHandle file, void* buffer, size_t size);
 
+//! \brief Wraps ReadFile(), retrying following a short read. Does not log on
+//!     failure.
+//!
+//! \returns The number of bytes read or `-1` if the underlying ReadFile()
+//!     fails.
+//!
+//! \sa ReadFile
+//! \sa ReadFileExactly
+//! \sa LoggingReadFileExactly
+//! \sa LoggingReadFileUntil
+FileOperationResult ReadFileUntil(FileHandle file, void* buffer, size_t size);
+
 //! \brief Wraps ReadFile(), retrying following a short read, ensuring that
-//!     exactly \a size bytes are read.
+//!     exactly \a size bytes are read. Logs an error on failure.
 //!
-//! \return `true` on success. If the underlying ReadFile() fails, or if fewer
-//!     than \a size bytes were read, this function logs a message and
-//!     returns `false`.
+//! \return `true` on success. Returns `false` if the underlying ReadFile()
+//!     fails or if fewer than \a size bytes were read.
 //!
 //! \sa LoggingWriteFile
 //! \sa ReadFile
 //! \sa ReadFileExactly
+//! \sa ReadFileUntil
+//! \sa LoggingReadFileUntil
 //! \sa CheckedReadFileExactly
 //! \sa CheckedReadFileAtEOF
 bool LoggingReadFileExactly(FileHandle file, void* buffer, size_t size);
 
+//! \brief Wraps ReadFile(), retrying following a short read. Logs an error on
+//!     failure.
+//!
+//! \returns The number of bytes read or `-1` if the underlying ReadFile()
+//!     fails.
+//!
+//! \sa ReadFileExactly
+//! \sa ReadFileUntil
+//! \sa LoggingReadFileExactly
+//! \sa CheckedReadFileExactly
+//! \sa CheckedReadFileAtEOF
+FileOperationResult LoggingReadFileUntil(FileHandle file,
+                                         void* buffer,
+                                         size_t size);
+
 //! \brief Wraps WriteFile(), ensuring that exactly \a size bytes are written.
 //!
 //! \return `true` on success. If the underlying WriteFile() fails, or if fewer
@@ -422,7 +435,7 @@ FileHandle LoggingOpenFileForWrite(const base::FilePath& path,
                                    FileWriteMode mode,
                                    FilePermissions permissions);
 
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 //! \brief Opens an in-memory file for input and output.
 //!
 //! This function first attempts to open the file with `memfd_create()`. If
@@ -444,7 +457,7 @@ FileHandle LoggingOpenFileForWrite(const base::FilePath& path,
 //! \sa LoggingOpenFileForWrite
 //! \sa LoggingOpenFileForReadAndWrite
 FileHandle LoggingOpenMemoryFileForReadAndWrite(const base::FilePath& name);
-#endif  // OS_LINUX || OS_CHROMEOS
+#endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 
 //! \brief Wraps OpenFileForReadAndWrite(), logging an error if the operation
 //!     fails.
@@ -461,7 +474,7 @@ FileHandle LoggingOpenFileForReadAndWrite(const base::FilePath& path,
 // Fuchsia does not currently support any sort of file locking. See
 // https://crashpad.chromium.org/bug/196 and
 // https://crashpad.chromium.org/bug/217.
-#if !defined(OS_FUCHSIA)
+#if CRASHPAD_FLOCK_ALWAYS_SUPPORTED
 
 //! \brief Locks the given \a file using `flock()` on POSIX or `LockFileEx()` on
 //!     Windows.
@@ -500,7 +513,7 @@ FileLockingResult LoggingLockFile(FileHandle file,
 //! \return `true` on success, or `false` and a message will be logged.
 bool LoggingUnlockFile(FileHandle file);
 
-#endif  // !OS_FUCHSIA
+#endif  // CRASHPAD_FLOCK_ALWAYS_SUPPORTED
 
 //! \brief Wraps `lseek()` or `SetFilePointerEx()`. Logs an error if the
 //!     operation fails.
diff --git a/extern/crashpad/crashpad/util/file/file_io_posix.cc b/extern/crashpad/crashpad/util/file/file_io_posix.cc
index 119a2fcf67..fe7ed06036 100644
--- a/extern/crashpad/crashpad/util/file/file_io_posix.cc
+++ b/extern/crashpad/crashpad/util/file/file_io_posix.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
 #include <algorithm>
 #include <limits>
 
+#include "base/check_op.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/notreached.h"
@@ -72,7 +73,7 @@ FileHandle OpenFileForOutput(int rdwr_or_wronly,
                              const base::FilePath& path,
                              FileWriteMode mode,
                              FilePermissions permissions) {
-#if defined(OS_FUCHSIA)
+#if BUILDFLAG(IS_FUCHSIA)
   // O_NOCTTY is invalid on Fuchsia, and O_CLOEXEC isn't necessary.
   int flags = 0;
 #else
@@ -120,7 +121,7 @@ FileOperationResult ReadFile(FileHandle file, void* buffer, size_t size) {
 
 FileHandle OpenFileForRead(const base::FilePath& path) {
   int flags = O_RDONLY;
-#if !defined(OS_FUCHSIA)
+#if !BUILDFLAG(IS_FUCHSIA)
   // O_NOCTTY is invalid on Fuchsia, and O_CLOEXEC isn't necessary.
   flags |= O_NOCTTY | O_CLOEXEC;
 #endif
@@ -153,7 +154,7 @@ FileHandle LoggingOpenFileForWrite(const base::FilePath& path,
   return fd;
 }
 
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 FileHandle LoggingOpenMemoryFileForReadAndWrite(const base::FilePath& name) {
   DCHECK(name.value().find('/') == std::string::npos);
 
@@ -208,7 +209,7 @@ FileHandle LoggingOpenFileForReadAndWrite(const base::FilePath& path,
   return fd;
 }
 
-#if !defined(OS_FUCHSIA)
+#if CRASHPAD_FLOCK_ALWAYS_SUPPORTED
 
 FileLockingResult LoggingLockFile(FileHandle file,
                                   FileLocking locking,
@@ -234,7 +235,7 @@ bool LoggingUnlockFile(FileHandle file) {
   return rv == 0;
 }
 
-#endif  // !OS_FUCHSIA
+#endif  // CRASHPAD_FLOCK_ALWAYS_SUPPORTED
 
 FileOffset LoggingSeekFile(FileHandle file, FileOffset offset, int whence) {
   off_t rv = lseek(file, offset, whence);
@@ -276,7 +277,6 @@ FileHandle StdioFileHandle(StdioStream stdio_stream) {
   }
 
   NOTREACHED();
-  return kInvalidFileHandle;
 }
 
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/util/file/file_io_test.cc b/extern/crashpad/crashpad/util/file/file_io_test.cc
index abfef12916..a0c79f9a4a 100644
--- a/extern/crashpad/crashpad/util/file/file_io_test.cc
+++ b/extern/crashpad/crashpad/util/file/file_io_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,12 +16,14 @@
 
 #include <stdio.h>
 
+#include <functional>
+#include <iterator>
 #include <limits>
 #include <type_traits>
 
 #include "base/atomicops.h"
-#include "base/cxx17_backports.h"
 #include "base/files/file_path.h"
+#include "build/build_config.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include "test/errors.h"
@@ -38,202 +40,204 @@ using testing::_;
 using testing::InSequence;
 using testing::Return;
 
-class MockReadExactly : public internal::ReadExactlyInternal {
+class MockReadExactly {
  public:
-  MockReadExactly() : ReadExactlyInternal() {}
+  MockReadExactly() = default;
 
   MockReadExactly(const MockReadExactly&) = delete;
   MockReadExactly& operator=(const MockReadExactly&) = delete;
 
-  ~MockReadExactly() {}
+  ~MockReadExactly() = default;
 
   // Since it’s more convenient for the test to use uintptr_t than void*,
   // ReadExactlyInt() and ReadInt() adapt the types.
 
-  bool ReadExactlyInt(uintptr_t data, size_t size, bool can_log) {
-    return ReadExactly(reinterpret_cast<void*>(data), size, can_log);
+  bool ReadExactlyInt(bool can_log, uintptr_t data, size_t size) {
+    return internal::ReadExactly(std::bind_front(&MockReadExactly::Read, this),
+                                 can_log,
+                                 reinterpret_cast<void*>(data),
+                                 size);
   }
 
-  MOCK_METHOD(FileOperationResult, ReadInt, (uintptr_t, size_t, bool));
+  MOCK_METHOD(FileOperationResult, ReadInt, (bool, uintptr_t, size_t));
 
-  // ReadExactlyInternal:
-  FileOperationResult Read(void* data, size_t size, bool can_log) {
-    return ReadInt(reinterpret_cast<uintptr_t>(data), size, can_log);
+  FileOperationResult Read(bool can_log, void* data, size_t size) {
+    return ReadInt(can_log, reinterpret_cast<uintptr_t>(data), size);
   }
 };
 
 TEST(FileIO, ReadExactly_Zero) {
   MockReadExactly read_exactly;
   InSequence in_sequence;
-  EXPECT_CALL(read_exactly, ReadInt(_, _, false)).Times(0);
-  EXPECT_TRUE(read_exactly.ReadExactlyInt(100, 0, false));
+  EXPECT_CALL(read_exactly, ReadInt(false, _, _)).Times(0);
+  EXPECT_TRUE(read_exactly.ReadExactlyInt(false, 100, 0));
 }
 
 TEST(FileIO, ReadExactly_SingleSmallSuccess) {
   MockReadExactly read_exactly;
   InSequence in_sequence;
-  EXPECT_CALL(read_exactly, ReadInt(1000, 1, false)).WillOnce(Return(1));
-  EXPECT_TRUE(read_exactly.ReadExactlyInt(1000, 1, false));
+  EXPECT_CALL(read_exactly, ReadInt(false, 1000, 1)).WillOnce(Return(1));
+  EXPECT_TRUE(read_exactly.ReadExactlyInt(false, 1000, 1));
 }
 
 TEST(FileIO, ReadExactly_SingleSmallSuccessCanLog) {
   MockReadExactly read_exactly;
   InSequence in_sequence;
-  EXPECT_CALL(read_exactly, ReadInt(1000, 1, true)).WillOnce(Return(1));
-  EXPECT_TRUE(read_exactly.ReadExactlyInt(1000, 1, true));
+  EXPECT_CALL(read_exactly, ReadInt(true, 1000, 1)).WillOnce(Return(1));
+  EXPECT_TRUE(read_exactly.ReadExactlyInt(true, 1000, 1));
 }
 
 TEST(FileIO, ReadExactly_SingleSmallFailure) {
   MockReadExactly read_exactly;
   InSequence in_sequence;
-  EXPECT_CALL(read_exactly, ReadInt(1000, 1, false)).WillOnce(Return(-1));
-  EXPECT_FALSE(read_exactly.ReadExactlyInt(1000, 1, false));
+  EXPECT_CALL(read_exactly, ReadInt(false, 1000, 1)).WillOnce(Return(-1));
+  EXPECT_FALSE(read_exactly.ReadExactlyInt(false, 1000, 1));
 }
 
 TEST(FileIO, ReadExactly_SingleSmallFailureCanLog) {
   MockReadExactly read_exactly;
   InSequence in_sequence;
-  EXPECT_CALL(read_exactly, ReadInt(1000, 1, true)).WillOnce(Return(-1));
-  EXPECT_FALSE(read_exactly.ReadExactlyInt(1000, 1, true));
+  EXPECT_CALL(read_exactly, ReadInt(true, 1000, 1)).WillOnce(Return(-1));
+  EXPECT_FALSE(read_exactly.ReadExactlyInt(true, 1000, 1));
 }
 
 TEST(FileIO, ReadExactly_DoubleSmallSuccess) {
   MockReadExactly read_exactly;
   InSequence in_sequence;
-  EXPECT_CALL(read_exactly, ReadInt(0x1000, 2, false)).WillOnce(Return(1));
-  EXPECT_CALL(read_exactly, ReadInt(0x1001, 1, false)).WillOnce(Return(1));
-  EXPECT_TRUE(read_exactly.ReadExactlyInt(0x1000, 2, false));
+  EXPECT_CALL(read_exactly, ReadInt(false, 0x1000, 2)).WillOnce(Return(1));
+  EXPECT_CALL(read_exactly, ReadInt(false, 0x1001, 1)).WillOnce(Return(1));
+  EXPECT_TRUE(read_exactly.ReadExactlyInt(false, 0x1000, 2));
 }
 
 TEST(FileIO, ReadExactly_DoubleSmallShort) {
   MockReadExactly read_exactly;
   InSequence in_sequence;
-  EXPECT_CALL(read_exactly, ReadInt(0x20000, 2, false)).WillOnce(Return(1));
-  EXPECT_CALL(read_exactly, ReadInt(0x20001, 1, false)).WillOnce(Return(0));
-  EXPECT_FALSE(read_exactly.ReadExactlyInt(0x20000, 2, false));
+  EXPECT_CALL(read_exactly, ReadInt(false, 0x20000, 2)).WillOnce(Return(1));
+  EXPECT_CALL(read_exactly, ReadInt(false, 0x20001, 1)).WillOnce(Return(0));
+  EXPECT_FALSE(read_exactly.ReadExactlyInt(false, 0x20000, 2));
 }
 
 TEST(FileIO, ReadExactly_DoubleSmallShortCanLog) {
   MockReadExactly read_exactly;
   InSequence in_sequence;
-  EXPECT_CALL(read_exactly, ReadInt(0x20000, 2, true)).WillOnce(Return(1));
-  EXPECT_CALL(read_exactly, ReadInt(0x20001, 1, true)).WillOnce(Return(0));
-  EXPECT_FALSE(read_exactly.ReadExactlyInt(0x20000, 2, true));
+  EXPECT_CALL(read_exactly, ReadInt(true, 0x20000, 2)).WillOnce(Return(1));
+  EXPECT_CALL(read_exactly, ReadInt(true, 0x20001, 1)).WillOnce(Return(0));
+  EXPECT_FALSE(read_exactly.ReadExactlyInt(true, 0x20000, 2));
 }
 
 TEST(FileIO, ReadExactly_Medium) {
   MockReadExactly read_exactly;
   InSequence in_sequence;
-  EXPECT_CALL(read_exactly, ReadInt(0x80000000, 0x20000000, false))
+  EXPECT_CALL(read_exactly, ReadInt(false, 0x80000000, 0x20000000))
       .WillOnce(Return(0x10000000));
-  EXPECT_CALL(read_exactly, ReadInt(0x90000000, 0x10000000, false))
+  EXPECT_CALL(read_exactly, ReadInt(false, 0x90000000, 0x10000000))
       .WillOnce(Return(0x8000000));
-  EXPECT_CALL(read_exactly, ReadInt(0x98000000, 0x8000000, false))
+  EXPECT_CALL(read_exactly, ReadInt(false, 0x98000000, 0x8000000))
       .WillOnce(Return(0x4000000));
-  EXPECT_CALL(read_exactly, ReadInt(0x9c000000, 0x4000000, false))
+  EXPECT_CALL(read_exactly, ReadInt(false, 0x9c000000, 0x4000000))
       .WillOnce(Return(0x2000000));
-  EXPECT_CALL(read_exactly, ReadInt(0x9e000000, 0x2000000, false))
+  EXPECT_CALL(read_exactly, ReadInt(false, 0x9e000000, 0x2000000))
       .WillOnce(Return(0x1000000));
-  EXPECT_CALL(read_exactly, ReadInt(0x9f000000, 0x1000000, false))
+  EXPECT_CALL(read_exactly, ReadInt(false, 0x9f000000, 0x1000000))
       .WillOnce(Return(0x800000));
-  EXPECT_CALL(read_exactly, ReadInt(0x9f800000, 0x800000, false))
+  EXPECT_CALL(read_exactly, ReadInt(false, 0x9f800000, 0x800000))
       .WillOnce(Return(0x400000));
-  EXPECT_CALL(read_exactly, ReadInt(0x9fc00000, 0x400000, false))
+  EXPECT_CALL(read_exactly, ReadInt(false, 0x9fc00000, 0x400000))
       .WillOnce(Return(0x200000));
-  EXPECT_CALL(read_exactly, ReadInt(0x9fe00000, 0x200000, false))
+  EXPECT_CALL(read_exactly, ReadInt(false, 0x9fe00000, 0x200000))
       .WillOnce(Return(0x100000));
-  EXPECT_CALL(read_exactly, ReadInt(0x9ff00000, 0x100000, false))
+  EXPECT_CALL(read_exactly, ReadInt(false, 0x9ff00000, 0x100000))
       .WillOnce(Return(0x80000));
-  EXPECT_CALL(read_exactly, ReadInt(0x9ff80000, 0x80000, false))
+  EXPECT_CALL(read_exactly, ReadInt(false, 0x9ff80000, 0x80000))
       .WillOnce(Return(0x40000));
-  EXPECT_CALL(read_exactly, ReadInt(0x9ffc0000, 0x40000, false))
+  EXPECT_CALL(read_exactly, ReadInt(false, 0x9ffc0000, 0x40000))
       .WillOnce(Return(0x20000));
-  EXPECT_CALL(read_exactly, ReadInt(0x9ffe0000, 0x20000, false))
+  EXPECT_CALL(read_exactly, ReadInt(false, 0x9ffe0000, 0x20000))
       .WillOnce(Return(0x10000));
-  EXPECT_CALL(read_exactly, ReadInt(0x9fff0000, 0x10000, false))
+  EXPECT_CALL(read_exactly, ReadInt(false, 0x9fff0000, 0x10000))
       .WillOnce(Return(0x8000));
-  EXPECT_CALL(read_exactly, ReadInt(0x9fff8000, 0x8000, false))
+  EXPECT_CALL(read_exactly, ReadInt(false, 0x9fff8000, 0x8000))
       .WillOnce(Return(0x4000));
-  EXPECT_CALL(read_exactly, ReadInt(0x9fffc000, 0x4000, false))
+  EXPECT_CALL(read_exactly, ReadInt(false, 0x9fffc000, 0x4000))
       .WillOnce(Return(0x2000));
-  EXPECT_CALL(read_exactly, ReadInt(0x9fffe000, 0x2000, false))
+  EXPECT_CALL(read_exactly, ReadInt(false, 0x9fffe000, 0x2000))
       .WillOnce(Return(0x1000));
-  EXPECT_CALL(read_exactly, ReadInt(0x9ffff000, 0x1000, false))
+  EXPECT_CALL(read_exactly, ReadInt(false, 0x9ffff000, 0x1000))
       .WillOnce(Return(0x800));
-  EXPECT_CALL(read_exactly, ReadInt(0x9ffff800, 0x800, false))
+  EXPECT_CALL(read_exactly, ReadInt(false, 0x9ffff800, 0x800))
       .WillOnce(Return(0x400));
-  EXPECT_CALL(read_exactly, ReadInt(0x9ffffc00, 0x400, false))
+  EXPECT_CALL(read_exactly, ReadInt(false, 0x9ffffc00, 0x400))
       .WillOnce(Return(0x200));
-  EXPECT_CALL(read_exactly, ReadInt(0x9ffffe00, 0x200, false))
+  EXPECT_CALL(read_exactly, ReadInt(false, 0x9ffffe00, 0x200))
       .WillOnce(Return(0x100));
-  EXPECT_CALL(read_exactly, ReadInt(0x9fffff00, 0x100, false))
+  EXPECT_CALL(read_exactly, ReadInt(false, 0x9fffff00, 0x100))
       .WillOnce(Return(0x80));
-  EXPECT_CALL(read_exactly, ReadInt(0x9fffff80, 0x80, false))
+  EXPECT_CALL(read_exactly, ReadInt(false, 0x9fffff80, 0x80))
       .WillOnce(Return(0x40));
-  EXPECT_CALL(read_exactly, ReadInt(0x9fffffc0, 0x40, false))
+  EXPECT_CALL(read_exactly, ReadInt(false, 0x9fffffc0, 0x40))
       .WillOnce(Return(0x20));
-  EXPECT_CALL(read_exactly, ReadInt(0x9fffffe0, 0x20, false))
+  EXPECT_CALL(read_exactly, ReadInt(false, 0x9fffffe0, 0x20))
       .WillOnce(Return(0x10));
-  EXPECT_CALL(read_exactly, ReadInt(0x9ffffff0, 0x10, false))
+  EXPECT_CALL(read_exactly, ReadInt(false, 0x9ffffff0, 0x10))
       .WillOnce(Return(0x8));
-  EXPECT_CALL(read_exactly, ReadInt(0x9ffffff8, 0x8, false))
+  EXPECT_CALL(read_exactly, ReadInt(false, 0x9ffffff8, 0x8))
       .WillOnce(Return(0x4));
-  EXPECT_CALL(read_exactly, ReadInt(0x9ffffffc, 0x4, false))
+  EXPECT_CALL(read_exactly, ReadInt(false, 0x9ffffffc, 0x4))
       .WillOnce(Return(0x2));
-  EXPECT_CALL(read_exactly, ReadInt(0x9ffffffe, 0x2, false))
+  EXPECT_CALL(read_exactly, ReadInt(false, 0x9ffffffe, 0x2))
       .WillOnce(Return(0x1));
-  EXPECT_CALL(read_exactly, ReadInt(0x9fffffff, 0x1, false))
+  EXPECT_CALL(read_exactly, ReadInt(false, 0x9fffffff, 0x1))
       .WillOnce(Return(0x1));
-  EXPECT_TRUE(read_exactly.ReadExactlyInt(0x80000000, 0x20000000, false));
+  EXPECT_TRUE(read_exactly.ReadExactlyInt(false, 0x80000000, 0x20000000));
 }
 
 TEST(FileIO, ReadExactly_LargeSuccess) {
   MockReadExactly read_exactly;
   InSequence in_sequence;
-  constexpr size_t max = std::numeric_limits<uint32_t>::max();
-  constexpr size_t increment = std::numeric_limits<int32_t>::max();
-  EXPECT_CALL(read_exactly, ReadInt(0, max, false)).WillOnce(Return(increment));
-  EXPECT_CALL(read_exactly, ReadInt(increment, max - increment, false))
+  constexpr size_t max = std::numeric_limits<int32_t>::max();
+  constexpr size_t increment = max / 2;
+  EXPECT_CALL(read_exactly, ReadInt(false, 0, max)).WillOnce(Return(increment));
+  EXPECT_CALL(read_exactly, ReadInt(false, increment, max - increment))
       .WillOnce(Return(increment));
-  EXPECT_CALL(read_exactly, ReadInt(2 * increment, 1, false))
+  EXPECT_CALL(read_exactly, ReadInt(false, 2 * increment, 1))
       .WillOnce(Return(1));
-  EXPECT_TRUE(read_exactly.ReadExactlyInt(0, max, false));
+  EXPECT_TRUE(read_exactly.ReadExactlyInt(false, 0, max));
 }
 
 TEST(FileIO, ReadExactly_LargeShort) {
   MockReadExactly read_exactly;
   InSequence in_sequence;
-  EXPECT_CALL(read_exactly, ReadInt(0, 0xffffffff, false))
-      .WillOnce(Return(0x7fffffff));
-  EXPECT_CALL(read_exactly, ReadInt(0x7fffffff, 0x80000000, false))
+  EXPECT_CALL(read_exactly, ReadInt(false, 0, 0x7fffffff))
+      .WillOnce(Return(0x3fffffff));
+  EXPECT_CALL(read_exactly, ReadInt(false, 0x3fffffff, 0x40000000))
       .WillOnce(Return(0x10000000));
-  EXPECT_CALL(read_exactly, ReadInt(0x8fffffff, 0x70000000, false))
+  EXPECT_CALL(read_exactly, ReadInt(false, 0x4fffffff, 0x30000000))
       .WillOnce(Return(0));
-  EXPECT_FALSE(read_exactly.ReadExactlyInt(0, 0xffffffff, false));
+  EXPECT_FALSE(read_exactly.ReadExactlyInt(false, 0, 0x7fffffff));
 }
 
 TEST(FileIO, ReadExactly_LargeFailure) {
   MockReadExactly read_exactly;
   InSequence in_sequence;
-  EXPECT_CALL(read_exactly, ReadInt(0, 0xffffffff, false))
-      .WillOnce(Return(0x7fffffff));
-  EXPECT_CALL(read_exactly, ReadInt(0x7fffffff, 0x80000000, false))
+  EXPECT_CALL(read_exactly, ReadInt(false, 0, 0x7fffffff))
+      .WillOnce(Return(0x3fffffff));
+  EXPECT_CALL(read_exactly, ReadInt(false, 0x3fffffff, 0x40000000))
       .WillOnce(Return(-1));
-  EXPECT_FALSE(read_exactly.ReadExactlyInt(0, 0xffffffff, false));
+  EXPECT_FALSE(read_exactly.ReadExactlyInt(false, 0, 0x7fffffff));
 }
 
 TEST(FileIO, ReadExactly_TripleMax) {
   MockReadExactly read_exactly;
   InSequence in_sequence;
-  constexpr size_t max = std::numeric_limits<size_t>::max();
-  constexpr size_t increment =
-      std::numeric_limits<std::make_signed<size_t>::type>::max();
-  EXPECT_CALL(read_exactly, ReadInt(0, max, false)).WillOnce(Return(increment));
-  EXPECT_CALL(read_exactly, ReadInt(increment, max - increment, false))
+  // ReadExactly supports at most int32_t bytes.
+  constexpr size_t max = std::numeric_limits<int32_t>::max();
+  constexpr size_t increment = max / 2;
+  EXPECT_CALL(read_exactly, ReadInt(false, 0, max)).WillOnce(Return(increment));
+  EXPECT_CALL(read_exactly, ReadInt(false, increment, max - increment))
       .WillOnce(Return(increment));
-  EXPECT_CALL(read_exactly, ReadInt(2 * increment, 1, false))
+  EXPECT_CALL(read_exactly, ReadInt(false, 2 * increment, 1))
       .WillOnce(Return(1));
-  EXPECT_TRUE(read_exactly.ReadExactlyInt(0, max, false));
+  EXPECT_TRUE(read_exactly.ReadExactlyInt(false, 0, max));
 }
 
 class MockWriteAll : public internal::WriteAllInternal {
@@ -474,7 +478,7 @@ TEST(FileIO, LoggingOpenFileForReadAndWrite) {
   TestOpenFileForWrite(LoggingOpenFileForReadAndWrite);
 }
 
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 TEST(FileIO, LoggingOpenMemoryFileForReadAndWrite) {
   ScopedFileHandle handle(
       LoggingOpenMemoryFileForReadAndWrite(base::FilePath("memfile")));
@@ -489,7 +493,7 @@ TEST(FileIO, LoggingOpenMemoryFileForReadAndWrite) {
   ASSERT_TRUE(LoggingReadFileExactly(handle.get(), buffer, sizeof(buffer)));
   EXPECT_EQ(memcmp(buffer, kTestData, sizeof(buffer)), 0);
 }
-#endif  // OS_LINUX || OS_CHROMEOS
+#endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 
 enum class ReadOrWrite : bool {
   kRead,
@@ -545,7 +549,9 @@ TEST(FileIO, FileShareMode_Write_Write) {
 // Fuchsia does not currently support any sort of file locking. See
 // https://crashpad.chromium.org/bug/196 and
 // https://crashpad.chromium.org/bug/217.
-#if !defined(OS_FUCHSIA)
+// Android can conditionally not support file locking depending on what type of
+// filesystem is being used to store settings.dat.
+#if CRASHPAD_FLOCK_ALWAYS_SUPPORTED
 
 TEST(FileIO, MultipleSharedLocks) {
   ScopedTempDir temp_dir;
@@ -642,7 +648,7 @@ void LockingTest(FileLocking main_lock, FileLocking other_locks) {
 
   LockingTestThread threads[20];
   int expected_iterations = 0;
-  for (size_t index = 0; index < base::size(threads); ++index) {
+  for (size_t index = 0; index < std::size(threads); ++index) {
     int iterations_for_this_thread = static_cast<int>(index * 10);
     threads[index].Init(
         (other_locks == FileLocking::kShared)
@@ -720,7 +726,7 @@ TEST(FileIO, ExclusiveVsExclusivesNonBlocking) {
   EXPECT_TRUE(LoggingUnlockFile(handle2.get()));
 }
 
-#endif  // !OS_FUCHSIA
+#endif  // CRASHPAD_FLOCK_ALWAYS_SUPPORTED
 
 TEST(FileIO, FileSizeByHandle) {
   EXPECT_EQ(LoggingFileSizeByHandle(kInvalidFileHandle), -1);
@@ -742,9 +748,9 @@ TEST(FileIO, FileSizeByHandle) {
 
 FileHandle FileHandleForFILE(FILE* file) {
   int fd = fileno(file);
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
   return fd;
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   return reinterpret_cast<HANDLE>(_get_osfhandle(fd));
 #else
 #error Port
diff --git a/extern/crashpad/crashpad/util/file/file_io_win.cc b/extern/crashpad/crashpad/util/file/file_io_win.cc
index 93a1229472..002831fb98 100644
--- a/extern/crashpad/crashpad/util/file/file_io_win.cc
+++ b/extern/crashpad/crashpad/util/file/file_io_win.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 #include <algorithm>
 #include <limits>
 
+#include "base/check_op.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/notreached.h"
@@ -230,7 +231,6 @@ FileOffset LoggingSeekFile(FileHandle file, FileOffset offset, int whence) {
       break;
     default:
       NOTREACHED();
-      break;
   }
 
   LARGE_INTEGER distance_to_move;
@@ -283,7 +283,6 @@ FileHandle StdioFileHandle(StdioStream stdio_stream) {
       break;
     default:
       NOTREACHED();
-      return INVALID_HANDLE_VALUE;
   }
 
   HANDLE handle = GetStdHandle(standard_handle);
diff --git a/extern/crashpad/crashpad/util/file/file_reader.cc b/extern/crashpad/crashpad/util/file/file_reader.cc
index f22bd7ec66..6c30e524e0 100644
--- a/extern/crashpad/crashpad/util/file/file_reader.cc
+++ b/extern/crashpad/crashpad/util/file/file_reader.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,39 +14,22 @@
 
 #include "util/file/file_reader.h"
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "build/build_config.h"
 
 namespace crashpad {
 
-namespace {
-
-class FileReaderReadExactly final : public internal::ReadExactlyInternal {
- public:
-  explicit FileReaderReadExactly(FileReaderInterface* file_reader)
-      : ReadExactlyInternal(), file_reader_(file_reader) {}
-
-  FileReaderReadExactly(const FileReaderReadExactly&) = delete;
-  FileReaderReadExactly& operator=(const FileReaderReadExactly&) = delete;
-
-  ~FileReaderReadExactly() {}
-
- private:
-  // ReadExactlyInternal:
-  FileOperationResult Read(void* buffer, size_t size, bool can_log) override {
-    DCHECK(can_log);
-    return file_reader_->Read(buffer, size);
-  }
-
-  FileReaderInterface* file_reader_;  // weak
-};
-
-}  // namespace
-
 bool FileReaderInterface::ReadExactly(void* data, size_t size) {
-  FileReaderReadExactly read_exactly(this);
-  return read_exactly.ReadExactly(data, size, true);
+  return internal::ReadExactly(
+      [this](bool can_log, void* buffer, size_t size) {
+        DCHECK(can_log);
+        return Read(buffer, size);
+      },
+      true,
+      data,
+      size);
 }
 
 WeakFileHandleFileReader::WeakFileHandleFileReader(FileHandle file_handle)
diff --git a/extern/crashpad/crashpad/util/file/file_reader.h b/extern/crashpad/crashpad/util/file/file_reader.h
index f24366c117..7872e13514 100644
--- a/extern/crashpad/crashpad/util/file/file_reader.h
+++ b/extern/crashpad/crashpad/util/file/file_reader.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/file/file_reader_test.cc b/extern/crashpad/crashpad/util/file/file_reader_test.cc
index bda1a3b4a9..e68959f041 100644
--- a/extern/crashpad/crashpad/util/file/file_reader_test.cc
+++ b/extern/crashpad/crashpad/util/file/file_reader_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -156,8 +156,8 @@ TEST(FileReader, ReadExactly_Medium) {
 TEST(FileReader, ReadExactly_LargeSuccess) {
   MockFileReader file_reader;
   InSequence in_sequence;
-  constexpr size_t max = std::numeric_limits<uint32_t>::max();
-  constexpr size_t increment = std::numeric_limits<int32_t>::max();
+  constexpr size_t max = std::numeric_limits<int32_t>::max();
+  constexpr size_t increment = max / 2;
   EXPECT_CALL(file_reader, ReadInt(0, max)).WillOnce(Return(increment));
   EXPECT_CALL(file_reader, ReadInt(increment, max - increment))
       .WillOnce(Return(increment));
@@ -169,30 +169,30 @@ TEST(FileReader, ReadExactly_LargeSuccess) {
 TEST(FileReader, ReadExactly_LargeShort) {
   MockFileReader file_reader;
   InSequence in_sequence;
-  EXPECT_CALL(file_reader, ReadInt(0, 0xffffffff)).WillOnce(Return(0x7fffffff));
-  EXPECT_CALL(file_reader, ReadInt(0x7fffffff, 0x80000000))
+  EXPECT_CALL(file_reader, ReadInt(0, 0x7fffffff)).WillOnce(Return(0x3fffffff));
+  EXPECT_CALL(file_reader, ReadInt(0x3fffffff, 0x40000000))
       .WillOnce(Return(0x10000000));
-  EXPECT_CALL(file_reader, ReadInt(0x8fffffff, 0x70000000)).WillOnce(Return(0));
+  EXPECT_CALL(file_reader, ReadInt(0x4fffffff, 0x30000000)).WillOnce(Return(0));
   EXPECT_CALL(file_reader, Seek(_, _)).Times(0);
-  EXPECT_FALSE(file_reader.ReadExactlyInt(0, 0xffffffff));
+  EXPECT_FALSE(file_reader.ReadExactlyInt(0, 0x7fffffff));
 }
 
 TEST(FileReader, ReadExactly_LargeFailure) {
   MockFileReader file_reader;
   InSequence in_sequence;
-  EXPECT_CALL(file_reader, ReadInt(0, 0xffffffff)).WillOnce(Return(0x7fffffff));
-  EXPECT_CALL(file_reader, ReadInt(0x7fffffff, 0x80000000))
+  EXPECT_CALL(file_reader, ReadInt(0, 0x7fffffff)).WillOnce(Return(0x3fffffff));
+  EXPECT_CALL(file_reader, ReadInt(0x3fffffff, 0x40000000))
       .WillOnce(Return(-1));
   EXPECT_CALL(file_reader, Seek(_, _)).Times(0);
-  EXPECT_FALSE(file_reader.ReadExactlyInt(0, 0xffffffff));
+  EXPECT_FALSE(file_reader.ReadExactlyInt(0, 0x7fffffff));
 }
 
 TEST(FileReader, ReadExactly_TripleMax) {
   MockFileReader file_reader;
   InSequence in_sequence;
-  constexpr size_t max = std::numeric_limits<size_t>::max();
-  constexpr size_t increment =
-      std::numeric_limits<std::make_signed<size_t>::type>::max();
+  // ReadExactly supports at most int32_t bytes.
+  constexpr size_t max = std::numeric_limits<int32_t>::max();
+  constexpr size_t increment = max / 2;
   EXPECT_CALL(file_reader, ReadInt(0, max)).WillOnce(Return(increment));
   EXPECT_CALL(file_reader, ReadInt(increment, max - increment))
       .WillOnce(Return(increment));
diff --git a/extern/crashpad/crashpad/util/file/file_seeker.cc b/extern/crashpad/crashpad/util/file/file_seeker.cc
index a38e2f9185..9372c133b4 100644
--- a/extern/crashpad/crashpad/util/file/file_seeker.cc
+++ b/extern/crashpad/crashpad/util/file/file_seeker.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/file/file_seeker.h b/extern/crashpad/crashpad/util/file/file_seeker.h
index a7cff90807..c129486b45 100644
--- a/extern/crashpad/crashpad/util/file/file_seeker.h
+++ b/extern/crashpad/crashpad/util/file/file_seeker.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/file/file_writer.cc b/extern/crashpad/crashpad/util/file/file_writer.cc
index 73fe708796..a5bfa0811f 100644
--- a/extern/crashpad/crashpad/util/file/file_writer.cc
+++ b/extern/crashpad/crashpad/util/file/file_writer.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,27 +20,28 @@
 
 #include <algorithm>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "build/build_config.h"
 #include "util/misc/implicit_cast.h"
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 #include <sys/uio.h>
 #include <unistd.h>
 #include "base/posix/eintr_wrapper.h"
-#endif  // OS_POSIX
+#endif  // BUILDFLAG(IS_POSIX)
 
 namespace crashpad {
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 // Ensure type compatibility between WritableIoVec and iovec.
 static_assert(sizeof(WritableIoVec) == sizeof(iovec), "WritableIoVec size");
 static_assert(offsetof(WritableIoVec, iov_base) == offsetof(iovec, iov_base),
               "WritableIoVec base offset");
 static_assert(offsetof(WritableIoVec, iov_len) == offsetof(iovec, iov_len),
               "WritableIoVec len offset");
-#endif  // OS_POSIX
+#endif  // BUILDFLAG(IS_POSIX)
 
 WeakFileHandleFileWriter::WeakFileHandleFileWriter(FileHandle file_handle)
     : file_handle_(file_handle) {
@@ -62,7 +63,7 @@ bool WeakFileHandleFileWriter::WriteIoVec(std::vector<WritableIoVec>* iovecs) {
     return false;
   }
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 
   ssize_t size = 0;
   for (const WritableIoVec& iov : *iovecs) {
@@ -79,7 +80,7 @@ bool WeakFileHandleFileWriter::WriteIoVec(std::vector<WritableIoVec>* iovecs) {
   iovec* iov = reinterpret_cast<iovec*>(&(*iovecs)[0]);
   size_t remaining_iovecs = iovecs->size();
 
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
   // Android does not expose the IOV_MAX macro, but makes its value available
   // via sysconf(). See Android 7.0.0 bionic/libc/bionic/sysconf.cpp sysconf().
   // Bionic defines IOV_MAX at bionic/libc/include/limits.h, but does not ship
@@ -127,14 +128,14 @@ bool WeakFileHandleFileWriter::WriteIoVec(std::vector<WritableIoVec>* iovecs) {
 
   DCHECK_EQ(remaining_iovecs, 0u);
 
-#else  // !OS_POSIX
+#else  // !BUILDFLAG(IS_POSIX)
 
   for (const WritableIoVec& iov : *iovecs) {
     if (!Write(iov.iov_base, iov.iov_len))
       return false;
   }
 
-#endif  // OS_POSIX
+#endif  // BUILDFLAG(IS_POSIX)
 
 #ifndef NDEBUG
   // The interface says that |iovecs| is not sacred, so scramble it to make sure
@@ -171,7 +172,7 @@ bool FileWriter::Open(const base::FilePath& path,
   return true;
 }
 
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 bool FileWriter::OpenMemfd(const base::FilePath& path) {
   CHECK(!file_.is_valid());
   file_.reset(LoggingOpenMemoryFileForReadAndWrite(path));
diff --git a/extern/crashpad/crashpad/util/file/file_writer.h b/extern/crashpad/crashpad/util/file/file_writer.h
index 4ba7a43868..6ff4b5c182 100644
--- a/extern/crashpad/crashpad/util/file/file_writer.h
+++ b/extern/crashpad/crashpad/util/file/file_writer.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 #include <vector>
 
 #include "base/files/file_path.h"
+#include "build/build_config.h"
 #include "util/file/file_io.h"
 #include "util/file/file_seeker.h"
 
@@ -136,7 +137,7 @@ class FileWriter : public FileWriterInterface {
             FileWriteMode write_mode,
             FilePermissions permissions);
 
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
   //! \brief Wraps LoggingOpenMemoryFileForWrite().
   //!
   //! \return `true` if the operation succeeded, `false` if it failed, with an
diff --git a/extern/crashpad/crashpad/util/file/filesystem.h b/extern/crashpad/crashpad/util/file/filesystem.h
index e12f127148..f04ee10d9b 100644
--- a/extern/crashpad/crashpad/util/file/filesystem.h
+++ b/extern/crashpad/crashpad/util/file/filesystem.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -111,6 +111,22 @@ bool LoggingRemoveFile(const base::FilePath& path);
 //! \return `true` if the directory was removed. Otherwise, `false`.
 bool LoggingRemoveDirectory(const base::FilePath& path);
 
+//! \brief Returns the size of the file at |filepath|.
+//!    The function will ignore symlinks (not follow them, not add them to
+//!    the returned size).
+//!
+//! \return The size of the file pointed by |filepath|.
+uint64_t GetFileSize(const base::FilePath& filepath);
+
+//! \brief Returns the recursive sum of the size of the files in |dirPath|.
+//!    The function will ignore symlinks (not follow them, not add them to
+//!    the returned size).
+//!
+//! \param[in] dirPath The path to the directory
+//!
+//! \return The sum of the size of the files in |dirPath|.
+uint64_t GetDirectorySize(const base::FilePath& dirPath);
+
 }  // namespace crashpad
 
 #endif  // CRASHPAD_UTIL_FILE_FILESYSTEM_H_
diff --git a/extern/crashpad/crashpad/util/file/filesystem_posix.cc b/extern/crashpad/crashpad/util/file/filesystem_posix.cc
index 60799eb4b3..0c701c0d11 100644
--- a/extern/crashpad/crashpad/util/file/filesystem_posix.cc
+++ b/extern/crashpad/crashpad/util/file/filesystem_posix.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 
 #include "base/logging.h"
 #include "build/build_config.h"
+#include "util/file/directory_reader.h"
 
 namespace crashpad {
 
@@ -32,9 +33,9 @@ bool FileModificationTime(const base::FilePath& path, timespec* mtime) {
     return false;
   }
 
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
   *mtime = st.st_mtimespec;
-#elif defined(OS_ANDROID)
+#elif BUILDFLAG(IS_ANDROID)
   // This is needed to compile with traditional NDK headers.
   mtime->tv_sec = st.st_mtime;
   mtime->tv_nsec = st.st_mtime_nsec;
@@ -112,4 +113,38 @@ bool LoggingRemoveDirectory(const base::FilePath& path) {
   return true;
 }
 
+uint64_t GetFileSize(const base::FilePath& filepath) {
+  if (!IsRegularFile(filepath)) {
+    return 0;
+  }
+  struct stat statbuf;
+  if (stat(filepath.value().c_str(), &statbuf) == 0) {
+    return statbuf.st_size;
+  }
+  PLOG(ERROR) << "stat " << filepath.value().c_str();
+  return 0;
+}
+
+uint64_t GetDirectorySize(const base::FilePath& dirpath) {
+  if (!IsDirectory(dirpath, /*allow_symlinks=*/false)) {
+    return 0;
+  }
+  DirectoryReader reader;
+  if (!reader.Open(dirpath)) {
+    return 0;
+  }
+  base::FilePath filename;
+  DirectoryReader::Result result;
+  uint64_t size = 0;
+  while ((result = reader.NextFile(&filename)) ==
+         DirectoryReader::Result::kSuccess) {
+    const base::FilePath filepath(dirpath.Append(filename));
+    if (IsDirectory(filepath, /*allow_symlinks=*/false)) {
+      size += GetDirectorySize(filepath);
+    } else {
+      size += GetFileSize(filepath);
+    }
+  }
+  return size;
+}
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/util/file/filesystem_test.cc b/extern/crashpad/crashpad/util/file/filesystem_test.cc
index 30cd0d128e..bff3e3235e 100644
--- a/extern/crashpad/crashpad/util/file/filesystem_test.cc
+++ b/extern/crashpad/crashpad/util/file/filesystem_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,14 +21,17 @@
 #include "test/errors.h"
 #include "test/filesystem.h"
 #include "test/scoped_temp_dir.h"
+#include "util/file/file_writer.h"
 #include "util/misc/time.h"
 
 namespace crashpad {
 namespace test {
 namespace {
 
+constexpr char kTestFileContent[] = "file_content";
+
 bool CurrentTime(timespec* now) {
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
   timeval now_tv;
   int res = gettimeofday(&now_tv, nullptr);
   if (res != 0) {
@@ -37,7 +40,7 @@ bool CurrentTime(timespec* now) {
   }
   TimevalToTimespec(now_tv, now);
   return true;
-#elif defined(OS_POSIX)
+#elif BUILDFLAG(IS_POSIX)
   int res = clock_gettime(CLOCK_REALTIME, now);
   if (res != 0) {
     EXPECT_EQ(res, 0) << ErrnoMessage("clock_gettime");
@@ -87,7 +90,7 @@ TEST(Filesystem, FileModificationTime) {
       temp_dir.path().Append(FILE_PATH_LITERAL("notafile")), &mtime));
 }
 
-#if !defined(OS_FUCHSIA)
+#if !BUILDFLAG(IS_FUCHSIA)
 
 TEST(Filesystem, FileModificationTime_SymbolicLinks) {
   if (!CanCreateSymbolicLinks()) {
@@ -137,7 +140,7 @@ TEST(Filesystem, FileModificationTime_SymbolicLinks) {
   EXPECT_LE(mtime.tv_sec, expected_time_end.tv_sec + 2);
 }
 
-#endif  // !OS_FUCHSIA
+#endif  // !BUILDFLAG(IS_FUCHSIA)
 
 TEST(Filesystem, CreateDirectory) {
   ScopedTempDir temp_dir;
@@ -218,7 +221,7 @@ TEST(Filesystem, MoveFileOrDirectory) {
   EXPECT_TRUE(IsRegularFile(file));
 }
 
-#if !defined(OS_FUCHSIA)
+#if !BUILDFLAG(IS_FUCHSIA)
 
 TEST(Filesystem, MoveFileOrDirectory_SymbolicLinks) {
   if (!CanCreateSymbolicLinks()) {
@@ -281,7 +284,7 @@ TEST(Filesystem, MoveFileOrDirectory_SymbolicLinks) {
   EXPECT_FALSE(PathExists(link2));
 }
 
-#endif  // !OS_FUCHSIA
+#endif  // !BUILDFLAG(IS_FUCHSIA)
 
 TEST(Filesystem, IsRegularFile) {
   EXPECT_FALSE(IsRegularFile(base::FilePath()));
@@ -296,7 +299,7 @@ TEST(Filesystem, IsRegularFile) {
   EXPECT_TRUE(IsRegularFile(file));
 }
 
-#if !defined(OS_FUCHSIA)
+#if !BUILDFLAG(IS_FUCHSIA)
 
 TEST(Filesystem, IsRegularFile_SymbolicLinks) {
   if (!CanCreateSymbolicLinks()) {
@@ -320,7 +323,7 @@ TEST(Filesystem, IsRegularFile_SymbolicLinks) {
   EXPECT_FALSE(IsRegularFile(dir_link));
 }
 
-#endif  // !OS_FUCHSIA
+#endif  // !BUILDFLAG(IS_FUCHSIA)
 
 TEST(Filesystem, IsDirectory) {
   EXPECT_FALSE(IsDirectory(base::FilePath(), false));
@@ -338,7 +341,7 @@ TEST(Filesystem, IsDirectory) {
   EXPECT_FALSE(IsDirectory(file, true));
 }
 
-#if !defined(OS_FUCHSIA)
+#if !BUILDFLAG(IS_FUCHSIA)
 
 TEST(Filesystem, IsDirectory_SymbolicLinks) {
   if (!CanCreateSymbolicLinks()) {
@@ -365,7 +368,7 @@ TEST(Filesystem, IsDirectory_SymbolicLinks) {
   EXPECT_TRUE(IsDirectory(dir_link, true));
 }
 
-#endif  // !OS_FUCHSIA
+#endif  // !BUILDFLAG(IS_FUCHSIA)
 
 TEST(Filesystem, RemoveFile) {
   EXPECT_FALSE(LoggingRemoveFile(base::FilePath()));
@@ -387,7 +390,7 @@ TEST(Filesystem, RemoveFile) {
   EXPECT_FALSE(LoggingRemoveFile(file));
 }
 
-#if !defined(OS_FUCHSIA)
+#if !BUILDFLAG(IS_FUCHSIA)
 
 TEST(Filesystem, RemoveFile_SymbolicLinks) {
   if (!CanCreateSymbolicLinks()) {
@@ -414,7 +417,7 @@ TEST(Filesystem, RemoveFile_SymbolicLinks) {
   EXPECT_TRUE(PathExists(dir));
 }
 
-#endif  // !OS_FUCHSIA
+#endif  // !BUILDFLAG(IS_FUCHSIA)
 
 TEST(Filesystem, RemoveDirectory) {
   EXPECT_FALSE(LoggingRemoveDirectory(base::FilePath()));
@@ -429,7 +432,7 @@ TEST(Filesystem, RemoveDirectory) {
   EXPECT_FALSE(LoggingRemoveDirectory(file));
 
   ASSERT_TRUE(CreateFile(file));
-#if !defined(OS_FUCHSIA)
+#if !BUILDFLAG(IS_FUCHSIA)
   // The current implementation of Fuchsia's rmdir() simply calls unlink(), and
   // unlink() works on all FS objects. This is incorrect as
   // http://pubs.opengroup.org/onlinepubs/9699919799/functions/rmdir.html says
@@ -444,7 +447,7 @@ TEST(Filesystem, RemoveDirectory) {
   EXPECT_TRUE(LoggingRemoveDirectory(dir));
 }
 
-#if !defined(OS_FUCHSIA)
+#if !BUILDFLAG(IS_FUCHSIA)
 
 TEST(Filesystem, RemoveDirectory_SymbolicLinks) {
   if (!CanCreateSymbolicLinks()) {
@@ -469,7 +472,69 @@ TEST(Filesystem, RemoveDirectory_SymbolicLinks) {
   EXPECT_TRUE(LoggingRemoveFile(link));
 }
 
-#endif  // !OS_FUCHSIA
+#endif  // !BUILDFLAG(IS_FUCHSIA)
+
+TEST(Filesystem, GetFileSize) {
+  ScopedTempDir temp_dir;
+  base::FilePath filepath(temp_dir.path().Append(FILE_PATH_LITERAL("file")));
+  FileWriter writer;
+  bool is_created = writer.Open(
+      filepath, FileWriteMode::kCreateOrFail, FilePermissions::kOwnerOnly);
+  ASSERT_TRUE(is_created);
+  writer.Write(kTestFileContent, sizeof(kTestFileContent));
+  writer.Close();
+  uint64_t filesize = GetFileSize(filepath);
+  EXPECT_EQ(filesize, sizeof(kTestFileContent));
+
+#if !BUILDFLAG(IS_FUCHSIA)
+  if (!CanCreateSymbolicLinks()) {
+    GTEST_SKIP();
+  }
+
+  // Create a link to a file.
+  base::FilePath link(temp_dir.path().Append(FILE_PATH_LITERAL("link")));
+  ASSERT_TRUE(CreateSymbolicLink(filepath, link));
+  uint64_t filesize_link = GetFileSize(link);
+  EXPECT_EQ(filesize_link, 0u);
+#endif  // !BUILDFLAG(IS_FUCHSIA)
+}
+
+TEST(Filesystem, GetDirectorySize) {
+  ScopedTempDir temp_dir;
+  base::FilePath dir(temp_dir.path().Append(FILE_PATH_LITERAL("dir")));
+  ASSERT_TRUE(
+      LoggingCreateDirectory(dir, FilePermissions::kWorldReadable, false));
+  base::FilePath filepath1(temp_dir.path().Append(FILE_PATH_LITERAL("file")));
+  FileWriter writer1;
+  bool is_created1 = writer1.Open(
+      filepath1, FileWriteMode::kCreateOrFail, FilePermissions::kOwnerOnly);
+  ASSERT_TRUE(is_created1);
+  writer1.Write(kTestFileContent, sizeof(kTestFileContent));
+  writer1.Close();
+
+  base::FilePath filepath2(dir.Append(FILE_PATH_LITERAL("file")));
+  FileWriter writer2;
+  bool is_created2 = writer2.Open(
+      filepath2, FileWriteMode::kCreateOrFail, FilePermissions::kOwnerOnly);
+  ASSERT_TRUE(is_created2);
+  writer2.Write(kTestFileContent, sizeof(kTestFileContent));
+  writer2.Close();
+
+#if !BUILDFLAG(IS_FUCHSIA)
+  if (CanCreateSymbolicLinks()) {
+    // Create a link to a file.
+    base::FilePath link(dir.Append(FILE_PATH_LITERAL("link")));
+    ASSERT_TRUE(CreateSymbolicLink(filepath2, link));
+
+    // Create a link to a dir.
+    base::FilePath linkdir(temp_dir.path().Append(FILE_PATH_LITERAL("link")));
+    ASSERT_TRUE(CreateSymbolicLink(dir, linkdir));
+  }
+#endif  // !BUILDFLAG(IS_FUCHSIA)
+
+  uint64_t filesize = GetDirectorySize(temp_dir.path());
+  EXPECT_EQ(filesize, 2 * sizeof(kTestFileContent));
+}
 
 }  // namespace
 }  // namespace test
diff --git a/extern/crashpad/crashpad/util/file/filesystem_win.cc b/extern/crashpad/crashpad/util/file/filesystem_win.cc
index d0270fc6bf..b6454b3ab2 100644
--- a/extern/crashpad/crashpad/util/file/filesystem_win.cc
+++ b/extern/crashpad/crashpad/util/file/filesystem_win.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 #include <windows.h>
 
 #include "base/logging.h"
-#include "base/strings/utf_string_conversions.h"
+#include "util/file/directory_reader.h"
 #include "util/misc/time.h"
 
 namespace crashpad {
@@ -34,7 +34,7 @@ bool IsSymbolicLink(const base::FilePath& path) {
                                             nullptr,
                                             0));
   if (!handle.is_valid()) {
-    PLOG(ERROR) << "FindFirstFileEx " << base::WideToUTF8(path.value());
+    PLOG(ERROR) << "FindFirstFileEx " << path;
     return false;
   }
 
@@ -44,7 +44,7 @@ bool IsSymbolicLink(const base::FilePath& path) {
 
 bool LoggingRemoveDirectoryImpl(const base::FilePath& path) {
   if (!RemoveDirectory(path.value().c_str())) {
-    PLOG(ERROR) << "RemoveDirectory " << base::WideToUTF8(path.value());
+    PLOG(ERROR) << "RemoveDirectory " << path;
     return false;
   }
   return true;
@@ -68,13 +68,13 @@ bool FileModificationTime(const base::FilePath& path, timespec* mtime) {
                    flags,
                    nullptr));
   if (!handle.is_valid()) {
-    PLOG(ERROR) << "CreateFile " << base::WideToUTF8(path.value());
+    PLOG(ERROR) << "CreateFile " << path;
     return false;
   }
 
   FILETIME file_mtime;
   if (!GetFileTime(handle.get(), nullptr, nullptr, &file_mtime)) {
-    PLOG(ERROR) << "GetFileTime " << base::WideToUTF8(path.value());
+    PLOG(ERROR) << "GetFileTime " << path;
     return false;
   }
   *mtime = FiletimeToTimespecEpoch(file_mtime);
@@ -89,12 +89,12 @@ bool LoggingCreateDirectory(const base::FilePath& path,
   }
   if (may_reuse && GetLastError() == ERROR_ALREADY_EXISTS) {
     if (!IsDirectory(path, true)) {
-      LOG(ERROR) << base::WideToUTF8(path.value()) << " not a directory";
+      LOG(ERROR) << path << " not a directory";
       return false;
     }
     return true;
   }
-  PLOG(ERROR) << "CreateDirectory " << base::WideToUTF8(path.value());
+  PLOG(ERROR) << "CreateDirectory " << path;
   return false;
 }
 
@@ -103,8 +103,7 @@ bool MoveFileOrDirectory(const base::FilePath& source,
   if (!MoveFileEx(source.value().c_str(),
                   dest.value().c_str(),
                   IsDirectory(source, false) ? 0 : MOVEFILE_REPLACE_EXISTING)) {
-    PLOG(ERROR) << "MoveFileEx" << base::WideToUTF8(source.value()) << ", "
-                << base::WideToUTF8(dest.value());
+    PLOG(ERROR) << "MoveFileEx" << source << ", " << dest;
     return false;
   }
   return true;
@@ -113,7 +112,7 @@ bool MoveFileOrDirectory(const base::FilePath& source,
 bool IsRegularFile(const base::FilePath& path) {
   DWORD fileattr = GetFileAttributes(path.value().c_str());
   if (fileattr == INVALID_FILE_ATTRIBUTES) {
-    PLOG(ERROR) << "GetFileAttributes " << base::WideToUTF8(path.value());
+    PLOG(ERROR) << "GetFileAttributes " << path;
     return false;
   }
   if ((fileattr & FILE_ATTRIBUTE_DIRECTORY) != 0 ||
@@ -126,7 +125,7 @@ bool IsRegularFile(const base::FilePath& path) {
 bool IsDirectory(const base::FilePath& path, bool allow_symlinks) {
   DWORD fileattr = GetFileAttributes(path.value().c_str());
   if (fileattr == INVALID_FILE_ATTRIBUTES) {
-    PLOG(ERROR) << "GetFileAttributes " << base::WideToUTF8(path.value());
+    PLOG(ERROR) << "GetFileAttributes " << path;
     return false;
   }
   if (!allow_symlinks && (fileattr & FILE_ATTRIBUTE_REPARSE_POINT) != 0) {
@@ -145,7 +144,7 @@ bool LoggingRemoveFile(const base::FilePath& path) {
   }
 
   if (!DeleteFile(path.value().c_str())) {
-    PLOG(ERROR) << "DeleteFile " << base::WideToUTF8(path.value());
+    PLOG(ERROR) << "DeleteFile " << path;
     return false;
   }
   return true;
@@ -153,10 +152,46 @@ bool LoggingRemoveFile(const base::FilePath& path) {
 
 bool LoggingRemoveDirectory(const base::FilePath& path) {
   if (IsSymbolicLink(path)) {
-    LOG(ERROR) << "Not a directory " << base::WideToUTF8(path.value());
+    LOG(ERROR) << "Not a directory " << path;
     return false;
   }
   return LoggingRemoveDirectoryImpl(path);
 }
 
+uint64_t GetFileSize(const base::FilePath& filepath) {
+  struct _stati64 statbuf;
+  if (!IsRegularFile(filepath)) {
+    return 0;
+  }
+  int ret_value = _wstat64(filepath.value().c_str(), &statbuf);
+  if (ret_value == 0) {
+    return statbuf.st_size;
+  }
+  PLOG(ERROR) << "stat " << filepath;
+  return 0;
+}
+
+uint64_t GetDirectorySize(const base::FilePath& dirpath) {
+  if (!IsDirectory(dirpath, /*allow_symlinks=*/false)) {
+    return 0;
+  }
+  DirectoryReader reader;
+  if (!reader.Open(dirpath)) {
+    return 0;
+  }
+  base::FilePath filename;
+  DirectoryReader::Result result;
+  uint64_t size = 0;
+  while ((result = reader.NextFile(&filename)) ==
+         DirectoryReader::Result::kSuccess) {
+    const base::FilePath filepath(dirpath.Append(filename));
+    if (IsDirectory(filepath, /*allow_symlinks=*/false)) {
+      size += GetDirectorySize(filepath);
+    } else {
+      size += GetFileSize(filepath);
+    }
+  }
+  return size;
+}
+
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/util/file/output_stream_file_writer.cc b/extern/crashpad/crashpad/util/file/output_stream_file_writer.cc
index d55c0ad335..150a9e7a16 100644
--- a/extern/crashpad/crashpad/util/file/output_stream_file_writer.cc
+++ b/extern/crashpad/crashpad/util/file/output_stream_file_writer.cc
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -57,7 +57,6 @@ bool OutputStreamFileWriter::WriteIoVec(std::vector<WritableIoVec>* iovecs) {
 
 FileOffset OutputStreamFileWriter::Seek(FileOffset offset, int whence) {
   NOTREACHED();
-  return -1;
 }
 
 bool OutputStreamFileWriter::Flush() {
diff --git a/extern/crashpad/crashpad/util/file/output_stream_file_writer.h b/extern/crashpad/crashpad/util/file/output_stream_file_writer.h
index 60965f9219..67f8ff4ee3 100644
--- a/extern/crashpad/crashpad/util/file/output_stream_file_writer.h
+++ b/extern/crashpad/crashpad/util/file/output_stream_file_writer.h
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/file/scoped_remove_file.cc b/extern/crashpad/crashpad/util/file/scoped_remove_file.cc
index af53b60c3b..9fb2130719 100644
--- a/extern/crashpad/crashpad/util/file/scoped_remove_file.cc
+++ b/extern/crashpad/crashpad/util/file/scoped_remove_file.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/file/scoped_remove_file.h b/extern/crashpad/crashpad/util/file/scoped_remove_file.h
index de4af0d445..ac7df5edd7 100644
--- a/extern/crashpad/crashpad/util/file/scoped_remove_file.h
+++ b/extern/crashpad/crashpad/util/file/scoped_remove_file.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/file/string_file.cc b/extern/crashpad/crashpad/util/file/string_file.cc
index 959b0a5398..959d04740b 100644
--- a/extern/crashpad/crashpad/util/file/string_file.cc
+++ b/extern/crashpad/crashpad/util/file/string_file.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 #include <algorithm>
 #include <limits>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/numerics/safe_math.h"
 #include "util/misc/implicit_cast.h"
diff --git a/extern/crashpad/crashpad/util/file/string_file.h b/extern/crashpad/crashpad/util/file/string_file.h
index bd68987464..07f8caea2e 100644
--- a/extern/crashpad/crashpad/util/file/string_file.h
+++ b/extern/crashpad/crashpad/util/file/string_file.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/file/string_file_test.cc b/extern/crashpad/crashpad/util/file/string_file_test.cc
index 5c8512ba6d..d90610e336 100644
--- a/extern/crashpad/crashpad/util/file/string_file_test.cc
+++ b/extern/crashpad/crashpad/util/file/string_file_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/fuchsia/koid_utilities.cc b/extern/crashpad/crashpad/util/fuchsia/koid_utilities.cc
index f0377dc357..00f986e70f 100644
--- a/extern/crashpad/crashpad/util/fuchsia/koid_utilities.cc
+++ b/extern/crashpad/crashpad/util/fuchsia/koid_utilities.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/fuchsia/koid_utilities.h b/extern/crashpad/crashpad/util/fuchsia/koid_utilities.h
index 8859bc51eb..733d77ff2b 100644
--- a/extern/crashpad/crashpad/util/fuchsia/koid_utilities.h
+++ b/extern/crashpad/crashpad/util/fuchsia/koid_utilities.h
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/fuchsia/scoped_task_suspend.cc b/extern/crashpad/crashpad/util/fuchsia/scoped_task_suspend.cc
index 8591d55833..ef057ae3c4 100644
--- a/extern/crashpad/crashpad/util/fuchsia/scoped_task_suspend.cc
+++ b/extern/crashpad/crashpad/util/fuchsia/scoped_task_suspend.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 
 #include <vector>
 
+#include "base/check_op.h"
 #include "base/fuchsia/fuchsia_logging.h"
 #include "base/logging.h"
 #include "util/fuchsia/koid_utilities.h"
diff --git a/extern/crashpad/crashpad/util/fuchsia/scoped_task_suspend.h b/extern/crashpad/crashpad/util/fuchsia/scoped_task_suspend.h
index 49a73cf5ee..e576794360 100644
--- a/extern/crashpad/crashpad/util/fuchsia/scoped_task_suspend.h
+++ b/extern/crashpad/crashpad/util/fuchsia/scoped_task_suspend.h
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/fuchsia/traits.h b/extern/crashpad/crashpad/util/fuchsia/traits.h
index 5cdedc162b..419c12fdec 100644
--- a/extern/crashpad/crashpad/util/fuchsia/traits.h
+++ b/extern/crashpad/crashpad/util/fuchsia/traits.h
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_data.cc b/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_data.cc
index 4879ccf20c..b45e16cdda 100644
--- a/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_data.cc
+++ b/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_data.cc
@@ -1,4 +1,4 @@
-// Copyright 2021 The Crashpad Authors. All rights reserved.
+// Copyright 2021 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_data.h b/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_data.h
index c2613e90f3..024c22e617 100644
--- a/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_data.h
+++ b/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_data.h
@@ -1,4 +1,4 @@
-// Copyright 2021 The Crashpad Authors. All rights reserved.
+// Copyright 2021 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -35,8 +35,7 @@ class IOSIntermediateDumpData : public IOSIntermediateDumpObject {
 
   //! \brief Constructs a new data object which owns a std::vector<uint8_t>.
   //!
-  //! \param[in] data An array of uint8_t.
-  //! \param[in] length The length of \a data.
+  //! \param[in] data A vector of uint8_t.
   IOSIntermediateDumpData(std::vector<uint8_t> data) : data_(std::move(data)) {}
 
   // IOSIntermediateDumpObject:
diff --git a/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_format.h b/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_format.h
index 46d3f46798..32752f6116 100644
--- a/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_format.h
+++ b/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_format.h
@@ -1,4 +1,4 @@
-// Copyright 2021 The Crashpad Authors. All rights reserved.
+// Copyright 2021 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
 #ifndef CRASHPAD_UTIL_IOS_IOS_INTERMEDIATE_DUMP_FORMAT_H_
 #define CRASHPAD_UTIL_IOS_IOS_INTERMEDIATE_DUMP_FORMAT_H_
 
+#include <stdint.h>
+
 namespace crashpad {
 namespace internal {
 
@@ -54,6 +56,12 @@ namespace internal {
     TD(kAnnotationsCrashInfoMessage1, 3016) \
     TD(kAnnotationsCrashInfoMessage2, 3017) \
     TD(kAnnotationsDyldErrorString, 3018) \
+    TD(kModuleExtraMemoryRegions, 3019) \
+    TD(kModuleExtraMemoryRegionAddress, 3020) \
+    TD(kModuleExtraMemoryRegionData, 3021) \
+    TD(kModuleIntermediateDumpExtraMemoryRegions, 3022) \
+    TD(kModuleIntermediateDumpExtraMemoryRegionAddress, 3023) \
+    TD(kModuleIntermediateDumpExtraMemoryRegionData, 3024) \
   TD(kProcessInfo, 4000) \
     TD(kParentPID, 4001) \
     TD(kPID, 4002) \
@@ -83,6 +91,8 @@ namespace internal {
     TD(kFree, 5017) \
     TD(kInactive, 5018) \
     TD(kWired, 5019) \
+    TD(kAddressMask, 5020) \
+    TD(kCrashpadUptime, 5021) \
   TD(kThreads, 6000) \
     TD(kDebugState, 6001) \
     TD(kFloatState, 6002) \
@@ -97,10 +107,10 @@ namespace internal {
     TD(kThreadContextMemoryRegions, 6011) \
     TD(kThreadContextMemoryRegionAddress, 6012) \
     TD(kThreadContextMemoryRegionData, 6013) \
+    TD(kThreadName, 6014) \
   TD(kMaxValue, 65535) \
 // clang-format on
 
-
 //! \brief They key for items in the intermediate dump file.
 //!
 //! These values are persisted to the intermediate crash dump file. Entries
diff --git a/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_interface.cc b/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_interface.cc
new file mode 100644
index 0000000000..c9caddbf8b
--- /dev/null
+++ b/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_interface.cc
@@ -0,0 +1,60 @@
+// Copyright 2021 The Crashpad Authors
+//
+// 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.
+
+#include "util/ios/ios_intermediate_dump_interface.h"
+
+#include "util/file/scoped_remove_file.h"
+
+namespace crashpad {
+namespace internal {
+
+bool IOSIntermediateDumpFilePath::Initialize(const base::FilePath& path) {
+  INITIALIZATION_STATE_SET_INITIALIZING(initialized_);
+  ScopedRemoveFile file_remover(path);
+  handle_.reset(LoggingOpenFileForRead(path));
+  if (!handle_.is_valid())
+    return false;
+
+  reader_ = std::make_unique<WeakFileHandleFileReader>(handle_.get());
+  INITIALIZATION_STATE_SET_VALID(initialized_);
+  return true;
+}
+
+FileReaderInterface* IOSIntermediateDumpFilePath::FileReader() const {
+  INITIALIZATION_STATE_DCHECK_VALID(initialized_);
+  return reader_.get();
+}
+
+FileOffset IOSIntermediateDumpFilePath::Size() const {
+  INITIALIZATION_STATE_DCHECK_VALID(initialized_);
+  return LoggingFileSizeByHandle(handle_.get());
+}
+
+IOSIntermediateDumpByteArray::IOSIntermediateDumpByteArray(const void* data,
+                                                           size_t size) {
+  string_file_ = std::make_unique<StringFile>();
+  string_file_->SetString(
+      std::string(reinterpret_cast<const char*>(data), size));
+}
+
+FileReaderInterface* IOSIntermediateDumpByteArray::FileReader() const {
+  return string_file_.get();
+}
+
+FileOffset IOSIntermediateDumpByteArray::Size() const {
+  return string_file_->string().size();
+}
+
+}  // namespace internal
+}  // namespace crashpad
diff --git a/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_interface.h b/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_interface.h
new file mode 100644
index 0000000000..813b61c1f4
--- /dev/null
+++ b/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_interface.h
@@ -0,0 +1,67 @@
+// Copyright 2021 The Crashpad Authors
+//
+// 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.
+
+#ifndef CRASHPAD_UTIL_IOS_IOS_INTERMEDIATE_DUMP_INTERFACE_H_
+#define CRASHPAD_UTIL_IOS_IOS_INTERMEDIATE_DUMP_INTERFACE_H_
+
+#include "base/files/file_path.h"
+#include "util/file/file_reader.h"
+#include "util/file/filesystem.h"
+#include "util/file/string_file.h"
+#include "util/misc/initialization_state_dcheck.h"
+
+namespace crashpad {
+namespace internal {
+
+//! \brief The base class for reading data into an IOSIntermediateDumpReader.
+class IOSIntermediateDumpInterface {
+ public:
+  virtual FileReaderInterface* FileReader() const = 0;
+  virtual FileOffset Size() const = 0;
+};
+
+//! \brief An intermediate dump backed by a FilePath. FilePath is unlinked
+//!     immediately upon initialization to ensure files are only processed once
+//!     in the event a crash is introduced by this intermediate dump.
+class IOSIntermediateDumpFilePath : public IOSIntermediateDumpInterface {
+ public:
+  bool Initialize(const base::FilePath& path);
+
+  // IOSIntermediateDumpInterface:
+  FileReaderInterface* FileReader() const override;
+  FileOffset Size() const override;
+
+ private:
+  ScopedFileHandle handle_;
+  std::unique_ptr<WeakFileHandleFileReader> reader_;
+  InitializationStateDcheck initialized_;
+};
+
+//! \brief An intermediate dump backed by a byte array.
+class IOSIntermediateDumpByteArray : public IOSIntermediateDumpInterface {
+ public:
+  IOSIntermediateDumpByteArray(const void* data, size_t size);
+
+  // IOSIntermediateDumpInterface
+  FileReaderInterface* FileReader() const override;
+  FileOffset Size() const override;
+
+ private:
+  std::unique_ptr<StringFile> string_file_;
+};
+
+}  // namespace internal
+}  // namespace crashpad
+
+#endif  // CRASHPAD_UTIL_IOS_IOS_INTERMEDIATE_DUMP_INTERFACE_H_
diff --git a/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_list.cc b/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_list.cc
index 17f2b89d9b..5d8908e9a0 100644
--- a/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_list.cc
+++ b/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_list.cc
@@ -1,4 +1,4 @@
-// Copyright 2021 The Crashpad Authors. All rights reserved.
+// Copyright 2021 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_list.h b/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_list.h
index e2ad92537d..3973acc988 100644
--- a/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_list.h
+++ b/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_list.h
@@ -1,4 +1,4 @@
-// Copyright 2021 The Crashpad Authors. All rights reserved.
+// Copyright 2021 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_map.cc b/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_map.cc
index 7ec61038bf..6b89c21dd1 100644
--- a/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_map.cc
+++ b/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_map.cc
@@ -1,4 +1,4 @@
-// Copyright 2021 The Crashpad Authors. All rights reserved.
+// Copyright 2021 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_map.h b/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_map.h
index ca26cb37e2..5ffeb36be5 100644
--- a/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_map.h
+++ b/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_map.h
@@ -1,4 +1,4 @@
-// Copyright 2021 The Crashpad Authors. All rights reserved.
+// Copyright 2021 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_object.cc b/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_object.cc
index 9909935040..ac497635b8 100644
--- a/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_object.cc
+++ b/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_object.cc
@@ -1,4 +1,4 @@
-// Copyright 2021 The Crashpad Authors. All rights reserved.
+// Copyright 2021 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_object.h b/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_object.h
index fde7e1e46b..2fc81bee4d 100644
--- a/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_object.h
+++ b/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_object.h
@@ -1,4 +1,4 @@
-// Copyright 2021 The Crashpad Authors. All rights reserved.
+// Copyright 2021 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_reader.cc b/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_reader.cc
index b571662d87..a53a84a4e8 100644
--- a/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_reader.cc
+++ b/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_reader.cc
@@ -1,4 +1,4 @@
-// Copyright 2021 The Crashpad Authors. All rights reserved.
+// Copyright 2021 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -29,31 +29,36 @@
 namespace crashpad {
 namespace internal {
 
-bool IOSIntermediateDumpReader::Initialize(const base::FilePath& path) {
-  ScopedFileHandle handle(LoggingOpenFileForRead(path));
-  auto reader = std::make_unique<WeakFileHandleFileReader>(handle.get());
+IOSIntermediateDumpReaderInitializeResult IOSIntermediateDumpReader::Initialize(
+    const IOSIntermediateDumpInterface& dump_interface) {
+  INITIALIZATION_STATE_SET_INITIALIZING(initialized_);
 
-  // In the event a crash is introduced by this intermediate dump, don't ever
-  // read a file twice.  To ensure this doesn't happen, immediately unlink.
-  LoggingRemoveFile(path);
-
-  // Don't initialize invalid or empty files.
-  FileOffset size = LoggingFileSizeByHandle(handle.get());
-  if (!handle.is_valid() || size == 0) {
-    return false;
+  // Don't initialize empty files.
+  FileOffset size = dump_interface.Size();
+  if (size == 0) {
+    return IOSIntermediateDumpReaderInitializeResult::kFailure;
   }
 
-  if (!Parse(reader.get(), size)) {
+  IOSIntermediateDumpReaderInitializeResult result =
+      IOSIntermediateDumpReaderInitializeResult::kSuccess;
+  if (!Parse(dump_interface.FileReader(), size)) {
     LOG(ERROR) << "Intermediate dump parsing failed";
+    result = IOSIntermediateDumpReaderInitializeResult::kIncomplete;
   }
 
-  return true;
+  INITIALIZATION_STATE_SET_VALID(initialized_);
+  return result;
+}
+
+const IOSIntermediateDumpMap* IOSIntermediateDumpReader::RootMap() {
+  INITIALIZATION_STATE_DCHECK_VALID(initialized_);
+  return &intermediate_dump_;
 }
 
 bool IOSIntermediateDumpReader::Parse(FileReaderInterface* reader,
                                       FileOffset file_size) {
   std::stack<IOSIntermediateDumpObject*> stack;
-  stack.push(&minidump_);
+  stack.push(&intermediate_dump_);
   using Command = IOSIntermediateDumpWriter::CommandType;
   using Type = IOSIntermediateDumpObject::Type;
 
@@ -65,6 +70,12 @@ bool IOSIntermediateDumpReader::Parse(FileReaderInterface* reader,
   }
 
   while (reader->ReadExactly(&command, sizeof(Command))) {
+    constexpr int kMaxStackDepth = 10;
+    if (stack.size() > kMaxStackDepth) {
+      LOG(ERROR) << "Unexpected depth of intermediate dump data.";
+      return false;
+    }
+
     IOSIntermediateDumpObject* parent = stack.top();
     switch (command) {
       case Command::kMapStart: {
@@ -142,7 +153,7 @@ bool IOSIntermediateDumpReader::Parse(FileReaderInterface* reader,
         if (key == IntermediateDumpKey::kInvalid)
           return false;
 
-        off_t value_length;
+        size_t value_length;
         if (!reader->ReadExactly(&value_length, sizeof(value_length))) {
           return false;
         }
diff --git a/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_reader.h b/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_reader.h
index e1c42172a2..9f5db8b29e 100644
--- a/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_reader.h
+++ b/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_reader.h
@@ -1,4 +1,4 @@
-// Copyright 2021 The Crashpad Authors. All rights reserved.
+// Copyright 2021 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,13 +15,28 @@
 #ifndef CRASHPAD_UTIL_IOS_IOS_INTERMEDIATE_DUMP_READER_H_
 #define CRASHPAD_UTIL_IOS_IOS_INTERMEDIATE_DUMP_READER_H_
 
-#include "base/files/file_path.h"
-#include "util/file/file_reader.h"
+#include "util/ios/ios_intermediate_dump_interface.h"
 #include "util/ios/ios_intermediate_dump_map.h"
+#include "util/misc/initialization_state_dcheck.h"
 
 namespace crashpad {
 namespace internal {
 
+//! \brief The return value for IOSIntermediateDumpReader::Initialize.
+enum class IOSIntermediateDumpReaderInitializeResult : int {
+  //! \brief The intermediate dump was read successfully, initialization
+  //!     succeeded.
+  kSuccess,
+
+  //! \brief The intermediate dump could be loaded, but parsing was incomplete.
+  //!     An attempt to parse the RootMap should still be made, as there may
+  //!     still be valuable information to put into a minidump.
+  kIncomplete,
+
+  //! \brief The intermediate dump could not be loaded, initialization failed.
+  kFailure,
+};
+
 //! \brief Open and parse iOS intermediate dumps.
 class IOSIntermediateDumpReader {
  public:
@@ -31,26 +46,29 @@ class IOSIntermediateDumpReader {
   IOSIntermediateDumpReader& operator=(const IOSIntermediateDumpReader&) =
       delete;
 
-  //! \brief Open and parses \a path, ignoring empty files.
+  //! \brief Open and parses \a dump_interface.
   //!
   //! Will attempt to parse the binary file, similar to a JSON file, using the
   //! same format used by IOSIntermediateDumpWriter, resulting in an
   //! IOSIntermediateDumpMap
   //!
-  //! \param[in] path The intermediate dump to read.
+  //! \param[in] dump_interface An interface corresponding to an intermediate
+  //!     dump file.
   //!
   //! \return On success, returns `true`, otherwise returns `false`. Clients may
   //!     still attempt to parse RootMap, as partial minidumps may still be
   //!     usable.
-  bool Initialize(const base::FilePath& path);
+  IOSIntermediateDumpReaderInitializeResult Initialize(
+      const IOSIntermediateDumpInterface& dump_interface);
 
   //! \brief Returns an IOSIntermediateDumpMap corresponding to the root of the
   //!     intermediate dump.
-  const IOSIntermediateDumpMap* RootMap() { return &minidump_; }
+  const IOSIntermediateDumpMap* RootMap();
 
  private:
   bool Parse(FileReaderInterface* reader, FileOffset file_size);
-  IOSIntermediateDumpMap minidump_;
+  IOSIntermediateDumpMap intermediate_dump_;
+  InitializationStateDcheck initialized_;
 };
 
 }  // namespace internal
diff --git a/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_reader_test.cc b/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_reader_test.cc
index ae27f7d80a..9614ccc91f 100644
--- a/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_reader_test.cc
+++ b/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_reader_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2021 The Crashpad Authors. All rights reserved.
+// Copyright 2021 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -33,6 +33,7 @@ namespace test {
 namespace {
 
 using Key = internal::IntermediateDumpKey;
+using Result = internal::IOSIntermediateDumpReaderInitializeResult;
 using internal::IOSIntermediateDumpWriter;
 
 class IOSIntermediateDumpReaderTest : public testing::Test {
@@ -48,9 +49,11 @@ class IOSIntermediateDumpReaderTest : public testing::Test {
     writer_ = std::make_unique<IOSIntermediateDumpWriter>();
     ASSERT_TRUE(writer_->Open(path_));
     ASSERT_TRUE(IsRegularFile(path_));
+    dump_interface_.Initialize(path_);
   }
 
   void TearDown() override {
+    ASSERT_TRUE(writer_->Close());
     fd_.reset();
     writer_.reset();
     EXPECT_FALSE(IsRegularFile(path_));
@@ -59,6 +62,7 @@ class IOSIntermediateDumpReaderTest : public testing::Test {
   int fd() { return fd_.get(); }
 
   const base::FilePath& path() const { return path_; }
+  const auto& dump_interface() const { return dump_interface_; }
 
   std::unique_ptr<IOSIntermediateDumpWriter> writer_;
 
@@ -66,22 +70,20 @@ class IOSIntermediateDumpReaderTest : public testing::Test {
   base::ScopedFD fd_;
   ScopedTempDir temp_dir_;
   base::FilePath path_;
+  internal::IOSIntermediateDumpFilePath dump_interface_;
 };
 
 TEST_F(IOSIntermediateDumpReaderTest, ReadNoFile) {
   internal::IOSIntermediateDumpReader reader;
-  EXPECT_FALSE(reader.Initialize(base::FilePath()));
-  EXPECT_TRUE(LoggingRemoveFile(path()));
+  internal::IOSIntermediateDumpFilePath dump_interface;
+  EXPECT_FALSE(dump_interface.Initialize(base::FilePath()));
   EXPECT_FALSE(IsRegularFile(path()));
 }
 
 TEST_F(IOSIntermediateDumpReaderTest, ReadEmptyFile) {
   internal::IOSIntermediateDumpReader reader;
-  EXPECT_FALSE(reader.Initialize(path()));
+  EXPECT_EQ(reader.Initialize(dump_interface()), Result::kFailure);
   EXPECT_FALSE(IsRegularFile(path()));
-
-  const auto root_map = reader.RootMap();
-  EXPECT_TRUE(root_map->empty());
 }
 
 TEST_F(IOSIntermediateDumpReaderTest, ReadHelloWorld) {
@@ -89,13 +91,38 @@ TEST_F(IOSIntermediateDumpReaderTest, ReadHelloWorld) {
   EXPECT_TRUE(
       LoggingWriteFile(fd(), hello_world.c_str(), hello_world.length()));
   internal::IOSIntermediateDumpReader reader;
-  EXPECT_TRUE(reader.Initialize(path()));
+  EXPECT_EQ(reader.Initialize(dump_interface()), Result::kIncomplete);
   EXPECT_FALSE(IsRegularFile(path()));
 
   const auto root_map = reader.RootMap();
   EXPECT_TRUE(root_map->empty());
 }
 
+TEST_F(IOSIntermediateDumpReaderTest, FuzzTestCases) {
+  constexpr uint8_t fuzz1[] = {0x6,
+                               0x5,
+                               0x0,
+                               0xff,
+                               0xff,
+                               0xfd,
+                               0x1,
+                               0xff,
+                               0xff,
+                               0xff,
+                               0xff,
+                               0xff,
+                               0xfd,
+                               0x1,
+                               0x7,
+                               0x16};
+
+  internal::IOSIntermediateDumpByteArray dump_interface(fuzz1, sizeof(fuzz1));
+  internal::IOSIntermediateDumpReader reader;
+  EXPECT_EQ(reader.Initialize(dump_interface), Result::kIncomplete);
+  const auto root_map = reader.RootMap();
+  EXPECT_TRUE(root_map->empty());
+}
+
 TEST_F(IOSIntermediateDumpReaderTest, WriteBadPropertyDataLength) {
   internal::IOSIntermediateDumpReader reader;
   IOSIntermediateDumpWriter::CommandType command_type =
@@ -110,7 +137,7 @@ TEST_F(IOSIntermediateDumpReaderTest, WriteBadPropertyDataLength) {
   size_t value_length = 999999;
   EXPECT_TRUE(LoggingWriteFile(fd(), &value_length, sizeof(size_t)));
   EXPECT_TRUE(LoggingWriteFile(fd(), &value, sizeof(value)));
-  EXPECT_TRUE(reader.Initialize(path()));
+  EXPECT_EQ(reader.Initialize(dump_interface()), Result::kIncomplete);
   EXPECT_FALSE(IsRegularFile(path()));
 
   const auto root_map = reader.RootMap();
@@ -133,7 +160,7 @@ TEST_F(IOSIntermediateDumpReaderTest, InvalidArrayInArray) {
     writer_->AddProperty(Key::kVersion, &version);
   }
   EXPECT_TRUE(writer_->Close());
-  EXPECT_TRUE(reader.Initialize(path()));
+  EXPECT_EQ(reader.Initialize(dump_interface()), Result::kIncomplete);
   EXPECT_FALSE(IsRegularFile(path()));
 
   const auto root_map = reader.RootMap();
@@ -155,7 +182,7 @@ TEST_F(IOSIntermediateDumpReaderTest, InvalidPropertyInArray) {
     writer_->AddProperty(Key::kVersion, &version);
   }
   EXPECT_TRUE(writer_->Close());
-  EXPECT_TRUE(reader.Initialize(path()));
+  EXPECT_EQ(reader.Initialize(dump_interface()), Result::kIncomplete);
   EXPECT_FALSE(IsRegularFile(path()));
 
   const auto root_map = reader.RootMap();
@@ -192,7 +219,7 @@ TEST_F(IOSIntermediateDumpReaderTest, ReadValidData) {
   }
 
   EXPECT_TRUE(writer_->Close());
-  EXPECT_TRUE(reader.Initialize(path()));
+  EXPECT_EQ(reader.Initialize(dump_interface()), Result::kSuccess);
   EXPECT_FALSE(IsRegularFile(path()));
 
   auto root_map = reader.RootMap();
diff --git a/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_writer.cc b/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_writer.cc
index eca33d380f..00f7d4d5bc 100644
--- a/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_writer.cc
+++ b/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_writer.cc
@@ -1,4 +1,4 @@
-// Copyright 2021 The Crashpad Authors. All rights reserved.
+// Copyright 2021 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,8 +15,15 @@
 #include "util/ios/ios_intermediate_dump_writer.h"
 
 #include <fcntl.h>
+#include <mach/mach.h>
+#include <string.h>
 #include <unistd.h>
 
+#include <algorithm>
+#include <ostream>
+
+#include "base/check.h"
+#include "base/check_op.h"
 #include "base/posix/eintr_wrapper.h"
 #include "build/build_config.h"
 #include "util/ios/raw_logging.h"
@@ -26,16 +33,15 @@ namespace crashpad {
 namespace internal {
 
 // Similar to LoggingWriteFile but with CRASHPAD_RAW_LOG.
-bool RawLoggingWriteFile(int fd, const void* buffer, size_t size) {
-  uintptr_t buffer_int = reinterpret_cast<uintptr_t>(buffer);
+bool RawLoggingWriteFile(int fd, const void* data, size_t size) {
+  const char* data_char = static_cast<const char*>(data);
   while (size > 0) {
-    ssize_t bytes_written = HANDLE_EINTR(
-        write(fd, reinterpret_cast<const char*>(buffer_int), size));
+    ssize_t bytes_written = HANDLE_EINTR(write(fd, data_char, size));
     if (bytes_written < 0 || bytes_written == 0) {
       CRASHPAD_RAW_LOG_ERROR(bytes_written, "RawLoggingWriteFile");
       return false;
     }
-    buffer_int += bytes_written;
+    data_char += bytes_written;
     size -= bytes_written;
   }
   return true;
@@ -50,13 +56,8 @@ bool RawLoggingCloseFile(int fd) {
   return rv == 0;
 }
 
-// Similar to LoggingLockFile but with CRASHPAD_RAW_LOG.
-bool RawLoggingLockFileExclusiveNonBlocking(int fd) {
-  int rv = HANDLE_EINTR(flock(fd, LOCK_EX | LOCK_NB));
-  if (rv != 0) {
-    CRASHPAD_RAW_LOG_ERROR(rv, "RawLoggingLockFileExclusiveNonBlocking");
-  }
-  return rv == 0;
+IOSIntermediateDumpWriter::~IOSIntermediateDumpWriter() {
+  CHECK_EQ(fd_, -1) << "Call Close() before this object is destroyed.";
 }
 
 bool IOSIntermediateDumpWriter::Open(const base::FilePath& path) {
@@ -76,61 +77,199 @@ bool IOSIntermediateDumpWriter::Open(const base::FilePath& path) {
     return false;
   }
 
-  return RawLoggingLockFileExclusiveNonBlocking(fd_);
+  return true;
 }
 
 bool IOSIntermediateDumpWriter::Close() {
-  return RawLoggingCloseFile(fd_);
+  if (fd_ < 0) {
+    return true;
+  }
+  const bool flushed = FlushWriteBuffer();
+  const bool closed = RawLoggingCloseFile(fd_);
+  fd_ = -1;
+  return flushed && closed;
+}
+
+bool IOSIntermediateDumpWriter::AddPropertyCString(IntermediateDumpKey key,
+                                                   size_t max_length,
+                                                   const char* value) {
+  constexpr size_t kMaxStringBytes = 1024;
+  if (max_length > kMaxStringBytes) {
+    CRASHPAD_RAW_LOG("AddPropertyCString max_length too large");
+    return false;
+  }
+
+  char buffer[kMaxStringBytes];
+  size_t string_length;
+  if (ReadCStringInternal(value, buffer, max_length, &string_length)) {
+    return Property(key, buffer, string_length);
+  }
+  return false;
+}
+
+bool IOSIntermediateDumpWriter::ReadCStringInternal(const char* value,
+                                                    char* buffer,
+                                                    size_t max_length,
+                                                    size_t* string_length) {
+  size_t length = 0;
+  while (length < max_length) {
+    vm_address_t data_address = reinterpret_cast<vm_address_t>(value + length);
+    // Calculate bytes to read past `data_address`, either the number of bytes
+    // to the end of the page, or the remaining bytes in `buffer`, whichever is
+    // smaller.
+    size_t data_to_end_of_page =
+        getpagesize() - (data_address - trunc_page(data_address));
+    size_t remaining_bytes_in_buffer = max_length - length;
+    size_t bytes_to_read =
+        std::min(data_to_end_of_page, remaining_bytes_in_buffer);
+
+    char* buffer_start = buffer + length;
+    size_t bytes_read = 0;
+    kern_return_t kr =
+        vm_read_overwrite(mach_task_self(),
+                          data_address,
+                          bytes_to_read,
+                          reinterpret_cast<vm_address_t>(buffer_start),
+                          &bytes_read);
+    if (kr != KERN_SUCCESS || bytes_read <= 0) {
+      CRASHPAD_RAW_LOG("ReadCStringInternal vm_read_overwrite failed");
+      return false;
+    }
+
+    char* nul = static_cast<char*>(memchr(buffer_start, '\0', bytes_read));
+    if (nul != nullptr) {
+      length += nul - buffer_start;
+      *string_length = length;
+      return true;
+    }
+    length += bytes_read;
+  }
+  CRASHPAD_RAW_LOG("unterminated string");
+  return false;
+}
+
+bool IOSIntermediateDumpWriter::AddPropertyBytes(IntermediateDumpKey key,
+                                                 const void* value,
+                                                 size_t value_length) {
+  constexpr size_t kMaxPropertyBytesSmallSize = 512;
+  if (value_length <= kMaxPropertyBytesSmallSize) {
+    char buffer[kMaxPropertyBytesSmallSize];
+    vm_size_t out_size = 0;
+    kern_return_t kr = vm_read_overwrite(mach_task_self(),
+                                         reinterpret_cast<vm_address_t>(value),
+                                         value_length,
+                                         reinterpret_cast<vm_address_t>(buffer),
+                                         &out_size);
+    if (kr != KERN_SUCCESS) {
+      // It's expected that this will sometimes fail. Don't log here.
+      return false;
+    }
+
+    return Property(key, buffer, out_size);
+  }
+
+  ScopedVMRead<char> vmread;
+  if (!vmread.Read(value, value_length))
+    return false;
+  return Property(key, vmread.get(), value_length);
 }
 
 bool IOSIntermediateDumpWriter::ArrayMapStart() {
   const CommandType command_type = CommandType::kMapStart;
-  return RawLoggingWriteFile(fd_, &command_type, sizeof(command_type));
+  return BufferedWrite(&command_type, sizeof(command_type));
 }
 
 bool IOSIntermediateDumpWriter::MapStart(IntermediateDumpKey key) {
   const CommandType command_type = CommandType::kMapStart;
-  return RawLoggingWriteFile(fd_, &command_type, sizeof(command_type)) &&
-         RawLoggingWriteFile(fd_, &key, sizeof(key));
+  return BufferedWrite(&command_type, sizeof(command_type)) &&
+         BufferedWrite(&key, sizeof(key));
 }
 
 bool IOSIntermediateDumpWriter::ArrayStart(IntermediateDumpKey key) {
   const CommandType command_type = CommandType::kArrayStart;
-  return RawLoggingWriteFile(fd_, &command_type, sizeof(command_type)) &&
-         RawLoggingWriteFile(fd_, &key, sizeof(key));
+  return BufferedWrite(&command_type, sizeof(command_type)) &&
+         BufferedWrite(&key, sizeof(key));
 }
 
 bool IOSIntermediateDumpWriter::MapEnd() {
   const CommandType command_type = CommandType::kMapEnd;
-  return RawLoggingWriteFile(fd_, &command_type, sizeof(command_type));
+  return BufferedWrite(&command_type, sizeof(command_type));
 }
 
 bool IOSIntermediateDumpWriter::ArrayEnd() {
   const CommandType command_type = CommandType::kArrayEnd;
-  return RawLoggingWriteFile(fd_, &command_type, sizeof(command_type));
+  return BufferedWrite(&command_type, sizeof(command_type));
 }
 
 bool IOSIntermediateDumpWriter::RootMapStart() {
   const CommandType command_type = CommandType::kRootMapStart;
-  return RawLoggingWriteFile(fd_, &command_type, sizeof(command_type));
+  return BufferedWrite(&command_type, sizeof(command_type));
 }
 
 bool IOSIntermediateDumpWriter::RootMapEnd() {
   const CommandType command_type = CommandType::kRootMapEnd;
-  return RawLoggingWriteFile(fd_, &command_type, sizeof(command_type));
+  return BufferedWrite(&command_type, sizeof(command_type));
 }
 
-bool IOSIntermediateDumpWriter::AddPropertyInternal(IntermediateDumpKey key,
-                                                    const char* value,
-                                                    size_t value_length) {
-  ScopedVMRead<char> vmread;
-  if (!vmread.Read(value, value_length))
-    return false;
+bool IOSIntermediateDumpWriter::Property(IntermediateDumpKey key,
+                                         const void* value,
+                                         size_t value_length) {
   const CommandType command_type = CommandType::kProperty;
-  return RawLoggingWriteFile(fd_, &command_type, sizeof(command_type)) &&
-         RawLoggingWriteFile(fd_, &key, sizeof(key)) &&
-         RawLoggingWriteFile(fd_, &value_length, sizeof(size_t)) &&
-         RawLoggingWriteFile(fd_, vmread.get(), value_length);
+  return BufferedWrite(&command_type, sizeof(command_type)) &&
+         BufferedWrite(&key, sizeof(key)) &&
+         BufferedWrite(&value_length, sizeof(size_t)) &&
+         BufferedWrite(value, value_length);
+}
+
+bool IOSIntermediateDumpWriter::FlushWriteBuffer() {
+  size_t size = buffer_occupied_;
+  buffer_occupied_ = 0;
+  return RawLoggingWriteFile(fd_, buffer_, size);
+}
+
+bool IOSIntermediateDumpWriter::BufferedWrite(const void* data,
+                                              size_t data_size) {
+  const char* data_char = static_cast<const char*>(data);
+  // If `buffer_` is occupied, fill it up first, and flush if full.
+  if (buffer_occupied_ > 0) {
+    size_t data_size_to_copy =
+        std::min(kBufferSize - buffer_occupied_, data_size);
+    memcpy(buffer_ + buffer_occupied_, data_char, data_size_to_copy);
+    buffer_occupied_ += data_size_to_copy;
+    data_char += data_size_to_copy;
+    data_size -= data_size_to_copy;
+
+    if (buffer_occupied_ == kBufferSize) {
+      if (!FlushWriteBuffer()) {
+        return false;
+      }
+    }
+  }
+
+  // Either `data_size` is big enough that it could fill `buffer_`, trigger
+  // a FlushWriteBuffer, and reset `buffer_occuppied_` to zero, or there is no
+  // data left to process.
+  DCHECK(buffer_occupied_ == 0 || data_size == 0);
+
+  // Write the rest of the `data` in an increment of kBufferSize.
+  if (data_size >= kBufferSize) {
+    DCHECK_EQ(buffer_occupied_, 0u);
+    size_t data_size_to_write = data_size - (data_size % kBufferSize);
+    if (!RawLoggingWriteFile(fd_, data_char, data_size_to_write)) {
+      return false;
+    }
+    data_char += data_size_to_write;
+    data_size -= data_size_to_write;
+  }
+
+  // If there's any `data` left, put it in `buffer_`.
+  if (data_size > 0) {
+    DCHECK_EQ(buffer_occupied_, 0u);
+    memcpy(buffer_, data_char, data_size);
+    buffer_occupied_ = data_size;
+  }
+
+  return true;
 }
 
 }  // namespace internal
diff --git a/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_writer.h b/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_writer.h
index 836fbe7ac6..4146b1d784 100644
--- a/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_writer.h
+++ b/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_writer.h
@@ -1,4 +1,4 @@
-// Copyright 2021 The Crashpad Authors. All rights reserved.
+// Copyright 2021 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
 #ifndef CRASHPAD_UTIL_IOS_IOS_INTERMEDIATE_DUMP_WRITER_H_
 #define CRASHPAD_UTIL_IOS_IOS_INTERMEDIATE_DUMP_WRITER_H_
 
+#include <sys/types.h>
+
 #include "base/files/file_path.h"
 #include "util/ios/ios_intermediate_dump_format.h"
 
@@ -39,12 +41,14 @@ namespace internal {
 //! Note: All methods are `RUNS-DURING-CRASH`.
 class IOSIntermediateDumpWriter final {
  public:
-  IOSIntermediateDumpWriter() = default;
+  IOSIntermediateDumpWriter() : buffer_occupied_(0), fd_(-1) {}
 
   IOSIntermediateDumpWriter(const IOSIntermediateDumpWriter&) = delete;
   IOSIntermediateDumpWriter& operator=(const IOSIntermediateDumpWriter&) =
       delete;
 
+  ~IOSIntermediateDumpWriter();
+
   //! \brief Command instructions for the intermediate dump reader.
   enum class CommandType : uint8_t {
     //! \brief Indicates a new map, followed by associated key.
@@ -73,6 +77,8 @@ class IOSIntermediateDumpWriter final {
   //! \brief Open and lock an intermediate dump file. This is the only method
   //!     in the writer class that is generally run outside of a crash.
   //!
+  //! The client must invoke `Close()` before this object is destroyed.
+  //!
   //! \param[in] path The path to the intermediate dump.
   //!
   //! \return On success, returns `true`, otherwise returns `false`.
@@ -154,53 +160,88 @@ class IOSIntermediateDumpWriter final {
     IOSIntermediateDumpWriter* writer_;
   };
 
-  //! \return The `true` if able to AddPropertyInternal the \a key \a value
+  //! \return `true` if able to add the property with the \a key \a value
   //!     \a count tuple.
   template <typename T>
   bool AddProperty(IntermediateDumpKey key, const T* value, size_t count = 1) {
-    return AddPropertyInternal(
-        key, reinterpret_cast<const char*>(value), count * sizeof(T));
+    return AddPropertyBytes(key, value, count * sizeof(T));
   }
 
-  //! \return The `true` if able to AddPropertyInternal the \a key \a value
-  //!     \a count tuple.
+  //! \brief Adds a property using `vm_read` or `vm_read_overwrite`.
+  //!
+  //! \return `true` if able to read `value` `value_length` and write a
+  //!     kProperty command with the `key` `value` `value_length` tuple.
+  //!
+  //! \note This method automatically chooses between `vm_read_overwrite` with
+  //!     a local stack buffer for small reads (<= 512 bytes) and `vm_read`
+  //!     for larger reads to avoid unnecessary virtual memory allocations.
   bool AddPropertyBytes(IntermediateDumpKey key,
                         const void* value,
-                        size_t value_length) {
-    return AddPropertyInternal(
-        key, reinterpret_cast<const char*>(value), value_length);
-  }
+                        size_t value_length);
+
+  //! \return `true` if able to vm_read a string of \a value  and write a
+  //!     kProperty command with the \a key \a value up to a NUL byte.
+  //!     The string cannot be longer than \a max_length with a maximum string
+  //!     length of 1024.
+  bool AddPropertyCString(IntermediateDumpKey key,
+                          size_t max_length,
+                          const char* value);
 
  private:
-  //! \return Returns `true` if able to write a kProperty command  with the
-  //!     \a key \a value \a count tuple.
-  bool AddPropertyInternal(IntermediateDumpKey key,
-                           const char* value,
-                           size_t value_length);
-
-  //! \return Returns `true` if able to write a kArrayStart command  with the
-  //!     \a key.
+  //! \return `true` if able to vm_read_overwrite \a value into
+  //!     \a buffer while only reading one page at a time up to a NUL byte.
+  //!     Sets the final length of \a buffer to \a string_length.
+  //!     Returns `false` if unable to vm_read \a value or when no NUL byte can
+  //!     be found within /a max_length (unterminated).
+  bool ReadCStringInternal(const char* value,
+                           char* buffer,
+                           size_t max_length,
+                           size_t* string_length);
+
+  //! \return `true` if able to write a kArrayStart command  with the \a key.
   bool ArrayStart(IntermediateDumpKey key);
 
-  //! \return Returns `true` if able to write a kMapStart command with the
-  //!     \a key.
+  //! \return `true` if able to write a kMapStart command with the \a key.
   bool MapStart(IntermediateDumpKey key);
 
-  //! \return Returns `true` if able to write a kMapStart command.
+  //! \return `true` if able to write a kMapStart command.
   bool ArrayMapStart();
 
-  //! \return Returns `true` if able to write a kArrayEnd command.
+  //! \return `true` if able to write a kArrayEnd command.
   bool ArrayEnd();
 
-  //! \return Returns `true` if able to write a kMapEnd command.
+  //! \return `true` if able to write a kMapEnd command.
   bool MapEnd();
 
-  //! \return Returns `true` if able to write a kRootMapStart command.
+  //! \return `true` if able to write a kRootMapStart command.
   bool RootMapStart();
 
-  //! \return Returns `true` if able to write a kRootMapEnd command.
+  //! \return `true` if able to write a kRootMapEnd command.
   bool RootMapEnd();
 
+  //! \return `true` if able to write a kProperty command with the \a key
+  //!     \a value \a value_length tuple.
+  bool Property(IntermediateDumpKey key,
+                const void* value,
+                size_t value_length);
+
+  //! \return `true` if able to write \a data up to \a size. The \a data might
+  //!     not be written to fd_  until `buffer_` is full or the writer is
+  //!     closed. All writes will be 4096 bytes (the size of your kBufferSize)
+  //!     except for the final flush, which might be partial.
+  bool BufferedWrite(const void* data, size_t size);
+
+  //! \return `true` if able to write `buffer_` up to `buffer_occupied_`.
+  bool FlushWriteBuffer();
+
+  //! \brief The maximum size of the write buffer.
+  static constexpr size_t kBufferSize = 4096;
+
+  //! \brief The write data buffer and amount of that buffer occupied with data
+  //!   to be written.
+  char buffer_[kBufferSize];
+  size_t buffer_occupied_;
+
   int fd_;
 };
 
diff --git a/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_writer_test.cc b/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_writer_test.cc
index 6c6bcadf10..2bf2b780e4 100644
--- a/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_writer_test.cc
+++ b/extern/crashpad/crashpad/util/ios/ios_intermediate_dump_writer_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2021 The Crashpad Authors. All rights reserved.
+// Copyright 2021 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,7 +15,9 @@
 #include "util/ios/ios_intermediate_dump_writer.h"
 
 #include <fcntl.h>
+#include <mach/mach.h>
 
+#include "base/apple/scoped_mach_vm.h"
 #include "base/files/scoped_file.h"
 #include "base/posix/eintr_wrapper.h"
 #include "gmock/gmock.h"
@@ -41,6 +43,7 @@ class IOSIntermediateDumpWriterTest : public testing::Test {
   }
 
   void TearDown() override {
+    EXPECT_TRUE(writer_->Close());
     writer_.reset();
     EXPECT_EQ(unlink(path_.value().c_str()), 0) << ErrnoMessage("unlink");
   }
@@ -54,18 +57,6 @@ class IOSIntermediateDumpWriterTest : public testing::Test {
   base::FilePath path_;
 };
 
-// Test file is locked.
-TEST_F(IOSIntermediateDumpWriterTest, OpenLocked) {
-  EXPECT_TRUE(writer_->Open(path()));
-
-  ScopedFileHandle handle(LoggingOpenFileForRead(path()));
-  EXPECT_TRUE(handle.is_valid());
-  EXPECT_EQ(LoggingLockFile(handle.get(),
-                            FileLocking::kExclusive,
-                            FileLockingBlocking::kNonBlocking),
-            FileLockingResult::kWouldBlock);
-}
-
 TEST_F(IOSIntermediateDumpWriterTest, Close) {
   EXPECT_TRUE(writer_->Open(path()));
   EXPECT_TRUE(writer_->Close());
@@ -83,6 +74,8 @@ TEST_F(IOSIntermediateDumpWriterTest, ScopedArray) {
                                                        Key::kThreads);
     IOSIntermediateDumpWriter::ScopedArrayMap threadMap(writer_.get());
   }
+  EXPECT_TRUE(writer_->Close());
+
   std::string contents;
   ASSERT_TRUE(LoggingReadEntireFile(path(), &contents));
   std::string result("\6\x3p\x17\1\2\4\a", 8);
@@ -96,6 +89,7 @@ TEST_F(IOSIntermediateDumpWriterTest, ScopedMap) {
     IOSIntermediateDumpWriter::ScopedMap map(writer_.get(),
                                              Key::kMachException);
   }
+  EXPECT_TRUE(writer_->Close());
 
   std::string contents;
   ASSERT_TRUE(LoggingReadEntireFile(path(), &contents));
@@ -106,6 +100,7 @@ TEST_F(IOSIntermediateDumpWriterTest, ScopedMap) {
 TEST_F(IOSIntermediateDumpWriterTest, Property) {
   EXPECT_TRUE(writer_->Open(path()));
   EXPECT_TRUE(writer_->AddProperty(Key::kVersion, "version", 7));
+  EXPECT_TRUE(writer_->Close());
 
   std::string contents;
   ASSERT_TRUE(LoggingReadEntireFile(path(), &contents));
@@ -113,17 +108,85 @@ TEST_F(IOSIntermediateDumpWriterTest, Property) {
   ASSERT_EQ(contents, result);
 }
 
-TEST_F(IOSIntermediateDumpWriterTest, BadProperty) {
+TEST_F(IOSIntermediateDumpWriterTest, PropertyString) {
   EXPECT_TRUE(writer_->Open(path()));
-  ASSERT_FALSE(writer_->AddProperty(Key::kVersion, "version", -1));
+  EXPECT_TRUE(writer_->AddPropertyCString(Key::kVersion, 64, "version"));
+  EXPECT_TRUE(writer_->Close());
 
   std::string contents;
   ASSERT_TRUE(LoggingReadEntireFile(path(), &contents));
+  std::string result("\5\1\0\a\0\0\0\0\0\0\0version", 18);
+  ASSERT_EQ(contents, result);
+}
+
+TEST_F(IOSIntermediateDumpWriterTest, PropertyStringShort) {
+  EXPECT_TRUE(writer_->Open(path()));
+  EXPECT_FALSE(
+      writer_->AddPropertyCString(Key::kVersion, 7, "versionnnnnnnnnnnn"));
+}
 
-  // path() is now invalid, as type, key and value were written, but the
-  // value itself is not.
-  std::string results("\5\1\0\xff\xff\xff\xff\xff\xff\xff\xff", 11);
-  ASSERT_EQ(contents, results);
+TEST_F(IOSIntermediateDumpWriterTest, PropertyStringLong) {
+  EXPECT_TRUE(writer_->Open(path()));
+
+  char* bad_string = nullptr;
+  EXPECT_FALSE(writer_->AddPropertyCString(Key::kVersion, 1025, bad_string));
+}
+
+TEST_F(IOSIntermediateDumpWriterTest, MissingPropertyString) {
+  char* region;
+  vm_size_t page_size = getpagesize();
+  vm_size_t region_size = page_size * 2;
+  ASSERT_EQ(vm_allocate(mach_task_self(),
+                        reinterpret_cast<vm_address_t*>(&region),
+                        region_size,
+                        VM_FLAGS_ANYWHERE),
+            0);
+  base::apple::ScopedMachVM vm_owner(reinterpret_cast<vm_address_t>(region),
+                                     region_size);
+
+  // Fill first page with 'A' and second with 'B'.
+  memset(region, 'A', page_size);
+  memset(region + page_size, 'B', page_size);
+
+  // Drop a NUL 10 bytes from the end of the first page and into the second
+  // page.
+  region[page_size - 10] = '\0';
+  region[page_size + 10] = '\0';
+
+  // Read a string that spans two pages.
+  EXPECT_TRUE(writer_->Open(path()));
+  EXPECT_TRUE(
+      writer_->AddPropertyCString(Key::kVersion, 64, region + page_size - 5));
+  EXPECT_TRUE(writer_->Close());
+  std::string contents;
+  ASSERT_TRUE(LoggingReadEntireFile(path(), &contents));
+  std::string result("\x5\x1\0\xF\0\0\0\0\0\0\0AAAAABBBBBBBBBB", 26);
+  ASSERT_EQ(contents, result);
+
+  // Dealloc second page.
+  ASSERT_EQ(vm_deallocate(mach_task_self(),
+                          reinterpret_cast<vm_address_t>(region + page_size),
+                          page_size),
+            0);
+
+  // Reading the same string should fail when the next page is dealloc-ed.
+  EXPECT_FALSE(
+      writer_->AddPropertyCString(Key::kVersion, 64, region + page_size - 5));
+
+  // Ensure we can read the first string without loading the second page.
+  EXPECT_TRUE(writer_->Open(path()));
+  EXPECT_TRUE(
+      writer_->AddPropertyCString(Key::kVersion, 64, region + page_size - 20));
+  EXPECT_TRUE(writer_->Close());
+  ASSERT_TRUE(LoggingReadEntireFile(path(), &contents));
+  result.assign("\x5\x1\0\n\0\0\0\0\0\0\0AAAAAAAAAA", 21);
+  ASSERT_EQ(contents, result);
+}
+
+TEST_F(IOSIntermediateDumpWriterTest, BadProperty) {
+  EXPECT_TRUE(writer_->Open(path()));
+  ASSERT_FALSE(writer_->AddProperty(Key::kVersion, "version", -1));
+  EXPECT_TRUE(writer_->Close());
 }
 
 }  // namespace
diff --git a/extern/crashpad/crashpad/util/ios/ios_system_data_collector.h b/extern/crashpad/crashpad/util/ios/ios_system_data_collector.h
index cac0c8691b..7bef9a2e52 100644
--- a/extern/crashpad/crashpad/util/ios/ios_system_data_collector.h
+++ b/extern/crashpad/crashpad/util/ios/ios_system_data_collector.h
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 
 #import <CoreFoundation/CoreFoundation.h>
 
+#include <functional>
 #include <string>
 
 namespace crashpad {
@@ -32,6 +33,8 @@ class IOSSystemDataCollector {
   const std::string& MachineDescription() const { return machine_description_; }
   int ProcessorCount() const { return processor_count_; }
   const std::string& Build() const { return build_; }
+  const std::string& BundleIdentifier() const { return bundle_identifier_; }
+  bool IsExtension() const { return is_extension_; }
   const std::string& CPUVendor() const { return cpu_vendor_; }
   bool HasDaylightSavingTime() const { return has_next_daylight_saving_time_; }
   bool IsDaylightSavingTime() const { return is_daylight_saving_time_; }
@@ -39,35 +42,37 @@ class IOSSystemDataCollector {
   int DaylightOffsetSeconds() const { return daylight_offset_seconds_; }
   const std::string& StandardName() const { return standard_name_; }
   const std::string& DaylightName() const { return daylight_name_; }
+  bool IsApplicationActive() const { return active_; }
+  uint64_t AddressMask() const { return address_mask_; }
+  uint64_t InitializationTime() const { return initialization_time_ns_; }
 
   // Currently unused by minidump.
   int Orientation() const { return orientation_; }
 
+  // A completion callback that takes a bool indicating that the application has
+  // become active or inactive.
+  using ActiveApplicationCallback = std::function<void(bool)>;
+
+  void SetActiveApplicationCallback(ActiveApplicationCallback callback) {
+    active_application_callback_ = callback;
+  }
+
  private:
-  // Notification handlers.
+  // Notification handlers for time zone, orientation and active state.
   void InstallHandlers();
-  static void SystemTimeZoneDidChangeNotificationHandler(
-      CFNotificationCenterRef center,
-      void* observer,
-      CFStringRef name,
-      const void* object,
-      CFDictionaryRef userInfo);
   void SystemTimeZoneDidChangeNotification();
-
-  static void OrientationDidChangeNotificationHandler(
-      CFNotificationCenterRef center,
-      void* observer,
-      CFStringRef name,
-      const void* object,
-      CFDictionaryRef userInfo);
   void OrientationDidChangeNotification();
+  void ApplicationDidChangeActiveNotification();
 
   int major_version_;
   int minor_version_;
   int patch_version_;
   std::string build_;
+  std::string bundle_identifier_;
+  bool is_extension_;
   std::string machine_description_;
   int orientation_;
+  bool active_;
   int processor_count_;
   std::string cpu_vendor_;
   bool has_next_daylight_saving_time_;
@@ -76,6 +81,14 @@ class IOSSystemDataCollector {
   int daylight_offset_seconds_;
   std::string standard_name_;
   std::string daylight_name_;
+  ActiveApplicationCallback active_application_callback_;
+  uint64_t address_mask_;
+
+  // Time in nanoseconds as returned by ClockMonotonicNanoseconds() to store the
+  // crashpad start time. This clock increments monotonically but pauses while
+  // the system is asleep. It should not be compared to other system time
+  // sources.
+  uint64_t initialization_time_ns_;
 };
 
 }  // namespace internal
diff --git a/extern/crashpad/crashpad/util/ios/ios_system_data_collector.mm b/extern/crashpad/crashpad/util/ios/ios_system_data_collector.mm
index 4387ac9555..b2e3eb480c 100644
--- a/extern/crashpad/crashpad/util/ios/ios_system_data_collector.mm
+++ b/extern/crashpad/crashpad/util/ios/ios_system_data_collector.mm
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,32 +21,33 @@
 #include <TargetConditionals.h>
 #import <UIKit/UIKit.h>
 
-#include "base/mac/mach_logging.h"
+#include "base/apple/mach_logging.h"
+#include "base/notreached.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "build/build_config.h"
+#include "util/mac/sysctl.h"
+#include "util/misc/clock.h"
 
 namespace {
 
-std::string ReadStringSysctlByName(const char* name) {
-  size_t buf_len;
-  if (sysctlbyname(name, nullptr, &buf_len, nullptr, 0) != 0) {
-    PLOG(WARNING) << "sysctlbyname (size) " << name;
-    return std::string();
-  }
-
-  if (buf_len == 0) {
-    return std::string();
-  }
-
-  std::string value(buf_len - 1, '\0');
-  if (sysctlbyname(name, &value[0], &buf_len, nullptr, 0) != 0) {
-    PLOG(WARNING) << "sysctlbyname " << name;
-    return std::string();
-  }
-
-  return value;
+template <typename T, void (T::*M)(void)>
+void AddObserver(CFStringRef notification_name, T* observer) {
+  CFNotificationCenterAddObserver(
+      CFNotificationCenterGetLocalCenter(),
+      observer,
+      [](CFNotificationCenterRef center,
+         void* observer_vp,
+         CFNotificationName name,
+         const void* object,
+         CFDictionaryRef userInfo) {
+        T* observer = reinterpret_cast<T*>(observer_vp);
+        (observer->*M)();
+      },
+      notification_name,
+      nullptr,
+      CFNotificationSuspensionBehaviorDeliverImmediately);
 }
 
 }  // namespace
@@ -68,7 +69,8 @@
       standard_offset_seconds_(0),
       daylight_offset_seconds_(0),
       standard_name_(),
-      daylight_name_() {
+      daylight_name_(),
+      initialization_time_ns_(ClockMonotonicNanoseconds()) {
   NSOperatingSystemVersion version =
       [[NSProcessInfo processInfo] operatingSystemVersion];
   major_version_ = base::saturated_cast<int>(version.majorVersion);
@@ -76,11 +78,31 @@
   patch_version_ = base::saturated_cast<int>(version.patchVersion);
   processor_count_ =
       base::saturated_cast<int>([[NSProcessInfo processInfo] processorCount]);
-  build_ = ReadStringSysctlByName("kern.osversion");
+  build_ = ReadStringSysctlByName("kern.osversion", false);
+  bundle_identifier_ =
+      base::SysNSStringToUTF8([[NSBundle mainBundle] bundleIdentifier]);
+// If CRASHPAD_IS_IOS_APP_EXTENSION is defined, then the code is compiled with
+// -fapplication-extension and can only be used in an app extension. Otherwise
+// check at runtime whether the code is executing in an app extension or not.
+#if defined(CRASHPAD_IS_IOS_APP_EXTENSION)
+  is_extension_ = true;
+#else
+  is_extension_ = [[NSBundle mainBundle].bundlePath hasSuffix:@"appex"];
+#endif
 
 #if defined(ARCH_CPU_X86_64)
-  cpu_vendor_ = ReadStringSysctlByName("machdep.cpu.vendor");
+  cpu_vendor_ = ReadStringSysctlByName("machdep.cpu.vendor", false);
 #endif
+  uint32_t addressable_bits = 0;
+  size_t len = sizeof(uint32_t);
+  // `machdep.virtual_address_size` is the number of addressable bits in
+  // userspace virtual addresses
+  if (sysctlbyname(
+          "machdep.virtual_address_size", &addressable_bits, &len, NULL, 0) !=
+      0) {
+    addressable_bits = 0;
+  }
+  address_mask_ = ~((1UL << addressable_bits) - 1);
 
 #if TARGET_OS_SIMULATOR
   // TODO(justincohen): Consider adding board and model information to
@@ -128,35 +150,34 @@
 
 void IOSSystemDataCollector::InstallHandlers() {
   // Timezone.
-  CFNotificationCenterAddObserver(
-      CFNotificationCenterGetLocalCenter(),
-      this,
-      IOSSystemDataCollector::SystemTimeZoneDidChangeNotificationHandler,
-      reinterpret_cast<CFStringRef>(NSSystemTimeZoneDidChangeNotification),
-      nullptr,
-      CFNotificationSuspensionBehaviorDeliverImmediately);
+  AddObserver<IOSSystemDataCollector,
+              &IOSSystemDataCollector::SystemTimeZoneDidChangeNotification>(
+      (__bridge CFStringRef)NSSystemTimeZoneDidChangeNotification, this);
   SystemTimeZoneDidChangeNotification();
 
+#if !BUILDFLAG(IS_IOS_TVOS)
   // Orientation.
-  CFNotificationCenterAddObserver(
-      CFNotificationCenterGetLocalCenter(),
-      this,
-      IOSSystemDataCollector::OrientationDidChangeNotificationHandler,
-      reinterpret_cast<CFStringRef>(UIDeviceOrientationDidChangeNotification),
-      nullptr,
-      CFNotificationSuspensionBehaviorDeliverImmediately);
+  AddObserver<IOSSystemDataCollector,
+              &IOSSystemDataCollector::OrientationDidChangeNotification>(
+      (__bridge CFStringRef)UIDeviceOrientationDidChangeNotification, this);
   OrientationDidChangeNotification();
-}
+#endif
 
-// static
-void IOSSystemDataCollector::SystemTimeZoneDidChangeNotificationHandler(
-    CFNotificationCenterRef center,
-    void* observer,
-    CFStringRef name,
-    const void* object,
-    CFDictionaryRef userInfo) {
-  static_cast<IOSSystemDataCollector*>(observer)
-      ->SystemTimeZoneDidChangeNotification();
+#if !defined(CRASHPAD_IS_IOS_APP_EXTENSION)
+  // Foreground/Background. Extensions shouldn't use UIApplication*.
+  if (!is_extension_) {
+    AddObserver<
+        IOSSystemDataCollector,
+        &IOSSystemDataCollector::ApplicationDidChangeActiveNotification>(
+        (__bridge CFStringRef)UIApplicationDidBecomeActiveNotification, this);
+    AddObserver<
+        IOSSystemDataCollector,
+        &IOSSystemDataCollector::ApplicationDidChangeActiveNotification>(
+        (__bridge CFStringRef)UIApplicationDidEnterBackgroundNotification,
+        this);
+    ApplicationDidChangeActiveNotification();
+  }
+#endif
 }
 
 void IOSSystemDataCollector::SystemTimeZoneDidChangeNotification() {
@@ -194,20 +215,25 @@
   }
 }
 
-// static
-void IOSSystemDataCollector::OrientationDidChangeNotificationHandler(
-    CFNotificationCenterRef center,
-    void* observer,
-    CFStringRef name,
-    const void* object,
-    CFDictionaryRef userInfo) {
-  static_cast<IOSSystemDataCollector*>(observer)
-      ->OrientationDidChangeNotification();
-}
-
 void IOSSystemDataCollector::OrientationDidChangeNotification() {
+#if !BUILDFLAG(IS_IOS_TVOS)
   orientation_ =
       base::saturated_cast<int>([[UIDevice currentDevice] orientation]);
+#endif
+}
+
+void IOSSystemDataCollector::ApplicationDidChangeActiveNotification() {
+#if defined(CRASHPAD_IS_IOS_APP_EXTENSION)
+  NOTREACHED();
+#else
+  dispatch_assert_queue_debug(dispatch_get_main_queue());
+  bool old_active = active_;
+  active_ = [UIApplication sharedApplication].applicationState ==
+            UIApplicationStateActive;
+  if (active_ != old_active && active_application_callback_) {
+    active_application_callback_(active_);
+  }
+#endif
 }
 
 }  // namespace internal
diff --git a/extern/crashpad/crashpad/util/ios/raw_logging.cc b/extern/crashpad/crashpad/util/ios/raw_logging.cc
index f037c45289..0361bea422 100644
--- a/extern/crashpad/crashpad/util/ios/raw_logging.cc
+++ b/extern/crashpad/crashpad/util/ios/raw_logging.cc
@@ -1,4 +1,4 @@
-// Copyright 2021 The Crashpad Authors. All rights reserved.
+// Copyright 2021 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,6 +14,8 @@
 
 #include "util/ios/raw_logging.h"
 
+#include <atomic>
+
 #include <string.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -23,12 +25,22 @@
 namespace crashpad {
 namespace internal {
 
+namespace {
+static_assert(std::atomic<FileHandle>::is_always_lock_free,
+              "std::atomic<FileHandle> may not be signal-safe");
+std::atomic<FileHandle> g_file_handle = STDERR_FILENO;
+}  // namespace
+
+void SetFileHandleForTesting(FileHandle file_handle) {
+  g_file_handle = file_handle;
+}
+
 void RawLogString(const char* message) {
   const size_t message_len = strlen(message);
   size_t bytes_written = 0;
   while (bytes_written < message_len) {
     int rv = HANDLE_EINTR(write(
-        STDERR_FILENO, message + bytes_written, message_len - bytes_written));
+        g_file_handle, message + bytes_written, message_len - bytes_written));
     if (rv < 0) {
       // Give up, nothing we can do now.
       break;
@@ -51,15 +63,15 @@ void RawLogInt(unsigned int number) {
 // Prints `path:linenum message:error` (with optional `:error`).
 void RawLog(const char* file, int line, const char* message, int error) {
   RawLogString(file);
-  HANDLE_EINTR(write(STDERR_FILENO, ":", 1));
+  HANDLE_EINTR(write(g_file_handle, ":", 1));
   RawLogInt(line);
-  HANDLE_EINTR(write(STDERR_FILENO, " ", 1));
+  HANDLE_EINTR(write(g_file_handle, " ", 1));
   RawLogString(message);
   if (error) {
     RawLogString(": ");
     RawLogInt(error);
   }
-  HANDLE_EINTR(write(STDERR_FILENO, "\n", 1));
+  HANDLE_EINTR(write(g_file_handle, "\n", 1));
 }
 
 }  // namespace internal
diff --git a/extern/crashpad/crashpad/util/ios/raw_logging.h b/extern/crashpad/crashpad/util/ios/raw_logging.h
index 6075281713..5d951ec074 100644
--- a/extern/crashpad/crashpad/util/ios/raw_logging.h
+++ b/extern/crashpad/crashpad/util/ios/raw_logging.h
@@ -1,4 +1,4 @@
-// Copyright 2021 The Crashpad Authors. All rights reserved.
+// Copyright 2021 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
 #ifndef CRASHPAD_UTIL_IOS_EXCEPTION_LOGGING_H_
 #define CRASHPAD_UTIL_IOS_EXCEPTION_LOGGING_H_
 
+#include "util/file/file_io.h"
+
 namespace crashpad {
 namespace internal {
 
@@ -25,6 +27,11 @@ namespace internal {
 //! Note: RUNS-DURING-CRASH.
 void RawLog(const char* file, int line, const char* message, int error);
 
+//! \brief Direct RawLog to log to \a file_handle instead of stderr, so tests
+//!     can confirm certain error conditions during in-process crashes. Call
+//!     before before any Crashpad is run.
+void SetFileHandleForTesting(FileHandle file_handle);
+
 }  // namespace internal
 }  // namespace crashpad
 
diff --git a/extern/crashpad/crashpad/util/ios/scoped_background_task.h b/extern/crashpad/crashpad/util/ios/scoped_background_task.h
new file mode 100644
index 0000000000..909915b757
--- /dev/null
+++ b/extern/crashpad/crashpad/util/ios/scoped_background_task.h
@@ -0,0 +1,40 @@
+// 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.
+
+#ifndef CRASHPAD_UTIL_IOS_SCOPED_BACKGROUND_TASK_H_
+#define CRASHPAD_UTIL_IOS_SCOPED_BACKGROUND_TASK_H_
+
+#include <dispatch/dispatch.h>
+
+namespace crashpad {
+namespace internal {
+
+//! \brief Marks the start of a task that should continue if the application
+//!     enters the background.
+class ScopedBackgroundTask {
+ public:
+  //! \param[in] task_name A string used in debugging to indicate the reason the
+  //!     activity began. This parameter must not be nullptr or an empty string.
+  ScopedBackgroundTask(const char* task_name);
+
+  ScopedBackgroundTask(const ScopedBackgroundTask&) = delete;
+  ScopedBackgroundTask& operator=(const ScopedBackgroundTask&) = delete;
+  ~ScopedBackgroundTask();
+
+ private:
+  dispatch_semaphore_t task_complete_semaphore_;
+};
+
+}  // namespace internal
+}  // namespace crashpad
+
+#endif  // CRASHPAD_UTIL_IOS_SCOPED_BACKGROUND_TASK_H_
diff --git a/extern/crashpad/crashpad/util/ios/scoped_background_task.mm b/extern/crashpad/crashpad/util/ios/scoped_background_task.mm
new file mode 100644
index 0000000000..2af7bb8e58
--- /dev/null
+++ b/extern/crashpad/crashpad/util/ios/scoped_background_task.mm
@@ -0,0 +1,54 @@
+// Copyright 2022 The Crashpad Authors
+//
+// 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.
+
+#include "util/ios/scoped_background_task.h"
+
+#import <Foundation/Foundation.h>
+
+namespace crashpad {
+namespace internal {
+
+ScopedBackgroundTask::ScopedBackgroundTask(const char* task_name)
+    : task_complete_semaphore_(dispatch_semaphore_create(0)) {
+  __weak dispatch_semaphore_t weak_task_complete_semaphore =
+      task_complete_semaphore_;
+  NSString* name = [NSString stringWithUTF8String:task_name];
+  [[NSProcessInfo processInfo]
+      performExpiringActivityWithReason:name
+                             usingBlock:^(BOOL expired) {
+                               if (expired) {
+                                 // TODO(crbug.com/crashpad/400): Notify the
+                                 // BG task creator that time's up -- this will
+                                 // be useful for BackgroundTasks and
+                                 // NSURLSessions.
+                                 return;
+                               }
+                               __strong dispatch_semaphore_t
+                                   strong_task_complete_semaphore =
+                                       weak_task_complete_semaphore;
+                               if (!strong_task_complete_semaphore) {
+                                 return;
+                               }
+                               dispatch_semaphore_wait(
+                                   strong_task_complete_semaphore,
+                                   DISPATCH_TIME_FOREVER);
+                             }];
+}
+
+ScopedBackgroundTask::~ScopedBackgroundTask() {
+  dispatch_semaphore_signal(task_complete_semaphore_);
+}
+
+}  // namespace internal
+}  // namespace crashpad
diff --git a/extern/crashpad/crashpad/util/ios/scoped_vm_map.cc b/extern/crashpad/crashpad/util/ios/scoped_vm_map.cc
new file mode 100644
index 0000000000..e52b8778a3
--- /dev/null
+++ b/extern/crashpad/crashpad/util/ios/scoped_vm_map.cc
@@ -0,0 +1,86 @@
+// Copyright 2023 The Crashpad Authors
+//
+// 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.
+
+#include "util/ios/scoped_vm_map.h"
+
+#include "util/ios/raw_logging.h"
+
+namespace crashpad {
+namespace internal {
+
+ScopedVMMapInternal::ScopedVMMapInternal()
+    : data_(0),
+      region_start_(0),
+      region_size_(0),
+      cur_protection_(VM_PROT_NONE) {}
+
+ScopedVMMapInternal::~ScopedVMMapInternal() {
+  Reset();
+}
+
+bool ScopedVMMapInternal::Map(const void* data, const size_t data_length) {
+  Reset();
+
+  vm_address_t data_address = reinterpret_cast<vm_address_t>(data);
+  vm_address_t page_region_address = trunc_page(data_address);
+  region_size_ = round_page(data_address - page_region_address + data_length);
+  if (region_size_ < data_length) {
+    CRASHPAD_RAW_LOG("ScopedVMMap data_length overflow");
+    return false;
+  }
+
+  // Since region_start_ is 0, vm_remap() will choose an address to which the
+  // memory will be mapped and store the mapped address in region_start_ on
+  // success.
+  vm_prot_t max_protection;
+  kern_return_t kr = vm_remap(mach_task_self(),
+                              &region_start_,
+                              region_size_,
+                              0,
+                              TRUE,
+                              mach_task_self(),
+                              page_region_address,
+                              FALSE,
+                              &cur_protection_,
+                              &max_protection,
+                              VM_INHERIT_DEFAULT);
+  if (kr != KERN_SUCCESS) {
+    // It's expected that this will sometimes fail. Don't log here.
+    return false;
+  }
+
+  data_ = region_start_ + (data_address - page_region_address);
+  return true;
+}
+
+void ScopedVMMapInternal::Reset() {
+  if (!region_start_) {
+    return;
+  }
+
+  kern_return_t kr =
+      vm_deallocate(mach_task_self(), region_start_, region_size_);
+
+  if (kr != KERN_SUCCESS) {
+    CRASHPAD_RAW_LOG_ERROR(kr, "vm_deallocate");
+  }
+
+  data_ = 0;
+  region_start_ = 0;
+  region_size_ = 0;
+  cur_protection_ = VM_PROT_NONE;
+}
+
+}  // namespace internal
+}  // namespace crashpad
diff --git a/extern/crashpad/crashpad/util/ios/scoped_vm_map.h b/extern/crashpad/crashpad/util/ios/scoped_vm_map.h
new file mode 100644
index 0000000000..d918d2e914
--- /dev/null
+++ b/extern/crashpad/crashpad/util/ios/scoped_vm_map.h
@@ -0,0 +1,125 @@
+// Copyright 2023 The Crashpad Authors
+//
+// 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.
+
+#ifndef CRASHPAD_UTIL_IOS_SCOPED_VM_MAP_H_
+#define CRASHPAD_UTIL_IOS_SCOPED_VM_MAP_H_
+
+#include <mach/mach.h>
+
+namespace crashpad {
+namespace internal {
+
+//! \brief Non-templated internal class to be used by ScopedVMMap.
+//!
+//! Note: RUNS-DURING-CRASH.
+class ScopedVMMapInternal {
+ public:
+  ScopedVMMapInternal();
+
+  ScopedVMMapInternal(const ScopedVMMapInternal&) = delete;
+  ScopedVMMapInternal& operator=(const ScopedVMMapInternal&) = delete;
+
+  ~ScopedVMMapInternal();
+
+  //! \brief Releases any previously mapped data and vm_remaps \a data. Logs an
+  //!     error on failure.
+  //!
+  //! \param[in] data Memory to be mapped by vm_remap.
+  //! \param[in] data_length Length of \a data.
+  //!
+  //! \return `true` if all the data was mapped. Logs an error and returns false
+  //!   on failure.
+  bool Map(const void* data, size_t data_length);
+
+  //! \brief Returns the current protection for the memory in the region.
+  vm_prot_t CurrentProtection() const { return cur_protection_; }
+
+  vm_address_t data() const { return data_; }
+
+ private:
+  //! \brief Deallocates any resources allocated by this object and resets it
+  //!     to its original state.
+  void Reset();
+
+  // The address within region_start_ at which the mapped data is available.
+  vm_address_t data_;
+
+  // The region returned by vm_remap().
+  vm_address_t region_start_;
+
+  // The size of the region returned by vm_remap().
+  vm_size_t region_size_;
+
+  // The current protection for the memory region.
+  vm_prot_t cur_protection_;
+};
+
+//! \brief A scoped wrapper for calls to `vm_remap` and `vm_deallocate`.  Allows
+//!     in-process handler to safely read and write memory (modulo its
+//!     protection level) for the intermediate dump.
+//!
+//! Note: RUNS-DURING-CRASH.
+template <typename T>
+class ScopedVMMap {
+ public:
+  ScopedVMMap() : internal_() {}
+
+  ScopedVMMap(const ScopedVMMap&) = delete;
+  ScopedVMMap& operator=(const ScopedVMMap&) = delete;
+
+  ~ScopedVMMap() {}
+
+  //! \brief Releases any previously mapped data and vm_remaps data.
+  //!
+  //! \param[in] data Memory to be mapped by vm_remap.
+  //! \param[in] count Length of \a data.
+  //!
+  //! \return `true` if all \a data was mapped. Returns false on failure.
+  bool Map(const void* data, size_t count = 1) {
+    size_t data_length = count * sizeof(T);
+    return internal_.Map(data, data_length);
+  }
+
+  //! \brief Releases any previously mapped data and vm_remaps address.
+  //!
+  //! Before reading or writing the memory, check `CurrentProtection()` to
+  //! ensure the data is readable or writable.
+  //!
+  //! \param[in] address Address of memory to be mapped by vm_remap.
+  //! \param[in] count Length of \a data.
+  //!
+  //! \return `true` if all of \a address was mapped. Returns false on failure.
+  bool Map(vm_address_t address, size_t count = 1) {
+    return Map(reinterpret_cast<T*>(address), count);
+  }
+
+  //! \brief Returns the pointer to memory safe to read and write (respecting
+  //!   the CurrentProtection() level) during the in-process crash handler.
+  T* operator->() const { return get(); }
+
+  //! \brief Returns the pointer to memory safe to read and write (respecting
+  //!   the CurrentProtection() level) during the in-process crash handler.
+  T* get() const { return reinterpret_cast<T*>(internal_.data()); }
+
+  //! \brief Returns the current protection level of the mapped memory.
+  vm_prot_t CurrentProtection() const { return internal_.CurrentProtection(); }
+
+ private:
+  ScopedVMMapInternal internal_;
+};
+
+}  // namespace internal
+}  // namespace crashpad
+
+#endif  // CRASHPAD_UTIL_IOS_SCOPED_VM_MAP_H_
diff --git a/extern/crashpad/crashpad/util/ios/scoped_vm_map_test.cc b/extern/crashpad/crashpad/util/ios/scoped_vm_map_test.cc
new file mode 100644
index 0000000000..6a6b3ebc9c
--- /dev/null
+++ b/extern/crashpad/crashpad/util/ios/scoped_vm_map_test.cc
@@ -0,0 +1,94 @@
+// Copyright 2023 The Crashpad Authors
+//
+// 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.
+
+#include "util/ios/scoped_vm_map.h"
+
+#include <sys/time.h>
+
+#include "base/apple/scoped_mach_vm.h"
+#include "gtest/gtest.h"
+#include "test/mac/mach_errors.h"
+
+namespace crashpad {
+namespace test {
+namespace {
+
+TEST(ScopedVMMapTest, BasicFunctionality) {
+  // bad data or count.
+  internal::ScopedVMMap<vm_address_t> vmmap_bad;
+  EXPECT_FALSE(vmmap_bad.Map(nullptr, 100));
+  EXPECT_FALSE(vmmap_bad.Map(reinterpret_cast<void*>(0x1000), 100));
+  vm_address_t invalid_address = 1;
+  EXPECT_FALSE(vmmap_bad.Map(&invalid_address, 1000000000));
+  EXPECT_FALSE(vmmap_bad.Map(&invalid_address, -1));
+
+  vm_address_t valid_address = reinterpret_cast<vm_address_t>(this);
+  EXPECT_FALSE(vmmap_bad.Map(&valid_address, 1000000000));
+  EXPECT_FALSE(vmmap_bad.Map(&valid_address, -1));
+
+  // array
+  static constexpr char map_me[] = "map me";
+  internal::ScopedVMMap<char> vmmap_string;
+  ASSERT_TRUE(vmmap_string.Map(map_me, strlen(map_me)));
+  EXPECT_STREQ(vmmap_string.get(), map_me);
+  EXPECT_TRUE(vmmap_string.CurrentProtection() & VM_PROT_READ);
+
+  // struct
+  timeval time_of_day;
+  EXPECT_TRUE(gettimeofday(&time_of_day, nullptr) == 0);
+  internal::ScopedVMMap<timeval> vmmap_time;
+  ASSERT_TRUE(vmmap_time.Map(&time_of_day));
+  constexpr vm_prot_t kReadWrite = VM_PROT_READ | VM_PROT_WRITE;
+  EXPECT_EQ(vmmap_time.CurrentProtection() & kReadWrite, kReadWrite);
+  EXPECT_EQ(vmmap_time->tv_sec, time_of_day.tv_sec);
+  EXPECT_EQ(vmmap_time->tv_usec, time_of_day.tv_usec);
+
+  // reset.
+  timeval time_of_day2;
+  EXPECT_TRUE(gettimeofday(&time_of_day2, nullptr) == 0);
+  ASSERT_TRUE(vmmap_time.Map(&time_of_day2));
+  EXPECT_EQ(vmmap_time.CurrentProtection() & kReadWrite, kReadWrite);
+  EXPECT_EQ(vmmap_time->tv_sec, time_of_day2.tv_sec);
+  EXPECT_EQ(vmmap_time->tv_usec, time_of_day2.tv_usec);
+}
+
+TEST(ScopedVMMapTest, MissingMiddleVM) {
+  char* region;
+  vm_size_t page_size = getpagesize();
+  vm_size_t region_size = page_size * 3;
+  kern_return_t kr = vm_allocate(mach_task_self(),
+                                 reinterpret_cast<vm_address_t*>(&region),
+                                 region_size,
+                                 VM_FLAGS_ANYWHERE);
+  ASSERT_EQ(kr, KERN_SUCCESS) << MachErrorMessage(kr, "vm_allocate");
+
+  base::apple::ScopedMachVM vm_owner(reinterpret_cast<vm_address_t>(region),
+                                     region_size);
+
+  internal::ScopedVMMap<char> vmmap_missing_middle;
+  ASSERT_TRUE(vmmap_missing_middle.Map(region, region_size));
+
+  // Dealloc middle page.
+  kr = vm_deallocate(mach_task_self(),
+                     reinterpret_cast<vm_address_t>(region + page_size),
+                     page_size);
+  ASSERT_EQ(kr, KERN_SUCCESS) << MachErrorMessage(kr, "vm_deallocate");
+
+  EXPECT_FALSE(vmmap_missing_middle.Map(region, region_size));
+  ASSERT_TRUE(vmmap_missing_middle.Map(region, page_size));
+}
+
+}  // namespace
+}  // namespace test
+}  // namespace crashpad
diff --git a/extern/crashpad/crashpad/util/ios/scoped_vm_read.cc b/extern/crashpad/crashpad/util/ios/scoped_vm_read.cc
index 06cf43440c..ba3b694011 100644
--- a/extern/crashpad/crashpad/util/ios/scoped_vm_read.cc
+++ b/extern/crashpad/crashpad/util/ios/scoped_vm_read.cc
@@ -1,4 +1,4 @@
-// Copyright 2021 The Crashpad Authors. All rights reserved.
+// Copyright 2021 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,42 +20,50 @@ namespace crashpad {
 namespace internal {
 
 ScopedVMReadInternal::ScopedVMReadInternal()
-    : data_(0), vm_read_data_(0), vm_read_data_count_(0) {}
+    : data_(0), region_start_(0), region_size_(0) {}
 
 ScopedVMReadInternal::~ScopedVMReadInternal() {
-  if (data_) {
-    kern_return_t kr =
-        vm_deallocate(mach_task_self(), vm_read_data_, vm_read_data_count_);
-    if (kr != KERN_SUCCESS)
-      CRASHPAD_RAW_LOG_ERROR(kr, "vm_deallocate");
-  }
+  Reset();
 }
 
 bool ScopedVMReadInternal::Read(const void* data, const size_t data_length) {
-  if (data_) {
-    kern_return_t kr =
-        vm_deallocate(mach_task_self(), vm_read_data_, vm_read_data_count_);
-    if (kr != KERN_SUCCESS)
-      CRASHPAD_RAW_LOG_ERROR(kr, "vm_deallocate");
-    data_ = 0;
-  }
+  Reset();
+
   vm_address_t data_address = reinterpret_cast<vm_address_t>(data);
   vm_address_t page_region_address = trunc_page(data_address);
   vm_size_t page_region_size =
       round_page(data_address - page_region_address + data_length);
+  if (page_region_size < data_length) {
+    CRASHPAD_RAW_LOG("ScopedVMRead data_length overflow");
+    return false;
+  }
   kern_return_t kr = vm_read(mach_task_self(),
                              page_region_address,
                              page_region_size,
-                             &vm_read_data_,
-                             &vm_read_data_count_);
+                             &region_start_,
+                             &region_size_);
 
-  if (kr == KERN_SUCCESS) {
-    data_ = vm_read_data_ + (data_address - page_region_address);
-    return true;
-  } else {
+  if (kr != KERN_SUCCESS) {
     // It's expected that this will sometimes fail. Don't log here.
     return false;
   }
+
+  data_ = region_start_ + (data_address - page_region_address);
+  return true;
+}
+
+void ScopedVMReadInternal::Reset() {
+  if (!region_start_) {
+    return;
+  }
+  kern_return_t kr =
+      vm_deallocate(mach_task_self(), region_start_, region_size_);
+  if (kr != KERN_SUCCESS) {
+    CRASHPAD_RAW_LOG_ERROR(kr, "vm_deallocate");
+  }
+  region_start_ = 0;
+  region_size_ = 0;
+  data_ = 0;
 }
 
 }  // namespace internal
diff --git a/extern/crashpad/crashpad/util/ios/scoped_vm_read.h b/extern/crashpad/crashpad/util/ios/scoped_vm_read.h
index 3fa1249c66..0c956a2ffc 100644
--- a/extern/crashpad/crashpad/util/ios/scoped_vm_read.h
+++ b/extern/crashpad/crashpad/util/ios/scoped_vm_read.h
@@ -1,4 +1,4 @@
-// Copyright 2021 The Crashpad Authors. All rights reserved.
+// Copyright 2021 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -46,14 +46,18 @@ class ScopedVMReadInternal {
   vm_address_t data() const { return data_; }
 
  private:
-  // The address of the requested data.
+  //! \brief Deallocates any resources allocated by this object and resets it
+  //!     to its original state.
+  void Reset();
+
+  // The address within region_start_ at which the the data is available.
   vm_address_t data_;
 
-  // The rounded down page boundary of the requested data.
-  vm_address_t vm_read_data_;
+  // The region returned by vm_read().
+  vm_address_t region_start_;
 
-  // The size of the pages that were actually read.
-  mach_msg_type_number_t vm_read_data_count_;
+  // The size of the region returned by vm_read().
+  mach_msg_type_number_t region_size_;
 };
 
 //! \brief A scoped wrapper for calls to `vm_read` and `vm_deallocate`.  Allows
diff --git a/extern/crashpad/crashpad/util/ios/scoped_vm_read_test.cc b/extern/crashpad/crashpad/util/ios/scoped_vm_read_test.cc
index 80edf04256..29e5c232e0 100644
--- a/extern/crashpad/crashpad/util/ios/scoped_vm_read_test.cc
+++ b/extern/crashpad/crashpad/util/ios/scoped_vm_read_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2021 The Crashpad Authors. All rights reserved.
+// Copyright 2021 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,8 +16,9 @@
 
 #include <sys/time.h>
 
-#include "base/mac/scoped_mach_vm.h"
+#include "base/apple/scoped_mach_vm.h"
 #include "gtest/gtest.h"
+#include "test/mac/mach_errors.h"
 
 namespace crashpad {
 namespace test {
@@ -26,55 +27,60 @@ namespace {
 TEST(ScopedVMReadTest, BasicFunctionality) {
   // bad data or count.
   internal::ScopedVMRead<vm_address_t> vmread_bad;
-  ASSERT_FALSE(vmread_bad.Read(nullptr, 100));
-  ASSERT_FALSE(vmread_bad.Read(reinterpret_cast<void*>(0x1000), 100));
-  vm_address_t address = 1;
-  ASSERT_FALSE(vmread_bad.Read(&address, 1000000000));
+  EXPECT_FALSE(vmread_bad.Read(nullptr, 100));
+  EXPECT_FALSE(vmread_bad.Read(reinterpret_cast<void*>(0x1000), 100));
+  vm_address_t invalid_address = 1;
+  EXPECT_FALSE(vmread_bad.Read(&invalid_address, 1000000000));
+  EXPECT_FALSE(vmread_bad.Read(&invalid_address, -1));
 
+  vm_address_t valid_address = reinterpret_cast<vm_address_t>(this);
+  EXPECT_FALSE(vmread_bad.Read(&valid_address, 1000000000));
+  EXPECT_FALSE(vmread_bad.Read(&valid_address, -1));
   // array
   constexpr char read_me[] = "read me";
   internal::ScopedVMRead<char> vmread_string;
   ASSERT_TRUE(vmread_string.Read(read_me, strlen(read_me)));
-  EXPECT_STREQ(read_me, vmread_string.get());
+  EXPECT_STREQ(vmread_string.get(), read_me);
 
   // struct
   timeval time_of_day;
   EXPECT_TRUE(gettimeofday(&time_of_day, nullptr) == 0);
   internal::ScopedVMRead<timeval> vmread_time;
   ASSERT_TRUE(vmread_time.Read(&time_of_day));
-  EXPECT_EQ(time_of_day.tv_sec, vmread_time->tv_sec);
-  EXPECT_EQ(time_of_day.tv_usec, vmread_time->tv_usec);
+  EXPECT_EQ(vmread_time->tv_sec, time_of_day.tv_sec);
+  EXPECT_EQ(vmread_time->tv_usec, time_of_day.tv_usec);
 
   // reset.
   timeval time_of_day2;
   EXPECT_TRUE(gettimeofday(&time_of_day2, nullptr) == 0);
   ASSERT_TRUE(vmread_time.Read(&time_of_day2));
-  EXPECT_EQ(time_of_day2.tv_sec, vmread_time->tv_sec);
-  EXPECT_EQ(time_of_day2.tv_usec, vmread_time->tv_usec);
+  EXPECT_EQ(vmread_time->tv_sec, time_of_day2.tv_sec);
+  EXPECT_EQ(vmread_time->tv_usec, time_of_day2.tv_usec);
 }
 
 TEST(ScopedVMReadTest, MissingMiddleVM) {
   char* region;
   vm_size_t page_size = getpagesize();
   vm_size_t region_size = page_size * 3;
-  ASSERT_EQ(vm_allocate(mach_task_self(),
-                        reinterpret_cast<vm_address_t*>(&region),
-                        region_size,
-                        VM_FLAGS_ANYWHERE),
-            0);
-  base::mac::ScopedMachVM vm_owner(reinterpret_cast<vm_address_t>(region),
-                                   region_size);
+  kern_return_t kr = vm_allocate(mach_task_self(),
+                                 reinterpret_cast<vm_address_t*>(&region),
+                                 region_size,
+                                 VM_FLAGS_ANYWHERE);
+  ASSERT_EQ(kr, KERN_SUCCESS) << MachErrorMessage(kr, "vm_allocate");
+
+  base::apple::ScopedMachVM vm_owner(reinterpret_cast<vm_address_t>(region),
+                                     region_size);
 
   internal::ScopedVMRead<char> vmread_missing_middle;
   ASSERT_TRUE(vmread_missing_middle.Read(region, region_size));
 
   // Dealloc middle page.
-  ASSERT_EQ(vm_deallocate(mach_task_self(),
-                          reinterpret_cast<vm_address_t>(region + page_size),
-                          page_size),
-            0);
+  kr = vm_deallocate(mach_task_self(),
+                     reinterpret_cast<vm_address_t>(region + page_size),
+                     page_size);
+  ASSERT_EQ(kr, KERN_SUCCESS) << MachErrorMessage(kr, "vm_deallocate");
 
-  ASSERT_FALSE(vmread_missing_middle.Read(region, region_size));
+  EXPECT_FALSE(vmread_missing_middle.Read(region, region_size));
   ASSERT_TRUE(vmread_missing_middle.Read(region, page_size));
 }
 
diff --git a/extern/crashpad/crashpad/util/linux/address_types.h b/extern/crashpad/crashpad/util/linux/address_types.h
index fb17500d9b..bc164f0524 100644
--- a/extern/crashpad/crashpad/util/linux/address_types.h
+++ b/extern/crashpad/crashpad/util/linux/address_types.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/linux/auxiliary_vector.cc b/extern/crashpad/crashpad/util/linux/auxiliary_vector.cc
index d3d5ebdfb9..1bdaf7b6f5 100644
--- a/extern/crashpad/crashpad/util/linux/auxiliary_vector.cc
+++ b/extern/crashpad/crashpad/util/linux/auxiliary_vector.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/linux/auxiliary_vector.h b/extern/crashpad/crashpad/util/linux/auxiliary_vector.h
index 63a115438b..47be5ee333 100644
--- a/extern/crashpad/crashpad/util/linux/auxiliary_vector.h
+++ b/extern/crashpad/crashpad/util/linux/auxiliary_vector.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/linux/auxiliary_vector_test.cc b/extern/crashpad/crashpad/util/linux/auxiliary_vector_test.cc
index 75c20d1a09..f171ef84c4 100644
--- a/extern/crashpad/crashpad/util/linux/auxiliary_vector_test.cc
+++ b/extern/crashpad/crashpad/util/linux/auxiliary_vector_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@
 #include "util/numeric/int128.h"
 #include "util/process/process_memory_linux.h"
 
-#if !defined(OS_ANDROID)
+#if !BUILDFLAG(IS_ANDROID)
 // TODO(jperaza): This symbol isn't defined when building in chromium for
 // Android. There may be another symbol to use.
 extern "C" {
@@ -72,7 +72,7 @@ void TestAgainstCloneOrSelf(pid_t pid) {
   ASSERT_TRUE(aux.GetValue(AT_BASE, &interp_base));
   EXPECT_TRUE(mappings.FindMapping(interp_base));
 
-#if !defined(OS_ANDROID)
+#if !BUILDFLAG(IS_ANDROID)
   LinuxVMAddress entry_addr;
   ASSERT_TRUE(aux.GetValue(AT_ENTRY, &entry_addr));
   EXPECT_EQ(entry_addr, FromPointerCast<LinuxVMAddress>(START_SYMBOL));
@@ -96,10 +96,15 @@ void TestAgainstCloneOrSelf(pid_t pid) {
 
   ProcessMemoryLinux memory(&connection);
 
+// AT_PLATFORM is null for RISC-V:
+// https://elixir.bootlin.com/linux/v6.4-rc4/C/ident/ELF_PLATFORM
+#if !defined(ARCH_CPU_RISCV64)
   LinuxVMAddress platform_addr;
   ASSERT_TRUE(aux.GetValue(AT_PLATFORM, &platform_addr));
   std::string platform;
   ASSERT_TRUE(memory.ReadCStringSizeLimited(platform_addr, 10, &platform));
+#endif  // ARCH_CPU_RISCV64
+
 #if defined(ARCH_CPU_X86)
   EXPECT_STREQ(platform.c_str(), "i686");
 #elif defined(ARCH_CPU_X86_64)
@@ -182,13 +187,13 @@ TEST(AuxiliaryVector, SignedBit) {
   constexpr uint64_t type = 0x0000000012345678;
 
   constexpr int32_t neg1_32 = -1;
-  aux.Insert(type, bit_cast<uint32_t>(neg1_32));
+  aux.Insert(type, base::bit_cast<uint32_t>(neg1_32));
   int32_t outval32s;
   ASSERT_TRUE(aux.GetValue(type, &outval32s));
   EXPECT_EQ(outval32s, neg1_32);
 
   constexpr int32_t int32_max = std::numeric_limits<int32_t>::max();
-  aux.Insert(type, bit_cast<uint32_t>(int32_max));
+  aux.Insert(type, base::bit_cast<uint32_t>(int32_max));
   ASSERT_TRUE(aux.GetValue(type, &outval32s));
   EXPECT_EQ(outval32s, int32_max);
 
@@ -199,13 +204,13 @@ TEST(AuxiliaryVector, SignedBit) {
   EXPECT_EQ(outval32u, uint32_max);
 
   constexpr int64_t neg1_64 = -1;
-  aux.Insert(type, bit_cast<uint64_t>(neg1_64));
+  aux.Insert(type, base::bit_cast<uint64_t>(neg1_64));
   int64_t outval64s;
   ASSERT_TRUE(aux.GetValue(type, &outval64s));
   EXPECT_EQ(outval64s, neg1_64);
 
   constexpr int64_t int64_max = std::numeric_limits<int64_t>::max();
-  aux.Insert(type, bit_cast<uint64_t>(int64_max));
+  aux.Insert(type, base::bit_cast<uint64_t>(int64_max));
   ASSERT_TRUE(aux.GetValue(type, &outval64s));
   EXPECT_EQ(outval64s, int64_max);
 
diff --git a/extern/crashpad/crashpad/util/linux/checked_linux_address_range.h b/extern/crashpad/crashpad/util/linux/checked_linux_address_range.h
index 6bf86ec5a9..68fa9c88f5 100644
--- a/extern/crashpad/crashpad/util/linux/checked_linux_address_range.h
+++ b/extern/crashpad/crashpad/util/linux/checked_linux_address_range.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/linux/direct_ptrace_connection.cc b/extern/crashpad/crashpad/util/linux/direct_ptrace_connection.cc
index 5da0147587..e75fec1752 100644
--- a/extern/crashpad/crashpad/util/linux/direct_ptrace_connection.cc
+++ b/extern/crashpad/crashpad/util/linux/direct_ptrace_connection.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -73,7 +73,7 @@ bool DirectPtraceConnection::ReadFileContents(const base::FilePath& path,
   return LoggingReadEntireFile(path, contents);
 }
 
-ProcessMemory* DirectPtraceConnection::Memory() {
+ProcessMemoryLinux* DirectPtraceConnection::Memory() {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
   if (!memory_) {
     memory_ = std::make_unique<ProcessMemoryLinux>(this);
diff --git a/extern/crashpad/crashpad/util/linux/direct_ptrace_connection.h b/extern/crashpad/crashpad/util/linux/direct_ptrace_connection.h
index a120889a59..8b47740063 100644
--- a/extern/crashpad/crashpad/util/linux/direct_ptrace_connection.h
+++ b/extern/crashpad/crashpad/util/linux/direct_ptrace_connection.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -58,13 +58,13 @@ class DirectPtraceConnection : public PtraceConnection {
   bool GetThreadInfo(pid_t tid, ThreadInfo* info) override;
   bool ReadFileContents(const base::FilePath& path,
                         std::string* contents) override;
-  ProcessMemory* Memory() override;
+  ProcessMemoryLinux* Memory() override;
   bool Threads(std::vector<pid_t>* threads) override;
   ssize_t ReadUpTo(VMAddress, size_t size, void* buffer) override;
 
  private:
   std::vector<std::unique_ptr<ScopedPtraceAttach>> attachments_;
-  std::unique_ptr<ProcessMemory> memory_;
+  std::unique_ptr<ProcessMemoryLinux> memory_;
   pid_t pid_;
   Ptracer ptracer_;
   InitializationStateDcheck initialized_;
diff --git a/extern/crashpad/crashpad/util/linux/exception_handler_client.cc b/extern/crashpad/crashpad/util/linux/exception_handler_client.cc
index 608a199c0d..68dc67eff9 100644
--- a/extern/crashpad/crashpad/util/linux/exception_handler_client.cc
+++ b/extern/crashpad/crashpad/util/linux/exception_handler_client.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
 #include "build/build_config.h"
@@ -30,7 +31,7 @@
 #include "util/misc/from_pointer_cast.h"
 #include "util/posix/signals.h"
 
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
 #include <android/api-level.h>
 #endif
 
diff --git a/extern/crashpad/crashpad/util/linux/exception_handler_client.h b/extern/crashpad/crashpad/util/linux/exception_handler_client.h
index 7b28bd4867..2212e2d15d 100644
--- a/extern/crashpad/crashpad/util/linux/exception_handler_client.h
+++ b/extern/crashpad/crashpad/util/linux/exception_handler_client.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/linux/exception_handler_protocol.cc b/extern/crashpad/crashpad/util/linux/exception_handler_protocol.cc
index 27f180c6e1..090a663418 100644
--- a/extern/crashpad/crashpad/util/linux/exception_handler_protocol.cc
+++ b/extern/crashpad/crashpad/util/linux/exception_handler_protocol.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,15 +14,19 @@
 
 #include "util/linux/exception_handler_protocol.h"
 
+#include "build/build_config.h"
+
 namespace crashpad {
 
 ExceptionHandlerProtocol::ClientInformation::ClientInformation()
     : exception_information_address(0),
       sanitization_information_address(0)
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-      , crash_loop_before_time(0)
-#endif  // OS_LINUX || OS_CHROMEOS
-{}
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+      ,
+      crash_loop_before_time(0)
+#endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+{
+}
 
 ExceptionHandlerProtocol::ClientToServerMessage::ClientToServerMessage()
     : version(kVersion),
diff --git a/extern/crashpad/crashpad/util/linux/exception_handler_protocol.h b/extern/crashpad/crashpad/util/linux/exception_handler_protocol.h
index cbd24418a6..14fd863314 100644
--- a/extern/crashpad/crashpad/util/linux/exception_handler_protocol.h
+++ b/extern/crashpad/crashpad/util/linux/exception_handler_protocol.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -51,7 +51,7 @@ class ExceptionHandlerProtocol {
     //!     SanitizationInformation struct, or 0 if there is no such struct.
     VMAddress sanitization_information_address;
 
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
     //! \brief Indicates that the client is likely in a crash loop if a crash
     //!     occurs before this timestamp. This value is only used by ChromeOS's
     //!     `/sbin/crash_reporter`.
diff --git a/extern/crashpad/crashpad/util/linux/exception_information.h b/extern/crashpad/crashpad/util/linux/exception_information.h
index d7dbe529e4..153bb65369 100644
--- a/extern/crashpad/crashpad/util/linux/exception_information.h
+++ b/extern/crashpad/crashpad/util/linux/exception_information.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/linux/initial_signal_dispositions.cc b/extern/crashpad/crashpad/util/linux/initial_signal_dispositions.cc
index 9d980a11fb..9145b0bcf7 100644
--- a/extern/crashpad/crashpad/util/linux/initial_signal_dispositions.cc
+++ b/extern/crashpad/crashpad/util/linux/initial_signal_dispositions.cc
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/linux/initial_signal_dispositions.h b/extern/crashpad/crashpad/util/linux/initial_signal_dispositions.h
index b67083c7a2..2e010898b8 100644
--- a/extern/crashpad/crashpad/util/linux/initial_signal_dispositions.h
+++ b/extern/crashpad/crashpad/util/linux/initial_signal_dispositions.h
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/linux/memory_map.cc b/extern/crashpad/crashpad/util/linux/memory_map.cc
index dabc114d91..5838357372 100644
--- a/extern/crashpad/crashpad/util/linux/memory_map.cc
+++ b/extern/crashpad/crashpad/util/linux/memory_map.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 #include <string.h>
 #include <sys/sysmacros.h>
 
-#include "base/bit_cast.h"
+#include "base/check_op.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "build/build_config.h"
@@ -227,6 +227,12 @@ class FullReverseIterator : public MemoryMap::Iterator {
   std::vector<MemoryMap::Mapping>::const_reverse_iterator rend_;
 };
 
+// Faster than a CheckedRange, for temporary values.
+struct FastRange {
+  VMAddress base;
+  VMSize size;
+};
+
 }  // namespace
 
 MemoryMap::Mapping::Mapping()
@@ -240,7 +246,7 @@ MemoryMap::Mapping::Mapping()
       executable(false),
       shareable(false) {}
 
-MemoryMap::MemoryMap() : mappings_(), initialized_() {}
+MemoryMap::MemoryMap() : mappings_(), connection_(nullptr), initialized_() {}
 
 MemoryMap::~MemoryMap() {}
 
@@ -256,6 +262,7 @@ bool MemoryMap::Mapping::Equals(const Mapping& other) const {
 
 bool MemoryMap::Initialize(PtraceConnection* connection) {
   INITIALIZATION_STATE_SET_INITIALIZING(initialized_);
+  connection_ = connection;
 
   // If the maps file is not read atomically, entries can be read multiple times
   // or missed entirely. The kernel reads entries from this file into a page
@@ -268,8 +275,8 @@ bool MemoryMap::Initialize(PtraceConnection* connection) {
   do {
     std::string contents;
     char path[32];
-    snprintf(path, sizeof(path), "/proc/%d/maps", connection->GetProcessID());
-    if (!connection->ReadFileContents(base::FilePath(path), &contents)) {
+    snprintf(path, sizeof(path), "/proc/%d/maps", connection_->GetProcessID());
+    if (!connection_->ReadFileContents(base::FilePath(path), &contents)) {
       return false;
     }
 
@@ -298,6 +305,7 @@ bool MemoryMap::Initialize(PtraceConnection* connection) {
 
 const MemoryMap::Mapping* MemoryMap::FindMapping(LinuxVMAddress address) const {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
+  address = connection_->Memory()->PointerToAddress(address);
 
   for (const auto& mapping : mappings_) {
     if (mapping.range.Base() <= address && mapping.range.End() > address) {
@@ -319,6 +327,57 @@ const MemoryMap::Mapping* MemoryMap::FindMappingWithName(
   return nullptr;
 }
 
+std::vector<CheckedRange<VMAddress>> MemoryMap::GetReadableRanges(
+    const CheckedRange<VMAddress, VMSize>& range) const {
+  using Range = CheckedRange<VMAddress, VMSize>;
+
+  VMAddress range_base = range.base();
+  VMAddress range_end = range.end();
+  std::vector<FastRange> overlapping;
+
+  // Find all readable ranges overlapping the target range, maintaining order.
+  for (const auto& mapping : mappings_) {
+    if (!mapping.readable)
+      continue;
+    if (mapping.range.End() < range_base)
+      continue;
+    if (mapping.range.Base() >= range_end)
+      continue;
+    // Special case: the "[vvar]" region is marked readable, but we can't
+    // access it.
+    if (mapping.inode == 0 && mapping.name == "[vvar]")
+      continue;
+    overlapping.push_back({mapping.range.Base(), mapping.range.Size()});
+  }
+  if (overlapping.empty())
+    return std::vector<Range>();
+
+  // For the first and last, trim to the boundary of the incoming range.
+  FastRange& front = overlapping.front();
+  VMAddress original_front_base = front.base;
+  front.base = std::max(front.base, range_base);
+  front.size = (original_front_base + front.size) - front.base;
+  FastRange& back = overlapping.back();
+  VMAddress back_end = back.base + back.size;
+  back.size = std::min(range_end, back_end) - back.base;
+
+  // Coalesce, and convert to return type.
+  std::vector<Range> result;
+  result.push_back({overlapping[0].base, overlapping[0].size});
+  DCHECK(result.back().IsValid());
+  for (size_t i = 1; i < overlapping.size(); ++i) {
+    if (result.back().end() == overlapping[i].base) {
+      result.back().SetRange(result.back().base(),
+                             result.back().size() + overlapping[i].size);
+    } else {
+      result.push_back({overlapping[i].base, overlapping[i].size});
+    }
+    DCHECK(result.back().IsValid());
+  }
+
+  return result;
+}
+
 std::unique_ptr<MemoryMap::Iterator> MemoryMap::FindFilePossibleMmapStarts(
     const Mapping& mapping) const {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
@@ -339,7 +398,7 @@ std::unique_ptr<MemoryMap::Iterator> MemoryMap::FindFilePossibleMmapStarts(
     return std::make_unique<SparseReverseIterator>();
   }
 
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
   // The Android Chromium linker uses ashmem to share RELRO segments between
   // processes. The original RELRO segment has been unmapped and replaced with a
   // mapping named "/dev/ashmem/RELRO:<libname>" where <libname> is the base
@@ -368,17 +427,17 @@ std::unique_ptr<MemoryMap::Iterator> MemoryMap::FindFilePossibleMmapStarts(
       }
     }
   }
-#endif  // OS_ANDROID
+#endif  // BUILDFLAG(IS_ANDROID)
 
   for (const auto& candidate : mappings_) {
     if (candidate.device == mapping.device &&
         candidate.inode == mapping.inode
-#if !defined(OS_ANDROID)
+#if !BUILDFLAG(IS_ANDROID)
         // Libraries on Android may be mapped from zipfiles (APKs), in which
         // case the offset is not 0.
         && candidate.offset == 0
-#endif  // !defined(OS_ANDROID)
-        ) {
+#endif  // !BUILDFLAG(IS_ANDROID)
+    ) {
       possible_starts.push_back(&candidate);
     }
     if (mapping.Equals(candidate)) {
diff --git a/extern/crashpad/crashpad/util/linux/memory_map.h b/extern/crashpad/crashpad/util/linux/memory_map.h
index d43b7af429..c8ba706e55 100644
--- a/extern/crashpad/crashpad/util/linux/memory_map.h
+++ b/extern/crashpad/crashpad/util/linux/memory_map.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -77,6 +77,16 @@ class MemoryMap {
   //!     it was obtained from.
   const Mapping* FindMappingWithName(const std::string& name) const;
 
+  //! \brief Given a range to be read from the target process, returns a vector
+  //!     of ranges, representing the readable portions of the original range.
+  //!
+  //! \param[in] range The range being identified.
+  //!
+  //! \return A vector of ranges corresponding to the portion of \a range that
+  //!     is readable based on the memory map.
+  std::vector<CheckedRange<uint64_t>> GetReadableRanges(
+      const CheckedRange<LinuxVMAddress, LinuxVMSize>& range) const;
+
   //! \brief An abstract base class for iterating over ordered sets of mappings
   //!   in a MemoryMap.
   class Iterator {
@@ -129,6 +139,7 @@ class MemoryMap {
 
  private:
   std::vector<Mapping> mappings_;
+  PtraceConnection* connection_;
   InitializationStateDcheck initialized_;
 };
 
diff --git a/extern/crashpad/crashpad/util/linux/memory_map_test.cc b/extern/crashpad/crashpad/util/linux/memory_map_test.cc
index 4ab7b05c43..2dae4d7536 100644
--- a/extern/crashpad/crashpad/util/linux/memory_map_test.cc
+++ b/extern/crashpad/crashpad/util/linux/memory_map_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -101,7 +101,7 @@ TEST(MemoryMap, SelfBasic) {
   ASSERT_TRUE(mapping);
   EXPECT_GE(code_address, mapping->range.Base());
   EXPECT_LT(code_address, mapping->range.End());
-#if !defined(OS_ANDROID)
+#if !BUILDFLAG(IS_ANDROID)
   // Android Q+ supports execute only memory.
   EXPECT_TRUE(mapping->readable);
 #endif
@@ -174,7 +174,7 @@ class MapChildTest : public Multiprocess {
     ASSERT_TRUE(mapping);
     EXPECT_GE(code_address, mapping->range.Base());
     EXPECT_LT(code_address, mapping->range.End());
-#if !defined(OS_ANDROID)
+#if !BUILDFLAG(IS_ANDROID)
     // Android Q+ supports execute only memory.
     EXPECT_TRUE(mapping->readable);
 #endif
@@ -426,7 +426,7 @@ void ExpectFindFilePossibleMmapStarts(LinuxVMAddress mapping_start,
   EXPECT_EQ(mappings->Next(), mapping2);
 
   mappings = map.FindFilePossibleMmapStarts(*mapping3);
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
   EXPECT_EQ(mappings->Count(), 2u);
 #else
   ASSERT_EQ(mappings->Count(), 1u);
@@ -474,7 +474,7 @@ TEST(MemoryMap, FindFilePossibleMmapStarts) {
     ASSERT_NE(mapping1, mapping2);
     ASSERT_NE(mapping2, mapping3);
 
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
     auto mappings = map.FindFilePossibleMmapStarts(*mapping1);
     EXPECT_EQ(mappings->Count(), 1u);
     EXPECT_EQ(mappings->Next(), mapping1);
@@ -622,7 +622,7 @@ TEST(MemoryMap, FindFilePossibleMmapStarts_MultipleStarts) {
   auto mapping = map.FindMapping(file_mapping0.addr_as<VMAddress>());
   ASSERT_TRUE(mapping);
   auto possible_starts = map.FindFilePossibleMmapStarts(*mapping);
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
   EXPECT_EQ(possible_starts->Count(), 1u);
 #else
   EXPECT_EQ(possible_starts->Count(), 0u);
@@ -631,7 +631,7 @@ TEST(MemoryMap, FindFilePossibleMmapStarts_MultipleStarts) {
   mapping = map.FindMapping(file_mapping1.addr_as<VMAddress>());
   ASSERT_TRUE(mapping);
   possible_starts = map.FindFilePossibleMmapStarts(*mapping);
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
   EXPECT_EQ(possible_starts->Count(), 2u);
 #else
   EXPECT_EQ(possible_starts->Count(), 1u);
@@ -640,7 +640,7 @@ TEST(MemoryMap, FindFilePossibleMmapStarts_MultipleStarts) {
   mapping = map.FindMapping(file_mapping2.addr_as<VMAddress>());
   ASSERT_TRUE(mapping);
   possible_starts = map.FindFilePossibleMmapStarts(*mapping);
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
   EXPECT_EQ(possible_starts->Count(), 3u);
 #else
   EXPECT_EQ(possible_starts->Count(), 2u);
@@ -649,7 +649,7 @@ TEST(MemoryMap, FindFilePossibleMmapStarts_MultipleStarts) {
   mapping = map.FindMapping(file_mapping3.addr_as<VMAddress>());
   ASSERT_TRUE(mapping);
   possible_starts = map.FindFilePossibleMmapStarts(*mapping);
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
   EXPECT_EQ(possible_starts->Count(), 4u);
 #else
   EXPECT_EQ(possible_starts->Count(), 3u);
@@ -658,7 +658,7 @@ TEST(MemoryMap, FindFilePossibleMmapStarts_MultipleStarts) {
   mapping = map.FindMapping(file_mapping4.addr_as<VMAddress>());
   ASSERT_TRUE(mapping);
   possible_starts = map.FindFilePossibleMmapStarts(*mapping);
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
   EXPECT_EQ(possible_starts->Count(), 5u);
 #else
   EXPECT_EQ(possible_starts->Count(), 4u);
diff --git a/extern/crashpad/crashpad/util/linux/pac_helper.cc b/extern/crashpad/crashpad/util/linux/pac_helper.cc
new file mode 100644
index 0000000000..a9d5f04564
--- /dev/null
+++ b/extern/crashpad/crashpad/util/linux/pac_helper.cc
@@ -0,0 +1,44 @@
+// Copyright 2023 The Crashpad Authors
+//
+// 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.
+
+#include "util/linux/pac_helper.h"
+
+#if defined(__has_feature)
+#define CRASHPAD_HAS_FEATURE(x) __has_feature(x)
+#else
+#define CRASHPAD_HAS_FEATURE(x) 0
+#endif
+
+#if CRASHPAD_HAS_FEATURE(ptrauth_intrinsics)
+  #include <ptrauth.h>
+#endif
+
+#include "util/misc/address_types.h"
+
+namespace crashpad {
+
+VMAddress StripPACBits(VMAddress address) {
+#if CRASHPAD_HAS_FEATURE(ptrauth_intrinsics)
+    address = ptrauth_strip(address, ptrauth_key_function_pointer);
+#elif defined(ARCH_CPU_ARM64)
+    // Strip any pointer authentication bits that are assigned to the address.
+    register uintptr_t x30 __asm("x30") = address;
+    asm("xpaclri" : "+r"(x30));
+    address = x30;
+#endif
+    return address;
+}
+
+}  // namespace crashpad
+
diff --git a/extern/crashpad/crashpad/util/misc/capture_context_broken.cc b/extern/crashpad/crashpad/util/linux/pac_helper.h
similarity index 64%
rename from extern/crashpad/crashpad/util/misc/capture_context_broken.cc
rename to extern/crashpad/crashpad/util/linux/pac_helper.h
index ea6d0a0cf9..6fcea652ab 100644
--- a/extern/crashpad/crashpad/util/misc/capture_context_broken.cc
+++ b/extern/crashpad/crashpad/util/linux/pac_helper.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2023 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,18 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "util/misc/capture_context.h"
+#ifndef CRASHPAD_UTIL_LINUX_PAC_HELPER_H_
+#define CRASHPAD_UTIL_LINUX_PAC_HELPER_H_
 
-#include <ostream>
-
-#include "base/check.h"
+#include "util/misc/address_types.h"
 
 namespace crashpad {
 
-void CaptureContext(NativeCPUContext* context) {
-  // Don't use this file in production.
-  CHECK(false)
-      << "Don't use this! For cross builds only. See https://crbug.com/762167.";
-}
+//! \brief Strips PAC bits from an address
+VMAddress StripPACBits(VMAddress address);
 
 }  // namespace crashpad
+
+
+#endif  // CRASHPAD_UTIL_LINUX_PAC_HELPER_H_
+
diff --git a/extern/crashpad/crashpad/util/linux/proc_stat_reader.cc b/extern/crashpad/crashpad/util/linux/proc_stat_reader.cc
index 878103d9dc..cc5527353b 100644
--- a/extern/crashpad/crashpad/util/linux/proc_stat_reader.cc
+++ b/extern/crashpad/crashpad/util/linux/proc_stat_reader.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,7 +18,8 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "util/file/file_io.h"
@@ -48,7 +49,7 @@ bool ProcStatReader::Initialize(PtraceConnection* connection, pid_t tid) {
   INITIALIZATION_STATE_SET_INITIALIZING(initialized_);
 
   char path[32];
-  snprintf(path, base::size(path), "/proc/%d/stat", tid);
+  snprintf(path, std::size(path), "/proc/%d/stat", tid);
   if (!connection->ReadFileContents(base::FilePath(path), &contents_)) {
     return false;
   }
diff --git a/extern/crashpad/crashpad/util/linux/proc_stat_reader.h b/extern/crashpad/crashpad/util/linux/proc_stat_reader.h
index 193330c7b3..4009f7b9ba 100644
--- a/extern/crashpad/crashpad/util/linux/proc_stat_reader.h
+++ b/extern/crashpad/crashpad/util/linux/proc_stat_reader.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/linux/proc_stat_reader_test.cc b/extern/crashpad/crashpad/util/linux/proc_stat_reader_test.cc
index 1c0c0ae43c..b063719516 100644
--- a/extern/crashpad/crashpad/util/linux/proc_stat_reader_test.cc
+++ b/extern/crashpad/crashpad/util/linux/proc_stat_reader_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/linux/proc_task_reader.cc b/extern/crashpad/crashpad/util/linux/proc_task_reader.cc
index ca62db2712..159d8cac9d 100644
--- a/extern/crashpad/crashpad/util/linux/proc_task_reader.cc
+++ b/extern/crashpad/crashpad/util/linux/proc_task_reader.cc
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,7 +16,9 @@
 
 #include <stdio.h>
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+
+#include "base/check_op.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
@@ -29,7 +31,7 @@ bool ReadThreadIDs(pid_t pid, std::vector<pid_t>* tids) {
   DCHECK(tids->empty());
 
   char path[32];
-  snprintf(path, base::size(path), "/proc/%d/task", pid);
+  snprintf(path, std::size(path), "/proc/%d/task", pid);
   DirectoryReader reader;
   if (!reader.Open(base::FilePath(path))) {
     return false;
diff --git a/extern/crashpad/crashpad/util/linux/proc_task_reader.h b/extern/crashpad/crashpad/util/linux/proc_task_reader.h
index 9b95f12703..8cbda53013 100644
--- a/extern/crashpad/crashpad/util/linux/proc_task_reader.h
+++ b/extern/crashpad/crashpad/util/linux/proc_task_reader.h
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/linux/proc_task_reader_test.cc b/extern/crashpad/crashpad/util/linux/proc_task_reader_test.cc
index ab2650f50a..5d67d2a375 100644
--- a/extern/crashpad/crashpad/util/linux/proc_task_reader_test.cc
+++ b/extern/crashpad/crashpad/util/linux/proc_task_reader_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/linux/ptrace_broker.cc b/extern/crashpad/crashpad/util/linux/ptrace_broker.cc
index 9bf133bc89..1680a4ed32 100644
--- a/extern/crashpad/crashpad/util/linux/ptrace_broker.cc
+++ b/extern/crashpad/crashpad/util/linux/ptrace_broker.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/linux/ptrace_broker.h b/extern/crashpad/crashpad/util/linux/ptrace_broker.h
index 4502da2004..b3e574a286 100644
--- a/extern/crashpad/crashpad/util/linux/ptrace_broker.h
+++ b/extern/crashpad/crashpad/util/linux/ptrace_broker.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/linux/ptrace_broker_test.cc b/extern/crashpad/crashpad/util/linux/ptrace_broker_test.cc
index b07a9be57c..11f1684ab5 100644
--- a/extern/crashpad/crashpad/util/linux/ptrace_broker_test.cc
+++ b/extern/crashpad/crashpad/util/linux/ptrace_broker_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -277,7 +277,10 @@ class SameBitnessTest : public Multiprocess {
   ScopedMmap mapping_;
 };
 
-TEST(PtraceBroker, SameBitness) {
+// TODO(https://crbug.com/1459865): This test consistently fails on ASAN/LSAN
+// but it's not clear if this test is correct in the general case (see comment 2
+// on that issue).
+TEST(PtraceBroker, DISABLED_SameBitness) {
   SameBitnessTest test;
   test.Run();
 }
diff --git a/extern/crashpad/crashpad/util/linux/ptrace_client.cc b/extern/crashpad/crashpad/util/linux/ptrace_client.cc
index cb1a1a5d06..56bc555684 100644
--- a/extern/crashpad/crashpad/util/linux/ptrace_client.cc
+++ b/extern/crashpad/crashpad/util/linux/ptrace_client.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,9 +18,10 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <iterator>
 #include <string>
 
-#include "base/cxx17_backports.h"
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "util/file/file_io.h"
@@ -248,7 +249,7 @@ bool PtraceClient::ReadFileContents(const base::FilePath& path,
   return true;
 }
 
-ProcessMemory* PtraceClient::Memory() {
+ProcessMemoryLinux* PtraceClient::Memory() {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
   if (!memory_) {
     memory_ = std::make_unique<ProcessMemoryLinux>(this);
@@ -265,7 +266,7 @@ bool PtraceClient::Threads(std::vector<pid_t>* threads) {
   threads->push_back(pid_);
 
   char path[32];
-  snprintf(path, base::size(path), "/proc/%d/task", pid_);
+  snprintf(path, std::size(path), "/proc/%d/task", pid_);
 
   PtraceBroker::Request request = {};
   request.type = PtraceBroker::Request::kTypeListDirectory;
@@ -331,6 +332,11 @@ ssize_t PtraceClient::ReadUpTo(VMAddress address, size_t size, void* buffer) {
       return total_read;
     }
 
+    if (static_cast<size_t>(bytes_read) > size) {
+      LOG(ERROR) << "invalid size " << bytes_read;
+      return -1;
+    }
+
     if (!LoggingReadFileExactly(sock_, buffer_c, bytes_read)) {
       return -1;
     }
diff --git a/extern/crashpad/crashpad/util/linux/ptrace_client.h b/extern/crashpad/crashpad/util/linux/ptrace_client.h
index 299aafc993..dea36b21c7 100644
--- a/extern/crashpad/crashpad/util/linux/ptrace_client.h
+++ b/extern/crashpad/crashpad/util/linux/ptrace_client.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -60,14 +60,14 @@ class PtraceClient : public PtraceConnection {
   bool GetThreadInfo(pid_t tid, ThreadInfo* info) override;
   bool ReadFileContents(const base::FilePath& path,
                         std::string* contents) override;
-  ProcessMemory* Memory() override;
+  ProcessMemoryLinux* Memory() override;
   bool Threads(std::vector<pid_t>* threads) override;
   ssize_t ReadUpTo(VMAddress address, size_t size, void* buffer) override;
 
  private:
   bool SendFilePath(const char* path, size_t length);
 
-  std::unique_ptr<ProcessMemory> memory_;
+  std::unique_ptr<ProcessMemoryLinux> memory_;
   int sock_;
   pid_t pid_;
   bool is_64_bit_;
diff --git a/extern/crashpad/crashpad/util/linux/ptrace_connection.h b/extern/crashpad/crashpad/util/linux/ptrace_connection.h
index 9b31d52a45..e4a384ee70 100644
--- a/extern/crashpad/crashpad/util/linux/ptrace_connection.h
+++ b/extern/crashpad/crashpad/util/linux/ptrace_connection.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 
 #include "base/files/file_path.h"
 #include "util/linux/thread_info.h"
-#include "util/process/process_memory.h"
+#include "util/process/process_memory_linux.h"
 
 namespace crashpad {
 
@@ -64,7 +64,7 @@ class PtraceConnection {
   //!
   //! The caller does not take ownership of the reader. The reader is valid for
   //! the lifetime of the PtraceConnection that created it.
-  virtual ProcessMemory* Memory() = 0;
+  virtual ProcessMemoryLinux* Memory() = 0;
 
   //! \brief Determines the thread IDs of the threads in the connected process.
   //!
diff --git a/extern/crashpad/crashpad/util/linux/ptracer.cc b/extern/crashpad/crashpad/util/linux/ptracer.cc
index 557e0d3635..a985cb1d1f 100644
--- a/extern/crashpad/crashpad/util/linux/ptracer.cc
+++ b/extern/crashpad/crashpad/util/linux/ptracer.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 #include <sys/ptrace.h>
 #include <sys/uio.h>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "util/misc/from_pointer_cast.h"
@@ -398,6 +399,37 @@ bool GetThreadArea64(pid_t tid,
   return true;
 }
 
+#elif defined(ARCH_CPU_RISCV64)
+
+bool GetFloatingPointRegisters64(pid_t tid,
+                                 FloatContext* context,
+                                 bool can_log) {
+  iovec iov;
+  iov.iov_base = context;
+  iov.iov_len = sizeof(*context);
+  if (ptrace(
+          PTRACE_GETREGSET, tid, reinterpret_cast<void*>(NT_PRFPREG), &iov) !=
+      0) {
+    PLOG_IF(ERROR, can_log) << "ptrace";
+    return false;
+  }
+  if (iov.iov_len != sizeof(context->f64)) {
+    LOG_IF(ERROR, can_log) << "Unexpected registers size " << iov.iov_len
+                           << " != " << sizeof(context->f64);
+    return false;
+  }
+  return true;
+}
+
+bool GetThreadArea64(pid_t tid,
+                     const ThreadContext& context,
+                     LinuxVMAddress* address,
+                     bool can_log) {
+  // Thread pointer register
+  *address = context.t64.regs[3];
+  return true;
+}
+
 #else
 #error Port.
 #endif  // ARCH_CPU_X86_FAMILY
@@ -426,6 +458,7 @@ size_t GetGeneralPurposeRegistersAndLength(pid_t tid,
   return iov.iov_len;
 }
 
+#if !defined(ARCH_CPU_RISCV64)
 bool GetGeneralPurposeRegisters32(pid_t tid,
                                   ThreadContext* context,
                                   bool can_log) {
@@ -437,6 +470,7 @@ bool GetGeneralPurposeRegisters32(pid_t tid,
   }
   return true;
 }
+#endif
 
 bool GetGeneralPurposeRegisters64(pid_t tid,
                                   ThreadContext* context,
@@ -500,12 +534,16 @@ bool Ptracer::GetThreadInfo(pid_t tid, ThreadInfo* info) {
                            can_log_);
   }
 
+#if !defined(ARCH_CPU_RISCV64)
   return GetGeneralPurposeRegisters32(tid, &info->thread_context, can_log_) &&
          GetFloatingPointRegisters32(tid, &info->float_context, can_log_) &&
          GetThreadArea32(tid,
                          info->thread_context,
                          &info->thread_specific_data_address,
                          can_log_);
+#else
+  return false;
+#endif
 }
 
 ssize_t Ptracer::ReadUpTo(pid_t pid,
diff --git a/extern/crashpad/crashpad/util/linux/ptracer.h b/extern/crashpad/crashpad/util/linux/ptracer.h
index 696ac33277..55be79891e 100644
--- a/extern/crashpad/crashpad/util/linux/ptracer.h
+++ b/extern/crashpad/crashpad/util/linux/ptracer.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/linux/ptracer_test.cc b/extern/crashpad/crashpad/util/linux/ptracer_test.cc
index 7465f90aa4..419289d98b 100644
--- a/extern/crashpad/crashpad/util/linux/ptracer_test.cc
+++ b/extern/crashpad/crashpad/util/linux/ptracer_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/linux/scoped_pr_set_dumpable.cc b/extern/crashpad/crashpad/util/linux/scoped_pr_set_dumpable.cc
index cbec009b19..be1d635a39 100644
--- a/extern/crashpad/crashpad/util/linux/scoped_pr_set_dumpable.cc
+++ b/extern/crashpad/crashpad/util/linux/scoped_pr_set_dumpable.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/linux/scoped_pr_set_dumpable.h b/extern/crashpad/crashpad/util/linux/scoped_pr_set_dumpable.h
index 7cd3aa7a1d..19a0189b24 100644
--- a/extern/crashpad/crashpad/util/linux/scoped_pr_set_dumpable.h
+++ b/extern/crashpad/crashpad/util/linux/scoped_pr_set_dumpable.h
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/linux/scoped_pr_set_ptracer.cc b/extern/crashpad/crashpad/util/linux/scoped_pr_set_ptracer.cc
index c7aeefc640..15da6c5309 100644
--- a/extern/crashpad/crashpad/util/linux/scoped_pr_set_ptracer.cc
+++ b/extern/crashpad/crashpad/util/linux/scoped_pr_set_ptracer.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/linux/scoped_pr_set_ptracer.h b/extern/crashpad/crashpad/util/linux/scoped_pr_set_ptracer.h
index 3d5e55c606..dda34e12d5 100644
--- a/extern/crashpad/crashpad/util/linux/scoped_pr_set_ptracer.h
+++ b/extern/crashpad/crashpad/util/linux/scoped_pr_set_ptracer.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/linux/scoped_ptrace_attach.cc b/extern/crashpad/crashpad/util/linux/scoped_ptrace_attach.cc
index eed8345563..cb184a44b5 100644
--- a/extern/crashpad/crashpad/util/linux/scoped_ptrace_attach.cc
+++ b/extern/crashpad/crashpad/util/linux/scoped_ptrace_attach.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/linux/scoped_ptrace_attach.h b/extern/crashpad/crashpad/util/linux/scoped_ptrace_attach.h
index e38464ae9c..7fea6571c0 100644
--- a/extern/crashpad/crashpad/util/linux/scoped_ptrace_attach.h
+++ b/extern/crashpad/crashpad/util/linux/scoped_ptrace_attach.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 
 #include <sys/types.h>
 
-
 namespace crashpad {
 
 //! \brief Attaches to the process with process ID \a pid and blocks until the
@@ -35,7 +34,7 @@ bool PtraceAttach(pid_t pid, bool can_log = true);
 //! \param pid The process ID of the process to detach.
 //! \param can_log Whether this function may log messages on failure.
 //! \return `true` on success. `false` on failure with a message logged if \a
-//!     ca_log is `true `true`
+//!     can_log is `true`.
 bool PtraceDetach(pid_t pid, bool can_log = true);
 
 //! \brief Maintains a `ptrace()` attachment to a process.
diff --git a/extern/crashpad/crashpad/util/linux/scoped_ptrace_attach_test.cc b/extern/crashpad/crashpad/util/linux/scoped_ptrace_attach_test.cc
index b22c5aecac..1576186414 100644
--- a/extern/crashpad/crashpad/util/linux/scoped_ptrace_attach_test.cc
+++ b/extern/crashpad/crashpad/util/linux/scoped_ptrace_attach_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/linux/socket.cc b/extern/crashpad/crashpad/util/linux/socket.cc
index 868cee4a3b..bad5056f9f 100644
--- a/extern/crashpad/crashpad/util/linux/socket.cc
+++ b/extern/crashpad/crashpad/util/linux/socket.cc
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/linux/socket.h b/extern/crashpad/crashpad/util/linux/socket.h
index f232778d77..4bde25c814 100644
--- a/extern/crashpad/crashpad/util/linux/socket.h
+++ b/extern/crashpad/crashpad/util/linux/socket.h
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/linux/socket_test.cc b/extern/crashpad/crashpad/util/linux/socket_test.cc
index 284953f67d..8e75318f97 100644
--- a/extern/crashpad/crashpad/util/linux/socket_test.cc
+++ b/extern/crashpad/crashpad/util/linux/socket_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -124,7 +124,7 @@ TEST(Socket, RecvClosesFileDescriptors) {
   for (size_t index = 0; index < UnixCredentialSocket::kMaxSendRecvMsgFDs;
        ++index) {
     recv_fds[index].reset();
-    char c;
+    char c = 0;
     EXPECT_EQ(
         HANDLE_EINTR(send(send_fds[index].get(), &c, sizeof(c), MSG_NOSIGNAL)),
         -1);
diff --git a/extern/crashpad/crashpad/util/linux/thread_info.cc b/extern/crashpad/crashpad/util/linux/thread_info.cc
index ec84f53604..4cff830c73 100644
--- a/extern/crashpad/crashpad/util/linux/thread_info.cc
+++ b/extern/crashpad/crashpad/util/linux/thread_info.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,13 +19,13 @@
 namespace crashpad {
 
 ThreadContext::ThreadContext() {
-  memset(this, 0, sizeof(*this));
+  memset(static_cast<void*>(this), 0, sizeof(*this));
 }
 
 ThreadContext::~ThreadContext() {}
 
 FloatContext::FloatContext() {
-  memset(this, 0, sizeof(*this));
+  memset(static_cast<void*>(this), 0, sizeof(*this));
 }
 
 FloatContext::~FloatContext() {}
diff --git a/extern/crashpad/crashpad/util/linux/thread_info.h b/extern/crashpad/crashpad/util/linux/thread_info.h
index 5b55c24a76..808b35a3af 100644
--- a/extern/crashpad/crashpad/util/linux/thread_info.h
+++ b/extern/crashpad/crashpad/util/linux/thread_info.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
 #ifndef CRASHPAD_UTIL_LINUX_THREAD_INFO_H_
 #define CRASHPAD_UTIL_LINUX_THREAD_INFO_H_
 
+#include <features.h>
 #include <stdint.h>
 #include <sys/user.h>
 
@@ -24,10 +25,15 @@
 #include "util/linux/address_types.h"
 #include "util/numeric/int128.h"
 
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
 #include <android/api-level.h>
 #endif
 
+// x86_64 has compilation errors if asm/ptrace.h is #included.
+#if defined(ARCH_CPU_RISCV64)
+#include <asm/ptrace.h>
+#endif
+
 namespace crashpad {
 
 //! \brief The set of general purpose registers for an architecture family.
@@ -79,6 +85,8 @@ union ThreadContext {
     uint32_t cp0_status;
     uint32_t cp0_cause;
     uint32_t padding1_;
+#elif defined(ARCH_CPU_RISCV64)
+    // 32 bit RISC-V not supported
 #else
 #error Port.
 #endif  // ARCH_CPU_X86_FAMILY
@@ -132,12 +140,17 @@ union ThreadContext {
     uint64_t cp0_badvaddr;
     uint64_t cp0_status;
     uint64_t cp0_cause;
+#elif defined(ARCH_CPU_RISCV64)
+    // Reflects user_regs_struct in asm/ptrace.h.
+    uint64_t pc;
+    uint64_t regs[31];
 #else
 #error Port.
 #endif  // ARCH_CPU_X86_FAMILY
   } t64;
 
-#if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM64)
+#if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM64) || \
+    defined(ARCH_CPU_RISCV64)
   using NativeThreadContext = user_regs_struct;
 #elif defined(ARCH_CPU_ARMEL)
   using NativeThreadContext = user_regs;
@@ -145,7 +158,7 @@ union ThreadContext {
 // No appropriate NativeThreadsContext type available for MIPS
 #else
 #error Port.
-#endif  // ARCH_CPU_X86_FAMILY || ARCH_CPU_ARM64
+#endif  // ARCH_CPU_X86_FAMILY || ARCH_CPU_ARM64 || ARCH_CPU_RISCV64
 
 #if !defined(ARCH_CPU_MIPS_FAMILY)
 #if defined(ARCH_CPU_32_BITS)
@@ -218,6 +231,8 @@ union FloatContext {
     } fpregs[32];
     uint32_t fpcsr;
     uint32_t fpu_id;
+#elif defined(ARCH_CPU_RISCV64)
+    // 32 bit RISC-V not supported
 #else
 #error Port.
 #endif  // ARCH_CPU_X86_FAMILY
@@ -252,6 +267,10 @@ union FloatContext {
     double fpregs[32];
     uint32_t fpcsr;
     uint32_t fpu_id;
+#elif defined(ARCH_CPU_RISCV64)
+    // Reflects __riscv_d_ext_state in asm/ptrace.h
+    uint64_t fpregs[32];
+    uint64_t fcsr;
 #else
 #error Port.
 #endif  // ARCH_CPU_X86_FAMILY
@@ -261,11 +280,12 @@ union FloatContext {
 // __ANDROID_API_N__ is a proxy for determining whether unified headers are in
 // use. It’s only defined by unified headers. Unified headers call this
 // structure user_fpxregs_struct regardless of API level.
-#if defined(OS_ANDROID) && __ANDROID_API__ <= 19 && !defined(__ANDROID_API_N__)
+#if BUILDFLAG(IS_ANDROID) && __ANDROID_API__ <= 19 && \
+    !defined(__ANDROID_API_N__)
   using NativeFpxregs = user_fxsr_struct;
 #else
   using NativeFpxregs = user_fpxregs_struct;
-#endif  // OS_ANDROID
+#endif  // BUILDFLAG(IS_ANDROID)
   static_assert(sizeof(f32_t::fxsave) == sizeof(NativeFpxregs),
                 "Size mismatch");
 #elif defined(ARCH_CPU_X86_64)
@@ -273,13 +293,15 @@ union FloatContext {
                 "Size mismatch");
 #elif defined(ARCH_CPU_ARMEL)
   static_assert(sizeof(f32_t::fpregs) == sizeof(user_fpregs), "Size mismatch");
-#if !defined(__GLIBC__)
+#if defined(__BIONIC__)
   static_assert(sizeof(f32_t::vfp) == sizeof(user_vfp), "Size mismatch");
 #endif
 #elif defined(ARCH_CPU_ARM64)
   static_assert(sizeof(f64) == sizeof(user_fpsimd_struct), "Size mismatch");
 #elif defined(ARCH_CPU_MIPS_FAMILY)
 // No appropriate floating point context native type for available MIPS.
+#elif defined(ARCH_CPU_RISCV64)
+  static_assert(sizeof(f64) == sizeof(__riscv_d_ext_state), "Size mismatch");
 #else
 #error Port.
 #endif  // ARCH_CPU_X86
diff --git a/extern/crashpad/crashpad/util/linux/traits.h b/extern/crashpad/crashpad/util/linux/traits.h
index dc5463d8c6..2d09240a77 100644
--- a/extern/crashpad/crashpad/util/linux/traits.h
+++ b/extern/crashpad/crashpad/util/linux/traits.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/mac/checked_mach_address_range.h b/extern/crashpad/crashpad/util/mac/checked_mach_address_range.h
index e64e3d1ec7..ced8fa4edf 100644
--- a/extern/crashpad/crashpad/util/mac/checked_mach_address_range.h
+++ b/extern/crashpad/crashpad/util/mac/checked_mach_address_range.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/mac/checked_mach_address_range_test.cc b/extern/crashpad/crashpad/util/mac/checked_mach_address_range_test.cc
index 4ef26fd923..f7a3fbbf44 100644
--- a/extern/crashpad/crashpad/util/mac/checked_mach_address_range_test.cc
+++ b/extern/crashpad/crashpad/util/mac/checked_mach_address_range_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,9 +17,9 @@
 #include <mach/mach.h>
 #include <sys/types.h>
 
+#include <iterator>
 #include <limits>
 
-#include "base/cxx17_backports.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"
@@ -116,7 +116,7 @@ TEST(CheckedMachAddressRange, IsValid) {
       {0xffffffffffffffff, 1, kInvalid},
   };
 
-  for (size_t index = 0; index < base::size(kTestData); ++index) {
+  for (size_t index = 0; index < std::size(kTestData); ++index) {
     const auto& testcase = kTestData[index];
     SCOPED_TRACE(base::StringPrintf("index %zu, base 0x%llx, size 0x%llx",
                                     index,
@@ -166,7 +166,7 @@ TEST(CheckedMachAddressRange, ContainsValue) {
   CheckedMachAddressRange parent_range_32(false, 0x2000, 0x1000);
   ASSERT_TRUE(parent_range_32.IsValid());
 
-  for (size_t index = 0; index < base::size(kTestData); ++index) {
+  for (size_t index = 0; index < std::size(kTestData); ++index) {
     const auto& testcase = kTestData[index];
     SCOPED_TRACE(
         base::StringPrintf("index %zu, value 0x%llx", index, testcase.value));
@@ -223,7 +223,7 @@ TEST(CheckedMachAddressRange, ContainsRange) {
   CheckedMachAddressRange parent_range_32(false, 0x2000, 0x1000);
   ASSERT_TRUE(parent_range_32.IsValid());
 
-  for (size_t index = 0; index < base::size(kTestData); ++index) {
+  for (size_t index = 0; index < std::size(kTestData); ++index) {
     const auto& testcase = kTestData[index];
     SCOPED_TRACE(base::StringPrintf("index %zu, base 0x%llx, size 0x%llx",
                                     index,
diff --git a/extern/crashpad/crashpad/util/mac/launchd.h b/extern/crashpad/crashpad/util/mac/launchd.h
index 21b43f8d00..471ff6f89e 100644
--- a/extern/crashpad/crashpad/util/mac/launchd.h
+++ b/extern/crashpad/crashpad/util/mac/launchd.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/mac/launchd.mm b/extern/crashpad/crashpad/util/mac/launchd.mm
index 37748eea5f..e2ced32deb 100644
--- a/extern/crashpad/crashpad/util/mac/launchd.mm
+++ b/extern/crashpad/crashpad/util/mac/launchd.mm
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,9 +16,10 @@
 
 #import <Foundation/Foundation.h>
 
-#include "base/mac/foundation_util.h"
+#include "base/apple/bridging.h"
+#include "base/apple/foundation_util.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/mac/scoped_launch_data.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/strings/sys_string_conversions.h"
 #include "util/misc/implicit_cast.h"
 
@@ -34,8 +35,8 @@ launch_data_t CFPropertyToLaunchData(CFPropertyListRef property_cf) {
     CFTypeID type_id_cf = CFGetTypeID(property_cf);
 
     if (type_id_cf == CFDictionaryGetTypeID()) {
-      NSDictionary* dictionary_ns = base::mac::CFToNSCast(
-          base::mac::CFCastStrict<CFDictionaryRef>(property_cf));
+      NSDictionary* dictionary_ns = base::apple::CFToNSPtrCast(
+          base::apple::CFCastStrict<CFDictionaryRef>(property_cf));
       base::mac::ScopedLaunchData dictionary_launch(
           LaunchDataAlloc(LAUNCH_DATA_DICTIONARY));
 
@@ -45,7 +46,7 @@ launch_data_t CFPropertyToLaunchData(CFPropertyListRef property_cf) {
         }
 
         CFPropertyListRef value_cf =
-            implicit_cast<CFPropertyListRef>(dictionary_ns[key]);
+            (__bridge CFPropertyListRef)dictionary_ns[key];
         launch_data_t value_launch = CFPropertyToLaunchData(value_cf);
         if (!value_launch) {
           return nullptr;
@@ -58,15 +59,14 @@ launch_data_t CFPropertyToLaunchData(CFPropertyListRef property_cf) {
       data_launch = dictionary_launch.release();
 
     } else if (type_id_cf == CFArrayGetTypeID()) {
-      NSArray* array_ns = base::mac::CFToNSCast(
-          base::mac::CFCastStrict<CFArrayRef>(property_cf));
+      NSArray* array_ns = base::apple::CFToNSPtrCast(
+          base::apple::CFCastStrict<CFArrayRef>(property_cf));
       base::mac::ScopedLaunchData array_launch(
           LaunchDataAlloc(LAUNCH_DATA_ARRAY));
       size_t index = 0;
 
       for (id element_ns in array_ns) {
-        CFPropertyListRef element_cf =
-            implicit_cast<CFPropertyListRef>(element_ns);
+        CFPropertyListRef element_cf = (__bridge CFPropertyListRef)element_ns;
         launch_data_t element_launch = CFPropertyToLaunchData(element_cf);
         if (!element_launch) {
           return nullptr;
@@ -78,8 +78,9 @@ launch_data_t CFPropertyToLaunchData(CFPropertyListRef property_cf) {
       data_launch = array_launch.release();
 
     } else if (type_id_cf == CFNumberGetTypeID()) {
-      CFNumberRef number_cf = base::mac::CFCastStrict<CFNumberRef>(property_cf);
-      NSNumber* number_ns = base::mac::CFToNSCast(number_cf);
+      CFNumberRef number_cf =
+          base::apple::CFCastStrict<CFNumberRef>(property_cf);
+      NSNumber* number_ns = base::apple::CFToNSPtrCast(number_cf);
       switch (CFNumberGetType(number_cf)) {
         case kCFNumberSInt8Type:
         case kCFNumberSInt16Type:
@@ -109,12 +110,12 @@ launch_data_t CFPropertyToLaunchData(CFPropertyListRef property_cf) {
 
     } else if (type_id_cf == CFBooleanGetTypeID()) {
       CFBooleanRef boolean_cf =
-          base::mac::CFCastStrict<CFBooleanRef>(property_cf);
+          base::apple::CFCastStrict<CFBooleanRef>(property_cf);
       data_launch = LaunchDataNewBool(CFBooleanGetValue(boolean_cf));
 
     } else if (type_id_cf == CFStringGetTypeID()) {
-      NSString* string_ns = base::mac::CFToNSCast(
-          base::mac::CFCastStrict<CFStringRef>(property_cf));
+      NSString* string_ns = base::apple::CFToNSPtrCast(
+          base::apple::CFCastStrict<CFStringRef>(property_cf));
 
       // -fileSystemRepresentation might be more correct than -UTF8String,
       // because these strings can hold paths. The analogous function in
@@ -125,14 +126,14 @@ launch_data_t CFPropertyToLaunchData(CFPropertyListRef property_cf) {
       data_launch = LaunchDataNewString([string_ns UTF8String]);
 
     } else if (type_id_cf == CFDataGetTypeID()) {
-      NSData* data_ns = base::mac::CFToNSCast(
-          base::mac::CFCastStrict<CFDataRef>(property_cf));
+      NSData* data_ns = base::apple::CFToNSPtrCast(
+          base::apple::CFCastStrict<CFDataRef>(property_cf));
       data_launch = LaunchDataNewOpaque([data_ns bytes], [data_ns length]);
     } else {
-      base::ScopedCFTypeRef<CFStringRef> type_name_cf(
+      base::apple::ScopedCFTypeRef<CFStringRef> type_name_cf(
           CFCopyTypeIDDescription(type_id_cf));
       DLOG(ERROR) << "unable to convert CFTypeID " << type_id_cf << " ("
-                  << base::SysCFStringRefToUTF8(type_name_cf) << ")";
+                  << base::SysCFStringRefToUTF8(type_name_cf.get()) << ")";
     }
 
     return data_launch;
diff --git a/extern/crashpad/crashpad/util/mac/launchd_test.mm b/extern/crashpad/crashpad/util/mac/launchd_test.mm
index 2e49ee665b..27e0bdeaf0 100644
--- a/extern/crashpad/crashpad/util/mac/launchd_test.mm
+++ b/extern/crashpad/crashpad/util/mac/launchd_test.mm
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,9 +20,10 @@
 #include <string.h>
 
 #include <cmath>
+#include <iterator>
 #include <limits>
 
-#include "base/cxx17_backports.h"
+#include "base/apple/bridging.h"
 #include "base/mac/scoped_launch_data.h"
 #include "gtest/gtest.h"
 #include "util/stdlib/objc.h"
@@ -58,9 +59,10 @@
       @0xfedcba9876543210,
     };
 
-    for (size_t index = 0; index < base::size(integer_nses); ++index) {
+    for (size_t index = 0; index < std::size(integer_nses); ++index) {
       NSNumber* integer_ns = integer_nses[index];
-      launch_data.reset(CFPropertyToLaunchData(integer_ns));
+      launch_data.reset(
+          CFPropertyToLaunchData(base::apple::NSToCFPtrCast(integer_ns)));
       ASSERT_TRUE(launch_data.get());
       ASSERT_EQ(LaunchDataGetType(launch_data.get()), LAUNCH_DATA_INTEGER);
       EXPECT_EQ(LaunchDataGetInteger(launch_data.get()),
@@ -88,9 +90,10 @@
       @(std::numeric_limits<double>::signaling_NaN()),
     };
 
-    for (size_t index = 0; index < base::size(double_nses); ++index) {
+    for (size_t index = 0; index < std::size(double_nses); ++index) {
       NSNumber* double_ns = double_nses[index];
-      launch_data.reset(CFPropertyToLaunchData(double_ns));
+      launch_data.reset(
+          CFPropertyToLaunchData(base::apple::NSToCFPtrCast(double_ns)));
       ASSERT_TRUE(launch_data.get());
       ASSERT_EQ(LaunchDataGetType(launch_data.get()), LAUNCH_DATA_REAL);
       double expected_double_value = [double_ns doubleValue];
@@ -109,17 +112,19 @@
   @autoreleasepool {
     base::mac::ScopedLaunchData launch_data;
 
-    NSNumber* bool_nses[] = {
-      @NO,
-      @YES,
+    // Use CFBooleanRefs here because calling NSToCFPtrCast on an NSNumber
+    // boolean can fail. Casting an NSNumber expects a CFNumberRef as a result
+    // but a cast boolean will end up as a CFBooleanRef.
+    CFBooleanRef bools[] = {
+        kCFBooleanFalse,
+        kCFBooleanTrue,
     };
 
-    for (size_t index = 0; index < base::size(bool_nses); ++index) {
-      NSNumber* bool_ns = bool_nses[index];
-      launch_data.reset(CFPropertyToLaunchData(bool_ns));
+    for (CFBooleanRef bool_cf : bools) {
+      launch_data.reset(CFPropertyToLaunchData(bool_cf));
       ASSERT_TRUE(launch_data.get());
       ASSERT_EQ(LaunchDataGetType(launch_data.get()), LAUNCH_DATA_BOOL);
-      if ([bool_ns boolValue]) {
+      if (CFBooleanGetValue(bool_cf)) {
         EXPECT_TRUE(LaunchDataGetBool(launch_data.get()));
       } else {
         EXPECT_FALSE(LaunchDataGetBool(launch_data.get()));
@@ -138,9 +143,10 @@
       @"Üñîçø∂é",
     };
 
-    for (size_t index = 0; index < base::size(string_nses); ++index) {
+    for (size_t index = 0; index < std::size(string_nses); ++index) {
       NSString* string_ns = string_nses[index];
-      launch_data.reset(CFPropertyToLaunchData(string_ns));
+      launch_data.reset(
+          CFPropertyToLaunchData(base::apple::NSToCFPtrCast(string_ns)));
       ASSERT_TRUE(launch_data.get());
       ASSERT_EQ(LaunchDataGetType(launch_data.get()), LAUNCH_DATA_STRING);
       EXPECT_STREQ([string_ns UTF8String],
@@ -156,7 +162,8 @@
     static constexpr uint8_t data_c[] = {
         1, 2, 3, 4, 5, 6, 7, 8, 0, 0, 0, 0, 0, 0, 0, 0, 9, 8, 7, 6, 5, 4, 3, 2};
     NSData* data_ns = [NSData dataWithBytes:data_c length:sizeof(data_c)];
-    launch_data.reset(CFPropertyToLaunchData(data_ns));
+    launch_data.reset(
+        CFPropertyToLaunchData(base::apple::NSToCFPtrCast(data_ns)));
     ASSERT_TRUE(launch_data.get());
     ASSERT_EQ(LaunchDataGetType(launch_data.get()), LAUNCH_DATA_OPAQUE);
     EXPECT_EQ(LaunchDataGetOpaqueSize(launch_data.get()), sizeof(data_c));
@@ -174,7 +181,8 @@
       @"key" : @"value",
     };
 
-    launch_data.reset(CFPropertyToLaunchData(dictionary_ns));
+    launch_data.reset(
+        CFPropertyToLaunchData(base::apple::NSToCFPtrCast(dictionary_ns)));
     ASSERT_TRUE(launch_data.get());
     ASSERT_EQ(LaunchDataGetType(launch_data.get()), LAUNCH_DATA_DICTIONARY);
     EXPECT_EQ(LaunchDataDictGetCount(launch_data.get()), [dictionary_ns count]);
@@ -193,7 +201,8 @@
 
     NSArray* array_ns = @[ @"element_1", @"element_2", ];
 
-    launch_data.reset(CFPropertyToLaunchData(array_ns));
+    launch_data.reset(
+        CFPropertyToLaunchData(base::apple::NSToCFPtrCast(array_ns)));
     ASSERT_TRUE(launch_data.get());
     ASSERT_EQ(LaunchDataGetType(launch_data.get()), LAUNCH_DATA_ARRAY);
     EXPECT_EQ(LaunchDataArrayGetCount(launch_data.get()), [array_ns count]);
@@ -219,18 +228,20 @@
     base::mac::ScopedLaunchData launch_data;
 
     NSDate* date = [NSDate date];
-    launch_data.reset(CFPropertyToLaunchData(date));
+    launch_data.reset(CFPropertyToLaunchData(base::apple::NSToCFPtrCast(date)));
     EXPECT_FALSE(launch_data.get());
 
     NSDictionary* date_dictionary = @{
       @"key" : @"value",
       @"date" : date,
     };
-    launch_data.reset(CFPropertyToLaunchData(date_dictionary));
+    launch_data.reset(
+        CFPropertyToLaunchData(base::apple::NSToCFPtrCast(date_dictionary)));
     EXPECT_FALSE(launch_data.get());
 
     NSArray* date_array = @[ @"string_1", date, @"string_2", ];
-    launch_data.reset(CFPropertyToLaunchData(date_array));
+    launch_data.reset(
+        CFPropertyToLaunchData(base::apple::NSToCFPtrCast(date_array)));
     EXPECT_FALSE(launch_data.get());
   }
 }
@@ -249,7 +260,8 @@
       },
     };
 
-    launch_data.reset(CFPropertyToLaunchData(job_dictionary));
+    launch_data.reset(
+        CFPropertyToLaunchData(base::apple::NSToCFPtrCast(job_dictionary)));
     ASSERT_TRUE(launch_data.get());
     ASSERT_EQ(LaunchDataGetType(launch_data.get()), LAUNCH_DATA_DICTIONARY);
     EXPECT_EQ(LaunchDataDictGetCount(launch_data.get()), 4u);
diff --git a/extern/crashpad/crashpad/util/mac/mac_util.cc b/extern/crashpad/crashpad/util/mac/mac_util.cc
index 10e7aad1a7..6b2666c881 100644
--- a/extern/crashpad/crashpad/util/mac/mac_util.cc
+++ b/extern/crashpad/crashpad/util/mac/mac_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,21 +14,18 @@
 
 #include "util/mac/mac_util.h"
 
-#include <Availability.h>
 #include <CoreFoundation/CoreFoundation.h>
 #include <IOKit/IOKitLib.h>
-#include <string.h>
 #include <sys/types.h>
-#include <sys/utsname.h>
 
+#include <string_view>
+
+#include "base/apple/foundation_util.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/check_op.h"
 #include "base/logging.h"
-#include "base/mac/foundation_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_ioobject.h"
-#include "base/notreached.h"
 #include "base/strings/string_number_conversions.h"
-#include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "build/build_config.h"
@@ -45,7 +42,6 @@ extern "C" {
 // TryCFCopy*VersionDictionary() helpers to account for the possibility that
 // they may not be present at runtime.
 CFDictionaryRef _CFCopySystemVersionDictionary() WEAK_IMPORT;
-CFDictionaryRef _CFCopyServerVersionDictionary() WEAK_IMPORT;
 
 // Don’t use these constants with CFDictionaryGetValue() directly, use them with
 // the TryCFDictionaryGetValue() wrapper to account for the possibility that
@@ -61,45 +57,6 @@ extern const CFStringRef _kCFSystemVersionBuildVersionKey WEAK_IMPORT;
 
 namespace {
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_13_4
-// Returns the running system’s Darwin major version. Don’t call this, it’s an
-// implementation detail and its result is meant to be cached by
-// MacOSVersionNumber().
-//
-// This is very similar to Chromium’s base/mac/mac_util.mm
-// DarwinMajorVersionInternal().
-int DarwinMajorVersion() {
-  // base::OperatingSystemVersionNumbers calls Gestalt(), which is a
-  // higher-level function than is needed. It might perform unnecessary
-  // operations. On 10.6, it was observed to be able to spawn threads (see
-  // https://crbug.com/53200). It might also read files or perform other
-  // blocking operations. Actually, nobody really knows for sure just what
-  // Gestalt() might do, or what it might be taught to do in the future.
-  //
-  // uname(), on the other hand, is implemented as a simple series of sysctl()
-  // system calls to obtain the relevant data from the kernel. The data is
-  // compiled right into the kernel, so no threads or blocking or other funny
-  // business is necessary.
-
-  utsname uname_info;
-  int rv = uname(&uname_info);
-  PCHECK(rv == 0) << "uname";
-
-  DCHECK_EQ(strcmp(uname_info.sysname, "Darwin"), 0) << "unexpected sysname "
-                                                     << uname_info.sysname;
-
-  char* dot = strchr(uname_info.release, '.');
-  CHECK(dot);
-
-  int darwin_major_version = 0;
-  CHECK(base::StringToInt(
-      base::StringPiece(uname_info.release, dot - uname_info.release),
-      &darwin_major_version));
-
-  return darwin_major_version;
-}
-#endif  // DT < 10.13.4
-
 // Helpers for the weak-imported private CoreFoundation internals.
 
 CFDictionaryRef TryCFCopySystemVersionDictionary() {
@@ -109,13 +66,6 @@ CFDictionaryRef TryCFCopySystemVersionDictionary() {
   return nullptr;
 }
 
-CFDictionaryRef TryCFCopyServerVersionDictionary() {
-  if (_CFCopyServerVersionDictionary) {
-    return _CFCopyServerVersionDictionary();
-  }
-  return nullptr;
-}
-
 const void* TryCFDictionaryGetValue(CFDictionaryRef dictionary,
                                     const void* value) {
   if (value) {
@@ -139,7 +89,7 @@ bool StringToVersionNumbers(const std::string& version,
     LOG(ERROR) << "version has unexpected format";
     return false;
   }
-  if (!base::StringToInt(base::StringPiece(&version[0], first_dot), major)) {
+  if (!base::StringToInt(std::string_view(&version[0], first_dot), major)) {
     LOG(ERROR) << "version has unexpected format";
     return false;
   }
@@ -152,9 +102,9 @@ bool StringToVersionNumbers(const std::string& version,
     second_dot = version.length();
   }
 
-  if (!base::StringToInt(base::StringPiece(&version[first_dot + 1],
-                                           second_dot - first_dot - 1),
-                         minor)) {
+  if (!base::StringToInt(
+          std::string_view(&version[first_dot + 1], second_dot - first_dot - 1),
+          minor)) {
     LOG(ERROR) << "version has unexpected format";
     return false;
   }
@@ -162,8 +112,8 @@ bool StringToVersionNumbers(const std::string& version,
   if (second_dot == version.length()) {
     *bugfix = 0;
   } else if (!base::StringToInt(
-                 base::StringPiece(&version[second_dot + 1],
-                                   version.length() - second_dot - 1),
+                 std::string_view(&version[second_dot + 1],
+                                  version.length() - second_dot - 1),
                  bugfix)) {
     LOG(ERROR) << "version has unexpected format";
     return false;
@@ -174,9 +124,9 @@ bool StringToVersionNumbers(const std::string& version,
 
 std::string IORegistryEntryDataPropertyAsString(io_registry_entry_t entry,
                                                 CFStringRef key) {
-  base::ScopedCFTypeRef<CFTypeRef> property(
+  base::apple::ScopedCFTypeRef<CFTypeRef> property(
       IORegistryEntryCreateCFProperty(entry, key, kCFAllocatorDefault, 0));
-  CFDataRef data = base::mac::CFCast<CFDataRef>(property);
+  CFDataRef data = base::apple::CFCast<CFDataRef>(property.get());
   if (data && CFDataGetLength(data) > 0) {
     return reinterpret_cast<const char*>(CFDataGetBytePtr(data));
   }
@@ -194,45 +144,24 @@ int MacOSVersionNumber() {
     // version from the kernel without having to open any files or spin up any
     // threads, but it’s only available in macOS 10.13.4 and later.
     std::string macos_version_number_string = ReadStringSysctlByName(
-        "kern.osproductversion",
-        __MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_13_4);
-    if (!macos_version_number_string.empty()) {
-      int major;
-      int minor;
-      int bugfix;
-      if (StringToVersionNumbers(
-              macos_version_number_string, &major, &minor, &bugfix)) {
-        DCHECK_GE(major, 10);
-        DCHECK_LE(major, 99);
-        DCHECK_GE(minor, 0);
-        DCHECK_LE(minor, 99);
-        DCHECK_GE(bugfix, 0);
-        DCHECK_LE(bugfix, 99);
-        return major * 1'00'00 + minor * 1'00 + bugfix;
-      }
-    }
-
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_13_4
-    // On macOS 10.13.4 and later, the sysctlbyname above should have been
-    // successful.
-    NOTREACHED();
-    return -1;
-#else  // DT >= 10.13.4
-    // The Darwin major version is always 4 greater than the macOS minor version
-    // for Darwin versions beginning with 6, corresponding to Mac OS X 10.2,
-    // through Darwin 19, corresponding to macOS 10.15.
-    int darwin_major_version = DarwinMajorVersion();
-    DCHECK_GE(darwin_major_version, 6);
-    DCHECK_LE(darwin_major_version, 19);
-
-    int macos_version_number = 10'00'00 + (darwin_major_version - 4) * 1'00;
-
-    // On macOS 10.13.4 and later, the sysctlbyname above should have been
-    // successful.
-    DCHECK_LT(macos_version_number, 10'13'04);
-
-    return macos_version_number;
-#endif  // DT >= 10.13.4
+        "kern.osproductversion", true);
+    DCHECK(!macos_version_number_string.empty());
+
+    int major;
+    int minor;
+    int bugfix;
+    bool success = StringToVersionNumbers(
+            macos_version_number_string, &major, &minor, &bugfix);
+    DCHECK(success);
+
+    DCHECK_GE(major, 10);
+    DCHECK_LE(major, 99);
+    DCHECK_GE(minor, 0);
+    DCHECK_LE(minor, 99);
+    DCHECK_GE(bugfix, 0);
+    DCHECK_LE(bugfix, 99);
+
+    return major * 1'00'00 + minor * 1'00 + bugfix;
   }();
 
   return macos_version_number;
@@ -242,25 +171,19 @@ bool MacOSVersionComponents(int* major,
                             int* minor,
                             int* bugfix,
                             std::string* build,
-                            bool* server,
                             std::string* version_string) {
-  base::ScopedCFTypeRef<CFDictionaryRef> dictionary(
-      TryCFCopyServerVersionDictionary());
-  if (dictionary) {
-    *server = true;
-  } else {
-    dictionary.reset(TryCFCopySystemVersionDictionary());
-    if (!dictionary) {
-      LOG(ERROR) << "_CFCopySystemVersionDictionary failed";
-      return false;
-    }
-    *server = false;
+  base::apple::ScopedCFTypeRef<CFDictionaryRef> dictionary(
+      TryCFCopySystemVersionDictionary());
+  if (!dictionary) {
+    LOG(ERROR) << "_CFCopySystemVersionDictionary failed";
+    return false;
   }
 
   bool success = true;
 
-  CFStringRef version_cf = base::mac::CFCast<CFStringRef>(
-      TryCFDictionaryGetValue(dictionary, _kCFSystemVersionProductVersionKey));
+  CFStringRef version_cf =
+      base::apple::CFCast<CFStringRef>(TryCFDictionaryGetValue(
+          dictionary.get(), _kCFSystemVersionProductVersionKey));
   std::string version;
   if (!version_cf) {
     LOG(ERROR) << "version_cf not found";
@@ -279,8 +202,9 @@ bool MacOSVersionComponents(int* major,
     }
   }
 
-  CFStringRef build_cf = base::mac::CFCast<CFStringRef>(
-      TryCFDictionaryGetValue(dictionary, _kCFSystemVersionBuildVersionKey));
+  CFStringRef build_cf =
+      base::apple::CFCast<CFStringRef>(TryCFDictionaryGetValue(
+          dictionary.get(), _kCFSystemVersionBuildVersionKey));
   if (!build_cf) {
     LOG(ERROR) << "build_cf not found";
     success = false;
@@ -288,8 +212,9 @@ bool MacOSVersionComponents(int* major,
     build->assign(base::SysCFStringRefToUTF8(build_cf));
   }
 
-  CFStringRef product_cf = base::mac::CFCast<CFStringRef>(
-      TryCFDictionaryGetValue(dictionary, _kCFSystemVersionProductNameKey));
+  CFStringRef product_cf =
+      base::apple::CFCast<CFStringRef>(TryCFDictionaryGetValue(
+          dictionary.get(), _kCFSystemVersionProductNameKey));
   std::string product;
   if (!product_cf) {
     LOG(ERROR) << "product_cf not found";
@@ -299,8 +224,9 @@ bool MacOSVersionComponents(int* major,
   }
 
   // This key is not required, and in fact is normally not present.
-  CFStringRef extra_cf = base::mac::CFCast<CFStringRef>(TryCFDictionaryGetValue(
-      dictionary, _kCFSystemVersionProductVersionExtraKey));
+  CFStringRef extra_cf =
+      base::apple::CFCast<CFStringRef>(TryCFDictionaryGetValue(
+          dictionary.get(), _kCFSystemVersionProductVersionExtraKey));
   std::string extra;
   if (extra_cf) {
     extra = base::SysCFStringRefToUTF8(extra_cf);
@@ -324,22 +250,24 @@ bool MacOSVersionComponents(int* major,
 
 void MacModelAndBoard(std::string* model, std::string* board_id) {
   base::mac::ScopedIOObject<io_service_t> platform_expert(
-      IOServiceGetMatchingService(kIOMasterPortDefault,
+      IOServiceGetMatchingService(kIOMainPortDefault,
                                   IOServiceMatching("IOPlatformExpertDevice")));
   if (platform_expert) {
-    model->assign(
-        IORegistryEntryDataPropertyAsString(platform_expert, CFSTR("model")));
+    model->assign(IORegistryEntryDataPropertyAsString(platform_expert.get(),
+                                                      CFSTR("model")));
 #if defined(ARCH_CPU_X86_FAMILY)
-    CFStringRef kBoardProperty = CFSTR("board-id");
+    board_id->assign(IORegistryEntryDataPropertyAsString(platform_expert.get(),
+                                                         CFSTR("board-id")));
 #elif defined(ARCH_CPU_ARM64)
-    // TODO(https://crashpad.chromium.org/bug/352): When production arm64
-    // hardware is available, determine whether board-id works and switch to it
-    // if feasible, otherwise, determine whether target-type remains a viable
-    // alternative.
-    CFStringRef kBoardProperty = CFSTR("target-type");
+    board_id->assign(IORegistryEntryDataPropertyAsString(
+        platform_expert.get(), CFSTR("target-sub-type")));
+    if (board_id->empty()) {
+      board_id->assign(IORegistryEntryDataPropertyAsString(
+          platform_expert.get(), CFSTR("target-type")));
+    }
+#else
+#error Port.
 #endif
-    board_id->assign(IORegistryEntryDataPropertyAsString(platform_expert,
-                                                         kBoardProperty));
   } else {
     model->clear();
     board_id->clear();
diff --git a/extern/crashpad/crashpad/util/mac/mac_util.h b/extern/crashpad/crashpad/util/mac/mac_util.h
index c94e233251..16edcb2bbf 100644
--- a/extern/crashpad/crashpad/util/mac/mac_util.h
+++ b/extern/crashpad/crashpad/util/mac/mac_util.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,21 +21,17 @@ namespace crashpad {
 
 //! \brief Returns the version of the running operating system.
 //!
-//! \return The version of the operating system, such as `10'15'06` for macOS
-//!     10.15.6.
+//! \return The version of the operating system, such as `15'04'01` for macOS
+//!     15.4.1.
 //!
-//! The format of the return value matches what is used by the <Availability.h>
-//! `__MAC_OS_X_VERSION_MIN_REQUIRED`, `__MAC_OS_X_VERSION_MAX_ALLOWED`, and
-//! per-version `__MAC_*` macros, for versions since OS X 10.10.
+//! This function returns the major, minor, and bugfix components combined into
+//! a single number. The format of the return value matches what is used by the
+//! <Availability.h> `__MAC_OS_X_VERSION_MIN_REQUIRED`,
+//! `__MAC_OS_X_VERSION_MAX_ALLOWED`, and per-version `__MAC_*` macros, for
+//! versions since OS X 10.10.
 //!
-//! On macOS 10.13.4 and later, this function will return the major, minor, and
-//! bugfix components combined into a single number. On older OS versions, only
-//! the major and minor components will be returned, and the bugfix component
-//! will always be reported as 0. By contrast, MacOSVersionComponents() always
-//! returns the bugfix component.
-//!
-//! \note This is similar to the base::mac::IsOS*() family of functions, but
-//!     is provided for situations where the caller needs to obtain version
+//! \note This is similar to the base::mac::IsOS*() family of functions, but is
+//!     provided for situations where the caller needs to obtain version
 //!     information beyond what is provided by Chromium’s base, or for when the
 //!     caller needs the actual minor version value.
 int MacOSVersionNumber();
@@ -44,18 +40,17 @@ int MacOSVersionNumber();
 //!
 //! All parameters are required. No parameter may be `nullptr`.
 //!
-//! \param[out] major The major version of the operating system, such as `10`
-//!     for macOS 10.12.1.
-//! \param[out] minor The major version of the operating system, such as `12`
-//!     for macOS 10.12.1.
+//! \param[out] major The major version of the operating system, such as `15`
+//!     for macOS 15.4.1.
+//! \param[out] minor The major version of the operating system, such as `4`
+//!     for macOS 15.4.1.
 //! \param[out] bugfix The bugfix version of the operating system, such as `1`
-//!     for macOS 10.12.1.
-//! \param[out] build The operating system’s build string, such as `"16B2657"`
-//!     for macOS 10.12.1.
-//! \param[out] server `true` for a macOS Server installation, `false` otherwise
-//!     (for a desktop/laptop, client, or workstation system).
+//!     for macOS 15.4.1.
+//! \param[out] build The operating system’s build string, such as `"24E263"`
+//!     for macOS 15.4.1.
 //! \param[out] version_string A string representing the full operating system
-//!     version, such as `"macOS 10.12.1 (16B2657)"`.
+//!     version, such as `"macOS 15.4.1 (24E263)"`. If \a bugfix is 0, it will
+//!     not be included in \a version_string: `"macOS 15.5 (24F74)"`.
 //!
 //! \return `true` on success, `false` on failure, with an error message logged.
 //!     A failure is considered to have occurred if any element could not be
@@ -65,15 +60,17 @@ bool MacOSVersionComponents(int* major,
                             int* minor,
                             int* bugfix,
                             std::string* build,
-                            bool* server,
                             std::string* version_string);
 
 //! \brief Returns the model name and board ID of the running system.
 //!
-//! \param[out] model The system’s model name. A mid-2012 15" MacBook Pro would
-//!     report “MacBookPro10,1”.
-//! \param[out] board_id The system’s board ID. A mid-2012 15" MacBook Pro would
-//!     report “Mac-C3EC7CD22292981F”.
+//! \param[out] model The system’s model name. A mid-2012 15\" MacBook Pro would
+//!     report “MacBookPro10,1”, and a 2021 16\" M1 Max MacBook Pro would report
+//!     “MacBookPro18,2”.
+//! \param[out] board_id The system’s board ID or target type. An x86_64 system
+//!     reports a board ID: a mid-2012 15\" MacBook Pro would report
+//!     “Mac-C3EC7CD22292981F”. An arm64 system reports a target subtype or
+//!     target type: a 2021 16\" M1 Max MacBook Pro would report “J316cAP”.
 //!
 //! If a value cannot be determined, its string is cleared.
 void MacModelAndBoard(std::string* model, std::string* board_id);
diff --git a/extern/crashpad/crashpad/util/mac/mac_util_test.mm b/extern/crashpad/crashpad/util/mac/mac_util_test.mm
index aa188e3660..acf8a17631 100644
--- a/extern/crashpad/crashpad/util/mac/mac_util_test.mm
+++ b/extern/crashpad/crashpad/util/mac/mac_util_test.mm
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,21 +19,9 @@
 
 #include <string>
 
-#include "base/mac/scoped_nsobject.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 
-#ifdef __GLIBCXX__
-// When C++ exceptions are disabled, libstdc++ from GCC 4.2 defines |try| and
-// |catch| so as to allow exception-expecting C++ code to build properly when
-// language support for exceptions is not present. These macros interfere with
-// the use of |@try| and |@catch| in Objective-C files such as this one.
-// Undefine these macros here, after everything has been #included, since there
-// will be no C++ uses and only Objective-C uses from this point on.
-#undef try
-#undef catch
-#endif
-
 namespace crashpad {
 namespace test {
 namespace {
@@ -44,16 +32,15 @@
 // check for with ASSERT_NO_FATAL_FAILURE() or testing::Test::HasFatalFailure().
 void SwVers(NSString* argument, std::string* output) {
   @autoreleasepool {
-    base::scoped_nsobject<NSPipe> pipe([[NSPipe alloc] init]);
-    base::scoped_nsobject<NSTask> task([[NSTask alloc] init]);
+    NSPipe* pipe = [[NSPipe alloc] init];
+    NSTask* task = [[NSTask alloc] init];
     [task setStandardOutput:pipe];
     [task setLaunchPath:@"/usr/bin/sw_vers"];
     [task setArguments:@[ argument ]];
 
     @try {
       [task launch];
-    }
-    @catch (NSException* exception) {
+    } @catch (NSException* exception) {
       FAIL() << [[exception name] UTF8String] << ": "
              << [[exception reason] UTF8String];
     }
@@ -66,8 +53,11 @@ void SwVers(NSString* argument, std::string* output) {
 
     output->assign(reinterpret_cast<const char*>([data bytes]), [data length]);
 
-    EXPECT_EQ(output->at(output->size() - 1), '\n');
-    output->resize(output->size() - 1);
+    EXPECT_FALSE(output->empty());
+    if (!output->empty()) {
+      EXPECT_EQ(output->back(), '\n');
+      output->pop_back();
+    }
   }
 }
 
@@ -76,10 +66,9 @@ void SwVers(NSString* argument, std::string* output) {
   int minor;
   int bugfix;
   std::string build;
-  bool server;
   std::string version_string;
-  ASSERT_TRUE(MacOSVersionComponents(
-      &major, &minor, &bugfix, &build, &server, &version_string));
+  ASSERT_TRUE(
+      MacOSVersionComponents(&major, &minor, &bugfix, &build, &version_string));
 
   EXPECT_GE(major, 10);
   EXPECT_LE(major, 99);
@@ -88,11 +77,17 @@ void SwVers(NSString* argument, std::string* output) {
   EXPECT_GE(bugfix, 0);
   EXPECT_LE(bugfix, 99);
 
+  if (major == 10) {
+    EXPECT_LE(minor, 15);
+  } else {
+    EXPECT_TRUE(major <= 15 || major >= 26);
+  }
+
   std::string version;
   if (bugfix) {
     version = base::StringPrintf("%d.%d.%d", major, minor, bugfix);
   } else {
-    // 10.x.0 releases report their version string as simply 10.x.
+    // x.y.0 releases report their version string as simply x.y.
     version = base::StringPrintf("%d.%d", major, minor);
   }
 
@@ -110,9 +105,12 @@ void SwVers(NSString* argument, std::string* output) {
   std::string expected_product_name;
   ASSERT_NO_FATAL_FAILURE(SwVers(@"-productName", &expected_product_name));
 
-  // Look for a space after the product name in the complete version string.
-  expected_product_name += ' ';
-  EXPECT_EQ(version_string.find(expected_product_name), 0u);
+  std::string expected_version_string_start =
+      expected_product_name + ' ' + expected_product_version + ' ';
+  std::string expected_version_string_end = " (" + expected_build_version + ')';
+
+  EXPECT_TRUE(version_string.starts_with(expected_version_string_start));
+  EXPECT_TRUE(version_string.ends_with(expected_version_string_end));
 }
 
 TEST(MacUtil, MacOSVersionNumber) {
@@ -127,14 +125,11 @@ void SwVers(NSString* argument, std::string* output) {
   int minor;
   int bugfix;
   std::string build;
-  bool server;
   std::string version_string;
-  ASSERT_TRUE(MacOSVersionComponents(
-      &major, &minor, &bugfix, &build, &server, &version_string));
+  ASSERT_TRUE(
+      MacOSVersionComponents(&major, &minor, &bugfix, &build, &version_string));
 
-  EXPECT_EQ(macos_version_number,
-            major * 1'00'00 + minor * 1'00 +
-                (macos_version_number >= 10'13'04 ? bugfix : 0));
+  EXPECT_EQ(macos_version_number, major * 1'00'00 + minor * 1'00 + bugfix);
 }
 
 TEST(MacUtil, MacModelAndBoard) {
diff --git a/extern/crashpad/crashpad/util/mac/service_management.cc b/extern/crashpad/crashpad/util/mac/service_management.cc
index e1d45f3ce6..62ea63bbf4 100644
--- a/extern/crashpad/crashpad/util/mac/service_management.cc
+++ b/extern/crashpad/crashpad/util/mac/service_management.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/mac/service_management.h b/extern/crashpad/crashpad/util/mac/service_management.h
index 16cb45aaed..47eb211f6b 100644
--- a/extern/crashpad/crashpad/util/mac/service_management.h
+++ b/extern/crashpad/crashpad/util/mac/service_management.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/mac/service_management_test.mm b/extern/crashpad/crashpad/util/mac/service_management_test.mm
index 0bec3366f9..a48d201e64 100644
--- a/extern/crashpad/crashpad/util/mac/service_management_test.mm
+++ b/extern/crashpad/crashpad/util/mac/service_management_test.mm
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@
 #include <string>
 #include <vector>
 
-#include "base/mac/foundation_util.h"
-#include "base/mac/scoped_cftyperef.h"
+#include "base/apple/bridging.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "gtest/gtest.h"
@@ -56,7 +56,7 @@ void ExpectProcessIsRunning(pid_t pid, std::string& last_arg) {
         break;
       }
       if (inner_tries > 0) {
-        SleepNanoseconds(1E6);  // 1 millisecond
+        SleepNanoseconds(1E7);  // 10 milliseconds
       }
     } while (inner_tries--);
     ASSERT_TRUE(success);
@@ -120,11 +120,14 @@ void ExpectProcessIsNotRunning(pid_t pid, std::string& last_arg) {
     NSDictionary* job_dictionary_ns = @{
       @LAUNCH_JOBKEY_LABEL : @"org.chromium.crashpad.test.service_management",
       @LAUNCH_JOBKEY_RUNATLOAD : @YES,
-      @LAUNCH_JOBKEY_PROGRAMARGUMENTS :
-          @[ @"/bin/sh", @"-c", shell_script_ns, ],
+      @LAUNCH_JOBKEY_PROGRAMARGUMENTS : @[
+        @"/bin/sh",
+        @"-c",
+        shell_script_ns,
+      ],
     };
     CFDictionaryRef job_dictionary_cf =
-        base::mac::NSToCFCast(job_dictionary_ns);
+        base::apple::NSToCFPtrCast(job_dictionary_ns);
 
     // The job may be left over from a failed previous run.
     if (ServiceManagementIsJobLoaded(kJobLabel)) {
diff --git a/extern/crashpad/crashpad/util/mac/sysctl.cc b/extern/crashpad/crashpad/util/mac/sysctl.cc
index c364352c45..1327d42340 100644
--- a/extern/crashpad/crashpad/util/mac/sysctl.cc
+++ b/extern/crashpad/crashpad/util/mac/sysctl.cc
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/mac/sysctl.h b/extern/crashpad/crashpad/util/mac/sysctl.h
index cc74704f29..cd95fa4aeb 100644
--- a/extern/crashpad/crashpad/util/mac/sysctl.h
+++ b/extern/crashpad/crashpad/util/mac/sysctl.h
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/mac/sysctl_test.cc b/extern/crashpad/crashpad/util/mac/sysctl_test.cc
index 5aafef169e..ac86310766 100644
--- a/extern/crashpad/crashpad/util/mac/sysctl_test.cc
+++ b/extern/crashpad/crashpad/util/mac/sysctl_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/mac/xattr.cc b/extern/crashpad/crashpad/util/mac/xattr.cc
index c63fc87c03..a5c57eb1a3 100644
--- a/extern/crashpad/crashpad/util/mac/xattr.cc
+++ b/extern/crashpad/crashpad/util/mac/xattr.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,6 +19,9 @@
 #include <sys/types.h>
 #include <sys/xattr.h>
 
+#include <string_view>
+
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/string_number_conversions.h"
@@ -27,7 +30,7 @@
 namespace crashpad {
 
 XattrStatus ReadXattr(const base::FilePath& file,
-                      const base::StringPiece& name,
+                      std::string_view name,
                       std::string* value) {
   // First get the size of the attribute value.
   ssize_t buffer_size = getxattr(file.value().c_str(), name.data(), nullptr,
@@ -56,7 +59,7 @@ XattrStatus ReadXattr(const base::FilePath& file,
 }
 
 bool WriteXattr(const base::FilePath& file,
-                const base::StringPiece& name,
+                std::string_view name,
                 const std::string& value) {
   int rv = setxattr(file.value().c_str(), name.data(), value.c_str(),
       value.length(), 0, 0);
@@ -66,7 +69,7 @@ bool WriteXattr(const base::FilePath& file,
 }
 
 XattrStatus ReadXattrBool(const base::FilePath& file,
-                          const base::StringPiece& name,
+                          std::string_view name,
                           bool* value) {
   std::string tmp;
   XattrStatus status;
@@ -86,13 +89,13 @@ XattrStatus ReadXattrBool(const base::FilePath& file,
 }
 
 bool WriteXattrBool(const base::FilePath& file,
-                    const base::StringPiece& name,
+                    std::string_view name,
                     bool value) {
   return WriteXattr(file, name, (value ? "1" : "0"));
 }
 
 XattrStatus ReadXattrInt(const base::FilePath& file,
-                         const base::StringPiece& name,
+                         std::string_view name,
                          int* value) {
   std::string tmp;
   XattrStatus status;
@@ -107,14 +110,14 @@ XattrStatus ReadXattrInt(const base::FilePath& file,
 }
 
 bool WriteXattrInt(const base::FilePath& file,
-                   const base::StringPiece& name,
+                   std::string_view name,
                    int value) {
   std::string tmp = base::StringPrintf("%d", value);
   return WriteXattr(file, name, tmp);
 }
 
 XattrStatus ReadXattrTimeT(const base::FilePath& file,
-                           const base::StringPiece& name,
+                           std::string_view name,
                            time_t* value) {
   // time_t on macOS is defined as a long, but it will be read into an int64_t
   // here, since there is no string conversion method for long.
@@ -141,14 +144,13 @@ XattrStatus ReadXattrTimeT(const base::FilePath& file,
 }
 
 bool WriteXattrTimeT(const base::FilePath& file,
-                     const base::StringPiece& name,
+                     std::string_view name,
                      time_t value) {
   std::string tmp = base::StringPrintf("%ld", value);
   return WriteXattr(file, name, tmp);
 }
 
-XattrStatus RemoveXattr(const base::FilePath& file,
-                        const base::StringPiece& name) {
+XattrStatus RemoveXattr(const base::FilePath& file, std::string_view name) {
   int rv = removexattr(file.value().c_str(), name.data(), 0);
   if (rv != 0) {
     if (errno == ENOATTR)
diff --git a/extern/crashpad/crashpad/util/mac/xattr.h b/extern/crashpad/crashpad/util/mac/xattr.h
index ebe13df507..6b8516e52a 100644
--- a/extern/crashpad/crashpad/util/mac/xattr.h
+++ b/extern/crashpad/crashpad/util/mac/xattr.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,9 +18,9 @@
 #include <time.h>
 
 #include <string>
+#include <string_view>
 
 #include "base/files/file_path.h"
-#include "base/strings/string_piece.h"
 
 namespace crashpad {
 
@@ -44,7 +44,7 @@ enum class XattrStatus {
 //!
 //! \return XattrStatus
 XattrStatus ReadXattr(const base::FilePath& file,
-                      const base::StringPiece& name,
+                      std::string_view name,
                       std::string* value);
 
 //! \brief Writes an extended attribute on a file.
@@ -56,7 +56,7 @@ XattrStatus ReadXattr(const base::FilePath& file,
 //! \return `true` if the write was successful. `false` on error, with a message
 //!     logged.
 bool WriteXattr(const base::FilePath& file,
-                const base::StringPiece& name,
+                std::string_view name,
                 const std::string& value);
 
 //! \copydoc ReadXattr
@@ -64,32 +64,32 @@ bool WriteXattr(const base::FilePath& file,
 //! Only the values `"0"` and `"1"`, for `false` and `true` respectively, are
 //! valid conversions.
 XattrStatus ReadXattrBool(const base::FilePath& file,
-                          const base::StringPiece& name,
+                          std::string_view name,
                           bool* value);
 
 //! \copydoc WriteXattr
 bool WriteXattrBool(const base::FilePath& file,
-                    const base::StringPiece& name,
+                    std::string_view name,
                     bool value);
 
 //! \copydoc ReadXattr
 XattrStatus ReadXattrInt(const base::FilePath& file,
-                         const base::StringPiece& name,
+                         std::string_view name,
                          int* value);
 
 //! \copydoc WriteXattr
 bool WriteXattrInt(const base::FilePath& file,
-                   const base::StringPiece& name,
+                   std::string_view name,
                    int value);
 
 //! \copydoc ReadXattr
 XattrStatus ReadXattrTimeT(const base::FilePath& file,
-                           const base::StringPiece& name,
+                           std::string_view name,
                            time_t* value);
 
 //! \copydoc WriteXattr
 bool WriteXattrTimeT(const base::FilePath& file,
-                     const base::StringPiece& name,
+                     std::string_view name,
                      time_t value);
 
 //! \brief Removes an extended attribute from a file.
@@ -98,8 +98,7 @@ bool WriteXattrTimeT(const base::FilePath& file,
 //! \param[in] name The name of the extended attribute to remove.
 //!
 //! \return XattrStatus
-XattrStatus RemoveXattr(const base::FilePath& file,
-                        const base::StringPiece& name);
+XattrStatus RemoveXattr(const base::FilePath& file, std::string_view name);
 
 }  // namespace crashpad
 
diff --git a/extern/crashpad/crashpad/util/mac/xattr_test.cc b/extern/crashpad/crashpad/util/mac/xattr_test.cc
index 50031dc586..6b2a82db0e 100644
--- a/extern/crashpad/crashpad/util/mac/xattr_test.cc
+++ b/extern/crashpad/crashpad/util/mac/xattr_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/mach/bootstrap.cc b/extern/crashpad/crashpad/util/mach/bootstrap.cc
index f553437204..f369f7f301 100644
--- a/extern/crashpad/crashpad/util/mach/bootstrap.cc
+++ b/extern/crashpad/crashpad/util/mach/bootstrap.cc
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 #include <mach/mach.h>
 #include <servers/bootstrap.h>
 
-#include "base/mac/mach_logging.h"
+#include "base/apple/mach_logging.h"
 
 namespace {
 
@@ -26,7 +26,7 @@ namespace {
 // and the right type returned.
 
 struct BootstrapCheckInTraits {
-  using Type = base::mac::ScopedMachReceiveRight;
+  using Type = base::apple::ScopedMachReceiveRight;
   static kern_return_t Call(mach_port_t bootstrap_port,
                             const char* service_name,
                             mach_port_t* service_port) {
@@ -37,7 +37,7 @@ struct BootstrapCheckInTraits {
 constexpr char BootstrapCheckInTraits::kName[];
 
 struct BootstrapLookUpTraits {
-  using Type = base::mac::ScopedMachSendRight;
+  using Type = base::apple::ScopedMachSendRight;
   static kern_return_t Call(mach_port_t bootstrap_port,
                             const char* service_name,
                             mach_port_t* service_port) {
@@ -73,14 +73,14 @@ typename Traits::Type BootstrapCheckInOrLookUp(
 
 namespace crashpad {
 
-base::mac::ScopedMachReceiveRight BootstrapCheckIn(
+base::apple::ScopedMachReceiveRight BootstrapCheckIn(
     const std::string& service_name) {
   return BootstrapCheckInOrLookUp<BootstrapCheckInTraits>(service_name);
 }
 
-base::mac::ScopedMachSendRight BootstrapLookUp(
+base::apple::ScopedMachSendRight BootstrapLookUp(
     const std::string& service_name) {
-  base::mac::ScopedMachSendRight send(
+  base::apple::ScopedMachSendRight send(
       BootstrapCheckInOrLookUp<BootstrapLookUpTraits>(service_name));
 
   // It’s possible to race the bootstrap server when the receive right
@@ -102,7 +102,7 @@ base::mac::ScopedMachSendRight BootstrapLookUp(
   return send;
 }
 
-base::mac::ScopedMachSendRight SystemCrashReporterHandler() {
+base::apple::ScopedMachSendRight SystemCrashReporterHandler() {
   return BootstrapLookUp("com.apple.ReportCrash");
 }
 
diff --git a/extern/crashpad/crashpad/util/mach/bootstrap.h b/extern/crashpad/crashpad/util/mach/bootstrap.h
index 680f5b91f0..35004c3291 100644
--- a/extern/crashpad/crashpad/util/mach/bootstrap.h
+++ b/extern/crashpad/crashpad/util/mach/bootstrap.h
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 
 #include <string>
 
-#include "base/mac/scoped_mach_port.h"
+#include "base/apple/scoped_mach_port.h"
 
 namespace crashpad {
 
@@ -30,7 +30,7 @@ namespace crashpad {
 //!
 //! \return On success, a receive right to the service port. On failure,
 //!     `MACH_PORT_NULL` with a message logged.
-base::mac::ScopedMachReceiveRight BootstrapCheckIn(
+base::apple::ScopedMachReceiveRight BootstrapCheckIn(
     const std::string& service_name);
 
 //! \brief Makes a `boostrap_look_up()` call to the process’ bootstrap server.
@@ -42,7 +42,8 @@ base::mac::ScopedMachReceiveRight BootstrapCheckIn(
 //!
 //! \return On success, a send right to the service port. On failure,
 //!     `MACH_PORT_NULL` with a message logged.
-base::mac::ScopedMachSendRight BootstrapLookUp(const std::string& service_name);
+base::apple::ScopedMachSendRight BootstrapLookUp(
+    const std::string& service_name);
 
 //! \brief Obtains the system’s default Mach exception handler for crash-type
 //!     exceptions.
@@ -56,7 +57,7 @@ base::mac::ScopedMachSendRight BootstrapLookUp(const std::string& service_name);
 //! \return On success, a send right to an `exception_handler_t` corresponding
 //!     to the system’s default crash reporter. On failure, `MACH_PORT_NULL`,
 //!     with a message logged.
-base::mac::ScopedMachSendRight SystemCrashReporterHandler();
+base::apple::ScopedMachSendRight SystemCrashReporterHandler();
 
 }  // namespace crashpad
 
diff --git a/extern/crashpad/crashpad/util/mach/bootstrap_test.cc b/extern/crashpad/crashpad/util/mach/bootstrap_test.cc
index 44587d0893..196f59491b 100644
--- a/extern/crashpad/crashpad/util/mach/bootstrap_test.cc
+++ b/extern/crashpad/crashpad/util/mach/bootstrap_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 
 #include "util/mach/bootstrap.h"
 
-#include "base/mac/scoped_mach_port.h"
+#include "base/apple/scoped_mach_port.h"
 #include "gtest/gtest.h"
 #include "util/mach/mach_extensions.h"
 #include "util/misc/random_string.h"
@@ -25,7 +25,7 @@ namespace {
 
 TEST(Bootstrap, BootstrapCheckInAndLookUp) {
   // This should always exist.
-  base::mac::ScopedMachSendRight report_crash(
+  base::apple::ScopedMachSendRight report_crash(
       BootstrapLookUp("com.apple.ReportCrash"));
   EXPECT_NE(report_crash, kMachPortNull);
 
@@ -34,11 +34,11 @@ TEST(Bootstrap, BootstrapCheckInAndLookUp) {
 
   {
     // The new service hasn’t checked in yet, so this should fail.
-    base::mac::ScopedMachSendRight send(BootstrapLookUp(service_name));
+    base::apple::ScopedMachSendRight send(BootstrapLookUp(service_name));
     EXPECT_EQ(send, kMachPortNull);
 
     // Check it in.
-    base::mac::ScopedMachReceiveRight receive(BootstrapCheckIn(service_name));
+    base::apple::ScopedMachReceiveRight receive(BootstrapCheckIn(service_name));
     EXPECT_NE(receive, kMachPortNull);
 
     // Now it should be possible to look up the new service.
@@ -46,21 +46,22 @@ TEST(Bootstrap, BootstrapCheckInAndLookUp) {
     EXPECT_NE(send, kMachPortNull);
 
     // It shouldn’t be possible to check the service in while it’s active.
-    base::mac::ScopedMachReceiveRight receive_2(BootstrapCheckIn(service_name));
+    base::apple::ScopedMachReceiveRight receive_2(
+        BootstrapCheckIn(service_name));
     EXPECT_EQ(receive_2, kMachPortNull);
   }
 
   // The new service should be gone now.
-  base::mac::ScopedMachSendRight send(BootstrapLookUp(service_name));
+  base::apple::ScopedMachSendRight send(BootstrapLookUp(service_name));
   EXPECT_EQ(send, kMachPortNull);
 
   // It should be possible to check it in again.
-  base::mac::ScopedMachReceiveRight receive(BootstrapCheckIn(service_name));
+  base::apple::ScopedMachReceiveRight receive(BootstrapCheckIn(service_name));
   EXPECT_NE(receive, kMachPortNull);
 }
 
 TEST(Bootstrap, SystemCrashReporterHandler) {
-  base::mac::ScopedMachSendRight system_crash_reporter_handler(
+  base::apple::ScopedMachSendRight system_crash_reporter_handler(
       SystemCrashReporterHandler());
   EXPECT_TRUE(system_crash_reporter_handler.is_valid());
 }
diff --git a/extern/crashpad/crashpad/util/mach/child_port.defs b/extern/crashpad/crashpad/util/mach/child_port.defs
index b0cf982d3c..d63a9e3cca 100644
--- a/extern/crashpad/crashpad/util/mach/child_port.defs
+++ b/extern/crashpad/crashpad/util/mach/child_port.defs
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/mach/child_port_handshake.cc b/extern/crashpad/crashpad/util/mach/child_port_handshake.cc
index 28fdbae6db..5ddfb8152e 100644
--- a/extern/crashpad/crashpad/util/mach/child_port_handshake.cc
+++ b/extern/crashpad/crashpad/util/mach/child_port_handshake.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -24,13 +24,13 @@
 #include <unistd.h>
 
 #include <algorithm>
+#include <iterator>
 #include <utility>
 
+#include "base/apple/mach_logging.h"
+#include "base/apple/scoped_mach_port.h"
 #include "base/check_op.h"
-#include "base/cxx17_backports.h"
 #include "base/logging.h"
-#include "base/mac/mach_logging.h"
-#include "base/mac/scoped_mach_port.h"
 #include "base/notreached.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/rand_util.h"
@@ -113,7 +113,8 @@ mach_port_t ChildPortHandshakeServer::RunServer(
 
   // Check the new service in with the bootstrap server, obtaining a receive
   // right for it.
-  base::mac::ScopedMachReceiveRight server_port(BootstrapCheckIn(service_name));
+  base::apple::ScopedMachReceiveRight server_port(
+      BootstrapCheckIn(service_name));
   CHECK(server_port.is_valid());
 
   // Share the service name with the client via the pipe.
@@ -137,7 +138,7 @@ mach_port_t ChildPortHandshakeServer::RunServer(
   // MACH_PORT_RIGHT_PORT_SET, to 10.12.0 xnu-3789.1.32/osfmk/ipc/ipc_pset.c
   // filt_machportattach(), which also handles MACH_PORT_TYPE_RECEIVE. Create a
   // new port set and add the receive right to it.
-  base::mac::ScopedMachPortSet server_port_set(
+  base::apple::ScopedMachPortSet server_port_set(
       NewMachPort(MACH_PORT_RIGHT_PORT_SET));
   CHECK(server_port_set.is_valid());
 
@@ -167,8 +168,8 @@ mach_port_t ChildPortHandshakeServer::RunServer(
          0,
          0,
          nullptr);
-  int rv = HANDLE_EINTR(kevent(
-      kq.get(), changelist, base::size(changelist), nullptr, 0, nullptr));
+  int rv = HANDLE_EINTR(
+      kevent(kq.get(), changelist, std::size(changelist), nullptr, 0, nullptr));
   PCHECK(rv != -1) << "kevent";
 
   ChildPortServer child_port_server(this);
@@ -256,7 +257,6 @@ mach_port_t ChildPortHandshakeServer::RunServer(
 
       default:
         NOTREACHED();
-        break;
     }
   }
 
@@ -442,7 +442,7 @@ bool ChildPortHandshake::RunClientInternal_SendCheckIn(
     mach_msg_type_name_t right_type) {
   // Get a send right to the server by looking up the service with the bootstrap
   // server by name.
-  base::mac::ScopedMachSendRight server_port(BootstrapLookUp(service_name));
+  base::apple::ScopedMachSendRight server_port(BootstrapLookUp(service_name));
   if (server_port == kMachPortNull) {
     return false;
   }
diff --git a/extern/crashpad/crashpad/util/mach/child_port_handshake.h b/extern/crashpad/crashpad/util/mach/child_port_handshake.h
index 0399f9b80b..9a0b8e104f 100644
--- a/extern/crashpad/crashpad/util/mach/child_port_handshake.h
+++ b/extern/crashpad/crashpad/util/mach/child_port_handshake.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,9 +18,9 @@
 #include <mach/mach.h>
 
 #include <string>
+#include <tuple>
 
 #include "base/files/scoped_file.h"
-#include "base/macros.h"
 #include "util/mach/child_port_types.h"
 
 namespace crashpad {
@@ -107,7 +107,7 @@ class ChildPortHandshakeTest;
 //!   server_write_fd.reset();
 //!
 //!   // Make a new Mach receive right.
-//!   base::mac::ScopedMachReceiveRight
+//!   base::apple::ScopedMachReceiveRight
 //!       receive_right(NewMachPort(MACH_PORT_RIGHT_RECEIVE));
 //!
 //!   // Make a send right corresponding to the receive right.
@@ -118,13 +118,13 @@ class ChildPortHandshakeTest;
 //!                           MACH_MSG_TYPE_MAKE_SEND,
 //!                           &send_right,
 //!                           &send_right_type);
-//!   base::mac::ScopedMachSendRight send_right_owner(send_right);
+//!   base::apple::ScopedMachSendRight send_right_owner(send_right);
 //!
 //!   // Send the receive right to the child process, retaining the send right
 //!   // for use in the parent process.
 //!   if (child_port_handshake.RunClient(receive_right.get(),
 //!                                      MACH_MSG_TYPE_MOVE_RECEIVE)) {
-//!     ignore_result(receive_right.release());
+//!     std::ignore = receive_right.release();
 //!   }
 //! \endcode
 //!
@@ -136,7 +136,7 @@ class ChildPortHandshakeTest;
 //!     base::ScopedFD server_write_fd(atoi(argv[1]));
 //!
 //!     // Obtain a receive right from the parent process.
-//!     base::mac::ScopedMachReceiveRight receive_right(
+//!     base::apple::ScopedMachReceiveRight receive_right(
 //!         ChildPortHandshake::RunServerForFD(
 //!             std::move(server_write_fd),
 //!             ChildPortHandshake::PortRightType::kReceiveRight));
diff --git a/extern/crashpad/crashpad/util/mach/child_port_handshake_test.cc b/extern/crashpad/crashpad/util/mach/child_port_handshake_test.cc
index 5301c4ce33..e8fe91b726 100644
--- a/extern/crashpad/crashpad/util/mach/child_port_handshake_test.cc
+++ b/extern/crashpad/crashpad/util/mach/child_port_handshake_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 
 #include "util/mach/child_port_handshake.h"
 
-#include "base/mac/scoped_mach_port.h"
+#include "base/apple/scoped_mach_port.h"
 #include "gtest/gtest.h"
 #include "test/multiprocess.h"
 #include "util/mach/child_port_types.h"
@@ -99,8 +99,8 @@ class ChildPortHandshakeTest : public Multiprocess {
       return;
     }
 
-    base::mac::ScopedMachReceiveRight receive_right;
-    base::mac::ScopedMachSendRight send_right;
+    base::apple::ScopedMachReceiveRight receive_right;
+    base::apple::ScopedMachSendRight send_right;
     if (test_type_ == TestType::kClientChecksIn_ReceiveRight) {
       receive_right.reset(child_port_handshake_.RunServer(
           ChildPortHandshake::PortRightType::kReceiveRight));
@@ -152,7 +152,7 @@ class ChildPortHandshakeTest : public Multiprocess {
       }
 
       case TestType::kClientChecksIn_SendOnceRight: {
-        base::mac::ScopedMachReceiveRight receive_right(
+        base::apple::ScopedMachReceiveRight receive_right(
             NewMachPort(MACH_PORT_RIGHT_RECEIVE));
         ASSERT_TRUE(child_port_handshake_.RunClient(
             receive_right.get(), MACH_MSG_TYPE_MAKE_SEND_ONCE));
@@ -372,7 +372,7 @@ TEST(ChildPortHandshake, NoClient) {
   // is similar to kClientDoesNotCheckIn, but because there’s no client at all,
   // the server is guaranteed to see that its pipe partner is gone.
   ChildPortHandshake child_port_handshake;
-  base::mac::ScopedMachSendRight child_port(child_port_handshake.RunServer(
+  base::apple::ScopedMachSendRight child_port(child_port_handshake.RunServer(
       ChildPortHandshake::PortRightType::kSendRight));
   EXPECT_FALSE(child_port.is_valid());
 }
diff --git a/extern/crashpad/crashpad/util/mach/child_port_server.cc b/extern/crashpad/crashpad/util/mach/child_port_server.cc
index 927342942f..2f98aac885 100644
--- a/extern/crashpad/crashpad/util/mach/child_port_server.cc
+++ b/extern/crashpad/crashpad/util/mach/child_port_server.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,8 @@
 
 #include "util/mach/child_port_server.h"
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+
 #include "util/mach/child_portServer.h"
 #include "util/mach/mach_message.h"
 
@@ -90,7 +91,7 @@ std::set<mach_msg_id_t> ChildPortServer::MachMessageServerRequestIDs() {
   static constexpr mach_msg_id_t request_ids[] =
       {kMachMessageIDChildPortCheckIn};
   return std::set<mach_msg_id_t>(&request_ids[0],
-                                 &request_ids[base::size(request_ids)]);
+                                 &request_ids[std::size(request_ids)]);
 }
 
 mach_msg_size_t ChildPortServer::MachMessageServerRequestSize() {
diff --git a/extern/crashpad/crashpad/util/mach/child_port_server.h b/extern/crashpad/crashpad/util/mach/child_port_server.h
index b7a9895d2e..44ec6e4fd8 100644
--- a/extern/crashpad/crashpad/util/mach/child_port_server.h
+++ b/extern/crashpad/crashpad/util/mach/child_port_server.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/mach/child_port_server_test.cc b/extern/crashpad/crashpad/util/mach/child_port_server_test.cc
index 451caa810d..adfdeaff97 100644
--- a/extern/crashpad/crashpad/util/mach/child_port_server_test.cc
+++ b/extern/crashpad/crashpad/util/mach/child_port_server_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/mach/child_port_types.h b/extern/crashpad/crashpad/util/mach/child_port_types.h
index d0760a73f4..8b593ca12f 100644
--- a/extern/crashpad/crashpad/util/mach/child_port_types.h
+++ b/extern/crashpad/crashpad/util/mach/child_port_types.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/mach/composite_mach_message_server.cc b/extern/crashpad/crashpad/util/mach/composite_mach_message_server.cc
index 6b955006a2..4d35a5de1e 100644
--- a/extern/crashpad/crashpad/util/mach/composite_mach_message_server.cc
+++ b/extern/crashpad/crashpad/util/mach/composite_mach_message_server.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/mach/composite_mach_message_server.h b/extern/crashpad/crashpad/util/mach/composite_mach_message_server.h
index f1f75f3c11..b4655aa5be 100644
--- a/extern/crashpad/crashpad/util/mach/composite_mach_message_server.h
+++ b/extern/crashpad/crashpad/util/mach/composite_mach_message_server.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/mach/composite_mach_message_server_test.cc b/extern/crashpad/crashpad/util/mach/composite_mach_message_server_test.cc
index 91a3851f2e..d40835aa80 100644
--- a/extern/crashpad/crashpad/util/mach/composite_mach_message_server_test.cc
+++ b/extern/crashpad/crashpad/util/mach/composite_mach_message_server_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,7 +16,8 @@
 
 #include <sys/types.h>
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 #include "test/gtest_death.h"
@@ -198,7 +199,7 @@ TEST(CompositeMachMessageServer, ThreeHandlers) {
   TestMachMessageHandler handlers[3];
   std::set<mach_msg_id_t> expect_request_ids;
 
-  for (size_t index = 0; index < base::size(kRequestIDs0); ++index) {
+  for (size_t index = 0; index < std::size(kRequestIDs0); ++index) {
     const mach_msg_id_t request_id = kRequestIDs0[index];
     handlers[0].AddRequestID(request_id);
     expect_request_ids.insert(request_id);
@@ -207,7 +208,7 @@ TEST(CompositeMachMessageServer, ThreeHandlers) {
   handlers[0].SetReplySize(sizeof(mig_reply_error_t));
   handlers[0].SetReturnCodes(true, kReturnCode0, false);
 
-  for (size_t index = 0; index < base::size(kRequestIDs1); ++index) {
+  for (size_t index = 0; index < std::size(kRequestIDs1); ++index) {
     const mach_msg_id_t request_id = kRequestIDs1[index];
     handlers[1].AddRequestID(request_id);
     expect_request_ids.insert(request_id);
@@ -216,7 +217,7 @@ TEST(CompositeMachMessageServer, ThreeHandlers) {
   handlers[1].SetReplySize(200);
   handlers[1].SetReturnCodes(false, kReturnCode1, true);
 
-  for (size_t index = 0; index < base::size(kRequestIDs2); ++index) {
+  for (size_t index = 0; index < std::size(kRequestIDs2); ++index) {
     const mach_msg_id_t request_id = kRequestIDs2[index];
     handlers[2].AddRequestID(request_id);
     expect_request_ids.insert(request_id);
@@ -254,7 +255,7 @@ TEST(CompositeMachMessageServer, ThreeHandlers) {
 
   // Send messages with known request IDs.
 
-  for (size_t index = 0; index < base::size(kRequestIDs0); ++index) {
+  for (size_t index = 0; index < std::size(kRequestIDs0); ++index) {
     request.header.msgh_id = kRequestIDs0[index];
     SCOPED_TRACE(base::StringPrintf(
         "handler 0, index %zu, id %d", index, request.header.msgh_id));
@@ -265,7 +266,7 @@ TEST(CompositeMachMessageServer, ThreeHandlers) {
     EXPECT_FALSE(destroy_complex_request);
   }
 
-  for (size_t index = 0; index < base::size(kRequestIDs1); ++index) {
+  for (size_t index = 0; index < std::size(kRequestIDs1); ++index) {
     request.header.msgh_id = kRequestIDs1[index];
     SCOPED_TRACE(base::StringPrintf(
         "handler 1, index %zu, id %d", index, request.header.msgh_id));
@@ -276,7 +277,7 @@ TEST(CompositeMachMessageServer, ThreeHandlers) {
     EXPECT_TRUE(destroy_complex_request);
   }
 
-  for (size_t index = 0; index < base::size(kRequestIDs2); ++index) {
+  for (size_t index = 0; index < std::size(kRequestIDs2); ++index) {
     request.header.msgh_id = kRequestIDs2[index];
     SCOPED_TRACE(base::StringPrintf(
         "handler 2, index %zu, id %d", index, request.header.msgh_id));
diff --git a/extern/crashpad/crashpad/util/mach/exc_client_variants.cc b/extern/crashpad/crashpad/util/mach/exc_client_variants.cc
index 9b87774866..7c0baa88a2 100644
--- a/extern/crashpad/crashpad/util/mach/exc_client_variants.cc
+++ b/extern/crashpad/crashpad/util/mach/exc_client_variants.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -124,7 +124,6 @@ kern_return_t UniversalExceptionRaise(exception_behavior_t behavior,
 
     default:
       NOTREACHED();
-      return KERN_INVALID_ARGUMENT;
   }
 }
 
diff --git a/extern/crashpad/crashpad/util/mach/exc_client_variants.h b/extern/crashpad/crashpad/util/mach/exc_client_variants.h
index 8f52ed5323..dea0d62f59 100644
--- a/extern/crashpad/crashpad/util/mach/exc_client_variants.h
+++ b/extern/crashpad/crashpad/util/mach/exc_client_variants.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/mach/exc_client_variants_test.cc b/extern/crashpad/crashpad/util/mach/exc_client_variants_test.cc
index aba72052fb..1d4bf2b88e 100644
--- a/extern/crashpad/crashpad/util/mach/exc_client_variants_test.cc
+++ b/extern/crashpad/crashpad/util/mach/exc_client_variants_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,7 +19,8 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 #include "test/mac/mach_errors.h"
@@ -184,11 +185,11 @@ class TestExcClientVariants : public MachMultiprocess,
       // These aren’t real flavors, it’s just for testing.
       flavor = exception_ + 10;
       flavor_p = &flavor;
-      for (size_t index = 0; index < base::size(old_state); ++index) {
+      for (size_t index = 0; index < std::size(old_state); ++index) {
         old_state[index] = index;
       }
       old_state_p = reinterpret_cast<thread_state_t>(&old_state);
-      old_state_count = base::size(old_state);
+      old_state_count = std::size(old_state);
 
       // new_state and new_state_count are out parameters that the server should
       // never see or use, so set them to bogus values. The call to the server
@@ -205,7 +206,7 @@ class TestExcClientVariants : public MachMultiprocess,
                                       task,
                                       exception,
                                       code,
-                                      base::size(code),
+                                      std::size(code),
                                       flavor_p,
                                       old_state_p,
                                       old_state_count,
@@ -274,7 +275,7 @@ TEST(ExcClientVariants, UniversalExceptionRaise) {
       kMachExceptionCodes | EXCEPTION_STATE_IDENTITY,
   };
 
-  for (size_t index = 0; index < base::size(kBehaviors); ++index) {
+  for (size_t index = 0; index < std::size(kBehaviors); ++index) {
     exception_behavior_t behavior = kBehaviors[index];
     SCOPED_TRACE(base::StringPrintf("index %zu, behavior %d", index, behavior));
 
diff --git a/extern/crashpad/crashpad/util/mach/exc_server_variants.cc b/extern/crashpad/crashpad/util/mach/exc_server_variants.cc
index b9357a7802..8476574d88 100644
--- a/extern/crashpad/crashpad/util/mach/exc_server_variants.cc
+++ b/extern/crashpad/crashpad/util/mach/exc_server_variants.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,9 +18,9 @@
 #include <string.h>
 
 #include <algorithm>
+#include <iterator>
 #include <vector>
 
-#include "base/cxx17_backports.h"
 #include "build/build_config.h"
 #include "util/mac/mac_util.h"
 #include "util/mach/composite_mach_message_server.h"
@@ -31,6 +31,12 @@
 #include "util/mach/mach_excServer.h"
 #include "util/mach/mach_message.h"
 
+#if BUILDFLAG(IS_IOS)
+#include "util/ios/raw_logging.h"
+#else
+#include "base/apple/mach_logging.h"
+#endif
+
 namespace crashpad {
 
 namespace {
@@ -83,6 +89,8 @@ struct ExcTraits {
   static const mach_msg_id_t kMachMessageIDExceptionRaise = 2401;
   static const mach_msg_id_t kMachMessageIDExceptionRaiseState = 2402;
   static const mach_msg_id_t kMachMessageIDExceptionRaiseStateIdentity = 2403;
+  static const mach_msg_id_t
+      kMachMessageIDExceptionRaiseStateIdentityProtected = 2411;
 
   static const exception_behavior_t kExceptionBehavior = 0;
 };
@@ -99,11 +107,15 @@ struct MachExcTraits {
   using ExceptionRaiseStateRequest = __Request__mach_exception_raise_state_t;
   using ExceptionRaiseStateIdentityRequest =
       __Request__mach_exception_raise_state_identity_t;
+  using ExceptionRaiseStateIdentityProtectedRequest =
+      __Request__mach_exception_raise_state_identity_protected_t;
 
   using ExceptionRaiseReply = __Reply__mach_exception_raise_t;
   using ExceptionRaiseStateReply = __Reply__mach_exception_raise_state_t;
   using ExceptionRaiseStateIdentityReply =
       __Reply__mach_exception_raise_state_identity_t;
+  using ExceptionRaiseStateIdentityProtectedReply =
+      __Reply__mach_exception_raise_state_identity_protected_t;
 
   // The MIG-generated __MIG_check__Request__*() functions are not declared as
   // accepting const data, but they could have been because they in fact do not
@@ -131,10 +143,23 @@ struct MachExcTraits {
         const_cast<ExceptionRaiseStateIdentityRequest**>(in_request_1));
   }
 
+  static kern_return_t MIGCheckRequestExceptionRaiseStateIdentityProtected(
+      const ExceptionRaiseStateIdentityProtectedRequest* in_request,
+      const ExceptionRaiseStateIdentityProtectedRequest** in_request_1) {
+    return
+        __MIG_check__Request__mach_exception_raise_state_identity_protected_t(
+            const_cast<ExceptionRaiseStateIdentityProtectedRequest*>(
+                in_request),
+            const_cast<ExceptionRaiseStateIdentityProtectedRequest**>(
+                in_request_1));
+  }
+
   // There are no predefined constants for these.
   static const mach_msg_id_t kMachMessageIDExceptionRaise = 2405;
   static const mach_msg_id_t kMachMessageIDExceptionRaiseState = 2406;
   static const mach_msg_id_t kMachMessageIDExceptionRaiseStateIdentity = 2407;
+  static const mach_msg_id_t
+      kMachMessageIDExceptionRaiseStateIdentityProtected = 2410;
 
   static const exception_behavior_t kExceptionBehavior = MACH_EXCEPTION_CODES;
 };
@@ -220,6 +245,32 @@ class ExcServer : public MachMessageServer::Interface {
         const mach_msg_trailer_t* trailer,
         bool* destroy_request) = 0;
 
+    //! \brief Handles exceptions raised by
+    //!     `mach_exception_raise_state_identity_protected()`.
+    //!
+    //! This behaves equivalently to a
+    //! `catch_mach_exception_raise_state_identity_protected()` function used
+    //! with `mach_exc_server()`.
+    //!
+    //! \param[in] trailer The trailer received with the request message.
+    //! \param[out] destroy_request `true` if the request message is to be
+    //!     destroyed even when this method returns success. See
+    //!     MachMessageServer::Interface.
+    virtual kern_return_t CatchExceptionRaiseStateIdentityProtected(
+        exception_handler_t exception_port,
+        thread_t thread,
+        task_t task,
+        exception_type_t exception,
+        const typename Traits::ExceptionCode* code,
+        mach_msg_type_number_t code_count,
+        thread_state_flavor_t* flavor,
+        ConstThreadState old_state,
+        mach_msg_type_number_t old_state_count,
+        thread_state_t new_state,
+        mach_msg_type_number_t* new_state_count,
+        const mach_msg_trailer_t* trailer,
+        bool* destroy_request) = 0;
+
    protected:
     ~Interface() {}
   };
@@ -244,9 +295,10 @@ class ExcServer : public MachMessageServer::Interface {
         Traits::kMachMessageIDExceptionRaise,
         Traits::kMachMessageIDExceptionRaiseState,
         Traits::kMachMessageIDExceptionRaiseStateIdentity,
+        Traits::kMachMessageIDExceptionRaiseStateIdentityProtected,
     };
     return std::set<mach_msg_id_t>(&request_ids[0],
-                                   &request_ids[base::size(request_ids)]);
+                                   &request_ids[std::size(request_ids)]);
   }
 
   mach_msg_size_t MachMessageServerRequestSize() override {
@@ -321,7 +373,7 @@ bool ExcServer<Traits>::MachMessageServerFunction(
       using Reply = typename Traits::ExceptionRaiseStateReply;
       Reply* out_reply = reinterpret_cast<Reply*>(out_header);
       out_reply->flavor = in_request_1->flavor;
-      out_reply->new_stateCnt = base::size(out_reply->new_state);
+      out_reply->new_stateCnt = std::size(out_reply->new_state);
       out_reply->RetCode =
           interface_->CatchExceptionRaiseState(in_header->msgh_local_port,
                                                in_request->exception,
@@ -364,7 +416,7 @@ bool ExcServer<Traits>::MachMessageServerFunction(
       using Reply = typename Traits::ExceptionRaiseStateIdentityReply;
       Reply* out_reply = reinterpret_cast<Reply*>(out_header);
       out_reply->flavor = in_request_1->flavor;
-      out_reply->new_stateCnt = base::size(out_reply->new_state);
+      out_reply->new_stateCnt = std::size(out_reply->new_state);
       out_reply->RetCode = interface_->CatchExceptionRaiseStateIdentity(
           in_header->msgh_local_port,
           in_request->thread.name,
@@ -389,6 +441,113 @@ bool ExcServer<Traits>::MachMessageServerFunction(
       return true;
     }
 
+    case MachExcTraits::kMachMessageIDExceptionRaiseStateIdentityProtected: {
+      // mach_exception_raise_state_identity_protected(),
+      // catch_mach_exception_raise_state_identity_protected().
+      using Request =
+          typename MachExcTraits::ExceptionRaiseStateIdentityProtectedRequest;
+      const Request* in_request = reinterpret_cast<const Request*>(in_header);
+
+      // in_request_1 is used for the portion of the request after the codes,
+      // which in theory can be variable-length. The check function will set it.
+      const Request* in_request_1;
+      kern_return_t kr =
+          MachExcTraits::MIGCheckRequestExceptionRaiseStateIdentityProtected(
+              in_request, &in_request_1);
+      if (kr != MACH_MSG_SUCCESS) {
+        SetMIGReplyError(out_header, kr);
+        return true;
+      }
+
+      task_t task_port = TASK_NULL;
+      if (in_request->task_id_token_t.name != MACH_PORT_NULL) {
+        kr = task_identity_token_get_task_port(
+            in_request->task_id_token_t.name, TASK_FLAVOR_CONTROL, &task_port);
+        if (kr != MACH_MSG_SUCCESS) {
+          // If this fails, pass TASK_NULL to
+          // CatchExceptionRaiseStateIdentityProtected
+#if BUILDFLAG(IS_IOS)
+          CRASHPAD_RAW_LOG_ERROR(kr, "task_identity_token_get_task_port");
+#else
+          MACH_LOG(WARNING, kr) << "task_identity_token_get_task_port";
+#endif
+        }
+      }
+
+      // Get the thread_t matching in_request->thread_id.
+      thread_t thread_port = THREAD_NULL;
+      if (task_port != TASK_NULL) {
+        thread_act_array_t threads;
+        mach_msg_type_number_t thread_count;
+        kr = task_threads(task_port, &threads, &thread_count);
+        if (kr == KERN_SUCCESS) {
+          for (mach_msg_type_number_t thread_index = 0;
+               thread_index < thread_count;
+               ++thread_index) {
+            if (thread_port != THREAD_NULL) {
+              mach_port_deallocate(mach_task_self(), threads[thread_index]);
+              continue;
+            }
+            thread_identifier_info_data_t thread_id_info;
+            mach_msg_type_number_t count = THREAD_IDENTIFIER_INFO_COUNT;
+            kr = thread_info(threads[thread_index],
+                             THREAD_IDENTIFIER_INFO,
+                             (thread_info_t)&thread_id_info,
+                             &count);
+            if (kr != KERN_SUCCESS) {
+              mach_port_deallocate(mach_task_self(), threads[thread_index]);
+              continue;
+            }
+            if (thread_id_info.thread_id == in_request->thread_id) {
+              thread_port = threads[thread_index];
+            } else {
+              mach_port_deallocate(mach_task_self(), threads[thread_index]);
+            }
+          }
+          vm_deallocate(mach_task_self(),
+                        (vm_address_t)threads,
+                        thread_count * sizeof(thread_t));
+        }
+      }
+
+      using Reply = MachExcTraits::ExceptionRaiseStateIdentityProtectedReply;
+      Reply* out_reply = reinterpret_cast<Reply*>(out_header);
+      out_reply->flavor = in_request_1->flavor;
+      out_reply->new_stateCnt = std::size(out_reply->new_state);
+      out_reply->RetCode =
+          interface_->CatchExceptionRaiseStateIdentityProtected(
+              in_header->msgh_local_port,
+              thread_port,
+              task_port,
+              in_request->exception,
+              (const typename Traits::ExceptionCode*)in_request->code,
+              in_request->codeCnt,
+              &out_reply->flavor,
+              in_request_1->old_state,
+              in_request_1->old_stateCnt,
+              out_reply->new_state,
+              &out_reply->new_stateCnt,
+              in_trailer,
+              destroy_complex_request);
+
+      if (task_port != TASK_NULL) {
+        mach_port_deallocate(mach_task_self(), task_port);
+      }
+
+      if (thread_port != THREAD_NULL) {
+        mach_port_deallocate(mach_task_self(), thread_port);
+      }
+
+      if (out_reply->RetCode != KERN_SUCCESS) {
+        return true;
+      }
+
+      out_header->msgh_size =
+          sizeof(*out_reply) - sizeof(out_reply->new_state) +
+          sizeof(out_reply->new_state[0]) * out_reply->new_stateCnt;
+      return true;
+    }
+
     default: {
       SetMIGReplyError(out_header, MIG_BAD_ID);
       return false;
@@ -421,11 +580,12 @@ class SimplifiedExcServer final : public ExcServer<Traits>,
     //! The meanings of most parameters are identical to that of
     //! ExcServer<>::Interface::CatchExceptionRaiseStateIdentity().
     //!
-    //! \param[in] behavior `EXCEPTION_DEFAULT`, `EXCEPTION_STATE`, or
-    //!     `EXCEPTION_STATE_IDENTITY`, identifying which exception request
-    //!     message was processed and thus which other parameters are valid.
-    //!     When used with the `mach_exc` subsystem, `MACH_EXCEPTION_CODES` will
-    //!     be ORed in to this parameter.
+    //! \param[in] behavior `EXCEPTION_DEFAULT`, `EXCEPTION_STATE`,
+    //!     `EXCEPTION_STATE_IDENTITY`, or
+    //!     `EXCEPTION_STATE_IDENTITY_PROTECTED` identifying which exception
+    //!     request message was processed and thus which other parameters are
+    //!     valid. When used with the `mach_exc` subsystem,
+    //!     `MACH_EXCEPTION_CODES` will be ORed in to this parameter.
     virtual kern_return_t CatchException(
         exception_behavior_t behavior,
         exception_handler_t exception_port,
@@ -546,6 +706,37 @@ class SimplifiedExcServer final : public ExcServer<Traits>,
         destroy_request);
   }
 
+  kern_return_t CatchExceptionRaiseStateIdentityProtected(
+      exception_handler_t exception_port,
+      thread_t thread,
+      task_t task,
+      exception_type_t exception,
+      const typename Traits::ExceptionCode* code,
+      mach_msg_type_number_t code_count,
+      thread_state_flavor_t* flavor,
+      ConstThreadState old_state,
+      mach_msg_type_number_t old_state_count,
+      thread_state_t new_state,
+      mach_msg_type_number_t* new_state_count,
+      const mach_msg_trailer_t* trailer,
+      bool* destroy_request) override {
+    return interface_->CatchException(
+        Traits::kExceptionBehavior | EXCEPTION_STATE_IDENTITY_PROTECTED,
+        exception_port,
+        thread,
+        task,
+        exception,
+        code_count ? code : nullptr,
+        code_count,
+        flavor,
+        old_state_count ? old_state : nullptr,
+        old_state_count,
+        new_state_count ? new_state : nullptr,
+        new_state_count,
+        trailer,
+        destroy_request);
+  }
+
  private:
   Interface* interface_;  // weak
 };
@@ -686,10 +877,10 @@ kern_return_t ExcServerSuccessfulReturnValue(exception_type_t exception,
                                              exception_behavior_t behavior,
                                              bool set_thread_state) {
   if (exception == EXC_CRASH
-#if defined(OS_MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_11
+#if BUILDFLAG(IS_MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_11
       && MacOSVersionNumber() >= 10'11'00
 #endif
-     ) {
+  ) {
     return KERN_SUCCESS;
   }
 
diff --git a/extern/crashpad/crashpad/util/mach/exc_server_variants.h b/extern/crashpad/crashpad/util/mach/exc_server_variants.h
index 15d1cb2ad5..bf310bfbf3 100644
--- a/extern/crashpad/crashpad/util/mach/exc_server_variants.h
+++ b/extern/crashpad/crashpad/util/mach/exc_server_variants.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/mach/exc_server_variants_test.cc b/extern/crashpad/crashpad/util/mach/exc_server_variants_test.cc
index d74cbc5915..7424426a76 100644
--- a/extern/crashpad/crashpad/util/mach/exc_server_variants_test.cc
+++ b/extern/crashpad/crashpad/util/mach/exc_server_variants_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,7 +19,8 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "gmock/gmock.h"
@@ -31,9 +32,9 @@
 #include "util/mach/mach_message.h"
 #include "util/misc/implicit_cast.h"
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 #include "test/mac/mach_multiprocess.h"
-#endif  // OS_MAC
+#endif  // BUILDFLAG(IS_MAC)
 
 namespace crashpad {
 namespace test {
@@ -224,6 +225,9 @@ struct __attribute__((packed, aligned(4))) ExceptionRaiseStateReply {
       case EXCEPTION_STATE_IDENTITY | kMachExceptionCodes:
         EXPECT_EQ(Head.msgh_id, 2507);
         break;
+      case EXCEPTION_STATE_IDENTITY_PROTECTED | kMachExceptionCodes:
+        EXPECT_EQ(Head.msgh_id, 2510);
+        break;
       default:
         ADD_FAILURE() << "behavior " << behavior << ", Head.msgh_id "
                       << Head.msgh_id;
@@ -232,7 +236,7 @@ struct __attribute__((packed, aligned(4))) ExceptionRaiseStateReply {
     EXPECT_EQ(memcmp(&NDR, &NDR_record, sizeof(NDR)), 0);
     EXPECT_EQ(RetCode, KERN_SUCCESS);
     EXPECT_EQ(flavor, kThreadStateFlavor);
-    EXPECT_EQ(new_stateCnt, base::size(new_state));
+    EXPECT_EQ(new_stateCnt, std::size(new_state));
   }
 
   mach_msg_header_t Head;
@@ -422,6 +426,58 @@ MachExceptionRaiseStateIdentityRequest {
 // mach_exception_raise_state_identity are identical.
 using MachExceptionRaiseStateIdentityReply = ExceptionRaiseStateIdentityReply;
 
+struct __attribute__((packed, aligned(4)))
+MachExceptionRaiseStateIdentityProtectedRequest {
+  MachExceptionRaiseStateIdentityProtectedRequest() {
+    memset(this, 0xa5, sizeof(*this));
+    Head.msgh_bits =
+        MACH_MSGH_BITS(MACH_MSG_TYPE_PORT_SEND_ONCE, MACH_MSG_TYPE_PORT_SEND) |
+        MACH_MSGH_BITS_COMPLEX;
+    Head.msgh_size = sizeof(*this) - sizeof(trailer);
+    Head.msgh_remote_port = kClientRemotePort;
+    Head.msgh_local_port = kServerLocalPort;
+    Head.msgh_id = 2410;
+    msgh_body.msgh_descriptor_count = 1;
+    thread_id = 0;
+    InitializeMachMsgPortDescriptor(&task_id_token_t, kExceptionTaskPort);
+    NDR = NDR_record;
+    exception = kExceptionType;
+    codeCnt = 2;
+    code[0] = kTestMachExceptionCodes[0];
+    code[1] = kTestMachExceptionCodes[1];
+    flavor = kThreadStateFlavor;
+    old_stateCnt = kThreadStateFlavorCount;
+
+    // Adjust the message size for the data that it’s actually carrying, which
+    // may be smaller than the maximum that it can carry.
+    Head.msgh_size += sizeof(old_state[0]) * old_stateCnt - sizeof(old_state);
+  }
+
+  // Because the message size has been adjusted, the trailer may not appear in
+  // its home member variable. This computes the actual address of the trailer.
+  const mach_msg_trailer_t* Trailer() const {
+    return MachMessageTrailerFromHeader(&Head);
+  }
+
+  mach_msg_header_t Head;
+  mach_msg_body_t msgh_body;
+  mach_msg_port_descriptor_t task_id_token_t;
+  NDR_record_t NDR;
+  int64_t thread_id;
+  exception_type_t exception;
+  mach_msg_type_number_t codeCnt;
+  int64_t code[2];
+  int flavor;
+  mach_msg_type_number_t old_stateCnt;
+  natural_t old_state[THREAD_STATE_MAX];
+  mach_msg_trailer_t trailer;
+};
+
+// The reply messages for mach_exception_raise_state_identity_protected and
+// mach_exception_raise_state_identity are identical.
+using MachExceptionRaiseStateIdentityProtectedReply =
+    MachExceptionRaiseStateIdentityReply;
+
 // InvalidRequest and BadIDErrorReply are used to test that
 // UniversalMachExcServer deals appropriately with messages that it does not
 // understand: messages with an unknown Head.msgh_id.
@@ -633,6 +689,53 @@ TEST(ExcServerVariants, MockExceptionRaise) {
   reply.Verify(kExceptionBehavior);
 }
 
+TEST(ExcServerVariants, MockMachExceptionRaiseStateIdentityProtected) {
+  ScopedDefaultValue<kern_return_t> default_kern_return_t(KERN_FAILURE);
+
+  MockUniversalMachExcServer server;
+  UniversalMachExcServer universal_mach_exc_server(&server);
+
+  std::set<mach_msg_id_t> ids =
+      universal_mach_exc_server.MachMessageServerRequestIDs();
+  EXPECT_NE(ids.find(2410), ids.end());  // There is no constant for this.
+
+  MachExceptionRaiseStateIdentityProtectedRequest request;  // Protected
+  EXPECT_LE(request.Head.msgh_size,
+            universal_mach_exc_server.MachMessageServerRequestSize());
+
+  MachExceptionRaiseStateIdentityProtectedReply reply;
+  EXPECT_LE(sizeof(reply),
+            universal_mach_exc_server.MachMessageServerReplySize());
+
+  constexpr exception_behavior_t kExceptionBehavior =
+      EXCEPTION_STATE_IDENTITY_PROTECTED | MACH_EXCEPTION_CODES;
+
+  EXPECT_CALL(
+      server,
+      MockCatchMachException(kExceptionBehavior,
+                             kServerLocalPort,
+                             0,  // kExceptionThreadPort,
+                             0,  // kExceptionTaskPort,
+                             kExceptionType,
+                             AreExceptionCodes(kTestMachExceptionCodes[0],
+                                               kTestMachExceptionCodes[1]),
+                             Pointee(Eq(kThreadStateFlavor)),
+                             IsThreadStateAndCount(kThreadStateFlavorCount),
+                             IsThreadStateAndCount(std::size(reply.new_state)),
+                             Eq(request.Trailer())))
+      .WillOnce(Return(KERN_SUCCESS))
+      .RetiresOnSaturation();
+
+  bool destroy_complex_request = false;
+  EXPECT_TRUE(universal_mach_exc_server.MachMessageServerFunction(
+      reinterpret_cast<mach_msg_header_t*>(&request),
+      reinterpret_cast<mach_msg_header_t*>(&reply),
+      &destroy_complex_request));
+  EXPECT_TRUE(destroy_complex_request);
+
+  reply.Verify(kExceptionBehavior);
+}
+
 TEST(ExcServerVariants, MockExceptionRaiseState) {
   ScopedDefaultValue<kern_return_t> default_kern_return_t(KERN_FAILURE);
 
@@ -664,7 +767,7 @@ TEST(ExcServerVariants, MockExceptionRaiseState) {
           AreExceptionCodes(kTestExceptonCodes[0], kTestExceptonCodes[1]),
           Pointee(Eq(kThreadStateFlavor)),
           IsThreadStateAndCount(kThreadStateFlavorCount),
-          IsThreadStateAndCount(base::size(reply.new_state)),
+          IsThreadStateAndCount(std::size(reply.new_state)),
           Eq(request.Trailer())))
       .WillOnce(Return(KERN_SUCCESS))
       .RetiresOnSaturation();
@@ -713,7 +816,7 @@ TEST(ExcServerVariants, MockExceptionRaiseStateIdentity) {
           AreExceptionCodes(kTestExceptonCodes[0], kTestExceptonCodes[1]),
           Pointee(Eq(kThreadStateFlavor)),
           IsThreadStateAndCount(kThreadStateFlavorCount),
-          IsThreadStateAndCount(base::size(reply.new_state)),
+          IsThreadStateAndCount(std::size(reply.new_state)),
           Eq(request.Trailer())))
       .WillOnce(Return(KERN_SUCCESS))
       .RetiresOnSaturation();
@@ -807,7 +910,7 @@ TEST(ExcServerVariants, MockMachExceptionRaiseState) {
                                                kTestMachExceptionCodes[1]),
                              Pointee(Eq(kThreadStateFlavor)),
                              IsThreadStateAndCount(kThreadStateFlavorCount),
-                             IsThreadStateAndCount(base::size(reply.new_state)),
+                             IsThreadStateAndCount(std::size(reply.new_state)),
                              Eq(request.Trailer())))
       .WillOnce(Return(KERN_SUCCESS))
       .RetiresOnSaturation();
@@ -857,7 +960,7 @@ TEST(ExcServerVariants, MockMachExceptionRaiseStateIdentity) {
                                                kTestMachExceptionCodes[1]),
                              Pointee(Eq(kThreadStateFlavor)),
                              IsThreadStateAndCount(kThreadStateFlavorCount),
-                             IsThreadStateAndCount(base::size(reply.new_state)),
+                             IsThreadStateAndCount(std::size(reply.new_state)),
                              Eq(request.Trailer())))
       .WillOnce(Return(KERN_SUCCESS))
       .RetiresOnSaturation();
@@ -911,7 +1014,7 @@ TEST(ExcServerVariants, MockUnknownID) {
       2508,
   };
 
-  for (size_t index = 0; index < base::size(unknown_ids); ++index) {
+  for (size_t index = 0; index < std::size(unknown_ids); ++index) {
     mach_msg_id_t id = unknown_ids[index];
 
     SCOPED_TRACE(base::StringPrintf("unknown id %d", id));
@@ -954,6 +1057,8 @@ TEST(ExcServerVariants, MachMessageServerRequestIDs) {
   expect_request_ids.insert(2405);
   expect_request_ids.insert(2406);
   expect_request_ids.insert(2407);
+  expect_request_ids.insert(2410);
+  expect_request_ids.insert(2411);
 
   MockUniversalMachExcServer server;
   UniversalMachExcServer universal_mach_exc_server(&server);
@@ -962,7 +1067,7 @@ TEST(ExcServerVariants, MachMessageServerRequestIDs) {
             expect_request_ids);
 }
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 
 class TestExcServerVariants : public MachMultiprocess,
                               public UniversalMachExcServer::Interface {
@@ -1190,7 +1295,7 @@ TEST(ExcServerVariants, ThreadStates) {
 #endif
   };
 
-  for (size_t index = 0; index < base::size(test_data); ++index) {
+  for (size_t index = 0; index < std::size(test_data); ++index) {
     const auto& test = test_data[index];
     SCOPED_TRACE(
         base::StringPrintf("index %zu, flavor %d", index, test.flavor));
@@ -1203,10 +1308,10 @@ TEST(ExcServerVariants, ThreadStates) {
   }
 }
 
-#endif  // OS_MAC
+#endif  // BUILDFLAG(IS_MAC)
 
 TEST(ExcServerVariants, ExcServerSuccessfulReturnValue) {
-#if defined(OS_IOS)
+#if BUILDFLAG(IS_IOS)
   // iOS 9 ≅ OS X 10.11.
   const kern_return_t prefer_not_set_thread_state = KERN_SUCCESS;
 #else
@@ -1270,7 +1375,7 @@ TEST(ExcServerVariants, ExcServerSuccessfulReturnValue) {
        KERN_SUCCESS},
   };
 
-  for (size_t index = 0; index < base::size(kTestData); ++index) {
+  for (size_t index = 0; index < std::size(kTestData); ++index) {
     const auto& test_data = kTestData[index];
     SCOPED_TRACE(
         base::StringPrintf("index %zu, behavior %d, set_thread_state %s",
@@ -1289,8 +1394,8 @@ TEST(ExcServerVariants, ExcServerCopyState) {
   static constexpr natural_t old_state[] = {1, 2, 3, 4, 5};
   natural_t new_state[10] = {};
 
-  constexpr mach_msg_type_number_t old_state_count = base::size(old_state);
-  mach_msg_type_number_t new_state_count = base::size(new_state);
+  constexpr mach_msg_type_number_t old_state_count = std::size(old_state);
+  mach_msg_type_number_t new_state_count = std::size(new_state);
 
   // EXCEPTION_DEFAULT (with or without MACH_EXCEPTION_CODES) is not
   // state-carrying. new_state and new_state_count should be untouched.
@@ -1299,8 +1404,8 @@ TEST(ExcServerVariants, ExcServerCopyState) {
                      old_state_count,
                      new_state,
                      &new_state_count);
-  EXPECT_EQ(new_state_count, base::size(new_state));
-  for (size_t i = 0; i < base::size(new_state); ++i) {
+  EXPECT_EQ(new_state_count, std::size(new_state));
+  for (size_t i = 0; i < std::size(new_state); ++i) {
     EXPECT_EQ(new_state[i], 0u) << "i " << i;
   }
 
@@ -1309,8 +1414,8 @@ TEST(ExcServerVariants, ExcServerCopyState) {
                      old_state_count,
                      new_state,
                      &new_state_count);
-  EXPECT_EQ(new_state_count, base::size(new_state));
-  for (size_t i = 0; i < base::size(new_state); ++i) {
+  EXPECT_EQ(new_state_count, std::size(new_state));
+  for (size_t i = 0; i < std::size(new_state); ++i) {
     EXPECT_EQ(new_state[i], 0u) << "i " << i;
   }
 
@@ -1322,7 +1427,7 @@ TEST(ExcServerVariants, ExcServerCopyState) {
   for (size_t i = 0; i < copy_limit; ++i) {
     EXPECT_EQ(new_state[i], old_state[i]) << "i " << i;
   }
-  for (size_t i = copy_limit; i < base::size(new_state); ++i) {
+  for (size_t i = copy_limit; i < std::size(new_state); ++i) {
     EXPECT_EQ(new_state[i], 0u) << "i " << i;
   }
 
@@ -1338,23 +1443,23 @@ TEST(ExcServerVariants, ExcServerCopyState) {
   for (size_t i = 0; i < copy_limit; ++i) {
     EXPECT_EQ(new_state[i], old_state[i]) << "i " << i;
   }
-  for (size_t i = copy_limit; i < base::size(new_state); ++i) {
+  for (size_t i = copy_limit; i < std::size(new_state); ++i) {
     EXPECT_EQ(new_state[i], 0u) << "i " << i;
   }
 
   // This is a state-carrying exception where all of old_state is copied to
   // new_state, which is large enough to receive it and then some.
-  new_state_count = base::size(new_state);
+  new_state_count = std::size(new_state);
   ExcServerCopyState(MACH_EXCEPTION_CODES | EXCEPTION_STATE_IDENTITY,
                      old_state,
                      old_state_count,
                      new_state,
                      &new_state_count);
   EXPECT_EQ(new_state_count, old_state_count);
-  for (size_t i = 0; i < base::size(old_state); ++i) {
+  for (size_t i = 0; i < std::size(old_state); ++i) {
     EXPECT_EQ(new_state[i], old_state[i]) << "i " << i;
   }
-  for (size_t i = base::size(old_state); i < base::size(new_state); ++i) {
+  for (size_t i = std::size(old_state); i < std::size(new_state); ++i) {
     EXPECT_EQ(new_state[i], 0u) << "i " << i;
   }
 }
diff --git a/extern/crashpad/crashpad/util/mach/exception_behaviors.cc b/extern/crashpad/crashpad/util/mach/exception_behaviors.cc
index eb2a80caff..7c2cc2e7eb 100644
--- a/extern/crashpad/crashpad/util/mach/exception_behaviors.cc
+++ b/extern/crashpad/crashpad/util/mach/exception_behaviors.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/mach/exception_behaviors.h b/extern/crashpad/crashpad/util/mach/exception_behaviors.h
index 14b5448a2b..a54ea8402d 100644
--- a/extern/crashpad/crashpad/util/mach/exception_behaviors.h
+++ b/extern/crashpad/crashpad/util/mach/exception_behaviors.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/mach/exception_behaviors_test.cc b/extern/crashpad/crashpad/util/mach/exception_behaviors_test.cc
index e6abd25fbc..b8c6c82446 100644
--- a/extern/crashpad/crashpad/util/mach/exception_behaviors_test.cc
+++ b/extern/crashpad/crashpad/util/mach/exception_behaviors_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,7 +16,8 @@
 
 #include <sys/types.h>
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 #include "util/mach/mach_extensions.h"
@@ -53,7 +54,7 @@ TEST(ExceptionBehaviors, ExceptionBehaviors) {
        EXCEPTION_STATE_IDENTITY},
   };
 
-  for (size_t index = 0; index < base::size(kTestData); ++index) {
+  for (size_t index = 0; index < std::size(kTestData); ++index) {
     const auto& test_data = kTestData[index];
     SCOPED_TRACE(base::StringPrintf(
         "index %zu, behavior %d", index, test_data.behavior));
diff --git a/extern/crashpad/crashpad/util/mach/exception_ports.cc b/extern/crashpad/crashpad/util/mach/exception_ports.cc
index 02fed19c96..055fa116ea 100644
--- a/extern/crashpad/crashpad/util/mach/exception_ports.cc
+++ b/extern/crashpad/crashpad/util/mach/exception_ports.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,8 +14,8 @@
 
 #include "util/mach/exception_ports.h"
 
+#include "base/apple/mach_logging.h"
 #include "base/logging.h"
-#include "base/mac/mach_logging.h"
 #include "base/notreached.h"
 
 namespace crashpad {
@@ -81,11 +81,6 @@ ExceptionPorts::ExceptionPorts(TargetType target_type, mach_port_t target_port)
 
     default:
       NOTREACHED();
-      get_exception_ports_ = nullptr;
-      set_exception_ports_ = nullptr;
-      target_name_ = nullptr;
-      target_port_ = MACH_PORT_NULL;
-      break;
   }
 }
 
diff --git a/extern/crashpad/crashpad/util/mach/exception_ports.h b/extern/crashpad/crashpad/util/mach/exception_ports.h
index 06a952070b..4b3db5948f 100644
--- a/extern/crashpad/crashpad/util/mach/exception_ports.h
+++ b/extern/crashpad/crashpad/util/mach/exception_ports.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/mach/exception_ports_test.cc b/extern/crashpad/crashpad/util/mach/exception_ports_test.cc
index b29e125ebb..15375d326a 100644
--- a/extern/crashpad/crashpad/util/mach/exception_ports_test.cc
+++ b/extern/crashpad/crashpad/util/mach/exception_ports_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,9 +19,9 @@
 #include <signal.h>
 #include <unistd.h>
 
+#include "base/apple/mach_logging.h"
+#include "base/apple/scoped_mach_port.h"
 #include "base/check.h"
-#include "base/mac/mach_logging.h"
-#include "base/mac/scoped_mach_port.h"
 #include "base/notreached.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"
@@ -189,7 +189,6 @@ class TestExceptionPorts : public MachMultiprocess,
       expect_behavior = EXCEPTION_STATE_IDENTITY;
     } else {
       NOTREACHED();
-      expect_behavior = 0;
     }
 
     EXPECT_EQ(behavior, expect_behavior);
@@ -444,8 +443,8 @@ class TestExceptionPorts : public MachMultiprocess,
 
     ScopedForbidReturn threads_need_owners;
     ASSERT_EQ(thread_count, 2u);
-    base::mac::ScopedMachSendRight main_thread(threads[0]);
-    base::mac::ScopedMachSendRight other_thread(threads[1]);
+    base::apple::ScopedMachSendRight main_thread(threads[0]);
+    base::apple::ScopedMachSendRight other_thread(threads[1]);
     threads_need_owners.Disarm();
 
     ExceptionPorts main_thread_ports(ExceptionPorts::kTargetTypeThread,
@@ -467,7 +466,7 @@ class TestExceptionPorts : public MachMultiprocess,
           mach_task_self(), local_port, local_port, MACH_MSG_TYPE_MAKE_SEND);
       ASSERT_EQ(kr, KERN_SUCCESS)
           << MachErrorMessage(kr, "mach_port_insert_right");
-      base::mac::ScopedMachSendRight send_owner(local_port);
+      base::apple::ScopedMachSendRight send_owner(local_port);
 
       switch (set_or_swap_) {
         case kSetExceptionPort: {
@@ -555,13 +554,12 @@ class TestExceptionPorts : public MachMultiprocess,
       UniversalMachExcServer universal_mach_exc_server(this);
 
       constexpr mach_msg_timeout_t kTimeoutMs = 50;
-      kern_return_t kr =
-          MachMessageServer::Run(&universal_mach_exc_server,
-                                 local_port,
-                                 kMachMessageReceiveAuditTrailer,
-                                 MachMessageServer::kOneShot,
-                                 MachMessageServer::kReceiveLargeError,
-                                 kTimeoutMs);
+      kr = MachMessageServer::Run(&universal_mach_exc_server,
+                                  local_port,
+                                  kMachMessageReceiveAuditTrailer,
+                                  MachMessageServer::kOneShot,
+                                  MachMessageServer::kReceiveLargeError,
+                                  kTimeoutMs);
       EXPECT_EQ(kr, KERN_SUCCESS)
           << MachErrorMessage(kr, "MachMessageServer::Run");
 
@@ -820,7 +818,7 @@ TEST(ExceptionPorts, HostExceptionPorts) {
 
   const bool expect_success = geteuid() == 0;
 
-  base::mac::ScopedMachSendRight host(mach_host_self());
+  base::apple::ScopedMachSendRight host(mach_host_self());
   ExceptionPorts explicit_host_ports(ExceptionPorts::kTargetTypeHost,
                                      host.get());
   EXPECT_STREQ("host", explicit_host_ports.TargetTypeName());
diff --git a/extern/crashpad/crashpad/util/mach/exception_types.cc b/extern/crashpad/crashpad/util/mach/exception_types.cc
index 9c9bbd42a5..f9e1923f7a 100644
--- a/extern/crashpad/crashpad/util/mach/exception_types.cc
+++ b/extern/crashpad/crashpad/util/mach/exception_types.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,9 +21,9 @@
 #include <libproc.h>
 #include <strings.h>
 
+#include "base/apple/mach_logging.h"
 #include "base/check_op.h"
 #include "base/logging.h"
-#include "base/mac/mach_logging.h"
 #include "util/mac/mac_util.h"
 #include "util/mach/mach_extensions.h"
 #include "util/misc/no_cfi_icall.h"
@@ -135,14 +135,15 @@ exception_type_t ExcCrashRecoverOriginalException(
 bool ExcCrashCouldContainException(exception_type_t exception) {
   // EXC_CRASH should never be wrapped in another EXC_CRASH.
   //
-  // EXC_RESOURCE and EXC_GUARD are software exceptions that are never wrapped
-  // in EXC_CRASH. The only time EXC_CRASH is generated is for processes exiting
-  // due to an unhandled core-generating signal or being killed by SIGKILL for
-  // code-signing reasons. Neither of these apply to EXC_RESOURCE or EXC_GUARD.
-  // See 10.10 xnu-2782.1.97/bsd/kern/kern_exit.c proc_prepareexit(). Receiving
-  // these exception types wrapped in EXC_CRASH would lose information because
-  // their code[0] uses all 64 bits (see ExceptionSnapshotMac::Initialize()) and
-  // the code[0] recovered from EXC_CRASH only contains 20 significant bits.
+  // EXC_RESOURCE is a software exceptions that is never wrapped in EXC_CRASH.
+  // The same applies to EXC_GUARD below macOS 13. The only time EXC_CRASH is
+  // generated is for processes exiting due to an unhandled core-generating
+  // signal or being killed by SIGKILL for code-signing reasons. Neither of
+  // these apply to EXC_RESOURCE or EXC_GUARD. See 10.10
+  // xnu-2782.1.97/bsd/kern/kern_exit.c proc_prepareexit(). Receiving these
+  // exception types wrapped in EXC_CRASH would lose information because their
+  // code[0] uses all 64 bits (see ExceptionSnapshotMac::Initialize()) and the
+  // code[0] recovered from EXC_CRASH only contains 20 significant bits.
   //
   // EXC_CORPSE_NOTIFY may be generated from EXC_CRASH, but the opposite should
   // never occur.
@@ -150,11 +151,11 @@ bool ExcCrashCouldContainException(exception_type_t exception) {
   // kMachExceptionSimulated is a non-fatal Crashpad-specific pseudo-exception
   // that never exists as an exception within the kernel and should thus never
   // be wrapped in EXC_CRASH.
-  return exception != EXC_CRASH &&
-         exception != EXC_RESOURCE &&
-         exception != EXC_GUARD &&
-         exception != EXC_CORPSE_NOTIFY &&
-         exception != kMachExceptionSimulated;
+  if (MacOSVersionNumber() < 13'00'00 && exception == EXC_GUARD) {
+    return false;
+  }
+  return exception != EXC_CRASH && exception != EXC_RESOURCE &&
+         exception != EXC_CORPSE_NOTIFY && exception != kMachExceptionSimulated;
 }
 
 int32_t ExceptionCodeForMetrics(exception_type_t exception,
diff --git a/extern/crashpad/crashpad/util/mach/exception_types.h b/extern/crashpad/crashpad/util/mach/exception_types.h
index 5082ed194f..e10419a0c1 100644
--- a/extern/crashpad/crashpad/util/mach/exception_types.h
+++ b/extern/crashpad/crashpad/util/mach/exception_types.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/mach/exception_types_test.cc b/extern/crashpad/crashpad/util/mach/exception_types_test.cc
index 3e777ef246..a66a2be121 100644
--- a/extern/crashpad/crashpad/util/mach/exception_types_test.cc
+++ b/extern/crashpad/crashpad/util/mach/exception_types_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,7 +20,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"
@@ -71,7 +72,7 @@ TEST(ExceptionTypes, ExcCrashRecoverOriginalException) {
     // TODO(macos_arm64): Add arm64 test data.
   };
 
-  for (size_t index = 0; index < base::size(kTestData); ++index) {
+  for (size_t index = 0; index < std::size(kTestData); ++index) {
     const auto& test_data = kTestData[index];
     SCOPED_TRACE(base::StringPrintf(
         "index %zu, code_0 0x%llx", index, test_data.code_0));
@@ -88,7 +89,7 @@ TEST(ExceptionTypes, ExcCrashRecoverOriginalException) {
 
   // Now make sure that ExcCrashRecoverOriginalException() properly ignores
   // optional arguments.
-  static_assert(base::size(kTestData) >= 1, "must have something to test");
+  static_assert(std::size(kTestData) >= 1, "must have something to test");
   const auto& test_data = kTestData[0];
   EXPECT_EQ(
       ExcCrashRecoverOriginalException(test_data.code_0, nullptr, nullptr),
@@ -123,7 +124,6 @@ TEST(ExceptionTypes, ExcCrashCouldContainException) {
   EXPECT_TRUE(ExcCrashCouldContainException(EXC_RPC_ALERT));
   EXPECT_FALSE(ExcCrashCouldContainException(EXC_CRASH));
   EXPECT_FALSE(ExcCrashCouldContainException(EXC_RESOURCE));
-  EXPECT_FALSE(ExcCrashCouldContainException(EXC_GUARD));
   EXPECT_FALSE(ExcCrashCouldContainException(EXC_CORPSE_NOTIFY));
   EXPECT_FALSE(ExcCrashCouldContainException(kMachExceptionSimulated));
 }
@@ -248,7 +248,7 @@ TEST(ExceptionTypes, ExceptionCodeForMetrics) {
     {0x00010000, 0x00010000, static_cast<int32_t>(0xffffffff)},
   };
 
-  for (size_t index = 0; index < base::size(kTestData); ++index) {
+  for (size_t index = 0; index < std::size(kTestData); ++index) {
     const auto& test_data = kTestData[index];
     SCOPED_TRACE(base::StringPrintf("index %zu, exception 0x%x, code_0 0x%llx",
                                     index,
diff --git a/extern/crashpad/crashpad/util/mach/mach_extensions.cc b/extern/crashpad/crashpad/util/mach/mach_extensions.cc
index 7f80693888..463d364a0d 100644
--- a/extern/crashpad/crashpad/util/mach/mach_extensions.cc
+++ b/extern/crashpad/crashpad/util/mach/mach_extensions.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 #include <Availability.h>
 #include <pthread.h>
 
-#include "base/mac/mach_logging.h"
+#include "base/apple/mach_logging.h"
 #include "build/build_config.h"
 #include "util/mac/mac_util.h"
 
@@ -44,12 +44,12 @@ exception_mask_t ExcMaskAll() {
   // 10.9.4 xnu-2422.110.17/osfmk/mach/ipc_host.c and
   // xnu-2422.110.17/osfmk/mach/ipc_tt.c.
 
-#if defined(OS_IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_7_0
+#if BUILDFLAG(IS_IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_7_0
 // iOS 7 ≅ OS X 10.9.
 #error This code was not ported to iOS versions older than 7
 #endif
 
-#if defined(OS_MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_9
+#if BUILDFLAG(IS_MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_9
   const int macos_version_number = MacOSVersionNumber();
 #endif
 
@@ -66,7 +66,7 @@ exception_mask_t ExcMaskAll() {
       EXC_MASK_MACH_SYSCALL |
       EXC_MASK_RPC_ALERT |
       EXC_MASK_MACHINE;
-#if defined(OS_MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_8
+#if BUILDFLAG(IS_MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_8
   if (macos_version_number < 10'08'00) {
     return kExcMaskAll_10_6;
   }
@@ -76,7 +76,7 @@ exception_mask_t ExcMaskAll() {
   // xnu-2050.48.11/osfmk/mach/exception_types.h.
   constexpr exception_mask_t kExcMaskAll_10_8 =
       kExcMaskAll_10_6 | EXC_MASK_RESOURCE;
-#if defined(OS_MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_9
+#if BUILDFLAG(IS_MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_9
   if (macos_version_number < 10'09'00) {
     return kExcMaskAll_10_8;
   }
@@ -91,12 +91,12 @@ exception_mask_t ExcMaskAll() {
 
 exception_mask_t ExcMaskValid() {
   const exception_mask_t kExcMaskValid_10_6 = ExcMaskAll() | EXC_MASK_CRASH;
-#if defined(OS_IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_9_0
+#if BUILDFLAG(IS_IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_9_0
 // iOS 9 ≅ OS X 10.11.
 #error This code was not ported to iOS versions older than 9
 #endif
 
-#if defined(OS_MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_11
+#if BUILDFLAG(IS_MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_11
   if (MacOSVersionNumber() < 10'11'00) {
     return kExcMaskValid_10_6;
   }
diff --git a/extern/crashpad/crashpad/util/mach/mach_extensions.h b/extern/crashpad/crashpad/util/mach/mach_extensions.h
index 9247ce947c..03763e36d9 100644
--- a/extern/crashpad/crashpad/util/mach/mach_extensions.h
+++ b/extern/crashpad/crashpad/util/mach/mach_extensions.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -47,6 +47,9 @@ constexpr exception_behavior_t kMachExceptionCodes = MACH_EXCEPTION_CODES;
 //! \brief An exception type to use for simulated exceptions.
 constexpr exception_type_t kMachExceptionSimulated = 'CPsx';
 
+//! \brief An exception type to use for uncaught NSExceptions.
+constexpr exception_type_t kMachExceptionFromNSException = 'CPnx';
+
 //! \brief A const version of `thread_state_t`.
 //!
 //! This is useful as the \a old_state parameter to exception handler functions.
diff --git a/extern/crashpad/crashpad/util/mach/mach_extensions_test.cc b/extern/crashpad/crashpad/util/mach/mach_extensions_test.cc
index 4ff53d9422..31042f7caf 100644
--- a/extern/crashpad/crashpad/util/mach/mach_extensions_test.cc
+++ b/extern/crashpad/crashpad/util/mach/mach_extensions_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 
 #include "util/mach/mach_extensions.h"
 
-#include "base/mac/scoped_mach_port.h"
+#include "base/apple/scoped_mach_port.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"
 #include "test/mac/mach_errors.h"
@@ -25,12 +25,13 @@ namespace test {
 namespace {
 
 TEST(MachExtensions, MachThreadSelf) {
-  base::mac::ScopedMachSendRight thread_self(mach_thread_self());
+  base::apple::ScopedMachSendRight thread_self(mach_thread_self());
   EXPECT_EQ(MachThreadSelf(), thread_self);
 }
 
 TEST(MachExtensions, NewMachPort_Receive) {
-  base::mac::ScopedMachReceiveRight port(NewMachPort(MACH_PORT_RIGHT_RECEIVE));
+  base::apple::ScopedMachReceiveRight port(
+      NewMachPort(MACH_PORT_RIGHT_RECEIVE));
   ASSERT_NE(port, kMachPortNull);
 
   mach_port_type_t type;
@@ -41,7 +42,7 @@ TEST(MachExtensions, NewMachPort_Receive) {
 }
 
 TEST(MachExtensions, NewMachPort_PortSet) {
-  base::mac::ScopedMachPortSet port(NewMachPort(MACH_PORT_RIGHT_PORT_SET));
+  base::apple::ScopedMachPortSet port(NewMachPort(MACH_PORT_RIGHT_PORT_SET));
   ASSERT_NE(port, kMachPortNull);
 
   mach_port_type_t type;
@@ -52,7 +53,7 @@ TEST(MachExtensions, NewMachPort_PortSet) {
 }
 
 TEST(MachExtensions, NewMachPort_DeadName) {
-  base::mac::ScopedMachSendRight port(NewMachPort(MACH_PORT_RIGHT_DEAD_NAME));
+  base::apple::ScopedMachSendRight port(NewMachPort(MACH_PORT_RIGHT_DEAD_NAME));
   ASSERT_NE(port, kMachPortNull);
 
   mach_port_type_t type;
@@ -80,11 +81,11 @@ TEST(MachExtensions, ExcMaskAll) {
   EXPECT_FALSE(exc_mask_all & EXC_MASK_CRASH);
   EXPECT_FALSE(exc_mask_all & EXC_MASK_CORPSE_NOTIFY);
 
-#if defined(OS_IOS)
+#if BUILDFLAG(IS_IOS)
   // Assume at least iOS 7 (≅ OS X 10.9).
   EXPECT_TRUE(exc_mask_all & EXC_MASK_RESOURCE);
   EXPECT_TRUE(exc_mask_all & EXC_MASK_GUARD);
-#else  // OS_IOS
+#else  // BUILDFLAG(IS_IOS)
   const int macos_version_number = MacOSVersionNumber();
   if (macos_version_number >= 10'08'00) {
     EXPECT_TRUE(exc_mask_all & EXC_MASK_RESOURCE);
@@ -97,7 +98,7 @@ TEST(MachExtensions, ExcMaskAll) {
   } else {
     EXPECT_FALSE(exc_mask_all & EXC_MASK_GUARD);
   }
-#endif  // OS_IOS
+#endif  // BUILDFLAG(IS_IOS)
 
   // Bit 0 should not be set.
   EXPECT_FALSE(ExcMaskAll() & 1);
@@ -112,12 +113,12 @@ TEST(MachExtensions, ExcMaskValid) {
 
   EXPECT_TRUE(exc_mask_valid & EXC_MASK_CRASH);
 
-#if defined(OS_IOS)
+#if BUILDFLAG(IS_IOS)
   // Assume at least iOS 9 (≅ OS X 10.11).
   EXPECT_TRUE(exc_mask_valid & EXC_MASK_RESOURCE);
   EXPECT_TRUE(exc_mask_valid & EXC_MASK_GUARD);
   EXPECT_TRUE(exc_mask_valid & EXC_MASK_CORPSE_NOTIFY);
-#else  // OS_IOS
+#else  // BUILDFLAG(IS_IOS)
   const int macos_version_number = MacOSVersionNumber();
   if (macos_version_number >= 10'08'00) {
     EXPECT_TRUE(exc_mask_valid & EXC_MASK_RESOURCE);
@@ -136,7 +137,7 @@ TEST(MachExtensions, ExcMaskValid) {
   } else {
     EXPECT_FALSE(exc_mask_valid & EXC_MASK_CORPSE_NOTIFY);
   }
-#endif  // OS_IOS
+#endif  // BUILDFLAG(IS_IOS)
 
   // Bit 0 should not be set.
   EXPECT_FALSE(ExcMaskValid() & 1);
diff --git a/extern/crashpad/crashpad/util/mach/mach_message.cc b/extern/crashpad/crashpad/util/mach/mach_message.cc
index 00fe116f88..28e4227917 100644
--- a/extern/crashpad/crashpad/util/mach/mach_message.cc
+++ b/extern/crashpad/crashpad/util/mach/mach_message.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,14 +18,15 @@
 
 #include <limits>
 
+#include "base/apple/mach_logging.h"
 #include "base/logging.h"
-#include "base/mac/mach_logging.h"
+#include "build/build_config.h"
 #include "util/misc/clock.h"
 #include "util/misc/implicit_cast.h"
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 #include <bsm/libbsm.h>
-#endif  // OS_MAC
+#endif  // BUILDFLAG(IS_MAC)
 
 namespace crashpad {
 
@@ -253,7 +254,7 @@ bool MachMessageDestroyReceivedPort(mach_port_t port,
   }
 }
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 
 pid_t AuditPIDFromMachMessageTrailer(const mach_msg_trailer_t* trailer) {
   if (trailer->msgh_trailer_type != MACH_MSG_TRAILER_FORMAT_0) {
@@ -287,6 +288,6 @@ pid_t AuditPIDFromMachMessageTrailer(const mach_msg_trailer_t* trailer) {
   return audit_pid;
 }
 
-#endif  // OS_MAC
+#endif  // BUILDFLAG(IS_MAC)
 
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/util/mach/mach_message.h b/extern/crashpad/crashpad/util/mach/mach_message.h
index c58b6d05fa..0f5040389e 100644
--- a/extern/crashpad/crashpad/util/mach/mach_message.h
+++ b/extern/crashpad/crashpad/util/mach/mach_message.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -183,7 +183,7 @@ const mach_msg_trailer_t* MachMessageTrailerFromHeader(
 bool MachMessageDestroyReceivedPort(mach_port_t port,
                                     mach_msg_type_name_t port_right_type);
 
-#if defined(OS_MAC) || DOXYGEN
+#if BUILDFLAG(IS_MAC) || DOXYGEN
 
 //! \brief Returns the process ID of a Mach message’s sender from its audit
 //!     trailer.
@@ -201,7 +201,7 @@ bool MachMessageDestroyReceivedPort(mach_port_t port,
 //!     audit information.
 pid_t AuditPIDFromMachMessageTrailer(const mach_msg_trailer_t* trailer);
 
-#endif  // OS_MAC
+#endif  // BUILDFLAG(IS_MAC)
 
 }  // namespace crashpad
 
diff --git a/extern/crashpad/crashpad/util/mach/mach_message_server.cc b/extern/crashpad/crashpad/util/mach/mach_message_server.cc
index 8cf119c4a3..b4509a9a3a 100644
--- a/extern/crashpad/crashpad/util/mach/mach_message_server.cc
+++ b/extern/crashpad/crashpad/util/mach/mach_message_server.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,9 +18,10 @@
 
 #include <limits>
 
+#include "base/apple/mach_logging.h"
+#include "base/apple/scoped_mach_vm.h"
+#include "base/check_op.h"
 #include "base/logging.h"
-#include "base/mac/mach_logging.h"
-#include "base/mac/scoped_mach_vm.h"
 #include "util/mach/mach_message.h"
 
 namespace crashpad {
@@ -83,7 +84,7 @@ class MachMessageBuffer {
   }
 
  private:
-  base::mac::ScopedMachVM vm_;
+  base::apple::ScopedMachVM vm_;
 };
 
 // Wraps MachMessageWithDeadline(), using a MachMessageBuffer argument which
diff --git a/extern/crashpad/crashpad/util/mach/mach_message_server.h b/extern/crashpad/crashpad/util/mach/mach_message_server.h
index 67812917e3..64dffcaae1 100644
--- a/extern/crashpad/crashpad/util/mach/mach_message_server.h
+++ b/extern/crashpad/crashpad/util/mach/mach_message_server.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/mach/mach_message_server_test.cc b/extern/crashpad/crashpad/util/mach/mach_message_server_test.cc
index 6785827b98..335aa7bfde 100644
--- a/extern/crashpad/crashpad/util/mach/mach_message_server_test.cc
+++ b/extern/crashpad/crashpad/util/mach/mach_message_server_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,10 +19,10 @@
 #include <string.h>
 #include <sys/types.h>
 
+#include <iterator>
 #include <set>
 
-#include "base/cxx17_backports.h"
-#include "base/mac/scoped_mach_port.h"
+#include "base/apple/scoped_mach_port.h"
 #include "gtest/gtest.h"
 #include "test/mac/mach_errors.h"
 #include "test/mac/mach_multiprocess.h"
@@ -284,7 +284,7 @@ class TestMachMessageServer : public MachMessageServer::Interface,
   std::set<mach_msg_id_t> MachMessageServerRequestIDs() override {
     static constexpr mach_msg_id_t request_ids[] = {kRequestMessageID};
     return std::set<mach_msg_id_t>(&request_ids[0],
-                                   &request_ids[base::size(request_ids)]);
+                                   &request_ids[std::size(request_ids)]);
   }
 
   mach_msg_size_t MachMessageServerRequestSize() override {
@@ -445,7 +445,7 @@ class TestMachMessageServer : public MachMessageServer::Interface,
     // local_receive_port_owner will the receive right that is created in this
     // scope and intended to be destroyed when leaving this scope, after it has
     // been carried in a Mach message.
-    base::mac::ScopedMachReceiveRight local_receive_port_owner;
+    base::apple::ScopedMachReceiveRight local_receive_port_owner;
 
     // A LargeRequestMessage is always allocated, but the message that will be
     // sent will be a normal RequestMessage due to the msgh_size field
@@ -582,7 +582,7 @@ class TestMachMessageServer : public MachMessageServer::Interface,
   // A receive right allocated in the child process. A send right will be
   // created from this right and sent to the parent parent process in the
   // request message.
-  base::mac::ScopedMachReceiveRight child_complex_message_port_;
+  base::apple::ScopedMachReceiveRight child_complex_message_port_;
 
   // The send right received in the parent process. This right is stored in a
   // member variable to test that resources carried in complex messages are
diff --git a/extern/crashpad/crashpad/util/mach/mach_message_test.cc b/extern/crashpad/crashpad/util/mach/mach_message_test.cc
index 5af954e4e2..5698179eaf 100644
--- a/extern/crashpad/crashpad/util/mach/mach_message_test.cc
+++ b/extern/crashpad/crashpad/util/mach/mach_message_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,8 +16,10 @@
 
 #include <unistd.h>
 
-#include "base/mac/scoped_mach_port.h"
-#include "base/macros.h"
+#include <tuple>
+
+#include "base/apple/scoped_mach_port.h"
+#include "build/build_config.h"
 #include "gtest/gtest.h"
 #include "test/mac/mach_errors.h"
 #include "util/mach/mach_extensions.h"
@@ -114,7 +116,7 @@ TEST(MachMessage, MachMessageDestroyReceivedPort) {
   ASSERT_NE(port, kMachPortNull);
   EXPECT_TRUE(MachMessageDestroyReceivedPort(port, MACH_MSG_TYPE_PORT_RECEIVE));
 
-  base::mac::ScopedMachReceiveRight receive(
+  base::apple::ScopedMachReceiveRight receive(
       NewMachPort(MACH_PORT_RIGHT_RECEIVE));
   mach_msg_type_name_t right_type;
   kern_return_t kr = mach_port_extract_right(mach_task_self(),
@@ -154,14 +156,15 @@ TEST(MachMessage, MachMessageDestroyReceivedPort) {
   ASSERT_EQ(right_type,
             implicit_cast<mach_msg_type_name_t>(MACH_MSG_TYPE_PORT_SEND));
   EXPECT_TRUE(MachMessageDestroyReceivedPort(port, MACH_MSG_TYPE_PORT_RECEIVE));
-  ignore_result(receive.release());
+  std::ignore = receive.release();
   EXPECT_TRUE(MachMessageDestroyReceivedPort(port, MACH_MSG_TYPE_PORT_SEND));
 }
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 
 TEST(MachMessage, AuditPIDFromMachMessageTrailer) {
-  base::mac::ScopedMachReceiveRight port(NewMachPort(MACH_PORT_RIGHT_RECEIVE));
+  base::apple::ScopedMachReceiveRight port(
+      NewMachPort(MACH_PORT_RIGHT_RECEIVE));
   ASSERT_NE(port, kMachPortNull);
 
   mach_msg_empty_send_t send = {};
@@ -200,7 +203,7 @@ TEST(MachMessage, AuditPIDFromMachMessageTrailer) {
   EXPECT_EQ(AuditPIDFromMachMessageTrailer(&receive.trailer), getpid());
 }
 
-#endif  // OS_MAC
+#endif  // BUILDFLAG(IS_MAC)
 
 }  // namespace
 }  // namespace test
diff --git a/extern/crashpad/crashpad/util/mach/mig.py b/extern/crashpad/crashpad/util/mach/mig.py
index 53a7a5bd1d..4e4a061b0a 100755
--- a/extern/crashpad/crashpad/util/mach/mig.py
+++ b/extern/crashpad/crashpad/util/mach/mig.py
@@ -1,6 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
-# Copyright 2019 The Crashpad Authors. All rights reserved.
+# Copyright 2019 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
 # limitations under the License.
 
 import os
-import shutil
 import sys
 import tempfile
 
@@ -31,17 +30,33 @@ def _try_remove(*paths):
             pass
 
 
-def _generate_and_fix(user_c, server_c, user_h, server_h, defs, include, sdk,
-                      clang_path, mig_path, migcom_path, arch):
+def _generate_and_fix(user_c,
+                      server_c,
+                      user_h,
+                      server_h,
+                      defs,
+                      sdk=None,
+                      clang_path=None,
+                      mig_path=None,
+                      migcom_path=None,
+                      arch=None,
+                      mig_args=None):
     interface = mig_gen.MigInterface(user_c, server_c, user_h, server_h)
-    mig_gen.generate_interface(defs, interface, include, sdk, clang_path,
-                               mig_path, migcom_path, arch)
+    mig_gen.generate_interface(defs,
+                               interface,
+                               sdk=sdk,
+                               clang_path=clang_path,
+                               mig_path=mig_path,
+                               migcom_path=migcom_path,
+                               arch=arch,
+                               mig_args=mig_args)
     mig_fix.fix_interface(interface)
 
 
 def _wrap_arch_guards(file, arch):
     contents = '#if defined(__%s__)\n' % arch
-    contents += open(file, 'r').read()
+    with open(file, 'r') as f:
+        contents += f.read()
     contents += '\n#endif  /* __%s__ */\n' % arch
     return contents
 
@@ -57,11 +72,18 @@ def main(args):
     _try_remove(parsed.user_c, parsed.server_c, parsed.user_h, parsed.server_h)
 
     if len(parsed.arch) <= 1:
-        _generate_and_fix(parsed.user_c, parsed.server_c, parsed.user_h,
-                          parsed.server_h, parsed.defs, parsed.include,
-                          parsed.sdk, parsed.clang_path, parsed.mig_path,
-                          parsed.migcom_path,
-                          parsed.arch[0] if len(parsed.arch) >= 1 else None)
+        _generate_and_fix(
+            user_c=parsed.user_c,
+            server_c=parsed.server_c,
+            user_h=parsed.user_h,
+            server_h=parsed.server_h,
+            defs=parsed.defs,
+            sdk=parsed.sdk,
+            clang_path=parsed.clang_path,
+            mig_path=parsed.mig_path,
+            migcom_path=parsed.migcom_path,
+            arch=parsed.arch[0] if len(parsed.arch) >= 1 else None,
+            mig_args=parsed.mig_args)
         return 0
 
     # Run mig once per architecture, and smush everything together, wrapped in
@@ -73,23 +95,28 @@ def main(args):
     server_h_data = ''
 
     for arch in parsed.arch:
-        # Python 3: use tempfile.TempDirectory instead
-        temp_dir = tempfile.mkdtemp(prefix=os.path.basename(sys.argv[0]) + '_')
-        try:
+        with tempfile.TemporaryDirectory(prefix=os.path.basename(sys.argv[0]) +
+                                         '_') as temp_dir:
             user_c = os.path.join(temp_dir, os.path.basename(parsed.user_c))
             server_c = os.path.join(temp_dir, os.path.basename(parsed.server_c))
             user_h = os.path.join(temp_dir, os.path.basename(parsed.user_h))
             server_h = os.path.join(temp_dir, os.path.basename(parsed.server_h))
-            _generate_and_fix(user_c, server_c, user_h, server_h, parsed.defs,
-                              parsed.include, parsed.sdk, parsed.clang_path,
-                              parsed.mig_path, parsed.migcom_path, arch)
+            _generate_and_fix(user_c=user_c,
+                              server_c=server_c,
+                              user_h=user_h,
+                              server_h=server_h,
+                              defs=parsed.defs,
+                              sdk=parsed.sdk,
+                              clang_path=parsed.clang_path,
+                              mig_path=parsed.mig_path,
+                              migcom_path=parsed.migcom_path,
+                              arch=arch,
+                              mig_args=parsed.mig_args)
 
             user_c_data += _wrap_arch_guards(user_c, arch)
             server_c_data += _wrap_arch_guards(server_c, arch)
             user_h_data += _wrap_arch_guards(user_h, arch)
             server_h_data += _wrap_arch_guards(server_h, arch)
-        finally:
-            shutil.rmtree(temp_dir)
 
     _write_file(parsed.user_c, user_c_data)
     _write_file(parsed.server_c, server_c_data)
diff --git a/extern/crashpad/crashpad/util/mach/mig_fix.py b/extern/crashpad/crashpad/util/mach/mig_fix.py
index 037746fac3..2151ad2215 100755
--- a/extern/crashpad/crashpad/util/mach/mig_fix.py
+++ b/extern/crashpad/crashpad/util/mach/mig_fix.py
@@ -1,7 +1,6 @@
-#!/usr/bin/env python
-# coding: utf-8
+#!/usr/bin/env python3
 
-# Copyright 2019 The Crashpad Authors. All rights reserved.
+# Copyright 2019 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,6 +22,33 @@
 from mig_gen import MigInterface
 
 
+def _make_generated_comments_deterministic(contents):
+    """Replaces generated code comments with determenistic ones.
+
+    This is what is generated by mig (only in .c files):
+    /*
+     * IDENTIFICATION:
+     * stub generated Mon Jan 17 15:28:03 2022
+     * with a MiG generated by bootstrap_cmds-122
+     * OPTIONS:
+     */
+
+    We look for two specific lines and replace them like so:
+    /*
+     * IDENTIFICATION:
+     * stub generated <suppressed by mig_fix.py>
+     * with a MiG generated by <suppressed by mig_fix.py>
+     * OPTIONS:
+     */
+    """
+
+    return re.sub(r'^( \* (?:stub generated|with a MiG generated by) ).+$',
+                  r'\1<suppressed by mig_fix.py>',
+                  contents,
+                  count=2,
+                  flags=re.MULTILINE)
+
+
 def _fix_user_implementation(implementation, fixed_implementation, header,
                              fixed_header):
     """Rewrites a MIG-generated user implementation (.c) file.
@@ -33,7 +59,8 @@ def _fix_user_implementation(implementation, fixed_implementation, header,
     unused in the user implementation file, and this will trigger a
     -Wunused-local-typedefs warning in gcc unless removed or marked with the
     “unused” attribute. Also changes header references to point to the new
-    header filename, if changed.
+    header filename, if changed. Replaces generated code comments with
+    deterministic ones.
 
     If |fixed_implementation| is None, overwrites the original; otherwise, puts
     the result in the file at |fixed_implementation|.
@@ -42,7 +69,7 @@ def _fix_user_implementation(implementation, fixed_implementation, header,
     file = open(implementation, 'r+' if fixed_implementation is None else 'r')
     contents = file.read()
 
-    pattern = re.compile('^(\t} __Reply);$', re.MULTILINE)
+    pattern = re.compile('^(\t} __Reply);$', flags=re.MULTILINE)
     contents = pattern.sub(r'\1 __attribute__((unused));', contents)
 
     if fixed_header is not None:
@@ -50,6 +77,9 @@ def _fix_user_implementation(implementation, fixed_implementation, header,
             '#include "%s"' % os.path.basename(header),
             '#include "%s"' % os.path.basename(fixed_header))
 
+    # Replace generated code comments with determenistic ones.
+    contents = _make_generated_comments_deterministic(contents)
+
     if fixed_implementation is None:
         file.seek(0)
         file.truncate()
@@ -71,6 +101,7 @@ def _fix_server_implementation(implementation, fixed_implementation, header,
     added to a header file, so that other files that include that header file
     will have access to these declarations from a compilation perspective. Also
     changes header references to point to the new header filename, if changed.
+    Replaces generated code comments with deterministic ones.
 
     If |fixed_implementation| is None or not provided, overwrites the original;
     otherwise, puts the result in the file at |fixed_implementation|.
@@ -81,7 +112,7 @@ def _fix_server_implementation(implementation, fixed_implementation, header,
 
     # Find interesting declarations.
     declaration_pattern = re.compile(
-        '^mig_internal (kern_return_t __MIG_check__.*)$', re.MULTILINE)
+        '^mig_internal (kern_return_t __MIG_check__.*)$', flags=re.MULTILINE)
     declarations = declaration_pattern.findall(contents)
 
     # Remove “__attribute__((__unused__))” from the declarations, and call them
@@ -117,6 +148,9 @@ def _fix_server_implementation(implementation, fixed_implementation, header,
             '#include "%s"' % os.path.basename(header),
             '#include "%s"' % os.path.basename(fixed_header))
 
+    # Replace generated code comments with determenistic ones.
+    contents = _make_generated_comments_deterministic(contents)
+
     if fixed_implementation is None:
         file.seek(0)
         file.truncate()
diff --git a/extern/crashpad/crashpad/util/mach/mig_gen.py b/extern/crashpad/crashpad/util/mach/mig_gen.py
index 99b4f7ec6b..9bb57f607e 100755
--- a/extern/crashpad/crashpad/util/mach/mig_gen.py
+++ b/extern/crashpad/crashpad/util/mach/mig_gen.py
@@ -1,6 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
-# Copyright 2019 The Crashpad Authors. All rights reserved.
+# Copyright 2019 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -26,12 +26,12 @@
 
 def generate_interface(defs,
                        interface,
-                       includes=[],
                        sdk=None,
                        clang_path=None,
                        mig_path=None,
                        migcom_path=None,
-                       arch=None):
+                       arch=None,
+                       mig_args=None):
     if mig_path is None:
         mig_path = 'mig'
 
@@ -53,14 +53,18 @@ def generate_interface(defs,
         command.extend(['-arch', arch])
     if sdk is not None:
         command.extend(['-isysroot', sdk])
-    for include in includes:
-        command.extend(['-I' + include])
+    if mig_args:
+        command.extend(mig_args)
     command.append(defs)
     subprocess.check_call(command)
 
 
 def parse_args(args, multiple_arch=False):
-    parser = argparse.ArgumentParser()
+    parser = argparse.ArgumentParser(
+        description="A utility for Mach Interface Generator (MIG) compilation.",
+        usage=
+        "%(prog)s [OPTIONS] <defs> <user_c> <server_c> <user_h> <server_h> -- [mig arguments]"
+    )
     parser.add_argument('--clang-path', help='Path to clang')
     parser.add_argument('--mig-path', help='Path to mig')
     parser.add_argument('--migcom-path', help='Path to migcom')
@@ -73,16 +77,12 @@ def parse_args(args, multiple_arch=False):
             action='append',
             help='Target architecture (may appear multiple times)')
     parser.add_argument('--sdk', help='Path to SDK')
-    parser.add_argument(
-        '--include',
-        default=[],
-        action='append',
-        help='Additional include directory (may appear multiple times)')
     parser.add_argument('defs')
     parser.add_argument('user_c')
     parser.add_argument('server_c')
     parser.add_argument('user_h')
     parser.add_argument('server_h')
+    parser.add_argument('mig_args', nargs="*")
     return parser.parse_args(args)
 
 
@@ -90,9 +90,14 @@ def main(args):
     parsed = parse_args(args)
     interface = MigInterface(parsed.user_c, parsed.server_c, parsed.user_h,
                              parsed.server_h)
-    generate_interface(parsed.defs, interface, parsed.include, parsed.sdk,
-                       parsed.clang_path, parsed.mig_path, parsed.migcom_path,
-                       parsed.arch)
+    generate_interface(parsed.defs,
+                       interface,
+                       sdk=parsed.sdk,
+                       clang_path=parsed.clang_path,
+                       mig_path=parsed.mig_path,
+                       migcom_path=parsed.migcom_path,
+                       arch=parsed.arch,
+                       mig_args=parsed.mig_args)
 
 
 if __name__ == '__main__':
diff --git a/extern/crashpad/crashpad/util/mach/notify_server.cc b/extern/crashpad/crashpad/util/mach/notify_server.cc
index e625419e93..18acef3800 100644
--- a/extern/crashpad/crashpad/util/mach/notify_server.cc
+++ b/extern/crashpad/crashpad/util/mach/notify_server.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,8 @@
 
 #include "util/mach/notify_server.h"
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+
 #include "util/mach/mach_message.h"
 #include "util/mach/notifyServer.h"
 
@@ -227,7 +228,7 @@ std::set<mach_msg_id_t> NotifyServer::MachMessageServerRequestIDs() {
       MACH_NOTIFY_DEAD_NAME,
   };
   return std::set<mach_msg_id_t>(&request_ids[0],
-                                 &request_ids[base::size(request_ids)]);
+                                 &request_ids[std::size(request_ids)]);
 }
 
 mach_msg_size_t NotifyServer::MachMessageServerRequestSize() {
diff --git a/extern/crashpad/crashpad/util/mach/notify_server.h b/extern/crashpad/crashpad/util/mach/notify_server.h
index 9e3182068c..1ad67ece85 100644
--- a/extern/crashpad/crashpad/util/mach/notify_server.h
+++ b/extern/crashpad/crashpad/util/mach/notify_server.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/mach/notify_server_test.cc b/extern/crashpad/crashpad/util/mach/notify_server_test.cc
index 98a68820f4..e068e0e450 100644
--- a/extern/crashpad/crashpad/util/mach/notify_server_test.cc
+++ b/extern/crashpad/crashpad/util/mach/notify_server_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 
 #include <stddef.h>
 
+#include "base/apple/scoped_mach_port.h"
 #include "base/compiler_specific.h"
-#include "base/mac/scoped_mach_port.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include "test/mac/mach_errors.h"
@@ -33,7 +33,6 @@ namespace {
 using testing::AllOf;
 using testing::DoAll;
 using testing::Eq;
-using testing::Invoke;
 using testing::Pointee;
 using testing::ResultOf;
 using testing::Return;
@@ -234,7 +233,7 @@ class NotifyServerTestBase : public testing::Test,
       return false;
     }
 
-    base::mac::ScopedMachSendRight previous_owner(previous);
+    base::apple::ScopedMachSendRight previous_owner(previous);
     EXPECT_EQ(previous, kMachPortNull);
 
     return true;
@@ -284,7 +283,7 @@ class NotifyServerTestBase : public testing::Test,
   void TearDown() override { server_port_.reset(); }
 
  private:
-  base::mac::ScopedMachReceiveRight server_port_;
+  base::apple::ScopedMachReceiveRight server_port_;
 };
 
 using NotifyServerTest = StrictMock<NotifyServerTestBase>;
@@ -319,11 +318,11 @@ TEST_F(NotifyServerTest, NoNotification) {
 // When a send-once right with a dead-name notification request is deallocated,
 // a port-deleted notification should be generated.
 TEST_F(NotifyServerTest, MachNotifyPortDeleted) {
-  base::mac::ScopedMachReceiveRight receive_right(
+  base::apple::ScopedMachReceiveRight receive_right(
       NewMachPort(MACH_PORT_RIGHT_RECEIVE));
   ASSERT_TRUE(receive_right.is_valid());
 
-  base::mac::ScopedMachSendRight send_once_right(
+  base::apple::ScopedMachSendRight send_once_right(
       SendOnceRightFromReceiveRight(receive_right.get()));
   ASSERT_TRUE(send_once_right.is_valid());
 
@@ -346,7 +345,7 @@ TEST_F(NotifyServerTest, MachNotifyPortDeleted) {
 // When a receive right with a port-destroyed notification request is destroyed,
 // a port-destroyed notification should be generated.
 TEST_F(NotifyServerTest, MachNotifyPortDestroyed) {
-  base::mac::ScopedMachReceiveRight receive_right(
+  base::apple::ScopedMachReceiveRight receive_right(
       NewMachPort(MACH_PORT_RIGHT_RECEIVE));
   ASSERT_TRUE(receive_right.is_valid());
 
@@ -370,7 +369,7 @@ TEST_F(NotifyServerTest, MachNotifyPortDestroyed) {
 // When a receive right with a port-destroyed notification request is not
 // destroyed, no port-destroyed notification should be generated.
 TEST_F(NotifyServerTest, MachNotifyPortDestroyed_NoNotification) {
-  base::mac::ScopedMachReceiveRight receive_right(
+  base::apple::ScopedMachReceiveRight receive_right(
       NewMachPort(MACH_PORT_RIGHT_RECEIVE));
   ASSERT_TRUE(receive_right.is_valid());
 
@@ -383,7 +382,7 @@ TEST_F(NotifyServerTest, MachNotifyPortDestroyed_NoNotification) {
 // When a no-senders notification request is registered for a receive right with
 // no senders, a no-senders notification should be generated.
 TEST_F(NotifyServerTest, MachNotifyNoSenders_NoSendRight) {
-  base::mac::ScopedMachReceiveRight receive_right(
+  base::apple::ScopedMachReceiveRight receive_right(
       NewMachPort(MACH_PORT_RIGHT_RECEIVE));
   ASSERT_TRUE(receive_right.is_valid());
 
@@ -403,11 +402,11 @@ TEST_F(NotifyServerTest, MachNotifyNoSenders_NoSendRight) {
 // notification request is deallocated, a no-senders notification should be
 // generated.
 TEST_F(NotifyServerTest, MachNotifyNoSenders_SendRightDeallocated) {
-  base::mac::ScopedMachReceiveRight receive_right(
+  base::apple::ScopedMachReceiveRight receive_right(
       NewMachPort(MACH_PORT_RIGHT_RECEIVE));
   ASSERT_TRUE(receive_right.is_valid());
 
-  base::mac::ScopedMachSendRight send_right(
+  base::apple::ScopedMachSendRight send_right(
       SendRightFromReceiveRight(receive_right.get()));
   ASSERT_TRUE(send_right.is_valid());
 
@@ -428,15 +427,15 @@ TEST_F(NotifyServerTest, MachNotifyNoSenders_SendRightDeallocated) {
 // When the a receive right with a no-senders notification request never loses
 // all senders, no no-senders notification should be generated.
 TEST_F(NotifyServerTest, MachNotifyNoSenders_NoNotification) {
-  base::mac::ScopedMachReceiveRight receive_right(
+  base::apple::ScopedMachReceiveRight receive_right(
       NewMachPort(MACH_PORT_RIGHT_RECEIVE));
   ASSERT_TRUE(receive_right.is_valid());
 
-  base::mac::ScopedMachSendRight send_right_0(
+  base::apple::ScopedMachSendRight send_right_0(
       SendRightFromReceiveRight(receive_right.get()));
   ASSERT_TRUE(send_right_0.is_valid());
 
-  base::mac::ScopedMachSendRight send_right_1(
+  base::apple::ScopedMachSendRight send_right_1(
       SendRightFromReceiveRight(receive_right.get()));
   ASSERT_TRUE(send_right_1.is_valid());
 
@@ -454,7 +453,7 @@ TEST_F(NotifyServerTest, MachNotifyNoSenders_NoNotification) {
 // When a send-once right is deallocated without being used, a send-once
 // notification notification should be sent via the send-once right.
 TEST_F(NotifyServerTest, MachNotifySendOnce_ExplicitDeallocation) {
-  base::mac::ScopedMachSendRight send_once_right(
+  base::apple::ScopedMachSendRight send_once_right(
       SendOnceRightFromReceiveRight(ServerPort()));
   ASSERT_TRUE(send_once_right.is_valid());
 
@@ -473,7 +472,7 @@ TEST_F(NotifyServerTest, MachNotifySendOnce_ExplicitDeallocation) {
 // the send-once right is destroyed, and a send-once notification should appear
 // on the reply port.
 TEST_F(NotifyServerTest, MachNotifySendOnce_ImplicitDeallocation) {
-  base::mac::ScopedMachReceiveRight receive_right(
+  base::apple::ScopedMachReceiveRight receive_right(
       NewMachPort(MACH_PORT_RIGHT_RECEIVE));
   ASSERT_TRUE(receive_right.is_valid());
 
@@ -507,11 +506,11 @@ TEST_F(NotifyServerTest, MachNotifySendOnce_ImplicitDeallocation) {
 // notification request is destroyed, a dead-name notification should be
 // generated.
 TEST_F(NotifyServerTest, MachNotifyDeadName) {
-  base::mac::ScopedMachReceiveRight receive_right(
+  base::apple::ScopedMachReceiveRight receive_right(
       NewMachPort(MACH_PORT_RIGHT_RECEIVE));
   ASSERT_TRUE(receive_right.is_valid());
 
-  base::mac::ScopedMachSendRight send_once_right(
+  base::apple::ScopedMachSendRight send_once_right(
       SendOnceRightFromReceiveRight(receive_right.get()));
   ASSERT_TRUE(send_once_right.is_valid());
 
@@ -528,7 +527,7 @@ TEST_F(NotifyServerTest, MachNotifyDeadName) {
                                          ResultOf(DeadNameRightRefCount, 2)),
                                    ResultOf(AuditPIDFromMachMessageTrailer, 0)))
       .WillOnce(
-          DoAll(WithArg<1>(Invoke(MachPortDeallocate)), Return(MIG_NO_REPLY)))
+          DoAll(WithArg<1>(MachPortDeallocate), Return(MIG_NO_REPLY)))
       .RetiresOnSaturation();
 
   receive_right.reset();
@@ -546,11 +545,11 @@ TEST_F(NotifyServerTest, MachNotifyDeadName) {
 // notification request is not destroyed, no dead-name notification should be
 // generated.
 TEST_F(NotifyServerTest, MachNotifyDeadName_NoNotification) {
-  base::mac::ScopedMachReceiveRight receive_right(
+  base::apple::ScopedMachReceiveRight receive_right(
       NewMachPort(MACH_PORT_RIGHT_RECEIVE));
   ASSERT_TRUE(receive_right.is_valid());
 
-  base::mac::ScopedMachSendRight send_once_right(
+  base::apple::ScopedMachSendRight send_once_right(
       SendOnceRightFromReceiveRight(receive_right.get()));
   ASSERT_TRUE(send_once_right.is_valid());
 
diff --git a/extern/crashpad/crashpad/util/mach/scoped_task_suspend.cc b/extern/crashpad/crashpad/util/mach/scoped_task_suspend.cc
index 651cad25b0..67cad4f1e6 100644
--- a/extern/crashpad/crashpad/util/mach/scoped_task_suspend.cc
+++ b/extern/crashpad/crashpad/util/mach/scoped_task_suspend.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
 
 #include "util/mach/scoped_task_suspend.h"
 
+#include "base/apple/mach_logging.h"
 #include "base/check_op.h"
 #include "base/logging.h"
-#include "base/mac/mach_logging.h"
 
 namespace crashpad {
 
diff --git a/extern/crashpad/crashpad/util/mach/scoped_task_suspend.h b/extern/crashpad/crashpad/util/mach/scoped_task_suspend.h
index f935983b80..3d0d0104e1 100644
--- a/extern/crashpad/crashpad/util/mach/scoped_task_suspend.h
+++ b/extern/crashpad/crashpad/util/mach/scoped_task_suspend.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/mach/scoped_task_suspend_test.cc b/extern/crashpad/crashpad/util/mach/scoped_task_suspend_test.cc
index 06a518da60..b75cef5bdb 100644
--- a/extern/crashpad/crashpad/util/mach/scoped_task_suspend_test.cc
+++ b/extern/crashpad/crashpad/util/mach/scoped_task_suspend_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/mach/symbolic_constants_mach.cc b/extern/crashpad/crashpad/util/mach/symbolic_constants_mach.cc
index 47090086e4..bea8a8c6b1 100644
--- a/extern/crashpad/crashpad/util/mach/symbolic_constants_mach.cc
+++ b/extern/crashpad/crashpad/util/mach/symbolic_constants_mach.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,7 +17,9 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+#include <string_view>
+
 #include "base/strings/stringprintf.h"
 #include "util/mach/exception_behaviors.h"
 #include "util/mach/mach_extensions.h"
@@ -45,7 +47,7 @@ constexpr const char* kExceptionNames[] = {
     "GUARD",
     "CORPSE_NOTIFY",
 };
-static_assert(base::size(kExceptionNames) == EXC_TYPES_COUNT,
+static_assert(std::size(kExceptionNames) == EXC_TYPES_COUNT,
               "kExceptionNames length");
 
 constexpr char kExcPrefix[] = "EXC_";
@@ -137,7 +139,7 @@ constexpr struct {
 };
 
 // Returns the short name for a flavor name, given its full flavor name.
-std::string ThreadStateFlavorFullToShort(const base::StringPiece& flavor) {
+std::string ThreadStateFlavorFullToShort(std::string_view flavor) {
   // For generic flavors like THREAD_STATE_NONE and THREAD_STATE_FLAVOR_LIST_*.
   static constexpr char kThreadState[] = "THREAD_STATE_";
   size_t prefix_len = strlen(kThreadState);
@@ -170,7 +172,7 @@ std::string ThreadStateFlavorFullToShort(const base::StringPiece& flavor) {
         {"_STATE32", "32"},
         {"_STATE64", "64"},
     };
-    for (size_t suffix_index = 0; suffix_index < base::size(kStateSuffixes);
+    for (size_t suffix_index = 0; suffix_index < std::size(kStateSuffixes);
          ++suffix_index) {
       const char* suffix = kStateSuffixes[suffix_index].orig;
       size_t suffix_len = strlen(suffix);
@@ -194,7 +196,7 @@ namespace crashpad {
 std::string ExceptionToString(exception_type_t exception,
                               SymbolicConstantToStringOptions options) {
   const char* exception_name =
-      implicit_cast<size_t>(exception) < base::size(kExceptionNames)
+      implicit_cast<size_t>(exception) < std::size(kExceptionNames)
           ? kExceptionNames[exception]
           : nullptr;
   if (!exception_name) {
@@ -210,17 +212,17 @@ std::string ExceptionToString(exception_type_t exception,
   return base::StringPrintf("%s%s", kExcPrefix, exception_name);
 }
 
-bool StringToException(const base::StringPiece& string,
+bool StringToException(std::string_view string,
                        StringToSymbolicConstantOptions options,
                        exception_type_t* exception) {
   if ((options & kAllowFullName) || (options & kAllowShortName)) {
     bool can_match_full =
         (options & kAllowFullName) &&
         string.substr(0, strlen(kExcPrefix)).compare(kExcPrefix) == 0;
-    base::StringPiece short_string =
+    std::string_view short_string =
         can_match_full ? string.substr(strlen(kExcPrefix)) : string;
     for (exception_type_t index = 0;
-         index < implicit_cast<exception_type_t>(base::size(kExceptionNames));
+         index < implicit_cast<exception_type_t>(std::size(kExceptionNames));
          ++index) {
       const char* exception_name = kExceptionNames[index];
       if (!exception_name) {
@@ -250,7 +252,7 @@ std::string ExceptionMaskToString(exception_mask_t exception_mask,
   exception_mask_t local_exception_mask = exception_mask;
   std::string mask_string;
   bool has_forbidden_or = false;
-  for (size_t exception = 0; exception < base::size(kExceptionNames);
+  for (size_t exception = 0; exception < std::size(kExceptionNames);
        ++exception) {
     const char* exception_name = kExceptionNames[exception];
     exception_mask_t exception_mask_value = 1 << exception;
@@ -289,7 +291,7 @@ std::string ExceptionMaskToString(exception_mask_t exception_mask,
   return mask_string;
 }
 
-bool StringToExceptionMask(const base::StringPiece& string,
+bool StringToExceptionMask(std::string_view string,
                            StringToSymbolicConstantOptions options,
                            exception_mask_t* exception_mask) {
   if (options & kAllowOr) {
@@ -298,20 +300,17 @@ bool StringToExceptionMask(const base::StringPiece& string,
     size_t pos = -1;
     do {
       ++pos;
-      const char* substring_begin = string.begin() + pos;
+      const size_t start = pos;
       pos = string.find('|', pos);
-      const char* substring_end = (pos == base::StringPiece::npos)
-                                      ? string.end()
-                                      : (string.begin() + pos);
-      base::StringPiece substring = string.substr(
-          substring_begin - string.begin(), substring_end - substring_begin);
-
+      std::string_view substring = (pos == std::string_view::npos)
+                                       ? string.substr(start)
+                                       : string.substr(start, pos - start);
       exception_mask_t temp_mask;
       if (!StringToExceptionMask(substring, options, &temp_mask)) {
         return false;
       }
       build_mask |= temp_mask;
-    } while (pos != base::StringPiece::npos);
+    } while (pos != std::string_view::npos);
 
     *exception_mask = build_mask;
     return true;
@@ -321,10 +320,10 @@ bool StringToExceptionMask(const base::StringPiece& string,
     bool can_match_full =
         (options & kAllowFullName) &&
         string.substr(0, strlen(kExcMaskPrefix)).compare(kExcMaskPrefix) == 0;
-    base::StringPiece short_string =
+    std::string_view short_string =
         can_match_full ? string.substr(strlen(kExcMaskPrefix)) : string;
     for (exception_type_t index = 0;
-         index < implicit_cast<exception_type_t>(base::size(kExceptionNames));
+         index < implicit_cast<exception_type_t>(std::size(kExceptionNames));
          ++index) {
       const char* exception_name = kExceptionNames[index];
       if (!exception_name) {
@@ -363,7 +362,7 @@ std::string ExceptionBehaviorToString(exception_behavior_t behavior,
   const exception_behavior_t basic_behavior = ExceptionBehaviorBasic(behavior);
 
   const char* behavior_name =
-      implicit_cast<size_t>(basic_behavior) < base::size(kBehaviorNames)
+      implicit_cast<size_t>(basic_behavior) < std::size(kBehaviorNames)
           ? kBehaviorNames[basic_behavior]
           : nullptr;
   if (!behavior_name) {
@@ -390,15 +389,15 @@ std::string ExceptionBehaviorToString(exception_behavior_t behavior,
   return behavior_string;
 }
 
-bool StringToExceptionBehavior(const base::StringPiece& string,
+bool StringToExceptionBehavior(std::string_view string,
                                StringToSymbolicConstantOptions options,
                                exception_behavior_t* behavior) {
-  base::StringPiece sp = string;
+  std::string_view sp = string;
   exception_behavior_t build_behavior = 0;
   size_t pos = sp.find('|', 0);
-  if (pos != base::StringPiece::npos) {
-    base::StringPiece left = sp.substr(0, pos);
-    base::StringPiece right = sp.substr(pos + 1, sp.length() - pos - 1);
+  if (pos != std::string_view::npos) {
+    std::string_view left = sp.substr(0, pos);
+    std::string_view right = sp.substr(pos + 1, sp.length() - pos - 1);
     if (options & kAllowFullName) {
       if (left.compare(kMachExceptionCodesFull) == 0) {
         build_behavior |= MACH_EXCEPTION_CODES;
@@ -427,11 +426,10 @@ bool StringToExceptionBehavior(const base::StringPiece& string,
     bool can_match_full =
         (options & kAllowFullName) &&
         sp.substr(0, strlen(kBehaviorPrefix)).compare(kBehaviorPrefix) == 0;
-    base::StringPiece short_string =
+    std::string_view short_string =
         can_match_full ? sp.substr(strlen(kBehaviorPrefix)) : sp;
     for (exception_behavior_t index = 0;
-         index <
-         implicit_cast<exception_behavior_t>(base::size(kBehaviorNames));
+         index < implicit_cast<exception_behavior_t>(std::size(kBehaviorNames));
          ++index) {
       const char* behavior_name = kBehaviorNames[index];
       if (!behavior_name) {
@@ -467,13 +465,13 @@ bool StringToExceptionBehavior(const base::StringPiece& string,
 std::string ThreadStateFlavorToString(thread_state_flavor_t flavor,
                                       SymbolicConstantToStringOptions options) {
   const char* flavor_name =
-      implicit_cast<size_t>(flavor) < base::size(kFlavorNames)
+      implicit_cast<size_t>(flavor) < std::size(kFlavorNames)
           ? kFlavorNames[flavor]
           : nullptr;
 
   if (!flavor_name) {
     for (size_t generic_flavor_index = 0;
-         generic_flavor_index < base::size(kGenericFlavorNames);
+         generic_flavor_index < std::size(kGenericFlavorNames);
          ++generic_flavor_index) {
       if (flavor == kGenericFlavorNames[generic_flavor_index].flavor) {
         flavor_name = kGenericFlavorNames[generic_flavor_index].name;
@@ -495,12 +493,12 @@ std::string ThreadStateFlavorToString(thread_state_flavor_t flavor,
   return std::string(flavor_name);
 }
 
-bool StringToThreadStateFlavor(const base::StringPiece& string,
+bool StringToThreadStateFlavor(std::string_view string,
                                StringToSymbolicConstantOptions options,
                                thread_state_flavor_t* flavor) {
   if ((options & kAllowFullName) || (options & kAllowShortName)) {
     for (thread_state_flavor_t index = 0;
-         index < implicit_cast<thread_state_flavor_t>(base::size(kFlavorNames));
+         index < implicit_cast<thread_state_flavor_t>(std::size(kFlavorNames));
          ++index) {
       const char* flavor_name = kFlavorNames[index];
       if (!flavor_name) {
@@ -520,7 +518,7 @@ bool StringToThreadStateFlavor(const base::StringPiece& string,
     }
 
     for (size_t generic_flavor_index = 0;
-         generic_flavor_index < base::size(kGenericFlavorNames);
+         generic_flavor_index < std::size(kGenericFlavorNames);
          ++generic_flavor_index) {
       const char* flavor_name = kGenericFlavorNames[generic_flavor_index].name;
       thread_state_flavor_t flavor_number =
diff --git a/extern/crashpad/crashpad/util/mach/symbolic_constants_mach.h b/extern/crashpad/crashpad/util/mach/symbolic_constants_mach.h
index be522fa875..18b9ec581a 100644
--- a/extern/crashpad/crashpad/util/mach/symbolic_constants_mach.h
+++ b/extern/crashpad/crashpad/util/mach/symbolic_constants_mach.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@
 #include <mach/mach.h>
 
 #include <string>
+#include <string_view>
 
-#include "base/strings/string_piece.h"
 #include "util/misc/symbolic_constants_common.h"
 
 namespace crashpad {
@@ -42,7 +42,7 @@ std::string ExceptionToString(exception_type_t exception,
 //!
 //! \return `true` on success, `false` if \a string could not be converted as
 //!     requested.
-bool StringToException(const base::StringPiece& string,
+bool StringToException(std::string_view string,
                        StringToSymbolicConstantOptions options,
                        exception_type_t* exception);
 
@@ -64,7 +64,7 @@ std::string ExceptionMaskToString(exception_mask_t exception_mask,
 //!
 //! \return `true` on success, `false` if \a string could not be converted as
 //!     requested.
-bool StringToExceptionMask(const base::StringPiece& string,
+bool StringToExceptionMask(std::string_view string,
                            StringToSymbolicConstantOptions options,
                            exception_mask_t* exception_mask);
 
@@ -89,7 +89,7 @@ std::string ExceptionBehaviorToString(exception_behavior_t behavior,
 //!
 //! \return `true` on success, `false` if \a string could not be converted as
 //!     requested.
-bool StringToExceptionBehavior(const base::StringPiece& string,
+bool StringToExceptionBehavior(std::string_view string,
                                StringToSymbolicConstantOptions options,
                                exception_behavior_t* behavior);
 
@@ -111,7 +111,7 @@ std::string ThreadStateFlavorToString(thread_state_flavor_t flavor,
 //!
 //! \return `true` on success, `false` if \a string could not be converted as
 //!     requested.
-bool StringToThreadStateFlavor(const base::StringPiece& string,
+bool StringToThreadStateFlavor(std::string_view string,
                                StringToSymbolicConstantOptions options,
                                thread_state_flavor_t* flavor);
 
diff --git a/extern/crashpad/crashpad/util/mach/symbolic_constants_mach_test.cc b/extern/crashpad/crashpad/util/mach/symbolic_constants_mach_test.cc
index 20c60a0ead..84d7b5df8e 100644
--- a/extern/crashpad/crashpad/util/mach/symbolic_constants_mach_test.cc
+++ b/extern/crashpad/crashpad/util/mach/symbolic_constants_mach_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,15 +18,16 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "base/cxx17_backports.h"
-#include "base/strings/string_piece.h"
+#include <iterator>
+#include <string_view>
+
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 #include "util/mach/mach_extensions.h"
 #include "util/misc/implicit_cast.h"
 
 #define NUL_TEST_DATA(string) \
-  { string, base::size(string) - 1 }
+  { string, std::size(string) - 1 }
 
 namespace crashpad {
 namespace test {
@@ -97,7 +98,7 @@ void TestSomethingToString(typename Traits::ValueType value,
 }
 
 template <typename Traits>
-void TestStringToSomething(const base::StringPiece& string,
+void TestStringToSomething(std::string_view string,
                            StringToSymbolicConstantOptions options,
                            bool expect_result,
                            typename Traits::ValueType expect_value) {
@@ -143,7 +144,7 @@ struct ConvertExceptionTraits {
       SymbolicConstantToStringOptions options) {
     return ExceptionToString(value, options);
   }
-  static bool StringToSomething(const base::StringPiece& string,
+  static bool StringToSomething(std::string_view string,
                                 StringToSymbolicConstantOptions options,
                                 ValueType* value) {
     return StringToException(string, options, value);
@@ -160,7 +161,7 @@ void TestExceptionToString(exception_type_t value,
 }
 
 TEST(SymbolicConstantsMach, ExceptionToString) {
-  for (size_t index = 0; index < base::size(kExceptionTestData); ++index) {
+  for (size_t index = 0; index < std::size(kExceptionTestData); ++index) {
     SCOPED_TRACE(base::StringPrintf("index %zu", index));
     TestExceptionToString(kExceptionTestData[index].exception,
                           kExceptionTestData[index].full_name,
@@ -179,7 +180,7 @@ TEST(SymbolicConstantsMach, ExceptionToString) {
   }
 }
 
-void TestStringToException(const base::StringPiece& string,
+void TestStringToException(std::string_view string,
                            StringToSymbolicConstantOptions options,
                            bool expect_result,
                            exception_type_t expect_value) {
@@ -188,11 +189,11 @@ void TestStringToException(const base::StringPiece& string,
 }
 
 TEST(SymbolicConstantsMach, StringToException) {
-  for (size_t option_index = 0; option_index < base::size(kNormalOptions);
+  for (size_t option_index = 0; option_index < std::size(kNormalOptions);
        ++option_index) {
     SCOPED_TRACE(base::StringPrintf("option_index %zu", option_index));
     StringToSymbolicConstantOptions options = kNormalOptions[option_index];
-    for (size_t index = 0; index < base::size(kExceptionTestData); ++index) {
+    for (size_t index = 0; index < std::size(kExceptionTestData); ++index) {
       SCOPED_TRACE(base::StringPrintf("index %zu", index));
       exception_type_t exception = kExceptionTestData[index].exception;
       {
@@ -230,7 +231,7 @@ TEST(SymbolicConstantsMach, StringToException) {
         "",
     };
 
-    for (size_t index = 0; index < base::size(kNegativeTestData); ++index) {
+    for (size_t index = 0; index < std::size(kNegativeTestData); ++index) {
       SCOPED_TRACE(base::StringPrintf("index %zu", index));
       TestStringToException(kNegativeTestData[index], options, false, 0);
     }
@@ -251,10 +252,10 @@ TEST(SymbolicConstantsMach, StringToException) {
         NUL_TEST_DATA("1\0002"),
     };
 
-    for (size_t index = 0; index < base::size(kNULTestData); ++index) {
+    for (size_t index = 0; index < std::size(kNULTestData); ++index) {
       SCOPED_TRACE(base::StringPrintf("index %zu", index));
-      base::StringPiece string(kNULTestData[index].string,
-                               kNULTestData[index].length);
+      std::string_view string(kNULTestData[index].string,
+                              kNULTestData[index].length);
       TestStringToException(string, options, false, 0);
     }
   }
@@ -262,14 +263,14 @@ TEST(SymbolicConstantsMach, StringToException) {
   // Ensure that a NUL is not required at the end of the string.
   {
     SCOPED_TRACE("trailing_NUL_full");
-    TestStringToException(base::StringPiece("EXC_BREAKPOINTED", 14),
+    TestStringToException(std::string_view("EXC_BREAKPOINTED", 14),
                           kAllowFullName,
                           true,
                           EXC_BREAKPOINT);
   }
   {
     SCOPED_TRACE("trailing_NUL_short");
-    TestStringToException(base::StringPiece("BREAKPOINTED", 10),
+    TestStringToException(std::string_view("BREAKPOINTED", 10),
                           kAllowShortName,
                           true,
                           EXC_BREAKPOINT);
@@ -317,7 +318,7 @@ struct ConvertExceptionMaskTraits {
       SymbolicConstantToStringOptions options) {
     return ExceptionMaskToString(value, options);
   }
-  static bool StringToSomething(const base::StringPiece& string,
+  static bool StringToSomething(std::string_view string,
                                 StringToSymbolicConstantOptions options,
                                 ValueType* value) {
     return StringToExceptionMask(string, options, value);
@@ -334,7 +335,7 @@ void TestExceptionMaskToString(exception_mask_t value,
 }
 
 TEST(SymbolicConstantsMach, ExceptionMaskToString) {
-  for (size_t index = 0; index < base::size(kExceptionMaskTestData); ++index) {
+  for (size_t index = 0; index < std::size(kExceptionMaskTestData); ++index) {
     SCOPED_TRACE(base::StringPrintf("index %zu", index));
     TestExceptionMaskToString(kExceptionMaskTestData[index].exception_mask,
                               kExceptionMaskTestData[index].full_name,
@@ -360,7 +361,7 @@ TEST(SymbolicConstantsMach, ExceptionMaskToString) {
             "CRASH|GUARD");
 }
 
-void TestStringToExceptionMask(const base::StringPiece& string,
+void TestStringToExceptionMask(std::string_view string,
                                StringToSymbolicConstantOptions options,
                                bool expect_result,
                                exception_mask_t expect_value) {
@@ -389,20 +390,19 @@ TEST(SymbolicConstantsMach, StringToExceptionMask) {
       kAllowFullName | kAllowShortName | kAllowNumber | kAllowOr,
   };
 
-  for (size_t option_index = 0; option_index < base::size(kOptions);
+  for (size_t option_index = 0; option_index < std::size(kOptions);
        ++option_index) {
     SCOPED_TRACE(base::StringPrintf("option_index %zu", option_index));
     StringToSymbolicConstantOptions options = kOptions[option_index];
-    for (size_t index = 0; index < base::size(kExceptionMaskTestData);
-         ++index) {
+    for (size_t index = 0; index < std::size(kExceptionMaskTestData); ++index) {
       SCOPED_TRACE(base::StringPrintf("index %zu", index));
       exception_mask_t exception_mask =
           kExceptionMaskTestData[index].exception_mask;
       {
         SCOPED_TRACE("full_name");
-        base::StringPiece full_name(kExceptionMaskTestData[index].full_name);
-        bool has_number = full_name.find("0x", 0) != base::StringPiece::npos;
-        bool has_or = full_name.find('|', 0) != base::StringPiece::npos;
+        std::string_view full_name(kExceptionMaskTestData[index].full_name);
+        bool has_number = full_name.find("0x", 0) != std::string_view::npos;
+        bool has_or = full_name.find('|', 0) != std::string_view::npos;
         bool allowed_characteristics =
             (has_number ? (options & kAllowNumber) : true) &&
             (has_or ? (options & kAllowOr) : true);
@@ -415,9 +415,9 @@ TEST(SymbolicConstantsMach, StringToExceptionMask) {
       }
       {
         SCOPED_TRACE("short_name");
-        base::StringPiece short_name(kExceptionMaskTestData[index].short_name);
-        bool has_number = short_name.find("0x", 0) != base::StringPiece::npos;
-        bool has_or = short_name.find('|', 0) != base::StringPiece::npos;
+        std::string_view short_name(kExceptionMaskTestData[index].short_name);
+        bool has_number = short_name.find("0x", 0) != std::string_view::npos;
+        bool has_or = short_name.find('|', 0) != std::string_view::npos;
         bool allowed_characteristics =
             (has_number ? (options & kAllowNumber) : true) &&
             (has_or ? (options & kAllowOr) : true);
@@ -445,7 +445,7 @@ TEST(SymbolicConstantsMach, StringToExceptionMask) {
         "",
     };
 
-    for (size_t index = 0; index < base::size(kNegativeTestData); ++index) {
+    for (size_t index = 0; index < std::size(kNegativeTestData); ++index) {
       SCOPED_TRACE(base::StringPrintf("index %zu", index));
       TestStringToExceptionMask(kNegativeTestData[index], options, false, 0);
     }
@@ -471,10 +471,10 @@ TEST(SymbolicConstantsMach, StringToExceptionMask) {
         NUL_TEST_DATA("ARITHMETIC|\0EMULATION"),
     };
 
-    for (size_t index = 0; index < base::size(kNULTestData); ++index) {
+    for (size_t index = 0; index < std::size(kNULTestData); ++index) {
       SCOPED_TRACE(base::StringPrintf("index %zu", index));
-      base::StringPiece string(kNULTestData[index].string,
-                               kNULTestData[index].length);
+      std::string_view string(kNULTestData[index].string,
+                              kNULTestData[index].length);
       TestStringToExceptionMask(string, options, false, 0);
     }
   }
@@ -506,7 +506,7 @@ TEST(SymbolicConstantsMach, StringToExceptionMask) {
        EXC_MASK_SYSCALL | 0x100},
     };
 
-  for (size_t index = 0; index < base::size(kNonCanonicalTestData); ++index) {
+  for (size_t index = 0; index < std::size(kNonCanonicalTestData); ++index) {
     SCOPED_TRACE(base::StringPrintf("index %zu", index));
     TestStringToExceptionMask(kNonCanonicalTestData[index].string,
                               kNonCanonicalTestData[index].options,
@@ -517,14 +517,14 @@ TEST(SymbolicConstantsMach, StringToExceptionMask) {
   // Ensure that a NUL is not required at the end of the string.
   {
     SCOPED_TRACE("trailing_NUL_full");
-    TestStringToExceptionMask(base::StringPiece("EXC_MASK_BREAKPOINTED", 19),
+    TestStringToExceptionMask(std::string_view("EXC_MASK_BREAKPOINTED", 19),
                               kAllowFullName,
                               true,
                               EXC_MASK_BREAKPOINT);
   }
   {
     SCOPED_TRACE("trailing_NUL_short");
-    TestStringToExceptionMask(base::StringPiece("BREAKPOINTED", 10),
+    TestStringToExceptionMask(std::string_view("BREAKPOINTED", 10),
                               kAllowShortName,
                               true,
                               EXC_MASK_BREAKPOINT);
@@ -560,7 +560,7 @@ struct ConvertExceptionBehaviorTraits {
       SymbolicConstantToStringOptions options) {
     return ExceptionBehaviorToString(value, options);
   }
-  static bool StringToSomething(const base::StringPiece& string,
+  static bool StringToSomething(std::string_view string,
                                 StringToSymbolicConstantOptions options,
                                 ValueType* value) {
     return StringToExceptionBehavior(string, options, value);
@@ -577,7 +577,7 @@ void TestExceptionBehaviorToString(exception_behavior_t value,
 }
 
 TEST(SymbolicConstantsMach, ExceptionBehaviorToString) {
-  for (size_t index = 0; index < base::size(kExceptionBehaviorTestData);
+  for (size_t index = 0; index < std::size(kExceptionBehaviorTestData);
        ++index) {
     SCOPED_TRACE(base::StringPrintf("index %zu", index));
     TestExceptionBehaviorToString(kExceptionBehaviorTestData[index].behavior,
@@ -598,7 +598,7 @@ TEST(SymbolicConstantsMach, ExceptionBehaviorToString) {
   }
 }
 
-void TestStringToExceptionBehavior(const base::StringPiece& string,
+void TestStringToExceptionBehavior(std::string_view string,
                                    StringToSymbolicConstantOptions options,
                                    bool expect_result,
                                    exception_behavior_t expect_value) {
@@ -607,11 +607,11 @@ void TestStringToExceptionBehavior(const base::StringPiece& string,
 }
 
 TEST(SymbolicConstantsMach, StringToExceptionBehavior) {
-  for (size_t option_index = 0; option_index < base::size(kNormalOptions);
+  for (size_t option_index = 0; option_index < std::size(kNormalOptions);
        ++option_index) {
     SCOPED_TRACE(base::StringPrintf("option_index %zu", option_index));
     StringToSymbolicConstantOptions options = kNormalOptions[option_index];
-    for (size_t index = 0; index < base::size(kExceptionBehaviorTestData);
+    for (size_t index = 0; index < std::size(kExceptionBehaviorTestData);
          ++index) {
       SCOPED_TRACE(base::StringPrintf("index %zu", index));
       exception_behavior_t behavior =
@@ -657,7 +657,7 @@ TEST(SymbolicConstantsMach, StringToExceptionBehavior) {
         "",
     };
 
-    for (size_t index = 0; index < base::size(kNegativeTestData); ++index) {
+    for (size_t index = 0; index < std::size(kNegativeTestData); ++index) {
       SCOPED_TRACE(base::StringPrintf("index %zu", index));
       TestStringToExceptionBehavior(
           kNegativeTestData[index], options, false, 0);
@@ -683,10 +683,10 @@ TEST(SymbolicConstantsMach, StringToExceptionBehavior) {
         NUL_TEST_DATA("STATE_IDENTITY|\0MACH"),
     };
 
-    for (size_t index = 0; index < base::size(kNULTestData); ++index) {
+    for (size_t index = 0; index < std::size(kNULTestData); ++index) {
       SCOPED_TRACE(base::StringPrintf("index %zu", index));
-      base::StringPiece string(kNULTestData[index].string,
-                               kNULTestData[index].length);
+      std::string_view string(kNULTestData[index].string,
+                              kNULTestData[index].length);
       TestStringToExceptionBehavior(string, options, false, 0);
     }
   }
@@ -720,7 +720,7 @@ TEST(SymbolicConstantsMach, StringToExceptionBehavior) {
        implicit_cast<exception_behavior_t>(MACH_EXCEPTION_CODES | 0x2)},
   };
 
-  for (size_t index = 0; index < base::size(kNonCanonicalTestData); ++index) {
+  for (size_t index = 0; index < std::size(kNonCanonicalTestData); ++index) {
     SCOPED_TRACE(base::StringPrintf("index %zu", index));
     TestStringToExceptionBehavior(kNonCanonicalTestData[index].string,
                                   kNonCanonicalTestData[index].options,
@@ -731,21 +731,21 @@ TEST(SymbolicConstantsMach, StringToExceptionBehavior) {
   // Ensure that a NUL is not required at the end of the string.
   {
     SCOPED_TRACE("trailing_NUL_full");
-    TestStringToExceptionBehavior(base::StringPiece("EXCEPTION_DEFAULTS", 17),
+    TestStringToExceptionBehavior(std::string_view("EXCEPTION_DEFAULTS", 17),
                                   kAllowFullName,
                                   true,
                                   EXCEPTION_DEFAULT);
   }
   {
     SCOPED_TRACE("trailing_NUL_short");
-    TestStringToExceptionBehavior(base::StringPiece("DEFAULTS", 7),
+    TestStringToExceptionBehavior(std::string_view("DEFAULTS", 7),
                                   kAllowShortName,
                                   true,
                                   EXCEPTION_DEFAULT);
   }
   {
     SCOPED_TRACE("trailing_NUL_full_mach");
-    base::StringPiece string("EXCEPTION_DEFAULT|MACH_EXCEPTION_CODESS", 38);
+    std::string_view string("EXCEPTION_DEFAULT|MACH_EXCEPTION_CODESS", 38);
     TestStringToExceptionBehavior(string,
                                   kAllowFullName | kAllowOr,
                                   true,
@@ -753,7 +753,7 @@ TEST(SymbolicConstantsMach, StringToExceptionBehavior) {
   }
   {
     SCOPED_TRACE("trailing_NUL_short_mach");
-    TestStringToExceptionBehavior(base::StringPiece("DEFAULT|MACH_", 12),
+    TestStringToExceptionBehavior(std::string_view("DEFAULT|MACH_", 12),
                                   kAllowShortName | kAllowOr,
                                   true,
                                   EXCEPTION_DEFAULT | MACH_EXCEPTION_CODES);
@@ -820,7 +820,7 @@ struct ConvertThreadStateFlavorTraits {
       SymbolicConstantToStringOptions options) {
     return ThreadStateFlavorToString(value, options);
   }
-  static bool StringToSomething(const base::StringPiece& string,
+  static bool StringToSomething(std::string_view string,
                                 StringToSymbolicConstantOptions options,
                                 ValueType* value) {
     return StringToThreadStateFlavor(string, options, value);
@@ -837,7 +837,7 @@ void TestThreadStateFlavorToString(exception_type_t value,
 }
 
 TEST(SymbolicConstantsMach, ThreadStateFlavorToString) {
-  for (size_t index = 0; index < base::size(kThreadStateFlavorTestData);
+  for (size_t index = 0; index < std::size(kThreadStateFlavorTestData);
        ++index) {
     SCOPED_TRACE(base::StringPrintf("index %zu", index));
     TestThreadStateFlavorToString(kThreadStateFlavorTestData[index].flavor,
@@ -870,7 +870,7 @@ TEST(SymbolicConstantsMach, ThreadStateFlavorToString) {
   }
 }
 
-void TestStringToThreadStateFlavor(const base::StringPiece& string,
+void TestStringToThreadStateFlavor(std::string_view string,
                                    StringToSymbolicConstantOptions options,
                                    bool expect_result,
                                    thread_state_flavor_t expect_value) {
@@ -879,11 +879,11 @@ void TestStringToThreadStateFlavor(const base::StringPiece& string,
 }
 
 TEST(SymbolicConstantsMach, StringToThreadStateFlavor) {
-  for (size_t option_index = 0; option_index < base::size(kNormalOptions);
+  for (size_t option_index = 0; option_index < std::size(kNormalOptions);
        ++option_index) {
     SCOPED_TRACE(base::StringPrintf("option_index %zu", option_index));
     StringToSymbolicConstantOptions options = kNormalOptions[option_index];
-    for (size_t index = 0; index < base::size(kThreadStateFlavorTestData);
+    for (size_t index = 0; index < std::size(kThreadStateFlavorTestData);
          ++index) {
       SCOPED_TRACE(base::StringPrintf("index %zu", index));
       thread_state_flavor_t flavor = kThreadStateFlavorTestData[index].flavor;
@@ -953,7 +953,7 @@ TEST(SymbolicConstantsMach, StringToThreadStateFlavor) {
 #endif
     };
 
-    for (size_t index = 0; index < base::size(kNegativeTestData); ++index) {
+    for (size_t index = 0; index < std::size(kNegativeTestData); ++index) {
       SCOPED_TRACE(base::StringPrintf("index %zu", index));
       TestStringToThreadStateFlavor(
           kNegativeTestData[index], options, false, 0);
@@ -1019,10 +1019,10 @@ TEST(SymbolicConstantsMach, StringToThreadStateFlavor) {
 #endif
     };
 
-    for (size_t index = 0; index < base::size(kNULTestData); ++index) {
+    for (size_t index = 0; index < std::size(kNULTestData); ++index) {
       SCOPED_TRACE(base::StringPrintf("index %zu", index));
-      base::StringPiece string(kNULTestData[index].string,
-                               kNULTestData[index].length);
+      std::string_view string(kNULTestData[index].string,
+                              kNULTestData[index].length);
       TestStringToThreadStateFlavor(string, options, false, 0);
     }
   }
@@ -1030,27 +1030,25 @@ TEST(SymbolicConstantsMach, StringToThreadStateFlavor) {
   // Ensure that a NUL is not required at the end of the string.
   {
     SCOPED_TRACE("trailing_NUL_full");
-    TestStringToThreadStateFlavor(base::StringPiece("THREAD_STATE_NONER", 17),
+    TestStringToThreadStateFlavor(std::string_view("THREAD_STATE_NONER", 17),
                                   kAllowFullName,
                                   true,
                                   THREAD_STATE_NONE);
   }
   {
     SCOPED_TRACE("trailing_NUL_short");
-    TestStringToThreadStateFlavor(base::StringPiece("NONER", 4),
-                                  kAllowShortName,
-                                  true,
-                                  THREAD_STATE_NONE);
+    TestStringToThreadStateFlavor(
+        std::string_view("NONER", 4), kAllowShortName, true, THREAD_STATE_NONE);
   }
   {
     SCOPED_TRACE("trailing_NUL_full_new");
-    base::StringPiece string("THREAD_STATE_FLAVOR_LIST_NEWS", 28);
+    std::string_view string("THREAD_STATE_FLAVOR_LIST_NEWS", 28);
     TestStringToThreadStateFlavor(
         string, kAllowFullName, true, THREAD_STATE_FLAVOR_LIST_NEW);
   }
   {
     SCOPED_TRACE("trailing_NUL_short_new");
-    TestStringToThreadStateFlavor(base::StringPiece("FLAVOR_LIST_NEWS", 15),
+    TestStringToThreadStateFlavor(std::string_view("FLAVOR_LIST_NEWS", 15),
                                   kAllowShortName,
                                   true,
                                   THREAD_STATE_FLAVOR_LIST_NEW);
diff --git a/extern/crashpad/crashpad/util/mach/task_for_pid.cc b/extern/crashpad/crashpad/util/mach/task_for_pid.cc
index 4d0dfebaab..5827dc45e0 100644
--- a/extern/crashpad/crashpad/util/mach/task_for_pid.cc
+++ b/extern/crashpad/crashpad/util/mach/task_for_pid.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,8 +21,8 @@
 #include <iterator>
 #include <set>
 
-#include "base/mac/mach_logging.h"
-#include "base/mac/scoped_mach_port.h"
+#include "base/apple/mach_logging.h"
+#include "base/apple/scoped_mach_port.h"
 #include "util/posix/process_info.h"
 
 namespace crashpad {
@@ -154,7 +154,7 @@ task_t TaskForPID(pid_t pid) {
     return TASK_NULL;
   }
 
-  base::mac::ScopedMachSendRight task_owner(task);
+  base::apple::ScopedMachSendRight task_owner(task);
 
   if (!TaskForPIDCheck(task)) {
     return TASK_NULL;
diff --git a/extern/crashpad/crashpad/util/mach/task_for_pid.h b/extern/crashpad/crashpad/util/mach/task_for_pid.h
index 2b81fbebdd..2f2c6bd3ec 100644
--- a/extern/crashpad/crashpad/util/mach/task_for_pid.h
+++ b/extern/crashpad/crashpad/util/mach/task_for_pid.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/address_sanitizer.h b/extern/crashpad/crashpad/util/misc/address_sanitizer.h
index 75c72399aa..dd4924b6c8 100644
--- a/extern/crashpad/crashpad/util/misc/address_sanitizer.h
+++ b/extern/crashpad/crashpad/util/misc/address_sanitizer.h
@@ -1,4 +1,4 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
+// Copyright 2016 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/address_types.h b/extern/crashpad/crashpad/util/misc/address_types.h
index 14942bd8ea..c43d36cdf8 100644
--- a/extern/crashpad/crashpad/util/misc/address_types.h
+++ b/extern/crashpad/crashpad/util/misc/address_types.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,13 +21,13 @@
 
 #include "build/build_config.h"
 
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
 #include <mach/mach_types.h>
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 #include "util/win/address_types.h"
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
 #include "util/linux/address_types.h"
-#elif defined(OS_FUCHSIA)
+#elif BUILDFLAG(IS_FUCHSIA)
 #include <zircon/types.h>
 #else
 #error "Unhandled OS type"
@@ -45,22 +45,22 @@ using VMAddress = uint64_t;
 //!     VMAddress), potentially across bitness.
 using VMSize = uint64_t;
 
-#elif defined(OS_APPLE)
+#elif BUILDFLAG(IS_APPLE)
 
 using VMAddress = mach_vm_address_t;
 using VMSize = mach_vm_size_t;
 
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 
 using VMAddress = WinVMAddress;
 using VMSize = WinVMSize;
 
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
 
 using VMAddress = LinuxVMAddress;
 using VMSize = LinuxVMSize;
 
-#elif defined(OS_FUCHSIA)
+#elif BUILDFLAG(IS_FUCHSIA)
 
 using VMAddress = zx_vaddr_t;
 using VMSize = size_t;
diff --git a/extern/crashpad/crashpad/util/misc/arm64_pac_bti.S b/extern/crashpad/crashpad/util/misc/arm64_pac_bti.S
new file mode 100644
index 0000000000..77961d410e
--- /dev/null
+++ b/extern/crashpad/crashpad/util/misc/arm64_pac_bti.S
@@ -0,0 +1,65 @@
+// Copyright 2021 The Crashpad Authors
+//
+// 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.
+
+#ifndef CRASHPAD_UTIL_MISC_ARM64_PAC_BTI_S
+#define CRASHPAD_UTIL_MISC_ARM64_PAC_BTI_S
+
+/* Support macros for the Armv8.5-A Branch Target Identification and
+ * Armv8.3-A Pointer Authentication features which require emitting
+ * a .note.gnu.property section with the appropriate
+ * architecture-dependent feature bits set.
+ * Read more: "ELF for the Arm® 64-bit Architecture"
+ */
+#if defined(__ARM_FEATURE_BTI_DEFAULT) && (__ARM_FEATURE_BTI_DEFAULT == 1)
+#define GNU_PROPERTY_AARCH64_BTI 1  // Has BTI
+#define CRASHPAD_AARCH64_VALID_JUMP_CALL_TARGET bti jc
+#define CRASHPAD_AARCH64_VALID_CALL_TARGET      bti c
+#define CRASHPAD_AARCH64_VALID_JUMP_TARGET      bti j
+#else
+#define GNU_PROPERTY_AARCH64_BTI 0  // No BTI
+#define CRASHPAD_AARCH64_VALID_JUMP_CALL_TARGET
+#define CRASHPAD_AARCH64_VALID_CALL_TARGET
+#define CRASHPAD_AARCH64_VALID_JUMP_TARGET
+#endif
+
+#if defined(__ARM_FEATURE_PAC_DEFAULT)
+#if ((__ARM_FEATURE_PAC_DEFAULT & ((1<<0)|(1<<1))) == 0)
+#error Pointer authentication defines no valid key!
+#endif
+#define GNU_PROPERTY_AARCH64_PAC 1 // Has PAC
+#else
+#define GNU_PROPERTY_AARCH64_PAC 0 // No PAC
+#endif
+
+/**
+ * Emit a proper .note.gnu.property section in case of PAC or BTI being enabled.
+ */
+#if (GNU_PROPERTY_AARCH64_BTI != 0 || GNU_PROPERTY_AARCH64_PAC != 0)
+  .pushsection .note.gnu.property, "a"
+  .balign 4
+  .long 0x4  /* size of field "GNU" */
+  .long 0x10 /* note descriptor size */
+  .long 0x5  /* type of note descriptor: NT_GNU_PROPERTY_TYPE_0 */
+  .asciz "GNU"
+  .long 0xc0000000 /* GNU_PROPERTY_AARCH64_FEATURE_1_AND */
+  .long 0x4
+  .long ((GNU_PROPERTY_AARCH64_BTI<<0)|(GNU_PROPERTY_AARCH64_PAC<<1))
+  .long 0x0
+  .popsection
+#endif
+
+#undef GNU_PROPERTY_AARCH64_BTI
+#undef GNU_PROPERTY_AARCH64_PAC
+
+#endif /* CRASHPAD_UTIL_MISC_ARM64_PAC_BTI_S */
diff --git a/extern/crashpad/crashpad/util/misc/arraysize.h b/extern/crashpad/crashpad/util/misc/arraysize.h
index 93a63882e4..09f4d521f6 100644
--- a/extern/crashpad/crashpad/util/misc/arraysize.h
+++ b/extern/crashpad/crashpad/util/misc/arraysize.h
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -35,9 +35,9 @@ constexpr size_t ArraySizeHelper() noexcept {
 
 //! \brief A way of computing an array’s size.
 //!
-//! Use this only where `base::size()` or `std::size()` won’t work, such as in
-//! constant expressions (including `static_assert` expressions) that consider
-//! the sizes of non-static data members.
+//! Use this only where `std::size()` won’t work, such as in constant
+//! expressions (including `static_assert` expressions) that consider the
+//! sizes of non-static data members.
 #define ArraySize(array) crashpad::internal::ArraySizeHelper<decltype(array)>()
 
 #endif  // CRASHPAD_UTIL_MISC_ARRAYSIZE_H_
diff --git a/extern/crashpad/crashpad/util/misc/arraysize_test.cc b/extern/crashpad/crashpad/util/misc/arraysize_test.cc
index ad8da0970a..84e8f6bd2b 100644
--- a/extern/crashpad/crashpad/util/misc/arraysize_test.cc
+++ b/extern/crashpad/crashpad/util/misc/arraysize_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
+// Copyright 2016 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 
 #include "util/misc/arraysize.h"
 
-#include "base/compiler_specific.h"
 #include "gtest/gtest.h"
 
 namespace crashpad {
@@ -22,37 +21,29 @@ namespace test {
 namespace {
 
 TEST(ArraySize, ArraySize) {
-  char c1[1];
+  [[maybe_unused]] char c1[1];
   static_assert(ArraySize(c1) == 1, "c1");
-  ALLOW_UNUSED_LOCAL(c1);
 
-  char c2[2];
+  [[maybe_unused]] char c2[2];
   static_assert(ArraySize(c2) == 2, "c2");
-  ALLOW_UNUSED_LOCAL(c2);
 
-  char c4[4];
+  [[maybe_unused]] char c4[4];
   static_assert(ArraySize(c4) == 4, "c4");
-  ALLOW_UNUSED_LOCAL(c4);
 
-  int i1[1];
+  [[maybe_unused]] int i1[1];
   static_assert(ArraySize(i1) == 1, "i1");
-  ALLOW_UNUSED_LOCAL(i1);
 
-  int i2[2];
+  [[maybe_unused]] int i2[2];
   static_assert(ArraySize(i2) == 2, "i2");
-  ALLOW_UNUSED_LOCAL(i2);
 
-  int i4[4];
+  [[maybe_unused]] int i4[4];
   static_assert(ArraySize(i4) == 4, "i4");
-  ALLOW_UNUSED_LOCAL(i4);
 
-  long l8[8];
+  [[maybe_unused]] long l8[8];
   static_assert(ArraySize(l8) == 8, "l8");
-  ALLOW_UNUSED_LOCAL(l8);
 
-  int l9[9];
+  [[maybe_unused]] int l9[9];
   static_assert(ArraySize(l9) == 9, "l9");
-  ALLOW_UNUSED_LOCAL(l9);
 
   struct S {
     char c;
@@ -61,13 +52,11 @@ TEST(ArraySize, ArraySize) {
     bool b;
   };
 
-  S s1[1];
+  [[maybe_unused]] S s1[1];
   static_assert(ArraySize(s1) == 1, "s1");
-  ALLOW_UNUSED_LOCAL(s1);
 
-  S s10[10];
+  [[maybe_unused]] S s10[10];
   static_assert(ArraySize(s10) == 10, "s10");
-  ALLOW_UNUSED_LOCAL(s10);
 }
 
 }  // namespace
diff --git a/extern/crashpad/crashpad/util/misc/as_underlying_type.h b/extern/crashpad/crashpad/util/misc/as_underlying_type.h
index ba673ae5c2..4d335aaf3e 100644
--- a/extern/crashpad/crashpad/util/misc/as_underlying_type.h
+++ b/extern/crashpad/crashpad/util/misc/as_underlying_type.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/capture_context.h b/extern/crashpad/crashpad/util/misc/capture_context.h
index d21a24f19f..ac7707b48c 100644
--- a/extern/crashpad/crashpad/util/misc/capture_context.h
+++ b/extern/crashpad/crashpad/util/misc/capture_context.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,30 +17,27 @@
 
 #include "build/build_config.h"
 
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
 #include <mach/mach.h>
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 #include <windows.h>
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
 #include <ucontext.h>
-#elif defined(OS_FUCHSIA)
-#include <signal.h>
-#endif  // OS_APPLE
+#endif  // BUILDFLAG(IS_APPLE)
 
 namespace crashpad {
 
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
 #if defined(ARCH_CPU_X86_FAMILY)
 using NativeCPUContext = x86_thread_state;
 #elif defined(ARCH_CPU_ARM64)
 using NativeCPUContext = arm_unified_thread_state;
 #endif
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 using NativeCPUContext = CONTEXT;
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \
-    defined(OS_FUCHSIA)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
 using NativeCPUContext = ucontext_t;
-#endif  // OS_APPLE
+#endif  // BUILDFLAG(IS_APPLE)
 
 //! \brief Saves the CPU context.
 //!
@@ -57,6 +54,9 @@ using NativeCPUContext = ucontext_t;
 //! `RtlCaptureContext()` capture only the state of the integer registers,
 //! ignoring floating-point and vector state.
 //!
+//! CaptureContext isn't used on Fuchsia, nor does a concept of `ucontext_t`
+//! exist on Fuchsia.
+//!
 //! \param[out] cpu_context The structure to store the context in.
 //!
 //! \note The ABI may require that this function's argument is passed by
@@ -66,9 +66,10 @@ using NativeCPUContext = ucontext_t;
 //!     OS                  | Architecture | Register
 //!     --------------------|--------------|---------
 //!     Win                 | x86_64       | `%%rcx`
-//!     macOS/Linux/Fuchsia | x86_64       | `%%rdi`
+//!     macOS/Linux         | x86_64       | `%%rdi`
 //!     Linux               | ARM/ARM64    | `r0`/`x0`
 //!     Linux               | MIPS/MIPS64  | `$a0`
+//!     Linux               | RISCV64      | `a0`
 //!
 //!     Additionally, the value `LR` on ARM/ARM64 will be the return address of
 //!     this function.
diff --git a/extern/crashpad/crashpad/util/misc/capture_context_fuchsia.S b/extern/crashpad/crashpad/util/misc/capture_context_fuchsia.S
deleted file mode 100644
index 0ebc7f7fe8..0000000000
--- a/extern/crashpad/crashpad/util/misc/capture_context_fuchsia.S
+++ /dev/null
@@ -1,173 +0,0 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
-//
-// 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.
-
-// namespace crashpad {
-// void CaptureContext(ucontext_t* context);
-// }  // namespace crashpad
-
-#define CAPTURECONTEXT_SYMBOL _ZN8crashpad14CaptureContextEP8ucontext
-
-  .text
-  .globl CAPTURECONTEXT_SYMBOL
-#if defined(__x86_64__)
-  .balign 16, 0x90
-#elif defined(__aarch64__)
-  .balign 4, 0x0
-#endif
-
-CAPTURECONTEXT_SYMBOL:
-
-#if defined(__x86_64__)
-
-  .cfi_startproc
-
-  pushq %rbp
-  .cfi_def_cfa_offset 16
-  .cfi_offset %rbp, -16
-  movq %rsp, %rbp
-  .cfi_def_cfa_register %rbp
-
-  // Note that 16-byte stack alignment is not maintained because this function
-  // does not call out to any other.
-
-  // pushfq first, because some instructions (but probably none used here)
-  // affect %rflags. %rflags will be in -8(%rbp).
-  pushfq
-
-  // General-purpose registers whose values haven’t changed can be captured
-  // directly.
-  movq %r8, 0x28(%rdi)  // context->uc_mcontext.r8
-  movq %r9, 0x30(%rdi)  // context->uc_mcontext.r9
-  movq %r10, 0x38(%rdi)  // context->uc_mcontext.r10
-  movq %r11, 0x40(%rdi)  // context->uc_mcontext.r11
-  movq %r12, 0x48(%rdi)  // context->uc_mcontext.r12
-  movq %r13, 0x50(%rdi)  // context->uc_mcontext.r13
-  movq %r14, 0x58(%rdi)  // context->uc_mcontext.r14
-  movq %r15, 0x60(%rdi)  // context->uc_mcontext.r15
-
-  // Because of the calling convention, there’s no way to recover the value of
-  // the caller’s %rdi as it existed prior to calling this function. This
-  // function captures a snapshot of the register state at its return, which
-  // involves %rdi containing a pointer to its first argument. Callers that
-  // require the value of %rdi prior to calling this function should obtain it
-  // separately. For example:
-  //   uint64_t rdi;
-  //   asm("movq %%rdi, %0" : "=m"(rdi));
-  movq %rdi, 0x68(%rdi)  // context->uc_mcontext.rdi
-
-  movq %rsi, 0x70(%rdi)  // context->uc_mcontext.rsi
-
-  // Use %r8 as a scratch register now that it has been saved.
-  // The original %rbp was saved on the stack in this function’s prologue.
-  movq (%rbp), %r8
-  movq %r8, 0x78(%rdi)  // context->uc_mcontext.rbp
-
-  // Save the remaining general-purpose registers.
-  movq %rbx, 0x80(%rdi)  // context->uc_mcontext.rbx
-  movq %rdx, 0x88(%rdi)  // context->uc_mcontext.rdx
-  movq %rax, 0x90(%rdi)  // context->uc_mcontext.rax
-  movq %rcx, 0x98(%rdi)  // context->uc_mcontext.rcx
-
-  // %rsp was saved in %rbp in this function’s prologue, but the caller’s %rsp
-  // is 16 more than this value: 8 for the original %rbp saved on the stack in
-  // this function’s prologue, and 8 for the return address saved on the stack
-  // by the call instruction that reached this function.
-  leaq 16(%rbp), %r8
-  movq %r8, 0xa0(%rdi)  // context->uc_mcontext.rsp
-
-  // The return address saved on the stack used by the call of this function is
-  // likely more useful than the current RIP here.
-  movq 8(%rbp), %r8
-  movq %r8, 0xa8(%rdi)  // context->uc_mcontext.rip
-
-  // The original %rflags was saved on the stack above.
-  movq -8(%rbp), %r8
-  movq %r8, 0xb0(%rdi)  // context->uc_mcontext.eflags
-
-  // Save the segment registers
-  movw %cs, 0xb8(%rdi)  // context->uc_mcontext.cs
-  movw %gs, 0xba(%rdi)  // context->uc_mcontext.gs
-  movw %fs, 0xbc(%rdi)  // context->uc_mcontext.fs
-
-  xorw %ax, %ax
-  movw %ax, 0xbe(%rdi)  // context->uc_mcontext.padding
-
-  // Zero out the remainder of the unused pseudo-registers
-  xorq %r8, %r8
-  movq %r8, 0xc0(%rdi)  // context->uc_mcontext.err
-  movq %r8, 0xc8(%rdi)  // context->uc_mcontext.trapno
-  movq %r8, 0xd0(%rdi)  // context->uc_mcontext.oldmask
-  movq %r8, 0xd8(%rdi)  // context->uc_mcontext.cr2
-
-  // Clean up by restoring clobbered registers, even those considered volatile
-  // by the ABI, so that the captured context represents the state at this
-  // function’s exit.
-  movq 0x90(%rdi), %rax
-  movq 0x28(%rdi), %r8
-
-  // TODO(https://crashpad.chromium.org/bug/300): save floating-point registers.
-
-  popfq
-
-  popq %rbp
-
-  ret
-
-  .cfi_endproc
-
-#elif defined(__aarch64__)
-
-  // Zero out fault_address, which is unused.
-  str x31, [x0, #0xb0]  // context->uc_mcontext.fault_address
-
-  // Save general purpose registers in context->uc_mcontext.regs[i].
-  // The original x0 can't be recovered.
-  stp x0, x1, [x0, #0xb8]
-  stp x2, x3, [x0, #0xc8]
-  stp x4, x5, [x0, #0xd8]
-  stp x6, x7, [x0, #0xe8]
-  stp x8, x9, [x0, #0xf8]
-  stp x10, x11, [x0, #0x108]
-  stp x12, x13, [x0, #0x118]
-  stp x14, x15, [x0, #0x128]
-  stp x16, x17, [x0, #0x138]
-  stp x18, x19, [x0, #0x148]
-  stp x20, x21, [x0, #0x158]
-  stp x22, x23, [x0, #0x168]
-  stp x24, x25, [x0, #0x178]
-  stp x26, x27, [x0, #0x188]
-  stp x28, x29, [x0, #0x198]
-
-  // The original LR can't be recovered.
-  str LR, [x0, #0x1a8]
-
-  // Use x1 as a scratch register.
-  mov x1, SP
-  str x1, [x0, #0x1b0] // context->uc_mcontext.sp
-
-  // The link register holds the return address for this function.
-  str LR, [x0, #0x1b8]  // context->uc_mcontext.pc
-
-  // pstate should hold SPSR but NZCV are the only bits we know about.
-  mrs x1, NZCV
-  str x1, [x0, #0x1c0]  // context->uc_mcontext.pstate
-
-  // Restore x1 from the saved context.
-  ldr x1, [x0, #0xc0]
-
-  // TODO(https://crashpad.chromium.org/bug/300): save floating-point registers.
-
-  ret
-
-#endif  // __x86_64__
diff --git a/extern/crashpad/crashpad/util/misc/capture_context_linux.S b/extern/crashpad/crashpad/util/misc/capture_context_linux.S
index 52215ee5d0..cfad85738e 100644
--- a/extern/crashpad/crashpad/util/misc/capture_context_linux.S
+++ b/extern/crashpad/crashpad/util/misc/capture_context_linux.S
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "util/misc/arm64_pac_bti.S"
+
 // namespace crashpad {
 // void CaptureContext(ucontext_t* context);
 // }  // namespace crashpad
@@ -34,10 +36,13 @@
   .type CAPTURECONTEXT_SYMBOL2, %function
 #elif defined(__mips__)
   .balign 4, 0x0
+#elif defined(__riscv)
+  .balign 4, 0x0
 #endif
 
 CAPTURECONTEXT_SYMBOL:
 CAPTURECONTEXT_SYMBOL2:
+  CRASHPAD_AARCH64_VALID_CALL_TARGET
 
 #if defined(__i386__)
 
@@ -313,14 +318,15 @@ CAPTURECONTEXT_SYMBOL2:
   stp x26, x27, [x0, #0x188]
   stp x28, x29, [x0, #0x198]
 
-  // The original LR can't be recovered.
+  // The original LR can't be recovered, therefore no need to sign x30 with PAC.
   str x30, [x0, #0x1a8]
 
   // Use x1 as a scratch register.
   mov x1, SP
   str x1, [x0, #0x1b0] // context->uc_mcontext.sp
 
-  // The link register holds the return address for this function.
+  // The link register holds the return address for this function and won't be
+  // recovered, therefore no need to sign x30 with PAC.
   str x30, [x0, #0x1b8]  // context->uc_mcontext.pc
 
   // pstate should hold SPSR but NZCV are the only bits we know about.
@@ -423,4 +429,85 @@ CAPTURECONTEXT_SYMBOL2:
   jr $ra
 
   .set at
+
+#elif defined(__riscv)
+
+  #define MCONTEXT_GREGS_OFFSET 176
+
+  // x1/ra is the return address. Store it as the pc.
+  // The original x10/a0 can't be recovered.
+  sd x1, (0 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x1, (1 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x2, (2 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x3, (3 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x4, (4 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x5, (5 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x6, (6 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x7, (7 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x8, (8 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x9, (9 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x10, (10 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x11, (11 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x12, (12 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x13, (13 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x14, (14 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x15, (15 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x16, (16 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x17, (17 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x18, (18 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x19, (19 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x20, (20 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x21, (21 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x22, (22 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x23, (23 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x24, (24 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x25, (25 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x26, (26 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x27, (27 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x28, (28 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x29, (29 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x30, (30 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x31, (31 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+
+  #define MCONTEXT_FPREGS_OFFSET MCONTEXT_GREGS_OFFSET + 32*8
+
+  // Use x31/t6 as scratch register.
+  frcsr x31
+  sw x31, (32 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+
+  fsd f0, (0 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f1, (1 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f2, (2 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f3, (3 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f4, (4 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f5, (5 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f6, (6 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f7, (7 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f8, (8 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f9, (9 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f10, (10 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f11, (11 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f12, (12 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f13, (13 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f14, (14 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f15, (15 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f16, (16 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f17, (17 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f18, (18 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f19, (19 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f20, (20 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f21, (21 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f22, (22 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f23, (23 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f24, (24 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f25, (25 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f26, (26 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f27, (27 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f28, (28 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f29, (29 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f30, (30 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f31, (31 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+
+  ret
+
 #endif  // __i386__
diff --git a/extern/crashpad/crashpad/util/misc/capture_context_mac.S b/extern/crashpad/crashpad/util/misc/capture_context_mac.S
index f6acafbd33..db277f8298 100644
--- a/extern/crashpad/crashpad/util/misc/capture_context_mac.S
+++ b/extern/crashpad/crashpad/util/misc/capture_context_mac.S
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/capture_context_test.cc b/extern/crashpad/crashpad/util/misc/capture_context_test.cc
index cf23c2deff..2cd92c841a 100644
--- a/extern/crashpad/crashpad/util/misc/capture_context_test.cc
+++ b/extern/crashpad/crashpad/util/misc/capture_context_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -28,15 +28,6 @@ namespace crashpad {
 namespace test {
 namespace {
 
-#if defined(OS_FUCHSIA)
-// Fuchsia uses -fsanitize=safe-stack by default, which splits local variables
-// and the call stack into separate regions (see
-// https://clang.llvm.org/docs/SafeStack.html). Because this test would like to
-// find an approximately valid stack pointer by comparing locals to the
-// captured one, disable safe-stack for this function.
-__attribute__((no_sanitize("safe-stack")))
-#endif  // defined(OS_FUCHSIA)
-
 #if defined(MEMORY_SANITIZER)
 // CaptureContext() calls inline assembly and is incompatible with MSan.
 __attribute__((no_sanitize("memory")))
diff --git a/extern/crashpad/crashpad/util/misc/capture_context_test_util.h b/extern/crashpad/crashpad/util/misc/capture_context_test_util.h
index 90ec67a867..4284b54067 100644
--- a/extern/crashpad/crashpad/util/misc/capture_context_test_util.h
+++ b/extern/crashpad/crashpad/util/misc/capture_context_test_util.h
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/capture_context_test_util_fuchsia.cc b/extern/crashpad/crashpad/util/misc/capture_context_test_util_fuchsia.cc
deleted file mode 100644
index 3d2a1805aa..0000000000
--- a/extern/crashpad/crashpad/util/misc/capture_context_test_util_fuchsia.cc
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
-//
-// 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.
-
-#include "util/misc/capture_context_test_util.h"
-
-#include "gtest/gtest.h"
-#include "util/misc/from_pointer_cast.h"
-
-namespace crashpad {
-namespace test {
-
-#if defined(ARCH_CPU_X86_64)
-static_assert(offsetof(NativeCPUContext, uc_mcontext) == 0x28,
-              "unexpected mcontext offset");
-static_assert(offsetof(NativeCPUContext, uc_mcontext.gregs[REG_RSP]) == 0xa0,
-              "unexpected rsp offset");
-static_assert(offsetof(NativeCPUContext, uc_mcontext.gregs[REG_RIP]) == 0xa8,
-              "unexpected rip offset");
-#endif  // ARCH_CPU_X86_64
-
-void SanityCheckContext(const NativeCPUContext& context) {
-#if defined(ARCH_CPU_X86_64)
-  EXPECT_EQ(context.uc_mcontext.gregs[REG_RDI],
-            FromPointerCast<intptr_t>(&context));
-#elif defined(ARCH_CPU_ARM64)
-  EXPECT_EQ(context.uc_mcontext.regs[0], FromPointerCast<uintptr_t>(&context));
-#endif
-}
-
-uintptr_t ProgramCounterFromContext(const NativeCPUContext& context) {
-#if defined(ARCH_CPU_X86_64)
-  return context.uc_mcontext.gregs[REG_RIP];
-#elif defined(ARCH_CPU_ARM64)
-  return context.uc_mcontext.pc;
-#endif
-}
-
-uintptr_t StackPointerFromContext(const NativeCPUContext& context) {
-#if defined(ARCH_CPU_X86_64)
-  return context.uc_mcontext.gregs[REG_RSP];
-#elif defined(ARCH_CPU_ARM64)
-  return context.uc_mcontext.sp;
-#endif
-}
-
-}  // namespace test
-}  // namespace crashpad
diff --git a/extern/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc b/extern/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
index 30a2ab21df..55820b9ee7 100644
--- a/extern/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
+++ b/extern/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -35,6 +35,9 @@ void SanityCheckContext(const NativeCPUContext& context) {
   EXPECT_EQ(context.uc_mcontext.regs[0], FromPointerCast<uintptr_t>(&context));
 #elif defined(ARCH_CPU_MIPS_FAMILY)
   EXPECT_EQ(context.uc_mcontext.gregs[4], FromPointerCast<uintptr_t>(&context));
+#elif defined(ARCH_CPU_RISCV64)
+  EXPECT_EQ(context.uc_mcontext.__gregs[10],
+            FromPointerCast<uintptr_t>(&context));
 #endif
 }
 
@@ -49,6 +52,8 @@ uintptr_t ProgramCounterFromContext(const NativeCPUContext& context) {
   return context.uc_mcontext.pc;
 #elif defined(ARCH_CPU_MIPS_FAMILY)
   return context.uc_mcontext.pc;
+#elif defined(ARCH_CPU_RISCV64)
+  return context.uc_mcontext.__gregs[0];
 #endif
 }
 
@@ -63,6 +68,8 @@ uintptr_t StackPointerFromContext(const NativeCPUContext& context) {
   return context.uc_mcontext.sp;
 #elif defined(ARCH_CPU_MIPS_FAMILY)
   return context.uc_mcontext.gregs[29];
+#elif defined(ARCH_CPU_RISCV64)
+  return context.uc_mcontext.__gregs[2];
 #endif
 }
 
diff --git a/extern/crashpad/crashpad/util/misc/capture_context_test_util_mac.cc b/extern/crashpad/crashpad/util/misc/capture_context_test_util_mac.cc
index 6d4143fb0c..8a75b03802 100644
--- a/extern/crashpad/crashpad/util/misc/capture_context_test_util_mac.cc
+++ b/extern/crashpad/crashpad/util/misc/capture_context_test_util_mac.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/capture_context_test_util_win.cc b/extern/crashpad/crashpad/util/misc/capture_context_test_util_win.cc
index d1221956d8..e21d865e66 100644
--- a/extern/crashpad/crashpad/util/misc/capture_context_test_util_win.cc
+++ b/extern/crashpad/crashpad/util/misc/capture_context_test_util_win.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,10 +13,11 @@
 // limitations under the License.
 
 #include "util/misc/capture_context_test_util.h"
-#include "util/win/context_wrappers.h"
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+
 #include "gtest/gtest.h"
+#include "util/win/context_wrappers.h"
 
 namespace crashpad {
 namespace test {
@@ -59,7 +60,7 @@ void SanityCheckContext(const NativeCPUContext& context) {
 
 #if defined(ARCH_CPU_X86)
   // fxsave doesn’t write these bytes.
-  for (size_t i = 464; i < base::size(context.ExtendedRegisters); ++i) {
+  for (size_t i = 464; i < std::size(context.ExtendedRegisters); ++i) {
     SCOPED_TRACE(i);
     EXPECT_EQ(context.ExtendedRegisters[i], 0);
   }
@@ -69,7 +70,7 @@ void SanityCheckContext(const NativeCPUContext& context) {
   EXPECT_EQ(context.FltSave.MxCsr, context.MxCsr);
 
   // fxsave doesn’t write these bytes.
-  for (size_t i = 0; i < base::size(context.FltSave.Reserved4); ++i) {
+  for (size_t i = 0; i < std::size(context.FltSave.Reserved4); ++i) {
     SCOPED_TRACE(i);
     EXPECT_EQ(context.FltSave.Reserved4[i], 0);
   }
@@ -81,7 +82,7 @@ void SanityCheckContext(const NativeCPUContext& context) {
   EXPECT_EQ(context.P4Home, 0u);
   EXPECT_EQ(context.P5Home, 0u);
   EXPECT_EQ(context.P6Home, 0u);
-  for (size_t i = 0; i < base::size(context.VectorRegister); ++i) {
+  for (size_t i = 0; i < std::size(context.VectorRegister); ++i) {
     SCOPED_TRACE(i);
     EXPECT_EQ(context.VectorRegister[i].Low, 0u);
     EXPECT_EQ(context.VectorRegister[i].High, 0u);
diff --git a/extern/crashpad/crashpad/util/misc/capture_context_win.asm b/extern/crashpad/crashpad/util/misc/capture_context_win.asm
index adb76e510e..d4f7fbc07f 100644
--- a/extern/crashpad/crashpad/util/misc/capture_context_win.asm
+++ b/extern/crashpad/crashpad/util/misc/capture_context_win.asm
@@ -1,4 +1,4 @@
-; Copyright 2015 The Crashpad Authors. All rights reserved.
+; Copyright 2015 The Crashpad Authors
 ;
 ; Licensed under the Apache License, Version 2.0 (the "License");
 ; you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/capture_context_win_arm64.asm b/extern/crashpad/crashpad/util/misc/capture_context_win_arm64.asm
index 5630698f8d..ccdcc6a3f0 100644
--- a/extern/crashpad/crashpad/util/misc/capture_context_win_arm64.asm
+++ b/extern/crashpad/crashpad/util/misc/capture_context_win_arm64.asm
@@ -1,4 +1,4 @@
-; Copyright 2019 The Crashpad Authors. All rights reserved.
+; Copyright 2019 The Crashpad Authors
 ;
 ; Licensed under the Apache License, Version 2.0 (the "License");
 ; you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/clock.h b/extern/crashpad/crashpad/util/misc/clock.h
index ed88cdcb64..854a1fcd97 100644
--- a/extern/crashpad/crashpad/util/misc/clock.h
+++ b/extern/crashpad/crashpad/util/misc/clock.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/clock_mac.cc b/extern/crashpad/crashpad/util/misc/clock_mac.cc
index bb52299efa..2b4dccd0c4 100644
--- a/extern/crashpad/crashpad/util/misc/clock_mac.cc
+++ b/extern/crashpad/crashpad/util/misc/clock_mac.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,32 +14,12 @@
 
 #include "util/misc/clock.h"
 
-#include <mach/mach_time.h>
-
-#include "base/mac/mach_logging.h"
-
-namespace {
-
-mach_timebase_info_data_t* TimebaseInternal() {
-  mach_timebase_info_data_t* timebase_info = new mach_timebase_info_data_t;
-  kern_return_t kr = mach_timebase_info(timebase_info);
-  MACH_CHECK(kr == KERN_SUCCESS, kr) << "mach_timebase_info";
-  return timebase_info;
-}
-
-mach_timebase_info_data_t* Timebase() {
-  static mach_timebase_info_data_t* timebase_info = TimebaseInternal();
-  return timebase_info;
-}
-
-}  // namespace
+#include <time.h>
 
 namespace crashpad {
 
 uint64_t ClockMonotonicNanoseconds() {
-  uint64_t absolute_time = mach_absolute_time();
-  mach_timebase_info_data_t* timebase_info = Timebase();
-  return absolute_time * timebase_info->numer / timebase_info->denom;
+  return clock_gettime_nsec_np(CLOCK_UPTIME_RAW);
 }
 
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/util/misc/clock_posix.cc b/extern/crashpad/crashpad/util/misc/clock_posix.cc
index a9fe8e5856..698a9a307f 100644
--- a/extern/crashpad/crashpad/util/misc/clock_posix.cc
+++ b/extern/crashpad/crashpad/util/misc/clock_posix.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ constexpr uint64_t kNanosecondsPerSecond = 1E9;
 
 namespace crashpad {
 
-#if !defined(OS_APPLE)
+#if !BUILDFLAG(IS_APPLE)
 
 uint64_t ClockMonotonicNanoseconds() {
   timespec now;
diff --git a/extern/crashpad/crashpad/util/misc/clock_test.cc b/extern/crashpad/crashpad/util/misc/clock_test.cc
index 443d496b05..37d4fdc67c 100644
--- a/extern/crashpad/crashpad/util/misc/clock_test.cc
+++ b/extern/crashpad/crashpad/util/misc/clock_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,10 +17,11 @@
 #include <sys/types.h>
 
 #include <algorithm>
+#include <iterator>
 
-#include "base/cxx17_backports.h"
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
+#include "build/build_config.h"
 #include "gtest/gtest.h"
 
 namespace crashpad {
@@ -41,17 +42,17 @@ TEST(Clock, ClockMonotonicNanoseconds) {
     EXPECT_GE(now, last);
   }
 
-#if !defined(OS_WIN)  // No SleepNanoseconds implemented on Windows.
+#if !BUILDFLAG(IS_WIN)  // No SleepNanoseconds implemented on Windows.
   // SleepNanoseconds() should sleep for at least the value of the clock’s
   // resolution, so the clock’s value should definitely increase after a sleep.
   // EXPECT_GT can be used instead of EXPECT_GE after the sleep.
   SleepNanoseconds(1);
   now = ClockMonotonicNanoseconds();
   EXPECT_GT(now, start);
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
 }
 
-#if !defined(OS_WIN)  // No SleepNanoseconds implemented on Windows.
+#if !BUILDFLAG(IS_WIN)  // No SleepNanoseconds implemented on Windows.
 
 void TestSleepNanoseconds(uint64_t nanoseconds) {
   uint64_t start = ClockMonotonicNanoseconds();
@@ -82,7 +83,7 @@ TEST(Clock, SleepNanoseconds) {
       static_cast<uint64_t>(5E7),  // 50 milliseconds
   };
 
-  for (size_t index = 0; index < base::size(kTestData); ++index) {
+  for (size_t index = 0; index < std::size(kTestData); ++index) {
     const uint64_t nanoseconds = kTestData[index];
     SCOPED_TRACE(base::StringPrintf(
         "index %zu, nanoseconds %" PRIu64, index, nanoseconds));
@@ -91,7 +92,7 @@ TEST(Clock, SleepNanoseconds) {
   }
 }
 
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
 
 }  // namespace
 }  // namespace test
diff --git a/extern/crashpad/crashpad/util/misc/clock_win.cc b/extern/crashpad/crashpad/util/misc/clock_win.cc
index 1079c423a5..1665eaa99a 100644
--- a/extern/crashpad/crashpad/util/misc/clock_win.cc
+++ b/extern/crashpad/crashpad/util/misc/clock_win.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/elf_note_types.h b/extern/crashpad/crashpad/util/misc/elf_note_types.h
index 77c9043b83..888f790195 100644
--- a/extern/crashpad/crashpad/util/misc/elf_note_types.h
+++ b/extern/crashpad/crashpad/util/misc/elf_note_types.h
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/from_pointer_cast.h b/extern/crashpad/crashpad/util/misc/from_pointer_cast.h
index 89a9941440..64ed96f738 100644
--- a/extern/crashpad/crashpad/util/misc/from_pointer_cast.h
+++ b/extern/crashpad/crashpad/util/misc/from_pointer_cast.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
 #ifndef CRASHPAD_UTIL_MISC_FROM_POINTER_CAST_H_
 #define CRASHPAD_UTIL_MISC_FROM_POINTER_CAST_H_
 
+#include <stddef.h>
 #include <stdint.h>
 
 #include <cstddef>
diff --git a/extern/crashpad/crashpad/util/misc/from_pointer_cast_test.cc b/extern/crashpad/crashpad/util/misc/from_pointer_cast_test.cc
index 9c7f19c34c..b8b21db936 100644
--- a/extern/crashpad/crashpad/util/misc/from_pointer_cast_test.cc
+++ b/extern/crashpad/crashpad/util/misc/from_pointer_cast_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/implicit_cast.h b/extern/crashpad/crashpad/util/misc/implicit_cast.h
index 018800abd8..7fba432661 100644
--- a/extern/crashpad/crashpad/util/misc/implicit_cast.h
+++ b/extern/crashpad/crashpad/util/misc/implicit_cast.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/initialization_state.h b/extern/crashpad/crashpad/util/misc/initialization_state.h
index c8e24052ba..b6d313e756 100644
--- a/extern/crashpad/crashpad/util/misc/initialization_state.h
+++ b/extern/crashpad/crashpad/util/misc/initialization_state.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -56,6 +56,7 @@ class InitializationState {
   };
 
   InitializationState() : state_(kStateUninitialized) {}
+  explicit InitializationState(State state) : state_(state) {}
 
   InitializationState(const InitializationState&) = delete;
   InitializationState& operator=(const InitializationState&) = delete;
diff --git a/extern/crashpad/crashpad/util/misc/initialization_state_dcheck.cc b/extern/crashpad/crashpad/util/misc/initialization_state_dcheck.cc
index 82bb5b6d7f..e5036bbc88 100644
--- a/extern/crashpad/crashpad/util/misc/initialization_state_dcheck.cc
+++ b/extern/crashpad/crashpad/util/misc/initialization_state_dcheck.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/initialization_state_dcheck.h b/extern/crashpad/crashpad/util/misc/initialization_state_dcheck.h
index e04ff234c3..a722effc6a 100644
--- a/extern/crashpad/crashpad/util/misc/initialization_state_dcheck.h
+++ b/extern/crashpad/crashpad/util/misc/initialization_state_dcheck.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,8 +17,9 @@
 
 //! \file
 
+#include <tuple>
+
 #include "base/check_op.h"
-#include "base/compiler_specific.h"
 #include "build/build_config.h"
 #include "util/misc/initialization_state.h"
 
@@ -175,11 +176,17 @@ using InitializationStateDcheck = bool[0];
 // Avoid triggering warnings by repurposing these macros when DCHECKs are
 // disabled.
 #define INITIALIZATION_STATE_SET_INITIALIZING(initialization_state_dcheck) \
-  ALLOW_UNUSED_LOCAL(initialization_state_dcheck)
+  do {                                                                     \
+    std::ignore = initialization_state_dcheck;                             \
+  } while (false)
 #define INITIALIZATION_STATE_SET_VALID(initialization_state_dcheck) \
-  ALLOW_UNUSED_LOCAL(initialization_state_dcheck)
+  do {                                                              \
+    std::ignore = initialization_state_dcheck;                      \
+  } while (false)
 #define INITIALIZATION_STATE_DCHECK_VALID(initialization_state_dcheck) \
-  ALLOW_UNUSED_LOCAL(initialization_state_dcheck)
+  do {                                                                 \
+    std::ignore = initialization_state_dcheck;                         \
+  } while (false)
 
 #endif
 
diff --git a/extern/crashpad/crashpad/util/misc/initialization_state_dcheck_test.cc b/extern/crashpad/crashpad/util/misc/initialization_state_dcheck_test.cc
index 3e823c8a11..b8b6c4bdc1 100644
--- a/extern/crashpad/crashpad/util/misc/initialization_state_dcheck_test.cc
+++ b/extern/crashpad/crashpad/util/misc/initialization_state_dcheck_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/initialization_state_test.cc b/extern/crashpad/crashpad/util/misc/initialization_state_test.cc
index 9f462826f9..d6b96cedb7 100644
--- a/extern/crashpad/crashpad/util/misc/initialization_state_test.cc
+++ b/extern/crashpad/crashpad/util/misc/initialization_state_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 
 #include <memory>
 
+#include "base/compiler_specific.h"
 #include "base/memory/free_deleter.h"
 #include "gtest/gtest.h"
 
@@ -59,6 +60,10 @@ TEST(InitializationState, InitializationState) {
   // buffer that’s still valid and its destructor was called directly, this
   // approximates use-after-free without risking that the memory formerly used
   // for the InitializationState object has been repurposed.
+
+  // (Though this is still UB and MSan does not like this)
+  MSAN_UNPOISON(initialization_state, sizeof(*initialization_state));
+
   EXPECT_FALSE(initialization_state->is_uninitialized());
   EXPECT_FALSE(initialization_state->is_valid());
 }
diff --git a/extern/crashpad/crashpad/util/misc/lexing.cc b/extern/crashpad/crashpad/util/misc/lexing.cc
index 5e8fa304f5..f08cb259a7 100644
--- a/extern/crashpad/crashpad/util/misc/lexing.cc
+++ b/extern/crashpad/crashpad/util/misc/lexing.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,23 +14,23 @@
 
 #include "util/misc/lexing.h"
 
-#include <ctype.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>
 
 #include <limits>
+#include <string_view>
 
 #include "base/strings/string_number_conversions.h"
-#include "base/strings/string_piece.h"
+#include "base/strings/string_util.h"
 
 namespace crashpad {
 
 namespace {
 
-#define MAKE_ADAPTER(type, function)                                        \
-  bool ConvertStringToNumber(const base::StringPiece& input, type* value) { \
-    return function(input, value);                                          \
+#define MAKE_ADAPTER(type, function)                                \
+  bool ConvertStringToNumber(std::string_view input, type* value) { \
+    return function(input, value);                                  \
   }
 MAKE_ADAPTER(int, base::StringToInt)
 MAKE_ADAPTER(unsigned int, base::StringToUint)
@@ -55,11 +55,10 @@ bool AdvancePastNumber(const char** input, T* value) {
   if (std::numeric_limits<T>::is_signed && **input == '-') {
     ++length;
   }
-  while (isdigit((*input)[length])) {
+  while (base::IsAsciiDigit((*input)[length])) {
     ++length;
   }
-  bool success =
-      ConvertStringToNumber(base::StringPiece(*input, length), value);
+  bool success = ConvertStringToNumber(std::string_view(*input, length), value);
   if (success) {
     *input += length;
     return true;
diff --git a/extern/crashpad/crashpad/util/misc/lexing.h b/extern/crashpad/crashpad/util/misc/lexing.h
index ba37e0ca5f..5380431a67 100644
--- a/extern/crashpad/crashpad/util/misc/lexing.h
+++ b/extern/crashpad/crashpad/util/misc/lexing.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/memory_sanitizer.h b/extern/crashpad/crashpad/util/misc/memory_sanitizer.h
index a3e0d8eeb8..45095be31f 100644
--- a/extern/crashpad/crashpad/util/misc/memory_sanitizer.h
+++ b/extern/crashpad/crashpad/util/misc/memory_sanitizer.h
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/metrics.cc b/extern/crashpad/crashpad/util/misc/metrics.cc
index 47c9f26f31..de63434dde 100644
--- a/extern/crashpad/crashpad/util/misc/metrics.cc
+++ b/extern/crashpad/crashpad/util/misc/metrics.cc
@@ -1,4 +1,4 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
+// Copyright 2016 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,15 +19,15 @@
 #include "base/numerics/safe_conversions.h"
 #include "build/build_config.h"
 
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
 #define METRICS_OS_NAME "Mac"
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 #define METRICS_OS_NAME "Win"
-#elif defined(OS_ANDROID)
+#elif BUILDFLAG(IS_ANDROID)
 #define METRICS_OS_NAME "Android"
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 #define METRICS_OS_NAME "Linux"
-#elif defined(OS_FUCHSIA)
+#elif BUILDFLAG(IS_FUCHSIA)
 #define METRICS_OS_NAME "Fuchsia"
 #endif
 
@@ -78,6 +78,13 @@ void Metrics::CrashUploadAttempted(bool successful) {
   UMA_HISTOGRAM_BOOLEAN("Crashpad.CrashUpload.AttemptSuccessful", successful);
 }
 
+#if BUILDFLAG(IS_APPLE)
+// static
+void Metrics::CrashUploadErrorCode(int error_code) {
+  base::UmaHistogramSparse("Crashpad.CrashUpload.ErrorCode", error_code);
+}
+#endif
+
 // static
 void Metrics::CrashUploadSkipped(CrashSkippedReason reason) {
   UMA_HISTOGRAM_ENUMERATION(
@@ -115,7 +122,7 @@ void Metrics::HandlerCrashed(uint32_t exception_code) {
       "Crashpad.HandlerCrash.ExceptionCode." METRICS_OS_NAME, exception_code);
 }
 
-#if defined(OS_IOS)
+#if BUILDFLAG(IS_IOS)
 // static
 void Metrics::MissingIntermediateDumpKey(
     const internal::IntermediateDumpKey& key) {
diff --git a/extern/crashpad/crashpad/util/misc/metrics.h b/extern/crashpad/crashpad/util/misc/metrics.h
index 63c673a337..a47ee7472c 100644
--- a/extern/crashpad/crashpad/util/misc/metrics.h
+++ b/extern/crashpad/crashpad/util/misc/metrics.h
@@ -1,4 +1,4 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
+// Copyright 2016 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 #include "build/build_config.h"
 #include "util/file/file_io.h"
 
-#if defined(OS_IOS)
+#if BUILDFLAG(IS_IOS)
 #include "util/ios/ios_intermediate_dump_format.h"
 #endif
 
@@ -63,6 +63,12 @@ class Metrics {
   //! \brief Reports on a crash upload attempt, and if it succeeded.
   static void CrashUploadAttempted(bool successful);
 
+#if BUILDFLAG(IS_APPLE) || DOXYGEN
+  //! \brief Records error codes from
+  //!     `+[NSURLConnection sendSynchronousRequest:returningResponse:error:]`.
+  static void CrashUploadErrorCode(int error_code);
+#endif
+
   //! \brief Values for CrashUploadSkipped().
   //!
   //! \note These are used as metrics enumeration values, so new values should
@@ -89,6 +95,10 @@ class Metrics {
     //!     and uploading it to the crash server.
     kPrepareForUploadFailed = 5,
 
+    //! \brief The upload of the crash failed during communication with the
+    //!     server, but the upload can be retried later.
+    kUploadFailedButCanRetry = 6,
+
     //! \brief The number of values in this enumeration; not a valid value.
     kMaxValue
   };
@@ -203,7 +213,7 @@ class Metrics {
   //! This is currently only reported on Windows.
   static void HandlerCrashed(uint32_t exception_code);
 
-#if defined(OS_IOS) || DOXYGEN
+#if BUILDFLAG(IS_IOS) || DOXYGEN
   //! \brief Records a missing key from an intermediate dump.
   static void MissingIntermediateDumpKey(
       const internal::IntermediateDumpKey& key);
diff --git a/extern/crashpad/crashpad/util/misc/no_cfi_icall.h b/extern/crashpad/crashpad/util/misc/no_cfi_icall.h
index 817dca64c7..7410026dc6 100644
--- a/extern/crashpad/crashpad/util/misc/no_cfi_icall.h
+++ b/extern/crashpad/crashpad/util/misc/no_cfi_icall.h
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,34 +18,17 @@
 #include <type_traits>
 #include <utility>
 
+#include "base/compiler_specific.h"
 #include "build/build_config.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include <windows.h>
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
 
 namespace crashpad {
 
 namespace {
 
-// Sanitizers annotations.
-#if defined(__has_attribute)
-#if __has_attribute(no_sanitize)
-#define NO_SANITIZE(what) __attribute__((no_sanitize(what)))
-#endif
-#endif
-#if !defined(NO_SANITIZE)
-#define NO_SANITIZE(what)
-#endif
-
-// DISABLE_CFI_ICALL -- Disable Control Flow Integrity indirect call checks.
-#if defined(OS_WIN)
-// Windows also needs __declspec(guard(nocf)).
-#define DISABLE_CFI_ICALL NO_SANITIZE("cfi-icall") __declspec(guard(nocf))
-#else
-#define DISABLE_CFI_ICALL NO_SANITIZE("cfi-icall")
-#endif
-
 template <typename Functor>
 struct FunctorTraits;
 
@@ -65,7 +48,7 @@ struct FunctorTraits<R (*)(Args..., ...) noexcept> {
   }
 };
 
-#if defined(OS_WIN) && defined(ARCH_CPU_X86)
+#if BUILDFLAG(IS_WIN) && defined(ARCH_CPU_X86)
 template <typename R, typename... Args>
 struct FunctorTraits<R(__stdcall*)(Args...) noexcept> {
   template <typename... RunArgs>
@@ -74,7 +57,7 @@ struct FunctorTraits<R(__stdcall*)(Args...) noexcept> {
     return function(std::forward<RunArgs>(args)...);
   }
 };
-#endif  // OS_WIN && ARCH_CPU_X86
+#endif  // BUILDFLAG(IS_WIN) && ARCH_CPU_X86
 
 #if __cplusplus >= 201703L
 // These specializations match functions which are not explicitly declared
@@ -96,7 +79,19 @@ struct FunctorTraits<R (*)(Args..., ...)> {
     return std::forward<Function>(function)(std::forward<RunArgs>(args)...);
   }
 };
-#endif
+
+#if BUILDFLAG(IS_WIN) && defined(ARCH_CPU_X86)
+template <typename R, typename... Args>
+struct FunctorTraits<R(__stdcall*)(Args...)> {
+  template <typename... RunArgs>
+  DISABLE_CFI_ICALL static R Invoke(R(__stdcall* function)(Args...),
+                                    RunArgs&&... args) {
+    return function(std::forward<RunArgs>(args)...);
+  }
+};
+#endif  // BUILDFLAG(IS_WIN) && ARCH_CPU_X86
+
+#endif  // __cplusplus >= 201703L
 
 }  // namespace
 
@@ -134,14 +129,14 @@ class NoCfiIcall {
   explicit NoCfiIcall(PointerType function)
       : function_(reinterpret_cast<Functor>(function)) {}
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   //! \see NoCfiIcall
   template <typename = std::enable_if_t<
                 !std::is_same<typename std::remove_cv<Functor>::type,
                               FARPROC>::value>>
   explicit NoCfiIcall(FARPROC function)
       : function_(reinterpret_cast<Functor>(function)) {}
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
 
   ~NoCfiIcall() = default;
 
diff --git a/extern/crashpad/crashpad/util/misc/no_cfi_icall_test.cc b/extern/crashpad/crashpad/util/misc/no_cfi_icall_test.cc
index 5654a2f4a4..c2f29de9b3 100644
--- a/extern/crashpad/crashpad/util/misc/no_cfi_icall_test.cc
+++ b/extern/crashpad/crashpad/util/misc/no_cfi_icall_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 #include "build/build_config.h"
 #include "gtest/gtest.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include <windows.h>
 
 #include "util/win/get_function.h"
@@ -49,7 +49,7 @@ TEST(NoCfiIcall, SameDSOICall) {
 }
 
 TEST(NoCfiIcall, CrossDSOICall) {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   static const NoCfiIcall<decltype(GetCurrentProcessId)*> call(
       GET_FUNCTION_REQUIRED(L"kernel32.dll", GetCurrentProcessId));
   ASSERT_TRUE(call);
@@ -62,7 +62,7 @@ TEST(NoCfiIcall, CrossDSOICall) {
 }
 
 TEST(NoCfiIcall, Args) {
-#if !defined(OS_WIN)
+#if !BUILDFLAG(IS_WIN)
   static const NoCfiIcall<decltype(snprintf)*> call(
       dlsym(RTLD_NEXT, "snprintf"));
   ASSERT_TRUE(call);
diff --git a/extern/crashpad/crashpad/util/misc/paths.h b/extern/crashpad/crashpad/util/misc/paths.h
index 0b0cfe458f..00c98f7f48 100644
--- a/extern/crashpad/crashpad/util/misc/paths.h
+++ b/extern/crashpad/crashpad/util/misc/paths.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/paths_fuchsia.cc b/extern/crashpad/crashpad/util/misc/paths_fuchsia.cc
index 4ee88f98c6..ff70d41f13 100644
--- a/extern/crashpad/crashpad/util/misc/paths_fuchsia.cc
+++ b/extern/crashpad/crashpad/util/misc/paths_fuchsia.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/paths_linux.cc b/extern/crashpad/crashpad/util/misc/paths_linux.cc
index 569944bcbd..516a17feca 100644
--- a/extern/crashpad/crashpad/util/misc/paths_linux.cc
+++ b/extern/crashpad/crashpad/util/misc/paths_linux.cc
@@ -1,4 +1,4 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
+// Copyright 2016 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/paths_mac.cc b/extern/crashpad/crashpad/util/misc/paths_mac.cc
index 036f84b5aa..9b8355d023 100644
--- a/extern/crashpad/crashpad/util/misc/paths_mac.cc
+++ b/extern/crashpad/crashpad/util/misc/paths_mac.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/paths_test.cc b/extern/crashpad/crashpad/util/misc/paths_test.cc
index f0503ddc1b..11f36d493f 100644
--- a/extern/crashpad/crashpad/util/misc/paths_test.cc
+++ b/extern/crashpad/crashpad/util/misc/paths_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/paths_win.cc b/extern/crashpad/crashpad/util/misc/paths_win.cc
index 8510ccf932..620c5a8e36 100644
--- a/extern/crashpad/crashpad/util/misc/paths_win.cc
+++ b/extern/crashpad/crashpad/util/misc/paths_win.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,7 +16,8 @@
 
 #include <windows.h>
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+
 #include "base/logging.h"
 
 namespace crashpad {
@@ -24,14 +25,12 @@ namespace crashpad {
 // static
 bool Paths::Executable(base::FilePath* path) {
   wchar_t executable_path[_MAX_PATH];
-  unsigned int len =
-      GetModuleFileName(nullptr,
-                        executable_path,
-                        static_cast<DWORD>(base::size(executable_path)));
+  unsigned int len = GetModuleFileName(
+      nullptr, executable_path, static_cast<DWORD>(std::size(executable_path)));
   if (len == 0) {
     PLOG(ERROR) << "GetModuleFileName";
     return false;
-  } else if (len >= base::size(executable_path)) {
+  } else if (len >= std::size(executable_path)) {
     LOG(ERROR) << "GetModuleFileName";
     return false;
   }
diff --git a/extern/crashpad/crashpad/util/misc/pdb_structures.cc b/extern/crashpad/crashpad/util/misc/pdb_structures.cc
index e904dc630c..f6f6238765 100644
--- a/extern/crashpad/crashpad/util/misc/pdb_structures.cc
+++ b/extern/crashpad/crashpad/util/misc/pdb_structures.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/pdb_structures.h b/extern/crashpad/crashpad/util/misc/pdb_structures.h
index 834cfdc8da..be36965fa1 100644
--- a/extern/crashpad/crashpad/util/misc/pdb_structures.h
+++ b/extern/crashpad/crashpad/util/misc/pdb_structures.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/random_string.cc b/extern/crashpad/crashpad/util/misc/random_string.cc
index a522799ad1..44add55e47 100644
--- a/extern/crashpad/crashpad/util/misc/random_string.cc
+++ b/extern/crashpad/crashpad/util/misc/random_string.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/random_string.h b/extern/crashpad/crashpad/util/misc/random_string.h
index 93b3a7fa46..a0b8bf245d 100644
--- a/extern/crashpad/crashpad/util/misc/random_string.h
+++ b/extern/crashpad/crashpad/util/misc/random_string.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/random_string_test.cc b/extern/crashpad/crashpad/util/misc/random_string_test.cc
index fac830f358..8671a156c9 100644
--- a/extern/crashpad/crashpad/util/misc/random_string_test.cc
+++ b/extern/crashpad/crashpad/util/misc/random_string_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,9 +16,9 @@
 
 #include <sys/types.h>
 
+#include <iterator>
 #include <set>
 
-#include "base/cxx17_backports.h"
 #include "gtest/gtest.h"
 
 namespace crashpad {
@@ -33,7 +33,7 @@ TEST(RandomString, RandomString) {
   const std::string allowed_characters("ABCDEFGHIJKLMNOPQRSTUVWXYZ");
 
   size_t character_counts[26] = {};
-  ASSERT_EQ(allowed_characters.size(), base::size(character_counts));
+  ASSERT_EQ(allowed_characters.size(), std::size(character_counts));
 
   std::set<std::string> strings;
 
@@ -61,7 +61,7 @@ TEST(RandomString, RandomString) {
   // Make sure every character appears at least once. It is possible, but
   // extremely unlikely, for a character to not appear at all.
   for (size_t character_index = 0;
-       character_index < base::size(character_counts);
+       character_index < std::size(character_counts);
        ++character_index) {
     EXPECT_GT(character_counts[character_index], 0u)
         << allowed_characters[character_index];
diff --git a/extern/crashpad/crashpad/util/misc/range_set.cc b/extern/crashpad/crashpad/util/misc/range_set.cc
index 5a7040fe67..46d4176841 100644
--- a/extern/crashpad/crashpad/util/misc/range_set.cc
+++ b/extern/crashpad/crashpad/util/misc/range_set.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/range_set.h b/extern/crashpad/crashpad/util/misc/range_set.h
index 77be64cf77..4f4cac8f63 100644
--- a/extern/crashpad/crashpad/util/misc/range_set.h
+++ b/extern/crashpad/crashpad/util/misc/range_set.h
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/range_set_test.cc b/extern/crashpad/crashpad/util/misc/range_set_test.cc
index d5a3cd1484..c96b5af4c4 100644
--- a/extern/crashpad/crashpad/util/misc/range_set_test.cc
+++ b/extern/crashpad/crashpad/util/misc/range_set_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/reinterpret_bytes.cc b/extern/crashpad/crashpad/util/misc/reinterpret_bytes.cc
index 65ec33f348..5909b72881 100644
--- a/extern/crashpad/crashpad/util/misc/reinterpret_bytes.cc
+++ b/extern/crashpad/crashpad/util/misc/reinterpret_bytes.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/reinterpret_bytes.h b/extern/crashpad/crashpad/util/misc/reinterpret_bytes.h
index d6c8c78b60..652d7595fa 100644
--- a/extern/crashpad/crashpad/util/misc/reinterpret_bytes.h
+++ b/extern/crashpad/crashpad/util/misc/reinterpret_bytes.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/reinterpret_bytes_test.cc b/extern/crashpad/crashpad/util/misc/reinterpret_bytes_test.cc
index 47badb973c..80bb979b98 100644
--- a/extern/crashpad/crashpad/util/misc/reinterpret_bytes_test.cc
+++ b/extern/crashpad/crashpad/util/misc/reinterpret_bytes_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -75,27 +75,27 @@ TEST(ReinterpretBytes, ToSigned) {
   ExpectReinterpret(from64, &to64, static_cast<int64_t>(0));
 
   to32 = -1;
-  from64 = bit_cast<uint32_t>(to32);
+  from64 = base::bit_cast<uint32_t>(to32);
   ExpectReinterpret(from64, &to32, to32);
 
   to32 = std::numeric_limits<int32_t>::max();
-  from64 = bit_cast<uint32_t>(to32);
+  from64 = base::bit_cast<uint32_t>(to32);
   ExpectReinterpret(from64, &to32, to32);
 
   to32 = std::numeric_limits<int32_t>::min();
-  from64 = bit_cast<uint32_t>(to32);
+  from64 = base::bit_cast<uint32_t>(to32);
   ExpectReinterpret(from64, &to32, to32);
 
   to64 = -1;
-  from64 = bit_cast<uint64_t>(to64);
+  from64 = base::bit_cast<uint64_t>(to64);
   ExpectReinterpret(from64, &to64, to64);
 
   to64 = std::numeric_limits<int64_t>::max();
-  from64 = bit_cast<uint64_t>(to64);
+  from64 = base::bit_cast<uint64_t>(to64);
   ExpectReinterpret(from64, &to64, to64);
 
   to64 = std::numeric_limits<int64_t>::min();
-  from64 = bit_cast<uint64_t>(to64);
+  from64 = base::bit_cast<uint64_t>(to64);
   ExpectReinterpret(from64, &to64, to64);
 }
 
diff --git a/extern/crashpad/crashpad/util/misc/scoped_forbid_return.cc b/extern/crashpad/crashpad/util/misc/scoped_forbid_return.cc
index f8de1da49d..4c4119773a 100644
--- a/extern/crashpad/crashpad/util/misc/scoped_forbid_return.cc
+++ b/extern/crashpad/crashpad/util/misc/scoped_forbid_return.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/scoped_forbid_return.h b/extern/crashpad/crashpad/util/misc/scoped_forbid_return.h
index 31d48d843a..388d873392 100644
--- a/extern/crashpad/crashpad/util/misc/scoped_forbid_return.h
+++ b/extern/crashpad/crashpad/util/misc/scoped_forbid_return.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/scoped_forbid_return_test.cc b/extern/crashpad/crashpad/util/misc/scoped_forbid_return_test.cc
index 06cb5494b4..9da0e83e06 100644
--- a/extern/crashpad/crashpad/util/misc/scoped_forbid_return_test.cc
+++ b/extern/crashpad/crashpad/util/misc/scoped_forbid_return_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 
 #include "util/misc/scoped_forbid_return.h"
 
-#include "base/compiler_specific.h"
 #include "gtest/gtest.h"
 #include "test/gtest_death.h"
 
@@ -43,13 +42,12 @@ void ScopedForbidReturnHelper(ForbidReturnType type) {
   }
 }
 
-constexpr char kForbiddenMessage[] = "attempt to exit scope forbidden";
+// kForbiddenMessage may appear to be unused if ASSERT_DEATH_CHECK() throws it
+// away.
+[[maybe_unused]] constexpr char kForbiddenMessage[] =
+    "attempt to exit scope forbidden";
 
 TEST(ScopedForbidReturnDeathTest, Default) {
-  // kForbiddenMessage may appear to be unused if ASSERT_DEATH_CHECK() throws it
-  // away.
-  ALLOW_UNUSED_LOCAL(kForbiddenMessage);
-
   ASSERT_DEATH_CHECK(ScopedForbidReturnHelper(kForbidReturnDefault),
                      kForbiddenMessage);
 }
diff --git a/extern/crashpad/crashpad/util/misc/symbolic_constants_common.h b/extern/crashpad/crashpad/util/misc/symbolic_constants_common.h
index ea2495aa00..192431da07 100644
--- a/extern/crashpad/crashpad/util/misc/symbolic_constants_common.h
+++ b/extern/crashpad/crashpad/util/misc/symbolic_constants_common.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/time.cc b/extern/crashpad/crashpad/util/misc/time.cc
index 549b26adac..f50721c5c2 100644
--- a/extern/crashpad/crashpad/util/misc/time.cc
+++ b/extern/crashpad/crashpad/util/misc/time.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/time.h b/extern/crashpad/crashpad/util/misc/time.h
index dc992bdcce..624faf1aaa 100644
--- a/extern/crashpad/crashpad/util/misc/time.h
+++ b/extern/crashpad/crashpad/util/misc/time.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 
 #include "build/build_config.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include <windows.h>
 #endif
 
@@ -45,7 +45,7 @@ bool TimespecToTimeval(const timespec& ts, timeval* tv);
 //! \brief Convert the timeval \a tv to a timespec \a ts.
 void TimevalToTimespec(const timeval& tv, timespec* ts);
 
-#if defined(OS_WIN) || DOXYGEN
+#if BUILDFLAG(IS_WIN) || DOXYGEN
 
 //! \brief Convert a `timespec` to a Windows `FILETIME`, converting from POSIX
 //!     epoch to Windows epoch.
@@ -67,15 +67,17 @@ timeval FiletimeToTimevalInterval(const FILETIME& filetime);
 //!     UTC.
 void GetTimeOfDay(timeval* tv);
 
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
 
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || DOXYGEN
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
+    DOXYGEN
 //! \brief Get the kernel boot time. Subsequent calls to this function may
 //!     return different results due to the system clock being changed or
 //!     imprecision in measuring the boot time.
 //! \return `true` on success. Otherwise, `false` with a message logged.
 bool GetBootTime(timespec* ts);
-#endif  // OS_LINUX || OS_CHROMEOS || OS_ANDROID || DOXYGEN
+#endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
+        // BUILDFLAG(IS_ANDROID) || DOXYGEN
 
 }  // namespace crashpad
 
diff --git a/extern/crashpad/crashpad/util/misc/time_linux.cc b/extern/crashpad/crashpad/util/misc/time_linux.cc
index bc73533c97..bb43e858f6 100644
--- a/extern/crashpad/crashpad/util/misc/time_linux.cc
+++ b/extern/crashpad/crashpad/util/misc/time_linux.cc
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/time_test.cc b/extern/crashpad/crashpad/util/misc/time_test.cc
index 87e28faae3..a7ddc7c921 100644
--- a/extern/crashpad/crashpad/util/misc/time_test.cc
+++ b/extern/crashpad/crashpad/util/misc/time_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 #include <limits>
 
+#include "build/build_config.h"
 #include "gtest/gtest.h"
 
 namespace crashpad {
@@ -71,7 +72,7 @@ TEST(Time, TimeConversions) {
     EXPECT_TRUE(TimespecToTimeval(kEndOfTime, &end_of_timeval));
   }
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   constexpr uint64_t kBirthdateFiletimeIntervals = 130512285140000324;
   FILETIME filetime_birthdate;
   filetime_birthdate.dwLowDateTime = 0xffffffff & kBirthdateFiletimeIntervals;
@@ -112,10 +113,10 @@ TEST(Time, TimeConversions) {
   elapsed_timeval = FiletimeToTimevalInterval(elapsed_filetime);
   EXPECT_EQ(elapsed_timeval.tv_sec, 429);
   EXPECT_EQ(elapsed_timeval.tv_usec, 496729);
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
 }
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 
 TEST(Time, GetTimeOfDay) {
   timeval t;
@@ -125,7 +126,7 @@ TEST(Time, GetTimeOfDay) {
   EXPECT_LT(approx_now - 100, t.tv_sec);
 }
 
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
 
 }  // namespace
 }  // namespace test
diff --git a/extern/crashpad/crashpad/util/misc/time_win.cc b/extern/crashpad/crashpad/util/misc/time_win.cc
index acadd79248..8712cdf0ce 100644
--- a/extern/crashpad/crashpad/util/misc/time_win.cc
+++ b/extern/crashpad/crashpad/util/misc/time_win.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/tri_state.h b/extern/crashpad/crashpad/util/misc/tri_state.h
index be55721488..d828c0611c 100644
--- a/extern/crashpad/crashpad/util/misc/tri_state.h
+++ b/extern/crashpad/crashpad/util/misc/tri_state.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/uuid.cc b/extern/crashpad/crashpad/util/misc/uuid.cc
index 32ffea5259..6b404fdf3c 100644
--- a/extern/crashpad/crashpad/util/misc/uuid.cc
+++ b/extern/crashpad/crashpad/util/misc/uuid.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -23,38 +23,52 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <algorithm>
+#include <string_view>
 #include <type_traits>
 
+#include "base/containers/span.h"
+#include "base/numerics/byte_conversions.h"
 #include "base/rand_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/sys_byteorder.h"
+#include "build/build_config.h"
 
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
 #include <uuid/uuid.h>
-#endif  // OS_APPLE
+#endif  // BUILDFLAG(IS_APPLE)
 
 namespace crashpad {
 
 static_assert(sizeof(UUID) == 16, "UUID must be 16 bytes");
-static_assert(std::is_pod<UUID>::value, "UUID must be POD");
+static_assert(std::is_standard_layout<UUID>::value,
+              "UUID must be a standard-layout type");
+static_assert(std::is_trivial<UUID>::value, "UUID must be a trivial type");
 
 bool UUID::operator==(const UUID& that) const {
   return memcmp(this, &that, sizeof(*this)) == 0;
 }
 
+bool UUID::operator<(const UUID& that) const {
+  return memcmp(this, &that, sizeof(*this)) < 0;
+}
+
 void UUID::InitializeToZero() {
   memset(this, 0, sizeof(*this));
 }
 
-void UUID::InitializeFromBytes(const uint8_t* bytes) {
-  memcpy(this, bytes, sizeof(*this));
-  data_1 = base::NetToHost32(data_1);
-  data_2 = base::NetToHost16(data_2);
-  data_3 = base::NetToHost16(data_3);
+void UUID::InitializeFromBytes(const uint8_t* bytes_ptr) {
+  // TODO(crbug.com/40284755): This span construction is unsound. The caller
+  // should provide a span instead of an unbounded pointer.
+  base::span bytes(bytes_ptr, base::fixed_extent<sizeof(UUID)>());
+  data_1 = base::U32FromBigEndian(bytes.subspan<0u, 4u>());
+  data_2 = base::U16FromBigEndian(bytes.subspan<4u, 2u>());
+  data_3 = base::U16FromBigEndian(bytes.subspan<6u, 2u>());
+  std::ranges::copy(bytes.subspan<8, 2>(), data_4);
+  std::ranges::copy(bytes.subspan<10, 6>(), data_5);
 }
 
-bool UUID::InitializeFromString(const base::StringPiece& string) {
+bool UUID::InitializeFromString(std::string_view string) {
   if (string.length() != 36)
     return false;
 
@@ -83,26 +97,26 @@ bool UUID::InitializeFromString(const base::StringPiece& string) {
   return true;
 }
 
-#if defined(OS_WIN)
-bool UUID::InitializeFromString(const base::WStringPiece& string) {
-  return InitializeFromString(WideToUTF8(string));
+#if BUILDFLAG(IS_WIN)
+bool UUID::InitializeFromString(std::wstring_view string) {
+  return InitializeFromString(base::WideToUTF8(string));
 }
 #endif
 
 bool UUID::InitializeWithNew() {
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
   uuid_t uuid;
   uuid_generate(uuid);
   InitializeFromBytes(uuid);
   return true;
-#elif defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
-    defined(OS_ANDROID) || defined(OS_FUCHSIA)
+#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
   // Linux, Android, and Fuchsia do not provide a UUID generator in a
   // widely-available system library. On Linux and Android, uuid_generate()
   // from libuuid is not available everywhere.
   // On Windows, do not use UuidCreate() to avoid a dependency on rpcrt4, so
   // that this function is usable early in DllMain().
-  base::RandBytes(this, sizeof(*this));
+  base::RandBytes(base::byte_span_from_ref(*this));
 
   // Set six bits per RFC 4122 §4.4 to identify this as a pseudo-random UUID.
   data_3 = (4 << 12) | (data_3 & 0x0fff);  // §4.1.3
@@ -111,10 +125,10 @@ bool UUID::InitializeWithNew() {
   return true;
 #else
 #error Port.
-#endif  // OS_APPLE
+#endif  // BUILDFLAG(IS_APPLE)
 }
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 void UUID::InitializeFromSystemUUID(const ::UUID* system_uuid) {
   static_assert(sizeof(::UUID) == sizeof(UUID),
                 "unexpected system uuid size");
@@ -122,7 +136,7 @@ void UUID::InitializeFromSystemUUID(const ::UUID* system_uuid) {
                 "unexpected system uuid layout");
   memcpy(this, system_uuid, sizeof(*this));
 }
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
 
 std::string UUID::ToString() const {
   return base::StringPrintf("%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
@@ -139,10 +153,10 @@ std::string UUID::ToString() const {
                             data_5[5]);
 }
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 std::wstring UUID::ToWString() const {
   return base::UTF8ToWide(ToString());
 }
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
 
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/util/misc/uuid.h b/extern/crashpad/crashpad/util/misc/uuid.h
index 291baa9f28..a441b86263 100644
--- a/extern/crashpad/crashpad/util/misc/uuid.h
+++ b/extern/crashpad/crashpad/util/misc/uuid.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,11 +18,11 @@
 #include <stdint.h>
 
 #include <string>
+#include <string_view>
 
-#include "base/strings/string_piece.h"
 #include "build/build_config.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include <rpc.h>
 #endif
 
@@ -39,6 +39,7 @@ namespace crashpad {
 struct UUID {
   bool operator==(const UUID& that) const;
   bool operator!=(const UUID& that) const { return !operator==(that); }
+  bool operator<(const UUID& that) const;
 
   //! \brief Initializes the %UUID to zero.
   void InitializeToZero();
@@ -61,10 +62,10 @@ struct UUID {
   //! \return `true` if the string was formatted correctly and the object has
   //!     been initialized with the data. `false` if the string could not be
   //!     parsed, with the object state untouched.
-  bool InitializeFromString(const base::StringPiece& string);
-#if defined(OS_WIN) || DOXYGEN
-  bool InitializeFromString(const base::WStringPiece& string);
-#endif  // OS_WIN
+  bool InitializeFromString(std::string_view string);
+#if BUILDFLAG(IS_WIN) || DOXYGEN
+  bool InitializeFromString(std::wstring_view string);
+#endif  // BUILDFLAG(IS_WIN)
 
   //! \brief Initializes the %UUID using a standard system facility to generate
   //!     the value.
@@ -73,22 +74,22 @@ struct UUID {
   //!     with a message logged.
   bool InitializeWithNew();
 
-#if defined(OS_WIN) || DOXYGEN
+#if BUILDFLAG(IS_WIN) || DOXYGEN
   //! \brief Initializes the %UUID from a system `UUID` or `GUID` structure.
   //!
   //! \param[in] system_uuid A system `UUID` or `GUID` structure.
   void InitializeFromSystemUUID(const ::UUID* system_uuid);
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
 
   //! \brief Formats the %UUID per RFC 4122 §3.
   //!
   //! \return A string of the form `"00112233-4455-6677-8899-aabbccddeeff"`.
   std::string ToString() const;
 
-#if defined(OS_WIN) || DOXYGEN
+#if BUILDFLAG(IS_WIN) || DOXYGEN
   //! \brief The same as ToString, but returned as a wstring.
   std::wstring ToWString() const;
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
 
   // These fields are laid out according to RFC 4122 §4.1.2.
   uint32_t data_1;
diff --git a/extern/crashpad/crashpad/util/misc/uuid_test.cc b/extern/crashpad/crashpad/util/misc/uuid_test.cc
index 936e76bf24..5dfe24fc3f 100644
--- a/extern/crashpad/crashpad/util/misc/uuid_test.cc
+++ b/extern/crashpad/crashpad/util/misc/uuid_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,12 +17,14 @@
 #include <string.h>
 #include <sys/types.h>
 
+#include <iterator>
 #include <string>
+#include <string_view>
 
-#include "base/cxx17_backports.h"
 #include "base/format_macros.h"
 #include "base/scoped_generic.h"
 #include "base/strings/stringprintf.h"
+#include "build/build_config.h"
 #include "gtest/gtest.h"
 
 namespace crashpad {
@@ -85,24 +87,40 @@ TEST(UUID, UUID) {
   EXPECT_EQ(uuid_2, uuid);
   EXPECT_FALSE(uuid != uuid_2);
 
+  // Test operator< operator
+  UUID uuid_3{};
+  UUID uuid_4;
+  uuid_4.InitializeFromString("11111111-1111-1111-1111-111111111111");
+  UUID uuid_5;
+  uuid_5.InitializeFromString("22222222-2222-2222-2222-222222222222");
+
+  EXPECT_LT(uuid_3, uuid_4);
+  EXPECT_LT(uuid_3, uuid_5);
+  EXPECT_LT(uuid_4, uuid_5);
+
   // Make sure that operator== and operator!= check the entire UUID.
   ++uuid.data_1;
   EXPECT_NE(uuid, uuid_2);
+  EXPECT_LT(uuid_2, uuid);
   --uuid.data_1;
   ++uuid.data_2;
   EXPECT_NE(uuid, uuid_2);
+  EXPECT_LT(uuid_2, uuid);
   --uuid.data_2;
   ++uuid.data_3;
   EXPECT_NE(uuid, uuid_2);
+  EXPECT_LT(uuid_2, uuid);
   --uuid.data_3;
-  for (size_t index = 0; index < base::size(uuid.data_4); ++index) {
+  for (size_t index = 0; index < std::size(uuid.data_4); ++index) {
     ++uuid.data_4[index];
     EXPECT_NE(uuid, uuid_2);
+    EXPECT_LT(uuid_2, uuid);
     --uuid.data_4[index];
   }
-  for (size_t index = 0; index < base::size(uuid.data_5); ++index) {
+  for (size_t index = 0; index < std::size(uuid.data_5); ++index) {
     ++uuid.data_5[index];
     EXPECT_NE(uuid, uuid_2);
+    EXPECT_LT(uuid_2, uuid);
     --uuid.data_5[index];
   }
 
@@ -190,7 +208,7 @@ TEST(UUID, FromString) {
   uuid_zero.InitializeToZero();
   const std::string empty_uuid = uuid_zero.ToString();
 
-  for (size_t index = 0; index < base::size(kCases); ++index) {
+  for (size_t index = 0; index < std::size(kCases); ++index) {
     const TestCase& test_case = kCases[index];
     SCOPED_TRACE(base::StringPrintf(
         "index %" PRIuS ": %s", index, test_case.uuid_string));
@@ -215,8 +233,8 @@ TEST(UUID, FromString) {
   uuid.InitializeFromString("5762C15D-50b5-4171-a2e9-7429C9EC6CAB");
   EXPECT_EQ(uuid.ToString(), "5762c15d-50b5-4171-a2e9-7429c9ec6cab");
 
-#if defined(OS_WIN)
-  // Test accepting a StringPiece16 via L"" literals on Windows.
+#if BUILDFLAG(IS_WIN)
+  // Test accepting a std::u16string_view via L"" literals on Windows.
   EXPECT_TRUE(
       uuid.InitializeFromString(L"F32E5BDC-2681-4C73-A4E6-444FFD44B444"));
   EXPECT_EQ(uuid.ToString(), "f32e5bdc-2681-4c73-a4e6-444ffd44b444");
@@ -224,10 +242,10 @@ TEST(UUID, FromString) {
   EXPECT_TRUE(
       uuid.InitializeFromString(L"5762C15D-50b5-4171-a2e9-5555C5EC5CAB"));
   EXPECT_EQ(uuid.ToString(), "5762c15d-50b5-4171-a2e9-5555c5ec5cab");
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
 }
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 
 TEST(UUID, FromSystem) {
   ::GUID system_uuid;
@@ -252,7 +270,7 @@ TEST(UUID, FromSystem) {
   EXPECT_EQ(uuid.ToWString(), reinterpret_cast<wchar_t*>(system_string));
 }
 
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
 
 }  // namespace
 }  // namespace test
diff --git a/extern/crashpad/crashpad/util/misc/zlib.cc b/extern/crashpad/crashpad/util/misc/zlib.cc
index 1153bcbe15..7c39315d01 100644
--- a/extern/crashpad/crashpad/util/misc/zlib.cc
+++ b/extern/crashpad/crashpad/util/misc/zlib.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/misc/zlib.h b/extern/crashpad/crashpad/util/misc/zlib.h
index 99a9c91f9f..48ebc34cf2 100644
--- a/extern/crashpad/crashpad/util/misc/zlib.h
+++ b/extern/crashpad/crashpad/util/misc/zlib.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/net/generate_test_server_key.py b/extern/crashpad/crashpad/util/net/generate_test_server_key.py
index 3db08adee0..a56e020f40 100755
--- a/extern/crashpad/crashpad/util/net/generate_test_server_key.py
+++ b/extern/crashpad/crashpad/util/net/generate_test_server_key.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright 2018 The Crashpad Authors. All rights reserved.
+# Copyright 2018 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/net/http_body.cc b/extern/crashpad/crashpad/util/net/http_body.cc
index 4acacea725..f36118d0ff 100644
--- a/extern/crashpad/crashpad/util/net/http_body.cc
+++ b/extern/crashpad/crashpad/util/net/http_body.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/net/http_body.h b/extern/crashpad/crashpad/util/net/http_body.h
index 7d8ce7eba9..0fdc70fbf3 100644
--- a/extern/crashpad/crashpad/util/net/http_body.h
+++ b/extern/crashpad/crashpad/util/net/http_body.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/net/http_body_gzip.cc b/extern/crashpad/crashpad/util/net/http_body_gzip.cc
index 02abe7131a..a7882ea82a 100644
--- a/extern/crashpad/crashpad/util/net/http_body_gzip.cc
+++ b/extern/crashpad/crashpad/util/net/http_body_gzip.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 #include <utility>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "third_party/zlib/zlib_crashpad.h"
diff --git a/extern/crashpad/crashpad/util/net/http_body_gzip.h b/extern/crashpad/crashpad/util/net/http_body_gzip.h
index 461a9a9656..26af783c03 100644
--- a/extern/crashpad/crashpad/util/net/http_body_gzip.h
+++ b/extern/crashpad/crashpad/util/net/http_body_gzip.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/net/http_body_gzip_test.cc b/extern/crashpad/crashpad/util/net/http_body_gzip_test.cc
index 125f4d4501..6fed433ab3 100644
--- a/extern/crashpad/crashpad/util/net/http_body_gzip_test.cc
+++ b/extern/crashpad/crashpad/util/net/http_body_gzip_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,8 +21,9 @@
 #include <string>
 #include <utility>
 
-#include "base/rand_util.h"
+#include "base/containers/heap_array.h"
 #include "base/numerics/safe_conversions.h"
+#include "base/rand_util.h"
 #include "gtest/gtest.h"
 #include "third_party/zlib/zlib_crashpad.h"
 #include "util/misc/zlib.h"
@@ -54,17 +55,16 @@ void GzipInflate(const std::string& compressed,
   decompressed->clear();
 
   // There’s got to be at least a small buffer.
-  buf_size = std::max(buf_size, static_cast<size_t>(1));
-
-  std::unique_ptr<uint8_t[]> buf(new uint8_t[buf_size]);
+  auto buf = base::HeapArray<uint8_t>::Uninit(
+      std::max(buf_size, static_cast<size_t>(1)));
   z_stream zlib = {};
   zlib.zalloc = Z_NULL;
   zlib.zfree = Z_NULL;
   zlib.opaque = Z_NULL;
   zlib.next_in = reinterpret_cast<Bytef*>(const_cast<char*>(&compressed[0]));
   zlib.avail_in = base::checked_cast<uInt>(compressed.size());
-  zlib.next_out = buf.get();
-  zlib.avail_out = base::checked_cast<uInt>(buf_size);
+  zlib.next_out = buf.data();
+  zlib.avail_out = base::checked_cast<uInt>(buf.size());
 
   int zr = inflateInit2(&zlib, ZlibWindowBitsWithGzipWrapper(0));
   ASSERT_EQ(zr, Z_OK) << "inflateInit2: " << ZlibErrorString(zr);
@@ -73,9 +73,9 @@ void GzipInflate(const std::string& compressed,
   zr = inflate(&zlib, Z_FINISH);
   ASSERT_EQ(zr, Z_STREAM_END) << "inflate: " << ZlibErrorString(zr);
 
-  ASSERT_LE(zlib.avail_out, buf_size);
-  decompressed->assign(reinterpret_cast<char*>(buf.get()),
-                       buf_size - zlib.avail_out);
+  ASSERT_LE(zlib.avail_out, buf.size());
+  decompressed->assign(reinterpret_cast<char*>(buf.data()),
+                       buf.size() - zlib.avail_out);
 }
 
 void TestGzipDeflateInflate(const std::string& string) {
@@ -94,17 +94,17 @@ void TestGzipDeflateInflate(const std::string& string) {
   size_t buf_size =
       string.size() + kGzipHeaderSize +
       (string.empty() ? 2 : (((string.size() + 16383) / 16384) * 5));
-  std::unique_ptr<uint8_t[]> buf(new uint8_t[buf_size]);
+  auto buf = base::HeapArray<uint8_t>::Uninit(buf_size);
   FileOperationResult compressed_bytes =
-      gzip_stream.GetBytesBuffer(buf.get(), buf_size);
+      gzip_stream.GetBytesBuffer(buf.data(), buf.size());
   ASSERT_NE(compressed_bytes, -1);
-  ASSERT_LE(static_cast<size_t>(compressed_bytes), buf_size);
+  ASSERT_LE(static_cast<size_t>(compressed_bytes), buf.size());
 
   // Make sure that the stream is really at EOF.
   uint8_t eof_buf[16];
   ASSERT_EQ(gzip_stream.GetBytesBuffer(eof_buf, sizeof(eof_buf)), 0);
 
-  std::string compressed(reinterpret_cast<char*>(buf.get()), compressed_bytes);
+  std::string compressed(reinterpret_cast<char*>(buf.data()), compressed_bytes);
 
   ASSERT_GE(compressed.size(), kGzipHeaderSize);
   EXPECT_EQ(compressed[0], '\37');
diff --git a/extern/crashpad/crashpad/util/net/http_body_test.cc b/extern/crashpad/crashpad/util/net/http_body_test.cc
index 1e5a4796f7..aab1dfdec0 100644
--- a/extern/crashpad/crashpad/util/net/http_body_test.cc
+++ b/extern/crashpad/crashpad/util/net/http_body_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/net/http_body_test_util.cc b/extern/crashpad/crashpad/util/net/http_body_test_util.cc
index de7e028621..960eb62a71 100644
--- a/extern/crashpad/crashpad/util/net/http_body_test_util.cc
+++ b/extern/crashpad/crashpad/util/net/http_body_test_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,8 +16,7 @@
 
 #include <stdint.h>
 
-#include <memory>
-
+#include "base/containers/heap_array.h"
 #include "gtest/gtest.h"
 #include "util/file/file_io.h"
 #include "util/net/http_body.h"
@@ -30,17 +29,17 @@ std::string ReadStreamToString(HTTPBodyStream* stream) {
 }
 
 std::string ReadStreamToString(HTTPBodyStream* stream, size_t buffer_size) {
-  std::unique_ptr<uint8_t[]> buf(new uint8_t[buffer_size]);
+  auto buf = base::HeapArray<uint8_t>::Uninit(buffer_size);
   std::string result;
 
   FileOperationResult bytes_read;
-  while ((bytes_read = stream->GetBytesBuffer(buf.get(), buffer_size)) != 0) {
+  while ((bytes_read = stream->GetBytesBuffer(buf.data(), buf.size())) != 0) {
     if (bytes_read < 0) {
       ADD_FAILURE() << "Failed to read from stream: " << bytes_read;
       return std::string();
     }
 
-    result.append(reinterpret_cast<char*>(buf.get()), bytes_read);
+    result.append(reinterpret_cast<char*>(buf.data()), bytes_read);
   }
 
   return result;
diff --git a/extern/crashpad/crashpad/util/net/http_body_test_util.h b/extern/crashpad/crashpad/util/net/http_body_test_util.h
index 288fccaeb6..5edc518efb 100644
--- a/extern/crashpad/crashpad/util/net/http_body_test_util.h
+++ b/extern/crashpad/crashpad/util/net/http_body_test_util.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/net/http_headers.h b/extern/crashpad/crashpad/util/net/http_headers.h
index 50335063b3..fa927018dc 100644
--- a/extern/crashpad/crashpad/util/net/http_headers.h
+++ b/extern/crashpad/crashpad/util/net/http_headers.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/net/http_multipart_builder.cc b/extern/crashpad/crashpad/util/net/http_multipart_builder.cc
index 9ad7c90e8f..83514cb31b 100644
--- a/extern/crashpad/crashpad/util/net/http_multipart_builder.cc
+++ b/extern/crashpad/crashpad/util/net/http_multipart_builder.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/net/http_multipart_builder.h b/extern/crashpad/crashpad/util/net/http_multipart_builder.h
index 56ce52d799..96da8a0a02 100644
--- a/extern/crashpad/crashpad/util/net/http_multipart_builder.h
+++ b/extern/crashpad/crashpad/util/net/http_multipart_builder.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/net/http_multipart_builder_test.cc b/extern/crashpad/crashpad/util/net/http_multipart_builder_test.cc
index dab9e7e7ca..297619c1d9 100644
--- a/extern/crashpad/crashpad/util/net/http_multipart_builder_test.cc
+++ b/extern/crashpad/crashpad/util/net/http_multipart_builder_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/net/http_transport.cc b/extern/crashpad/crashpad/util/net/http_transport.cc
index 7ee381bdfb..dcc8d80a59 100644
--- a/extern/crashpad/crashpad/util/net/http_transport.cc
+++ b/extern/crashpad/crashpad/util/net/http_transport.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/net/http_transport.h b/extern/crashpad/crashpad/util/net/http_transport.h
index 0937ed4102..b046173b68 100644
--- a/extern/crashpad/crashpad/util/net/http_transport.h
+++ b/extern/crashpad/crashpad/util/net/http_transport.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/net/http_transport_libcurl.cc b/extern/crashpad/crashpad/util/net/http_transport_libcurl.cc
index 7e3f41186f..df63a77296 100644
--- a/extern/crashpad/crashpad/util/net/http_transport_libcurl.cc
+++ b/extern/crashpad/crashpad/util/net/http_transport_libcurl.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -237,6 +237,8 @@ std::string UserAgent() {
 #elif defined(ARCH_CPU_BIG_ENDIAN)
     static constexpr char arch[] = "aarch64_be";
 #endif
+#elif defined (ARCH_CPU_RISCV64)
+    static constexpr char arch[] = "riscv64";
 #else
 #error Port
 #endif
@@ -522,6 +524,10 @@ size_t HTTPTransportLibcurl::WriteResponseBody(char* buffer,
                                                size_t size,
                                                size_t nitems,
                                                void* userdata) {
+#if defined(MEMORY_SANITIZER)
+  // Work around an MSAN false-positive in passing `userdata`.
+  __msan_unpoison(&userdata, sizeof(userdata));
+#endif
   std::string* response_body = reinterpret_cast<std::string*>(userdata);
 
   // This libcurl callback mimics the silly stdio-style fread() interface: size
diff --git a/extern/crashpad/crashpad/util/net/http_transport_mac.mm b/extern/crashpad/crashpad/util/net/http_transport_mac.mm
index e1cfd2543f..e65a690f8d 100644
--- a/extern/crashpad/crashpad/util/net/http_transport_mac.mm
+++ b/extern/crashpad/crashpad/util/net/http_transport_mac.mm
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,21 +14,114 @@
 
 #include "util/net/http_transport.h"
 
-#include <CoreFoundation/CoreFoundation.h>
 #import <Foundation/Foundation.h>
 #include <sys/utsname.h>
 
-#include "base/mac/foundation_util.h"
-#import "base/mac/scoped_nsobject.h"
+#include "base/apple/bridging.h"
+#include "base/apple/foundation_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "build/build_config.h"
 #include "package.h"
-#include "third_party/apple_cf/CFStreamAbstract.h"
 #include "util/file/file_io.h"
 #include "util/misc/implicit_cast.h"
+#include "util/misc/metrics.h"
 #include "util/net/http_body.h"
 
+// An implementation of NSInputStream that reads from a
+// crashpad::HTTPBodyStream.
+@interface CrashpadHTTPBodyStreamTransport : NSInputStream {
+ @private
+  NSStreamStatus _streamStatus;
+  id<NSStreamDelegate> __strong _delegate;
+  crashpad::HTTPBodyStream* _bodyStream;  // weak
+}
+- (instancetype)initWithBodyStream:(crashpad::HTTPBodyStream*)bodyStream;
+@end
+
+@implementation CrashpadHTTPBodyStreamTransport
+
+- (instancetype)initWithBodyStream:(crashpad::HTTPBodyStream*)bodyStream {
+  if ((self = [super init])) {
+    _streamStatus = NSStreamStatusNotOpen;
+    _bodyStream = bodyStream;
+  }
+  return self;
+}
+
+// NSInputStream:
+
+- (BOOL)hasBytesAvailable {
+  // Per Apple's documentation: "May also return YES if a read must be attempted
+  // in order to determine the availability of bytes."
+  switch (_streamStatus) {
+    case NSStreamStatusAtEnd:
+    case NSStreamStatusClosed:
+    case NSStreamStatusError:
+      return NO;
+    default:
+      return YES;
+  }
+}
+
+- (NSInteger)read:(uint8_t*)buffer maxLength:(NSUInteger)maxLen {
+  _streamStatus = NSStreamStatusReading;
+
+  crashpad::FileOperationResult rv =
+      _bodyStream->GetBytesBuffer(buffer, maxLen);
+
+  if (rv == 0)
+    _streamStatus = NSStreamStatusAtEnd;
+  else if (rv < 0)
+    _streamStatus = NSStreamStatusError;
+  else
+    _streamStatus = NSStreamStatusOpen;
+
+  return rv;
+}
+
+- (BOOL)getBuffer:(uint8_t**)buffer length:(NSUInteger*)length {
+  return NO;
+}
+
+// NSStream:
+
+- (void)scheduleInRunLoop:(NSRunLoop*)runLoop forMode:(NSString*)mode {
+}
+
+- (void)removeFromRunLoop:(NSRunLoop*)runLoop forMode:(NSString*)mode {
+}
+
+- (void)open {
+  _streamStatus = NSStreamStatusOpen;
+}
+
+- (void)close {
+  _streamStatus = NSStreamStatusClosed;
+}
+
+- (NSStreamStatus)streamStatus {
+  return _streamStatus;
+}
+
+- (id<NSStreamDelegate>)delegate {
+  return _delegate;
+}
+
+- (void)setDelegate:(id)delegate {
+  _delegate = delegate;
+}
+
+- (id)propertyForKey:(NSStreamPropertyKey)key {
+  return nil;
+}
+
+- (BOOL)setProperty:(id)property forKey:(NSStreamPropertyKey)key {
+  return NO;
+}
+
+@end
+
 namespace crashpad {
 
 namespace {
@@ -60,13 +153,14 @@
 
   // Expected to be CFNetwork.
   NSBundle* nsurl_bundle = [NSBundle bundleForClass:[NSURLRequest class]];
-  NSString* bundle_name = base::mac::ObjCCast<NSString>([nsurl_bundle
-      objectForInfoDictionaryKey:base::mac::CFToNSCast(kCFBundleNameKey)]);
+  NSString* bundle_name = base::apple::ObjCCast<NSString>([nsurl_bundle
+      objectForInfoDictionaryKey:base::apple::CFToNSPtrCast(kCFBundleNameKey)]);
   if (bundle_name) {
     user_agent = AppendEscapedFormat(user_agent, @" %@", bundle_name);
 
-    NSString* bundle_version = base::mac::ObjCCast<NSString>([nsurl_bundle
-        objectForInfoDictionaryKey:base::mac::CFToNSCast(kCFBundleVersionKey)]);
+    NSString* bundle_version = base::apple::ObjCCast<NSString>(
+        [nsurl_bundle objectForInfoDictionaryKey:base::apple::CFToNSPtrCast(
+                                                     kCFBundleVersionKey)]);
     if (bundle_version) {
       user_agent = AppendEscapedFormat(user_agent, @"/%@", bundle_version);
     }
@@ -105,120 +199,6 @@
   return user_agent;
 }
 
-// An implementation of CFReadStream. This implements the V0 callback
-// scheme.
-class HTTPBodyStreamCFReadStream {
- public:
-  explicit HTTPBodyStreamCFReadStream(HTTPBodyStream* body_stream)
-      : body_stream_(body_stream) {
-  }
-
-  HTTPBodyStreamCFReadStream(const HTTPBodyStreamCFReadStream&) = delete;
-  HTTPBodyStreamCFReadStream& operator=(const HTTPBodyStreamCFReadStream&) =
-      delete;
-
-  // Creates a new NSInputStream, which the caller owns.
-  NSInputStream* CreateInputStream() {
-    CFStreamClientContext context = {
-        .version = 0,
-        .info = this,
-        .retain = nullptr,
-        .release = nullptr,
-        .copyDescription = nullptr
-    };
-    constexpr CFReadStreamCallBacksV0 callbacks = {
-        .version = 0,
-        .open = &Open,
-        .openCompleted = &OpenCompleted,
-        .read = &Read,
-        .getBuffer = &GetBuffer,
-        .canRead = &CanRead,
-        .close = &Close,
-        .copyProperty = &CopyProperty,
-        .schedule = &Schedule,
-        .unschedule = &Unschedule
-    };
-    CFReadStreamRef read_stream = CFReadStreamCreate(nullptr,
-        reinterpret_cast<const CFReadStreamCallBacks*>(&callbacks), &context);
-    return base::mac::CFToNSCast(read_stream);
-  }
-
- private:
-  static HTTPBodyStream* GetStream(void* info) {
-    return static_cast<HTTPBodyStreamCFReadStream*>(info)->body_stream_;
-  }
-
-  static Boolean Open(CFReadStreamRef stream,
-                      CFStreamError* error,
-                      Boolean* open_complete,
-                      void* info) {
-    *open_complete = TRUE;
-    return TRUE;
-  }
-
-  static Boolean OpenCompleted(CFReadStreamRef stream,
-                               CFStreamError* error,
-                               void* info) {
-    return TRUE;
-  }
-
-  static CFIndex Read(CFReadStreamRef stream,
-                      UInt8* buffer,
-                      CFIndex buffer_length,
-                      CFStreamError* error,
-                      Boolean* at_eof,
-                      void* info) {
-    if (buffer_length == 0) {
-      *at_eof = FALSE;
-      return 0;
-    }
-
-    FileOperationResult bytes_read =
-        GetStream(info)->GetBytesBuffer(buffer, buffer_length);
-    if (bytes_read < 0) {
-      error->error = -1;
-      error->domain = kCFStreamErrorDomainCustom;
-    } else {
-      *at_eof = bytes_read == 0;
-    }
-
-    return bytes_read;
-  }
-
-  static const UInt8* GetBuffer(CFReadStreamRef stream,
-                                CFIndex max_bytes_to_read,
-                                CFIndex* num_bytes_read,
-                                CFStreamError* error,
-                                Boolean* at_eof,
-                                void* info) {
-    return nullptr;
-  }
-
-  static Boolean CanRead(CFReadStreamRef stream, void* info) {
-    return TRUE;
-  }
-
-  static void Close(CFReadStreamRef stream, void* info) {}
-
-  static CFTypeRef CopyProperty(CFReadStreamRef stream,
-                                CFStringRef property_name,
-                                void* info) {
-    return nullptr;
-  }
-
-  static void Schedule(CFReadStreamRef stream,
-                       CFRunLoopRef run_loop,
-                       CFStringRef run_loop_mode,
-                       void* info) {}
-
-  static void Unschedule(CFReadStreamRef stream,
-                         CFRunLoopRef run_loop,
-                         CFStringRef run_loop_mode,
-                         void* info) {}
-
-  HTTPBodyStream* body_stream_;  // weak
-};
-
 class HTTPTransportMac final : public HTTPTransport {
  public:
   HTTPTransportMac();
@@ -261,10 +241,9 @@ static void Unschedule(CFReadStreamRef stream,
           forHTTPHeaderField:base::SysUTF8ToNSString(pair.first)];
     }
 
-    HTTPBodyStreamCFReadStream body_stream_cf(body_stream());
-    base::scoped_nsobject<NSInputStream> input_stream(
-        body_stream_cf.CreateInputStream());
-    [request setHTTPBodyStream:input_stream.get()];
+    NSInputStream* input_stream = [[CrashpadHTTPBodyStreamTransport alloc]
+        initWithBodyStream:body_stream()];
+    [request setHTTPBodyStream:input_stream];
 
     NSURLResponse* response = nil;
     NSError* error = nil;
@@ -279,6 +258,7 @@ static void Unschedule(CFReadStreamRef stream,
 #pragma clang diagnostic pop
 
     if (error) {
+      Metrics::CrashUploadErrorCode(error.code);
       LOG(ERROR) << [[error localizedDescription] UTF8String] << " ("
                  << [[error domain] UTF8String] << " " << [error code] << ")";
       return false;
@@ -288,7 +268,7 @@ static void Unschedule(CFReadStreamRef stream,
       return false;
     }
     NSHTTPURLResponse* http_response =
-        base::mac::ObjCCast<NSHTTPURLResponse>(response);
+        base::apple::ObjCCast<NSHTTPURLResponse>(response);
     if (!http_response) {
       LOG(ERROR) << "no http_response";
       return false;
diff --git a/extern/crashpad/crashpad/util/net/http_transport_socket.cc b/extern/crashpad/crashpad/util/net/http_transport_socket.cc
index 4de9280325..0d7fc0d1d3 100644
--- a/extern/crashpad/crashpad/util/net/http_transport_socket.cc
+++ b/extern/crashpad/crashpad/util/net/http_transport_socket.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,23 +12,25 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "util/net/http_transport.h"
-
 #include <fcntl.h>
 #include <netdb.h>
 #include <poll.h>
 #include <string.h>
 #include <sys/socket.h>
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/scoped_generic.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
+#include "build/build_config.h"
 #include "util/file/file_io.h"
 #include "util/net/http_body.h"
+#include "util/net/http_transport.h"
 #include "util/net/url.h"
 #include "util/stdlib/string_number_conversion.h"
 #include "util/string/split_string.h"
@@ -127,13 +129,13 @@ class SSLStream : public Stream {
         return false;
       }
     } else {
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
       if (SSL_CTX_load_verify_locations(
               ctx_.get(), nullptr, "/etc/ssl/certs") <= 0) {
         LOG(ERROR) << "SSL_CTX_load_verify_locations";
         return false;
       }
-#elif defined(OS_FUCHSIA)
+#elif BUILDFLAG(IS_FUCHSIA)
       if (SSL_CTX_load_verify_locations(
               ctx_.get(), "/config/ssl/cert.pem", nullptr) <= 0) {
         LOG(ERROR) << "SSL_CTX_load_verify_locations";
@@ -370,7 +372,7 @@ bool WriteRequest(Stream* stream,
 
   FileOperationResult data_bytes;
   do {
-    constexpr size_t kCRLFSize = base::size(kCRLFTerminator) - 1;
+    constexpr size_t kCRLFSize = std::size(kCRLFTerminator) - 1;
     struct __attribute__((packed)) {
       char size[8];
       char crlf[2];
diff --git a/extern/crashpad/crashpad/util/net/http_transport_test.cc b/extern/crashpad/crashpad/util/net/http_transport_test.cc
index cf53450ee4..552469a4f6 100644
--- a/extern/crashpad/crashpad/util/net/http_transport_test.cc
+++ b/extern/crashpad/crashpad/util/net/http_transport_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@ namespace crashpad {
 namespace test {
 namespace {
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 std::string ToUTF8IfWin(const std::wstring& x) {
   return base::WideToUTF8(x);
 }
@@ -70,7 +70,7 @@ class HTTPTransportTestFixture : public MultiprocessExec {
         scheme_and_host_() {
     base::FilePath server_path = TestPaths::Executable().DirName().Append(
         FILE_PATH_LITERAL("http_transport_test_server")
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
             FILE_PATH_LITERAL(".exe")
 #endif
     );
@@ -361,7 +361,7 @@ TEST_P(HTTPTransport, Upload33k_LengthUnknown) {
 }
 
 // This should be on for Fuchsia, but DX-382. Debug and re-enabled.
-#if defined(CRASHPAD_USE_BORINGSSL) && !defined(OS_FUCHSIA)
+#if defined(CRASHPAD_USE_BORINGSSL) && !BUILDFLAG(IS_FUCHSIA)
 // The test server requires BoringSSL or OpenSSL, so https in tests can only be
 // enabled where that's readily available. Additionally on Linux, the bots fail
 // lacking libcrypto.so.1.1, so disabled there for now. On Mac, they could also
diff --git a/extern/crashpad/crashpad/util/net/http_transport_test_server.cc b/extern/crashpad/crashpad/util/net/http_transport_test_server.cc
index a3bcc6a5ab..e4df221b3f 100644
--- a/extern/crashpad/crashpad/util/net/http_transport_test_server.cc
+++ b/extern/crashpad/crashpad/util/net/http_transport_test_server.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -92,6 +92,18 @@ int HttpTransportTestServerMain(int argc, char* argv[]) {
                  }
                  to_stdout += "\r\n";
                  to_stdout += req.body;
+                 if (req.is_multipart_form_data()) {
+                   std::string boundary;
+                   httplib::detail::parse_multipart_boundary(
+                       req.get_header_value("Content-Type"), boundary);
+                   for (const auto& part : req.form.fields) {
+                     to_stdout += "--" + boundary + "\r\n";
+                     to_stdout += "Content-Disposition: form-data; name=\"" +
+                                  part.first + "\"\r\n\r\n";
+                     to_stdout += part.second.content + "\r\n";
+                   }
+                   to_stdout += "--" + boundary + "--\r\n";
+                 }
 
                  server->stop();
                });
@@ -122,13 +134,13 @@ int HttpTransportTestServerMain(int argc, char* argv[]) {
 }  // namespace
 }  // namespace crashpad
 
-#if defined(OS_POSIX) || defined(OS_FUCHSIA)
+#if BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
 int main(int argc, char* argv[]) {
   return crashpad::HttpTransportTestServerMain(argc, argv);
 }
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 int wmain(int argc, wchar_t* argv[]) {
   return crashpad::ToolSupport::Wmain(
       argc, argv, crashpad::HttpTransportTestServerMain);
 }
-#endif  // OS_POSIX
+#endif  // BUILDFLAG(IS_POSIX)
diff --git a/extern/crashpad/crashpad/util/net/http_transport_win.cc b/extern/crashpad/crashpad/util/net/http_transport_win.cc
index cb04c2e930..13856dae82 100644
--- a/extern/crashpad/crashpad/util/net/http_transport_win.cc
+++ b/extern/crashpad/crashpad/util/net/http_transport_win.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,7 +22,9 @@
 #include <wchar.h>
 #include <winhttp.h>
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/scoped_generic.h"
@@ -96,7 +98,7 @@ std::string WinHttpMessage(const char* extra) {
                              error_code,
                              0,
                              msgbuf,
-                             static_cast<DWORD>(base::size(msgbuf)),
+                             static_cast<DWORD>(std::size(msgbuf)),
                              nullptr);
   if (!len) {
     return base::StringPrintf("%s: error 0x%lx while retrieving error 0x%lx",
@@ -148,7 +150,7 @@ HTTPTransportWin::~HTTPTransportWin() {
 
 bool HTTPTransportWin::ExecuteSynchronously(std::string* response_body) {
   ScopedHINTERNET session(WinHttpOpen(base::UTF8ToWide(UserAgent()).c_str(),
-                                      WINHTTP_ACCESS_TYPE_DEFAULT_PROXY,
+                                      WINHTTP_ACCESS_TYPE_AUTOMATIC_PROXY,
                                       WINHTTP_NO_PROXY_NAME,
                                       WINHTTP_NO_PROXY_BYPASS,
                                       0));
diff --git a/extern/crashpad/crashpad/util/net/tls.gni b/extern/crashpad/crashpad/util/net/tls.gni
index 343e9dbb6e..e0249a84c1 100644
--- a/extern/crashpad/crashpad/util/net/tls.gni
+++ b/extern/crashpad/crashpad/util/net/tls.gni
@@ -1,4 +1,4 @@
-# Copyright 2018 The Crashpad Authors. All rights reserved.
+# Copyright 2018 The Crashpad Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/net/url.cc b/extern/crashpad/crashpad/util/net/url.cc
index 9ce88e933d..9d037bdcd2 100644
--- a/extern/crashpad/crashpad/util/net/url.cc
+++ b/extern/crashpad/crashpad/util/net/url.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/net/url.h b/extern/crashpad/crashpad/util/net/url.h
index f83d436ce6..68ea104fb9 100644
--- a/extern/crashpad/crashpad/util/net/url.h
+++ b/extern/crashpad/crashpad/util/net/url.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/net/url_test.cc b/extern/crashpad/crashpad/util/net/url_test.cc
index 4f076413f8..56da0a8094 100644
--- a/extern/crashpad/crashpad/util/net/url_test.cc
+++ b/extern/crashpad/crashpad/util/net/url_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/numeric/checked_address_range.cc b/extern/crashpad/crashpad/util/numeric/checked_address_range.cc
index 4ba7ff3900..c27defb011 100644
--- a/extern/crashpad/crashpad/util/numeric/checked_address_range.cc
+++ b/extern/crashpad/crashpad/util/numeric/checked_address_range.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,16 +17,17 @@
 #include "base/check_op.h"
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
+#include "build/build_config.h"
 
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
 #include <mach/mach.h>
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 #include "util/win/address_types.h"
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
 #include "util/linux/address_types.h"
-#elif defined(OS_FUCHSIA)
+#elif BUILDFLAG(IS_FUCHSIA)
 #include <zircon/types.h>
-#endif  // OS_APPLE
+#endif  // BUILDFLAG(IS_APPLE)
 
 namespace crashpad {
 namespace internal {
@@ -126,15 +127,15 @@ std::string CheckedAddressRangeGeneric<ValueType, SizeType>::AsString() const {
 }
 
 // Explicit instantiations for the cases we use.
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
 template class CheckedAddressRangeGeneric<mach_vm_address_t, mach_vm_size_t>;
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 template class CheckedAddressRangeGeneric<WinVMAddress, WinVMSize>;
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
 template class CheckedAddressRangeGeneric<LinuxVMAddress, LinuxVMSize>;
-#elif defined(OS_FUCHSIA)
+#elif BUILDFLAG(IS_FUCHSIA)
 template class CheckedAddressRangeGeneric<zx_vaddr_t, size_t>;
-#endif  // OS_APPLE
+#endif  // BUILDFLAG(IS_APPLE)
 
 }  // namespace internal
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/util/numeric/checked_address_range.h b/extern/crashpad/crashpad/util/numeric/checked_address_range.h
index 5279bbc0da..b34eea2d97 100644
--- a/extern/crashpad/crashpad/util/numeric/checked_address_range.h
+++ b/extern/crashpad/crashpad/util/numeric/checked_address_range.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/numeric/checked_address_range_test.cc b/extern/crashpad/crashpad/util/numeric/checked_address_range_test.cc
index aa700e0a0d..1e64db9f1f 100644
--- a/extern/crashpad/crashpad/util/numeric/checked_address_range_test.cc
+++ b/extern/crashpad/crashpad/util/numeric/checked_address_range_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,9 +16,9 @@
 
 #include <sys/types.h>
 
+#include <iterator>
 #include <limits>
 
-#include "base/cxx17_backports.h"
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
@@ -119,7 +119,7 @@ TEST(CheckedAddressRange, IsValid) {
       {0xffffffffffffffff, 1, kInvalid},
   };
 
-  for (size_t index = 0; index < base::size(kTestData); ++index) {
+  for (size_t index = 0; index < std::size(kTestData); ++index) {
     const auto& testcase = kTestData[index];
     SCOPED_TRACE(base::StringPrintf("index %" PRIuS
                                     ", base 0x%" PRIx64 ", size 0x%" PRIx64,
@@ -170,7 +170,7 @@ TEST(CheckedAddressRange, ContainsValue) {
   CheckedAddressRange parent_range_32(false, 0x2000, 0x1000);
   ASSERT_TRUE(parent_range_32.IsValid());
 
-  for (size_t index = 0; index < base::size(kTestData); ++index) {
+  for (size_t index = 0; index < std::size(kTestData); ++index) {
     const auto& testcase = kTestData[index];
     SCOPED_TRACE(base::StringPrintf(
         "index %" PRIuS ", value 0x%" PRIx64, index, testcase.value));
@@ -227,7 +227,7 @@ TEST(CheckedAddressRange, ContainsRange) {
   CheckedAddressRange parent_range_32(false, 0x2000, 0x1000);
   ASSERT_TRUE(parent_range_32.IsValid());
 
-  for (size_t index = 0; index < base::size(kTestData); ++index) {
+  for (size_t index = 0; index < std::size(kTestData); ++index) {
     const auto& testcase = kTestData[index];
     SCOPED_TRACE(base::StringPrintf("index %" PRIuS
                                     ", base 0x%" PRIx64 ", size 0x%" PRIx64,
diff --git a/extern/crashpad/crashpad/util/numeric/checked_range.h b/extern/crashpad/crashpad/util/numeric/checked_range.h
index dbf719179b..933d05551a 100644
--- a/extern/crashpad/crashpad/util/numeric/checked_range.h
+++ b/extern/crashpad/crashpad/util/numeric/checked_range.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/numeric/checked_range_test.cc b/extern/crashpad/crashpad/util/numeric/checked_range_test.cc
index ad734ba342..419909b303 100644
--- a/extern/crashpad/crashpad/util/numeric/checked_range_test.cc
+++ b/extern/crashpad/crashpad/util/numeric/checked_range_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,9 +17,9 @@
 #include <stdint.h>
 #include <sys/types.h>
 
+#include <iterator>
 #include <limits>
 
-#include "base/cxx17_backports.h"
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
@@ -78,7 +78,7 @@ TEST(CheckedRange, IsValid) {
       {0xffffffff, 0xffffffff, false},
   };
 
-  for (size_t index = 0; index < base::size(kUnsignedTestData); ++index) {
+  for (size_t index = 0; index < std::size(kUnsignedTestData); ++index) {
     const auto& testcase = kUnsignedTestData[index];
     SCOPED_TRACE(base::StringPrintf("unsigned index %" PRIuS
                                     ", base 0x%x, size 0x%x",
@@ -140,7 +140,7 @@ TEST(CheckedRange, IsValid) {
       {-1, 0xffffffff, false},
   };
 
-  for (size_t index = 0; index < base::size(kSignedTestData); ++index) {
+  for (size_t index = 0; index < std::size(kSignedTestData); ++index) {
     const auto& testcase = kSignedTestData[index];
     SCOPED_TRACE(base::StringPrintf("signed index %" PRIuS
                                     ", base 0x%x, size 0x%x",
@@ -186,7 +186,7 @@ TEST(CheckedRange, ContainsValue) {
   CheckedRange<uint32_t> parent_range(0x2000, 0x1000);
   ASSERT_TRUE(parent_range.IsValid());
 
-  for (size_t index = 0; index < base::size(kTestData); ++index) {
+  for (size_t index = 0; index < std::size(kTestData); ++index) {
     const auto& testcase = kTestData[index];
     SCOPED_TRACE(base::StringPrintf(
         "index %" PRIuS ", value 0x%x", index, testcase.value));
@@ -234,7 +234,7 @@ TEST(CheckedRange, ContainsRange) {
   CheckedRange<uint32_t> parent_range(0x2000, 0x1000);
   ASSERT_TRUE(parent_range.IsValid());
 
-  for (size_t index = 0; index < base::size(kTestData); ++index) {
+  for (size_t index = 0; index < std::size(kTestData); ++index) {
     const auto& testcase = kTestData[index];
     SCOPED_TRACE(base::StringPrintf("index %" PRIuS ", base 0x%x, size 0x%x",
                                     index,
@@ -287,7 +287,7 @@ TEST(CheckedRange, OverlapsRange) {
   CheckedRange<uint32_t> first_range(0x2000, 0x1000);
   ASSERT_TRUE(first_range.IsValid());
 
-  for (size_t index = 0; index < base::size(kTestData); ++index) {
+  for (size_t index = 0; index < std::size(kTestData); ++index) {
     const auto& testcase = kTestData[index];
     SCOPED_TRACE(base::StringPrintf("index %" PRIuS ", base 0x%x, size 0x%x",
                                     index,
diff --git a/extern/crashpad/crashpad/util/numeric/checked_vm_address_range.h b/extern/crashpad/crashpad/util/numeric/checked_vm_address_range.h
index e792dba939..54e1cd056d 100644
--- a/extern/crashpad/crashpad/util/numeric/checked_vm_address_range.h
+++ b/extern/crashpad/crashpad/util/numeric/checked_vm_address_range.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/numeric/in_range_cast.h b/extern/crashpad/crashpad/util/numeric/in_range_cast.h
index 3dba10afa1..6aa55df274 100644
--- a/extern/crashpad/crashpad/util/numeric/in_range_cast.h
+++ b/extern/crashpad/crashpad/util/numeric/in_range_cast.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/numeric/in_range_cast_test.cc b/extern/crashpad/crashpad/util/numeric/in_range_cast_test.cc
index 73f5fd5762..a15e3ea593 100644
--- a/extern/crashpad/crashpad/util/numeric/in_range_cast_test.cc
+++ b/extern/crashpad/crashpad/util/numeric/in_range_cast_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/numeric/int128.h b/extern/crashpad/crashpad/util/numeric/int128.h
index c57bed6d28..4010e4ee3a 100644
--- a/extern/crashpad/crashpad/util/numeric/int128.h
+++ b/extern/crashpad/crashpad/util/numeric/int128.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/numeric/int128_test.cc b/extern/crashpad/crashpad/util/numeric/int128_test.cc
index 83b4f6e871..5bc9e4159c 100644
--- a/extern/crashpad/crashpad/util/numeric/int128_test.cc
+++ b/extern/crashpad/crashpad/util/numeric/int128_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@ TEST(Int128, UInt128) {
   uint128_struct uint128;
   static_assert(sizeof(uint128) == sizeof(kBytes), "sizes must be equal");
 
-  uint128 = bit_cast<uint128_struct>(kBytes);
+  uint128 = base::bit_cast<uint128_struct>(kBytes);
 
   EXPECT_EQ(uint128.lo, 0x0706050403020100u);
   EXPECT_EQ(uint128.hi, 0x0f0e0d0c0b0a0908u);
diff --git a/extern/crashpad/crashpad/util/numeric/safe_assignment.h b/extern/crashpad/crashpad/util/numeric/safe_assignment.h
index 358d983701..16e30a51ed 100644
--- a/extern/crashpad/crashpad/util/numeric/safe_assignment.h
+++ b/extern/crashpad/crashpad/util/numeric/safe_assignment.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/posix/close_multiple.cc b/extern/crashpad/crashpad/util/posix/close_multiple.cc
index 2e0ad1056e..8c94e75018 100644
--- a/extern/crashpad/crashpad/util/posix/close_multiple.cc
+++ b/extern/crashpad/crashpad/util/posix/close_multiple.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,8 +21,9 @@
 #include <unistd.h>
 
 #include <algorithm>
+#include <iterator>
 
-#include "base/cxx17_backports.h"
+#include "base/check_op.h"
 #include "base/files/scoped_file.h"
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
@@ -31,7 +32,7 @@
 #include "util/file/directory_reader.h"
 #include "util/misc/implicit_cast.h"
 
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
 #include <sys/sysctl.h>
 #endif
 
@@ -51,7 +52,7 @@ namespace {
 void CloseNowOrOnExec(int fd, bool ebadf_ok) {
   int rv;
 
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
   // Try to set close-on-exec, to avoid attempting to close a guarded FD with
   // a close guard set.
   rv = fcntl(fd, F_SETFD, FD_CLOEXEC);
@@ -72,9 +73,9 @@ void CloseNowOrOnExec(int fd, bool ebadf_ok) {
 // This is an advantage over looping over all possible file descriptors, because
 // no attempt needs to be made to close file descriptors that are not open.
 bool CloseMultipleNowOrOnExecUsingFDDir(int min_fd, int preserve_fd) {
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
   static constexpr char kFDDir[] = "/dev/fd";
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
   static constexpr char kFDDir[] = "/proc/self/fd";
 #endif
 
@@ -128,14 +129,15 @@ void CloseMultipleNowOrOnExec(int fd, int preserve_fd) {
   // bionic/libc/bionic/ndk_cruft.cpp getdtablesize().
   int max_fd = implicit_cast<int>(sysconf(_SC_OPEN_MAX));
 
-#if !defined(OS_ANDROID)
+#if !BUILDFLAG(IS_ANDROID)
   // getdtablesize() was removed effective Android 5.0.0 (API 21). Since it
   // returns the same thing as the sysconf() above, just skip it. See
   // https://android.googlesource.com/platform/bionic/+/462abab12b074c62c0999859e65d5a32ebb41951.
   max_fd = std::max(max_fd, getdtablesize());
 #endif
 
-#if !(defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)) || \
+#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+      BUILDFLAG(IS_ANDROID)) ||                        \
     defined(OPEN_MAX)
   // Linux does not provide OPEN_MAX. See
   // https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/include/linux/limits.h?id=77293034696e3e0b6c8b8fc1f96be091104b3d2b.
@@ -147,14 +149,14 @@ void CloseMultipleNowOrOnExec(int fd, int preserve_fd) {
   // while the system is running, but it’s still a better upper bound than the
   // current RLIMIT_NOFILE value.
 
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
   // See 10.11.6 xnu-3248.60.10/bsd/kern/kern_resource.c maxfilesperproc,
   // referenced by dosetrlimit().
   int oid[] = {CTL_KERN, KERN_MAXFILESPERPROC};
   int maxfilesperproc;
   size_t maxfilesperproc_size = sizeof(maxfilesperproc);
   if (sysctl(oid,
-             base::size(oid),
+             std::size(oid),
              &maxfilesperproc,
              &maxfilesperproc_size,
              nullptr,
@@ -163,7 +165,7 @@ void CloseMultipleNowOrOnExec(int fd, int preserve_fd) {
   } else {
     PLOG(WARNING) << "sysctl";
   }
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
   // See linux-4.4.27/fs/file.c sysctl_nr_open, referenced by kernel/sys.c
   // do_prlimit() and kernel/sysctl.c fs_table. Inability to open this file is
   // not considered an error, because /proc may not be available or usable.
diff --git a/extern/crashpad/crashpad/util/posix/close_multiple.h b/extern/crashpad/crashpad/util/posix/close_multiple.h
index baf72b2b6d..6fb5f870af 100644
--- a/extern/crashpad/crashpad/util/posix/close_multiple.h
+++ b/extern/crashpad/crashpad/util/posix/close_multiple.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/posix/close_stdio.cc b/extern/crashpad/crashpad/util/posix/close_stdio.cc
index 812aad5721..61edc6e752 100644
--- a/extern/crashpad/crashpad/util/posix/close_stdio.cc
+++ b/extern/crashpad/crashpad/util/posix/close_stdio.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,9 +18,10 @@
 #include <paths.h>
 #include <unistd.h>
 
+#include <tuple>
+
 #include "base/check.h"
 #include "base/files/scoped_file.h"
-#include "base/macros.h"
 #include "base/posix/eintr_wrapper.h"
 
 namespace crashpad {
@@ -32,7 +33,7 @@ void CloseStdioStream(int desired_fd, int oflag) {
       HANDLE_EINTR(open(_PATH_DEVNULL, oflag | O_NOCTTY | O_CLOEXEC)));
   if (fd == desired_fd) {
     // Weird, but play along.
-    ignore_result(fd.release());
+    std::ignore = fd.release();
   } else {
     PCHECK(fd.get() >= 0) << "open";
     PCHECK(HANDLE_EINTR(dup2(fd.get(), desired_fd)) != -1) << "dup2";
diff --git a/extern/crashpad/crashpad/util/posix/close_stdio.h b/extern/crashpad/crashpad/util/posix/close_stdio.h
index 9515923b52..746deedcbc 100644
--- a/extern/crashpad/crashpad/util/posix/close_stdio.h
+++ b/extern/crashpad/crashpad/util/posix/close_stdio.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/posix/double_fork_and_exec.cc b/extern/crashpad/crashpad/util/posix/double_fork_and_exec.cc
deleted file mode 100644
index 1960430954..0000000000
--- a/extern/crashpad/crashpad/util/posix/double_fork_and_exec.cc
+++ /dev/null
@@ -1,166 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// 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.
-
-#include "util/posix/double_fork_and_exec.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <sys/wait.h>
-#include <unistd.h>
-
-#include "base/check_op.h"
-#include "base/logging.h"
-#include "base/posix/eintr_wrapper.h"
-#include "base/strings/stringprintf.h"
-#include "util/posix/close_multiple.h"
-
-namespace crashpad {
-
-bool DoubleForkAndExec(const std::vector<std::string>& argv,
-                       const std::vector<std::string>* envp,
-                       int preserve_fd,
-                       bool use_path,
-                       void (*child_function)()) {
-  DCHECK(!envp || !use_path);
-
-  // argv_c contains const char* pointers and is terminated by nullptr. This is
-  // suitable for passing to execv(). Although argv_c is not used in the parent
-  // process, it must be built in the parent process because it’s unsafe to do
-  // so in the child or grandchild process.
-  std::vector<const char*> argv_c;
-  argv_c.reserve(argv.size() + 1);
-  for (const std::string& argument : argv) {
-    argv_c.push_back(argument.c_str());
-  }
-  argv_c.push_back(nullptr);
-
-  std::vector<const char*> envp_c;
-  if (envp) {
-    envp_c.reserve(envp->size() + 1);
-    for (const std::string& variable : *envp) {
-      envp_c.push_back(variable.c_str());
-    }
-    envp_c.push_back(nullptr);
-  }
-
-  // Double-fork(). The three processes involved are parent, child, and
-  // grandchild. The grandchild will call execv(). The child exits immediately
-  // after spawning the grandchild, so the grandchild becomes an orphan and its
-  // parent process ID becomes 1. This relieves the parent and child of the
-  // responsibility to reap the grandchild with waitpid() or similar. The
-  // grandchild is expected to outlive the parent process, so the parent
-  // shouldn’t be concerned with reaping it. This approach means that accidental
-  // early termination of the handler process will not result in a zombie
-  // process.
-  pid_t pid = fork();
-  if (pid < 0) {
-    PLOG(ERROR) << "fork";
-    return false;
-  }
-
-  if (pid == 0) {
-    // Child process.
-
-    if (child_function) {
-      child_function();
-    }
-
-    // Call setsid(), creating a new process group and a new session, both led
-    // by this process. The new process group has no controlling terminal. This
-    // disconnects it from signals generated by the parent process’ terminal.
-    //
-    // setsid() is done in the child instead of the grandchild so that the
-    // grandchild will not be a session leader. If it were a session leader, an
-    // accidental open() of a terminal device without O_NOCTTY would make that
-    // terminal the controlling terminal.
-    //
-    // It’s not desirable for the grandchild to have a controlling terminal. The
-    // grandchild manages its own lifetime, such as by monitoring clients on its
-    // own and exiting when it loses all clients and when it deems it
-    // appropraite to do so. It may serve clients in different process groups or
-    // sessions than its original client, and receiving signals intended for its
-    // original client’s process group could be harmful in that case.
-    PCHECK(setsid() != -1) << "setsid";
-
-    pid = fork();
-    if (pid < 0) {
-      PLOG(FATAL) << "fork";
-    }
-
-    if (pid > 0) {
-      // Child process.
-
-      // _exit() instead of exit(), because fork() was called.
-      _exit(EXIT_SUCCESS);
-    }
-
-    // Grandchild process.
-
-    CloseMultipleNowOrOnExec(STDERR_FILENO + 1, preserve_fd);
-
-    // &argv_c[0] is a pointer to a pointer to const char data, but because of
-    // how C (not C++) works, execvp() wants a pointer to a const pointer to
-    // char data. It modifies neither the data nor the pointers, so the
-    // const_cast is safe.
-    char* const* argv_for_execv = const_cast<char* const*>(&argv_c[0]);
-
-    if (envp) {
-      // This cast is safe for the same reason that the argv_for_execv cast is.
-      char* const* envp_for_execv = const_cast<char* const*>(&envp_c[0]);
-      execve(argv_for_execv[0], argv_for_execv, envp_for_execv);
-      PLOG(FATAL) << "execve " << argv_for_execv[0];
-    }
-
-    if (use_path) {
-      execvp(argv_for_execv[0], argv_for_execv);
-      PLOG(FATAL) << "execvp " << argv_for_execv[0];
-    }
-
-    execv(argv_for_execv[0], argv_for_execv);
-    PLOG(FATAL) << "execv " << argv_for_execv[0];
-  }
-
-  // waitpid() for the child, so that it does not become a zombie process. The
-  // child normally exits quickly.
-  //
-  // Failures from this point on may result in the accumulation of a zombie, but
-  // should not be considered fatal. Log only warnings, but don’t treat these
-  // failures as a failure of the function overall.
-  int status;
-  pid_t wait_pid = HANDLE_EINTR(waitpid(pid, &status, 0));
-  if (wait_pid == -1) {
-    PLOG(WARNING) << "waitpid";
-    return true;
-  }
-  DCHECK_EQ(wait_pid, pid);
-
-  if (WIFSIGNALED(status)) {
-    int sig = WTERMSIG(status);
-    LOG(WARNING) << base::StringPrintf(
-        "intermediate process terminated by signal %d (%s)%s",
-        sig,
-        strsignal(sig),
-        WCOREDUMP(status) ? " (core dumped)" : "");
-  } else if (!WIFEXITED(status)) {
-    LOG(WARNING) << base::StringPrintf(
-        "intermediate process: unknown termination 0x%x", status);
-  } else if (WEXITSTATUS(status) != EXIT_SUCCESS) {
-    LOG(WARNING) << "intermediate process exited with code "
-                 << WEXITSTATUS(status);
-  }
-
-  return true;
-}
-
-}  // namespace crashpad
diff --git a/extern/crashpad/crashpad/util/posix/drop_privileges.cc b/extern/crashpad/crashpad/util/posix/drop_privileges.cc
index 75650d5a68..1976c4fb7b 100644
--- a/extern/crashpad/crashpad/util/posix/drop_privileges.cc
+++ b/extern/crashpad/crashpad/util/posix/drop_privileges.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@ void DropPrivileges() {
   gid_t gid = getgid();
   uid_t uid = getuid();
 
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
   // Based on the POSIX.1-2008 2013 edition documentation for setreuid() and
   // setregid(), setreuid() and setregid() alone should be sufficient to drop
   // privileges. The standard specifies that the saved ID should be set to the
@@ -73,7 +73,7 @@ void DropPrivileges() {
       CHECK_EQ(setegid(egid), -1);
     }
   }
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
   PCHECK(setresgid(gid, gid, gid) == 0) << "setresgid";
   PCHECK(setresuid(uid, uid, uid) == 0) << "setresuid";
 
diff --git a/extern/crashpad/crashpad/util/posix/drop_privileges.h b/extern/crashpad/crashpad/util/posix/drop_privileges.h
index 91220e9785..db3cc2586c 100644
--- a/extern/crashpad/crashpad/util/posix/drop_privileges.h
+++ b/extern/crashpad/crashpad/util/posix/drop_privileges.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/posix/process_info.h b/extern/crashpad/crashpad/util/posix/process_info.h
index 7a58788dfa..4c2658043e 100644
--- a/extern/crashpad/crashpad/util/posix/process_info.h
+++ b/extern/crashpad/crashpad/util/posix/process_info.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -27,12 +27,12 @@
 #include "util/misc/initialization_state.h"
 #include "util/misc/initialization_state_dcheck.h"
 
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
 #include <mach/mach.h>
 #include <sys/sysctl.h>
 #endif
 
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
 #include "util/linux/ptrace_connection.h"
 #endif
 
@@ -47,7 +47,8 @@ class ProcessInfo {
 
   ~ProcessInfo();
 
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || DOXYGEN
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
+    DOXYGEN
   //! \brief Initializes this object with information about the process whose ID
   //!     is \a pid using a PtraceConnection \a connection.
   //!
@@ -62,9 +63,10 @@ class ProcessInfo {
   //!
   //! \return `true` on success, `false` on failure with a message logged.
   bool InitializeWithPtrace(PtraceConnection* connection);
-#endif  // OS_LINUX || OS_CHROMEOS || OS_ANDROID || DOXYGEN
+#endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
+        // BUILDFLAG(IS_ANDROID) || DOXYGEN
 
-#if defined(OS_APPLE) || DOXYGEN
+#if BUILDFLAG(IS_APPLE) || DOXYGEN
   //! \brief Initializes this object with information about the process whose ID
   //!     is \a pid.
   //!
@@ -169,9 +171,9 @@ class ProcessInfo {
   bool Arguments(std::vector<std::string>* argv) const;
 
  private:
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
   kinfo_proc kern_proc_info_;
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
   // Some members are marked mutable so that they can be lazily initialized by
   // const methods. These are always InitializationState-protected so that
   // multiple successive calls will always produce the same return value and out
diff --git a/extern/crashpad/crashpad/util/posix/process_info_linux.cc b/extern/crashpad/crashpad/util/posix/process_info_linux.cc
index 3ffd96aba0..1aca699c52 100644
--- a/extern/crashpad/crashpad/util/posix/process_info_linux.cc
+++ b/extern/crashpad/crashpad/util/posix/process_info_linux.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 #include <stdio.h>
 
+#include "base/check.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "util/file/delimited_file_reader.h"
diff --git a/extern/crashpad/crashpad/util/posix/process_info_mac.cc b/extern/crashpad/crashpad/util/posix/process_info_mac.cc
index 47d0ff4ae1..cf615194ad 100644
--- a/extern/crashpad/crashpad/util/posix/process_info_mac.cc
+++ b/extern/crashpad/crashpad/util/posix/process_info_mac.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,9 +16,11 @@
 
 #include <string.h>
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+
+#include "base/apple/mach_logging.h"
+#include "base/check_op.h"
 #include "base/logging.h"
-#include "base/mac/mach_logging.h"
 
 namespace crashpad {
 
@@ -33,7 +35,7 @@ bool ProcessInfo::InitializeWithPid(pid_t pid) {
 
   int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, pid};
   size_t len = sizeof(kern_proc_info_);
-  if (sysctl(mib, base::size(mib), &kern_proc_info_, &len, nullptr, 0) != 0) {
+  if (sysctl(mib, std::size(mib), &kern_proc_info_, &len, nullptr, 0) != 0) {
     PLOG(ERROR) << "sysctl for pid " << pid;
     return false;
   }
@@ -112,7 +114,7 @@ std::set<gid_t> ProcessInfo::SupplementaryGroups() const {
   const short ngroups = kern_proc_info_.kp_eproc.e_ucred.cr_ngroups;
   DCHECK_GE(ngroups, 0);
   DCHECK_LE(static_cast<size_t>(ngroups),
-            base::size(kern_proc_info_.kp_eproc.e_ucred.cr_groups));
+            std::size(kern_proc_info_.kp_eproc.e_ucred.cr_groups));
 
   const gid_t* groups = kern_proc_info_.kp_eproc.e_ucred.cr_groups;
   return std::set<gid_t>(&groups[0], &groups[ngroups]);
@@ -169,7 +171,7 @@ bool ProcessInfo::Arguments(std::vector<std::string>* argv) const {
   do {
     int mib[] = {CTL_KERN, KERN_PROCARGS2, pid};
     int rv =
-        sysctl(mib, base::size(mib), nullptr, &args_size_estimate, nullptr, 0);
+        sysctl(mib, std::size(mib), nullptr, &args_size_estimate, nullptr, 0);
     if (rv != 0) {
       PLOG(ERROR) << "sysctl (size) for pid " << pid;
       return false;
@@ -184,7 +186,7 @@ bool ProcessInfo::Arguments(std::vector<std::string>* argv) const {
     // for the reasons described above.)
     args_size = args_size_estimate + 32;
     args.resize(args_size);
-    rv = sysctl(mib, base::size(mib), &args[0], &args_size, nullptr, 0);
+    rv = sysctl(mib, std::size(mib), &args[0], &args_size, nullptr, 0);
     if (rv != 0) {
       PLOG(ERROR) << "sysctl (data) for pid " << pid;
       return false;
diff --git a/extern/crashpad/crashpad/util/posix/process_info_test.cc b/extern/crashpad/crashpad/util/posix/process_info_test.cc
index 1d9b065743..1207e7fa56 100644
--- a/extern/crashpad/crashpad/util/posix/process_info_test.cc
+++ b/extern/crashpad/crashpad/util/posix/process_info_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@
 #include "util/misc/implicit_cast.h"
 #include "util/string/split_string.h"
 
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
 #include "util/linux/direct_ptrace_connection.h"
 #include "test/linux/fake_ptrace_connection.h"
 #endif
@@ -98,7 +98,7 @@ void TestProcessSelfOrClone(const ProcessInfo& process_info) {
 
   const std::vector<std::string>& expect_argv = GetMainArguments();
 
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
   // Prior to Linux 4.2, the kernel only allowed reading a single page from
   // /proc/<pid>/cmdline, causing any further arguments to be truncated. Disable
   // testing arguments in this case.
@@ -124,7 +124,8 @@ void TestProcessSelfOrClone(const ProcessInfo& process_info) {
       argv_size > static_cast<size_t>(getpagesize())) {
     return;
   }
-#endif  // OS_ANDROID || OS_LINUX || OS_CHROMEOS
+#endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ||
+        // BUILDFLAG(IS_CHROMEOS)
 
   std::vector<std::string> argv;
   ASSERT_TRUE(process_info.Arguments(&argv));
@@ -161,18 +162,19 @@ void TestSelfProcess(const ProcessInfo& process_info) {
 
 TEST(ProcessInfo, Self) {
   ProcessInfo process_info;
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
   FakePtraceConnection connection;
   ASSERT_TRUE(connection.Initialize(getpid()));
   ASSERT_TRUE(process_info.InitializeWithPtrace(&connection));
 #else
   ASSERT_TRUE(process_info.InitializeWithPid(getpid()));
-#endif  // OS_LINUX || OS_ANDROID || OS_CHROMEOS
+#endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ||
+        // BUILDFLAG(IS_CHROMEOS)
 
   TestSelfProcess(process_info);
 }
 
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
 TEST(ProcessInfo, SelfTask) {
   ProcessInfo process_info;
   ASSERT_TRUE(process_info.InitializeWithTask(mach_task_self()));
@@ -184,7 +186,7 @@ TEST(ProcessInfo, Pid1) {
   // PID 1 is expected to be init or the system’s equivalent. This tests reading
   // information about another process.
   ProcessInfo process_info;
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
   FakePtraceConnection connection;
   ASSERT_TRUE(connection.Initialize(1));
   ASSERT_TRUE(process_info.InitializeWithPtrace(&connection));
@@ -216,7 +218,7 @@ class ProcessInfoForkedTest : public Multiprocess {
   void MultiprocessParent() override {
     const pid_t pid = ChildPID();
 
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
     DirectPtraceConnection connection;
     ASSERT_TRUE(connection.Initialize(pid));
 
@@ -225,7 +227,8 @@ class ProcessInfoForkedTest : public Multiprocess {
 #else
     ProcessInfo process_info;
     ASSERT_TRUE(process_info.InitializeWithPid(pid));
-#endif  // OS_LINUX || OS_CHROMEOS || OS_ANDROID
+#endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
+        // BUILDFLAG(IS_ANDROID)
 
     EXPECT_EQ(process_info.ProcessID(), pid);
     EXPECT_EQ(process_info.ParentProcessID(), getpid());
diff --git a/extern/crashpad/crashpad/util/posix/scoped_dir.cc b/extern/crashpad/crashpad/util/posix/scoped_dir.cc
index 94e4eecf18..e687f411b5 100644
--- a/extern/crashpad/crashpad/util/posix/scoped_dir.cc
+++ b/extern/crashpad/crashpad/util/posix/scoped_dir.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/posix/scoped_dir.h b/extern/crashpad/crashpad/util/posix/scoped_dir.h
index 3fcbdf9c9d..0580a4915f 100644
--- a/extern/crashpad/crashpad/util/posix/scoped_dir.h
+++ b/extern/crashpad/crashpad/util/posix/scoped_dir.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/posix/scoped_mmap.cc b/extern/crashpad/crashpad/util/posix/scoped_mmap.cc
index 4438393173..ee76c8569c 100644
--- a/extern/crashpad/crashpad/util/posix/scoped_mmap.cc
+++ b/extern/crashpad/crashpad/util/posix/scoped_mmap.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -24,19 +24,14 @@
 #include "base/numerics/safe_conversions.h"
 #include "base/numerics/safe_math.h"
 #include "build/build_config.h"
-#include "build/chromeos_buildflags.h"
 
-// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
-// complete.
-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#if BUILDFLAG(IS_LINUX)
 #include "third_party/lss/lss.h"
 #endif
 
 namespace {
 
-// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
-// complete.
-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#if BUILDFLAG(IS_LINUX)
 void* CallMmap(void* addr,
                size_t len,
                int prot,
diff --git a/extern/crashpad/crashpad/util/posix/scoped_mmap.h b/extern/crashpad/crashpad/util/posix/scoped_mmap.h
index 706f1e7fad..298328dbe8 100644
--- a/extern/crashpad/crashpad/util/posix/scoped_mmap.h
+++ b/extern/crashpad/crashpad/util/posix/scoped_mmap.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/posix/scoped_mmap_test.cc b/extern/crashpad/crashpad/util/posix/scoped_mmap_test.cc
index f8307cc698..5aa837a6a2 100644
--- a/extern/crashpad/crashpad/util/posix/scoped_mmap_test.cc
+++ b/extern/crashpad/crashpad/util/posix/scoped_mmap_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,7 +18,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+
 #include "base/numerics/safe_conversions.h"
 #include "base/rand_util.h"
 #include "base/strings/stringprintf.h"
@@ -152,7 +153,7 @@ TEST(ScopedMmapDeathTest, ResetAddrLen_Shrink) {
   EXPECT_EQ(mapping.len(), 3 * kPageSize);
 
   TestCookie cookies[3];
-  for (size_t index = 0; index < base::size(cookies); ++index) {
+  for (size_t index = 0; index < std::size(cookies); ++index) {
     cookies[index].SetUp(reinterpret_cast<uint64_t*>(
         mapping.addr_as<uintptr_t>() + index * kPageSize));
   }
@@ -187,7 +188,7 @@ TEST(ScopedMmap, ResetAddrLen_Grow) {
   EXPECT_EQ(mapping.len(), kPageSize);
 
   TestCookie cookies[3];
-  for (size_t index = 0; index < base::size(cookies); ++index) {
+  for (size_t index = 0; index < std::size(cookies); ++index) {
     cookies[index].SetUp(reinterpret_cast<uint64_t*>(
         reinterpret_cast<uintptr_t>(pages) + index * kPageSize));
   }
@@ -198,7 +199,7 @@ TEST(ScopedMmap, ResetAddrLen_Grow) {
   EXPECT_EQ(mapping.addr(), pages);
   EXPECT_EQ(mapping.len(), 3 * kPageSize);
 
-  for (size_t index = 0; index < base::size(cookies); ++index) {
+  for (size_t index = 0; index < std::size(cookies); ++index) {
     SCOPED_TRACE(base::StringPrintf("index %zu", index));
     EXPECT_EQ(cookies[index].Observed(), cookies[index].Expected());
   }
@@ -219,7 +220,7 @@ TEST(ScopedMmapDeathTest, ResetAddrLen_MoveDownAndGrow) {
   EXPECT_EQ(mapping.len(), kPageSize);
 
   TestCookie cookies[3];
-  for (size_t index = 0; index < base::size(cookies); ++index) {
+  for (size_t index = 0; index < std::size(cookies); ++index) {
     cookies[index].SetUp(reinterpret_cast<uint64_t*>(
         reinterpret_cast<uintptr_t>(pages) + index * kPageSize));
   }
@@ -250,7 +251,7 @@ TEST(ScopedMmapDeathTest, ResetAddrLen_MoveUpAndShrink) {
   EXPECT_EQ(mapping.len(), 2 * kPageSize);
 
   TestCookie cookies[3];
-  for (size_t index = 0; index < base::size(cookies); ++index) {
+  for (size_t index = 0; index < std::size(cookies); ++index) {
     cookies[index].SetUp(reinterpret_cast<uint64_t*>(
         reinterpret_cast<uintptr_t>(pages) + index * kPageSize));
   }
@@ -348,7 +349,7 @@ TEST(ScopedMmapDeathTest, NotIntegralNumberOfPages) {
   EXPECT_EQ(mapping.len(), 2 * kPageSize);
 
   TestCookie two_cookies[2];
-  for (size_t index = 0; index < base::size(two_cookies); ++index) {
+  for (size_t index = 0; index < std::size(two_cookies); ++index) {
     two_cookies[index].SetUp(reinterpret_cast<uint64_t*>(
         mapping.addr_as<uintptr_t>() + index * kPageSize));
   }
@@ -368,7 +369,7 @@ TEST(ScopedMmapDeathTest, NotIntegralNumberOfPages) {
   EXPECT_NE(mapping.addr(), MAP_FAILED);
   EXPECT_EQ(mapping.len(), 2 * kPageSize);
 
-  for (size_t index = 0; index < base::size(two_cookies); ++index) {
+  for (size_t index = 0; index < std::size(two_cookies); ++index) {
     two_cookies[index].SetUp(reinterpret_cast<uint64_t*>(
         mapping.addr_as<uintptr_t>() + index * kPageSize));
   }
diff --git a/extern/crashpad/crashpad/util/posix/signals.cc b/extern/crashpad/crashpad/util/posix/signals.cc
index b90e8f659b..58f957c40d 100644
--- a/extern/crashpad/crashpad/util/posix/signals.cc
+++ b/extern/crashpad/crashpad/util/posix/signals.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,11 +16,16 @@
 
 #include <unistd.h>
 
+#include <iterator>
 #include <vector>
 
 #include "base/check_op.h"
-#include "base/cxx17_backports.h"
 #include "base/logging.h"
+#include "build/build_config.h"
+
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS)
+#include <sys/syscall.h>
+#endif
 
 namespace crashpad {
 
@@ -46,10 +51,10 @@ constexpr int kCrashSignals[] = {
 #if defined(SIGEMT)
     SIGEMT,
 #endif  // defined(SIGEMT)
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
     SIGXCPU,
     SIGXFSZ,
-#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS)
+#endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 };
 
 // These are the non-core-generating but terminating signals.
@@ -82,13 +87,13 @@ constexpr int kTerminateSignals[] = {
 #if defined(SIGSTKFLT)
     SIGSTKFLT,
 #endif  // defined(SIGSTKFLT)
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
     SIGXCPU,
     SIGXFSZ,
-#endif  // defined(OS_APPLE)
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
+#endif  // BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
     SIGIO,
-#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS)
+#endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 };
 
 bool InstallHandlers(const std::vector<int>& signals,
@@ -125,7 +130,7 @@ bool IsSignalInSet(int sig, const int* set, size_t set_size) {
 struct sigaction* Signals::OldActions::ActionForSignal(int sig) {
   DCHECK_GT(sig, 0);
   const size_t slot = sig - 1;
-  DCHECK_LT(slot, base::size(actions_));
+  DCHECK_LT(slot, std::size(actions_));
   return &actions_[slot];
 }
 
@@ -142,6 +147,25 @@ bool Signals::InstallHandler(int sig,
     PLOG(ERROR) << "sigaction " << sig;
     return false;
   }
+
+// Sanitizers can prevent the installation of signal handlers, but sigaction
+// does not report this as failure. Attempt to detect this by checking the
+// currently installed signal handler.
+#if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER) || \
+    defined(THREAD_SANITIZER) || defined(LEAK_SANITIZER) ||    \
+    defined(UNDEFINED_SANITIZER)
+  struct sigaction installed_handler;
+  CHECK_EQ(sigaction(sig, nullptr, &installed_handler), 0);
+  // If the installed handler does not point to the just installed handler, then
+  // the allow_user_segv_handler sanitizer flag is (probably) disabled.
+  if (installed_handler.sa_sigaction != handler) {
+    LOG(WARNING)
+        << "sanitizers are preventing signal handler installation (sig " << sig
+        << ")";
+    return false;
+  }
+#endif
+
   return true;
 }
 
@@ -160,8 +184,7 @@ bool Signals::InstallCrashHandlers(Handler handler,
                                    OldActions* old_actions,
                                    const std::set<int>* unhandled_signals) {
   return InstallHandlers(
-      std::vector<int>(kCrashSignals,
-                       kCrashSignals + base::size(kCrashSignals)),
+      std::vector<int>(kCrashSignals, kCrashSignals + std::size(kCrashSignals)),
       handler,
       flags,
       old_actions,
@@ -174,7 +197,7 @@ bool Signals::InstallTerminateHandlers(Handler handler,
                                        OldActions* old_actions) {
   return InstallHandlers(
       std::vector<int>(kTerminateSignals,
-                       kTerminateSignals + base::size(kTerminateSignals)),
+                       kTerminateSignals + std::size(kTerminateSignals)),
       handler,
       flags,
       old_actions,
@@ -255,14 +278,8 @@ bool Signals::WillSignalReraiseAutonomously(const siginfo_t* siginfo) {
 }
 
 // static
-void Signals::RestoreHandlerAndReraiseSignalOnReturn(
-    const siginfo_t* siginfo,
-    const struct sigaction* old_action) {
-  // Failures in this function should _exit(kFailureExitCode). This is a quick
-  // and quiet failure. This function runs in signal handler context, and it’s
-  // difficult to safely be loud from a signal handler.
-  constexpr int kFailureExitCode = 191;
-
+bool Signals::RestoreOrResetHandler(int sig,
+                                    const struct sigaction* old_action) {
   struct sigaction default_action;
   sigemptyset(&default_action.sa_mask);
   default_action.sa_flags = 0;
@@ -274,11 +291,53 @@ void Signals::RestoreHandlerAndReraiseSignalOnReturn(
   // Try to restore restore_action. If that fails and restore_action was
   // old_action, the problem may have been that old_action was bogus, so try to
   // set the default action.
-  const int sig = siginfo->si_signo;
   if (sigaction(sig, restore_action, nullptr) != 0 && old_action &&
       sigaction(sig, &default_action, nullptr) != 0) {
+    return false;
+  }
+  return true;
+}
+
+// static
+void Signals::RestoreHandlerAndReraiseSignalOnReturn(
+    const siginfo_t* siginfo,
+    const struct sigaction* old_action) {
+  // Failures in this function should _exit(kFailureExitCode). This is a quick
+  // and quiet failure. This function runs in signal handler context, and it’s
+  // difficult to safely be loud from a signal handler.
+  constexpr int kFailureExitCode = 191;
+
+  const int sig = siginfo->si_signo;
+
+  if (!RestoreOrResetHandler(sig, old_action)) {
+    _exit(kFailureExitCode);
+  }
+
+  // If we can raise a signal with siginfo on this platform, do so. This ensures
+  // that we preserve the siginfo information for asynchronous signals (i.e.
+  // signals that do not re-raise autonomously), such as signals delivered via
+  // kill() and asynchronous hardware faults such as SEGV_MTEAERR, which would
+  // otherwise be lost when re-raising the signal via raise().
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS)
+  int retval = syscall(SYS_rt_tgsigqueueinfo,
+                       getpid(),
+                       syscall(SYS_gettid),
+                       siginfo->si_signo,
+                       siginfo);
+  if (retval == 0) {
+    return;
+  }
+
+  // Kernels without commit 66dd34ad31e5 ("signal: allow to send any siginfo to
+  // itself"), which was first released in kernel version 3.9, did not permit a
+  // process to send arbitrary signals to itself, and will reject the
+  // rt_tgsigqueueinfo syscall with EPERM. If that happens, follow the non-Linux
+  // code path. Any other errno is unexpected and will cause us to exit.
+  if (errno != EPERM) {
     _exit(kFailureExitCode);
   }
+#endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ||
+        // BUILDFLAG(IS_CHROMEOS)
 
   // Explicitly re-raise the signal if it will not re-raise itself. Because
   // signal handlers normally execute with their signal blocked, this raise()
@@ -293,12 +352,12 @@ void Signals::RestoreHandlerAndReraiseSignalOnReturn(
 
 // static
 bool Signals::IsCrashSignal(int sig) {
-  return IsSignalInSet(sig, kCrashSignals, base::size(kCrashSignals));
+  return IsSignalInSet(sig, kCrashSignals, std::size(kCrashSignals));
 }
 
 // static
 bool Signals::IsTerminateSignal(int sig) {
-  return IsSignalInSet(sig, kTerminateSignals, base::size(kTerminateSignals));
+  return IsSignalInSet(sig, kTerminateSignals, std::size(kTerminateSignals));
 }
 
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/util/posix/signals.h b/extern/crashpad/crashpad/util/posix/signals.h
index cfa196bdfc..934b31284b 100644
--- a/extern/crashpad/crashpad/util/posix/signals.h
+++ b/extern/crashpad/crashpad/util/posix/signals.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -196,6 +196,24 @@ class Signals {
   //! \note This function is safe to call from a signal handler.
   static bool WillSignalReraiseAutonomously(const siginfo_t* siginfo);
 
+  //! \brief Restores a previous signal action or reinstalls the default signal
+  //!     handler for a given signal.
+  //!
+  //! Attempts to reinstate the action given by \a old_action and, in case of
+  //! failure or if \a old_actiono is `nullptr`, resets the handler for \a sig
+  //! to the default action.
+  //!
+  //! \param[in] sig The signal to manage.
+  //! \param[in] old_action The previous action for the signal, which will be
+  //!     re-established as the signal’s action. May be `nullptr`, which directs
+  //!     the default action for the signal to be used.
+  //!
+  //! \return `true` on success, `false` if `sigaction()` fails.
+  //!
+  //! \note This function is safe to call from a signal handler.
+  static bool RestoreOrResetHandler(int sig,
+                                    const struct sigaction* old_action);
+
   //! \brief Restores a previous signal action and arranges to re-raise a signal
   //!     on return from a signal handler.
   //!
diff --git a/extern/crashpad/crashpad/util/posix/signals_test.cc b/extern/crashpad/crashpad/util/posix/signals_test.cc
index d26c291955..15c4499558 100644
--- a/extern/crashpad/crashpad/util/posix/signals_test.cc
+++ b/extern/crashpad/crashpad/util/posix/signals_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,14 +17,12 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/stat.h>
 #include <sys/time.h>
 #include <unistd.h>
 
+#include <iterator>
 #include <limits>
 
-#include "base/compiler_specific.h"
-#include "base/cxx17_backports.h"
 #include "base/files/scoped_file.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
@@ -35,36 +33,81 @@
 #include "test/scoped_temp_dir.h"
 #include "util/posix/scoped_mmap.h"
 
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS)
+#include <sys/auxv.h>
+#include <sys/prctl.h>
+
+#if defined(ARCH_CPU_ARM64)
+#ifndef HWCAP2_MTE
+#define HWCAP2_MTE (1 << 18)
+#endif
+#ifndef SEGV_MTEAERR
+#define SEGV_MTEAERR 8
+#endif
+#ifndef PROT_MTE
+#define PROT_MTE 0x20
+#endif
+#ifndef PR_SET_TAGGED_ADDR_CTRL
+#define PR_SET_TAGGED_ADDR_CTRL 55
+#endif
+#ifndef PR_TAGGED_ADDR_ENABLE
+#define PR_TAGGED_ADDR_ENABLE (1UL << 0)
+#endif
+#ifndef PR_MTE_TCF_ASYNC
+#define PR_MTE_TCF_ASYNC (1UL << 2)
+#endif
+#endif  // defined(ARCH_CPU_ARM64)
+#endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ||
+        // BUILDFLAG(IS_CHROMEOS)
+
 namespace crashpad {
 namespace test {
 namespace {
 
 constexpr int kUnexpectedExitStatus = 3;
 
+struct TestableSignal {
+  int sig, code;
+};
+
 // Keep synchronized with CauseSignal().
-bool CanCauseSignal(int sig) {
-  return sig == SIGABRT ||
-         sig == SIGALRM ||
-         sig == SIGBUS ||
-#if !defined(ARCH_CPU_ARM64)
-         sig == SIGFPE ||
-#endif  // !defined(ARCH_CPU_ARM64)
+std::vector<TestableSignal> TestableSignals() {
+  std::vector<TestableSignal> signals;
+  signals.push_back({SIGABRT, 0});
+  signals.push_back({SIGALRM, 0});
+  signals.push_back({SIGBUS, 0});
+/* According to DDI0487D (Armv8 Architecture Reference Manual) the expected
+ * behavior for division by zero (Section 3.4.8) is: "... results in a
+ * zero being written to the destination register, without any
+ * indication that the division by zero occurred.".
+ * This applies to Armv8 (and not earlier) for both 32bit and 64bit app code.
+ */
+#if defined(ARCH_CPU_X86_FAMILY)
+  signals.push_back({SIGFPE, 0});
+#endif
 #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
-         sig == SIGILL ||
+  signals.push_back({SIGILL, 0});
 #endif  // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
-         sig == SIGPIPE ||
-         sig == SIGSEGV ||
-#if defined(OS_APPLE)
-         sig == SIGSYS ||
-#endif  // OS_APPLE
+  signals.push_back({SIGPIPE, 0});
+  signals.push_back({SIGSEGV, 0});
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || \
+     BUILDFLAG(IS_CHROMEOS)) &&                      \
+    defined(ARCH_CPU_ARM64)
+  if (getauxval(AT_HWCAP2) & HWCAP2_MTE) {
+    signals.push_back({SIGSEGV, SEGV_MTEAERR});
+  }
+#endif
+#if BUILDFLAG(IS_APPLE)
+  signals.push_back({SIGSYS, 0});
+#endif  // BUILDFLAG(IS_APPLE)
 #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM64)
-         sig == SIGTRAP ||
+  signals.push_back({SIGTRAP, 0});
 #endif  // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM64)
-         false;
+  return signals;
 }
 
-// Keep synchronized with CanCauseSignal().
-void CauseSignal(int sig) {
+// Keep synchronized with TestableSignals().
+void CauseSignal(int sig, int code) {
   switch (sig) {
     case SIGABRT: {
       abort();
@@ -115,27 +158,21 @@ void CauseSignal(int sig) {
       _exit(kUnexpectedExitStatus);
     }
 
-#if !defined(ARCH_CPU_ARM64)
-    // ARM64 has hardware integer division instructions that don’t generate a
-    // trap for divide-by-zero, so this doesn’t produce SIGFPE.
     case SIGFPE: {
-      // Optimization makes this tricky, so get zero from a system call likely
-      // to succeed, and try to do something with the result.
-      struct stat stat_buf;
-      int zero = stat("/", &stat_buf);
-      if (zero == -1) {
-        // It’s important to check |== -1| and not |!= 0|. An optimizer is free
-        // to discard an |== 0| branch entirely, because division by zero is
-        // undefined behavior.
-        PLOG(ERROR) << "stat";
-        _exit(kUnexpectedExitStatus);
-      }
-
-      int quotient = 2 / zero;
-      fstat(quotient, &stat_buf);
+/* Enabled only for x86, since a division by zero won't raise a signal
+ * on Armv8, please see comment at the top of file concerning the
+ * Arm architecture.
+ */
+#if defined(ARCH_CPU_X86_FAMILY)
+      // Dividing by zero is undefined in C, so the compiler is permitted to
+      // optimize out the division. Instead, divide using inline assembly. As
+      // this instruction will trap anyway, we skip declaring any clobbers or
+      // output registers.
+      int a = 42, b = 0;
+      asm volatile("idivl %2" : : "a"(0), "d"(a), "r"(b));
+#endif
       break;
     }
-#endif  // ARCH_CPU_ARM64
 
 #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
     case SIGILL: {
@@ -169,12 +206,42 @@ void CauseSignal(int sig) {
     }
 
     case SIGSEGV: {
-      volatile int* i = nullptr;
-      *i = 0;
+      switch (code) {
+        case 0: {
+          volatile int* i = nullptr;
+          *i = 0;
+          break;
+        }
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || \
+     BUILDFLAG(IS_CHROMEOS)) &&                      \
+    defined(ARCH_CPU_ARM64)
+        case SEGV_MTEAERR: {
+          ScopedMmap mapping;
+          if (!mapping.ResetMmap(nullptr,
+                                 getpagesize(),
+                                 PROT_READ | PROT_WRITE | PROT_MTE,
+                                 MAP_PRIVATE | MAP_ANON,
+                                 -1,
+                                 0)) {
+            _exit(kUnexpectedExitStatus);
+          }
+          if (prctl(PR_SET_TAGGED_ADDR_CTRL,
+                PR_TAGGED_ADDR_ENABLE | PR_MTE_TCF_ASYNC,
+                0,
+                0,
+                0) != 0) {
+            _exit(kUnexpectedExitStatus);
+          }
+          mapping.addr_as<char*>()[1ULL << 56] = 0;
+          break;
+        }
+#endif  // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ||
+        // BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_ARM64)
+      }
       break;
     }
 
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
     case SIGSYS: {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
@@ -186,7 +253,7 @@ void CauseSignal(int sig) {
       }
       break;
     }
-#endif  // OS_APPLE
+#endif  // BUILDFLAG(IS_APPLE)
 
 #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM64)
     case SIGTRAP: {
@@ -223,9 +290,10 @@ class SignalsTest : public Multiprocess {
   };
   static constexpr int kExitingHandlerExitStatus = 2;
 
-  SignalsTest(TestType test_type, SignalSource signal_source, int sig)
+  SignalsTest(TestType test_type, SignalSource signal_source, int sig, int code)
       : Multiprocess(),
         sig_(sig),
+        code_(code),
         test_type_(test_type),
         signal_source_(signal_source) {}
 
@@ -304,7 +372,7 @@ class SignalsTest : public Multiprocess {
 
     switch (signal_source_) {
       case SignalSource::kCause:
-        CauseSignal(sig_);
+        CauseSignal(sig_, code_);
         break;
       case SignalSource::kRaise:
         raise(sig_);
@@ -315,6 +383,7 @@ class SignalsTest : public Multiprocess {
   }
 
   int sig_;
+  int code_;
   TestType test_type_;
   SignalSource signal_source_;
   static Signals::OldActions old_actions_;
@@ -344,7 +413,7 @@ TEST(Signals, WillSignalReraiseAutonomously) {
       {SIGHUP, SEGV_MAPERR, false},
       {SIGINT, SI_USER, false},
   };
-  for (size_t index = 0; index < base::size(kTestData); ++index) {
+  for (size_t index = 0; index < std::size(kTestData); ++index) {
     const auto test_data = kTestData[index];
     SCOPED_TRACE(base::StringPrintf(
         "index %zu, sig %d, code %d", index, test_data.sig, test_data.code));
@@ -357,32 +426,28 @@ TEST(Signals, WillSignalReraiseAutonomously) {
 }
 
 TEST(Signals, Cause_DefaultHandler) {
-  for (int sig = 1; sig < NSIG; ++sig) {
-    SCOPED_TRACE(base::StringPrintf("sig %d (%s)", sig, strsignal(sig)));
-
-    if (!CanCauseSignal(sig)) {
-      continue;
-    }
+  for (TestableSignal s : TestableSignals()) {
+    SCOPED_TRACE(base::StringPrintf(
+        "sig %d (%s), code %d", s.sig, strsignal(s.sig), s.code));
 
     SignalsTest test(SignalsTest::TestType::kDefaultHandler,
                      SignalsTest::SignalSource::kCause,
-                     sig);
-    test.SetExpectedChildTermination(Multiprocess::kTerminationSignal, sig);
+                     s.sig,
+                     s.code);
+    test.SetExpectedChildTermination(Multiprocess::kTerminationSignal, s.sig);
     test.Run();
   }
 }
 
 TEST(Signals, Cause_HandlerExits) {
-  for (int sig = 1; sig < NSIG; ++sig) {
-    SCOPED_TRACE(base::StringPrintf("sig %d (%s)", sig, strsignal(sig)));
-
-    if (!CanCauseSignal(sig)) {
-      continue;
-    }
+  for (TestableSignal s : TestableSignals()) {
+    SCOPED_TRACE(base::StringPrintf(
+        "sig %d (%s), code %d", s.sig, strsignal(s.sig), s.code));
 
     SignalsTest test(SignalsTest::TestType::kHandlerExits,
                      SignalsTest::SignalSource::kCause,
-                     sig);
+                     s.sig,
+                     s.code);
     test.SetExpectedChildTermination(Multiprocess::kTerminationNormal,
                                      SignalsTest::kExitingHandlerExitStatus);
     test.Run();
@@ -390,32 +455,28 @@ TEST(Signals, Cause_HandlerExits) {
 }
 
 TEST(Signals, Cause_HandlerReraisesToDefault) {
-  for (int sig = 1; sig < NSIG; ++sig) {
-    SCOPED_TRACE(base::StringPrintf("sig %d (%s)", sig, strsignal(sig)));
-
-    if (!CanCauseSignal(sig)) {
-      continue;
-    }
+  for (TestableSignal s : TestableSignals()) {
+    SCOPED_TRACE(base::StringPrintf(
+        "sig %d (%s), code %d", s.sig, strsignal(s.sig), s.code));
 
     SignalsTest test(SignalsTest::TestType::kHandlerReraisesToDefault,
                      SignalsTest::SignalSource::kCause,
-                     sig);
-    test.SetExpectedChildTermination(Multiprocess::kTerminationSignal, sig);
+                     s.sig,
+                     s.code);
+    test.SetExpectedChildTermination(Multiprocess::kTerminationSignal, s.sig);
     test.Run();
   }
 }
 
 TEST(Signals, Cause_HandlerReraisesToPrevious) {
-  for (int sig = 1; sig < NSIG; ++sig) {
-    SCOPED_TRACE(base::StringPrintf("sig %d (%s)", sig, strsignal(sig)));
-
-    if (!CanCauseSignal(sig)) {
-      continue;
-    }
+  for (TestableSignal s : TestableSignals()) {
+    SCOPED_TRACE(base::StringPrintf(
+        "sig %d (%s), code %d", s.sig, strsignal(s.sig), s.code));
 
     SignalsTest test(SignalsTest::TestType::kHandlerReraisesToPrevious,
                      SignalsTest::SignalSource::kCause,
-                     sig);
+                     s.sig,
+                     s.code);
     test.SetExpectedChildTermination(Multiprocess::kTerminationNormal,
                                      SignalsTest::kExitingHandlerExitStatus);
     test.Run();
@@ -432,7 +493,8 @@ TEST(Signals, Raise_DefaultHandler) {
 
     SignalsTest test(SignalsTest::TestType::kDefaultHandler,
                      SignalsTest::SignalSource::kRaise,
-                     sig);
+                     sig,
+                     0);
     test.SetExpectedChildTermination(Multiprocess::kTerminationSignal, sig);
     test.Run();
   }
@@ -448,7 +510,8 @@ TEST(Signals, Raise_HandlerExits) {
 
     SignalsTest test(SignalsTest::TestType::kHandlerExits,
                      SignalsTest::SignalSource::kRaise,
-                     sig);
+                     sig,
+                     0);
     test.SetExpectedChildTermination(Multiprocess::kTerminationNormal,
                                      SignalsTest::kExitingHandlerExitStatus);
     test.Run();
@@ -463,7 +526,7 @@ TEST(Signals, Raise_HandlerReraisesToDefault) {
       continue;
     }
 
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
     if (sig == SIGBUS
 #if defined(ARCH_CPU_ARM64)
         || sig == SIGILL || sig == SIGSEGV
@@ -476,11 +539,12 @@ TEST(Signals, Raise_HandlerReraisesToDefault) {
       // test must be skipped.
       continue;
     }
-#endif  // defined(OS_APPLE)
+#endif  // BUILDFLAG(IS_APPLE)
 
     SignalsTest test(SignalsTest::TestType::kHandlerReraisesToDefault,
                      SignalsTest::SignalSource::kRaise,
-                     sig);
+                     sig,
+                     0);
     test.SetExpectedChildTermination(Multiprocess::kTerminationSignal, sig);
     test.Run();
   }
@@ -494,7 +558,7 @@ TEST(Signals, Raise_HandlerReraisesToPrevious) {
       continue;
     }
 
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
     if (sig == SIGBUS
 #if defined(ARCH_CPU_ARM64)
         || sig == SIGILL || sig == SIGSEGV
@@ -507,11 +571,12 @@ TEST(Signals, Raise_HandlerReraisesToPrevious) {
       // test must be skipped.
       continue;
     }
-#endif  // defined(OS_APPLE)
+#endif  // BUILDFLAG(IS_APPLE)
 
     SignalsTest test(SignalsTest::TestType::kHandlerReraisesToPrevious,
                      SignalsTest::SignalSource::kRaise,
-                     sig);
+                     sig,
+                     0);
     test.SetExpectedChildTermination(Multiprocess::kTerminationNormal,
                                      SignalsTest::kExitingHandlerExitStatus);
     test.Run();
diff --git a/extern/crashpad/crashpad/util/posix/spawn_subprocess.cc b/extern/crashpad/crashpad/util/posix/spawn_subprocess.cc
new file mode 100644
index 0000000000..8f1f13d169
--- /dev/null
+++ b/extern/crashpad/crashpad/util/posix/spawn_subprocess.cc
@@ -0,0 +1,263 @@
+// Copyright 2017 The Crashpad Authors
+//
+// 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.
+
+#include "util/posix/spawn_subprocess.h"
+
+#include <errno.h>
+#include <spawn.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/wait.h>
+#include <unistd.h>
+
+#include "base/check.h"
+#include "base/check_op.h"
+#include "base/logging.h"
+#include "base/posix/eintr_wrapper.h"
+#include "base/strings/stringprintf.h"
+#include "build/build_config.h"
+#include "util/posix/close_multiple.h"
+
+#if BUILDFLAG(IS_ANDROID)
+#include <android/api-level.h>
+#endif
+
+extern char** environ;
+
+namespace crashpad {
+
+namespace {
+
+#if BUILDFLAG(IS_APPLE)
+
+class PosixSpawnAttr {
+ public:
+  PosixSpawnAttr() {
+    PCHECK((errno = posix_spawnattr_init(&attr_)) == 0)
+        << "posix_spawnattr_init";
+  }
+
+  PosixSpawnAttr(const PosixSpawnAttr&) = delete;
+  PosixSpawnAttr& operator=(const PosixSpawnAttr&) = delete;
+
+  ~PosixSpawnAttr() {
+    PCHECK((errno = posix_spawnattr_destroy(&attr_)) == 0)
+        << "posix_spawnattr_destroy";
+  }
+
+  void SetFlags(short flags) {
+    PCHECK((errno = posix_spawnattr_setflags(&attr_, flags)) == 0)
+        << "posix_spawnattr_setflags";
+  }
+
+  const posix_spawnattr_t* Get() const { return &attr_; }
+
+ private:
+  posix_spawnattr_t attr_;
+};
+
+class PosixSpawnFileActions {
+ public:
+  PosixSpawnFileActions() {
+    PCHECK((errno = posix_spawn_file_actions_init(&file_actions_)) == 0)
+        << "posix_spawn_file_actions_init";
+  }
+
+  PosixSpawnFileActions(const PosixSpawnFileActions&) = delete;
+  PosixSpawnFileActions& operator=(const PosixSpawnFileActions&) = delete;
+
+  ~PosixSpawnFileActions() {
+    PCHECK((errno = posix_spawn_file_actions_destroy(&file_actions_)) == 0)
+        << "posix_spawn_file_actions_destroy";
+  }
+
+  void AddInheritedFileDescriptor(int fd) {
+    PCHECK((errno = posix_spawn_file_actions_addinherit_np(&file_actions_,
+                                                           fd)) == 0)
+        << "posix_spawn_file_actions_addinherit_np";
+  }
+
+  const posix_spawn_file_actions_t* Get() const { return &file_actions_; }
+
+ private:
+  posix_spawn_file_actions_t file_actions_;
+};
+
+#endif
+
+}  // namespace
+
+bool SpawnSubprocess(const std::vector<std::string>& argv,
+                     const std::vector<std::string>* envp,
+                     int preserve_fd,
+                     bool use_path,
+                     void (*child_function)()) {
+  // argv_c contains const char* pointers and is terminated by nullptr. This is
+  // suitable for passing to posix_spawn*() and execv*(). Although argv_c is not
+  // used in the parent process, it must be built in the parent process because
+  // it’s unsafe to do so in the child or grandchild process.
+  std::vector<const char*> argv_c;
+  argv_c.reserve(argv.size() + 1);
+  for (const std::string& argument : argv) {
+    argv_c.push_back(argument.c_str());
+  }
+  argv_c.push_back(nullptr);
+
+  std::vector<const char*> envp_c;
+  if (envp) {
+    envp_c.reserve(envp->size() + 1);
+    for (const std::string& variable : *envp) {
+      envp_c.push_back(variable.c_str());
+    }
+    envp_c.push_back(nullptr);
+  }
+
+  // The three processes involved are parent, child, and grandchild. The child
+  // exits immediately after spawning the grandchild, so the grandchild becomes
+  // an orphan and its parent process ID becomes 1. This relieves the parent and
+  // child of the responsibility to reap the grandchild with waitpid() or
+  // similar. The grandchild is expected to outlive the parent process, so the
+  // parent shouldn’t be concerned with reaping it. This approach means that
+  // accidental early termination of the handler process will not result in a
+  // zombie process.
+  pid_t pid = fork();
+  if (pid < 0) {
+    PLOG(ERROR) << "fork";
+    return false;
+  }
+
+  if (pid == 0) {
+    // Child process.
+
+    if (child_function) {
+      child_function();
+    }
+
+    // Call setsid(), creating a new process group and a new session, both led
+    // by this process. The new process group has no controlling terminal. This
+    // disconnects it from signals generated by the parent process’ terminal.
+    //
+    // setsid() is done in the child instead of the grandchild so that the
+    // grandchild will not be a session leader. If it were a session leader, an
+    // accidental open() of a terminal device without O_NOCTTY would make that
+    // terminal the controlling terminal.
+    //
+    // It’s not desirable for the grandchild to have a controlling terminal. The
+    // grandchild manages its own lifetime, such as by monitoring clients on its
+    // own and exiting when it loses all clients and when it deems it
+    // appropraite to do so. It may serve clients in different process groups or
+    // sessions than its original client, and receiving signals intended for its
+    // original client’s process group could be harmful in that case.
+    PCHECK(setsid() != -1) << "setsid";
+
+    // &argv_c[0] is a pointer to a pointer to const char data, but because of
+    // how C (not C++) works, posix_spawn*() and execv*() want a pointer to
+    // a const pointer to char data. They modify neither the data nor the
+    // pointers, so the const_cast is safe.
+    char* const* argv_for_spawn = const_cast<char* const*>(argv_c.data());
+
+    // This cast is safe for the same reason that the argv_for_spawn cast is.
+    char* const* envp_for_spawn =
+        envp ? const_cast<char* const*>(envp_c.data()) : environ;
+
+#if BUILDFLAG(IS_ANDROID) && __ANDROID_API__ < 28
+    pid = fork();
+    if (pid < 0) {
+      PLOG(FATAL) << "fork";
+    }
+
+    if (pid > 0) {
+      // Child process.
+
+      // _exit() instead of exit(), because fork() was called.
+      _exit(EXIT_SUCCESS);
+    }
+
+    // Grandchild process.
+
+    CloseMultipleNowOrOnExec(STDERR_FILENO + 1, preserve_fd);
+
+    auto execve_fp = use_path ? execvpe : execve;
+    execve_fp(argv_for_spawn[0], argv_for_spawn, envp_for_spawn);
+    PLOG(FATAL) << (use_path ? "execvpe" : "execve") << " "
+                << argv_for_spawn[0];
+#else
+#if BUILDFLAG(IS_APPLE)
+    PosixSpawnAttr attr;
+    attr.SetFlags(POSIX_SPAWN_CLOEXEC_DEFAULT);
+
+    PosixSpawnFileActions file_actions;
+    for (int fd = 0; fd <= STDERR_FILENO; ++fd) {
+      file_actions.AddInheritedFileDescriptor(fd);
+    }
+    file_actions.AddInheritedFileDescriptor(preserve_fd);
+
+    const posix_spawnattr_t* attr_p = attr.Get();
+    const posix_spawn_file_actions_t* file_actions_p = file_actions.Get();
+#else
+    CloseMultipleNowOrOnExec(STDERR_FILENO + 1, preserve_fd);
+
+    const posix_spawnattr_t* attr_p = nullptr;
+    const posix_spawn_file_actions_t* file_actions_p = nullptr;
+#endif
+
+    auto posix_spawn_fp = use_path ? posix_spawnp : posix_spawn;
+    if ((errno = posix_spawn_fp(nullptr,
+                                argv_for_spawn[0],
+                                file_actions_p,
+                                attr_p,
+                                argv_for_spawn,
+                                envp_for_spawn)) != 0) {
+      PLOG(FATAL) << (use_path ? "posix_spawnp" : "posix_spawn") << " "
+                  << argv_for_spawn[0];
+    }
+
+    // _exit() instead of exit(), because fork() was called.
+    _exit(EXIT_SUCCESS);
+#endif
+  }
+
+  // waitpid() for the child, so that it does not become a zombie process. The
+  // child normally exits quickly.
+  //
+  // Failures from this point on may result in the accumulation of a zombie, but
+  // should not be considered fatal. Log only warnings, but don’t treat these
+  // failures as a failure of the function overall.
+  int status;
+  pid_t wait_pid = HANDLE_EINTR(waitpid(pid, &status, 0));
+  if (wait_pid == -1) {
+    PLOG(WARNING) << "waitpid";
+    return true;
+  }
+  DCHECK_EQ(wait_pid, pid);
+
+  if (WIFSIGNALED(status)) {
+    int sig = WTERMSIG(status);
+    LOG(WARNING) << base::StringPrintf(
+        "intermediate process terminated by signal %d (%s)%s",
+        sig,
+        strsignal(sig),
+        WCOREDUMP(status) ? " (core dumped)" : "");
+  } else if (!WIFEXITED(status)) {
+    LOG(WARNING) << base::StringPrintf(
+        "intermediate process: unknown termination 0x%x", status);
+  } else if (WEXITSTATUS(status) != EXIT_SUCCESS) {
+    LOG(WARNING) << "intermediate process exited with code "
+                 << WEXITSTATUS(status);
+  }
+
+  return true;
+}
+
+}  // namespace crashpad
diff --git a/extern/crashpad/crashpad/util/posix/double_fork_and_exec.h b/extern/crashpad/crashpad/util/posix/spawn_subprocess.h
similarity index 51%
rename from extern/crashpad/crashpad/util/posix/double_fork_and_exec.h
rename to extern/crashpad/crashpad/util/posix/spawn_subprocess.h
index 02fc0f28f1..7142686359 100644
--- a/extern/crashpad/crashpad/util/posix/double_fork_and_exec.h
+++ b/extern/crashpad/crashpad/util/posix/spawn_subprocess.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,48 +12,43 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef CRASHPAD_UTIL_POSIX_DOUBLE_FORK_AND_EXEC_H_
-#define CRASHPAD_UTIL_POSIX_DOUBLE_FORK_AND_EXEC_H_
+#ifndef CRASHPAD_UTIL_POSIX_SPAWN_SUBPROCESS_H_
+#define CRASHPAD_UTIL_POSIX_SPAWN_SUBPROCESS_H_
 
 #include <string>
 #include <vector>
 
 namespace crashpad {
 
-//! \brief Executes a (grand-)child process.
+//! \brief Spawns a subprocess.
 //!
-//! The grandchild process will be started through the
-//! double-`fork()`-and-`execv()` pattern. This allows the grandchild to fully
-//! disassociate from the parent. The grandchild will not be a member of the
-//! parent’s process group or session and will not have a controlling terminal,
-//! providing isolation from signals not intended for it. The grandchild’s
-//! parent process, in terms of the process tree hierarchy, will be the process
-//! with process ID 1, relieving any other process of the responsibility to reap
-//! it via `waitpid()`. Aside from the three file descriptors associated with
-//! the standard input/output streams and any file descriptor passed in \a
-//! preserve_fd, the grandchild will not inherit any file descriptors from the
-//! parent process.
+//! A grandchild process will be started through the
+//! `fork()`-and-`posix_spawn()` pattern where supported, and
+//! double-`fork()`-and-`execv()` pattern elsewhere. This allows the grandchild
+//! to fully disassociate from the parent. The grandchild will not be a member
+//! of the parent’s process group or session and will not have a controlling
+//! terminal, providing isolation from signals not intended for it. The
+//! grandchild’s parent process, in terms of the process tree hierarchy, will be
+//! the process with process ID 1, relieving any other process of the
+//! responsibility to reap it via `waitpid()`. Aside from the three file
+//! descriptors associated with the standard input/output streams and any file
+//! descriptor passed in \a preserve_fd, the grandchild will not inherit any
+//! file descriptors from the parent process.
 //!
 //! \param[in] argv The argument vector to start the grandchild process with.
 //!     `argv[0]` is used as the path to the executable.
 //! \param[in] envp A vector of environment variables of the form `var=value` to
-//!     be passed to `execve()`. If this value is `nullptr`, the current
-//!     environment is used.
+//!     be passed to the spawned process. If this value is `nullptr`, the
+//!     current environment is used.
 //! \param[in] preserve_fd A file descriptor to be inherited by the grandchild
 //!     process. This file descriptor is inherited in addition to the three file
 //!     descriptors associated with the standard input/output streams. Use `-1`
 //!     if no additional file descriptors are to be inherited.
 //! \param[in] use_path Whether to consult the `PATH` environment variable when
-//!     requested to start an executable at a non-absolute path. If `false`,
-//!     `execv()`, which does not consult `PATH`, will be used. If `true`,
-//!     `execvp()`, which does consult `PATH`, will be used.
+//!     requested to start an executable at a non-absolute path.
 //! \param[in] child_function If not `nullptr`, this function will be called in
-//!     the intermediate child process, prior to the second `fork()`. Take note
-//!     that this function will run in the context of a forked process, and must
-//!     be safe for that purpose.
-//!
-//! Setting both \a envp to a value other than `nullptr` and \a use_path to
-//! `true` is not currently supported.
+//!     the intermediate child process. Take note that this function will run in
+//!     the context of a forked process, and must be safe for that purpose.
 //!
 //! \return `true` on success, and `false` on failure with a message logged.
 //!     Only failures that occur in the parent process that indicate a definite
@@ -63,12 +58,12 @@ namespace crashpad {
 //!     terminating. The caller assumes the responsibility for detecting such
 //!     failures, for example, by observing a failure to perform a successful
 //!     handshake with the grandchild process.
-bool DoubleForkAndExec(const std::vector<std::string>& argv,
-                       const std::vector<std::string>* envp,
-                       int preserve_fd,
-                       bool use_path,
-                       void (*child_function)());
+bool SpawnSubprocess(const std::vector<std::string>& argv,
+                     const std::vector<std::string>* envp,
+                     int preserve_fd,
+                     bool use_path,
+                     void (*child_function)());
 
 }  // namespace crashpad
 
-#endif  // CRASHPAD_UTIL_POSIX_DOUBLE_FORK_AND_EXEC_H_
+#endif  // CRASHPAD_UTIL_POSIX_SPAWN_SUBPROCESS_H_
diff --git a/extern/crashpad/crashpad/util/posix/symbolic_constants_posix.cc b/extern/crashpad/crashpad/util/posix/symbolic_constants_posix.cc
index 671d963403..58c9057fbd 100644
--- a/extern/crashpad/crashpad/util/posix/symbolic_constants_posix.cc
+++ b/extern/crashpad/crashpad/util/posix/symbolic_constants_posix.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,7 +18,9 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+#include <string_view>
+
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "util/misc/implicit_cast.h"
@@ -29,8 +31,10 @@ namespace {
 constexpr const char* kSignalNames[] = {
     nullptr,
 
-#if defined(OS_APPLE)
-    // sed -Ene 's/^#define[[:space:]]SIG([[:alnum:]]+)[[:space:]]+[[:digit:]]{1,2}([[:space:]]|$).*/    "\1",/p'
+#if BUILDFLAG(IS_APPLE)
+    // sed -Ene
+    // 's/^#define[[:space:]]SIG([[:alnum:]]+)[[:space:]]+[[:digit:]]{1,2}([[:space:]]|$).*/
+    // "\1",/p'
     //     /usr/include/sys/signal.h
     // and fix up by removing the entry for SIGPOLL.
     "HUP",
@@ -64,7 +68,7 @@ constexpr const char* kSignalNames[] = {
     "INFO",
     "USR1",
     "USR2",
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
 #if defined(ARCH_CPU_MIPS_FAMILY)
     "HUP",
     "INT",
@@ -135,11 +139,11 @@ constexpr const char* kSignalNames[] = {
 #endif  // defined(ARCH_CPU_MIPS_FAMILY)
 #endif
 };
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
 // NSIG is 64 to account for real-time signals.
-static_assert(base::size(kSignalNames) == 32, "kSignalNames length");
+static_assert(std::size(kSignalNames) == 32, "kSignalNames length");
 #else
-static_assert(base::size(kSignalNames) == NSIG, "kSignalNames length");
+static_assert(std::size(kSignalNames) == NSIG, "kSignalNames length");
 #endif
 
 constexpr char kSigPrefix[] = "SIG";
@@ -151,7 +155,7 @@ namespace crashpad {
 std::string SignalToString(int signal,
                            SymbolicConstantToStringOptions options) {
   const char* signal_name =
-      implicit_cast<size_t>(signal) < base::size(kSignalNames)
+      implicit_cast<size_t>(signal) < std::size(kSignalNames)
           ? kSignalNames[signal]
           : nullptr;
   if (!signal_name) {
@@ -167,16 +171,16 @@ std::string SignalToString(int signal,
   return base::StringPrintf("%s%s", kSigPrefix, signal_name);
 }
 
-bool StringToSignal(const base::StringPiece& string,
+bool StringToSignal(std::string_view string,
                     StringToSymbolicConstantOptions options,
                     int* signal) {
   if ((options & kAllowFullName) || (options & kAllowShortName)) {
     bool can_match_full =
         (options & kAllowFullName) &&
         string.substr(0, strlen(kSigPrefix)).compare(kSigPrefix) == 0;
-    base::StringPiece short_string =
+    std::string_view short_string =
         can_match_full ? string.substr(strlen(kSigPrefix)) : string;
-    for (int index = 0; index < implicit_cast<int>(base::size(kSignalNames));
+    for (int index = 0; index < implicit_cast<int>(std::size(kSignalNames));
          ++index) {
       const char* signal_name = kSignalNames[index];
       if (!signal_name) {
diff --git a/extern/crashpad/crashpad/util/posix/symbolic_constants_posix.h b/extern/crashpad/crashpad/util/posix/symbolic_constants_posix.h
index 4fb4a358aa..0a38d7d6f9 100644
--- a/extern/crashpad/crashpad/util/posix/symbolic_constants_posix.h
+++ b/extern/crashpad/crashpad/util/posix/symbolic_constants_posix.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 #define CRASHPAD_UTIL_POSIX_SYMBOLIC_CONSTANTS_POSIX_H_
 
 #include <string>
+#include <string_view>
 
-#include "base/strings/string_piece.h"
 #include "util/misc/symbolic_constants_common.h"
 
 namespace crashpad {
@@ -39,7 +39,7 @@ std::string SignalToString(int signal, SymbolicConstantToStringOptions options);
 //!
 //! \return `true` on success, `false` if \a string could not be converted as
 //!     requested.
-bool StringToSignal(const base::StringPiece& string,
+bool StringToSignal(std::string_view string,
                     StringToSymbolicConstantOptions options,
                     int* signal);
 
diff --git a/extern/crashpad/crashpad/util/posix/symbolic_constants_posix_test.cc b/extern/crashpad/crashpad/util/posix/symbolic_constants_posix_test.cc
index 61d75e28a8..e2efd2ec80 100644
--- a/extern/crashpad/crashpad/util/posix/symbolic_constants_posix_test.cc
+++ b/extern/crashpad/crashpad/util/posix/symbolic_constants_posix_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,14 +17,15 @@
 #include <signal.h>
 #include <sys/types.h>
 
-#include "base/cxx17_backports.h"
-#include "base/strings/string_piece.h"
+#include <iterator>
+#include <string_view>
+
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"
 
 #define NUL_TEST_DATA(string) \
-  { string, base::size(string) - 1 }
+  { string, std::size(string) - 1 }
 
 namespace crashpad {
 namespace test {
@@ -35,38 +36,23 @@ constexpr struct {
   const char* full_name;
   const char* short_name;
 } kSignalTestData[] = {
-    {SIGABRT, "SIGABRT", "ABRT"},
-    {SIGALRM, "SIGALRM", "ALRM"},
-    {SIGBUS, "SIGBUS", "BUS"},
-    {SIGCHLD, "SIGCHLD", "CHLD"},
-    {SIGCONT, "SIGCONT", "CONT"},
-    {SIGFPE, "SIGFPE", "FPE"},
-    {SIGHUP, "SIGHUP", "HUP"},
-    {SIGILL, "SIGILL", "ILL"},
-    {SIGINT, "SIGINT", "INT"},
-    {SIGIO, "SIGIO", "IO"},
-    {SIGKILL, "SIGKILL", "KILL"},
-    {SIGPIPE, "SIGPIPE", "PIPE"},
-    {SIGPROF, "SIGPROF", "PROF"},
-    {SIGQUIT, "SIGQUIT", "QUIT"},
-    {SIGSEGV, "SIGSEGV", "SEGV"},
-    {SIGSTOP, "SIGSTOP", "STOP"},
-    {SIGSYS, "SIGSYS", "SYS"},
-    {SIGTERM, "SIGTERM", "TERM"},
-    {SIGTRAP, "SIGTRAP", "TRAP"},
-    {SIGTSTP, "SIGTSTP", "TSTP"},
-    {SIGTTIN, "SIGTTIN", "TTIN"},
-    {SIGTTOU, "SIGTTOU", "TTOU"},
-    {SIGURG, "SIGURG", "URG"},
-    {SIGUSR1, "SIGUSR1", "USR1"},
-    {SIGUSR2, "SIGUSR2", "USR2"},
-    {SIGVTALRM, "SIGVTALRM", "VTALRM"},
-    {SIGWINCH, "SIGWINCH", "WINCH"},
-    {SIGXCPU, "SIGXCPU", "XCPU"},
-#if defined(OS_APPLE)
-    {SIGEMT, "SIGEMT", "EMT"},
-    {SIGINFO, "SIGINFO", "INFO"},
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+    {SIGABRT, "SIGABRT", "ABRT"},    {SIGALRM, "SIGALRM", "ALRM"},
+    {SIGBUS, "SIGBUS", "BUS"},       {SIGCHLD, "SIGCHLD", "CHLD"},
+    {SIGCONT, "SIGCONT", "CONT"},    {SIGFPE, "SIGFPE", "FPE"},
+    {SIGHUP, "SIGHUP", "HUP"},       {SIGILL, "SIGILL", "ILL"},
+    {SIGINT, "SIGINT", "INT"},       {SIGIO, "SIGIO", "IO"},
+    {SIGKILL, "SIGKILL", "KILL"},    {SIGPIPE, "SIGPIPE", "PIPE"},
+    {SIGPROF, "SIGPROF", "PROF"},    {SIGQUIT, "SIGQUIT", "QUIT"},
+    {SIGSEGV, "SIGSEGV", "SEGV"},    {SIGSTOP, "SIGSTOP", "STOP"},
+    {SIGSYS, "SIGSYS", "SYS"},       {SIGTERM, "SIGTERM", "TERM"},
+    {SIGTRAP, "SIGTRAP", "TRAP"},    {SIGTSTP, "SIGTSTP", "TSTP"},
+    {SIGTTIN, "SIGTTIN", "TTIN"},    {SIGTTOU, "SIGTTOU", "TTOU"},
+    {SIGURG, "SIGURG", "URG"},       {SIGUSR1, "SIGUSR1", "USR1"},
+    {SIGUSR2, "SIGUSR2", "USR2"},    {SIGVTALRM, "SIGVTALRM", "VTALRM"},
+    {SIGWINCH, "SIGWINCH", "WINCH"}, {SIGXCPU, "SIGXCPU", "XCPU"},
+#if BUILDFLAG(IS_APPLE)
+    {SIGEMT, "SIGEMT", "EMT"},       {SIGINFO, "SIGINFO", "INFO"},
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
     {SIGPWR, "SIGPWR", "PWR"},
 #if !defined(ARCH_CPU_MIPS_FAMILY)
     {SIGSTKFLT, "SIGSTKFLT", "STKFLT"},
@@ -116,14 +102,14 @@ void TestSignalToString(int value,
 }
 
 TEST(SymbolicConstantsPOSIX, SignalToString) {
-  for (size_t index = 0; index < base::size(kSignalTestData); ++index) {
+  for (size_t index = 0; index < std::size(kSignalTestData); ++index) {
     SCOPED_TRACE(base::StringPrintf("index %zu", index));
     TestSignalToString(kSignalTestData[index].signal,
                        kSignalTestData[index].full_name,
                        kSignalTestData[index].short_name);
   }
 
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
   // NSIG is 64 to account for real-time signals.
   constexpr int kSignalCount = 32;
 #else
@@ -140,7 +126,7 @@ TEST(SymbolicConstantsPOSIX, SignalToString) {
   }
 }
 
-void TestStringToSignal(const base::StringPiece& string,
+void TestStringToSignal(std::string_view string,
                         StringToSymbolicConstantOptions options,
                         bool expect_result,
                         int expect_value) {
@@ -171,11 +157,11 @@ TEST(SymbolicConstantsPOSIX, StringToSignal) {
       kAllowFullName | kAllowShortName | kAllowNumber,
   };
 
-  for (size_t option_index = 0; option_index < base::size(kOptions);
+  for (size_t option_index = 0; option_index < std::size(kOptions);
        ++option_index) {
     SCOPED_TRACE(base::StringPrintf("option_index %zu", option_index));
     StringToSymbolicConstantOptions options = kOptions[option_index];
-    for (size_t index = 0; index < base::size(kSignalTestData); ++index) {
+    for (size_t index = 0; index < std::size(kSignalTestData); ++index) {
       SCOPED_TRACE(base::StringPrintf("index %zu", index));
       int signal = kSignalTestData[index].signal;
       {
@@ -213,7 +199,7 @@ TEST(SymbolicConstantsPOSIX, StringToSignal) {
         "",
     };
 
-    for (size_t index = 0; index < base::size(kNegativeTestData); ++index) {
+    for (size_t index = 0; index < std::size(kNegativeTestData); ++index) {
       SCOPED_TRACE(base::StringPrintf("index %zu", index));
       TestStringToSignal(kNegativeTestData[index], options, false, 0);
     }
@@ -234,10 +220,10 @@ TEST(SymbolicConstantsPOSIX, StringToSignal) {
         NUL_TEST_DATA("1\0002"),
     };
 
-    for (size_t index = 0; index < base::size(kNULTestData); ++index) {
+    for (size_t index = 0; index < std::size(kNULTestData); ++index) {
       SCOPED_TRACE(base::StringPrintf("index %zu", index));
-      base::StringPiece string(kNULTestData[index].string,
-                               kNULTestData[index].length);
+      std::string_view string(kNULTestData[index].string,
+                              kNULTestData[index].length);
       TestStringToSignal(string, options, false, 0);
     }
   }
@@ -246,12 +232,12 @@ TEST(SymbolicConstantsPOSIX, StringToSignal) {
   {
     SCOPED_TRACE("trailing_NUL_full");
     TestStringToSignal(
-        base::StringPiece("SIGBUST", 6), kAllowFullName, true, SIGBUS);
+        std::string_view("SIGBUST", 6), kAllowFullName, true, SIGBUS);
   }
   {
     SCOPED_TRACE("trailing_NUL_short");
     TestStringToSignal(
-        base::StringPiece("BUST", 3), kAllowShortName, true, SIGBUS);
+        std::string_view("BUST", 3), kAllowShortName, true, SIGBUS);
   }
 }
 
diff --git a/extern/crashpad/crashpad/util/process/process_id.h b/extern/crashpad/crashpad/util/process/process_id.h
index 113f6fc638..4beae7f188 100644
--- a/extern/crashpad/crashpad/util/process/process_id.h
+++ b/extern/crashpad/crashpad/util/process/process_id.h
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,27 +20,27 @@
 #include "base/format_macros.h"
 #include "build/build_config.h"
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 #include <sys/types.h>
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 #include <windows.h>
-#elif defined(OS_FUCHSIA)
+#elif BUILDFLAG(IS_FUCHSIA)
 #include <zircon/types.h>
 #endif
 
 namespace crashpad {
 
-#if defined(OS_POSIX) || DOXYGEN
+#if BUILDFLAG(IS_POSIX) || DOXYGEN
 //! \brief Alias for platform-specific type to represent a process.
 using ProcessID = pid_t;
 constexpr ProcessID kInvalidProcessID = -1;
 static_assert(std::is_same<ProcessID, int>::value, "Port.");
 #define PRI_PROCESS_ID "d"
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 using ProcessID = DWORD;
 constexpr ProcessID kInvalidProcessID = 0;
 #define PRI_PROCESS_ID "lu"
-#elif defined(OS_FUCHSIA)
+#elif BUILDFLAG(IS_FUCHSIA)
 using ProcessID = zx_koid_t;
 constexpr ProcessID kInvalidProcessID = ZX_KOID_INVALID;
 static_assert(std::is_same<ProcessID, int64_t>::value, "Port.");
diff --git a/extern/crashpad/crashpad/util/process/process_memory.cc b/extern/crashpad/crashpad/util/process/process_memory.cc
index b7b417ff7d..89837736a9 100644
--- a/extern/crashpad/crashpad/util/process/process_memory.cc
+++ b/extern/crashpad/crashpad/util/process/process_memory.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/process/process_memory.h b/extern/crashpad/crashpad/util/process/process_memory.h
index eeb78e97ee..cd68b9305c 100644
--- a/extern/crashpad/crashpad/util/process/process_memory.h
+++ b/extern/crashpad/crashpad/util/process/process_memory.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,10 +22,10 @@
 #include "build/build_config.h"
 #include "util/misc/address_types.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include <basetsd.h>
 typedef SSIZE_T ssize_t;
-#endif  // defined(OS_WIN)
+#endif  // BUILDFLAG(IS_WIN)
 
 namespace crashpad {
 
diff --git a/extern/crashpad/crashpad/util/process/process_memory_fuchsia.cc b/extern/crashpad/crashpad/util/process/process_memory_fuchsia.cc
index b9c4a0c346..a14c2ac680 100644
--- a/extern/crashpad/crashpad/util/process/process_memory_fuchsia.cc
+++ b/extern/crashpad/crashpad/util/process/process_memory_fuchsia.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,8 +16,9 @@
 
 #include <limits>
 
-#include "base/logging.h"
+#include "base/check_op.h"
 #include "base/fuchsia/fuchsia_logging.h"
+#include "base/logging.h"
 
 namespace crashpad {
 
diff --git a/extern/crashpad/crashpad/util/process/process_memory_fuchsia.h b/extern/crashpad/crashpad/util/process/process_memory_fuchsia.h
index 6693c5a9e8..163e0fb740 100644
--- a/extern/crashpad/crashpad/util/process/process_memory_fuchsia.h
+++ b/extern/crashpad/crashpad/util/process/process_memory_fuchsia.h
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/process/process_memory_linux.cc b/extern/crashpad/crashpad/util/process/process_memory_linux.cc
index 56ac0ec836..9c2edea302 100644
--- a/extern/crashpad/crashpad/util/process/process_memory_linux.cc
+++ b/extern/crashpad/crashpad/util/process/process_memory_linux.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,13 +22,23 @@
 #include <algorithm>
 #include <limits>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
+#include "build/build_config.h"
+#include "util/file/filesystem.h"
+#include "util/linux/ptrace_connection.h"
 
 namespace crashpad {
 
 ProcessMemoryLinux::ProcessMemoryLinux(PtraceConnection* connection)
-    : ProcessMemory(), mem_fd_() {
+    : ProcessMemory(), mem_fd_(), ignore_top_byte_(false) {
+#if defined(ARCH_CPU_ARM_FAMILY)
+  if (connection->Is64Bit()) {
+    ignore_top_byte_ = true;
+  }
+#endif  // ARCH_CPU_ARM_FAMILY
+
   char path[32];
   snprintf(path, sizeof(path), "/proc/%d/mem", connection->GetProcessID());
   mem_fd_.reset(HANDLE_EINTR(open(path, O_RDONLY | O_NOCTTY | O_CLOEXEC)));
@@ -53,11 +63,15 @@ ProcessMemoryLinux::ProcessMemoryLinux(PtraceConnection* connection)
 
 ProcessMemoryLinux::~ProcessMemoryLinux() {}
 
+VMAddress ProcessMemoryLinux::PointerToAddress(VMAddress address) const {
+  return ignore_top_byte_ ? address & 0x00ffffffffffffff : address;
+}
+
 ssize_t ProcessMemoryLinux::ReadUpTo(VMAddress address,
                                      size_t size,
                                      void* buffer) const {
   DCHECK_LE(size, size_t{std::numeric_limits<ssize_t>::max()});
-  return read_up_to_(address, size, buffer);
+  return read_up_to_(PointerToAddress(address), size, buffer);
 }
 
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/util/process/process_memory_linux.h b/extern/crashpad/crashpad/util/process/process_memory_linux.h
index 496cf2d545..8116d766a2 100644
--- a/extern/crashpad/crashpad/util/process/process_memory_linux.h
+++ b/extern/crashpad/crashpad/util/process/process_memory_linux.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,12 +21,13 @@
 #include <string>
 
 #include "base/files/scoped_file.h"
-#include "util/linux/ptrace_connection.h"
 #include "util/misc/address_types.h"
 #include "util/process/process_memory.h"
 
 namespace crashpad {
 
+class PtraceConnection;
+
 //! \brief Accesses the memory of another Linux process.
 class ProcessMemoryLinux final : public ProcessMemory {
  public:
@@ -37,11 +38,16 @@ class ProcessMemoryLinux final : public ProcessMemory {
 
   ~ProcessMemoryLinux();
 
+  //! \brief Returns the input pointer with any non-addressing bits, such as
+  //!     tags removed.
+  VMAddress PointerToAddress(VMAddress address) const;
+
  private:
   ssize_t ReadUpTo(VMAddress address, size_t size, void* buffer) const override;
 
   std::function<ssize_t(VMAddress, size_t, void*)> read_up_to_;
   base::ScopedFD mem_fd_;
+  bool ignore_top_byte_;
 };
 
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/util/process/process_memory_mac.cc b/extern/crashpad/crashpad/util/process/process_memory_mac.cc
index 29357f3d60..a972401dc2 100644
--- a/extern/crashpad/crashpad/util/process/process_memory_mac.cc
+++ b/extern/crashpad/crashpad/util/process/process_memory_mac.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,8 +19,9 @@
 
 #include <algorithm>
 
+#include "base/apple/mach_logging.h"
+#include "base/check_op.h"
 #include "base/logging.h"
-#include "base/mac/mach_logging.h"
 #include "base/strings/stringprintf.h"
 #include "util/stdlib/strnlen.h"
 
diff --git a/extern/crashpad/crashpad/util/process/process_memory_mac.h b/extern/crashpad/crashpad/util/process/process_memory_mac.h
index ba37383fd9..9803daf9d1 100644
--- a/extern/crashpad/crashpad/util/process/process_memory_mac.h
+++ b/extern/crashpad/crashpad/util/process/process_memory_mac.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 #include <memory>
 #include <string>
 
-#include "base/mac/scoped_mach_vm.h"
+#include "base/apple/scoped_mach_vm.h"
 #include "util/misc/address_types.h"
 #include "util/misc/initialization_state_dcheck.h"
 #include "util/process/process_memory.h"
@@ -82,7 +82,7 @@ class ProcessMemoryMac : public ProcessMemory {
                  size_t user_offset,
                  size_t user_size);
 
-    base::mac::ScopedMachVM vm_;
+    base::apple::ScopedMachVM vm_;
     const void* data_;
     size_t user_size_;
 
diff --git a/extern/crashpad/crashpad/util/process/process_memory_mac_test.cc b/extern/crashpad/crashpad/util/process/process_memory_mac_test.cc
index 6cb6fae0b8..08e897b7c9 100644
--- a/extern/crashpad/crashpad/util/process/process_memory_mac_test.cc
+++ b/extern/crashpad/crashpad/util/process/process_memory_mac_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,8 +21,9 @@
 #include <memory>
 #include <string>
 
-#include "base/mac/scoped_mach_port.h"
-#include "base/mac/scoped_mach_vm.h"
+#include "base/apple/scoped_mach_port.h"
+#include "base/apple/scoped_mach_vm.h"
+#include "base/containers/heap_array.h"
 #include "gtest/gtest.h"
 #include "test/mac/mach_errors.h"
 #include "util/misc/from_pointer_cast.h"
@@ -37,7 +38,7 @@ TEST(ProcessMemoryMac, ReadMappedSelf) {
   kern_return_t kr =
       vm_allocate(mach_task_self(), &address, kSize, VM_FLAGS_ANYWHERE);
   ASSERT_EQ(kr, KERN_SUCCESS) << MachErrorMessage(kr, "vm_allocate");
-  base::mac::ScopedMachVM vm_owner(address, mach_vm_round_page(kSize));
+  base::apple::ScopedMachVM vm_owner(address, mach_vm_round_page(kSize));
 
   char* region = reinterpret_cast<char*>(address);
   for (size_t index = 0; index < kSize; ++index) {
@@ -92,7 +93,7 @@ TEST(ProcessMemoryMac, ReadSelfUnmapped) {
   kern_return_t kr =
       vm_allocate(mach_task_self(), &address, kSize, VM_FLAGS_ANYWHERE);
   ASSERT_EQ(kr, KERN_SUCCESS) << MachErrorMessage(kr, "vm_allocate");
-  base::mac::ScopedMachVM vm_owner(address, mach_vm_round_page(kSize));
+  base::apple::ScopedMachVM vm_owner(address, mach_vm_round_page(kSize));
 
   char* region = reinterpret_cast<char*>(address);
   for (size_t index = 0; index < kSize; ++index) {
@@ -154,7 +155,7 @@ TEST(ProcessMemoryMac, ReadCStringSelfUnmapped) {
   kern_return_t kr =
       vm_allocate(mach_task_self(), &address, kSize, VM_FLAGS_ANYWHERE);
   ASSERT_EQ(kr, KERN_SUCCESS) << MachErrorMessage(kr, "vm_allocate");
-  base::mac::ScopedMachVM vm_owner(address, mach_vm_round_page(kSize));
+  base::apple::ScopedMachVM vm_owner(address, mach_vm_round_page(kSize));
 
   char* region = reinterpret_cast<char*>(address);
   for (size_t index = 0; index < kSize; ++index) {
@@ -219,7 +220,7 @@ bool IsAddressMapped(vm_address_t address) {
     // |object| will be MACH_PORT_NULL (10.9.4 xnu-2422.110.17/osfmk/vm/vm_map.c
     // vm_map_region()), but the interface acts as if it might carry a send
     // right, so treat it as documented.
-    base::mac::ScopedMachSendRight object_owner(object);
+    base::apple::ScopedMachSendRight object_owner(object);
 
     return address >= region_address && address <= region_address + region_size;
   }
@@ -259,13 +260,12 @@ TEST(ProcessMemoryMac, MappedMemoryDeallocates) {
   // This is the same but with a big buffer that’s definitely larger than a
   // single page. This makes sure that the whole mapped region winds up being
   // deallocated.
-  const size_t kBigSize = 4 * PAGE_SIZE;
-  std::unique_ptr<char[]> big_buffer(new char[kBigSize]);
+  auto big_buffer = base::HeapArray<char>::Uninit(4 * PAGE_SIZE);
   test_address = FromPointerCast<mach_vm_address_t>(&big_buffer[0]);
-  ASSERT_TRUE((mapped = memory.ReadMapped(test_address, kBigSize)));
+  ASSERT_TRUE((mapped = memory.ReadMapped(test_address, big_buffer.size())));
 
   mapped_address = reinterpret_cast<vm_address_t>(mapped->data());
-  vm_address_t mapped_last_address = mapped_address + kBigSize - 1;
+  vm_address_t mapped_last_address = mapped_address + big_buffer.size() - 1;
   EXPECT_TRUE(IsAddressMapped(mapped_address));
   EXPECT_TRUE(IsAddressMapped(mapped_address + PAGE_SIZE));
   EXPECT_TRUE(IsAddressMapped(mapped_last_address));
diff --git a/extern/crashpad/crashpad/util/process/process_memory_native.h b/extern/crashpad/crashpad/util/process/process_memory_native.h
index 5a792d76e2..143a6c03e2 100644
--- a/extern/crashpad/crashpad/util/process/process_memory_native.h
+++ b/extern/crashpad/crashpad/util/process/process_memory_native.h
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,26 +14,26 @@
 
 #include "build/build_config.h"
 
-#if defined(OS_FUCHSIA)
+#if BUILDFLAG(IS_FUCHSIA)
 #include "util/process/process_memory_fuchsia.h"
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
 #include "util/process/process_memory_linux.h"
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 #include "util/process/process_memory_win.h"
-#elif defined(OS_APPLE)
+#elif BUILDFLAG(IS_APPLE)
 #include "util/process/process_memory_mac.h"
 #endif
 
 namespace crashpad {
 
-#if defined(OS_FUCHSIA) || DOXYGEN
+#if BUILDFLAG(IS_FUCHSIA) || DOXYGEN
 //! \brief Alias for platform-specific native implementation of ProcessMemory.
 using ProcessMemoryNative = ProcessMemoryFuchsia;
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
 using ProcessMemoryNative = ProcessMemoryLinux;
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 using ProcessMemoryNative = ProcessMemoryWin;
-#elif defined(OS_APPLE)
+#elif BUILDFLAG(IS_APPLE)
 using ProcessMemoryNative = ProcessMemoryMac;
 #else
 #error Port.
diff --git a/extern/crashpad/crashpad/util/process/process_memory_range.cc b/extern/crashpad/crashpad/util/process/process_memory_range.cc
index caa4315f3a..d56a6a4919 100644
--- a/extern/crashpad/crashpad/util/process/process_memory_range.cc
+++ b/extern/crashpad/crashpad/util/process/process_memory_range.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/process/process_memory_range.h b/extern/crashpad/crashpad/util/process/process_memory_range.h
index 21be765958..d28f8b7497 100644
--- a/extern/crashpad/crashpad/util/process/process_memory_range.h
+++ b/extern/crashpad/crashpad/util/process/process_memory_range.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/process/process_memory_range_test.cc b/extern/crashpad/crashpad/util/process/process_memory_range_test.cc
index 2e34665fec..5701e0952f 100644
--- a/extern/crashpad/crashpad/util/process/process_memory_range_test.cc
+++ b/extern/crashpad/crashpad/util/process/process_memory_range_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,16 +14,16 @@
 
 #include "util/process/process_memory_range.h"
 
+#include <iterator>
 #include <limits>
 
-#include "base/cxx17_backports.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"
 #include "test/process_type.h"
 #include "util/misc/from_pointer_cast.h"
 #include "util/process/process_memory_native.h"
 
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 #include "test/linux/fake_ptrace_connection.h"
 #endif
 
@@ -43,14 +43,15 @@ TEST(ProcessMemoryRange, Basic) {
   constexpr bool is_64_bit = false;
 #endif  // ARCH_CPU_64_BITS
 
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
   FakePtraceConnection connection;
   ASSERT_TRUE(connection.Initialize(GetSelfProcess()));
   ProcessMemoryLinux memory(&connection);
 #else
   ProcessMemoryNative memory;
   ASSERT_TRUE(memory.Initialize(GetSelfProcess()));
-#endif  // OS_ANDROID || OS_LINUX || OS_CHROMEOS
+#endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ||
+        // BUILDFLAG(IS_CHROMEOS)
 
   ProcessMemoryRange range;
   ASSERT_TRUE(range.Initialize(&memory, is_64_bit));
@@ -68,28 +69,28 @@ TEST(ProcessMemoryRange, Basic) {
   auto string1_addr = FromPointerCast<VMAddress>(kTestObject.string1);
   auto string2_addr = FromPointerCast<VMAddress>(kTestObject.string2);
   ASSERT_TRUE(range.ReadCStringSizeLimited(
-      string1_addr, base::size(kTestObject.string1), &string));
+      string1_addr, std::size(kTestObject.string1), &string));
   EXPECT_STREQ(string.c_str(), kTestObject.string1);
 
   ASSERT_TRUE(range.ReadCStringSizeLimited(
-      string2_addr, base::size(kTestObject.string2), &string));
+      string2_addr, std::size(kTestObject.string2), &string));
   EXPECT_STREQ(string.c_str(), kTestObject.string2);
 
   // Limit the range to remove access to string2.
   ProcessMemoryRange range2;
   ASSERT_TRUE(range2.Initialize(range));
   ASSERT_TRUE(
-      range2.RestrictRange(string1_addr, base::size(kTestObject.string1)));
+      range2.RestrictRange(string1_addr, std::size(kTestObject.string1)));
   EXPECT_TRUE(range2.ReadCStringSizeLimited(
-      string1_addr, base::size(kTestObject.string1), &string));
+      string1_addr, std::size(kTestObject.string1), &string));
   EXPECT_FALSE(range2.ReadCStringSizeLimited(
-      string2_addr, base::size(kTestObject.string2), &string));
+      string2_addr, std::size(kTestObject.string2), &string));
   EXPECT_FALSE(range2.Read(object_addr, sizeof(object), &object));
 
   // String reads fail if the NUL terminator is outside the range.
   ASSERT_TRUE(range2.RestrictRange(string1_addr, strlen(kTestObject.string1)));
   EXPECT_FALSE(range2.ReadCStringSizeLimited(
-      string1_addr, base::size(kTestObject.string1), &string));
+      string1_addr, std::size(kTestObject.string1), &string));
 
   // New range outside the old range.
   EXPECT_FALSE(range2.RestrictRange(string1_addr - 1, 1));
diff --git a/extern/crashpad/crashpad/util/process/process_memory_sanitized.cc b/extern/crashpad/crashpad/util/process/process_memory_sanitized.cc
index 4d7a6854d9..5c600bfb50 100644
--- a/extern/crashpad/crashpad/util/process/process_memory_sanitized.cc
+++ b/extern/crashpad/crashpad/util/process/process_memory_sanitized.cc
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/process/process_memory_sanitized.h b/extern/crashpad/crashpad/util/process/process_memory_sanitized.h
index a406e01488..c11a8df707 100644
--- a/extern/crashpad/crashpad/util/process/process_memory_sanitized.h
+++ b/extern/crashpad/crashpad/util/process/process_memory_sanitized.h
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/process/process_memory_sanitized_test.cc b/extern/crashpad/crashpad/util/process/process_memory_sanitized_test.cc
index b88eab132d..c73d902d4f 100644
--- a/extern/crashpad/crashpad/util/process/process_memory_sanitized_test.cc
+++ b/extern/crashpad/crashpad/util/process/process_memory_sanitized_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,12 +14,13 @@
 
 #include "util/process/process_memory_sanitized.h"
 
+#include "build/build_config.h"
 #include "gtest/gtest.h"
 #include "test/process_type.h"
 #include "util/misc/from_pointer_cast.h"
 #include "util/process/process_memory_native.h"
 
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 #include "test/linux/fake_ptrace_connection.h"
 #endif
 
@@ -28,14 +29,15 @@ namespace test {
 namespace {
 
 TEST(ProcessMemorySanitized, DenyDisallowedMemory) {
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
   FakePtraceConnection connection;
   ASSERT_TRUE(connection.Initialize(GetSelfProcess()));
   ProcessMemoryLinux memory(&connection);
 #else
   ProcessMemoryNative memory;
   ASSERT_TRUE(memory.Initialize(GetSelfProcess()));
-#endif  // OS_ANDROID || OS_LINUX || OS_CHROMEOS
+#endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ||
+        // BUILDFLAG(IS_CHROMEOS)
 
   char c = 42;
   char out;
@@ -51,14 +53,15 @@ TEST(ProcessMemorySanitized, DenyDisallowedMemory) {
 }
 
 TEST(ProcessMemorySanitized, AllowedMemory) {
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
   FakePtraceConnection connection;
   ASSERT_TRUE(connection.Initialize(GetSelfProcess()));
   ProcessMemoryLinux memory(&connection);
 #else
   ProcessMemoryNative memory;
   ASSERT_TRUE(memory.Initialize(GetSelfProcess()));
-#endif  // OS_ANDROID || OS_LINUX || OS_CHROMEOS
+#endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ||
+        // BUILDFLAG(IS_CHROMEOS)
 
   char str[4] = "ABC";
   char out[4];
diff --git a/extern/crashpad/crashpad/util/process/process_memory_test.cc b/extern/crashpad/crashpad/util/process/process_memory_test.cc
index fe9971bcc7..07b42535ee 100644
--- a/extern/crashpad/crashpad/util/process/process_memory_test.cc
+++ b/extern/crashpad/crashpad/util/process/process_memory_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,8 +16,7 @@
 
 #include <string.h>
 
-#include <memory>
-
+#include "base/containers/heap_array.h"
 #include "base/memory/page_size.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"
@@ -30,14 +29,15 @@
 #include "util/misc/from_pointer_cast.h"
 #include "util/process/process_memory_native.h"
 
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
 #include "test/mac/mach_multiprocess.h"
-#endif  // defined(OS_APPLE)
+#endif  // BUILDFLAG(IS_APPLE)
 
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 #include "test/linux/fake_ptrace_connection.h"
 #include "util/linux/direct_ptrace_connection.h"
-#endif  // OS_ANDROID || OS_LINUX || OS_CHROMEOS
+#endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ||
+        // BUILDFLAG(IS_CHROMEOS)
 
 namespace crashpad {
 namespace test {
@@ -47,7 +47,7 @@ namespace {
 // port which requires root or a code signing entitlement. To account for this
 // we implement an adaptor class that wraps MachMultiprocess on macOS, because
 // it shares the child's task port, and makes it behave like MultiprocessExec.
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
 class MultiprocessAdaptor : public MachMultiprocess {
  public:
   void SetChildTestMainFunction(const std::string& function_name) {
@@ -102,24 +102,22 @@ class MultiprocessAdaptor : public MultiprocessExec {
 
   void MultiprocessParent() override { Parent(); }
 };
-#endif  // defined(OS_APPLE)
-
-void DoChildReadTestSetup(size_t* region_size,
-                          std::unique_ptr<char[]>* region) {
-  *region_size = 4 * base::GetPageSize();
-  region->reset(new char[*region_size]);
-  for (size_t index = 0; index < *region_size; ++index) {
-    (*region)[index] = static_cast<char>(index % 256);
+#endif  // BUILDFLAG(IS_APPLE)
+
+base::HeapArray<char> DoChildReadTestSetup() {
+  auto region = base::HeapArray<char>::Uninit(4 * base::GetPageSize());
+  for (size_t index = 0; index < region.size(); ++index) {
+    region[index] = static_cast<char>(index % 256);
   }
+  return region;
 }
 
 CRASHPAD_CHILD_TEST_MAIN(ReadTestChild) {
-  size_t region_size;
-  std::unique_ptr<char[]> region;
-  DoChildReadTestSetup(&region_size, &region);
+  auto region = DoChildReadTestSetup();
+  auto region_size = region.size();
   FileHandle out = MultiprocessAdaptor::OutputHandle();
   CheckedWriteFile(out, &region_size, sizeof(region_size));
-  VMAddress address = FromPointerCast<VMAddress>(region.get());
+  VMAddress address = FromPointerCast<VMAddress>(region.data());
   CheckedWriteFile(out, &address, sizeof(address));
   CheckedReadFileAtEOF(MultiprocessAdaptor::InputHandle());
   return 0;
@@ -135,12 +133,10 @@ class ReadTest : public MultiprocessAdaptor {
   ReadTest& operator=(const ReadTest&) = delete;
 
   void RunAgainstSelf() {
-    size_t region_size;
-    std::unique_ptr<char[]> region;
-    DoChildReadTestSetup(&region_size, &region);
+    auto region = DoChildReadTestSetup();
     DoTest(GetSelfProcess(),
-           region_size,
-           FromPointerCast<VMAddress>(region.get()));
+           region.size(),
+           FromPointerCast<VMAddress>(region.data()));
   }
 
   void RunAgainstChild() { Run(); }
@@ -156,59 +152,60 @@ class ReadTest : public MultiprocessAdaptor {
   }
 
   void DoTest(ProcessType process, size_t region_size, VMAddress address) {
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
     FakePtraceConnection connection;
     ASSERT_TRUE(connection.Initialize(process));
     ProcessMemoryLinux memory(&connection);
 #else
     ProcessMemoryNative memory;
     ASSERT_TRUE(memory.Initialize(process));
-#endif  // OS_ANDROID || OS_LINUX || OS_CHROMEOS
+#endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ||
+        // BUILDFLAG(IS_CHROMEOS)
 
-    std::unique_ptr<char[]> result(new char[region_size]);
+    auto result = base::HeapArray<char>::Uninit(region_size);
 
     // Ensure that the entire region can be read.
-    ASSERT_TRUE(memory.Read(address, region_size, result.get()));
-    for (size_t i = 0; i < region_size; ++i) {
+    ASSERT_TRUE(memory.Read(address, result.size(), result.data()));
+    for (size_t i = 0; i < result.size(); ++i) {
       EXPECT_EQ(result[i], static_cast<char>(i % 256));
     }
 
     // Ensure that a read of length 0 succeeds and doesn’t touch the result.
-    memset(result.get(), '\0', region_size);
-    ASSERT_TRUE(memory.Read(address, 0, result.get()));
-    for (size_t i = 0; i < region_size; ++i) {
+    memset(result.data(), '\0', result.size());
+    ASSERT_TRUE(memory.Read(address, 0, result.data()));
+    for (size_t i = 0; i < result.size(); ++i) {
       EXPECT_EQ(result[i], 0);
     }
 
     // Ensure that a read starting at an unaligned address works.
-    ASSERT_TRUE(memory.Read(address + 1, region_size - 1, result.get()));
-    for (size_t i = 0; i < region_size - 1; ++i) {
+    ASSERT_TRUE(memory.Read(address + 1, result.size() - 1, result.data()));
+    for (size_t i = 0; i < result.size() - 1; ++i) {
       EXPECT_EQ(result[i], static_cast<char>((i + 1) % 256));
     }
 
     // Ensure that a read ending at an unaligned address works.
-    ASSERT_TRUE(memory.Read(address, region_size - 1, result.get()));
-    for (size_t i = 0; i < region_size - 1; ++i) {
+    ASSERT_TRUE(memory.Read(address, result.size() - 1, result.data()));
+    for (size_t i = 0; i < result.size() - 1; ++i) {
       EXPECT_EQ(result[i], static_cast<char>(i % 256));
     }
 
     // Ensure that a read starting and ending at unaligned addresses works.
-    ASSERT_TRUE(memory.Read(address + 1, region_size - 2, result.get()));
-    for (size_t i = 0; i < region_size - 2; ++i) {
+    ASSERT_TRUE(memory.Read(address + 1, result.size() - 2, result.data()));
+    for (size_t i = 0; i < result.size() - 2; ++i) {
       EXPECT_EQ(result[i], static_cast<char>((i + 1) % 256));
     }
 
     // Ensure that a read of exactly one page works.
     size_t page_size = base::GetPageSize();
-    ASSERT_GE(region_size, page_size + page_size);
-    ASSERT_TRUE(memory.Read(address + page_size, page_size, result.get()));
+    ASSERT_GE(result.size(), page_size + page_size);
+    ASSERT_TRUE(memory.Read(address + page_size, page_size, result.data()));
     for (size_t i = 0; i < page_size; ++i) {
       EXPECT_EQ(result[i], static_cast<char>((i + page_size) % 256));
     }
 
     // Ensure that reading exactly a single byte works.
     result[1] = 'J';
-    ASSERT_TRUE(memory.Read(address + 2, 1, result.get()));
+    ASSERT_TRUE(memory.Read(address + 2, 1, result.data()));
     EXPECT_EQ(result[0], 2);
     EXPECT_EQ(result[1], 'J');
   }
@@ -343,14 +340,15 @@ class ReadCStringTest : public MultiprocessAdaptor {
               VMAddress local_empty_address,
               VMAddress local_short_address,
               VMAddress long_string_address) {
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
     FakePtraceConnection connection;
     ASSERT_TRUE(connection.Initialize(process));
     ProcessMemoryLinux memory(&connection);
 #else
     ProcessMemoryNative memory;
     ASSERT_TRUE(memory.Initialize(process));
-#endif  // OS_ANDROID || OS_LINUX || OS_CHROMEOS
+#endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ||
+        // BUILDFLAG(IS_CHROMEOS)
 
     Compare(memory, const_empty_address, kConstCharEmpty);
     Compare(memory, const_short_address, kConstCharShort);
@@ -421,26 +419,26 @@ class ReadUnmappedTest : public MultiprocessAdaptor {
   }
 
   void DoTest(ProcessType process, VMAddress address) {
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
     DirectPtraceConnection connection;
     ASSERT_TRUE(connection.Initialize(process));
     ProcessMemoryLinux memory(&connection);
 #else
     ProcessMemoryNative memory;
     ASSERT_TRUE(memory.Initialize(process));
-#endif  // OS_ANDROID || OS_LINUX || OS_CHROMEOS
+#endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ||
+        // BUILDFLAG(IS_CHROMEOS)
 
     VMAddress page_addr1 = address;
     VMAddress page_addr2 = page_addr1 + base::GetPageSize();
 
-    std::unique_ptr<char[]> result(new char[base::GetPageSize() * 2]);
-    EXPECT_TRUE(memory.Read(page_addr1, base::GetPageSize(), result.get()));
-    EXPECT_TRUE(memory.Read(page_addr2 - 1, 1, result.get()));
+    auto result = base::HeapArray<char>::Uninit(base::GetPageSize() * 2);
+    EXPECT_TRUE(memory.Read(page_addr1, base::GetPageSize(), result.data()));
+    EXPECT_TRUE(memory.Read(page_addr2 - 1, 1, result.data()));
 
-    EXPECT_FALSE(
-        memory.Read(page_addr1, base::GetPageSize() * 2, result.get()));
-    EXPECT_FALSE(memory.Read(page_addr2, base::GetPageSize(), result.get()));
-    EXPECT_FALSE(memory.Read(page_addr2 - 1, 2, result.get()));
+    EXPECT_FALSE(memory.Read(page_addr1, result.size(), result.data()));
+    EXPECT_FALSE(memory.Read(page_addr2, base::GetPageSize(), result.data()));
+    EXPECT_FALSE(memory.Read(page_addr2 - 1, 2, result.data()));
   }
 };
 
@@ -554,14 +552,15 @@ class ReadCStringUnmappedTest : public MultiprocessAdaptor {
 
   void DoTest(ProcessType process,
               const std::vector<StringDataInChildProcess>& strings) {
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
     DirectPtraceConnection connection;
     ASSERT_TRUE(connection.Initialize(process));
     ProcessMemoryLinux memory(&connection);
 #else
     ProcessMemoryNative memory;
     ASSERT_TRUE(memory.Initialize(process));
-#endif  // OS_ANDROID || OS_LINUX || OS_CHROMEOS
+#endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ||
+        // BUILDFLAG(IS_CHROMEOS)
 
     std::string result;
     result.reserve(kChildProcessStringLength + 1);
diff --git a/extern/crashpad/crashpad/util/process/process_memory_win.cc b/extern/crashpad/crashpad/util/process/process_memory_win.cc
index adf8972c13..c120827ad7 100644
--- a/extern/crashpad/crashpad/util/process/process_memory_win.cc
+++ b/extern/crashpad/crashpad/util/process/process_memory_win.cc
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 #include <algorithm>
 #include <limits>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/memory/page_size.h"
 #include "base/numerics/safe_conversions.h"
diff --git a/extern/crashpad/crashpad/util/process/process_memory_win.h b/extern/crashpad/crashpad/util/process/process_memory_win.h
index 919946e56e..aad3c80311 100644
--- a/extern/crashpad/crashpad/util/process/process_memory_win.h
+++ b/extern/crashpad/crashpad/util/process/process_memory_win.h
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/stdlib/aligned_allocator.cc b/extern/crashpad/crashpad/util/stdlib/aligned_allocator.cc
index 797a3ac4f8..d30c8b3100 100644
--- a/extern/crashpad/crashpad/util/stdlib/aligned_allocator.cc
+++ b/extern/crashpad/crashpad/util/stdlib/aligned_allocator.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,12 +18,12 @@
 
 #include "build/build_config.h"
 
-#if defined(OS_POSIX) || defined(_LIBCPP_STD_VER)
+#if BUILDFLAG(IS_POSIX) || defined(_LIBCPP_STD_VER)
 #include <stdlib.h>
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 #include <malloc.h>
 #include <xutility>
-#endif  // OS_POSIX
+#endif  // BUILDFLAG(IS_POSIX)
 
 namespace {
 
@@ -31,12 +31,12 @@ namespace {
 // library to do so. This works even if C++ exceptions are disabled, causing
 // program termination if uncaught.
 void ThrowBadAlloc() {
-#if defined(OS_POSIX) || defined(_LIBCPP_STD_VER)
+#if BUILDFLAG(IS_POSIX) || defined(_LIBCPP_STD_VER)
   // This works with both libc++ and libstdc++.
   std::__throw_bad_alloc();
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   std::_Xbad_alloc();
-#endif  // OS_POSIX
+#endif  // BUILDFLAG(IS_POSIX)
 }
 
 }  // namespace
@@ -44,7 +44,7 @@ void ThrowBadAlloc() {
 namespace crashpad {
 
 void* AlignedAllocate(size_t alignment, size_t size) {
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
   // posix_memalign() requires that alignment be at least sizeof(void*), so the
   // power-of-2 check needs to happen before potentially changing the alignment.
   if (alignment == 0 || alignment & (alignment - 1)) {
@@ -55,22 +55,22 @@ void* AlignedAllocate(size_t alignment, size_t size) {
   if (posix_memalign(&pointer, std::max(alignment, sizeof(void*)), size) != 0) {
     ThrowBadAlloc();
   }
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   void* pointer = _aligned_malloc(size, alignment);
   if (pointer == nullptr) {
     ThrowBadAlloc();
   }
-#endif  // OS_POSIX
+#endif  // BUILDFLAG(IS_POSIX)
 
   return pointer;
 }
 
 void AlignedFree(void* pointer) {
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
   free(pointer);
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   _aligned_free(pointer);
-#endif  // OS_POSIX
+#endif  // BUILDFLAG(IS_POSIX)
 }
 
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/util/stdlib/aligned_allocator.h b/extern/crashpad/crashpad/util/stdlib/aligned_allocator.h
index 4e64744e69..d8f0e6b2c0 100644
--- a/extern/crashpad/crashpad/util/stdlib/aligned_allocator.h
+++ b/extern/crashpad/crashpad/util/stdlib/aligned_allocator.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/stdlib/aligned_allocator_test.cc b/extern/crashpad/crashpad/util/stdlib/aligned_allocator_test.cc
index 1c16dcc5e0..1c887bbae7 100644
--- a/extern/crashpad/crashpad/util/stdlib/aligned_allocator_test.cc
+++ b/extern/crashpad/crashpad/util/stdlib/aligned_allocator_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,11 +16,11 @@
 
 #include <stdint.h>
 
-#include "base/compiler_specific.h"
+#include "build/build_config.h"
 #include "gtest/gtest.h"
 #include "test/gtest_death.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include <crtdbg.h>
 #endif
 
@@ -91,21 +91,19 @@ TEST(AlignedAllocator, AlignedVector) {
 }
 
 void BadAlignmentTest() {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   // Suppress the assertion MessageBox() normally displayed by the CRT in debug
-  // mode.
-  int previous = _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG);
-
-  // In release mode, _CrtSetReportMode() is #defined to ((int)0), so |previous|
-  // would appear unused.
-  ALLOW_UNUSED_LOCAL(previous);
+  // mode. In release mode, _CrtSetReportMode() is #defined to ((int)0), so
+  // |previous| would appear unused, thus the [[maybe_unused]].
+  [[maybe_unused]] int previous =
+      _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG);
 #endif
 
   // Alignment constraints must be powers of 2. 7 is not valid.
   AlignedVector<int, 7> bad_aligned_vector;
   bad_aligned_vector.push_back(0);
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   _CrtSetReportMode(_CRT_ASSERT, previous);
 #endif
 }
diff --git a/extern/crashpad/crashpad/util/stdlib/map_insert.h b/extern/crashpad/crashpad/util/stdlib/map_insert.h
index d2c3b84211..768d13f523 100644
--- a/extern/crashpad/crashpad/util/stdlib/map_insert.h
+++ b/extern/crashpad/crashpad/util/stdlib/map_insert.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/stdlib/map_insert_test.cc b/extern/crashpad/crashpad/util/stdlib/map_insert_test.cc
index 9dab8437d2..fa7ad8f364 100644
--- a/extern/crashpad/crashpad/util/stdlib/map_insert_test.cc
+++ b/extern/crashpad/crashpad/util/stdlib/map_insert_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/stdlib/objc.h b/extern/crashpad/crashpad/util/stdlib/objc.h
index b5e5b6c68c..f91d3f95e0 100644
--- a/extern/crashpad/crashpad/util/stdlib/objc.h
+++ b/extern/crashpad/crashpad/util/stdlib/objc.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/stdlib/string_number_conversion.cc b/extern/crashpad/crashpad/util/stdlib/string_number_conversion.cc
index 4254169aa9..1be5468766 100644
--- a/extern/crashpad/crashpad/util/stdlib/string_number_conversion.cc
+++ b/extern/crashpad/crashpad/util/stdlib/string_number_conversion.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 
 #include "util/stdlib/string_number_conversion.h"
 
-#include <ctype.h>
 #include <errno.h>
 #include <inttypes.h>
 #include <stdlib.h>
@@ -22,6 +21,7 @@
 
 #include <limits>
 
+#include "base/strings/string_util.h"
 
 namespace {
 
@@ -141,7 +141,7 @@ bool StringToIntegerInternal(const std::string& string,
 
   Traits::TypeCheck();
 
-  if (string.empty() || isspace(string[0])) {
+  if (string.empty() || base::IsAsciiWhitespace(string[0])) {
     return false;
   }
 
diff --git a/extern/crashpad/crashpad/util/stdlib/string_number_conversion.h b/extern/crashpad/crashpad/util/stdlib/string_number_conversion.h
index 69e7fdd656..bbfebf2dfc 100644
--- a/extern/crashpad/crashpad/util/stdlib/string_number_conversion.h
+++ b/extern/crashpad/crashpad/util/stdlib/string_number_conversion.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/stdlib/string_number_conversion_test.cc b/extern/crashpad/crashpad/util/stdlib/string_number_conversion_test.cc
index 90b67757f4..b988fb5383 100644
--- a/extern/crashpad/crashpad/util/stdlib/string_number_conversion_test.cc
+++ b/extern/crashpad/crashpad/util/stdlib/string_number_conversion_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,10 +17,10 @@
 #include <sys/types.h>
 
 #include <array>
+#include <iterator>
 #include <limits>
 #include <type_traits>
 
-#include "base/cxx17_backports.h"
 #include "gtest/gtest.h"
 
 #define STRINGIFY(a) STR(a)
@@ -277,7 +277,7 @@ TEST(StringNumberConversion, StringToInt) {
   //   "decimal digit terminates octal escape sequence".
   int output;
   std::string kEmbeddedNullInput(kEmbeddedNullInputRaw,
-                                 base::size(kEmbeddedNullInputRaw) - 1);
+                                 std::size(kEmbeddedNullInputRaw) - 1);
   EXPECT_FALSE(StringToNumber(kEmbeddedNullInput, &output));
 }
 
@@ -307,7 +307,7 @@ TEST(StringNumberConversion, StringToUnsignedInt) {
   //   "decimal digit terminates octal escape sequence".
   unsigned int output;
   std::string kEmbeddedNullInput(kEmbeddedNullInputRaw,
-                                 base::size(kEmbeddedNullInputRaw) - 1);
+                                 std::size(kEmbeddedNullInputRaw) - 1);
   EXPECT_FALSE(StringToNumber(kEmbeddedNullInput, &output));
 }
 
diff --git a/extern/crashpad/crashpad/util/stdlib/strlcpy.cc b/extern/crashpad/crashpad/util/stdlib/strlcpy.cc
index 1c87284883..3f3698c86e 100644
--- a/extern/crashpad/crashpad/util/stdlib/strlcpy.cc
+++ b/extern/crashpad/crashpad/util/stdlib/strlcpy.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/stdlib/strlcpy.h b/extern/crashpad/crashpad/util/stdlib/strlcpy.h
index d5d5805ead..9f60b45916 100644
--- a/extern/crashpad/crashpad/util/stdlib/strlcpy.h
+++ b/extern/crashpad/crashpad/util/stdlib/strlcpy.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 #define CRASHPAD_UTIL_STDLIB_STRLCPY_H_
 
 #include <sys/types.h>
+#include <uchar.h>
 
 namespace crashpad {
 
diff --git a/extern/crashpad/crashpad/util/stdlib/strlcpy_test.cc b/extern/crashpad/crashpad/util/stdlib/strlcpy_test.cc
index b729c24247..1365b704a4 100644
--- a/extern/crashpad/crashpad/util/stdlib/strlcpy_test.cc
+++ b/extern/crashpad/crashpad/util/stdlib/strlcpy_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,9 +18,9 @@
 #include <wchar.h>
 
 #include <algorithm>
+#include <iterator>
 #include <string>
 
-#include "base/cxx17_backports.h"
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
@@ -53,7 +53,7 @@ TEST(strlcpy, c16lcpy) {
   static constexpr char16_t test_characters[] = {
       0x4d, 0xe9, 0x100, 0x151, 0x1e18};
 
-  for (size_t index = 0; index < base::size(test_characters); ++index) {
+  for (size_t index = 0; index < std::size(test_characters); ++index) {
     char16_t test_character = test_characters[index];
     SCOPED_TRACE(base::StringPrintf(
         "character index %" PRIuS ", character 0x%x", index, test_character));
@@ -67,13 +67,13 @@ TEST(strlcpy, c16lcpy) {
 
       EXPECT_EQ(c16lcpy(destination.data,
                         test_string.c_str(),
-                        base::size(destination.data)),
+                        std::size(destination.data)),
                 length);
 
       // Make sure that the destination buffer is NUL-terminated, and that as
       // much of the test string was copied as could fit.
       size_t expected_destination_length =
-          std::min(length, base::size(destination.data) - 1);
+          std::min(length, std::size(destination.data) - 1);
 
       EXPECT_EQ(destination.data[expected_destination_length], '\0');
       EXPECT_EQ(C16Len(destination.data), expected_destination_length);
@@ -86,15 +86,15 @@ TEST(strlcpy, c16lcpy) {
       // of the buffer passed to c16lcpy.
       EXPECT_TRUE(C16Memcmp(expected_untouched.lead_guard,
                             destination.lead_guard,
-                            base::size(destination.lead_guard)) == 0);
+                            std::size(destination.lead_guard)) == 0);
       size_t expected_untouched_length =
-          base::size(destination.data) - expected_destination_length - 1;
+          std::size(destination.data) - expected_destination_length - 1;
       EXPECT_TRUE(C16Memcmp(expected_untouched.data,
                             &destination.data[expected_destination_length + 1],
                             expected_untouched_length) == 0);
       EXPECT_TRUE(C16Memcmp(expected_untouched.trail_guard,
                             destination.trail_guard,
-                            base::size(destination.trail_guard)) == 0);
+                            std::size(destination.trail_guard)) == 0);
     }
   }
 }
diff --git a/extern/crashpad/crashpad/util/stdlib/strnlen.cc b/extern/crashpad/crashpad/util/stdlib/strnlen.cc
index 872c0eb472..96ce7273b1 100644
--- a/extern/crashpad/crashpad/util/stdlib/strnlen.cc
+++ b/extern/crashpad/crashpad/util/stdlib/strnlen.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,9 @@
 
 #include "util/stdlib/strnlen.h"
 
-#if defined(OS_MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_7
+#include "build/build_config.h"
+
+#if BUILDFLAG(IS_MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_7
 
 #if __MAC_OS_X_VERSION_MAX_ALLOWED >= __MAC_10_7
 // Redeclare a method only available on Mac OS X 10.7 and later to suppress a
diff --git a/extern/crashpad/crashpad/util/stdlib/strnlen.h b/extern/crashpad/crashpad/util/stdlib/strnlen.h
index 59253b7517..f0ca4b8819 100644
--- a/extern/crashpad/crashpad/util/stdlib/strnlen.h
+++ b/extern/crashpad/crashpad/util/stdlib/strnlen.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 
 #include "build/build_config.h"
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 #include <Availability.h>
 #endif
 
@@ -38,7 +38,7 @@ namespace crashpad {
 //!     and not all systems’ standard libraries provide an implementation.
 size_t strnlen(const char* string, size_t max_length);
 
-#if !defined(OS_MAC) || __MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_7
+#if !BUILDFLAG(IS_MAC) || __MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_7
 inline size_t strnlen(const char* string, size_t max_length) {
   return ::strnlen(string, max_length);
 }
diff --git a/extern/crashpad/crashpad/util/stdlib/strnlen_test.cc b/extern/crashpad/crashpad/util/stdlib/strnlen_test.cc
index 1913e2086f..fb2117f5c6 100644
--- a/extern/crashpad/crashpad/util/stdlib/strnlen_test.cc
+++ b/extern/crashpad/crashpad/util/stdlib/strnlen_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/stdlib/thread_safe_vector.h b/extern/crashpad/crashpad/util/stdlib/thread_safe_vector.h
index 64a4bd2cf1..e99ba5200b 100644
--- a/extern/crashpad/crashpad/util/stdlib/thread_safe_vector.h
+++ b/extern/crashpad/crashpad/util/stdlib/thread_safe_vector.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/stdlib/thread_safe_vector_test.cc b/extern/crashpad/crashpad/util/stdlib/thread_safe_vector_test.cc
index 8962430411..956cd660c2 100644
--- a/extern/crashpad/crashpad/util/stdlib/thread_safe_vector_test.cc
+++ b/extern/crashpad/crashpad/util/stdlib/thread_safe_vector_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,8 @@
 
 #include "util/stdlib/thread_safe_vector.h"
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+
 #include "gtest/gtest.h"
 #include "util/thread/thread.h"
 
@@ -57,12 +58,12 @@ TEST(ThreadSafeVector, ThreadSafeVector) {
   EXPECT_TRUE(vector.empty());
 
   ThreadSafeVectorTestThread threads[100];
-  for (size_t index = 0; index < base::size(threads); ++index) {
+  for (size_t index = 0; index < std::size(threads); ++index) {
     threads[index].SetTestParameters(
         &thread_safe_vector, static_cast<int>(index * kElementsPerThread));
   }
 
-  for (size_t index = 0; index < base::size(threads); ++index) {
+  for (size_t index = 0; index < std::size(threads); ++index) {
     threads[index].Start();
 
     if (index % 10 == 0) {
@@ -79,8 +80,8 @@ TEST(ThreadSafeVector, ThreadSafeVector) {
 
   std::vector<int> drained = thread_safe_vector.Drain();
   vector.insert(vector.end(), drained.begin(), drained.end());
-  bool found[base::size(threads) * kElementsPerThread] = {};
-  EXPECT_EQ(vector.size(), base::size(found));
+  bool found[std::size(threads) * kElementsPerThread] = {};
+  EXPECT_EQ(vector.size(), std::size(found));
   for (int element : vector) {
     EXPECT_FALSE(found[element]) << element;
     found[element] = true;
diff --git a/extern/crashpad/crashpad/util/stream/base94_output_stream.cc b/extern/crashpad/crashpad/util/stream/base94_output_stream.cc
index 7513578c91..b3464fa89e 100644
--- a/extern/crashpad/crashpad/util/stream/base94_output_stream.cc
+++ b/extern/crashpad/crashpad/util/stream/base94_output_stream.cc
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/stream/base94_output_stream.h b/extern/crashpad/crashpad/util/stream/base94_output_stream.h
index 2f26d1cdf7..4fc9fc8a94 100644
--- a/extern/crashpad/crashpad/util/stream/base94_output_stream.h
+++ b/extern/crashpad/crashpad/util/stream/base94_output_stream.h
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/stream/base94_output_stream_test.cc b/extern/crashpad/crashpad/util/stream/base94_output_stream_test.cc
index d0a2985576..09f6b00956 100644
--- a/extern/crashpad/crashpad/util/stream/base94_output_stream_test.cc
+++ b/extern/crashpad/crashpad/util/stream/base94_output_stream_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,9 +17,10 @@
 #include <string.h>
 
 #include <algorithm>
+#include <iterator>
 #include <sstream>
 
-#include "base/cxx17_backports.h"
+#include "base/containers/heap_array.h"
 #include "base/rand_util.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
@@ -71,17 +72,16 @@ class Base94OutputStreamTest : public testing::Test {
   }
 
   const uint8_t* BuildDeterministicInput(size_t size) {
-    deterministic_input_ = std::make_unique<uint8_t[]>(size);
-    uint8_t* deterministic_input_base = deterministic_input_.get();
+    deterministic_input_ = base::HeapArray<uint8_t>::WithSize(size);
     while (size-- > 0)
-      deterministic_input_base[size] = static_cast<uint8_t>(size);
-    return deterministic_input_base;
+      deterministic_input_[size] = static_cast<uint8_t>(size);
+    return deterministic_input_.data();
   }
 
   const uint8_t* BuildRandomInput(size_t size) {
-    input_ = std::make_unique<uint8_t[]>(size);
-    base::RandBytes(&input_[0], size);
-    return input_.get();
+    input_ = base::HeapArray<uint8_t>::Uninit(size);
+    base::RandBytes(input_);
+    return input_.data();
   }
 
   Base94OutputStream* round_trip() const { return round_trip_.get(); }
@@ -127,8 +127,8 @@ class Base94OutputStreamTest : public testing::Test {
   TestOutputStream* encode_test_output_stream_;
   TestOutputStream* decode_test_output_stream_;
   TestOutputStream* round_trip_test_output_stream_;
-  std::unique_ptr<uint8_t[]> input_;
-  std::unique_ptr<uint8_t[]> deterministic_input_;
+  base::HeapArray<uint8_t> input_;
+  base::HeapArray<uint8_t> deterministic_input_;
 };
 
 TEST_F(Base94OutputStreamTest, Encoding) {
@@ -237,7 +237,7 @@ TEST_F(Base94OutputStreamTest, WriteDeterministicLongDataMultipleTimes) {
       4, 96, 40, kLongDataLength - 4 - 96 - 40};
 
   size_t offset = 0;
-  for (size_t index = 0; index < base::size(kWriteLengths); ++index) {
+  for (size_t index = 0; index < std::size(kWriteLengths); ++index) {
     const size_t write_length = kWriteLengths[index];
     SCOPED_TRACE(base::StringPrintf(
         "offset %zu, write_length %zu", offset, write_length));
diff --git a/extern/crashpad/crashpad/util/stream/file_encoder.cc b/extern/crashpad/crashpad/util/stream/file_encoder.cc
index e375cef7f8..a11c0cef3a 100644
--- a/extern/crashpad/crashpad/util/stream/file_encoder.cc
+++ b/extern/crashpad/crashpad/util/stream/file_encoder.cc
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
 #include "util/stream/file_encoder.h"
 
 #include <memory>
+#include <tuple>
 
-#include "base/macros.h"
 #include "util/file/file_io.h"
 #include "util/file/file_reader.h"
 #include "util/file/scoped_remove_file.h"
@@ -77,7 +77,7 @@ bool FileEncoder::Process() {
   if (!output->Flush())
     return false;
 
-  ignore_result(file_remover.release());
+  std::ignore = file_remover.release();
   return true;
 }
 
diff --git a/extern/crashpad/crashpad/util/stream/file_encoder.h b/extern/crashpad/crashpad/util/stream/file_encoder.h
index 72ea307713..3cff5c075b 100644
--- a/extern/crashpad/crashpad/util/stream/file_encoder.h
+++ b/extern/crashpad/crashpad/util/stream/file_encoder.h
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/stream/file_encoder_test.cc b/extern/crashpad/crashpad/util/stream/file_encoder_test.cc
index 23d78dd699..e916e1c453 100644
--- a/extern/crashpad/crashpad/util/stream/file_encoder_test.cc
+++ b/extern/crashpad/crashpad/util/stream/file_encoder_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/stream/file_output_stream.cc b/extern/crashpad/crashpad/util/stream/file_output_stream.cc
index 022d91fe47..a3633f9dec 100644
--- a/extern/crashpad/crashpad/util/stream/file_output_stream.cc
+++ b/extern/crashpad/crashpad/util/stream/file_output_stream.cc
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,6 +14,7 @@
 
 #include "util/stream/file_output_stream.h"
 
+#include "base/check.h"
 #include "base/logging.h"
 
 namespace crashpad {
diff --git a/extern/crashpad/crashpad/util/stream/file_output_stream.h b/extern/crashpad/crashpad/util/stream/file_output_stream.h
index d7fc017fc5..e6ded20db9 100644
--- a/extern/crashpad/crashpad/util/stream/file_output_stream.h
+++ b/extern/crashpad/crashpad/util/stream/file_output_stream.h
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/stream/log_output_stream.cc b/extern/crashpad/crashpad/util/stream/log_output_stream.cc
index 7b51dc2b5d..f633d86806 100644
--- a/extern/crashpad/crashpad/util/stream/log_output_stream.cc
+++ b/extern/crashpad/crashpad/util/stream/log_output_stream.cc
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@ bool LogOutputStream::Write(const uint8_t* data, size_t size) {
   DCHECK(!flushed_);
 
   static constexpr char kBeginMessage[] = "-----BEGIN CRASHPAD MINIDUMP-----";
-  if (output_count_ == 0 && WriteToLog(kBeginMessage) < 0) {
+  if (output_count_ == 0 && !WriteToLog(kBeginMessage)) {
     return false;
   }
 
@@ -69,11 +69,7 @@ bool LogOutputStream::WriteBuffer() {
     return false;
   }
 
-  int result = WriteToLog(buffer_.c_str());
-  if (result < 0) {
-    if (result == -EAGAIN) {
-      WriteToLog(kAbortMessage);
-    }
+  if (!WriteToLog(buffer_.c_str())) {
     flush_needed_ = false;
     return false;
   }
@@ -93,7 +89,7 @@ bool LogOutputStream::Flush() {
     flushed_ = true;
 
     static constexpr char kEndMessage[] = "-----END CRASHPAD MINIDUMP-----";
-    if (!WriteBuffer() || WriteToLog(kEndMessage) < 0) {
+    if (!WriteBuffer() || !WriteToLog(kEndMessage)) {
       result = false;
     }
   }
diff --git a/extern/crashpad/crashpad/util/stream/log_output_stream.h b/extern/crashpad/crashpad/util/stream/log_output_stream.h
index a90a1565f7..c12b69ba5c 100644
--- a/extern/crashpad/crashpad/util/stream/log_output_stream.h
+++ b/extern/crashpad/crashpad/util/stream/log_output_stream.h
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -38,8 +38,8 @@ class LogOutputStream : public OutputStreamInterface {
     //!
     //! \param buf the buffer to write to the log. More bytes than are in |buf|
     //!     may be written, e.g. to convey metadata.
-    //! \return the number of bytes written, or a negative error code.
-    virtual int Log(const char* buf) = 0;
+    //! \return `true` if the |buf| was successfully written.
+    virtual bool Log(const char* buf) = 0;
 
     //! \brief Returns the maximum number of bytes to allow writing to this log.
     virtual size_t OutputCap() = 0;
diff --git a/extern/crashpad/crashpad/util/stream/log_output_stream_test.cc b/extern/crashpad/crashpad/util/stream/log_output_stream_test.cc
index 7c625134e3..2a835e80c6 100644
--- a/extern/crashpad/crashpad/util/stream/log_output_stream_test.cc
+++ b/extern/crashpad/crashpad/util/stream/log_output_stream_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -36,11 +36,11 @@ class LogOutputStreamTestDelegate final : public LogOutputStream::Delegate {
       : logging_destination_(logging_destination) {}
   ~LogOutputStreamTestDelegate() override = default;
 
-  int Log(const char* buf) override {
+  bool Log(const char* buf) override {
     size_t len = strnlen(buf, kLineBufferSize + 1);
     EXPECT_LE(len, kLineBufferSize);
     logging_destination_->append(buf, len);
-    return static_cast<int>(len);
+    return true;
   }
 
   size_t OutputCap() override { return kOutputCap; }
diff --git a/extern/crashpad/crashpad/util/stream/output_stream_interface.h b/extern/crashpad/crashpad/util/stream/output_stream_interface.h
index 397860ef10..83748be295 100644
--- a/extern/crashpad/crashpad/util/stream/output_stream_interface.h
+++ b/extern/crashpad/crashpad/util/stream/output_stream_interface.h
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/stream/test_output_stream.cc b/extern/crashpad/crashpad/util/stream/test_output_stream.cc
index b17825cbce..02a1bb8c1e 100644
--- a/extern/crashpad/crashpad/util/stream/test_output_stream.cc
+++ b/extern/crashpad/crashpad/util/stream/test_output_stream.cc
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/stream/test_output_stream.h b/extern/crashpad/crashpad/util/stream/test_output_stream.h
index e8f9cf9d35..b21492df20 100644
--- a/extern/crashpad/crashpad/util/stream/test_output_stream.h
+++ b/extern/crashpad/crashpad/util/stream/test_output_stream.h
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/stream/zlib_output_stream.cc b/extern/crashpad/crashpad/util/stream/zlib_output_stream.cc
index 3ae7d91296..a38f42bbae 100644
--- a/extern/crashpad/crashpad/util/stream/zlib_output_stream.cc
+++ b/extern/crashpad/crashpad/util/stream/zlib_output_stream.cc
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,8 +14,9 @@
 
 #include "util/stream/zlib_output_stream.h"
 
+#include <iterator>
+
 #include "base/check.h"
-#include "base/cxx17_backports.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "util/misc/zlib.h"
@@ -65,7 +66,7 @@ bool ZlibOutputStream::Write(const uint8_t* data, size_t size) {
       }
     }
     zlib_stream_.next_out = buffer_;
-    zlib_stream_.avail_out = base::saturated_cast<uInt>(base::size(buffer_));
+    zlib_stream_.avail_out = base::saturated_cast<uInt>(std::size(buffer_));
     initialized_.set_valid();
   }
 
@@ -127,12 +128,12 @@ bool ZlibOutputStream::Flush() {
 }
 
 bool ZlibOutputStream::WriteOutputStream() {
-  auto valid_size = base::size(buffer_) - zlib_stream_.avail_out;
+  auto valid_size = std::size(buffer_) - zlib_stream_.avail_out;
   if (valid_size > 0 && !output_stream_->Write(buffer_, valid_size))
     return false;
 
   zlib_stream_.next_out = buffer_;
-  zlib_stream_.avail_out = base::saturated_cast<uInt>(base::size(buffer_));
+  zlib_stream_.avail_out = base::saturated_cast<uInt>(std::size(buffer_));
 
   return true;
 }
diff --git a/extern/crashpad/crashpad/util/stream/zlib_output_stream.h b/extern/crashpad/crashpad/util/stream/zlib_output_stream.h
index 62253ee939..301ba9b85e 100644
--- a/extern/crashpad/crashpad/util/stream/zlib_output_stream.h
+++ b/extern/crashpad/crashpad/util/stream/zlib_output_stream.h
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/stream/zlib_output_stream_test.cc b/extern/crashpad/crashpad/util/stream/zlib_output_stream_test.cc
index 306a61b1e5..25de62ad6d 100644
--- a/extern/crashpad/crashpad/util/stream/zlib_output_stream_test.cc
+++ b/extern/crashpad/crashpad/util/stream/zlib_output_stream_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,8 +17,9 @@
 #include <string.h>
 
 #include <algorithm>
+#include <iterator>
 
-#include "base/cxx17_backports.h"
+#include "base/containers/heap_array.h"
 #include "base/rand_util.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
@@ -46,17 +47,16 @@ class ZlibOutputStreamTest : public testing::Test {
   ZlibOutputStreamTest& operator=(const ZlibOutputStreamTest&) = delete;
 
   const uint8_t* BuildDeterministicInput(size_t size) {
-    deterministic_input_ = std::make_unique<uint8_t[]>(size);
-    uint8_t* deterministic_input_base = deterministic_input_.get();
+    deterministic_input_ = base::HeapArray<uint8_t>::WithSize(size);
     while (size-- > 0)
-      deterministic_input_base[size] = static_cast<uint8_t>(size);
-    return deterministic_input_base;
+      deterministic_input_[size] = static_cast<uint8_t>(size);
+    return deterministic_input_.data();
   }
 
   const uint8_t* BuildRandomInput(size_t size) {
-    input_ = std::make_unique<uint8_t[]>(size);
-    base::RandBytes(&input_[0], size);
-    return input_.get();
+    input_ = base::HeapArray<uint8_t>::Uninit(size);
+    base::RandBytes(input_);
+    return input_.data();
   }
 
   const TestOutputStream& test_output_stream() const {
@@ -69,8 +69,8 @@ class ZlibOutputStreamTest : public testing::Test {
 
  private:
   std::unique_ptr<ZlibOutputStream> zlib_output_stream_;
-  std::unique_ptr<uint8_t[]> input_;
-  std::unique_ptr<uint8_t[]> deterministic_input_;
+  base::HeapArray<uint8_t> input_;
+  base::HeapArray<uint8_t> deterministic_input_;
   TestOutputStream* test_output_stream_;  // weak, owned by zlib_output_stream_
 };
 
@@ -102,7 +102,7 @@ TEST_F(ZlibOutputStreamTest, WriteDeterministicLongDataMultipleTimes) {
       4, 96, 40, kLongDataLength - 4 - 96 - 40};
 
   size_t offset = 0;
-  for (size_t index = 0; index < base::size(kWriteLengths); ++index) {
+  for (size_t index = 0; index < std::size(kWriteLengths); ++index) {
     const size_t write_length = kWriteLengths[index];
     SCOPED_TRACE(base::StringPrintf(
         "offset %zu, write_length %zu", offset, write_length));
diff --git a/extern/crashpad/crashpad/util/string/split_string.cc b/extern/crashpad/crashpad/util/string/split_string.cc
index fe7a7eb4c6..1858263f76 100644
--- a/extern/crashpad/crashpad/util/string/split_string.cc
+++ b/extern/crashpad/crashpad/util/string/split_string.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/string/split_string.h b/extern/crashpad/crashpad/util/string/split_string.h
index af4f953c7a..997ea84819 100644
--- a/extern/crashpad/crashpad/util/string/split_string.h
+++ b/extern/crashpad/crashpad/util/string/split_string.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/string/split_string_test.cc b/extern/crashpad/crashpad/util/string/split_string_test.cc
index a260ac1b0b..3047f00333 100644
--- a/extern/crashpad/crashpad/util/string/split_string_test.cc
+++ b/extern/crashpad/crashpad/util/string/split_string_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/synchronization/scoped_spin_guard.h b/extern/crashpad/crashpad/util/synchronization/scoped_spin_guard.h
new file mode 100644
index 0000000000..6e445b85d3
--- /dev/null
+++ b/extern/crashpad/crashpad/util/synchronization/scoped_spin_guard.h
@@ -0,0 +1,129 @@
+// Copyright 2022 The Crashpad Authors
+//
+// 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.
+
+#ifndef CRASHPAD_UTIL_SYNCHRONIZATION_SCOPED_SPIN_GUARD_H_
+#define CRASHPAD_UTIL_SYNCHRONIZATION_SCOPED_SPIN_GUARD_H_
+
+#include <atomic>
+#include <optional>
+#include <utility>
+
+#include "base/check.h"
+#include "base/notreached.h"
+#include "util/misc/clock.h"
+
+namespace crashpad {
+
+//! \brief Spinlock state for `ScopedSpinGuard`.
+struct SpinGuardState final {
+  //! \brief A `ScopedSpinGuard` in an unlocked state.
+  constexpr SpinGuardState() : locked(false) {}
+
+  SpinGuardState(const SpinGuardState&) = delete;
+  SpinGuardState& operator=(const SpinGuardState&) = delete;
+
+  //! \brief `true` if the `ScopedSpinGuard` is locked, `false` otherwise.
+  std::atomic<bool> locked;
+  static_assert(std::atomic<bool>::is_always_lock_free,
+                "std::atomic<bool> may not be signal-safe");
+  static_assert(sizeof(std::atomic<bool>) == sizeof(bool),
+                "std::atomic<bool> adds size to bool");
+};
+
+//! \brief A scoped mutual-exclusion guard wrapping a `SpinGuardState` with RAII
+//!     semantics.
+class ScopedSpinGuard final {
+  //! \brief The duration in nanoseconds between attempts to lock the spinlock.
+  static constexpr uint64_t kSpinGuardSleepTimeNanos = 10;
+
+ public:
+  ScopedSpinGuard(const ScopedSpinGuard&) = delete;
+  ScopedSpinGuard& operator=(const ScopedSpinGuard&) = delete;
+  ScopedSpinGuard(ScopedSpinGuard&& other) noexcept : state_(nullptr) {
+    std::swap(state_, other.state_);
+  }
+  ScopedSpinGuard& operator=(ScopedSpinGuard&& other) {
+    std::swap(state_, other.state_);
+    return *this;
+  }
+
+  //! \brief Spins up to `timeout_nanos` nanoseconds trying to lock `state`.
+  //! \param[in] timeout_nanos The timeout in nanoseconds after which this gives
+  //!     up trying to lock the spinlock and returns `std::nullopt`.
+  //! \param[in,out] state The spinlock state to attempt to lock. This method
+  //!     holds a pointer to `state`, so `state` must outlive the lifetime of
+  //!     this object.
+  //! \return The locked `ScopedSpinGuard` on success, or `std::nullopt` on
+  //!     timeout.
+  static std::optional<ScopedSpinGuard> TryCreateScopedSpinGuard(
+      uint64_t timeout_nanos,
+      SpinGuardState& state) {
+    const uint64_t clock_end_time_nanos =
+        ClockMonotonicNanoseconds() + timeout_nanos;
+    while (true) {
+      bool expected_current_value = false;
+      // `std::atomic::compare_exchange_weak()` is allowed to spuriously fail on
+      // architectures like ARM, which can cause timeouts even for
+      // single-threaded cases (https://crbug.com/340980960,
+      // http://b/296082201).
+      //
+      // Use `std::compare_exchange_strong()` instead to avoid spurious failures
+      // in the common case.
+      if (state.locked.compare_exchange_strong(expected_current_value,
+                                               true,
+                                               std::memory_order_acquire,
+                                               std::memory_order_relaxed)) {
+        return std::make_optional<ScopedSpinGuard>(state);
+      }
+      if (ClockMonotonicNanoseconds() >= clock_end_time_nanos) {
+        return std::nullopt;
+      }
+      SleepNanoseconds(kSpinGuardSleepTimeNanos);
+    }
+
+    NOTREACHED();
+  }
+
+  ~ScopedSpinGuard() {
+    if (state_) {
+#ifdef NDEBUG
+      state_->locked.store(false, std::memory_order_release);
+#else
+      bool old = state_->locked.exchange(false, std::memory_order_release);
+      DCHECK(old);
+#endif
+    }
+  }
+
+  //! \brief A `ScopedSpinGuard` wrapping a locked `SpinGuardState`.
+  //! \param[in,out] locked_state A locked `SpinGuardState`. This method
+  //!     holds a pointer to `state`, so `state` must outlive the lifetime of
+  //!     this object.
+  ScopedSpinGuard(SpinGuardState& locked_state) : state_(&locked_state) {
+    DCHECK(locked_state.locked);
+  }
+
+ private:
+  // \brief Optional spinlock state, unlocked when this object goes out of
+  //     scope.
+  //
+  // If this is `nullptr`, then this object has been moved from, and the state
+  // is no longer valid. In that case, nothing will be unlocked when this object
+  // is destroyed.
+  SpinGuardState* state_;
+};
+
+}  // namespace crashpad
+
+#endif  // CRASHPAD_UTIL_SYNCHRONIZATION_SCOPED_SPIN_GUARD_H_
diff --git a/extern/crashpad/crashpad/util/synchronization/scoped_spin_guard_test.cc b/extern/crashpad/crashpad/util/synchronization/scoped_spin_guard_test.cc
new file mode 100644
index 0000000000..9980d50df8
--- /dev/null
+++ b/extern/crashpad/crashpad/util/synchronization/scoped_spin_guard_test.cc
@@ -0,0 +1,109 @@
+// Copyright 2022 The Crashpad Authors
+//
+// 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.
+
+#include "util/synchronization/scoped_spin_guard.h"
+
+#include <optional>
+#include <thread>
+
+#include "gtest/gtest.h"
+#include "util/misc/clock.h"
+
+namespace crashpad {
+namespace test {
+namespace {
+
+TEST(ScopedSpinGuard, TryCreateScopedSpinGuardShouldLockStateWhileInScope) {
+  SpinGuardState s;
+  EXPECT_FALSE(s.locked);
+  {
+    std::optional<ScopedSpinGuard> guard =
+        ScopedSpinGuard::TryCreateScopedSpinGuard(/*timeout_nanos=*/0, s);
+    EXPECT_NE(std::nullopt, guard);
+    EXPECT_TRUE(s.locked);
+  }
+  EXPECT_FALSE(s.locked);
+}
+
+TEST(
+    ScopedSpinGuard,
+    TryCreateScopedSpinGuardWithZeroTimeoutShouldFailImmediatelyIfStateLocked) {
+  SpinGuardState s;
+  s.locked = true;
+  std::optional<ScopedSpinGuard> guard =
+      ScopedSpinGuard::TryCreateScopedSpinGuard(/*timeout_nanos=*/0, s);
+  EXPECT_EQ(std::nullopt, guard);
+  EXPECT_TRUE(s.locked);
+}
+
+TEST(
+    ScopedSpinGuard,
+    TryCreateScopedSpinGuardWithNonZeroTimeoutShouldSucceedIfStateUnlockedDuringTimeout) {
+  SpinGuardState s;
+  s.locked = true;
+  std::thread unlock_thread([&s] {
+    constexpr uint64_t kUnlockThreadSleepTimeNanos = 10000;  // 10 us
+    EXPECT_TRUE(s.locked);
+    SleepNanoseconds(kUnlockThreadSleepTimeNanos);
+    s.locked = false;
+  });
+  constexpr uint64_t kLockThreadTimeoutNanos = 180000000000ULL;  // 3 minutes
+  std::optional<ScopedSpinGuard> guard =
+      ScopedSpinGuard::TryCreateScopedSpinGuard(kLockThreadTimeoutNanos, s);
+  EXPECT_NE(std::nullopt, guard);
+  EXPECT_TRUE(s.locked);
+  unlock_thread.join();
+}
+
+TEST(ScopedSpinGuard, SwapShouldMaintainSpinLock) {
+  SpinGuardState s;
+  std::optional<ScopedSpinGuard> outer_guard;
+  EXPECT_EQ(std::nullopt, outer_guard);
+  {
+    std::optional<ScopedSpinGuard> inner_guard =
+        ScopedSpinGuard::TryCreateScopedSpinGuard(/*timeout_nanos=*/0, s);
+    EXPECT_NE(std::nullopt, inner_guard);
+    EXPECT_TRUE(s.locked);
+    // If the move-assignment operator for `ScopedSpinGuard` is implemented
+    // incorrectly (e.g., the `= default` implementation), `inner_guard`
+    // will incorrectly think it still "owns" the spinlock after the swap,
+    // and when it falls out of scope, it will release the lock prematurely
+    // when it destructs.
+    //
+    // Confirm that the spinlock stays locked even after the swap.
+    std::swap(outer_guard, inner_guard);
+    EXPECT_TRUE(s.locked);
+    EXPECT_EQ(std::nullopt, inner_guard);
+  }
+  EXPECT_NE(std::nullopt, outer_guard);
+  EXPECT_TRUE(s.locked);
+}
+
+TEST(ScopedSpinGuard, MoveAssignmentShouldMaintainSpinLock) {
+  SpinGuardState s;
+  std::optional<ScopedSpinGuard> outer_guard;
+  EXPECT_EQ(std::nullopt, outer_guard);
+  {
+    outer_guard =
+        ScopedSpinGuard::TryCreateScopedSpinGuard(/*timeout_nanos=*/0, s);
+    EXPECT_NE(std::nullopt, outer_guard);
+    EXPECT_TRUE(s.locked);
+  }
+  EXPECT_NE(std::nullopt, outer_guard);
+  EXPECT_TRUE(s.locked);
+}
+
+}  // namespace
+}  // namespace test
+}  // namespace crashpad
diff --git a/extern/crashpad/crashpad/util/synchronization/semaphore.h b/extern/crashpad/crashpad/util/synchronization/semaphore.h
index 308b29b034..9761917206 100644
--- a/extern/crashpad/crashpad/util/synchronization/semaphore.h
+++ b/extern/crashpad/crashpad/util/synchronization/semaphore.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,11 +19,11 @@
 
 #include "build/build_config.h"
 
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
 #include <dispatch/dispatch.h>
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 #include <windows.h>
-#elif defined(OS_ANDROID)
+#elif BUILDFLAG(IS_ANDROID)
 #include <condition_variable>
 #include <mutex>
 #else
@@ -76,11 +76,11 @@ class Semaphore {
   void Signal();
 
  private:
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
   dispatch_semaphore_t semaphore_;
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   HANDLE semaphore_;
-#elif defined(OS_ANDROID)
+#elif BUILDFLAG(IS_ANDROID)
   std::condition_variable cv_;
   std::mutex mutex_;
   int value_;
diff --git a/extern/crashpad/crashpad/util/synchronization/semaphore_mac.cc b/extern/crashpad/crashpad/util/synchronization/semaphore_mac.cc
index a0ef595384..64f633fb1e 100644
--- a/extern/crashpad/crashpad/util/synchronization/semaphore_mac.cc
+++ b/extern/crashpad/crashpad/util/synchronization/semaphore_mac.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/synchronization/semaphore_posix.cc b/extern/crashpad/crashpad/util/synchronization/semaphore_posix.cc
index ebe62a4f42..ea20d3ca74 100644
--- a/extern/crashpad/crashpad/util/synchronization/semaphore_posix.cc
+++ b/extern/crashpad/crashpad/util/synchronization/semaphore_posix.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,19 +15,20 @@
 #include "util/synchronization/semaphore.h"
 
 #include <errno.h>
-#include <math.h>
 #include <time.h>
 
 #include <chrono>
+#include <cmath>
 
 #include "base/check_op.h"
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
+#include "build/build_config.h"
 #include "util/misc/time.h"
 
 namespace crashpad {
 
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
 
 Semaphore::Semaphore(int value) : cv_(), mutex_(), value_(value) {}
 
@@ -42,7 +43,7 @@ void Semaphore::Wait() {
 bool Semaphore::TimedWait(double seconds) {
   DCHECK_GE(seconds, 0.0);
 
-  if (isinf(seconds)) {
+  if (std::isinf(seconds)) {
     Wait();
     return true;
   }
@@ -63,7 +64,7 @@ void Semaphore::Signal() {
   cv_.notify_one();
 }
 
-#elif !defined(OS_APPLE)
+#elif !BUILDFLAG(IS_APPLE)
 
 Semaphore::Semaphore(int value) {
   PCHECK(sem_init(&semaphore_, 0, value) == 0) << "sem_init";
@@ -80,7 +81,7 @@ void Semaphore::Wait() {
 bool Semaphore::TimedWait(double seconds) {
   DCHECK_GE(seconds, 0.0);
 
-  if (isinf(seconds)) {
+  if (std::isinf(seconds)) {
     Wait();
     return true;
   }
@@ -104,6 +105,6 @@ void Semaphore::Signal() {
   PCHECK(sem_post(&semaphore_) == 0) << "sem_post";
 }
 
-#endif  // OS_ANDROID
+#endif  // BUILDFLAG(IS_ANDROID)
 
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/util/synchronization/semaphore_test.cc b/extern/crashpad/crashpad/util/synchronization/semaphore_test.cc
index 5cb91e489f..d9947b76c4 100644
--- a/extern/crashpad/crashpad/util/synchronization/semaphore_test.cc
+++ b/extern/crashpad/crashpad/util/synchronization/semaphore_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,12 +16,14 @@
 
 #include <sys/types.h>
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+
+#include "build/build_config.h"
 #include "gtest/gtest.h"
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 #include <pthread.h>
-#endif  // OS_POSIX
+#endif  // BUILDFLAG(IS_POSIX)
 
 namespace crashpad {
 namespace test {
@@ -60,50 +62,50 @@ TEST(Semaphore, TimedWaitInfinite_1) {
 }
 
 struct ThreadMainInfo {
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
   pthread_t pthread;
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   HANDLE thread;
 #endif
   Semaphore* semaphore;
   size_t iterations;
 };
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 void*
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 DWORD WINAPI
-#endif  // OS_POSIX
+#endif  // BUILDFLAG(IS_POSIX)
 ThreadMain(void* argument) {
   ThreadMainInfo* info = reinterpret_cast<ThreadMainInfo*>(argument);
   for (size_t iteration = 0; iteration < info->iterations; ++iteration) {
     info->semaphore->Wait();
   }
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
   return nullptr;
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   return 0;
-#endif  // OS_POSIX
+#endif  // BUILDFLAG(IS_POSIX)
 }
 
 void StartThread(ThreadMainInfo* info) {
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
   int rv = pthread_create(&info->pthread, nullptr, ThreadMain, info);
   ASSERT_EQ(rv, 0) << "pthread_create";
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   info->thread = CreateThread(nullptr, 0, ThreadMain, info, 0, nullptr);
   ASSERT_NE(info->thread, nullptr) << "CreateThread";
-#endif  // OS_POSIX
+#endif  // BUILDFLAG(IS_POSIX)
 }
 
 void JoinThread(ThreadMainInfo* info) {
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
   int rv = pthread_join(info->pthread, nullptr);
   EXPECT_EQ(rv, 0) << "pthread_join";
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   DWORD result = WaitForSingleObject(info->thread, INFINITE);
   EXPECT_EQ(result, WAIT_OBJECT_0) << "WaitForSingleObject";
-#endif  // OS_POSIX
+#endif  // BUILDFLAG(IS_POSIX)
 }
 
 TEST(Semaphore, Threaded) {
@@ -126,7 +128,7 @@ TEST(Semaphore, TenThreaded) {
   Semaphore semaphore(5);
   ThreadMainInfo info[10];
   size_t iterations = 0;
-  for (size_t index = 0; index < base::size(info); ++index) {
+  for (size_t index = 0; index < std::size(info); ++index) {
     info[index].semaphore = &semaphore;
     info[index].iterations = index;
     iterations += info[index].iterations;
@@ -138,7 +140,7 @@ TEST(Semaphore, TenThreaded) {
     semaphore.Signal();
   }
 
-  for (size_t index = 0; index < base::size(info); ++index) {
+  for (size_t index = 0; index < std::size(info); ++index) {
     JoinThread(&info[index]);
   }
 }
diff --git a/extern/crashpad/crashpad/util/synchronization/semaphore_win.cc b/extern/crashpad/crashpad/util/synchronization/semaphore_win.cc
index cce8191847..1b03b3efc1 100644
--- a/extern/crashpad/crashpad/util/synchronization/semaphore_win.cc
+++ b/extern/crashpad/crashpad/util/synchronization/semaphore_win.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/thread/stoppable.h b/extern/crashpad/crashpad/util/thread/stoppable.h
index 62bb40bd16..05794c278f 100644
--- a/extern/crashpad/crashpad/util/thread/stoppable.h
+++ b/extern/crashpad/crashpad/util/thread/stoppable.h
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/thread/thread.cc b/extern/crashpad/crashpad/util/thread/thread.cc
index cc73e9a9ba..2d0d626f37 100644
--- a/extern/crashpad/crashpad/util/thread/thread.cc
+++ b/extern/crashpad/crashpad/util/thread/thread.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/thread/thread.h b/extern/crashpad/crashpad/util/thread/thread.h
index e06ca3c9db..2736abc4df 100644
--- a/extern/crashpad/crashpad/util/thread/thread.h
+++ b/extern/crashpad/crashpad/util/thread/thread.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,11 +17,14 @@
 
 #include "build/build_config.h"
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 #include <pthread.h>
-#elif defined(OS_WIN)
+#include <stdint.h>
+#elif BUILDFLAG(IS_WIN)
 #include <windows.h>
-#endif  // OS_POSIX
+#endif  // BUILDFLAG(IS_POSIX)
+
+#include "build/build_config.h"
 
 namespace crashpad {
 
@@ -44,21 +47,26 @@ class Thread {
   //!     Must paired with a call to Start().
   void Join();
 
+#if BUILDFLAG(IS_APPLE)
+  //! \brief Returns the thread id of the Thread pthread_t.
+  static uint64_t GetThreadIdForTesting();
+#endif  // BUILDFLAG(IS_APPLE)
+
  private:
   //! \brief The thread entry point to be implemented by the subclass.
   virtual void ThreadMain() = 0;
 
   static
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
       void*
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
       DWORD WINAPI
-#endif  // OS_POSIX
+#endif  // BUILDFLAG(IS_POSIX)
       ThreadEntryThunk(void* argument);
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
   pthread_t platform_thread_;
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   HANDLE platform_thread_;
 #endif
 };
diff --git a/extern/crashpad/crashpad/util/thread/thread_log_messages.cc b/extern/crashpad/crashpad/util/thread/thread_log_messages.cc
index 230bb87a8a..efc6e2e11c 100644
--- a/extern/crashpad/crashpad/util/thread/thread_log_messages.cc
+++ b/extern/crashpad/crashpad/util/thread/thread_log_messages.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,71 +18,38 @@
 
 #include "base/check_op.h"
 #include "base/logging.h"
-#include "base/threading/thread_local_storage.h"
 
 namespace crashpad {
 
 namespace {
 
-// While an object of this class exists, it will be set as the log message
-// handler. A thread may register its thread-specific log message list to
-// receive messages produced just on that thread.
-//
-// Only one object of this class may exist in the program at a time as created
-// by GetInstance(). There must not be any log message handler in effect when it
-// is created, and nothing else can be set as a log message handler while an
-// object of this class exists.
-class ThreadLogMessagesMaster {
- public:
-  ThreadLogMessagesMaster(const ThreadLogMessagesMaster&) = delete;
-  ThreadLogMessagesMaster& operator=(const ThreadLogMessagesMaster&) = delete;
-
-  void SetThreadMessageList(std::vector<std::string>* message_list) {
-    DCHECK_EQ(logging::GetLogMessageHandler(), &LogMessageHandler);
-    DCHECK_NE(tls_.Get() != nullptr, message_list != nullptr);
-    tls_.Set(message_list);
-  }
-
-  static ThreadLogMessagesMaster* GetInstance() {
-    static auto master = new ThreadLogMessagesMaster();
-    return master;
-  }
-
- private:
-  ThreadLogMessagesMaster() {
-    DCHECK(!logging::GetLogMessageHandler());
-    logging::SetLogMessageHandler(LogMessageHandler);
-  }
-
-  ~ThreadLogMessagesMaster() = delete;
+thread_local std::vector<std::string>* thread_local_log_messages;
 
-  static bool LogMessageHandler(logging::LogSeverity severity,
-                                const char* file_path,
-                                int line,
-                                size_t message_start,
-                                const std::string& string) {
-    std::vector<std::string>* log_messages =
-        reinterpret_cast<std::vector<std::string>*>(GetInstance()->tls_.Get());
-    if (log_messages) {
-      log_messages->push_back(string);
-    }
-
-    // Don’t consume the message. Allow it to be logged as if nothing was set as
-    // the log message handler.
-    return false;
+bool LogMessageHandler(logging::LogSeverity severity,
+                       const char* file_path,
+                       int line,
+                       size_t message_start,
+                       const std::string& string) {
+  if (thread_local_log_messages) {
+    thread_local_log_messages->push_back(string);
   }
 
-  base::ThreadLocalStorage::Slot tls_;
-};
+  // Don’t consume the message. Allow it to be logged as if nothing was set as
+  // the log message handler.
+  return false;
+}
 
 }  // namespace
 
-ThreadLogMessages::ThreadLogMessages() : log_messages_() {
-  ThreadLogMessagesMaster::GetInstance()->SetThreadMessageList(&log_messages_);
-}
-
-ThreadLogMessages::~ThreadLogMessages() {
-  ThreadLogMessagesMaster::GetInstance()->SetThreadMessageList(nullptr);
+ThreadLogMessages::ThreadLogMessages()
+    : log_messages_(),
+      reset_thread_local_log_messages_(&thread_local_log_messages,
+                                       &log_messages_) {
+  [[maybe_unused]] static bool initialized = [] {
+    DCHECK(!logging::GetLogMessageHandler());
+    logging::SetLogMessageHandler(LogMessageHandler);
+    return true;
+  }();
 }
 
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/util/thread/thread_log_messages.h b/extern/crashpad/crashpad/util/thread/thread_log_messages.h
index 67bee6203e..43e3cd0dfe 100644
--- a/extern/crashpad/crashpad/util/thread/thread_log_messages.h
+++ b/extern/crashpad/crashpad/util/thread/thread_log_messages.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 #include <string>
 #include <vector>
 
+#include "base/auto_reset.h"
 
 namespace crashpad {
 
@@ -34,7 +35,7 @@ class ThreadLogMessages {
   ThreadLogMessages(const ThreadLogMessages&) = delete;
   ThreadLogMessages& operator=(const ThreadLogMessages&) = delete;
 
-  ~ThreadLogMessages();
+  ~ThreadLogMessages() = default;
 
   //! \return The log messages collected on the thread that this object was
   //!     created on since the time it was created.
@@ -42,6 +43,8 @@ class ThreadLogMessages {
 
  private:
   std::vector<std::string> log_messages_;
+  const base::AutoReset<std::vector<std::string>*>
+      reset_thread_local_log_messages_;
 };
 
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/util/thread/thread_log_messages_test.cc b/extern/crashpad/crashpad/util/thread/thread_log_messages_test.cc
index f3dc1a6659..1acee01817 100644
--- a/extern/crashpad/crashpad/util/thread/thread_log_messages_test.cc
+++ b/extern/crashpad/crashpad/util/thread/thread_log_messages_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,7 +17,8 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
@@ -65,8 +66,8 @@ TEST(ThreadLogMessages, Basic) {
     const std::vector<std::string>& log_messages =
         thread_log_messages.log_messages();
 
-    EXPECT_EQ(log_messages.size(), base::size(kMessages));
-    for (size_t index = 0; index < base::size(kMessages); ++index) {
+    EXPECT_EQ(log_messages.size(), std::size(kMessages));
+    for (size_t index = 0; index < std::size(kMessages); ++index) {
       ASSERT_NO_FATAL_FAILURE(
           ExpectLogMessage(log_messages[index], kMessages[index]))
           << "index " << index;
@@ -149,7 +150,7 @@ TEST(ThreadLogMessages, Multithreaded) {
 
   LoggingTestThread threads[20];
   int start = 0;
-  for (size_t index = 0; index < base::size(threads); ++index) {
+  for (size_t index = 0; index < std::size(threads); ++index) {
     threads[index].Initialize(
         index, static_cast<int>(start), static_cast<int>(index));
     start += static_cast<int>(index);
diff --git a/extern/crashpad/crashpad/util/thread/thread_posix.cc b/extern/crashpad/crashpad/util/thread/thread_posix.cc
index fe50050c7f..b510b34bdc 100644
--- a/extern/crashpad/crashpad/util/thread/thread_posix.cc
+++ b/extern/crashpad/crashpad/util/thread/thread_posix.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 #include <ostream>
 
 #include "base/check.h"
+#include "build/build_config.h"
 
 namespace crashpad {
 
@@ -35,6 +36,16 @@ void Thread::Join() {
   platform_thread_ = 0;
 }
 
+#if BUILDFLAG(IS_APPLE)
+// static
+uint64_t Thread::GetThreadIdForTesting() {
+  uint64_t thread_self;
+  errno = pthread_threadid_np(pthread_self(), &thread_self);
+  PCHECK(errno == 0) << "pthread_threadid_np";
+  return thread_self;
+}
+#endif  // BUILDFLAG(IS_APPLE)
+
 // static
 void* Thread::ThreadEntryThunk(void* argument) {
   Thread* self = reinterpret_cast<Thread*>(argument);
diff --git a/extern/crashpad/crashpad/util/thread/thread_test.cc b/extern/crashpad/crashpad/util/thread/thread_test.cc
index f2ea345f2d..a00af13238 100644
--- a/extern/crashpad/crashpad/util/thread/thread_test.cc
+++ b/extern/crashpad/crashpad/util/thread/thread_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/thread/thread_win.cc b/extern/crashpad/crashpad/util/thread/thread_win.cc
index 0132856a85..822dad51bd 100644
--- a/extern/crashpad/crashpad/util/thread/thread_win.cc
+++ b/extern/crashpad/crashpad/util/thread/thread_win.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/thread/worker_thread.cc b/extern/crashpad/crashpad/util/thread/worker_thread.cc
index e83f8f016d..a8acc29bdb 100644
--- a/extern/crashpad/crashpad/util/thread/worker_thread.cc
+++ b/extern/crashpad/crashpad/util/thread/worker_thread.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/thread/worker_thread.h b/extern/crashpad/crashpad/util/thread/worker_thread.h
index a07fd7d5e2..0b8c6687ea 100644
--- a/extern/crashpad/crashpad/util/thread/worker_thread.h
+++ b/extern/crashpad/crashpad/util/thread/worker_thread.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
 #ifndef CRASHPAD_UTIL_THREAD_WORKER_THREAD_H_
 #define CRASHPAD_UTIL_THREAD_WORKER_THREAD_H_
 
+#include <atomic>
 #include <memory>
 
 #include "util/synchronization/semaphore.h"
@@ -94,8 +95,8 @@ class WorkerThread {
   double work_interval_;
   Delegate* delegate_;  // weak
   std::unique_ptr<internal::WorkerThreadImpl> impl_;
-  bool running_;
-  bool do_work_now_;
+  std::atomic_bool running_;
+  std::atomic_bool do_work_now_;
 };
 
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/util/thread/worker_thread_test.cc b/extern/crashpad/crashpad/util/thread/worker_thread_test.cc
index 811d09c375..b635884bbb 100644
--- a/extern/crashpad/crashpad/util/thread/worker_thread_test.cc
+++ b/extern/crashpad/crashpad/util/thread/worker_thread_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,6 +14,7 @@
 
 #include "util/thread/worker_thread.h"
 
+#include "build/build_config.h"
 #include "gtest/gtest.h"
 #include "util/misc/clock.h"
 #include "util/synchronization/semaphore.h"
@@ -78,7 +79,7 @@ TEST(WorkerThread, DoWork) {
 // also somewhat useful. The expected time "should" be ~40-50ms with a work
 // interval of 0.05s, but on Fuchsia, 1200ms was observed. So, on Fuchsia, use a
 // much larger timeout. See https://crashpad.chromium.org/bug/231.
-#if defined(OS_FUCHSIA)
+#if BUILDFLAG(IS_FUCHSIA)
   constexpr uint64_t kUpperBoundTime = 10;
 #else
   constexpr uint64_t kUpperBoundTime = 1;
diff --git a/extern/crashpad/crashpad/util/win/address_types.h b/extern/crashpad/crashpad/util/win/address_types.h
index f26a57eff5..6148262b69 100644
--- a/extern/crashpad/crashpad/util/win/address_types.h
+++ b/extern/crashpad/crashpad/util/win/address_types.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/checked_win_address_range.h b/extern/crashpad/crashpad/util/win/checked_win_address_range.h
index e86c7b7b0a..3e0eac14d8 100644
--- a/extern/crashpad/crashpad/util/win/checked_win_address_range.h
+++ b/extern/crashpad/crashpad/util/win/checked_win_address_range.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/command_line.cc b/extern/crashpad/crashpad/util/win/command_line.cc
index c015eed741..de283264ac 100644
--- a/extern/crashpad/crashpad/util/win/command_line.cc
+++ b/extern/crashpad/crashpad/util/win/command_line.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/command_line.h b/extern/crashpad/crashpad/util/win/command_line.h
index c12d6539a4..ef1694e10f 100644
--- a/extern/crashpad/crashpad/util/win/command_line.h
+++ b/extern/crashpad/crashpad/util/win/command_line.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/command_line_test.cc b/extern/crashpad/crashpad/util/win/command_line_test.cc
index 28b9504182..9d8b45db4c 100644
--- a/extern/crashpad/crashpad/util/win/command_line_test.cc
+++ b/extern/crashpad/crashpad/util/win/command_line_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,7 +18,8 @@
 #include <shellapi.h>
 #include <sys/types.h>
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+
 #include "base/scoped_generic.h"
 #include "gtest/gtest.h"
 #include "test/errors.h"
@@ -64,7 +65,7 @@ TEST(CommandLine, AppendCommandLineArgument) {
         L"argument 1",
         L"argument 2",
     };
-    AppendCommandLineArgumentTest(base::size(kArguments), kArguments);
+    AppendCommandLineArgumentTest(std::size(kArguments), kArguments);
   }
 
   {
@@ -76,7 +77,7 @@ TEST(CommandLine, AppendCommandLineArgument) {
         L"argument 2",
         L"\\some\\path with\\spaces",
     };
-    AppendCommandLineArgumentTest(base::size(kArguments), kArguments);
+    AppendCommandLineArgumentTest(std::size(kArguments), kArguments);
   }
 
   {
@@ -88,7 +89,7 @@ TEST(CommandLine, AppendCommandLineArgument) {
         L"she said, \"you had me at hello\"",
         L"\\some\\path with\\spaces",
     };
-    AppendCommandLineArgumentTest(base::size(kArguments), kArguments);
+    AppendCommandLineArgumentTest(std::size(kArguments), kArguments);
   }
 
   {
@@ -101,7 +102,7 @@ TEST(CommandLine, AppendCommandLineArgument) {
         L"argument3",
         L"argument4",
     };
-    AppendCommandLineArgumentTest(base::size(kArguments), kArguments);
+    AppendCommandLineArgumentTest(std::size(kArguments), kArguments);
   }
 
   {
@@ -112,7 +113,7 @@ TEST(CommandLine, AppendCommandLineArgument) {
         L"\\some\\directory with\\spaces\\",
         L"argument2",
     };
-    AppendCommandLineArgumentTest(base::size(kArguments), kArguments);
+    AppendCommandLineArgumentTest(std::size(kArguments), kArguments);
   }
 
   {
@@ -123,7 +124,7 @@ TEST(CommandLine, AppendCommandLineArgument) {
         L"",
         L"argument2",
     };
-    AppendCommandLineArgumentTest(base::size(kArguments), kArguments);
+    AppendCommandLineArgumentTest(std::size(kArguments), kArguments);
   }
 
   {
@@ -158,7 +159,7 @@ TEST(CommandLine, AppendCommandLineArgument) {
         L"\"\"",
         L" \t\n\v\"",
     };
-    AppendCommandLineArgumentTest(base::size(kArguments), kArguments);
+    AppendCommandLineArgumentTest(std::size(kArguments), kArguments);
   }
 }
 
diff --git a/extern/crashpad/crashpad/util/win/context_wrappers.h b/extern/crashpad/crashpad/util/win/context_wrappers.h
index 5d9b1838a2..4d6f58cd9d 100644
--- a/extern/crashpad/crashpad/util/win/context_wrappers.h
+++ b/extern/crashpad/crashpad/util/win/context_wrappers.h
@@ -1,4 +1,4 @@
-// Copyright 2018 The Crashpad Authors. All rights reserved.
+// Copyright 2018 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/critical_section_with_debug_info.cc b/extern/crashpad/crashpad/util/win/critical_section_with_debug_info.cc
index 1613a51236..b86bfc65a1 100644
--- a/extern/crashpad/crashpad/util/win/critical_section_with_debug_info.cc
+++ b/extern/crashpad/crashpad/util/win/critical_section_with_debug_info.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/critical_section_with_debug_info.h b/extern/crashpad/crashpad/util/win/critical_section_with_debug_info.h
index 1271685755..c737ecaf71 100644
--- a/extern/crashpad/crashpad/util/win/critical_section_with_debug_info.h
+++ b/extern/crashpad/crashpad/util/win/critical_section_with_debug_info.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/critical_section_with_debug_info_test.cc b/extern/crashpad/crashpad/util/win/critical_section_with_debug_info_test.cc
index dcc596559c..d7f12d2b38 100644
--- a/extern/crashpad/crashpad/util/win/critical_section_with_debug_info_test.cc
+++ b/extern/crashpad/crashpad/util/win/critical_section_with_debug_info_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/exception_codes.h b/extern/crashpad/crashpad/util/win/exception_codes.h
new file mode 100644
index 0000000000..00fd411df3
--- /dev/null
+++ b/extern/crashpad/crashpad/util/win/exception_codes.h
@@ -0,0 +1,37 @@
+// Copyright 2022 The Crashpad Authors
+//
+// 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.
+
+#ifndef CRASHPAD_UTIL_WIN_EXCEPTION_CODES_H_
+#define CRASHPAD_UTIL_WIN_EXCEPTION_CODES_H_
+
+#include <stdint.h>
+
+namespace crashpad {
+
+//! \brief Crashpad-specific exception codes that are used as arguments to
+//!     `RaiseException()` in unusual circumstances.
+enum ExceptionCodes : uint32_t {
+  //! \brief The exception code (roughly "Client called") used when
+  //!     DumpAndCrashTargetProcess() triggers an exception in a target
+  //!     process.
+  //!
+  //! \note This value does not have any bits of the top nibble set, to avoid
+  //!     confusion with real exception codes which tend to have those bits
+  //!     set.
+  kTriggeredExceptionCode = 0xcca11ed,
+};
+
+}  // namespace crashpad
+
+#endif  // CRASHPAD_UTIL_WIN_EXCEPTION_CODES_H_
diff --git a/extern/crashpad/crashpad/util/win/exception_handler_server.cc b/extern/crashpad/crashpad/util/win/exception_handler_server.cc
index 92d5c5d47c..8af53a62b0 100644
--- a/extern/crashpad/crashpad/util/win/exception_handler_server.cc
+++ b/extern/crashpad/crashpad/util/win/exception_handler_server.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,9 +18,11 @@
 #include <string.h>
 #include <sys/types.h>
 
+#include <iterator>
 #include <utility>
 
-#include "base/cxx17_backports.h"
+#include "base/check.h"
+#include "base/containers/heap_array.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/rand_util.h"
@@ -269,16 +271,16 @@ void ExceptionHandlerServer::InitializeWithInheritedDataForInitialClient(
   first_pipe_instance_.reset(initial_client_data.first_pipe_instance());
 
   // TODO(scottmg): Vista+. Might need to pass through or possibly find an Nt*.
-  size_t bytes = sizeof(wchar_t) * _MAX_PATH + sizeof(FILE_NAME_INFO);
-  std::unique_ptr<uint8_t[]> data(new uint8_t[bytes]);
+  auto data = base::HeapArray<uint8_t>::Uninit(sizeof(wchar_t) * _MAX_PATH +
+                                               sizeof(FILE_NAME_INFO));
   if (!GetFileInformationByHandleEx(first_pipe_instance_.get(),
                                     FileNameInfo,
-                                    data.get(),
-                                    static_cast<DWORD>(bytes))) {
+                                    data.data(),
+                                    static_cast<DWORD>(data.size()))) {
     PLOG(FATAL) << "GetFileInformationByHandleEx";
   }
   FILE_NAME_INFO* file_name_info =
-      reinterpret_cast<FILE_NAME_INFO*>(data.get());
+      reinterpret_cast<FILE_NAME_INFO*>(data.data());
   pipe_name_ =
       L"\\\\.\\pipe" + std::wstring(file_name_info->FileName,
                                     file_name_info->FileNameLength /
@@ -306,7 +308,7 @@ void ExceptionHandlerServer::InitializeWithInheritedDataForInitialClient(
 void ExceptionHandlerServer::Run(Delegate* delegate) {
   uint64_t shutdown_token = base::RandUint64();
   ScopedKernelHANDLE thread_handles[kPipeInstances];
-  for (size_t i = 0; i < base::size(thread_handles); ++i) {
+  for (size_t i = 0; i < std::size(thread_handles); ++i) {
     HANDLE pipe;
     if (first_pipe_instance_.is_valid()) {
       pipe = first_pipe_instance_.release();
@@ -358,7 +360,7 @@ void ExceptionHandlerServer::Run(Delegate* delegate) {
   }
 
   // Signal to the named pipe instances that they should terminate.
-  for (size_t i = 0; i < base::size(thread_handles); ++i) {
+  for (size_t i = 0; i < std::size(thread_handles); ++i) {
     ClientToServerMessage message;
     memset(&message, 0, sizeof(message));
     message.type = ClientToServerMessage::kShutdown;
diff --git a/extern/crashpad/crashpad/util/win/exception_handler_server.h b/extern/crashpad/crashpad/util/win/exception_handler_server.h
index 6d9a367ce7..6f67ce8adc 100644
--- a/extern/crashpad/crashpad/util/win/exception_handler_server.h
+++ b/extern/crashpad/crashpad/util/win/exception_handler_server.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/exception_handler_server_test.cc b/extern/crashpad/crashpad/util/win/exception_handler_server_test.cc
index ed83e16b00..058fb9969a 100644
--- a/extern/crashpad/crashpad/util/win/exception_handler_server_test.cc
+++ b/extern/crashpad/crashpad/util/win/exception_handler_server_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/get_function.cc b/extern/crashpad/crashpad/util/win/get_function.cc
index 91a91652a8..cd820311d0 100644
--- a/extern/crashpad/crashpad/util/win/get_function.cc
+++ b/extern/crashpad/crashpad/util/win/get_function.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/get_function.h b/extern/crashpad/crashpad/util/win/get_function.h
index 50e5f1505c..23ccca629f 100644
--- a/extern/crashpad/crashpad/util/win/get_function.h
+++ b/extern/crashpad/crashpad/util/win/get_function.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/get_function_test.cc b/extern/crashpad/crashpad/util/win/get_function_test.cc
index a54ce7d444..ee61f2d549 100644
--- a/extern/crashpad/crashpad/util/win/get_function_test.cc
+++ b/extern/crashpad/crashpad/util/win/get_function_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/get_module_information.cc b/extern/crashpad/crashpad/util/win/get_module_information.cc
index 850bfe1299..873ce16e6d 100644
--- a/extern/crashpad/crashpad/util/win/get_module_information.cc
+++ b/extern/crashpad/crashpad/util/win/get_module_information.cc
@@ -1,4 +1,4 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
+// Copyright 2016 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/get_module_information.h b/extern/crashpad/crashpad/util/win/get_module_information.h
index 8fce035000..ca9a800d8d 100644
--- a/extern/crashpad/crashpad/util/win/get_module_information.h
+++ b/extern/crashpad/crashpad/util/win/get_module_information.h
@@ -1,4 +1,4 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
+// Copyright 2016 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/handle.cc b/extern/crashpad/crashpad/util/win/handle.cc
index 1744ecc20d..1633d8ed2d 100644
--- a/extern/crashpad/crashpad/util/win/handle.cc
+++ b/extern/crashpad/crashpad/util/win/handle.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/handle.h b/extern/crashpad/crashpad/util/win/handle.h
index 951302e2fb..44da2b50da 100644
--- a/extern/crashpad/crashpad/util/win/handle.h
+++ b/extern/crashpad/crashpad/util/win/handle.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/handle_test.cc b/extern/crashpad/crashpad/util/win/handle_test.cc
index 5898943d20..3b1b3fd312 100644
--- a/extern/crashpad/crashpad/util/win/handle_test.cc
+++ b/extern/crashpad/crashpad/util/win/handle_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/initial_client_data.cc b/extern/crashpad/crashpad/util/win/initial_client_data.cc
index cbeecf164a..d74d66c262 100644
--- a/extern/crashpad/crashpad/util/win/initial_client_data.cc
+++ b/extern/crashpad/crashpad/util/win/initial_client_data.cc
@@ -1,4 +1,4 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
+// Copyright 2016 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 #include <vector>
 
+#include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "util/stdlib/string_number_conversion.h"
@@ -99,7 +100,8 @@ bool InitialClientData::InitializeFromString(const std::string& str) {
 }
 
 std::string InitialClientData::StringRepresentation() const {
-  return base::StringPrintf("0x%x,0x%x,0x%x,0x%x,0x%x,0x%I64x,0x%I64x,0x%I64x",
+  return base::StringPrintf("0x%x,0x%x,0x%x,0x%x,0x%x,0x%" PRIx64 ",0x%" PRIx64
+                            ",0x%" PRIx64,
                             HandleToInt(request_crash_dump_),
                             HandleToInt(request_non_crash_dump_),
                             HandleToInt(non_crash_dump_completed_),
diff --git a/extern/crashpad/crashpad/util/win/initial_client_data.h b/extern/crashpad/crashpad/util/win/initial_client_data.h
index 856de8d890..4d52ba833b 100644
--- a/extern/crashpad/crashpad/util/win/initial_client_data.h
+++ b/extern/crashpad/crashpad/util/win/initial_client_data.h
@@ -1,4 +1,4 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
+// Copyright 2016 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/initial_client_data_test.cc b/extern/crashpad/crashpad/util/win/initial_client_data_test.cc
index 2121249417..4d24aaac0e 100644
--- a/extern/crashpad/crashpad/util/win/initial_client_data_test.cc
+++ b/extern/crashpad/crashpad/util/win/initial_client_data_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
+// Copyright 2016 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/loader_lock.cc b/extern/crashpad/crashpad/util/win/loader_lock.cc
index 187ef84eae..8ac1edc844 100644
--- a/extern/crashpad/crashpad/util/win/loader_lock.cc
+++ b/extern/crashpad/crashpad/util/win/loader_lock.cc
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/loader_lock.h b/extern/crashpad/crashpad/util/win/loader_lock.h
index 6c6b311f38..524597dbe5 100644
--- a/extern/crashpad/crashpad/util/win/loader_lock.h
+++ b/extern/crashpad/crashpad/util/win/loader_lock.h
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/loader_lock_test.cc b/extern/crashpad/crashpad/util/win/loader_lock_test.cc
index d33ea5acb5..a8522281da 100644
--- a/extern/crashpad/crashpad/util/win/loader_lock_test.cc
+++ b/extern/crashpad/crashpad/util/win/loader_lock_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/loader_lock_test_dll.cc b/extern/crashpad/crashpad/util/win/loader_lock_test_dll.cc
index b673ab3dd0..38fcdc2cf9 100644
--- a/extern/crashpad/crashpad/util/win/loader_lock_test_dll.cc
+++ b/extern/crashpad/crashpad/util/win/loader_lock_test_dll.cc
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/module_version.cc b/extern/crashpad/crashpad/util/win/module_version.cc
index fa54437bda..e06236694e 100644
--- a/extern/crashpad/crashpad/util/win/module_version.cc
+++ b/extern/crashpad/crashpad/util/win/module_version.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,8 +17,7 @@
 #include <windows.h>
 #include <stdint.h>
 
-#include <memory>
-
+#include "base/containers/heap_array.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 
@@ -33,15 +32,18 @@ bool GetModuleVersionAndType(const base::FilePath& path,
     return false;
   }
 
-  std::unique_ptr<uint8_t[]> data(new uint8_t[size]);
-  if (!GetFileVersionInfo(path.value().c_str(), 0, size, data.get())) {
+  auto data = base::HeapArray<uint8_t>::Uninit(size);
+  if (!GetFileVersionInfo(path.value().c_str(),
+                          0,
+                          static_cast<DWORD>(data.size()),
+                          data.data())) {
     PLOG(WARNING) << "GetFileVersionInfo: " << base::WideToUTF8(path.value());
     return false;
   }
 
   VS_FIXEDFILEINFO* fixed_file_info;
   UINT ffi_size;
-  if (!VerQueryValue(data.get(),
+  if (!VerQueryValue(data.data(),
                      L"\\",
                      reinterpret_cast<void**>(&fixed_file_info),
                      &ffi_size)) {
diff --git a/extern/crashpad/crashpad/util/win/module_version.h b/extern/crashpad/crashpad/util/win/module_version.h
index afc2a508b7..3f504f7753 100644
--- a/extern/crashpad/crashpad/util/win/module_version.h
+++ b/extern/crashpad/crashpad/util/win/module_version.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/nt_internals.cc b/extern/crashpad/crashpad/util/win/nt_internals.cc
index 87c6808cea..001d6ac17a 100644
--- a/extern/crashpad/crashpad/util/win/nt_internals.cc
+++ b/extern/crashpad/crashpad/util/win/nt_internals.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/nt_internals.h b/extern/crashpad/crashpad/util/win/nt_internals.h
index dad0405691..9e9f018718 100644
--- a/extern/crashpad/crashpad/util/win/nt_internals.h
+++ b/extern/crashpad/crashpad/util/win/nt_internals.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/ntstatus_logging.cc b/extern/crashpad/crashpad/util/win/ntstatus_logging.cc
index 7a1341952b..d4cd72c475 100644
--- a/extern/crashpad/crashpad/util/win/ntstatus_logging.cc
+++ b/extern/crashpad/crashpad/util/win/ntstatus_logging.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,10 +14,13 @@
 
 #include "util/win/ntstatus_logging.h"
 
+#include <iterator>
 #include <string>
 
-#include "base/cxx17_backports.h"
+#include "base/immediate_crash.h"
+#include "base/scoped_clear_last_error.h"
 #include "base/strings/stringprintf.h"
+#include "build/build_config.h"
 
 namespace {
 
@@ -30,7 +33,7 @@ std::string FormatNtstatus(DWORD ntstatus) {
       ntstatus,
       0,
       msgbuf,
-      static_cast<DWORD>(base::size(msgbuf)),
+      static_cast<DWORD>(std::size(msgbuf)),
       nullptr);
   if (len) {
     // Most system messages end in a period and a space. Remove the space if
@@ -68,8 +71,29 @@ NtstatusLogMessage::NtstatusLogMessage(
 }
 
 NtstatusLogMessage::~NtstatusLogMessage() {
+  AppendError();
+}
+
+void NtstatusLogMessage::AppendError() {
+  // Don't let actions from this method affect the system error after returning.
+  base::ScopedClearLastError scoped_clear_last_error;
+
   stream() << ": " << FormatNtstatus(ntstatus_)
            << base::StringPrintf(" (0x%08lx)", ntstatus_);
 }
 
+#if defined(COMPILER_MSVC)
+// Ignore warning that ~NtStatusLogMessageFatal never returns.
+#pragma warning(push)
+#pragma warning(disable : 4722)
+#endif  // COMPILER_MSVC
+NtstatusLogMessageFatal::~NtstatusLogMessageFatal() {
+  AppendError();
+  Flush();
+  base::ImmediateCrash();
+}
+#if defined(COMPILER_MSVC)
+#pragma warning(pop)  // C4722
+#endif  // COMPILER_MSVC
+
 }  // namespace logging
diff --git a/extern/crashpad/crashpad/util/win/ntstatus_logging.h b/extern/crashpad/crashpad/util/win/ntstatus_logging.h
index 24e6d90ad3..183c906787 100644
--- a/extern/crashpad/crashpad/util/win/ntstatus_logging.h
+++ b/extern/crashpad/crashpad/util/win/ntstatus_logging.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -37,10 +37,19 @@ class NtstatusLogMessage : public logging::LogMessage {
 
   ~NtstatusLogMessage();
 
+ protected:
+  void AppendError();
+
  private:
   DWORD ntstatus_;
 };
 
+class NtstatusLogMessageFatal final : public NtstatusLogMessage {
+ public:
+  using NtstatusLogMessage::NtstatusLogMessage;
+  [[noreturn]] ~NtstatusLogMessageFatal() override;
+};
+
 }  // namespace logging
 
 #define NTSTATUS_LOG_STREAM(severity, ntstatus) \
diff --git a/extern/crashpad/crashpad/util/win/process_info.cc b/extern/crashpad/crashpad/util/win/process_info.cc
index 49a6f27fd4..910b183fde 100644
--- a/extern/crashpad/crashpad/util/win/process_info.cc
+++ b/extern/crashpad/crashpad/util/win/process_info.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -23,6 +23,8 @@
 #include <new>
 #include <type_traits>
 
+#include "base/check_op.h"
+#include "base/containers/heap_array.h"
 #include "base/logging.h"
 #include "base/memory/free_deleter.h"
 #include "base/process/memory.h"
@@ -146,33 +148,34 @@ MEMORY_BASIC_INFORMATION64 MemoryBasicInformationToMemoryBasicInformation64(
 
 // NtQueryObject with a retry for size mismatch as well as a minimum size to
 // retrieve (and expect).
-std::unique_ptr<uint8_t[]> QueryObject(
+base::HeapArray<uint8_t> QueryObject(
     HANDLE handle,
     OBJECT_INFORMATION_CLASS object_information_class,
     ULONG minimum_size) {
-  ULONG size = minimum_size;
   ULONG return_length;
-  std::unique_ptr<uint8_t[]> buffer(new uint8_t[size]);
-  NTSTATUS status = crashpad::NtQueryObject(
-      handle, object_information_class, buffer.get(), size, &return_length);
+  auto buffer = base::HeapArray<uint8_t>::Uninit(minimum_size);
+  NTSTATUS status = crashpad::NtQueryObject(handle,
+                                            object_information_class,
+                                            buffer.data(),
+                                            (ULONG)buffer.size(),
+                                            &return_length);
   if (status == STATUS_INFO_LENGTH_MISMATCH) {
-    DCHECK_GT(return_length, size);
-    size = return_length;
-
-    // Free the old buffer before attempting to allocate a new one.
-    buffer.reset();
-
-    buffer.reset(new uint8_t[size]);
-    status = crashpad::NtQueryObject(
-        handle, object_information_class, buffer.get(), size, &return_length);
+    DCHECK_GT(return_length, buffer.size());
+
+    buffer = base::HeapArray<uint8_t>::Uninit(return_length);
+    status = crashpad::NtQueryObject(handle,
+                                     object_information_class,
+                                     buffer.data(),
+                                     (ULONG)buffer.size(),
+                                     &return_length);
   }
 
   if (!NT_SUCCESS(status)) {
     NTSTATUS_LOG(ERROR, status) << "NtQueryObject";
-    return nullptr;
+    return base::HeapArray<uint8_t>();
   }
 
-  DCHECK_LE(return_length, size);
+  DCHECK_LE(return_length, buffer.size());
   DCHECK_GE(return_length, minimum_size);
   return buffer;
 }
@@ -412,14 +415,14 @@ std::vector<ProcessInfo::Handle> ProcessInfo::BuildHandleVector(
       // information, but include the information that we do have already.
       ScopedKernelHANDLE scoped_dup_handle(dup_handle);
 
-      std::unique_ptr<uint8_t[]> object_basic_information_buffer =
+      auto object_basic_information_buffer =
           QueryObject(dup_handle,
                       ObjectBasicInformation,
                       sizeof(PUBLIC_OBJECT_BASIC_INFORMATION));
-      if (object_basic_information_buffer) {
+      if (!object_basic_information_buffer.empty()) {
         PUBLIC_OBJECT_BASIC_INFORMATION* object_basic_information =
             reinterpret_cast<PUBLIC_OBJECT_BASIC_INFORMATION*>(
-                object_basic_information_buffer.get());
+                object_basic_information_buffer.data());
         // The Attributes and GrantedAccess sometimes differ slightly between
         // the data retrieved in SYSTEM_HANDLE_INFORMATION_EX and
         // PUBLIC_OBJECT_TYPE_INFORMATION. We prefer the values in
@@ -438,14 +441,14 @@ std::vector<ProcessInfo::Handle> ProcessInfo::BuildHandleVector(
         result_handle.handle_count = object_basic_information->HandleCount - 1;
       }
 
-      std::unique_ptr<uint8_t[]> object_type_information_buffer =
+      auto object_type_information_buffer =
           QueryObject(dup_handle,
                       ObjectTypeInformation,
                       sizeof(PUBLIC_OBJECT_TYPE_INFORMATION));
-      if (object_type_information_buffer) {
+      if (!object_type_information_buffer.empty()) {
         PUBLIC_OBJECT_TYPE_INFORMATION* object_type_information =
             reinterpret_cast<PUBLIC_OBJECT_TYPE_INFORMATION*>(
-                object_type_information_buffer.get());
+                object_type_information_buffer.data());
 
         DCHECK_EQ(object_type_information->TypeName.Length %
                       sizeof(result_handle.type_name[0]),
diff --git a/extern/crashpad/crashpad/util/win/process_info.h b/extern/crashpad/crashpad/util/win/process_info.h
index 7b28a65f11..c72ba70296 100644
--- a/extern/crashpad/crashpad/util/win/process_info.h
+++ b/extern/crashpad/crashpad/util/win/process_info.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/process_info_test.cc b/extern/crashpad/crashpad/util/win/process_info_test.cc
index b5de341ebc..edd4c417d5 100644
--- a/extern/crashpad/crashpad/util/win/process_info_test.cc
+++ b/extern/crashpad/crashpad/util/win/process_info_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 
 #include <memory>
 
+#include "base/containers/heap_array.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
@@ -507,26 +508,23 @@ TEST(ProcessInfo, ReadableRanges) {
 
   // Also make sure what we think we can read corresponds with what we can
   // actually read.
-  std::unique_ptr<unsigned char[]> into(new unsigned char[kBlockSize * 6]);
+  auto into = base::HeapArray<unsigned char>::Uninit(kBlockSize * 6);
   SIZE_T bytes_read;
 
   EXPECT_TRUE(ReadProcessMemory(
-      current_process, readable1, into.get(), kBlockSize, &bytes_read));
+      current_process, readable1, into.data(), kBlockSize, &bytes_read));
   EXPECT_EQ(bytes_read, kBlockSize);
 
   EXPECT_TRUE(ReadProcessMemory(
-      current_process, readable2, into.get(), kBlockSize * 2, &bytes_read));
+      current_process, readable2, into.data(), kBlockSize * 2, &bytes_read));
   EXPECT_EQ(bytes_read, kBlockSize * 2);
 
   EXPECT_FALSE(ReadProcessMemory(
-      current_process, no_access, into.get(), kBlockSize, &bytes_read));
+      current_process, no_access, into.data(), kBlockSize, &bytes_read));
   EXPECT_FALSE(ReadProcessMemory(
-      current_process, reserve_region, into.get(), kBlockSize, &bytes_read));
-  EXPECT_FALSE(ReadProcessMemory(current_process,
-                                 reserve_region,
-                                 into.get(),
-                                 kBlockSize * 6,
-                                 &bytes_read));
+      current_process, reserve_region, into.data(), kBlockSize, &bytes_read));
+  EXPECT_FALSE(ReadProcessMemory(
+      current_process, reserve_region, into.data(), into.size(), &bytes_read));
 }
 
 TEST(ProcessInfo, Handles) {
@@ -633,15 +631,15 @@ TEST(ProcessInfo, Handles) {
 }
 
 TEST(ProcessInfo, OutOfRangeCheck) {
-  constexpr size_t kAllocationSize = 12345;
-  std::unique_ptr<char[]> safe_memory(new char[kAllocationSize]);
+  auto safe_memory = base::HeapArray<char>::Uninit(12345);
 
   ProcessInfo info;
   info.Initialize(GetCurrentProcess());
 
   EXPECT_TRUE(
       info.LoggingRangeIsFullyReadable(CheckedRange<WinVMAddress, WinVMSize>(
-          FromPointerCast<WinVMAddress>(safe_memory.get()), kAllocationSize)));
+          FromPointerCast<WinVMAddress>(safe_memory.data()),
+          safe_memory.size())));
   EXPECT_FALSE(info.LoggingRangeIsFullyReadable(
       CheckedRange<WinVMAddress, WinVMSize>(0, 1024)));
 }
diff --git a/extern/crashpad/crashpad/util/win/process_info_test_child.cc b/extern/crashpad/crashpad/util/win/process_info_test_child.cc
index 1de1e8b232..92fce0f6cc 100644
--- a/extern/crashpad/crashpad/util/win/process_info_test_child.cc
+++ b/extern/crashpad/crashpad/util/win/process_info_test_child.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/process_structs.h b/extern/crashpad/crashpad/util/win/process_structs.h
index d9b5b2fa6f..89ecc1d73f 100644
--- a/extern/crashpad/crashpad/util/win/process_structs.h
+++ b/extern/crashpad/crashpad/util/win/process_structs.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/registration_protocol_win.cc b/extern/crashpad/crashpad/util/win/registration_protocol_win.cc
index e3d55c6650..95111f9c5f 100644
--- a/extern/crashpad/crashpad/util/win/registration_protocol_win.cc
+++ b/extern/crashpad/crashpad/util/win/registration_protocol_win.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,7 +19,9 @@
 #include <sddl.h>
 #include <stddef.h>
 
-#include "base/cxx17_backports.h"
+#include <iterator>
+
+#include "base/check.h"
 #include "base/logging.h"
 #include "util/win/exception_handler_server.h"
 #include "util/win/loader_lock.h"
@@ -209,8 +211,7 @@ const void* GetFallbackSecurityDescriptorForNamedPipeInstance(size_t* size) {
               ACL_REVISION,  // AclRevision.
               0,  // Sbz1.
               sizeof(kSecDescBlob.sacl),  // AclSize.
-              static_cast<WORD>(
-                  base::size(kSecDescBlob.sacl.ace)),  // AceCount.
+              static_cast<WORD>(std::size(kSecDescBlob.sacl.ace)),  // AceCount.
               0,  // Sbz2.
           },
 
@@ -231,8 +232,8 @@ const void* GetFallbackSecurityDescriptorForNamedPipeInstance(size_t* size) {
                   {
                       SID_REVISION,  // Revision.
                                      // SubAuthorityCount.
-                      static_cast<BYTE>(base::size(
-                          kSecDescBlob.sacl.ace[0].sid.SubAuthority)),
+                      static_cast<BYTE>(
+                          std::size(kSecDescBlob.sacl.ace[0].sid.SubAuthority)),
                       // IdentifierAuthority.
                       {SECURITY_MANDATORY_LABEL_AUTHORITY},
                       {SECURITY_MANDATORY_UNTRUSTED_RID},  // SubAuthority.
diff --git a/extern/crashpad/crashpad/util/win/registration_protocol_win.h b/extern/crashpad/crashpad/util/win/registration_protocol_win.h
index 690d61242e..c0dba07cec 100644
--- a/extern/crashpad/crashpad/util/win/registration_protocol_win.h
+++ b/extern/crashpad/crashpad/util/win/registration_protocol_win.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,109 +21,10 @@
 #include <string>
 
 #include "util/win/address_types.h"
+#include "util/win/registration_protocol_win_structs.h"
 
 namespace crashpad {
 
-#pragma pack(push, 1)
-
-//! \brief Structure read out of the client process by the crash handler when an
-//!     exception occurs.
-struct ExceptionInformation {
-  //! \brief The address of an EXCEPTION_POINTERS structure in the client
-  //!     process that describes the exception.
-  WinVMAddress exception_pointers;
-
-  //! \brief The thread on which the exception happened.
-  DWORD thread_id;
-};
-
-//! \brief A client registration request.
-struct RegistrationRequest {
-  //! \brief The expected value of `version`. This should be changed whenever
-  //!     the messages or ExceptionInformation are modified incompatibly.
-  enum { kMessageVersion = 1 };
-
-  //! \brief Version field to detect skew between client and server. Should be
-  //!     set to kMessageVersion.
-  int version;
-
-  //! \brief The PID of the client process.
-  DWORD client_process_id;
-
-  //! \brief The address, in the client process's address space, of an
-  //!     ExceptionInformation structure, used when handling a crash dump
-  //!     request.
-  WinVMAddress crash_exception_information;
-
-  //! \brief The address, in the client process's address space, of an
-  //!     ExceptionInformation structure, used when handling a non-crashing dump
-  //!     request.
-  WinVMAddress non_crash_exception_information;
-
-  //! \brief The address, in the client process's address space, of a
-  //!     `CRITICAL_SECTION` allocated with a valid .DebugInfo field. This can
-  //!     be accomplished by using
-  //!     InitializeCriticalSectionWithDebugInfoIfPossible() or equivalent. This
-  //!     value can be `0`, however then limited lock data will be available in
-  //!     minidumps.
-  WinVMAddress critical_section_address;
-};
-
-//! \brief A message only sent to the server by itself to trigger shutdown.
-struct ShutdownRequest {
-  //! \brief A randomly generated token used to validate the the shutdown
-  //!     request was not sent from another process.
-  uint64_t token;
-};
-
-//! \brief The message passed from client to server by
-//!     SendToCrashHandlerServer().
-struct ClientToServerMessage {
-  //! \brief Indicates which field of the union is in use.
-  enum Type : uint32_t {
-    //! \brief For RegistrationRequest.
-    kRegister,
-
-    //! \brief For ShutdownRequest.
-    kShutdown,
-
-    //! \brief An empty message sent by the initial client in asynchronous mode.
-    //!     No data is required, this just confirms that the server is ready to
-    //!     accept client registrations.
-    kPing,
-  } type;
-
-  union {
-    RegistrationRequest registration;
-    ShutdownRequest shutdown;
-  };
-};
-
-//! \brief A client registration response.
-struct RegistrationResponse {
-  //! \brief An event `HANDLE`, valid in the client process, that should be
-  //!     signaled to request a crash report. Clients should convert the value
-  //!     to a `HANDLE` by calling IntToHandle().
-  int request_crash_dump_event;
-
-  //! \brief An event `HANDLE`, valid in the client process, that should be
-  //!     signaled to request a non-crashing dump be taken. Clients should
-  //!     convert the value to a `HANDLE` by calling IntToHandle().
-  int request_non_crash_dump_event;
-
-  //! \brief An event `HANDLE`, valid in the client process, that will be
-  //!     signaled by the server when the non-crashing dump is complete. Clients
-  //!     should convert the value to a `HANDLE` by calling IntToHandle().
-  int non_crash_dump_completed_event;
-};
-
-//! \brief The response sent back to the client via SendToCrashHandlerServer().
-union ServerToClientMessage {
-  RegistrationResponse registration;
-};
-
-#pragma pack(pop)
-
 //! \brief Connect over the given \a pipe_name, passing \a message to the
 //!     server, storing the server's reply into \a response.
 //!
diff --git a/extern/crashpad/crashpad/util/win/registration_protocol_win_structs.h b/extern/crashpad/crashpad/util/win/registration_protocol_win_structs.h
new file mode 100644
index 0000000000..f4ad4fd5ae
--- /dev/null
+++ b/extern/crashpad/crashpad/util/win/registration_protocol_win_structs.h
@@ -0,0 +1,169 @@
+// Copyright 2015 The Crashpad Authors
+//
+// 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.
+
+#ifndef CRASHPAD_UTIL_WIN_REGISTRATION_PROTOCOL_WIN_STRUCTS_H_
+#define CRASHPAD_UTIL_WIN_REGISTRATION_PROTOCOL_WIN_STRUCTS_H_
+
+#include <windows.h>
+#include <stdint.h>
+
+#include "util/win/address_types.h"
+
+namespace crashpad {
+
+#pragma pack(push, 1)
+
+//! \brief Structure read out of the client process by the crash handler when an
+//!     exception occurs.
+struct ExceptionInformation {
+  //! \brief The address of an EXCEPTION_POINTERS structure in the client
+  //!     process that describes the exception.
+  WinVMAddress exception_pointers;
+
+  //! \brief The thread on which the exception happened.
+  DWORD thread_id;
+};
+
+//! \brief Context to be passed to WerRegisterRuntimeExceptionModule().
+//!
+//! Used by the crashpad client, and the WER exception DLL.
+struct WerRegistration {
+  //! \brief The expected value of `version`. This should be changed whenever
+  //!     this struct is modified incompatibly.
+  enum { kWerRegistrationVersion = 1 };
+  //! \brief Version field to detect skew between target process and helper.
+  //!     Should be set to kWerRegistrationVersion.
+  int version;
+  //! \brief Used by DumpWithoutCrashing and the WER module to initiate a dump.
+  //!     These handles are leaked in the client process.
+  HANDLE dump_without_crashing;
+  //! \brief Used by DumpWithoutCrashing to signal that a dump has been taken.
+  //!     These handles are leaked in the client process.
+  HANDLE dump_completed;
+  //! \brief Set just before and cleared just after the events above are
+  //!     triggered or signalled in a normal DumpWithoutCrashing call.
+  //! When `true` the WER handler should not set the exception structures until
+  //! after dump_completed has been signalled.
+  bool in_dump_without_crashing;
+  //! \brief Address of g_non_crash_exception_information.
+  //!
+  //! Provided by the target process. Just before dumping we will point
+  //! (*crashpad_exception_info).exception_pointers at `pointers`. As WerFault
+  //! loads the helper with the same bitness as the client this can be void*.
+  void* crashpad_exception_info;
+  //! \brief These will point into the `exception` and `context` members in this
+  //!     structure.
+  //!
+  //! Filled in by the helper DLL.
+  EXCEPTION_POINTERS pointers;
+  //! \brief The exception provided by WerFault.
+  //!
+  //! Filled in by the helper DLL.
+  EXCEPTION_RECORD exception;
+  //! \brief The context provided by WerFault.
+  //!
+  //! Filled in by the helper DLL.
+  CONTEXT context;
+};
+
+//! \brief A client registration request.
+struct RegistrationRequest {
+  //! \brief The expected value of `version`. This should be changed whenever
+  //!     the messages or ExceptionInformation are modified incompatibly.
+  enum { kMessageVersion = 1 };
+
+  //! \brief Version field to detect skew between client and server. Should be
+  //!     set to kMessageVersion.
+  int version;
+
+  //! \brief The PID of the client process.
+  DWORD client_process_id;
+
+  //! \brief The address, in the client process's address space, of an
+  //!     ExceptionInformation structure, used when handling a crash dump
+  //!     request.
+  WinVMAddress crash_exception_information;
+
+  //! \brief The address, in the client process's address space, of an
+  //!     ExceptionInformation structure, used when handling a non-crashing dump
+  //!     request.
+  WinVMAddress non_crash_exception_information;
+
+  //! \brief The address, in the client process's address space, of a
+  //!     `CRITICAL_SECTION` allocated with a valid .DebugInfo field. This can
+  //!     be accomplished by using
+  //!     InitializeCriticalSectionWithDebugInfoIfPossible() or equivalent. This
+  //!     value can be `0`, however then limited lock data will be available in
+  //!     minidumps.
+  WinVMAddress critical_section_address;
+};
+
+//! \brief A message only sent to the server by itself to trigger shutdown.
+struct ShutdownRequest {
+  //! \brief A randomly generated token used to validate the the shutdown
+  //!     request was not sent from another process.
+  uint64_t token;
+};
+
+//! \brief The message passed from client to server by
+//!     SendToCrashHandlerServer().
+struct ClientToServerMessage {
+  //! \brief Indicates which field of the union is in use.
+  enum Type : uint32_t {
+    //! \brief For RegistrationRequest.
+    kRegister,
+
+    //! \brief For ShutdownRequest.
+    kShutdown,
+
+    //! \brief An empty message sent by the initial client in asynchronous mode.
+    //!     No data is required, this just confirms that the server is ready to
+    //!     accept client registrations.
+    kPing,
+  } type;
+
+  union {
+    RegistrationRequest registration;
+    ShutdownRequest shutdown;
+  };
+};
+
+//! \brief A client registration response.
+struct RegistrationResponse {
+  //! \brief An event `HANDLE`, valid in the client process, that should be
+  //!     signaled to request a crash report. Clients should convert the value
+  //!     to a `HANDLE` by calling IntToHandle().
+  int request_crash_dump_event;
+
+  //! \brief An event `HANDLE`, valid in the client process, that should be
+  //!     signaled to request a non-crashing dump be taken. Clients should
+  //!     convert the value to a `HANDLE` by calling IntToHandle().
+  int request_non_crash_dump_event;
+
+  //! \brief An event `HANDLE`, valid in the client process, that will be
+  //!     signaled by the server when the non-crashing dump is complete. Clients
+  //!     should convert the value to a `HANDLE` by calling IntToHandle().
+  int non_crash_dump_completed_event;
+};
+
+//! \brief The response sent back to the client via SendToCrashHandlerServer().
+union ServerToClientMessage {
+  RegistrationResponse registration;
+};
+
+#pragma pack(pop)
+
+}  // namespace crashpad
+
+#endif  // CRASHPAD_UTIL_WIN_REGISTRATION_PROTOCOL_WIN_STRUCTS_H_
diff --git a/extern/crashpad/crashpad/util/win/registration_protocol_win_test.cc b/extern/crashpad/crashpad/util/win/registration_protocol_win_test.cc
index 2cea7d250a..4538d23c96 100644
--- a/extern/crashpad/crashpad/util/win/registration_protocol_win_test.cc
+++ b/extern/crashpad/crashpad/util/win/registration_protocol_win_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
+// Copyright 2016 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -99,7 +99,6 @@ void CheckAce(PACL acl,
     } break;
     default:
       NOTREACHED();
-      break;
   }
 
   ASSERT_EQ(check_mask, mask);
diff --git a/extern/crashpad/crashpad/util/win/safe_terminate_process.asm b/extern/crashpad/crashpad/util/win/safe_terminate_process.asm
index b219a9e659..278b9c52aa 100644
--- a/extern/crashpad/crashpad/util/win/safe_terminate_process.asm
+++ b/extern/crashpad/crashpad/util/win/safe_terminate_process.asm
@@ -1,4 +1,4 @@
-; Copyright 2017 The Crashpad Authors. All rights reserved.
+; Copyright 2017 The Crashpad Authors
 ;
 ; Licensed under the Apache License, Version 2.0 (the "License");
 ; you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/safe_terminate_process.h b/extern/crashpad/crashpad/util/win/safe_terminate_process.h
index 7079eb2adc..85f95f2c3d 100644
--- a/extern/crashpad/crashpad/util/win/safe_terminate_process.h
+++ b/extern/crashpad/crashpad/util/win/safe_terminate_process.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/safe_terminate_process_broken.cc b/extern/crashpad/crashpad/util/win/safe_terminate_process_broken.cc
deleted file mode 100644
index 2429c726ca..0000000000
--- a/extern/crashpad/crashpad/util/win/safe_terminate_process_broken.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
-//
-// 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.
-
-#include "util/win/safe_terminate_process.h"
-
-#include "base/logging.h"
-
-#if defined(ARCH_CPU_X86)
-
-namespace crashpad {
-
-bool SafeTerminateProcess(HANDLE process, UINT exit_code) {
-  // Third-party software that hooks TerminateProcess() incorrectly has been
-  // encountered in the wild. This version of SafeTerminateProcess() lacks
-  // protection against that, so don't use it in production.
-  LOG(WARNING)
-      << "Don't use this! For cross builds only. See https://crbug.com/777924.";
-  return TerminateProcess(process, exit_code) != FALSE;
-}
-
-}  // namespace crashpad
-
-#endif  // defined(ARCH_CPU_X86)
diff --git a/extern/crashpad/crashpad/util/win/safe_terminate_process_test.cc b/extern/crashpad/crashpad/util/win/safe_terminate_process_test.cc
index 6ca5aa6d3f..5796c365af 100644
--- a/extern/crashpad/crashpad/util/win/safe_terminate_process_test.cc
+++ b/extern/crashpad/crashpad/util/win/safe_terminate_process_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,11 +16,11 @@
 
 #include <string.h>
 
-#include <string>
+#include <iterator>
 #include <memory>
+#include <string>
 
 #include "base/check.h"
-#include "base/cxx17_backports.h"
 #include "base/files/file_path.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"
@@ -150,7 +150,7 @@ TEST(SafeTerminateProcess, PatchBadly) {
     };
 
     void* target = reinterpret_cast<void*>(TerminateProcess);
-    ScopedExecutablePatch executable_patch(target, patch, base::size(patch));
+    ScopedExecutablePatch executable_patch(target, patch, std::size(patch));
 
     // Make sure that SafeTerminateProcess() can be called. Since it’s been
     // patched with a no-op stub, GetLastError() shouldn’t be modified.
diff --git a/extern/crashpad/crashpad/util/win/safe_terminate_process_test_child.cc b/extern/crashpad/crashpad/util/win/safe_terminate_process_test_child.cc
index 605778b05a..2adddc45fd 100644
--- a/extern/crashpad/crashpad/util/win/safe_terminate_process_test_child.cc
+++ b/extern/crashpad/crashpad/util/win/safe_terminate_process_test_child.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/scoped_handle.cc b/extern/crashpad/crashpad/util/win/scoped_handle.cc
index c7afb310ba..b979134a2e 100644
--- a/extern/crashpad/crashpad/util/win/scoped_handle.cc
+++ b/extern/crashpad/crashpad/util/win/scoped_handle.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -32,5 +32,9 @@ void ScopedSearchHANDLECloseTraits::Free(HANDLE handle) {
   PCHECK(FindClose(handle)) << "FindClose";
 }
 
+void ScopedVectoredExceptionRegistrationCloseTraits::Free(PVOID handle) {
+  PCHECK(::RemoveVectoredExceptionHandler(handle));
+}
+
 }  // namespace internal
 }  // namespace crashpad
diff --git a/extern/crashpad/crashpad/util/win/scoped_handle.h b/extern/crashpad/crashpad/util/win/scoped_handle.h
index a5893b843b..62e7e8075c 100644
--- a/extern/crashpad/crashpad/util/win/scoped_handle.h
+++ b/extern/crashpad/crashpad/util/win/scoped_handle.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
+// Copyright 2014 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -38,6 +38,11 @@ struct ScopedSearchHANDLECloseTraits {
   static void Free(HANDLE handle);
 };
 
+struct ScopedVectoredExceptionRegistrationCloseTraits {
+  static PVOID InvalidValue() { return nullptr; }
+  static void Free(PVOID handle);
+};
+
 }  // namespace internal
 
 using ScopedFileHANDLE =
@@ -46,6 +51,9 @@ using ScopedKernelHANDLE =
     base::ScopedGeneric<HANDLE, internal::ScopedKernelHANDLECloseTraits>;
 using ScopedSearchHANDLE =
     base::ScopedGeneric<HANDLE, internal::ScopedSearchHANDLECloseTraits>;
+using ScopedVectoredExceptionRegistration = base::ScopedGeneric<
+    PVOID,
+    internal::ScopedVectoredExceptionRegistrationCloseTraits>;
 
 }  // namespace crashpad
 
diff --git a/extern/crashpad/crashpad/util/win/scoped_local_alloc.cc b/extern/crashpad/crashpad/util/win/scoped_local_alloc.cc
index 75838bc0f6..f547ffbf1c 100644
--- a/extern/crashpad/crashpad/util/win/scoped_local_alloc.cc
+++ b/extern/crashpad/crashpad/util/win/scoped_local_alloc.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/scoped_local_alloc.h b/extern/crashpad/crashpad/util/win/scoped_local_alloc.h
index b46078523e..56f794e0fe 100644
--- a/extern/crashpad/crashpad/util/win/scoped_local_alloc.h
+++ b/extern/crashpad/crashpad/util/win/scoped_local_alloc.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/scoped_process_suspend.cc b/extern/crashpad/crashpad/util/win/scoped_process_suspend.cc
index 721eb7f5f0..73f8fae431 100644
--- a/extern/crashpad/crashpad/util/win/scoped_process_suspend.cc
+++ b/extern/crashpad/crashpad/util/win/scoped_process_suspend.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/scoped_process_suspend.h b/extern/crashpad/crashpad/util/win/scoped_process_suspend.h
index e809723f4a..0b26cb5ae0 100644
--- a/extern/crashpad/crashpad/util/win/scoped_process_suspend.h
+++ b/extern/crashpad/crashpad/util/win/scoped_process_suspend.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/scoped_process_suspend_test.cc b/extern/crashpad/crashpad/util/win/scoped_process_suspend_test.cc
index d8ca62f803..eaeee0304d 100644
--- a/extern/crashpad/crashpad/util/win/scoped_process_suspend_test.cc
+++ b/extern/crashpad/crashpad/util/win/scoped_process_suspend_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/scoped_registry_key.h b/extern/crashpad/crashpad/util/win/scoped_registry_key.h
index 4393dc2099..0ed9992159 100644
--- a/extern/crashpad/crashpad/util/win/scoped_registry_key.h
+++ b/extern/crashpad/crashpad/util/win/scoped_registry_key.h
@@ -1,4 +1,4 @@
-// Copyright 2019 The Crashpad Authors. All rights reserved.
+// Copyright 2019 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -31,4 +31,4 @@ using ScopedRegistryKey =
 
 }  // namespace crashpad
 
-#endif  // CRASHPAD_UTIL_WIN_SCOPED_REGISTRY_KEY_H_
\ No newline at end of file
+#endif  // CRASHPAD_UTIL_WIN_SCOPED_REGISTRY_KEY_H_
diff --git a/extern/crashpad/crashpad/util/win/scoped_set_event.cc b/extern/crashpad/crashpad/util/win/scoped_set_event.cc
index 4a31cdf75c..3313d538e0 100644
--- a/extern/crashpad/crashpad/util/win/scoped_set_event.cc
+++ b/extern/crashpad/crashpad/util/win/scoped_set_event.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/scoped_set_event.h b/extern/crashpad/crashpad/util/win/scoped_set_event.h
index ba58d2bd56..91f509cfbd 100644
--- a/extern/crashpad/crashpad/util/win/scoped_set_event.h
+++ b/extern/crashpad/crashpad/util/win/scoped_set_event.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/session_end_watcher.cc b/extern/crashpad/crashpad/util/win/session_end_watcher.cc
index 1d47089978..ead6b7fc67 100644
--- a/extern/crashpad/crashpad/util/win/session_end_watcher.cc
+++ b/extern/crashpad/crashpad/util/win/session_end_watcher.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,6 +14,7 @@
 
 #include "util/win/session_end_watcher.h"
 
+#include "base/check.h"
 #include "base/logging.h"
 #include "base/scoped_generic.h"
 #include "util/win/scoped_set_event.h"
diff --git a/extern/crashpad/crashpad/util/win/session_end_watcher.h b/extern/crashpad/crashpad/util/win/session_end_watcher.h
index 6da1af85b4..ca644b8418 100644
--- a/extern/crashpad/crashpad/util/win/session_end_watcher.h
+++ b/extern/crashpad/crashpad/util/win/session_end_watcher.h
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/session_end_watcher_test.cc b/extern/crashpad/crashpad/util/win/session_end_watcher_test.cc
index d6749dac2c..f7891bde94 100644
--- a/extern/crashpad/crashpad/util/win/session_end_watcher_test.cc
+++ b/extern/crashpad/crashpad/util/win/session_end_watcher_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2017 The Crashpad Authors. All rights reserved.
+// Copyright 2017 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/termination_codes.h b/extern/crashpad/crashpad/util/win/termination_codes.h
index ce7fdba97a..d57e58ae68 100644
--- a/extern/crashpad/crashpad/util/win/termination_codes.h
+++ b/extern/crashpad/crashpad/util/win/termination_codes.h
@@ -1,4 +1,4 @@
-// Copyright 2016 The Crashpad Authors. All rights reserved.
+// Copyright 2016 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/traits.h b/extern/crashpad/crashpad/util/win/traits.h
index 7ddf0f2678..2338d4ba27 100644
--- a/extern/crashpad/crashpad/util/win/traits.h
+++ b/extern/crashpad/crashpad/util/win/traits.h
@@ -1,4 +1,4 @@
-// Copyright 2020 The Crashpad Authors. All rights reserved.
+// Copyright 2020 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/crashpad/crashpad/util/win/xp_compat.h b/extern/crashpad/crashpad/util/win/xp_compat.h
index 1d4d4a0b46..1499c08aa6 100644
--- a/extern/crashpad/crashpad/util/win/xp_compat.h
+++ b/extern/crashpad/crashpad/util/win/xp_compat.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Crashpad Authors. All rights reserved.
+// Copyright 2015 The Crashpad Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/extern/discord/CMakeLists.txt b/extern/discord/CMakeLists.txt
index cdf36f6aa5..187471dcc5 100644
--- a/extern/discord/CMakeLists.txt
+++ b/extern/discord/CMakeLists.txt
@@ -8,13 +8,13 @@ target_include_directories(discord INTERFACE include)
 # Platform-specific Social SDK library paths
 if(WIN32)
     set(DISCORD_LIB_PATH "${CMAKE_CURRENT_SOURCE_DIR}/lib/release/discord_partner_sdk.lib")
-    set(DISCORD_SHARED_LIB "${CMAKE_CURRENT_SOURCE_DIR}/lib/release/discord_partner_sdk.dll")
+    #set(DISCORD_SHARED_LIB "${CMAKE_CURRENT_SOURCE_DIR}/lib/release/discord_partner_sdk.dll")
 elseif(APPLE)
     set(DISCORD_LIB_PATH "${CMAKE_CURRENT_SOURCE_DIR}/lib/release/libdiscord_partner_sdk.dylib")
-    set(DISCORD_SHARED_LIB "${CMAKE_CURRENT_SOURCE_DIR}/lib/release/libdiscord_partner_sdk.dylib")
+    #set(DISCORD_SHARED_LIB "${CMAKE_CURRENT_SOURCE_DIR}/lib/release/libdiscord_partner_sdk.dylib")
 else() # Linux
     set(DISCORD_LIB_PATH "${CMAKE_CURRENT_SOURCE_DIR}/lib/release/libdiscord_partner_sdk.so")
-    set(DISCORD_SHARED_LIB "${CMAKE_CURRENT_SOURCE_DIR}/lib/release/libdiscord_partner_sdk.so")
+    #set(DISCORD_SHARED_LIB "${CMAKE_CURRENT_SOURCE_DIR}/lib/release/libdiscord_partner_sdk.so")
 endif()
 
 message(DISCORD_LIB_PATH="${DISCORD_LIB_PATH}")
diff --git a/src/Etterna/Singletons/GameState.cpp b/src/Etterna/Singletons/GameState.cpp
index e0ac61ef60..6f01352fee 100644
--- a/src/Etterna/Singletons/GameState.cpp
+++ b/src/Etterna/Singletons/GameState.cpp
@@ -30,18 +30,26 @@
 #include "Etterna/Models/Misc/Profile.h"
 #include "Etterna/Models/Songs/SongOptions.h"
 #include "Etterna/Globals/rngthing.h"
-#include "Core/Services/Locator.hpp"
+#include "Core/Services/Locator.hpp"
 
-#include <algorithm>
+#include <algorithm>
 
-#define DISCORDPP_IMPLEMENTATION
+#if !(defined(__linux__) && defined(__aarch64__)) && !defined(SUPPORT_DISCORD_SDK)
+#error Something went wrong - Discord Social SDK should be supported on "all" platforms except for Linux arm64
+#endif
+
+#ifdef SUPPORT_DISCORD_SDK
+#define DISCORDPP_IMPLEMENTATION
 #include "discordpp.h"
-
+#endif
+
 // global and accessible from anywhere in our program
-GameState* GAMESTATE = nullptr;
+GameState* GAMESTATE = nullptr;
 
+#ifdef SUPPORT_DISCORD_SDK
 discordpp::Client* DISCORD = nullptr;
 static const auto discord_appid = 378543094531883009;
+#endif
 
 class GameStateMessageHandler : public MessageSubscriber
 {
@@ -150,8 +158,8 @@ GameState::GameState()
 
 	// Don't reset yet; let the first screen do it, so we can use PREFSMAN and
 	// THEME.
-	// Reset();
-
+	// Reset();
+
 	discordInit();
 
 	// Register with Lua.
@@ -160,8 +168,8 @@ GameState::GameState()
 		lua_pushstring(L, "GAMESTATE");
 		this->PushSelf(L);
 		lua_settable(L, LUA_GLOBALSINDEX);
-		LUA->Release(L);
-
+		LUA->Release(L);
+
 		LUA->SetGlobal("MIN_MUSIC_RATE", MIN_MUSIC_RATE);
 		LUA->SetGlobal("MAX_MUSIC_RATE", MAX_MUSIC_RATE);
 	}
@@ -715,9 +723,11 @@ GameState::Update(float fDelta)
 {
 	m_SongOptions.Update(fDelta);
 
-	m_pPlayerState->Update(fDelta);
+	m_pPlayerState->Update(fDelta);
 
-	discordpp::RunCallbacks();
+#ifdef SUPPORT_DISCORD_SDK
+	discordpp::RunCallbacks();
+#endif
 }
 
 void
@@ -1276,6 +1286,7 @@ GetNextEnabledMultiPlayer(MultiPlayer mp)
 void
 GameState::discordInit()
 {
+#ifdef SUPPORT_DISCORD_SDK
 	if (DISCORD != nullptr) {
 		Locator::getLogger()->warn("Tried to initialize Discord twice. Skipped");
 		return;
@@ -1297,48 +1308,52 @@ GameState::discordInit()
 	  discordpp::LoggingSeverity::Error);
 	DISCORD->AddLogCallback(
 	  [](auto msg, auto severity) { Locator::getLogger()->info("{}", msg); },
-	  discordpp::LoggingSeverity::None);
-
-	updateDiscordPresenceMenu();
+	  discordpp::LoggingSeverity::None);
+
+	updateDiscordPresenceMenu();
+#else
+	Locator::getLogger()->warn("Discord presence not available for this platform");
+#endif
 }
 
 void
 GameState::updateDiscordPresence(const std::string& details,
-								 const std::string& state,
+								 const std::string& state,
 								 const uint64_t startTime,
 								 const uint64_t endTime)
 {
+#ifdef SUPPORT_DISCORD_SDK
 	Locator::getLogger()->info("Updating Discord Rich Presence (Gameplay/Eval)");
 	if (DISCORD == nullptr) {
-		discordInit();
-	}
-
+		discordInit();
+	}
+
 	std::string largeImageTextCpy = "Etterna";
-	auto setLargeImageTxt = false;
+	auto setLargeImageTxt = false;
 	if (PROFILEMAN && PROFILEMAN->GetProfile(PLAYER_1)) {
 		const auto& profile = PROFILEMAN->GetProfile(PLAYER_1);
 		largeImageTextCpy = fmt::format(
 		  "{}: {:5.2f}", profile->m_sDisplayName, profile->m_fPlayerRating);
-		setLargeImageTxt = true;
+		setLargeImageTxt = true;
 	}
 	if ((setLargeImageTxt && largeImageTextCpy.size() > 128) ||
 		!setLargeImageTxt) {
 		largeImageTextCpy = CommonMetrics::WINDOW_TITLE.GetValue().substr(0, 127);
-	}
-
+	}
+
 	std::string stateCpy = state;
 	if (state.size() < 2 || state.size() > 128) {
-		stateCpy = "Unknown";
-	}
+		stateCpy = "Unknown";
+	}
 
 	discordpp::ActivityTimestamps ts;
-	ts.SetEnd(endTime);
+	ts.SetEnd(endTime);
 	if (startTime > 0)
-		ts.SetStart(startTime);
-
+		ts.SetStart(startTime);
+
 	discordpp::ActivityAssets assets;
 	assets.SetLargeImage("default");
-	assets.SetLargeText(largeImageTextCpy.c_str());
+	assets.SetLargeText(largeImageTextCpy.c_str());
 
 	discordpp::Activity activity;
 	activity.SetType(discordpp::ActivityTypes::Playing);
@@ -1346,27 +1361,32 @@ GameState::updateDiscordPresence(const std::string& details,
 	activity.SetDetails(details.c_str());
 	activity.SetState(stateCpy.c_str());
 	activity.SetTimestamps(ts);
-	activity.SetAssets(assets);
-
+	activity.SetAssets(assets);
+
 	DISCORD->UpdateRichPresence(activity, [](discordpp::ClientResult result) {
 		if (result.Successful()) {
-			Locator::getLogger()->warn("Rich presence (Gameplay/Eval) successfully set");
+			Locator::getLogger()->warn("Rich presence (Gameplay/Eval) successfully set");
 		}
 		else {
 			Locator::getLogger()->warn("Rich presence (Gameplay/Eval) failed to set - {}",
 									   result.Error());
 		}
 	});
+#else
+	Locator::getLogger()->warn(
+	  "Discord presence not available for this platform");
+#endif
 }
 
 void
 GameState::updateDiscordPresenceMenu()
 {
+#ifdef SUPPORT_DISCORD_SDK
 	Locator::getLogger()->info("Updating Discord Rich Presence (Menu)");
 	if (DISCORD == nullptr) {
 		discordInit();
-	}
-
+	}
+
 	std::string largeImageTextCpy = "Etterna";
 	auto setLargeImageTxt = false;
 	if (PROFILEMAN && PROFILEMAN->GetProfile(PLAYER_1) &&
@@ -1375,39 +1395,39 @@ GameState::updateDiscordPresenceMenu()
 		largeImageTextCpy = fmt::format(
 		  "{}: {:5.2f}", profile->m_sDisplayName, profile->m_fPlayerRating);
 		setLargeImageTxt = true;
-	}
+	}
 
 	discordpp::Activity activity;
-	activity.SetType(discordpp::ActivityTypes::Playing);
-
+	activity.SetType(discordpp::ActivityTypes::Playing);
+
 	std::string screenName = "";
 	if (SCREENMAN && SCREENMAN->GetTopScreen() &&
 		!SCREENMAN->GetTopScreen()->GetName().empty()) {
-		screenName = SCREENMAN->GetTopScreen()->GetName().c_str();
-	}
-
+		screenName = SCREENMAN->GetTopScreen()->GetName().c_str();
+	}
+
 	if (screenName.empty()) {
 		activity.SetDetails("Loading game...");
-		//activity.SetState(fmt::format("", screenName));
+		//activity.SetState(fmt::format("", screenName));
 	} else {
 		activity.SetDetails("In the menus");
 		activity.SetState(fmt::format("{}", screenName));
-	}
-
+	}
+
 	if ((setLargeImageTxt && largeImageTextCpy.size() > 128) ||
 		!setLargeImageTxt) {
 		if (!screenName.empty()) {
 			largeImageTextCpy = CommonMetrics::WINDOW_TITLE.GetValue().substr(0, 127);
-		}
+		}
 		else if (screenName.empty() && THEME != nullptr) {
 			largeImageTextCpy =
 			  fmt::format("Etterna - {}", THEME->GetCurThemeName())
 				.substr(0, 127);
 		} else {
-			largeImageTextCpy = "Etterna";
+			largeImageTextCpy = "Etterna";
 		}
-	}
-
+	}
+
 	discordpp::ActivityAssets assets;
 	assets.SetLargeImage("default");
 	assets.SetLargeText(largeImageTextCpy.c_str());
@@ -1422,6 +1442,10 @@ GameState::updateDiscordPresenceMenu()
 									   result.Error());
 		}
 	});
+#else
+	Locator::getLogger()->warn(
+	  "Discord presence not available for this platform");
+#endif
 }
 
 void
@@ -1601,8 +1625,8 @@ class LunaGameState : public Luna<GameState>
 	{
 		p->m_Environment->PushSelf(L);
 		return 1;
-	}
-	static int SetLastSongGroup(T* p, lua_State* L)
+	}
+	static int SetLastSongGroup(T* p, lua_State* L)
 	{
 		auto g = SArg(1);
 		p->m_sLastSongGroup = g;