Merge branch 'master' into utility-self-extracting

2024-11-22 07:31:57 +00:00 · 2022-06-27 12:26:16 +00:00 · 2022-06-27 12:26:16 +00:00 · 4e5fd226c8
commit 4e5fd226c8
parent 8ce6b8226d 5f81bcd84f
3194 changed files with 95411 additions and 73956 deletions
--- a/.clang-tidy
+++ b/.clang-tidy
@ -1,3 +1,6 @@
 # Enable all checks + disale selected checks. Feel free to remove disabled checks from below list if
 # a) the new check is not controversial (this includes many checks in readability-* and google-*) or
 # b) too noisy (checks with > 100 new warnings are considered noisy, this includes e.g. cppcoreguidelines-*).
 Checks: '*,
    -abseil-*,
@ -9,10 +12,8 @@ Checks: '*,
    -bugprone-easily-swappable-parameters,
    -bugprone-exception-escape,
    -bugprone-implicit-widening-of-multiplication-result,
    -bugprone-lambda-function-name,
    -bugprone-narrowing-conversions,
    -bugprone-not-null-terminated-result,
    -bugprone-unhandled-self-assignment,
    -cert-dcl16-c,
    -cert-err58-cpp,
@ -27,7 +28,31 @@ Checks: '*,
    -clang-analyzer-security.insecureAPI.bzero,
    -clang-analyzer-security.insecureAPI.strcpy,
-    -cppcoreguidelines-*,
+    -cppcoreguidelines-avoid-c-arrays,
    -cppcoreguidelines-avoid-goto,
    -cppcoreguidelines-avoid-magic-numbers,
    -cppcoreguidelines-avoid-non-const-global-variables,
    -cppcoreguidelines-explicit-virtual-functions,
    -cppcoreguidelines-init-variables,
    -cppcoreguidelines-interfaces-global-init,
    -cppcoreguidelines-macro-usage,
    -cppcoreguidelines-narrowing-conversions,
    -cppcoreguidelines-no-malloc,
    -cppcoreguidelines-non-private-member-variables-in-classes,
    -cppcoreguidelines-owning-memory,
    -cppcoreguidelines-prefer-member-initializer,
    -cppcoreguidelines-pro-bounds-array-to-pointer-decay,
    -cppcoreguidelines-pro-bounds-constant-array-index,
    -cppcoreguidelines-pro-bounds-pointer-arithmetic,
    -cppcoreguidelines-pro-type-const-cast,
    -cppcoreguidelines-pro-type-cstyle-cast,
    -cppcoreguidelines-pro-type-member-init,
    -cppcoreguidelines-pro-type-reinterpret-cast,
    -cppcoreguidelines-pro-type-static-cast-downcast,
    -cppcoreguidelines-pro-type-union-access,
    -cppcoreguidelines-pro-type-vararg,
    -cppcoreguidelines-slicing,
    -cppcoreguidelines-special-member-functions,
    -concurrency-mt-unsafe,
@ -37,6 +62,7 @@ Checks: '*,
    -google-build-using-namespace,
    -google-readability-braces-around-statements,
    -google-readability-casting,
    -google-readability-function-size,
    -google-readability-namespace-comments,
    -google-readability-todo,
@ -47,7 +73,6 @@ Checks: '*,
    -hicpp-braces-around-statements,
    -hicpp-explicit-conversions,
    -hicpp-function-size,
    -hicpp-invalid-access-moved,
    -hicpp-member-init,
    -hicpp-move-const-arg,
    -hicpp-multiway-paths-covered,
@ -60,10 +85,10 @@ Checks: '*,
    -hicpp-uppercase-literal-suffix,
    -hicpp-use-auto,
    -hicpp-use-emplace,
    -hicpp-use-noexcept,
    -hicpp-use-override,
    -hicpp-vararg,
    -linuxkernel-*,
    -llvm-*,
    -llvmlibc-*,
@ -86,7 +111,6 @@ Checks: '*,
    -performance-inefficient-string-concatenation,
    -performance-no-int-to-ptr,
    -performance-type-promotion-in-math-fn,
    -performance-unnecessary-value-param,
    -portability-simd-intrinsics,
@ -95,6 +119,7 @@ Checks: '*,
    -readability-else-after-return,
    -readability-function-cognitive-complexity,
    -readability-function-size,
    -readability-identifier-length,
    -readability-implicit-bool-conversion,
    -readability-isolate-declaration,
    -readability-magic-numbers,
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@ -1,3 +1,9 @@
 <!---
 A technical comment, you are free to remove or leave it as it is when PR is created
 The following categories are used in the next scripts, update them accordingly
 utils/changelog/changelog.py
 tests/ci/run_check.py
 -->
 ### Changelog category (leave one):
 - New Feature
 - Improvement
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@ -9,9 +9,11 @@ concurrency:
 on: # yamllint disable-line rule:truthy
  schedule:
    - cron: '0 */3 * * *'
  workflow_dispatch:
 jobs:
  CherryPick:
-    runs-on: [self-hosted, style-checker]
+    runs-on: [self-hosted, style-checker-aarch64]
    steps:
      - name: Set envs
        # https://docs.github.com/en/actions/learn-github-actions/workflow-commands-for-github-actions#multiline-strings
--- a/.github/workflows/backport_branches.yml
+++ b/.github/workflows/backport_branches.yml
@ -131,7 +131,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=package_release
          EOF
      - name: Download changed images
@ -151,7 +150,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -177,7 +176,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=package_aarch64
          EOF
      - name: Download changed images
@ -197,7 +195,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -223,7 +221,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=package_asan
          EOF
      - name: Download changed images
@ -243,7 +240,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -269,7 +266,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=package_tsan
          EOF
      - name: Download changed images
@ -289,7 +285,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -315,7 +311,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=package_debug
          EOF
      - name: Download changed images
@ -335,7 +330,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -364,15 +359,11 @@ jobs:
    steps:
      - name: Set envs
        run: |
          DEPENDENCIES=$(cat << 'EOF' | jq '. | length'
          ${{ toJSON(needs) }}
          EOF
          )
          echo "DEPENDENCIES=$DEPENDENCIES" >> "$GITHUB_ENV"
          cat >> "$GITHUB_ENV" << 'EOF'
          CHECK_NAME=ClickHouse build check (actions)
          REPORTS_PATH=${{runner.temp}}/reports_dir
          TEMP_PATH=${{runner.temp}}/report_check
          NEEDS_DATA_PATH=${{runner.temp}}/needs.json
          EOF
      - name: Download json reports
        uses: actions/download-artifact@v2
@ -387,8 +378,11 @@ jobs:
        run: |
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cat > "$NEEDS_DATA_PATH" << 'EOF'
          ${{ toJSON(needs) }}
          EOF
          cd "$GITHUB_WORKSPACE/tests/ci"
-          python3 build_report_check.py "$CHECK_NAME" "$DEPENDENCIES"
+          python3 build_report_check.py "$CHECK_NAME"
      - name: Cleanup
        if: always()
        run: |
--- a/.github/workflows/docs_check.yml
+++ b/.github/workflows/docs_check.yml
@ -13,9 +13,9 @@ on:  # yamllint disable-line rule:truthy
    branches:
      - master
    paths:
      - 'docker/docs/**'
      - 'docs/**'
      - 'website/**'
      - 'docker/docs/**'
 jobs:
  CheckLabels:
    runs-on: [self-hosted, style-checker]
--- a/.github/workflows/docs_release.yml
+++ b/.github/workflows/docs_release.yml
@ -7,16 +7,17 @@ env:
 concurrency:
  group: master-release
  cancel-in-progress: true
-on: # yamllint disable-line rule:truthy
+'on':
  push:
    branches:
      - master
    paths:
      - 'docs/**'
      - 'website/**'
      - 'benchmark/**'
      - 'docker/**'
      - '.github/**'
      - 'benchmark/**'
      - 'docker/docs/release/**'
      - 'docs/**'
      - 'utils/list-versions/version_date.tsv'
      - 'website/**'
  workflow_dispatch:
 jobs:
  DockerHubPushAarch64:
--- a/.github/workflows/jepsen.yml
+++ b/.github/workflows/jepsen.yml
@ -7,11 +7,8 @@ concurrency:
 on: # yamllint disable-line rule:truthy
  schedule:
    - cron: '0 */6 * * *'
  workflow_run:
    workflows: ["PullRequestCI"]
    types:
      - completed
  workflow_dispatch:
  workflow_call:
 jobs:
  KeeperJepsenRelease:
    runs-on: [self-hosted, style-checker]
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@ -199,7 +199,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=package_release
          EOF
      - name: Download changed images
@ -213,7 +212,7 @@ jobs:
      - name: Check out repository code
        uses: actions/checkout@v2
        with:
-          fetch-depth: 0 # otherwise we will have no info about contributors
+          fetch-depth: 0 # For a proper version and performance artifacts
      - name: Build
        run: |
          git -C "$GITHUB_WORKSPACE" submodule sync --recursive
@ -221,7 +220,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -247,7 +246,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=package_aarch64
          EOF
      - name: Download changed images
@ -258,7 +256,7 @@ jobs:
      - name: Check out repository code
        uses: actions/checkout@v2
        with:
-          fetch-depth: 0 # otherwise we will have no info about contributors
+          fetch-depth: 0 # For a proper version and performance artifacts
      - name: Build
        run: |
          git -C "$GITHUB_WORKSPACE" submodule sync --recursive
@ -266,7 +264,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        uses: actions/upload-artifact@v2
        with:
@ -280,54 +278,6 @@ jobs:
          # shellcheck disable=SC2046
          docker rm -f $(docker ps -a -q) ||:
          sudo rm -fr "$TEMP_PATH" "$CACHES_PATH"
  BuilderPerformance:
    needs: DockerHubPush
    runs-on: [self-hosted, builder]
    steps:
      - name: Set envs
        run: |
          cat >> "$GITHUB_ENV" << 'EOF'
          TEMP_PATH=${{runner.temp}}/build_check
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=performance
          EOF
      - name: Download changed images
        uses: actions/download-artifact@v2
        with:
          name: changed_images
          path: ${{ env.IMAGES_PATH }}
      - name: Clear repository
        run: |
          sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
      - name: Check out repository code
        uses: actions/checkout@v2
        with:
          fetch-depth: 0  # is needed for ancestor commit search
      - name: Build
        run: |
          git -C "$GITHUB_WORKSPACE" submodule sync --recursive
          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --recursive --init --jobs=10
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
        with:
          name: ${{ env.BUILD_URLS }}
          path: ${{ env.TEMP_PATH }}/${{ env.BUILD_URLS }}.json
      - name: Cleanup
        if: always()
        run: |
          # shellcheck disable=SC2046
          docker kill $(docker ps -q) ||:
          # shellcheck disable=SC2046
          docker rm -f $(docker ps -a -q) ||:
          sudo rm -fr "$TEMP_PATH" "$CACHES_PATH"
  BuilderBinRelease:
    needs: [DockerHubPush]
    runs-on: [self-hosted, builder]
@ -339,7 +289,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=binary_release
          EOF
      - name: Download changed images
@ -361,7 +310,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -387,7 +336,6 @@ jobs:
  #         IMAGES_PATH=${{runner.temp}}/images_path
  #         REPO_COPY=${{runner.temp}}/build_check/ClickHouse
  #         CACHES_PATH=${{runner.temp}}/../ccaches
  #         CHECK_NAME=ClickHouse build check (actions)
  #         BUILD_NAME=binary_gcc
  #         EOF
  #     - name: Download changed images
@ -407,7 +355,7 @@ jobs:
  #         sudo rm -fr "$TEMP_PATH"
  #         mkdir -p "$TEMP_PATH"
  #         cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-  #         cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+  #         cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
  #     - name: Upload build URLs to artifacts
  #       if: ${{ success() || failure() }}
  #       uses: actions/upload-artifact@v2
@ -433,7 +381,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=package_asan
          EOF
      - name: Download changed images
@ -453,7 +400,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -479,7 +426,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=package_ubsan
          EOF
      - name: Download changed images
@ -499,7 +445,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -525,7 +471,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=package_tsan
          EOF
      - name: Download changed images
@ -545,7 +490,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -571,7 +516,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=package_msan
          EOF
      - name: Download changed images
@ -591,7 +535,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -617,7 +561,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=package_debug
          EOF
      - name: Download changed images
@ -637,7 +580,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -666,7 +609,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=binary_splitted
          EOF
      - name: Download changed images
@ -686,7 +628,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -712,7 +654,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=binary_tidy
          EOF
      - name: Download changed images
@ -732,7 +673,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -758,7 +699,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=binary_darwin
          EOF
      - name: Download changed images
@ -780,7 +720,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -806,7 +746,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=binary_aarch64
          EOF
      - name: Download changed images
@ -828,7 +767,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -854,7 +793,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=binary_freebsd
          EOF
      - name: Download changed images
@ -876,7 +814,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -902,7 +840,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=binary_darwin_aarch64
          EOF
      - name: Download changed images
@ -924,7 +861,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -950,7 +887,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=binary_ppc64le
          EOF
      - name: Download changed images
@ -972,7 +908,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -1002,7 +938,7 @@ jobs:
      - name: Check out repository code
        uses: actions/checkout@v2
        with:
-          fetch-depth: 0  # otherwise we will have no version info
+          fetch-depth: 0  # It MUST BE THE SAME for all dependencies and the job itself
      - name: Check docker clickhouse/clickhouse-server building
        run: |
          cd "$GITHUB_WORKSPACE/tests/ci"
@ -1034,16 +970,12 @@ jobs:
    steps:
      - name: Set envs
        run: |
          DEPENDENCIES=$(cat << 'EOF' | jq '. | length'
          ${{ toJSON(needs) }}
          EOF
          )
          echo "DEPENDENCIES=$DEPENDENCIES" >> "$GITHUB_ENV"
          cat >> "$GITHUB_ENV" << 'EOF'
          CHECK_NAME=ClickHouse build check (actions)
          REPORTS_PATH=${{runner.temp}}/reports_dir
          REPORTS_PATH=${{runner.temp}}/reports_dir
          TEMP_PATH=${{runner.temp}}/report_check
          NEEDS_DATA_PATH=${{runner.temp}}/needs.json
          EOF
      - name: Download json reports
        uses: actions/download-artifact@v2
@ -1058,8 +990,11 @@ jobs:
        run: |
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cat > "$NEEDS_DATA_PATH" << 'EOF'
          ${{ toJSON(needs) }}
          EOF
          cd "$GITHUB_WORKSPACE/tests/ci"
-          python3 build_report_check.py "$CHECK_NAME" "$DEPENDENCIES"
+          python3 build_report_check.py "$CHECK_NAME"
      - name: Cleanup
        if: always()
        run: |
@ -1082,15 +1017,11 @@ jobs:
    steps:
      - name: Set envs
        run: |
          DEPENDENCIES=$(cat << 'EOF' | jq '. | length'
          ${{ toJSON(needs) }}
          EOF
          )
          echo "DEPENDENCIES=$DEPENDENCIES" >> "$GITHUB_ENV"
          cat >> "$GITHUB_ENV" << 'EOF'
          TEMP_PATH=${{runner.temp}}/report_check
          REPORTS_PATH=${{runner.temp}}/reports_dir
          CHECK_NAME=ClickHouse special build check (actions)
          NEEDS_DATA_PATH=${{runner.temp}}/needs.json
          EOF
      - name: Download json reports
        uses: actions/download-artifact@v2
@ -1105,8 +1036,11 @@ jobs:
        run: |
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cat > "$NEEDS_DATA_PATH" << 'EOF'
          ${{ toJSON(needs) }}
          EOF
          cd "$GITHUB_WORKSPACE/tests/ci"
-          python3 build_report_check.py "$CHECK_NAME" "$DEPENDENCIES"
+          python3 build_report_check.py "$CHECK_NAME"
      - name: Cleanup
        if: always()
        run: |
@ -2969,7 +2903,7 @@ jobs:
 #################################### PERFORMANCE TESTS ######################################
 #############################################################################################
  PerformanceComparison0:
-    needs: [BuilderPerformance]
+    needs: [BuilderDebRelease]
    runs-on: [self-hosted, stress-tester]
    steps:
      - name: Set envs
@ -2977,7 +2911,7 @@ jobs:
          cat >> "$GITHUB_ENV" << 'EOF'
          TEMP_PATH=${{runner.temp}}/performance_comparison
          REPORTS_PATH=${{runner.temp}}/reports_dir
-          CHECK_NAME=Performance Comparison (actions)
+          CHECK_NAME=Performance Comparison
          REPO_COPY=${{runner.temp}}/performance_comparison/ClickHouse
          RUN_BY_HASH_NUM=0
          RUN_BY_HASH_TOTAL=4
@ -3007,7 +2941,7 @@ jobs:
          docker rm -f $(docker ps -a -q) ||:
          sudo rm -fr "$TEMP_PATH"
  PerformanceComparison1:
-    needs: [BuilderPerformance]
+    needs: [BuilderDebRelease]
    runs-on: [self-hosted, stress-tester]
    steps:
      - name: Set envs
@ -3015,7 +2949,7 @@ jobs:
          cat >> "$GITHUB_ENV" << 'EOF'
          TEMP_PATH=${{runner.temp}}/performance_comparison
          REPORTS_PATH=${{runner.temp}}/reports_dir
-          CHECK_NAME=Performance Comparison (actions)
+          CHECK_NAME=Performance Comparison
          REPO_COPY=${{runner.temp}}/performance_comparison/ClickHouse
          RUN_BY_HASH_NUM=1
          RUN_BY_HASH_TOTAL=4
@ -3045,7 +2979,7 @@ jobs:
          docker rm -f $(docker ps -a -q) ||:
          sudo rm -fr "$TEMP_PATH"
  PerformanceComparison2:
-    needs: [BuilderPerformance]
+    needs: [BuilderDebRelease]
    runs-on: [self-hosted, stress-tester]
    steps:
      - name: Set envs
@ -3053,7 +2987,7 @@ jobs:
          cat >> "$GITHUB_ENV" << 'EOF'
          TEMP_PATH=${{runner.temp}}/performance_comparison
          REPORTS_PATH=${{runner.temp}}/reports_dir
-          CHECK_NAME=Performance Comparison (actions)
+          CHECK_NAME=Performance Comparison
          REPO_COPY=${{runner.temp}}/performance_comparison/ClickHouse
          RUN_BY_HASH_NUM=2
          RUN_BY_HASH_TOTAL=4
@ -3083,7 +3017,7 @@ jobs:
          docker rm -f $(docker ps -a -q) ||:
          sudo rm -fr "$TEMP_PATH"
  PerformanceComparison3:
-    needs: [BuilderPerformance]
+    needs: [BuilderDebRelease]
    runs-on: [self-hosted, stress-tester]
    steps:
      - name: Set envs
@ -3091,7 +3025,7 @@ jobs:
          cat >> "$GITHUB_ENV" << 'EOF'
          TEMP_PATH=${{runner.temp}}/performance_comparison
          REPORTS_PATH=${{runner.temp}}/reports_dir
-          CHECK_NAME=Performance Comparison (actions)
+          CHECK_NAME=Performance Comparison
          REPO_COPY=${{runner.temp}}/performance_comparison/ClickHouse
          RUN_BY_HASH_NUM=3
          RUN_BY_HASH_TOTAL=4
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@ -81,7 +81,6 @@ jobs:
          cat >> "$GITHUB_ENV" << 'EOF'
          BUILD_NAME=coverity
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          TEMP_PATH=${{runner.temp}}/build_check
@ -99,13 +98,15 @@ jobs:
        id: coverity-checkout
        uses: actions/checkout@v2
        with:
-          submodules: 'true'
+          fetch-depth: 0 # otherwise we will have no info about contributors
      - name: Build
        run: |
          git -C "$GITHUB_WORKSPACE" submodule sync
          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --init --jobs=10
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload Coverity Analysis
        if: ${{ success() || failure() }}
        run: |
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@ -13,6 +13,7 @@ on:  # yamllint disable-line rule:truthy
    branches:
      - master
    paths-ignore:
      - 'docker/docs/**'
      - 'docs/**'
      - 'website/**'
 ##########################################################################################
@ -260,7 +261,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=package_release
          EOF
      - name: Download changed images
@ -273,6 +273,8 @@ jobs:
          sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
      - name: Check out repository code
        uses: actions/checkout@v2
        with:
          fetch-depth: 0  # for performance artifact
      - name: Build
        run: |
          git -C "$GITHUB_WORKSPACE" submodule sync --recursive
@ -280,7 +282,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -295,54 +297,6 @@ jobs:
          # shellcheck disable=SC2046
          docker rm -f $(docker ps -a -q) ||:
          sudo rm -fr "$TEMP_PATH"
  BuilderPerformance:
    needs: [DockerHubPush, FastTest]
    runs-on: [self-hosted, builder]
    steps:
      - name: Set envs
        run: |
          cat >> "$GITHUB_ENV" << 'EOF'
          TEMP_PATH=${{runner.temp}}/build_check
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=performance
          EOF
      - name: Download changed images
        uses: actions/download-artifact@v2
        with:
          name: changed_images
          path: ${{ env.IMAGES_PATH }}
      - name: Clear repository
        run: |
          sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
      - name: Check out repository code
        uses: actions/checkout@v2
        with:
          fetch-depth: 0  # is needed for ancestor commit search
      - name: Build
        run: |
          git -C "$GITHUB_WORKSPACE" submodule sync --recursive
          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --recursive --init --jobs=10
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
        with:
          name: ${{ env.BUILD_URLS }}
          path: ${{ env.TEMP_PATH }}/${{ env.BUILD_URLS }}.json
      - name: Cleanup
        if: always()
        run: |
          # shellcheck disable=SC2046
          docker kill $(docker ps -q) ||:
          # shellcheck disable=SC2046
          docker rm -f $(docker ps -a -q) ||:
          sudo rm -fr "$TEMP_PATH" "$CACHES_PATH"
  BuilderBinRelease:
    needs: [DockerHubPush, FastTest]
    runs-on: [self-hosted, builder]
@ -354,7 +308,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=binary_release
          EOF
      - name: Download changed images
@ -374,7 +327,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -400,7 +353,6 @@ jobs:
  #         IMAGES_PATH=${{runner.temp}}/images_path
  #         REPO_COPY=${{runner.temp}}/build_check/ClickHouse
  #         CACHES_PATH=${{runner.temp}}/../ccaches
  #         CHECK_NAME=ClickHouse build check (actions)
  #         BUILD_NAME=binary_gcc
  #         EOF
  #     - name: Download changed images
@ -420,7 +372,7 @@ jobs:
  #         sudo rm -fr "$TEMP_PATH"
  #         mkdir -p "$TEMP_PATH"
  #         cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-  #         cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+  #         cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
  #     - name: Upload build URLs to artifacts
  #       if: ${{ success() || failure() }}
  #       uses: actions/upload-artifact@v2
@ -446,7 +398,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=package_aarch64
          EOF
      - name: Download changed images
@ -459,6 +410,8 @@ jobs:
          sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
      - name: Check out repository code
        uses: actions/checkout@v2
        with:
          fetch-depth: 0  # for performance artifact
      - name: Build
        run: |
          git -C "$GITHUB_WORKSPACE" submodule sync --recursive
@ -466,7 +419,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -492,7 +445,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=package_asan
          EOF
      - name: Download changed images
@ -512,7 +464,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -538,7 +490,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=package_ubsan
          EOF
      - name: Download changed images
@ -558,7 +509,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -584,7 +535,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=package_tsan
          EOF
      - name: Download changed images
@ -604,7 +554,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -630,7 +580,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=package_msan
          EOF
      - name: Download changed images
@ -650,7 +599,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -676,7 +625,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=package_debug
          EOF
      - name: Download changed images
@ -696,7 +644,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -725,7 +673,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=binary_splitted
          EOF
      - name: Download changed images
@ -745,7 +692,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -771,7 +718,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=binary_tidy
          EOF
      - name: Download changed images
@ -791,7 +737,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -817,7 +763,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=binary_darwin
          EOF
      - name: Download changed images
@ -837,7 +782,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -863,7 +808,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=binary_aarch64
          EOF
      - name: Download changed images
@ -883,7 +827,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -909,7 +853,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=binary_freebsd
          EOF
      - name: Download changed images
@ -929,7 +872,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -955,7 +898,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=binary_darwin_aarch64
          EOF
      - name: Download changed images
@ -975,7 +917,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -1001,7 +943,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=binary_ppc64le
          EOF
      - name: Download changed images
@ -1021,7 +962,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -1051,7 +992,7 @@ jobs:
      - name: Check out repository code
        uses: actions/checkout@v2
        with:
-          fetch-depth: 1  # It MUST BE THE SAME for all dependencies and the job itself
+          fetch-depth: 0  # It MUST BE THE SAME for all dependencies and the job itself
      - name: Check docker clickhouse/clickhouse-server building
        run: |
          cd "$GITHUB_WORKSPACE/tests/ci"
@ -1084,15 +1025,11 @@ jobs:
    steps:
      - name: Set envs
        run: |
          DEPENDENCIES=$(cat << 'EOF' | jq '. | length'
          ${{ toJSON(needs) }}
          EOF
          )
          echo "DEPENDENCIES=$DEPENDENCIES" >> "$GITHUB_ENV"
          cat >> "$GITHUB_ENV" << 'EOF'
          CHECK_NAME=ClickHouse build check (actions)
          REPORTS_PATH=${{runner.temp}}/reports_dir
          TEMP_PATH=${{runner.temp}}/report_check
          NEEDS_DATA_PATH=${{runner.temp}}/needs.json
          EOF
      - name: Download json reports
        uses: actions/download-artifact@v2
@ -1107,8 +1044,11 @@ jobs:
        run: |
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cat > "$NEEDS_DATA_PATH" << 'EOF'
          ${{ toJSON(needs) }}
          EOF
          cd "$GITHUB_WORKSPACE/tests/ci"
-          python3 build_report_check.py "$CHECK_NAME" "$DEPENDENCIES"
+          python3 build_report_check.py "$CHECK_NAME"
      - name: Cleanup
        if: always()
        run: |
@ -1132,15 +1072,11 @@ jobs:
    steps:
      - name: Set envs
        run: |
          DEPENDENCIES=$(cat << 'EOF' | jq '. | length'
          ${{ toJSON(needs) }}
          EOF
          )
          echo "DEPENDENCIES=$DEPENDENCIES" >> "$GITHUB_ENV"
          cat >> "$GITHUB_ENV" << 'EOF'
          TEMP_PATH=${{runner.temp}}/report_check
          REPORTS_PATH=${{runner.temp}}/reports_dir
          CHECK_NAME=ClickHouse special build check (actions)
          NEEDS_DATA_PATH=${{runner.temp}}/needs.json
          EOF
      - name: Download json reports
        uses: actions/download-artifact@v2
@ -1155,8 +1091,11 @@ jobs:
        run: |
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cat > "$NEEDS_DATA_PATH" << 'EOF'
          ${{ toJSON(needs) }}
          EOF
          cd "$GITHUB_WORKSPACE/tests/ci"
-          python3 build_report_check.py "$CHECK_NAME" "$DEPENDENCIES"
+          python3 build_report_check.py "$CHECK_NAME"
      - name: Cleanup
        if: always()
        run: |
@ -3180,7 +3119,7 @@ jobs:
 #################################### PERFORMANCE TESTS ######################################
 #############################################################################################
  PerformanceComparison0:
-    needs: [BuilderPerformance]
+    needs: [BuilderDebRelease]
    runs-on: [self-hosted, stress-tester]
    steps:
      - name: Set envs
@ -3188,7 +3127,7 @@ jobs:
          cat >> "$GITHUB_ENV" << 'EOF'
          TEMP_PATH=${{runner.temp}}/performance_comparison
          REPORTS_PATH=${{runner.temp}}/reports_dir
-          CHECK_NAME=Performance Comparison (actions)
+          CHECK_NAME=Performance Comparison
          REPO_COPY=${{runner.temp}}/performance_comparison/ClickHouse
          RUN_BY_HASH_NUM=0
          RUN_BY_HASH_TOTAL=4
@ -3218,7 +3157,7 @@ jobs:
          docker rm -f $(docker ps -a -q) ||:
          sudo rm -fr "$TEMP_PATH"
  PerformanceComparison1:
-    needs: [BuilderPerformance]
+    needs: [BuilderDebRelease]
    runs-on: [self-hosted, stress-tester]
    steps:
      - name: Set envs
@ -3226,7 +3165,7 @@ jobs:
          cat >> "$GITHUB_ENV" << 'EOF'
          TEMP_PATH=${{runner.temp}}/performance_comparison
          REPORTS_PATH=${{runner.temp}}/reports_dir
-          CHECK_NAME=Performance Comparison (actions)
+          CHECK_NAME=Performance Comparison
          REPO_COPY=${{runner.temp}}/performance_comparison/ClickHouse
          RUN_BY_HASH_NUM=1
          RUN_BY_HASH_TOTAL=4
@ -3256,7 +3195,7 @@ jobs:
          docker rm -f $(docker ps -a -q) ||:
          sudo rm -fr "$TEMP_PATH"
  PerformanceComparison2:
-    needs: [BuilderPerformance]
+    needs: [BuilderDebRelease]
    runs-on: [self-hosted, stress-tester]
    steps:
      - name: Set envs
@ -3264,7 +3203,7 @@ jobs:
          cat >> "$GITHUB_ENV" << 'EOF'
          TEMP_PATH=${{runner.temp}}/performance_comparison
          REPORTS_PATH=${{runner.temp}}/reports_dir
-          CHECK_NAME=Performance Comparison (actions)
+          CHECK_NAME=Performance Comparison
          REPO_COPY=${{runner.temp}}/performance_comparison/ClickHouse
          RUN_BY_HASH_NUM=2
          RUN_BY_HASH_TOTAL=4
@ -3294,7 +3233,7 @@ jobs:
          docker rm -f $(docker ps -a -q) ||:
          sudo rm -fr "$TEMP_PATH"
  PerformanceComparison3:
-    needs: [BuilderPerformance]
+    needs: [BuilderDebRelease]
    runs-on: [self-hosted, stress-tester]
    steps:
      - name: Set envs
@ -3302,7 +3241,7 @@ jobs:
          cat >> "$GITHUB_ENV" << 'EOF'
          TEMP_PATH=${{runner.temp}}/performance_comparison
          REPORTS_PATH=${{runner.temp}}/reports_dir
-          CHECK_NAME=Performance Comparison (actions)
+          CHECK_NAME=Performance Comparison
          REPO_COPY=${{runner.temp}}/performance_comparison/ClickHouse
          RUN_BY_HASH_NUM=3
          RUN_BY_HASH_TOTAL=4
@ -3331,6 +3270,165 @@ jobs:
          # shellcheck disable=SC2046
          docker rm -f $(docker ps -a -q) ||:
          sudo rm -fr "$TEMP_PATH"
  PerformanceComparisonAarch0:
    needs: [BuilderDebAarch64]
    runs-on: [self-hosted, func-tester-aarch64]
    steps:
      - name: Set envs
        run: |
          cat >> "$GITHUB_ENV" << 'EOF'
          TEMP_PATH=${{runner.temp}}/performance_comparison
          REPORTS_PATH=${{runner.temp}}/reports_dir
          CHECK_NAME=Performance Comparison Aarch64
          REPO_COPY=${{runner.temp}}/performance_comparison/ClickHouse
          RUN_BY_HASH_NUM=0
          RUN_BY_HASH_TOTAL=4
          EOF
      - name: Download json reports
        uses: actions/download-artifact@v2
        with:
          path: ${{ env.REPORTS_PATH }}
      - name: Clear repository
        run: |
          sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
      - name: Check out repository code
        uses: actions/checkout@v2
      - name: Performance Comparison
        run: |
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
          cd "$REPO_COPY/tests/ci"
          python3 performance_comparison_check.py "$CHECK_NAME"
      - name: Cleanup
        if: always()
        run: |
          # shellcheck disable=SC2046
          docker kill $(docker ps -q) ||:
          # shellcheck disable=SC2046
          docker rm -f $(docker ps -a -q) ||:
          sudo rm -fr "$TEMP_PATH"
  PerformanceComparisonAarch1:
    needs: [BuilderDebAarch64]
    runs-on: [self-hosted, func-tester-aarch64]
    steps:
      - name: Set envs
        run: |
          cat >> "$GITHUB_ENV" << 'EOF'
          TEMP_PATH=${{runner.temp}}/performance_comparison
          REPORTS_PATH=${{runner.temp}}/reports_dir
          CHECK_NAME=Performance Comparison Aarch64
          REPO_COPY=${{runner.temp}}/performance_comparison/ClickHouse
          RUN_BY_HASH_NUM=1
          RUN_BY_HASH_TOTAL=4
          EOF
      - name: Download json reports
        uses: actions/download-artifact@v2
        with:
          path: ${{ env.REPORTS_PATH }}
      - name: Clear repository
        run: |
          sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
      - name: Check out repository code
        uses: actions/checkout@v2
      - name: Performance Comparison
        run: |
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
          cd "$REPO_COPY/tests/ci"
          python3 performance_comparison_check.py "$CHECK_NAME"
      - name: Cleanup
        if: always()
        run: |
          # shellcheck disable=SC2046
          docker kill $(docker ps -q) ||:
          # shellcheck disable=SC2046
          docker rm -f $(docker ps -a -q) ||:
          sudo rm -fr "$TEMP_PATH"
  PerformanceComparisonAarch2:
    needs: [BuilderDebAarch64]
    runs-on: [self-hosted, func-tester-aarch64]
    steps:
      - name: Set envs
        run: |
          cat >> "$GITHUB_ENV" << 'EOF'
          TEMP_PATH=${{runner.temp}}/performance_comparison
          REPORTS_PATH=${{runner.temp}}/reports_dir
          CHECK_NAME=Performance Comparison Aarch64
          REPO_COPY=${{runner.temp}}/performance_comparison/ClickHouse
          RUN_BY_HASH_NUM=2
          RUN_BY_HASH_TOTAL=4
          EOF
      - name: Download json reports
        uses: actions/download-artifact@v2
        with:
          path: ${{ env.REPORTS_PATH }}
      - name: Clear repository
        run: |
          sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
      - name: Check out repository code
        uses: actions/checkout@v2
      - name: Performance Comparison
        run: |
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
          cd "$REPO_COPY/tests/ci"
          python3 performance_comparison_check.py "$CHECK_NAME"
      - name: Cleanup
        if: always()
        run: |
          # shellcheck disable=SC2046
          docker kill $(docker ps -q) ||:
          # shellcheck disable=SC2046
          docker rm -f $(docker ps -a -q) ||:
          sudo rm -fr "$TEMP_PATH"
  PerformanceComparisonAarch3:
    needs: [BuilderDebAarch64]
    runs-on: [self-hosted, func-tester-aarch64]
    steps:
      - name: Set envs
        run: |
          cat >> "$GITHUB_ENV" << 'EOF'
          TEMP_PATH=${{runner.temp}}/performance_comparison
          REPORTS_PATH=${{runner.temp}}/reports_dir
          CHECK_NAME=Performance Comparison Aarch64
          REPO_COPY=${{runner.temp}}/performance_comparison/ClickHouse
          RUN_BY_HASH_NUM=3
          RUN_BY_HASH_TOTAL=4
          EOF
      - name: Download json reports
        uses: actions/download-artifact@v2
        with:
          path: ${{ env.REPORTS_PATH }}
      - name: Clear repository
        run: |
          sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
      - name: Check out repository code
        uses: actions/checkout@v2
      - name: Performance Comparison
        run: |
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
          cd "$REPO_COPY/tests/ci"
          python3 performance_comparison_check.py "$CHECK_NAME"
      - name: Cleanup
        if: always()
        run: |
          # shellcheck disable=SC2046
          docker kill $(docker ps -q) ||:
          # shellcheck disable=SC2046
          docker rm -f $(docker ps -a -q) ||:
          sudo rm -fr "$TEMP_PATH"
 #############################################################################################
 ###################################### JEPSEN TESTS #########################################
 #############################################################################################
  Jepsen:
    needs: [BuilderBinRelease]
    uses: ./.github/workflows/jepsen.yml
  FinishCheck:
    needs:
      - StyleCheck
@ -3387,6 +3485,10 @@ jobs:
      - PerformanceComparison1
      - PerformanceComparison2
      - PerformanceComparison3
      - PerformanceComparisonAarch0
      - PerformanceComparisonAarch1
      - PerformanceComparisonAarch2
      - PerformanceComparisonAarch3
      - UnitTestsAsan
      - UnitTestsTsan
      - UnitTestsMsan
@ -3395,6 +3497,7 @@ jobs:
      - SplitBuildSmokeTest
      - CompatibilityCheck
      - IntegrationTestsFlakyCheck
      - Jepsen
    runs-on: [self-hosted, style-checker]
    steps:
      - name: Clear repository
--- a/.github/workflows/release_branches.yml
+++ b/.github/workflows/release_branches.yml
@ -122,7 +122,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=package_release
          EOF
      - name: Download changed images
@ -144,7 +143,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -170,7 +169,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=package_aarch64
          EOF
      - name: Download changed images
@ -189,7 +187,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        uses: actions/upload-artifact@v2
        with:
@ -214,7 +212,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=package_asan
          EOF
      - name: Download changed images
@ -234,7 +231,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -260,7 +257,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=package_ubsan
          EOF
      - name: Download changed images
@ -280,7 +276,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -306,7 +302,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=package_tsan
          EOF
      - name: Download changed images
@ -326,7 +321,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -352,7 +347,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=package_msan
          EOF
      - name: Download changed images
@ -372,7 +366,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -398,7 +392,6 @@ jobs:
          IMAGES_PATH=${{runner.temp}}/images_path
          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
          CACHES_PATH=${{runner.temp}}/../ccaches
          CHECK_NAME=ClickHouse build check (actions)
          BUILD_NAME=package_debug
          EOF
      - name: Download changed images
@ -418,7 +411,7 @@ jobs:
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
      - name: Upload build URLs to artifacts
        if: ${{ success() || failure() }}
        uses: actions/upload-artifact@v2
@ -449,16 +442,12 @@ jobs:
    steps:
      - name: Set envs
        run: |
          DEPENDENCIES=$(cat << 'EOF' | jq '. | length'
          ${{ toJSON(needs) }}
          EOF
          )
          echo "DEPENDENCIES=$DEPENDENCIES" >> "$GITHUB_ENV"
          cat >> "$GITHUB_ENV" << 'EOF'
          CHECK_NAME=ClickHouse build check (actions)
          REPORTS_PATH=${{runner.temp}}/reports_dir
          REPORTS_PATH=${{runner.temp}}/reports_dir
          TEMP_PATH=${{runner.temp}}/report_check
          NEEDS_DATA_PATH=${{runner.temp}}/needs.json
          EOF
      - name: Download json reports
        uses: actions/download-artifact@v2
@ -473,8 +462,11 @@ jobs:
        run: |
          sudo rm -fr "$TEMP_PATH"
          mkdir -p "$TEMP_PATH"
          cat > "$NEEDS_DATA_PATH" << 'EOF'
          ${{ toJSON(needs) }}
          EOF
          cd "$GITHUB_WORKSPACE/tests/ci"
-          python3 build_report_check.py "$CHECK_NAME" "$DEPENDENCIES"
+          python3 build_report_check.py "$CHECK_NAME"
      - name: Cleanup
        if: always()
        run: |
--- a/.github/workflows/tags_stable.yml
+++ b/.github/workflows/tags_stable.yml
@ -32,7 +32,7 @@ jobs:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      run: |
        ./utils/list-versions/list-versions.sh > ./utils/list-versions/version_date.tsv
-        GID=$(id -d "${UID}")
+        GID=$(id -g "${UID}")
        docker run -u "${UID}:${GID}" -e PYTHONUNBUFFERED=1 \
            --volume="${GITHUB_WORKSPACE}:/ClickHouse" clickhouse/style-test \
                /ClickHouse/utils/changelog/changelog.py -vv --gh-user-or-token="$GITHUB_TOKEN" \
--- a/.gitmodules
+++ b/.gitmodules
@ -86,9 +86,6 @@
 [submodule "contrib/h3"]
 	path = contrib/h3
 	url = https://github.com/ClickHouse/h3
 [submodule "contrib/hyperscan"]
 	path = contrib/hyperscan
 	url = https://github.com/ClickHouse/hyperscan.git
 [submodule "contrib/libunwind"]
 	path = contrib/libunwind
 	url = https://github.com/ClickHouse/libunwind.git
@ -265,6 +262,15 @@
 [submodule "contrib/wyhash"]
 	path = contrib/wyhash
 	url = https://github.com/wangyi-fudan/wyhash.git
-[submodule "contrib/eigen"]
+[submodule "contrib/hashidsxx"]
-	path = contrib/eigen
+	path = contrib/hashidsxx
-	url = https://github.com/eigen-mirror/eigen
+	url = https://github.com/schoentoon/hashidsxx.git
 [submodule "contrib/vectorscan"]
 	path = contrib/vectorscan
 	url = https://github.com/VectorCamp/vectorscan.git
 [submodule "contrib/liburing"]
 	path = contrib/liburing
 	url = https://github.com/axboe/liburing.git
 [submodule "contrib/base-x"]
 	path = contrib/base-x
 	url = https://github.com/ClickHouse/base-x.git
--- a/.pylintrc
+++ b/.pylintrc
@ -13,9 +13,7 @@ max-statements=200
 ignore-long-lines = (# )?<?https?://\S+>?$
 [MESSAGES CONTROL]
-disable = bad-continuation,
+disable = missing-docstring,
          missing-docstring,
          bad-whitespace,
          too-few-public-methods,
          invalid-name,
          too-many-arguments,
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,15 +1,345 @@
 ### Table of Contents
 **[ClickHouse release v22.6, 2022-06-16](#226)**<br>
 **[ClickHouse release v22.5, 2022-05-19](#225)**<br>
 **[ClickHouse release v22.4, 2022-04-20](#224)**<br>
 **[ClickHouse release v22.3-lts, 2022-03-17](#223)**<br>
 **[ClickHouse release v22.2, 2022-02-17](#222)**<br>
 **[ClickHouse release v22.1, 2022-01-18](#221)**<br>
-**[Changelog for 2021](https://github.com/ClickHouse/ClickHouse/blob/master/docs/en/whats-new/changelog/2021.md)**<br>
+**[Changelog for 2021](https://clickhouse.com/docs/en/whats-new/changelog/2021/)**<br>
-### <a id="224"></a> ClickHouse release master FIXME as compared to v22.3.3.44-lts
+### <a id="226"></a> ClickHouse release 22.6, 2022-06-16
 #### Backward Incompatible Change
 * Remove support for octal number literals in SQL. In previous versions they were parsed as Float64. [#37765](https://github.com/ClickHouse/ClickHouse/pull/37765) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
 * Changes how settings using `seconds` as type are parsed to support floating point values (for example: `max_execution_time=0.5`). Infinity or NaN values will throw an exception. [#37187](https://github.com/ClickHouse/ClickHouse/pull/37187) ([Raúl Marín](https://github.com/Algunenano)).
 * Changed format of binary serialization of columns of experimental type `Object`. New format is more convenient to implement by third-party clients. [#37482](https://github.com/ClickHouse/ClickHouse/pull/37482) ([Anton Popov](https://github.com/CurtizJ)).
 * Turn on setting `output_format_json_named_tuples_as_objects` by default. It allows to serialize named tuples as JSON objects in JSON formats. [#37756](https://github.com/ClickHouse/ClickHouse/pull/37756) ([Anton Popov](https://github.com/CurtizJ)).
 * LIKE patterns with trailing escape symbol ('\\') are now disallowed (as mandated by the SQL standard). [#37764](https://github.com/ClickHouse/ClickHouse/pull/37764) ([Robert Schulze](https://github.com/rschu1ze)).
 * If you run different ClickHouse versions on a cluster with AArch64 CPU or mix AArch64 and amd64 on a cluster, and use distributed queries with GROUP BY multiple keys of fixed-size type that fit in 256 bits but don't fit in 64 bits, and the size of the result is huge, the data will not be fully aggregated in the result of these queries during upgrade. Workaround: upgrade with downtime instead of a rolling upgrade.
 #### New Feature
 * Add `GROUPING` function. It allows to disambiguate the records in the queries with `ROLLUP`, `CUBE` or `GROUPING SETS`. Closes [#19426](https://github.com/ClickHouse/ClickHouse/issues/19426). [#37163](https://github.com/ClickHouse/ClickHouse/pull/37163) ([Dmitry Novik](https://github.com/novikd)).
 * A new codec [FPC](https://userweb.cs.txstate.edu/~burtscher/papers/dcc07a.pdf) algorithm for floating point data compression. [#37553](https://github.com/ClickHouse/ClickHouse/pull/37553) ([Mikhail Guzov](https://github.com/koloshmet)).
 * Add new columnar JSON formats: `JSONColumns`, `JSONCompactColumns`, `JSONColumnsWithMetadata`. Closes [#36338](https://github.com/ClickHouse/ClickHouse/issues/36338) Closes [#34509](https://github.com/ClickHouse/ClickHouse/issues/34509). [#36975](https://github.com/ClickHouse/ClickHouse/pull/36975) ([Kruglov Pavel](https://github.com/Avogar)).
 * Added open telemetry traces visualizing tool based on d3js. [#37810](https://github.com/ClickHouse/ClickHouse/pull/37810) ([Sergei Trifonov](https://github.com/serxa)).
 * Support INSERTs into `system.zookeeper` table. Closes [#22130](https://github.com/ClickHouse/ClickHouse/issues/22130). [#37596](https://github.com/ClickHouse/ClickHouse/pull/37596) ([Han Fei](https://github.com/hanfei1991)).
 * Support non-constant pattern argument for `LIKE`, `ILIKE` and `match` functions. [#37251](https://github.com/ClickHouse/ClickHouse/pull/37251) ([Robert Schulze](https://github.com/rschu1ze)).
 * Executable user defined functions now support parameters. Example: `SELECT test_function(parameters)(arguments)`. Closes [#37578](https://github.com/ClickHouse/ClickHouse/issues/37578). [#37720](https://github.com/ClickHouse/ClickHouse/pull/37720) ([Maksim Kita](https://github.com/kitaisreal)).
 * Add `merge_reason` column to system.part_log table. [#36912](https://github.com/ClickHouse/ClickHouse/pull/36912) ([Sema Checherinda](https://github.com/CheSema)).
 * Add support for Maps and Records in Avro format. Add new setting `input_format_avro_null_as_default ` that allow to insert null as default in Avro format. Closes [#18925](https://github.com/ClickHouse/ClickHouse/issues/18925) Closes [#37378](https://github.com/ClickHouse/ClickHouse/issues/37378) Closes [#32899](https://github.com/ClickHouse/ClickHouse/issues/32899). [#37525](https://github.com/ClickHouse/ClickHouse/pull/37525) ([Kruglov Pavel](https://github.com/Avogar)).
 * Add `clickhouse-disks` tool to introspect and operate on virtual filesystems configured for ClickHouse. [#36060](https://github.com/ClickHouse/ClickHouse/pull/36060) ([Artyom Yurkov](https://github.com/Varinara)).
 * Adds H3 unidirectional edge functions. [#36843](https://github.com/ClickHouse/ClickHouse/pull/36843) ([Bharat Nallan](https://github.com/bharatnc)).
 * Add support for calculating [hashids](https://hashids.org/) from unsigned integers. [#37013](https://github.com/ClickHouse/ClickHouse/pull/37013) ([Michael Nutt](https://github.com/mnutt)).
 * Explicit `SALT` specification is allowed for `CREATE USER <user> IDENTIFIED WITH sha256_hash`. [#37377](https://github.com/ClickHouse/ClickHouse/pull/37377) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
 * Add two new settings `input_format_csv_skip_first_lines/input_format_tsv_skip_first_lines` to allow skipping specified number of lines in the beginning of the file in CSV/TSV formats. [#37537](https://github.com/ClickHouse/ClickHouse/pull/37537) ([Kruglov Pavel](https://github.com/Avogar)).
 * `showCertificate` function shows current server's SSL certificate. [#37540](https://github.com/ClickHouse/ClickHouse/pull/37540) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
 * HTTP source for Data Dictionaries in Named Collections is supported. [#37581](https://github.com/ClickHouse/ClickHouse/pull/37581) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
 * Added a new window function `nonNegativeDerivative(metric_column, timestamp_column[, INTERVAL x SECOND])`. [#37628](https://github.com/ClickHouse/ClickHouse/pull/37628) ([Andrey Zvonov](https://github.com/zvonand)).
 * Implemented changing the comment for `ReplicatedMergeTree` tables. [#37416](https://github.com/ClickHouse/ClickHouse/pull/37416) ([Vasily Nemkov](https://github.com/Enmk)).
 * Added `SYSTEM UNFREEZE` query that deletes the whole backup regardless if the corresponding table is deleted or not. [#36424](https://github.com/ClickHouse/ClickHouse/pull/36424) ([Vadim Volodin](https://github.com/PolyProgrammist)).
 #### Experimental Feature
 * Enables `POPULATE` for `WINDOW VIEW`. [#36945](https://github.com/ClickHouse/ClickHouse/pull/36945) ([vxider](https://github.com/Vxider)).
 * `ALTER TABLE ... MODIFY QUERY` support for `WINDOW VIEW`. [#37188](https://github.com/ClickHouse/ClickHouse/pull/37188) ([vxider](https://github.com/Vxider)).
 * This PR changes the behavior of the `ENGINE` syntax in `WINDOW VIEW`, to make it like in `MATERIALIZED VIEW`. [#37214](https://github.com/ClickHouse/ClickHouse/pull/37214) ([vxider](https://github.com/Vxider)).
 #### Performance Improvement
 * Added numerous optimizations for ARM NEON [#38093](https://github.com/ClickHouse/ClickHouse/pull/38093)([Daniel Kutenin](https://github.com/danlark1)), ([Alexandra Pilipyuk](https://github.com/chalice19)) Note: if you run different ClickHouse versions on a cluster with ARM CPU and use distributed queries with GROUP BY multiple keys of fixed-size type that fit in 256 bits but don't fit in 64 bits, the result of the aggregation query will be wrong during upgrade. Workaround: upgrade with downtime instead of a rolling upgrade.
 * Improve performance and memory usage for select of subset of columns for formats Native, Protobuf, CapnProto, JSONEachRow, TSKV, all formats with suffixes WithNames/WithNamesAndTypes. Previously while selecting only subset of columns from files in these formats all columns were read and stored in memory. Now only required columns are read. This PR enables setting `input_format_skip_unknown_fields` by default, because otherwise in case of select of subset of columns exception will be thrown. [#37192](https://github.com/ClickHouse/ClickHouse/pull/37192) ([Kruglov Pavel](https://github.com/Avogar)).
 * Now more filters can be pushed down for join. [#37472](https://github.com/ClickHouse/ClickHouse/pull/37472) ([Amos Bird](https://github.com/amosbird)).
 * Load marks for only necessary columns when reading wide parts. [#36879](https://github.com/ClickHouse/ClickHouse/pull/36879) ([Anton Kozlov](https://github.com/tonickkozlov)).
 * Improved performance of aggregation in case, when sparse columns (can be enabled by experimental setting `ratio_of_defaults_for_sparse_serialization` in `MergeTree` tables) are used as arguments in aggregate functions. [#37617](https://github.com/ClickHouse/ClickHouse/pull/37617) ([Anton Popov](https://github.com/CurtizJ)).
 * Optimize function `COALESCE` with two arguments. [#37666](https://github.com/ClickHouse/ClickHouse/pull/37666) ([Anton Popov](https://github.com/CurtizJ)).
 * Replace `multiIf` to `if` in case when `multiIf` has only one condition, because function `if` is more performant. [#37695](https://github.com/ClickHouse/ClickHouse/pull/37695) ([Anton Popov](https://github.com/CurtizJ)).
 * Improve performance of `dictGetDescendants`, `dictGetChildren` functions, create temporary parent to children hierarchical index per query, not per function call during query. Allow to specify `BIDIRECTIONAL` for `HIERARHICAL` attributes, dictionary will maintain parent to children index in memory, that way functions `dictGetDescendants`, `dictGetChildren` will not create temporary index per query. Closes [#32481](https://github.com/ClickHouse/ClickHouse/issues/32481). [#37148](https://github.com/ClickHouse/ClickHouse/pull/37148) ([Maksim Kita](https://github.com/kitaisreal)).
 * Aggregates state destruction now may be posted on a thread pool. For queries with LIMIT and big state it provides significant speedup, e.g. `select uniq(number) from numbers_mt(1e7) group by number limit 100` became around 2.5x faster. [#37855](https://github.com/ClickHouse/ClickHouse/pull/37855) ([Nikita Taranov](https://github.com/nickitat)).
 * Improve sort performance by single column. [#37195](https://github.com/ClickHouse/ClickHouse/pull/37195) ([Maksim Kita](https://github.com/kitaisreal)).
 * Improve performance of single column sorting using sorting queue specializations. [#37990](https://github.com/ClickHouse/ClickHouse/pull/37990) ([Maksim Kita](https://github.com/kitaisreal)).
 * Improved performance on array norm and distance functions 2x-4x times. [#37394](https://github.com/ClickHouse/ClickHouse/pull/37394) ([Alexander Gololobov](https://github.com/davenger)).
 * Improve performance of number comparison functions using dynamic dispatch. [#37399](https://github.com/ClickHouse/ClickHouse/pull/37399) ([Maksim Kita](https://github.com/kitaisreal)).
 * Improve performance of ORDER BY with LIMIT. [#37481](https://github.com/ClickHouse/ClickHouse/pull/37481) ([Maksim Kita](https://github.com/kitaisreal)).
 * Improve performance of `hasAll` function using dynamic dispatch infrastructure. [#37484](https://github.com/ClickHouse/ClickHouse/pull/37484) ([Maksim Kita](https://github.com/kitaisreal)).
 * Improve performance of `greatCircleAngle`, `greatCircleDistance`, `geoDistance` functions. [#37524](https://github.com/ClickHouse/ClickHouse/pull/37524) ([Maksim Kita](https://github.com/kitaisreal)).
 * Improve performance of insert into MergeTree if there are multiple columns in ORDER BY. [#35762](https://github.com/ClickHouse/ClickHouse/pull/35762) ([Maksim Kita](https://github.com/kitaisreal)).
 * Fix excessive CPU usage in background when there are a lot of tables. [#38028](https://github.com/ClickHouse/ClickHouse/pull/38028) ([Maksim Kita](https://github.com/kitaisreal)).
 * Improve performance of `not` function using dynamic dispatch. [#38058](https://github.com/ClickHouse/ClickHouse/pull/38058) ([Maksim Kita](https://github.com/kitaisreal)).
 * Optimized the internal caching of re2 patterns which occur e.g. in LIKE and MATCH functions. [#37544](https://github.com/ClickHouse/ClickHouse/pull/37544) ([Robert Schulze](https://github.com/rschu1ze)).
 * Improve filter bitmask generator function all in one with AVX-512 instructions. [#37588](https://github.com/ClickHouse/ClickHouse/pull/37588) ([yaqi-zhao](https://github.com/yaqi-zhao)).
 * Apply read method `threadpool` for Hive integration engine. This will significantly speed up reading. [#36328](https://github.com/ClickHouse/ClickHouse/pull/36328) ([李扬](https://github.com/taiyang-li)).
 * When all the columns to read are partition keys, construct columns by the file's row number without real reading the Hive file. [#37103](https://github.com/ClickHouse/ClickHouse/pull/37103) ([lgbo](https://github.com/lgbo-ustc)).
 * Support multi disks for caching hive files. [#37279](https://github.com/ClickHouse/ClickHouse/pull/37279) ([lgbo](https://github.com/lgbo-ustc)).
 * Limiting the maximum cache usage per query can effectively prevent cache pool contamination. [Related Issues](https://github.com/ClickHouse/ClickHouse/issues/28961). [#37859](https://github.com/ClickHouse/ClickHouse/pull/37859) ([Han Shukai](https://github.com/KinderRiven)).
 * Currently clickhouse directly downloads all remote files to the local cache (even if they are only read once), which will frequently cause IO of the local hard disk. In some scenarios, these IOs may not be necessary and may easily cause negative optimization. As shown in the figure below, when we run SSB Q1-Q4, the performance of the cache has caused negative optimization. [#37516](https://github.com/ClickHouse/ClickHouse/pull/37516) ([Han Shukai](https://github.com/KinderRiven)).
 * Allow to prune the list of files via virtual columns such as `_file` and `_path` when reading from S3. This is for [#37174](https://github.com/ClickHouse/ClickHouse/issues/37174) , [#23494](https://github.com/ClickHouse/ClickHouse/issues/23494). [#37356](https://github.com/ClickHouse/ClickHouse/pull/37356) ([Amos Bird](https://github.com/amosbird)).
 * In function: CompressedWriteBuffer::nextImpl(), there is an unnecessary write-copy step that would happen frequently during inserting data. Below shows the differentiation with this patch: - Before: 1. Compress "working_buffer" into "compressed_buffer" 2. write-copy into "out" - After: Directly Compress "working_buffer" into "out". [#37242](https://github.com/ClickHouse/ClickHouse/pull/37242) ([jasperzhu](https://github.com/jinjunzh)).
 #### Improvement
 * Support types with non-standard defaults in ROLLUP, CUBE, GROUPING SETS. Closes [#37360](https://github.com/ClickHouse/ClickHouse/issues/37360). [#37667](https://github.com/ClickHouse/ClickHouse/pull/37667) ([Dmitry Novik](https://github.com/novikd)).
 * Fix stack traces collection on ARM. Closes [#37044](https://github.com/ClickHouse/ClickHouse/issues/37044). Closes [#15638](https://github.com/ClickHouse/ClickHouse/issues/15638). [#37797](https://github.com/ClickHouse/ClickHouse/pull/37797) ([Maksim Kita](https://github.com/kitaisreal)).
 * Client will try every IP address returned by DNS resolution until successful connection. [#37273](https://github.com/ClickHouse/ClickHouse/pull/37273) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
 * Allow to use String type instead of Binary in Arrow/Parquet/ORC formats. This PR introduces 3 new settings for it: `output_format_arrow_string_as_string`, `output_format_parquet_string_as_string`, `output_format_orc_string_as_string`. Default value for all settings is `false`. [#37327](https://github.com/ClickHouse/ClickHouse/pull/37327) ([Kruglov Pavel](https://github.com/Avogar)).
 * Apply setting `input_format_max_rows_to_read_for_schema_inference` for all read rows in total from all files in globs. Previously setting `input_format_max_rows_to_read_for_schema_inference` was applied for each file in glob separately and in case of huge number of nulls we could read first `input_format_max_rows_to_read_for_schema_inference` rows from each file and get nothing. Also increase default value for this setting to 25000. [#37332](https://github.com/ClickHouse/ClickHouse/pull/37332) ([Kruglov Pavel](https://github.com/Avogar)).
 * Add separate `CLUSTER` grant (and `access_control_improvements.on_cluster_queries_require_cluster_grant` configuration directive, for backward compatibility, default to `false`). [#35767](https://github.com/ClickHouse/ClickHouse/pull/35767) ([Azat Khuzhin](https://github.com/azat)).
 * Added support for schema inference for `hdfsCluster`. [#35812](https://github.com/ClickHouse/ClickHouse/pull/35812) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
 * Implement `least_used` load balancing algorithm for disks inside volume (multi disk configuration). [#36686](https://github.com/ClickHouse/ClickHouse/pull/36686) ([Azat Khuzhin](https://github.com/azat)).
 * Modify the HTTP Endpoint to return the full stats under the `X-ClickHouse-Summary` header when `send_progress_in_http_headers=0` (before it would return all zeros). - Modify the HTTP Endpoint to return `X-ClickHouse-Exception-Code` header when progress has been sent before (`send_progress_in_http_headers=1`) - Modify the HTTP Endpoint to return `HTTP_REQUEST_TIMEOUT` (408) instead of `HTTP_INTERNAL_SERVER_ERROR` (500) on `TIMEOUT_EXCEEDED` errors. [#36884](https://github.com/ClickHouse/ClickHouse/pull/36884) ([Raúl Marín](https://github.com/Algunenano)).
 * Allow a user to inspect grants from granted roles. [#36941](https://github.com/ClickHouse/ClickHouse/pull/36941) ([nvartolomei](https://github.com/nvartolomei)).
 * Do not calculate an integral numerically but use CDF functions instead. This will speed up execution and will increase the precision. This fixes [#36714](https://github.com/ClickHouse/ClickHouse/issues/36714). [#36953](https://github.com/ClickHouse/ClickHouse/pull/36953) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
 * Add default implementation for Nothing in functions. Now most of the functions will return column with type Nothing in case one of it's arguments is Nothing. It also solves problem with functions like arrayMap/arrayFilter and similar when they have empty array as an argument. Previously queries like `select arrayMap(x -> 2 * x, []);` failed because function inside lambda cannot work with type `Nothing`, now such queries return empty array with type `Array(Nothing)`. Also add support for arrays of nullable types in functions like arrayFilter/arrayFill. Previously, queries like `select arrayFilter(x -> x % 2, [1, NULL])` failed, now they work (if the result of lambda is NULL, then this value won't be included in the result). Closes [#37000](https://github.com/ClickHouse/ClickHouse/issues/37000). [#37048](https://github.com/ClickHouse/ClickHouse/pull/37048) ([Kruglov Pavel](https://github.com/Avogar)).
 * Now if a shard has local replica we create a local plan and a plan to read from all remote replicas. They have shared initiator which coordinates reading. [#37204](https://github.com/ClickHouse/ClickHouse/pull/37204) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
 * Do no longer abort server startup if configuration option "mark_cache_size" is not explicitly set. [#37326](https://github.com/ClickHouse/ClickHouse/pull/37326) ([Robert Schulze](https://github.com/rschu1ze)).
 * Allows providing `NULL`/`NOT NULL` right after type in column declaration. [#37337](https://github.com/ClickHouse/ClickHouse/pull/37337) ([Igor Nikonov](https://github.com/devcrafter)).
 * optimize file segment PARTIALLY_DOWNLOADED get read buffer. [#37338](https://github.com/ClickHouse/ClickHouse/pull/37338) ([xiedeyantu](https://github.com/xiedeyantu)).
 * Try to improve short circuit functions processing to fix problems with stress tests. [#37384](https://github.com/ClickHouse/ClickHouse/pull/37384) ([Kruglov Pavel](https://github.com/Avogar)).
 * Closes [#37395](https://github.com/ClickHouse/ClickHouse/issues/37395). [#37415](https://github.com/ClickHouse/ClickHouse/pull/37415) ([Memo](https://github.com/Joeywzr)).
 * Fix extremely rare deadlock during part fetch in zero-copy replication. Fixes [#37423](https://github.com/ClickHouse/ClickHouse/issues/37423). [#37424](https://github.com/ClickHouse/ClickHouse/pull/37424) ([metahys](https://github.com/metahys)).
 * Don't allow to create storage with unknown data format. [#37450](https://github.com/ClickHouse/ClickHouse/pull/37450) ([Kruglov Pavel](https://github.com/Avogar)).
 * Set `global_memory_usage_overcommit_max_wait_microseconds` default value to 5 seconds. Add info about `OvercommitTracker` to OOM exception message. Add `MemoryOvercommitWaitTimeMicroseconds` profile event. [#37460](https://github.com/ClickHouse/ClickHouse/pull/37460) ([Dmitry Novik](https://github.com/novikd)).
 * Do not display `-0.0` CPU time in clickhouse-client. It can appear due to rounding errors. This closes [#38003](https://github.com/ClickHouse/ClickHouse/issues/38003). This closes [#38038](https://github.com/ClickHouse/ClickHouse/issues/38038). [#38064](https://github.com/ClickHouse/ClickHouse/pull/38064) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Play UI: Keep controls in place when the page is scrolled horizontally. This makes edits comfortable even if the table is wide and it was scrolled far to the right. The feature proposed by Maksym Tereshchenko from CaspianDB. [#37470](https://github.com/ClickHouse/ClickHouse/pull/37470) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Modify query div in play.html to be extendable beyond 20% height. In case of very long queries it is helpful to extend the textarea element, only today, since the div is fixed height, the extended textarea hides the data div underneath. With this fix, extending the textarea element will push the data div down/up such the extended textarea won't hide it. Also, keeps query box width 100% even when the user adjusting the size of the query textarea. [#37488](https://github.com/ClickHouse/ClickHouse/pull/37488) ([guyco87](https://github.com/guyco87)).
 * Added `ProfileEvents` for introspection of type of written (inserted or merged) parts (`Inserted{Wide/Compact/InMemory}Parts`, `MergedInto{Wide/Compact/InMemory}Parts`. Added column `part_type` to `system.part_log`. Resolves [#37495](https://github.com/ClickHouse/ClickHouse/issues/37495). [#37536](https://github.com/ClickHouse/ClickHouse/pull/37536) ([Anton Popov](https://github.com/CurtizJ)).
 * clickhouse-keeper improvement: move broken logs to a timestamped folder. [#37565](https://github.com/ClickHouse/ClickHouse/pull/37565) ([Antonio Andelic](https://github.com/antonio2368)).
 * Do not write expired columns by TTL after subsequent merges (before only first merge/optimize of the part will not write expired by TTL columns, all other will do). [#37570](https://github.com/ClickHouse/ClickHouse/pull/37570) ([Azat Khuzhin](https://github.com/azat)).
 * More precise result of the `dumpColumnStructure` miscellaneous function in presence of LowCardinality or Sparse columns. In previous versions, these functions were converting the argument to a full column before returning the result. This is needed to provide an answer in [#6935](https://github.com/ClickHouse/ClickHouse/issues/6935). [#37633](https://github.com/ClickHouse/ClickHouse/pull/37633) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * clickhouse-keeper: store only unique session IDs for watches. [#37641](https://github.com/ClickHouse/ClickHouse/pull/37641) ([Azat Khuzhin](https://github.com/azat)).
 * Fix possible "Cannot write to finalized buffer". [#37645](https://github.com/ClickHouse/ClickHouse/pull/37645) ([Azat Khuzhin](https://github.com/azat)).
 * Add setting `support_batch_delete` for `DiskS3` to disable multiobject delete calls, which Google Cloud Storage doesn't support. [#37659](https://github.com/ClickHouse/ClickHouse/pull/37659) ([Fred Wulff](https://github.com/frew)).
 * Add an option to disable connection pooling in ODBC bridge. [#37705](https://github.com/ClickHouse/ClickHouse/pull/37705) ([Anton Kozlov](https://github.com/tonickkozlov)).
 * Functions `dictGetHierarchy`, `dictIsIn`, `dictGetChildren`, `dictGetDescendants` added support nullable `HIERARCHICAL` attribute in dictionaries. Closes [#35521](https://github.com/ClickHouse/ClickHouse/issues/35521). [#37805](https://github.com/ClickHouse/ClickHouse/pull/37805) ([Maksim Kita](https://github.com/kitaisreal)).
 * Expose BoringSSL version related info in the `system.build_options` table. [#37850](https://github.com/ClickHouse/ClickHouse/pull/37850) ([Bharat Nallan](https://github.com/bharatnc)).
 * Now clickhouse-server removes `delete_tmp` directories on server start. Fixes [#26503](https://github.com/ClickHouse/ClickHouse/issues/26503). [#37906](https://github.com/ClickHouse/ClickHouse/pull/37906) ([alesapin](https://github.com/alesapin)).
 * Clean up broken detached parts after timeout. Closes [#25195](https://github.com/ClickHouse/ClickHouse/issues/25195). [#37975](https://github.com/ClickHouse/ClickHouse/pull/37975) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Now in MergeTree table engines family failed-to-move parts will be removed instantly. [#37994](https://github.com/ClickHouse/ClickHouse/pull/37994) ([alesapin](https://github.com/alesapin)).
 * Now if setting `always_fetch_merged_part` is enabled for ReplicatedMergeTree merges will try to find parts on other replicas rarely with smaller load for [Zoo]Keeper. [#37995](https://github.com/ClickHouse/ClickHouse/pull/37995) ([alesapin](https://github.com/alesapin)).
 * Add implicit grants with grant option too. For example `GRANT CREATE TABLE ON test.* TO A WITH GRANT OPTION` now allows `A` to execute `GRANT CREATE VIEW ON test.* TO B`. [#38017](https://github.com/ClickHouse/ClickHouse/pull/38017) ([Vitaly Baranov](https://github.com/vitlibar)).
 #### Build/Testing/Packaging Improvement
 * Use `clang-14` and LLVM infrastructure version 14 for builds. This closes [#34681](https://github.com/ClickHouse/ClickHouse/issues/34681). [#34754](https://github.com/ClickHouse/ClickHouse/pull/34754) ([Alexey Milovidov](https://github.com/alexey-milovidov)). Note: `clang-14` has [a bug](https://github.com/google/sanitizers/issues/1540) in ThreadSanitizer that makes our CI work worse.
 * Allow to drop privileges at startup. This simplifies Docker images. Closes [#36293](https://github.com/ClickHouse/ClickHouse/issues/36293). [#36341](https://github.com/ClickHouse/ClickHouse/pull/36341) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Add docs spellcheck to CI. [#37790](https://github.com/ClickHouse/ClickHouse/pull/37790) ([Vladimir C](https://github.com/vdimir)).
 * Fix overly aggressive stripping which removed the embedded hash required for checking the consistency of the executable. [#37993](https://github.com/ClickHouse/ClickHouse/pull/37993) ([Robert Schulze](https://github.com/rschu1ze)).
 #### Bug Fix
 * Fix `SELECT ... INTERSECT` and `EXCEPT SELECT` statements with constant string types. [#37738](https://github.com/ClickHouse/ClickHouse/pull/37738) ([Antonio Andelic](https://github.com/antonio2368)).
 * Fix `GROUP BY` `AggregateFunction` (i.e. you `GROUP BY` by the column that has `AggregateFunction` type). [#37093](https://github.com/ClickHouse/ClickHouse/pull/37093) ([Azat Khuzhin](https://github.com/azat)).
 * (experimental WINDOW VIEW) Fix `addDependency` in WindowView. This bug can be reproduced like [#37237](https://github.com/ClickHouse/ClickHouse/issues/37237). [#37224](https://github.com/ClickHouse/ClickHouse/pull/37224) ([vxider](https://github.com/Vxider)).
 * Fix inconsistency in ORDER BY ... WITH FILL feature. Query, containing ORDER BY ... WITH FILL, can generate extra rows when multiple WITH FILL columns are present. [#38074](https://github.com/ClickHouse/ClickHouse/pull/38074) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
 * This PR moving `addDependency` from constructor to `startup()` to avoid adding dependency to a *dropped* table, fix [#37237](https://github.com/ClickHouse/ClickHouse/issues/37237). [#37243](https://github.com/ClickHouse/ClickHouse/pull/37243) ([vxider](https://github.com/Vxider)).
 * Fix inserting defaults for missing values in columnar formats. Previously missing columns were filled with defaults for types, not for columns. [#37253](https://github.com/ClickHouse/ClickHouse/pull/37253) ([Kruglov Pavel](https://github.com/Avogar)).
 * (experimental Object type) Fix some cases of insertion nested arrays to columns of type `Object`. [#37305](https://github.com/ClickHouse/ClickHouse/pull/37305) ([Anton Popov](https://github.com/CurtizJ)).
 * Fix unexpected errors with a clash of constant strings in aggregate function, prewhere and join. Close [#36891](https://github.com/ClickHouse/ClickHouse/issues/36891). [#37336](https://github.com/ClickHouse/ClickHouse/pull/37336) ([Vladimir C](https://github.com/vdimir)).
 * Fix projections with GROUP/ORDER BY in query and optimize_aggregation_in_order (before the result was incorrect since only finish sorting was performed). [#37342](https://github.com/ClickHouse/ClickHouse/pull/37342) ([Azat Khuzhin](https://github.com/azat)).
 * Fixed error with symbols in key name in S3. Fixes [#33009](https://github.com/ClickHouse/ClickHouse/issues/33009). [#37344](https://github.com/ClickHouse/ClickHouse/pull/37344) ([Vladimir Chebotarev](https://github.com/excitoon)).
 * Throw an exception when GROUPING SETS used with ROLLUP or CUBE. [#37367](https://github.com/ClickHouse/ClickHouse/pull/37367) ([Dmitry Novik](https://github.com/novikd)).
 * Fix LOGICAL_ERROR in getMaxSourcePartsSizeForMerge during merges (in case of non standard, greater, values of `background_pool_size`/`background_merges_mutations_concurrency_ratio` has been specified in `config.xml` (new way) not in `users.xml` (deprecated way)). [#37413](https://github.com/ClickHouse/ClickHouse/pull/37413) ([Azat Khuzhin](https://github.com/azat)).
 * Stop removing UTF-8 BOM in RowBinary format. [#37428](https://github.com/ClickHouse/ClickHouse/pull/37428) ([Paul Loyd](https://github.com/loyd)). [#37428](https://github.com/ClickHouse/ClickHouse/pull/37428) ([Paul Loyd](https://github.com/loyd)).
 * clickhouse-keeper bugfix: fix force recovery for single node cluster. [#37440](https://github.com/ClickHouse/ClickHouse/pull/37440) ([Antonio Andelic](https://github.com/antonio2368)).
 * Fix logical error in normalizeUTF8 functions. Closes [#37298](https://github.com/ClickHouse/ClickHouse/issues/37298). [#37443](https://github.com/ClickHouse/ClickHouse/pull/37443) ([Maksim Kita](https://github.com/kitaisreal)).
 * Fix cast lowcard of nullable in JoinSwitcher, close [#37385](https://github.com/ClickHouse/ClickHouse/issues/37385). [#37453](https://github.com/ClickHouse/ClickHouse/pull/37453) ([Vladimir C](https://github.com/vdimir)).
 * Fix named tuples output in ORC/Arrow/Parquet formats. [#37458](https://github.com/ClickHouse/ClickHouse/pull/37458) ([Kruglov Pavel](https://github.com/Avogar)).
 * Fix optimization of monotonous functions in ORDER BY clause in presence of GROUPING SETS. Fixes [#37401](https://github.com/ClickHouse/ClickHouse/issues/37401). [#37493](https://github.com/ClickHouse/ClickHouse/pull/37493) ([Dmitry Novik](https://github.com/novikd)).
 * Fix error on joining with dictionary on some conditions. Close [#37386](https://github.com/ClickHouse/ClickHouse/issues/37386). [#37530](https://github.com/ClickHouse/ClickHouse/pull/37530) ([Vladimir C](https://github.com/vdimir)).
 * Prohibit `optimize_aggregation_in_order` with `GROUPING SETS` (fixes `LOGICAL_ERROR`). [#37542](https://github.com/ClickHouse/ClickHouse/pull/37542) ([Azat Khuzhin](https://github.com/azat)).
 * Fix wrong dump information of ActionsDAG. [#37587](https://github.com/ClickHouse/ClickHouse/pull/37587) ([zhanglistar](https://github.com/zhanglistar)).
 * Fix converting types for UNION queries (may produce LOGICAL_ERROR). [#37593](https://github.com/ClickHouse/ClickHouse/pull/37593) ([Azat Khuzhin](https://github.com/azat)).
 * Fix `WITH FILL` modifier with negative intervals in `STEP` clause. Fixes [#37514](https://github.com/ClickHouse/ClickHouse/issues/37514). [#37600](https://github.com/ClickHouse/ClickHouse/pull/37600) ([Anton Popov](https://github.com/CurtizJ)).
 * Fix illegal joinGet array usage when ` join_use_nulls = 1`. This fixes [#37562](https://github.com/ClickHouse/ClickHouse/issues/37562) . [#37650](https://github.com/ClickHouse/ClickHouse/pull/37650) ([Amos Bird](https://github.com/amosbird)).
 * Fix columns number mismatch in cross join, close [#37561](https://github.com/ClickHouse/ClickHouse/issues/37561). [#37653](https://github.com/ClickHouse/ClickHouse/pull/37653) ([Vladimir C](https://github.com/vdimir)).
 * Fix segmentation fault in `show create table` from mysql database when it is configured with named collections. Closes [#37683](https://github.com/ClickHouse/ClickHouse/issues/37683). [#37690](https://github.com/ClickHouse/ClickHouse/pull/37690) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Fix RabbitMQ Storage not being able to startup on server restart if storage was create without SETTINGS clause. Closes [#37463](https://github.com/ClickHouse/ClickHouse/issues/37463). [#37691](https://github.com/ClickHouse/ClickHouse/pull/37691) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * SQL user defined functions disable CREATE/DROP in readonly mode. Closes [#37280](https://github.com/ClickHouse/ClickHouse/issues/37280). [#37699](https://github.com/ClickHouse/ClickHouse/pull/37699) ([Maksim Kita](https://github.com/kitaisreal)).
 * Fix formatting of Nullable arguments for executable user defined functions. Closes [#35897](https://github.com/ClickHouse/ClickHouse/issues/35897). [#37711](https://github.com/ClickHouse/ClickHouse/pull/37711) ([Maksim Kita](https://github.com/kitaisreal)).
 * Fix optimization enabled by setting `optimize_monotonous_functions_in_order_by` in distributed queries. Fixes [#36037](https://github.com/ClickHouse/ClickHouse/issues/36037). [#37724](https://github.com/ClickHouse/ClickHouse/pull/37724) ([Anton Popov](https://github.com/CurtizJ)).
 * Fix possible logical error: `Invalid Field get from type UInt64 to type Float64` in `values` table function. Closes [#37602](https://github.com/ClickHouse/ClickHouse/issues/37602). [#37754](https://github.com/ClickHouse/ClickHouse/pull/37754) ([Kruglov Pavel](https://github.com/Avogar)).
 * Fix possible segfault in schema inference in case of exception in SchemaReader constructor. Closes [#37680](https://github.com/ClickHouse/ClickHouse/issues/37680). [#37760](https://github.com/ClickHouse/ClickHouse/pull/37760) ([Kruglov Pavel](https://github.com/Avogar)).
 * Fix setting cast_ipv4_ipv6_default_on_conversion_error for internal cast function. Closes [#35156](https://github.com/ClickHouse/ClickHouse/issues/35156). [#37761](https://github.com/ClickHouse/ClickHouse/pull/37761) ([Maksim Kita](https://github.com/kitaisreal)).
 * Fix toString error on DatatypeDate32. [#37775](https://github.com/ClickHouse/ClickHouse/pull/37775) ([LiuNeng](https://github.com/liuneng1994)).
 * The clickhouse-keeper setting `dead_session_check_period_ms` was transformed into microseconds (multiplied by 1000), which lead to dead sessions only being cleaned up after several minutes (instead of 500ms). [#37824](https://github.com/ClickHouse/ClickHouse/pull/37824) ([Michael Lex](https://github.com/mlex)).
 * Fix possible "No more packets are available" for distributed queries (in case of `async_socket_for_remote`/`use_hedged_requests` is disabled). [#37826](https://github.com/ClickHouse/ClickHouse/pull/37826) ([Azat Khuzhin](https://github.com/azat)).
 * (experimental WINDOW VIEW) Do not drop the inner target table when executing `ALTER TABLE … MODIFY QUERY` in WindowView. [#37879](https://github.com/ClickHouse/ClickHouse/pull/37879) ([vxider](https://github.com/Vxider)).
 * Fix directory ownership of coordination dir in clickhouse-keeper Docker image. Fixes [#37914](https://github.com/ClickHouse/ClickHouse/issues/37914). [#37915](https://github.com/ClickHouse/ClickHouse/pull/37915) ([James Maidment](https://github.com/jamesmaidment)).
 * Dictionaries fix custom query with update field and `{condition}`. Closes [#33746](https://github.com/ClickHouse/ClickHouse/issues/33746). [#37947](https://github.com/ClickHouse/ClickHouse/pull/37947) ([Maksim Kita](https://github.com/kitaisreal)).
 * Fix possible incorrect result of `SELECT ... WITH FILL` in the case when `ORDER BY` should be applied after `WITH FILL` result (e.g. for outer query). Incorrect result was caused by optimization for `ORDER BY` expressions ([#35623](https://github.com/ClickHouse/ClickHouse/issues/35623)). Closes [#37904](https://github.com/ClickHouse/ClickHouse/issues/37904). [#37959](https://github.com/ClickHouse/ClickHouse/pull/37959) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
 * (experimental WINDOW VIEW) Add missing default columns when pushing to the target table in WindowView, fix [#37815](https://github.com/ClickHouse/ClickHouse/issues/37815). [#37965](https://github.com/ClickHouse/ClickHouse/pull/37965) ([vxider](https://github.com/Vxider)).
 * Fixed too large stack frame that would cause compilation to fail. [#37996](https://github.com/ClickHouse/ClickHouse/pull/37996) ([Han Shukai](https://github.com/KinderRiven)).
 * When open enable_filesystem_query_cache_limit, throw Reserved cache size exceeds the remaining cache size. [#38004](https://github.com/ClickHouse/ClickHouse/pull/38004) ([xiedeyantu](https://github.com/xiedeyantu)).
 * Fix converting types for UNION queries (may produce LOGICAL_ERROR). [#34775](https://github.com/ClickHouse/ClickHouse/pull/34775) ([Azat Khuzhin](https://github.com/azat)).
 * TTL merge may not be scheduled again if BackgroundExecutor is busy. --merges_with_ttl_counter is increased in selectPartsToMerge() --merge task will be ignored if BackgroundExecutor is busy --merges_with_ttl_counter will not be decrease. [#36387](https://github.com/ClickHouse/ClickHouse/pull/36387) ([lthaooo](https://github.com/lthaooo)).
 * Fix overridden settings value of `normalize_function_names`. [#36937](https://github.com/ClickHouse/ClickHouse/pull/36937) ([李扬](https://github.com/taiyang-li)).
 * Fix for exponential time decaying window functions. Now respecting boundaries of the window. [#36944](https://github.com/ClickHouse/ClickHouse/pull/36944) ([Vladimir Chebotarev](https://github.com/excitoon)).
 * Fix possible heap-use-after-free error when reading system.projection_parts and system.projection_parts_columns . This fixes [#37184](https://github.com/ClickHouse/ClickHouse/issues/37184). [#37185](https://github.com/ClickHouse/ClickHouse/pull/37185) ([Amos Bird](https://github.com/amosbird)).
 * Fixed `DateTime64` fractional seconds behavior prior to Unix epoch. [#37697](https://github.com/ClickHouse/ClickHouse/pull/37697) ([Andrey Zvonov](https://github.com/zvonand)). [#37039](https://github.com/ClickHouse/ClickHouse/pull/37039) ([李扬](https://github.com/taiyang-li)).
 ### <a id="225"></a> ClickHouse release 22.5, 2022-05-19
 #### Upgrade Notes
 * Now, background merges, mutations and `OPTIMIZE` will not increment `SelectedRows` and `SelectedBytes` metrics. They (still) will increment `MergedRows` and `MergedUncompressedBytes` as it was before. This only affects the metric values, and makes them better. This change does not introduce any incompatibility, but you may wonder about the changes of metrics, so we put in this category. [#37040](https://github.com/ClickHouse/ClickHouse/pull/37040) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Updated the BoringSSL module to the official FIPS compliant version. This makes ClickHouse FIPS compliant. [#35914](https://github.com/ClickHouse/ClickHouse/pull/35914) ([Meena-Renganathan](https://github.com/Meena-Renganathan)). The ciphers `aes-192-cfb128` and `aes-256-cfb128` were removed, because they are not included in the FIPS certified version of BoringSSL.
 * `max_memory_usage` setting is removed from the default user profile in `users.xml`. This enables flexible memory limits for queries instead of the old rigid limit of 10 GB.
 * Disable `log_query_threads` setting by default. It controls the logging of statistics about every thread participating in query execution. After supporting asynchronous reads, the total number of distinct thread ids became too large, and logging into the `query_thread_log` has become too heavy. [#37077](https://github.com/ClickHouse/ClickHouse/pull/37077) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Remove function `groupArraySorted` which has a bug. [#36822](https://github.com/ClickHouse/ClickHouse/pull/36822) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 #### New Feature
 * Enable memory overcommit by default. [#35921](https://github.com/ClickHouse/ClickHouse/pull/35921) ([Dmitry Novik](https://github.com/novikd)).
 * Add support of GROUPING SETS in GROUP BY clause. This implementation supports a parallel processing of grouping sets. [#33631](https://github.com/ClickHouse/ClickHouse/pull/33631) ([Dmitry Novik](https://github.com/novikd)).
 * Added `system.certificates` table. [#37142](https://github.com/ClickHouse/ClickHouse/pull/37142) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
 * Adds `h3Line`, `h3Distance` and `h3HexRing` functions. [#37030](https://github.com/ClickHouse/ClickHouse/pull/37030) ([Bharat Nallan](https://github.com/bharatnc)).
 * New single binary based diagnostics tool (clickhouse-diagnostics). [#36705](https://github.com/ClickHouse/ClickHouse/pull/36705) ([Dale McDiarmid](https://github.com/gingerwizard)).
 * Add output format `Prometheus` [#36051](https://github.com/ClickHouse/ClickHouse/issues/36051). [#36206](https://github.com/ClickHouse/ClickHouse/pull/36206) ([Vladimir C](https://github.com/vdimir)).
 * Add `MySQLDump` input format. It reads all data from INSERT queries belonging to one table in dump. If there are more than one table, by default it reads data from the first one. [#36667](https://github.com/ClickHouse/ClickHouse/pull/36667) ([Kruglov Pavel](https://github.com/Avogar)).
 * Show the `total_rows` and `total_bytes` fields in `system.tables` for temporary tables. [#36401](https://github.com/ClickHouse/ClickHouse/issues/36401). [#36439](https://github.com/ClickHouse/ClickHouse/pull/36439) ([xiedeyantu](https://github.com/xiedeyantu)).
 * Allow to override `parts_to_delay_insert` and `parts_to_throw_insert` with query-level settings. If they are defined, they will override table-level settings. [#36371](https://github.com/ClickHouse/ClickHouse/pull/36371) ([Memo](https://github.com/Joeywzr)).
 #### Experimental Feature
 * Implemented L1, L2, Linf, Cosine distance functions for arrays and L1, L2, Linf norm functions for arrays.
 [#37033](https://github.com/ClickHouse/ClickHouse/pull/37033) ([qieqieplus](https://github.com/qieqieplus)). Caveat: the functions will be renamed.
 * Improve the `WATCH` query in WindowView: 1. Reduce the latency of providing query results by calling the `fire_condition` signal. 2. Makes the cancel query operation(ctrl-c) faster, by checking `isCancelled()` more frequently. [#37226](https://github.com/ClickHouse/ClickHouse/pull/37226) ([vxider](https://github.com/Vxider)).
 * Introspection for remove filesystem cache. [#36802](https://github.com/ClickHouse/ClickHouse/pull/36802) ([Han Shukai](https://github.com/KinderRiven)).
 * Added new hash function `wyHash64` for SQL. [#36467](https://github.com/ClickHouse/ClickHouse/pull/36467) ([olevino](https://github.com/olevino)).
 * Improvement for replicated databases: Added `SYSTEM SYNC DATABASE REPLICA` query which allows to sync tables metadata inside Replicated database, because currently synchronisation is asynchronous. [#35944](https://github.com/ClickHouse/ClickHouse/pull/35944) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
 * Improvement for remote filesystem cache: Better read from cache. [#37054](https://github.com/ClickHouse/ClickHouse/pull/37054) ([Kseniia Sumarokova](https://github.com/kssenii)). Improve `SYSTEM DROP FILESYSTEM CACHE` query: `<path>` option and `FORCE` option. [#36639](https://github.com/ClickHouse/ClickHouse/pull/36639) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Improvement for semistructured data: Allow to cast columns of type `Object(...)` to `Object(Nullable(...))`. [#36564](https://github.com/ClickHouse/ClickHouse/pull/36564) ([awakeljw](https://github.com/awakeljw)).
 * Improvement for parallel replicas: We create a local interpreter if we want to execute query on localhost replica. But for when executing query on multiple replicas we rely on the fact that a connection exists so replicas can talk to coordinator. It is now improved and localhost replica can talk to coordinator directly in the same process. [#36281](https://github.com/ClickHouse/ClickHouse/pull/36281) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
 #### Performance Improvement
 * Improve performance of `avg`, `sum` aggregate functions if used without GROUP BY expression. [#37257](https://github.com/ClickHouse/ClickHouse/pull/37257) ([Maksim Kita](https://github.com/kitaisreal)).
 * Improve performance of unary arithmetic functions (`bitCount`, `bitNot`, `abs`, `intExp2`, `intExp10`, `negate`, `roundAge`, `roundDuration`, `roundToExp2`, `sign`) using dynamic dispatch. [#37289](https://github.com/ClickHouse/ClickHouse/pull/37289) ([Maksim Kita](https://github.com/kitaisreal)).
 * Improve performance of ORDER BY, MergeJoin, insertion into MergeTree using JIT compilation of sort columns comparator. [#34469](https://github.com/ClickHouse/ClickHouse/pull/34469) ([Maksim Kita](https://github.com/kitaisreal)).
 * Change structure of `system.asynchronous_metric_log`. It will take about 10 times less space. This closes [#36357](https://github.com/ClickHouse/ClickHouse/issues/36357). The field `event_time_microseconds` was removed, because it is useless. [#36360](https://github.com/ClickHouse/ClickHouse/pull/36360) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Load marks for only necessary columns when reading wide parts. [#36879](https://github.com/ClickHouse/ClickHouse/pull/36879) ([Anton Kozlov](https://github.com/tonickkozlov)).
 * Improves performance of file descriptor cache by narrowing mutex scopes. [#36682](https://github.com/ClickHouse/ClickHouse/pull/36682) ([Anton Kozlov](https://github.com/tonickkozlov)).
 * Improve performance of reading from storage `File` and table functions `file` in case when path has globs and matched directory contains large number of files. [#36647](https://github.com/ClickHouse/ClickHouse/pull/36647) ([Anton Popov](https://github.com/CurtizJ)).
 * Apply parallel parsing for input format `HiveText`, which can speed up HiveText parsing by 2x when reading local file. [#36650](https://github.com/ClickHouse/ClickHouse/pull/36650) ([李扬](https://github.com/taiyang-li)).
 * The default `HashJoin` is not thread safe for inserting right table's rows and run it in a single thread. When the right table is large, the join process is too slow with low cpu utilization. [#36415](https://github.com/ClickHouse/ClickHouse/pull/36415) ([lgbo](https://github.com/lgbo-ustc)).
 * Allow to rewrite `select countDistinct(a) from t` to `select count(1) from (select a from t groupBy a)`. [#35993](https://github.com/ClickHouse/ClickHouse/pull/35993) ([zhanglistar](https://github.com/zhanglistar)).
 * Transform OR LIKE chain to multiMatchAny. Will enable once we have more confidence it works. [#34932](https://github.com/ClickHouse/ClickHouse/pull/34932) ([Daniel Kutenin](https://github.com/danlark1)).
 * Improve performance of some functions with inlining. [#34544](https://github.com/ClickHouse/ClickHouse/pull/34544) ([Daniel Kutenin](https://github.com/danlark1)).
 * Add a branch to avoid unnecessary memcpy in readBig. It improves performance somewhat. [#36095](https://github.com/ClickHouse/ClickHouse/pull/36095) ([jasperzhu](https://github.com/jinjunzh)).
 * Implement partial GROUP BY key for optimize_aggregation_in_order. [#35111](https://github.com/ClickHouse/ClickHouse/pull/35111) ([Azat Khuzhin](https://github.com/azat)).
 #### Improvement
 * Show names of erroneous files in case of parsing errors while executing table functions `file`, `s3` and `url`. [#36314](https://github.com/ClickHouse/ClickHouse/pull/36314) ([Anton Popov](https://github.com/CurtizJ)).
 * Allowed to increase the number of threads for executing background operations (merges, mutations, moves and fetches) at runtime if they are specified at top level config. [#36425](https://github.com/ClickHouse/ClickHouse/pull/36425) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
 * Now date time conversion functions that generates time before 1970-01-01 00:00:00 with partial hours/minutes timezones will be saturated to zero instead of overflow. This is the continuation of https://github.com/ClickHouse/ClickHouse/pull/29953 which addresses https://github.com/ClickHouse/ClickHouse/pull/29953#discussion_r800550280 . Mark as improvement because it's implementation defined behavior (and very rare case) and we are allowed to break it. [#36656](https://github.com/ClickHouse/ClickHouse/pull/36656) ([Amos Bird](https://github.com/amosbird)).
 * Add a warning if someone running clickhouse-server with log level "test". The log level "test" was added recently and cannot be used in production due to inevitable, unavoidable, fatal and life-threatening performance degradation. [#36824](https://github.com/ClickHouse/ClickHouse/pull/36824) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Parse collations in CREATE TABLE, throw exception or ignore. closes [#35892](https://github.com/ClickHouse/ClickHouse/issues/35892). [#36271](https://github.com/ClickHouse/ClickHouse/pull/36271) ([yuuch](https://github.com/yuuch)).
 * Option `compatibility_ignore_auto_increment_in_create_table` allows ignoring `AUTO_INCREMENT` keyword in a column declaration to simplify migration from MySQL. [#37178](https://github.com/ClickHouse/ClickHouse/pull/37178) ([Igor Nikonov](https://github.com/devcrafter)).
 * Add aliases `JSONLines` and `NDJSON` for `JSONEachRow`. Closes [#36303](https://github.com/ClickHouse/ClickHouse/issues/36303). [#36327](https://github.com/ClickHouse/ClickHouse/pull/36327) ([flynn](https://github.com/ucasfl)).
 * Limit the max partitions could be queried for each hive table. Avoid resource overruns. [#37281](https://github.com/ClickHouse/ClickHouse/pull/37281) ([lgbo](https://github.com/lgbo-ustc)).
 * Added implicit cast for `h3kRing` function second argument to improve usability. Closes [#35432](https://github.com/ClickHouse/ClickHouse/issues/35432). [#37189](https://github.com/ClickHouse/ClickHouse/pull/37189) ([Maksim Kita](https://github.com/kitaisreal)).
 * Fix progress indication for `INSERT SELECT` in `clickhouse-local` for any query and for file progress in client, more correct file progress. [#37075](https://github.com/ClickHouse/ClickHouse/pull/37075) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Fix bug which can lead to forgotten outdated parts in MergeTree table engines family in case of filesystem failures during parts removal. Before fix they will be removed only after first server restart. [#37014](https://github.com/ClickHouse/ClickHouse/pull/37014) ([alesapin](https://github.com/alesapin)).
 * Implemented a new mode of handling row policies which can be enabled in the main configuration which enables users without permissive row policies to read rows. [#36997](https://github.com/ClickHouse/ClickHouse/pull/36997) ([Vitaly Baranov](https://github.com/vitlibar)).
 * Play UI: Nullable numbers will be aligned to the right in table cells. This closes [#36982](https://github.com/ClickHouse/ClickHouse/issues/36982). [#36988](https://github.com/ClickHouse/ClickHouse/pull/36988) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Play UI: If there is one row in result and more than a few columns, display the result vertically. Continuation of [#36811](https://github.com/ClickHouse/ClickHouse/issues/36811). [#36842](https://github.com/ClickHouse/ClickHouse/pull/36842) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Cleanup CSS in Play UI. The pixels are more evenly placed. Better usability for long content in table cells. [#36569](https://github.com/ClickHouse/ClickHouse/pull/36569) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Finalize write buffers in case of exception to avoid doing it in destructors. Hope it fixes: [#36907](https://github.com/ClickHouse/ClickHouse/issues/36907). [#36979](https://github.com/ClickHouse/ClickHouse/pull/36979) ([Kruglov Pavel](https://github.com/Avogar)).
 * After [#36425](https://github.com/ClickHouse/ClickHouse/issues/36425) settings like `background_fetches_pool_size` became obsolete and can appear in top level config, but clickhouse throws and exception like `Error updating configuration from '/etc/clickhouse-server/config.xml' config.: Code: 137. DB::Exception: A setting 'background_fetches_pool_size' appeared at top level in config /etc/clickhouse-server/config.xml.` This is fixed. [#36917](https://github.com/ClickHouse/ClickHouse/pull/36917) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
 * Add extra diagnostic info (if applicable) when sending exception to other server. [#36872](https://github.com/ClickHouse/ClickHouse/pull/36872) ([tavplubix](https://github.com/tavplubix)).
 * Allow to execute hash functions with arguments of type `Array(Tuple(..))`. [#36812](https://github.com/ClickHouse/ClickHouse/pull/36812) ([Anton Popov](https://github.com/CurtizJ)).
 * Added `user_defined_path` config setting. [#36753](https://github.com/ClickHouse/ClickHouse/pull/36753) ([Maksim Kita](https://github.com/kitaisreal)).
 * Allow cluster macro in `s3Cluster` table function. [#36726](https://github.com/ClickHouse/ClickHouse/pull/36726) ([Vadim Volodin](https://github.com/PolyProgrammist)).
 * Properly cancel INSERT queries in `clickhouse-client`/`clickhouse-local`. [#36710](https://github.com/ClickHouse/ClickHouse/pull/36710) ([Azat Khuzhin](https://github.com/azat)).
 * Allow to cancel a query while still keeping a decent query id in `MySQLHandler`. [#36699](https://github.com/ClickHouse/ClickHouse/pull/36699) ([Amos Bird](https://github.com/amosbird)).
 * Add `is_all_data_sent` column into `system.processes`, and improve internal testing hardening check based on it. [#36649](https://github.com/ClickHouse/ClickHouse/pull/36649) ([Azat Khuzhin](https://github.com/azat)).
 * The metrics about time spent reading from s3 now calculated correctly. Close [#35483](https://github.com/ClickHouse/ClickHouse/issues/35483). [#36572](https://github.com/ClickHouse/ClickHouse/pull/36572) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Allow file descriptors in table function file if it is run in clickhouse-local. [#36562](https://github.com/ClickHouse/ClickHouse/pull/36562) ([wuxiaobai24](https://github.com/wuxiaobai24)).
 * Allow names of tuple elements that start from digits. [#36544](https://github.com/ClickHouse/ClickHouse/pull/36544) ([Anton Popov](https://github.com/CurtizJ)).
 * Now clickhouse-benchmark can read authentication info from environment variables. [#36497](https://github.com/ClickHouse/ClickHouse/pull/36497) ([Anton Kozlov](https://github.com/tonickkozlov)).
 * `clickhouse-keeper` improvement: add support for force recovery which allows you to reconfigure cluster without quorum. [#36258](https://github.com/ClickHouse/ClickHouse/pull/36258) ([Antonio Andelic](https://github.com/antonio2368)).
 * Improve schema inference for JSON objects. [#36207](https://github.com/ClickHouse/ClickHouse/pull/36207) ([Kruglov Pavel](https://github.com/Avogar)).
 * Refactor code around schema inference with globs. Try next file from glob only if it makes sense (previously we tried next file in case of any error). Also it fixes [#36317](https://github.com/ClickHouse/ClickHouse/issues/36317). [#36205](https://github.com/ClickHouse/ClickHouse/pull/36205) ([Kruglov Pavel](https://github.com/Avogar)).
 * Add a separate `CLUSTER` grant (and `access_control_improvements.on_cluster_queries_require_cluster_grant` configuration directive, for backward compatibility, default to `false`). [#35767](https://github.com/ClickHouse/ClickHouse/pull/35767) ([Azat Khuzhin](https://github.com/azat)).
 * If the required amount of memory is available before the selected query stopped, all waiting queries continue execution. Now we don't stop any query if memory is freed before the moment when the selected query knows about the cancellation. [#35637](https://github.com/ClickHouse/ClickHouse/pull/35637) ([Dmitry Novik](https://github.com/novikd)).
 * Nullables detection in protobuf. In proto3, default values are not sent on the wire. This makes it non-trivial to distinguish between null and default values for Nullable columns. A standard way to deal with this problem is to use Google wrappers to nest the target value within an inner message (see https://github.com/protocolbuffers/protobuf/blob/master/src/google/protobuf/wrappers.proto). In this case, a missing field is interpreted as null value, a field with missing value if interpreted as default value, and a field with regular value is interpreted as regular value. However, ClickHouse interprets Google wrappers as nested columns. We propose to introduce special behaviour to detect Google wrappers and interpret them like in the description above. For example, to serialize values for a Nullable column `test`, we would use `google.protobuf.StringValue test` in our .proto schema. Note that these types are so called "well-known types" in Protobuf, implemented in the library itself. [#35149](https://github.com/ClickHouse/ClickHouse/pull/35149) ([Jakub Kuklis](https://github.com/jkuklis)).
 * Added support for specifying `content_type` in predefined and static HTTP handler config. [#34916](https://github.com/ClickHouse/ClickHouse/pull/34916) ([Roman Nikonov](https://github.com/nic11)).
 * Warn properly if use clickhouse-client --file without preceeding --external. Close [#34747](https://github.com/ClickHouse/ClickHouse/issues/34747). [#34765](https://github.com/ClickHouse/ClickHouse/pull/34765) ([李扬](https://github.com/taiyang-li)).
 * Improve MySQL database engine to compatible with binary(0) dataType. [#37232](https://github.com/ClickHouse/ClickHouse/pull/37232) ([zzsmdfj](https://github.com/zzsmdfj)).
 * Improve JSON report of clickhouse-benchmark. [#36473](https://github.com/ClickHouse/ClickHouse/pull/36473) ([Tian Xinhui](https://github.com/xinhuitian)).
 * Server might refuse to start if it cannot resolve hostname of external ClickHouse dictionary. It's fixed. Fixes [#36451](https://github.com/ClickHouse/ClickHouse/issues/36451). [#36463](https://github.com/ClickHouse/ClickHouse/pull/36463) ([tavplubix](https://github.com/tavplubix)).
 #### Build/Testing/Packaging Improvement
 * Now `clickhouse-keeper` for the `x86_64` architecture is statically linked with [musl](https://musl.libc.org/) and doesn't depend on any system libraries. [#31833](https://github.com/ClickHouse/ClickHouse/pull/31833) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * ClickHouse builds for `PowerPC64LE` architecture are now available in universal installation script `curl https://clickhouse.com/ | sh` and by direct link `https://builds.clickhouse.com/master/powerpc64le/clickhouse`. [#37095](https://github.com/ClickHouse/ClickHouse/pull/37095) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Limit PowerPC code generation to Power8 for better compatibility. This closes [#36025](https://github.com/ClickHouse/ClickHouse/issues/36025). [#36529](https://github.com/ClickHouse/ClickHouse/pull/36529) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Simplify performance test. This will give a chance for us to use it. [#36769](https://github.com/ClickHouse/ClickHouse/pull/36769) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Fail performance comparison on errors in the report. [#34797](https://github.com/ClickHouse/ClickHouse/pull/34797) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Add ZSTD support for Arrow. This fixes [#35283](https://github.com/ClickHouse/ClickHouse/issues/35283). [#35486](https://github.com/ClickHouse/ClickHouse/pull/35486) ([Sean Lafferty](https://github.com/seanlaff)).
 #### Bug Fix
 * Extracts Version ID if present from the URI and adds a request to the AWS HTTP URI. Closes [#31221](https://github.com/ClickHouse/ClickHouse/issues/31221). - [x] Extract `Version ID` from URI if present and reassemble without it. - [x] Configure `AWS HTTP URI` object with request. - [x] Unit Tests: [`gtest_s3_uri`](https://github.com/ClickHouse/ClickHouse/blob/2340a6c6849ebc05a8efbf97ba8de3ff9dc0eff4/src/IO/tests/gtest_s3_uri.cpp) - [x] Drop instrumentation commit. [#34571](https://github.com/ClickHouse/ClickHouse/pull/34571) ([Saad Ur Rahman](https://github.com/surahman)).
 * Fix system.opentelemetry_span_log attribute.values alias to values instead of keys. [#37275](https://github.com/ClickHouse/ClickHouse/pull/37275) ([Aleksandr Razumov](https://github.com/ernado)).
 * Fix Nullable(String) to Nullable(Bool/IPv4/IPv6) conversion Closes [#37221](https://github.com/ClickHouse/ClickHouse/issues/37221). [#37270](https://github.com/ClickHouse/ClickHouse/pull/37270) ([Kruglov Pavel](https://github.com/Avogar)).
 * Experimental feature: Fix execution of mutations in tables, in which there exist columns of type `Object`. Using subcolumns of type `Object` in `WHERE` expression of `UPDATE` or `DELETE` queries is now allowed yet, as well as manipulating (`DROP`, `MODIFY`) of separate subcolumns. Fixes [#37205](https://github.com/ClickHouse/ClickHouse/issues/37205). [#37266](https://github.com/ClickHouse/ClickHouse/pull/37266) ([Anton Popov](https://github.com/CurtizJ)).
 * Kafka does not need `group.id` on producer stage. In console log you can find Warning that describe this issue: ``` 2022.05.15 17:59:13.270227 [ 137 ] {} <Warning> StorageKafka (topic-name): [rdk:CONFWARN] [thrd:app]: Configuration property group.id is a consumer property and will be ignored by this producer instance ```. [#37228](https://github.com/ClickHouse/ClickHouse/pull/37228) ([Mark Andreev](https://github.com/mrk-andreev)).
 * Experimental feature (WindowView): Update `max_fired_watermark ` after blocks actually fired, in case delete data that hasn't been fired yet. [#37225](https://github.com/ClickHouse/ClickHouse/pull/37225) ([vxider](https://github.com/Vxider)).
 * Fix "Cannot create column of type Set" for distributed queries with LIMIT BY. [#37193](https://github.com/ClickHouse/ClickHouse/pull/37193) ([Azat Khuzhin](https://github.com/azat)).
 * Experimental feature: Now WindowView `WATCH EVENTS` query will not be terminated due to the nonempty Chunk created in `WindowViewSource.h:58`. [#37182](https://github.com/ClickHouse/ClickHouse/pull/37182) ([vxider](https://github.com/Vxider)).
 * Enable `enable_global_with_statement` for subqueries, close [#37141](https://github.com/ClickHouse/ClickHouse/issues/37141). [#37166](https://github.com/ClickHouse/ClickHouse/pull/37166) ([Vladimir C](https://github.com/vdimir)).
 * Fix implicit cast for optimize_skip_unused_shards_rewrite_in. [#37153](https://github.com/ClickHouse/ClickHouse/pull/37153) ([Azat Khuzhin](https://github.com/azat)).
 * The ILIKE function on FixedString columns could have returned wrong results (i.e. match less than it should). [#37117](https://github.com/ClickHouse/ClickHouse/pull/37117) ([Robert Schulze](https://github.com/rschu1ze)).
 * Fix `GROUP BY` `AggregateFunction` (i.e. you `GROUP BY` by the column that has `AggregateFunction` type). [#37093](https://github.com/ClickHouse/ClickHouse/pull/37093) ([Azat Khuzhin](https://github.com/azat)).
 * Experimental feature: Fix optimize_aggregation_in_order with prefix GROUP BY and *Array aggregate functions. [#37050](https://github.com/ClickHouse/ClickHouse/pull/37050) ([Azat Khuzhin](https://github.com/azat)).
 * Fixed performance degradation of some INSERT SELECT queries with implicit aggregation. Fixes [#36792](https://github.com/ClickHouse/ClickHouse/issues/36792). [#37047](https://github.com/ClickHouse/ClickHouse/pull/37047) ([tavplubix](https://github.com/tavplubix)).
 * Experimental feature: Fix in-order `GROUP BY` (`optimize_aggregation_in_order=1`) with `*Array` (`groupArrayArray`/...) aggregate functions. [#37046](https://github.com/ClickHouse/ClickHouse/pull/37046) ([Azat Khuzhin](https://github.com/azat)).
 * Fix LowCardinality->ArrowDictionary invalid output when type of indexes is not UInt8. Closes [#36832](https://github.com/ClickHouse/ClickHouse/issues/36832). [#37043](https://github.com/ClickHouse/ClickHouse/pull/37043) ([Kruglov Pavel](https://github.com/Avogar)).
 * Fixed problem with infs in `quantileTDigest`. Fixes [#32107](https://github.com/ClickHouse/ClickHouse/issues/32107). [#37021](https://github.com/ClickHouse/ClickHouse/pull/37021) ([Vladimir Chebotarev](https://github.com/excitoon)).
 * Fix sending external tables data in HedgedConnections with max_parallel_replicas != 1. [#36981](https://github.com/ClickHouse/ClickHouse/pull/36981) ([Kruglov Pavel](https://github.com/Avogar)).
 * Fixed logical error on `TRUNCATE` query in `Replicated` database. Fixes [#33747](https://github.com/ClickHouse/ClickHouse/issues/33747). [#36976](https://github.com/ClickHouse/ClickHouse/pull/36976) ([tavplubix](https://github.com/tavplubix)).
 * Experimental feature: Fix stuck when dropping source table in WindowView. Closes [#35678](https://github.com/ClickHouse/ClickHouse/issues/35678). [#36967](https://github.com/ClickHouse/ClickHouse/pull/36967) ([vxider](https://github.com/Vxider)).
 * Experimental feature (rocksdb cache): Fix issue: [#36671](https://github.com/ClickHouse/ClickHouse/issues/36671). [#36929](https://github.com/ClickHouse/ClickHouse/pull/36929) ([李扬](https://github.com/taiyang-li)).
 * Experimental feature: Fix bugs when using multiple columns in WindowView by adding converting actions to make it possible to call`writeIntoWindowView` with a slightly different schema. [#36928](https://github.com/ClickHouse/ClickHouse/pull/36928) ([vxider](https://github.com/Vxider)).
 * Fix bug in clickhouse-keeper which can lead to corrupted compressed log files in case of small load and restarts. [#36910](https://github.com/ClickHouse/ClickHouse/pull/36910) ([alesapin](https://github.com/alesapin)).
 * Fix incorrect query result when doing constant aggregation. This fixes [#36728](https://github.com/ClickHouse/ClickHouse/issues/36728) . [#36888](https://github.com/ClickHouse/ClickHouse/pull/36888) ([Amos Bird](https://github.com/amosbird)).
 * Experimental feature: Fix `current_size` count in cache. [#36887](https://github.com/ClickHouse/ClickHouse/pull/36887) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Experimental feature: Fix fire in window view with hop window [#34044](https://github.com/ClickHouse/ClickHouse/issues/34044). [#36861](https://github.com/ClickHouse/ClickHouse/pull/36861) ([vxider](https://github.com/Vxider)).
 * Experimental feature: Fix incorrect cast in cached buffer from remote fs. [#36809](https://github.com/ClickHouse/ClickHouse/pull/36809) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Fix creation of tables with `flatten_nested = 0`. Previously unflattened `Nested` columns could be flattened after server restart. [#36803](https://github.com/ClickHouse/ClickHouse/pull/36803) ([Anton Popov](https://github.com/CurtizJ)).
 * Fix some issues with async reads from remote filesystem which happened when reading low cardinality. [#36763](https://github.com/ClickHouse/ClickHouse/pull/36763) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Experimental feature: Fix insertion to columns of type `Object` from multiple files, e.g. via table function `file` with globs. [#36762](https://github.com/ClickHouse/ClickHouse/pull/36762) ([Anton Popov](https://github.com/CurtizJ)).
 * Fix timeouts in Hedged requests. Connection hang right after sending remote query could lead to eternal waiting. [#36749](https://github.com/ClickHouse/ClickHouse/pull/36749) ([Kruglov Pavel](https://github.com/Avogar)).
 * Experimental feature: Fix a bug of `groupBitmapAndState`/`groupBitmapOrState`/`groupBitmapXorState` on distributed table. [#36739](https://github.com/ClickHouse/ClickHouse/pull/36739) ([Zhang Yifan](https://github.com/zhangyifan27)).
 * Experimental feature: During the [test](https://s3.amazonaws.com/clickhouse-test-reports/36376/1cb1c7275cb53769ab826772db9b71361bb3e413/stress_test__thread__actions_/clickhouse-server.clean.log) in [PR](https://github.com/ClickHouse/ClickHouse/pull/36376), I found that the one cache class was initialized twice, it throws a exception. Although the cause of this problem is not clear, there should be code logic of repeatedly loading disk in ClickHouse, so we need to make special judgment for this situation. [#36737](https://github.com/ClickHouse/ClickHouse/pull/36737) ([Han Shukai](https://github.com/KinderRiven)).
 * Fix vertical merges in wide parts. Previously an exception `There is no column` can be thrown during merge. [#36707](https://github.com/ClickHouse/ClickHouse/pull/36707) ([Anton Popov](https://github.com/CurtizJ)).
 * Fix server reload on port change (do not wait for current connections from query context). [#36700](https://github.com/ClickHouse/ClickHouse/pull/36700) ([Azat Khuzhin](https://github.com/azat)).
 * Experimental feature: In the previous [PR](https://github.com/ClickHouse/ClickHouse/pull/36376), I found that testing (stateless tests, flaky check (address, actions)) is timeout. Moreover, testing locally can also trigger unstable system deadlocks. This problem still exists when using the latest source code of master. [#36697](https://github.com/ClickHouse/ClickHouse/pull/36697) ([Han Shukai](https://github.com/KinderRiven)).
 * Experimental feature: Fix server restart if cache configuration changed. [#36685](https://github.com/ClickHouse/ClickHouse/pull/36685) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Fix possible heap-use-after-free in schema inference. Closes [#36661](https://github.com/ClickHouse/ClickHouse/issues/36661). [#36679](https://github.com/ClickHouse/ClickHouse/pull/36679) ([Kruglov Pavel](https://github.com/Avogar)).
 * Fixed parsing of query settings in `CREATE` query when engine is not specified. Fixes https://github.com/ClickHouse/ClickHouse/pull/34187#issuecomment-1103812419. [#36642](https://github.com/ClickHouse/ClickHouse/pull/36642) ([tavplubix](https://github.com/tavplubix)).
 * Experimental feature: Fix merges of wide parts with type `Object`. [#36637](https://github.com/ClickHouse/ClickHouse/pull/36637) ([Anton Popov](https://github.com/CurtizJ)).
 * Fix format crash when default expression follow EPHEMERAL not literal. Closes [#36618](https://github.com/ClickHouse/ClickHouse/issues/36618). [#36633](https://github.com/ClickHouse/ClickHouse/pull/36633) ([flynn](https://github.com/ucasfl)).
 * Fix `Missing column` exception which could happen while using `INTERPOLATE` with `ENGINE = MergeTree` table. [#36549](https://github.com/ClickHouse/ClickHouse/pull/36549) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
 * Fix potential error with literals in `WHERE` for join queries. Close [#36279](https://github.com/ClickHouse/ClickHouse/issues/36279). [#36542](https://github.com/ClickHouse/ClickHouse/pull/36542) ([Vladimir C](https://github.com/vdimir)).
 * Fix offset update ReadBufferFromEncryptedFile, which could cause undefined behaviour. [#36493](https://github.com/ClickHouse/ClickHouse/pull/36493) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Fix hostname sanity checks for Keeper cluster configuration. Add `keeper_server.host_checks_enabled` config to enable/disable those checks. [#36492](https://github.com/ClickHouse/ClickHouse/pull/36492) ([Antonio Andelic](https://github.com/antonio2368)).
 * Fix usage of executable user defined functions in GROUP BY. Before executable user defined functions cannot be used as expressions in GROUP BY. Closes [#36448](https://github.com/ClickHouse/ClickHouse/issues/36448). [#36486](https://github.com/ClickHouse/ClickHouse/pull/36486) ([Maksim Kita](https://github.com/kitaisreal)).
 * Fix possible exception with unknown packet from server in client. [#36481](https://github.com/ClickHouse/ClickHouse/pull/36481) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Experimental feature (please never use `system.session_log`, it is going to be removed): Add missing enum values in system.session_log table. Closes [#36474](https://github.com/ClickHouse/ClickHouse/issues/36474). [#36480](https://github.com/ClickHouse/ClickHouse/pull/36480) ([Memo](https://github.com/Joeywzr)).
 * Fix bug in s3Cluster schema inference that let to the fact that not all data was read in the select from s3Cluster. The bug appeared in https://github.com/ClickHouse/ClickHouse/pull/35544. [#36434](https://github.com/ClickHouse/ClickHouse/pull/36434) ([Kruglov Pavel](https://github.com/Avogar)).
 * Fix nullptr dereference in JOIN and COLUMNS matcher. This fixes [#36416](https://github.com/ClickHouse/ClickHouse/issues/36416). This is for https://github.com/ClickHouse/ClickHouse/pull/36417. [#36430](https://github.com/ClickHouse/ClickHouse/pull/36430) ([Amos Bird](https://github.com/amosbird)).
 * Fix dictionary reload for `ClickHouseDictionarySource` if it contains scalar subqueries. [#36390](https://github.com/ClickHouse/ClickHouse/pull/36390) ([lthaooo](https://github.com/lthaooo)).
 * Fix assertion in JOIN, close [#36199](https://github.com/ClickHouse/ClickHouse/issues/36199). [#36201](https://github.com/ClickHouse/ClickHouse/pull/36201) ([Vladimir C](https://github.com/vdimir)).
 * Queries with aliases inside special operators returned parsing error (was broken in 22.1). Example: `SELECT substring('test' AS t, 1, 1)`. [#36167](https://github.com/ClickHouse/ClickHouse/pull/36167) ([Maksim Kita](https://github.com/kitaisreal)).
 * Experimental feature: Fix insertion of complex JSONs with nested arrays to columns of type `Object`. [#36077](https://github.com/ClickHouse/ClickHouse/pull/36077) ([Anton Popov](https://github.com/CurtizJ)).
 * Fix ALTER DROP COLUMN of nested column with compact parts (i.e. `ALTER TABLE x DROP COLUMN n`, when there is column `n.d`). [#35797](https://github.com/ClickHouse/ClickHouse/pull/35797) ([Azat Khuzhin](https://github.com/azat)).
 * Fix substring function range error length when `offset` and `length` is negative constant and `s` is not constant. [#33861](https://github.com/ClickHouse/ClickHouse/pull/33861) ([RogerYK](https://github.com/RogerYK)).
 ### <a id="224"></a> ClickHouse release 22.4, 2022-04-19
 #### Backward Incompatible Change
-* Do not allow SETTINGS after FORMAT for INSERT queries (there is compatibility setting `parser_settings_after_format_compact` to accept such queries, but it is turned OFF by default). [#35883](https://github.com/ClickHouse/ClickHouse/pull/35883) ([Azat Khuzhin](https://github.com/azat)).
+* Do not allow SETTINGS after FORMAT for INSERT queries (there is compatibility setting `allow_settings_after_format_in_insert` to accept such queries, but it is turned OFF by default). [#35883](https://github.com/ClickHouse/ClickHouse/pull/35883) ([Azat Khuzhin](https://github.com/azat)).
 * Function `yandexConsistentHash` (consistent hashing algorithm by Konstantin "kostik" Oblakov) is renamed to `kostikConsistentHash`. The old name is left as an alias for compatibility. Although this change is backward compatible, we may remove the alias in subsequent releases, that's why it's recommended to update the usages of this function in your apps. [#35553](https://github.com/ClickHouse/ClickHouse/pull/35553) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 #### New Feature
@ -638,4 +968,4 @@
 * Fix hang up with command `DROP TABLE system.query_log sync`. [#33293](https://github.com/ClickHouse/ClickHouse/pull/33293) ([zhanghuajie](https://github.com/zhanghuajieHIT)).
-## [Changelog for 2021](https://github.com/ClickHouse/ClickHouse/blob/master/docs/en/whats-new/changelog/2021.md)
+## [Changelog for 2021](https://clickhouse.com/docs/en/whats-new/changelog/2021)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -36,7 +36,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 # Check that submodules are present
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/sysroot/README.md")
-    message (FATAL_ERROR "Submodules are not initialized. Run\n\tgit submodule update --init --recursive")
+    message (FATAL_ERROR "Submodules are not initialized. Run\n\tgit submodule update --init")
 endif ()
 # Take care to add prlimit in command line before ccache, or else ccache thinks that
@ -244,16 +244,18 @@ endif ()
 # Add a section with the hash of the compiled machine code for integrity checks.
 # Only for official builds, because adding a section can be time consuming (rewrite of several GB).
 # And cross compiled binaries are not supported (since you cannot execute clickhouse hash-binary)
-if (OBJCOPY_PATH AND CLICKHOUSE_OFFICIAL_BUILD AND (NOT CMAKE_TOOLCHAIN_FILE OR CMAKE_TOOLCHAIN_FILE MATCHES "linux/toolchain-x86_64.cmake$"))
+if (CLICKHOUSE_OFFICIAL_BUILD AND (NOT CMAKE_TOOLCHAIN_FILE OR CMAKE_TOOLCHAIN_FILE MATCHES "linux/toolchain-x86_64.cmake$"))
    message(STATUS "Official build: A checksum hash will be added to the clickhouse executable")
    set (USE_BINARY_HASH 1 CACHE STRING "Calculate binary hash and store it in the separate section")
 else ()
    message(STATUS "No official build: A checksum hash will not be added to the clickhouse executable")
 endif ()
-# Allows to build stripped binary in a separate directory
+# Optionally split binaries and debug symbols.
-if (OBJCOPY_PATH AND STRIP_PATH)
+option(INSTALL_STRIPPED_BINARIES "Split binaries and debug symbols" OFF)
-    option(INSTALL_STRIPPED_BINARIES "Build stripped binaries with debug info in separate directory" OFF)
+if (INSTALL_STRIPPED_BINARIES)
-    if (INSTALL_STRIPPED_BINARIES)
+    message(STATUS "Will split binaries and debug symbols")
-        set(STRIPPED_BINARIES_OUTPUT "stripped" CACHE STRING "A separate directory for stripped information")
+    set(STRIPPED_BINARIES_OUTPUT "stripped" CACHE STRING "A separate directory for stripped information")
    endif()
 endif()
 cmake_host_system_information(RESULT AVAILABLE_PHYSICAL_MEMORY QUERY AVAILABLE_PHYSICAL_MEMORY) # Not available under freebsd
@ -351,6 +353,10 @@ set (CMAKE_C_FLAGS                       "${CMAKE_C_FLAGS} ${COMPILER_FLAGS} ${C
 set (CMAKE_C_FLAGS_RELWITHDEBINFO        "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O3 ${DEBUG_INFO_FLAGS} ${CMAKE_C_FLAGS_ADD}")
 set (CMAKE_C_FLAGS_DEBUG                 "${CMAKE_C_FLAGS_DEBUG} -O0 ${DEBUG_INFO_FLAGS} -fno-inline ${CMAKE_C_FLAGS_ADD}")
 set (CMAKE_ASM_FLAGS                     "${CMAKE_ASM_FLAGS} ${COMPILER_FLAGS} ${CMAKE_ASM_FLAGS_ADD}")
 set (CMAKE_ASM_FLAGS_RELWITHDEBINFO      "${CMAKE_ASM_FLAGS_RELWITHDEBINFO} -O3 ${DEBUG_INFO_FLAGS} ${CMAKE_ASM_FLAGS_ADD}")
 set (CMAKE_ASM_FLAGS_DEBUG               "${CMAKE_ASM_FLAGS_DEBUG} -O0 ${DEBUG_INFO_FLAGS} -fno-inline ${CMAKE_ASM_FLAGS_ADD}")
 if (COMPILER_CLANG)
    if (OS_DARWIN)
        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
--- a/PreLoad.cmake
+++ b/PreLoad.cmake
@ -15,25 +15,33 @@
 if (NOT DEFINED ENV{CLION_IDE} AND NOT DEFINED ENV{XCODE_IDE})
    find_program(NINJA_PATH ninja)
    if (NINJA_PATH)
-        set(CMAKE_GENERATOR "Ninja" CACHE INTERNAL "" FORCE)
+        set(CMAKE_GENERATOR "Ninja" CACHE INTERNAL "")
    endif ()
 endif()
 # Check if environment is polluted.
-if (NOT $ENV{CFLAGS} STREQUAL ""
+if (NOT "$ENV{CFLAGS}" STREQUAL ""
-    OR NOT $ENV{CXXFLAGS} STREQUAL ""
+    OR NOT "$ENV{CXXFLAGS}" STREQUAL ""
-    OR NOT $ENV{LDFLAGS} STREQUAL ""
+    OR NOT "$ENV{LDFLAGS}" STREQUAL ""
    OR CMAKE_C_FLAGS OR CMAKE_CXX_FLAGS OR CMAKE_EXE_LINKER_FLAGS OR CMAKE_SHARED_LINKER_FLAGS OR CMAKE_MODULE_LINKER_FLAGS
    OR CMAKE_C_FLAGS_INIT OR CMAKE_CXX_FLAGS_INIT OR CMAKE_EXE_LINKER_FLAGS_INIT OR CMAKE_SHARED_LINKER_FLAGS_INIT OR CMAKE_MODULE_LINKER_FLAGS_INIT)
    # if $ENV
    message("CFLAGS: $ENV{CFLAGS}")
    message("CXXFLAGS: $ENV{CXXFLAGS}")
    message("LDFLAGS: $ENV{LDFLAGS}")
    # if *_FLAGS
    message("CMAKE_C_FLAGS: ${CMAKE_C_FLAGS}")
    message("CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
    message("CMAKE_EXE_LINKER_FLAGS: ${CMAKE_EXE_LINKER_FLAGS}")
    message("CMAKE_SHARED_LINKER_FLAGS: ${CMAKE_SHARED_LINKER_FLAGS}")
    message("CMAKE_MODULE_LINKER_FLAGS: ${CMAKE_MODULE_LINKER_FLAGS}")
    # if *_FLAGS_INIT
    message("CMAKE_C_FLAGS_INIT: ${CMAKE_C_FLAGS_INIT}")
    message("CMAKE_CXX_FLAGS_INIT: ${CMAKE_CXX_FLAGS_INIT}")
    message("CMAKE_EXE_LINKER_FLAGS_INIT: ${CMAKE_EXE_LINKER_FLAGS_INIT}")
    message("CMAKE_SHARED_LINKER_FLAGS_INIT: ${CMAKE_SHARED_LINKER_FLAGS_INIT}")
    message("CMAKE_MODULE_LINKER_FLAGS_INIT: ${CMAKE_MODULE_LINKER_FLAGS_INIT}")
    message(FATAL_ERROR "
        Some of the variables like CFLAGS, CXXFLAGS, LDFLAGS are not empty.
@ -51,18 +59,35 @@ endif()
 execute_process(COMMAND uname -s OUTPUT_VARIABLE OS)
 execute_process(COMMAND uname -m OUTPUT_VARIABLE ARCH)
 # By default, prefer clang on Linux
 # But note, that you still may change the compiler with -DCMAKE_C_COMPILER/-DCMAKE_CXX_COMPILER.
 if (OS MATCHES "Linux"
    # some build systems may use CC/CXX env variables
    AND "$ENV{CC}" STREQUAL ""
    AND "$ENV{CXX}" STREQUAL "")
    find_program(CLANG_PATH clang)
    if (CLANG_PATH)
        set(CMAKE_C_COMPILER "clang" CACHE INTERNAL "")
    endif()
    find_program(CLANG_CXX_PATH clang++)
    if (CLANG_CXX_PATH)
        set(CMAKE_CXX_COMPILER "clang++" CACHE INTERNAL "")
    endif()
 endif()
 if (OS MATCHES "Linux"
    AND NOT DEFINED CMAKE_TOOLCHAIN_FILE
    AND NOT DISABLE_HERMETIC_BUILD
-    AND ($ENV{CC} MATCHES ".*clang.*" OR CMAKE_C_COMPILER MATCHES ".*clang.*"))
+    AND ("$ENV{CC}" MATCHES ".*clang.*" OR CMAKE_C_COMPILER MATCHES ".*clang.*"))
    if (ARCH MATCHES "amd64|x86_64")
-        set (CMAKE_TOOLCHAIN_FILE "cmake/linux/toolchain-x86_64.cmake" CACHE INTERNAL "" FORCE)
+        set (CMAKE_TOOLCHAIN_FILE "cmake/linux/toolchain-x86_64.cmake" CACHE INTERNAL "")
    elseif (ARCH MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)")
-        set (CMAKE_TOOLCHAIN_FILE "cmake/linux/toolchain-aarch64.cmake" CACHE INTERNAL "" FORCE)
+        set (CMAKE_TOOLCHAIN_FILE "cmake/linux/toolchain-aarch64.cmake" CACHE INTERNAL "")
    elseif (ARCH MATCHES "^(ppc64le.*|PPC64LE.*)")
-        set (CMAKE_TOOLCHAIN_FILE "cmake/linux/toolchain-ppc64le.cmake" CACHE INTERNAL "" FORCE)
+        set (CMAKE_TOOLCHAIN_FILE "cmake/linux/toolchain-ppc64le.cmake" CACHE INTERNAL "")
-    else ()
+else ()
        message (FATAL_ERROR "Unsupported architecture: ${ARCH}")
    endif ()
--- a/README.md
+++ b/README.md
@ -13,3 +13,6 @@ ClickHouse® is an open-source column-oriented database management system that a
 * [Code Browser (Woboq)](https://clickhouse.com/codebrowser/ClickHouse/index.html) with syntax highlight and navigation.
 * [Code Browser (github.dev)](https://github.dev/ClickHouse/ClickHouse) with syntax highlight, powered by github.dev.
 * [Contacts](https://clickhouse.com/company/#contact) can help to get your questions answered if there are any.
 ## Upcoming events
 * [Paris Meetup](https://www.meetup.com/clickhouse-france-user-group/events/286304312/) Please join us for an evening of talks (in English), food and discussion. Featuring talks of ClickHouse in production and at least one on the deep internals of ClickHouse itself.
--- a/SECURITY.md
+++ b/SECURITY.md
@ -1,3 +1,4 @@
 # Security Policy
 ## Security Announcements
@ -7,27 +8,30 @@ Security fixes will be announced by posting them in the [security changelog](htt
 The following versions of ClickHouse server are currently being supported with security updates:
-| Version | Supported          |
+| Version | Supported |
-| ------- | ------------------ |
+|:-|:-|
-| 1.x   | :x: |
+| 22.6 | ✔️ |
-| 18.x   | :x:                |
+| 22.5 | ✔️ |
-| 19.x   | :x:                |
+| 22.4 | ✔️ |
-| 20.x   | :x: |
+| 22.3 | ✔️ |
-| 21.1   | :x: |
+| 22.2 | ❌ |
-| 21.2   | :x: |
+| 22.1 | ❌ |
-| 21.3   | :x: |
+| 21.12 | ❌ |
-| 21.4   | :x: |
+| 21.11 | ❌ |
-| 21.5   | :x: |
+| 21.10 | ❌ |
-| 21.6   | :x: |
+| 21.9 | ❌ |
-| 21.7   | :x: |
+| 21.8 | ✔️ |
-| 21.8   | ✅ |
+| 21.7 | ❌ |
-| 21.9   | :x: |
+| 21.6 | ❌ |
-| 21.10   | :x: |
+| 21.5 | ❌ |
-| 21.11   | :x: |
+| 21.4 | ❌ |
-| 21.12   | :x: |
+| 21.3 | ❌ |
-| 22.1   | ✅ |
+| 21.2 | ❌ |
-| 22.2   | ✅ |
+| 21.1 | ❌ |
-| 22.3   | ✅ |
+| 20.* | ❌ |
 | 19.* | ❌ |
 | 18.* | ❌ |
 | 1.* | ❌ |
 ## Reporting a Vulnerability
@ -55,4 +59,3 @@ As the security issue moves from triage, to identified fix, to release planning
 A public disclosure date is negotiated by the ClickHouse maintainers and the bug submitter. We prefer to fully disclose the bug as soon as possible once a user mitigation is available. It is reasonable to delay disclosure when the bug or the fix is not yet fully understood, the solution is not well-tested, or for vendor coordination. The timeframe for disclosure is from immediate (especially if it's already publicly known) to 90 days. For a vulnerability with a straightforward mitigation, we expect report date to disclosure date to be on the order of 7 days. 
--- a/base/base/CMakeLists.txt
+++ b/base/base/CMakeLists.txt
@ -17,15 +17,12 @@ set (SRCS
    sleep.cpp
    terminalColors.cpp
    errnoToString.cpp
    ReplxxLineReader.cpp
    StringRef.cpp
    safeExit.cpp
    throwError.cpp
 )
 if (ENABLE_REPLXX)
    list (APPEND SRCS ReplxxLineReader.cpp)
 endif ()
 if (USE_DEBUG_HELPERS)
    get_target_property(MAGIC_ENUM_INCLUDE_DIR ch_contrib::magic_enum INTERFACE_INCLUDE_DIRECTORIES)
    # CMake generator expression will do insane quoting when it encounters special character like quotes, spaces, etc.
--- a/base/base/Decimal.h
+++ b/base/base/Decimal.h
@ -49,7 +49,7 @@ struct Decimal
    using NativeType = T;
    constexpr Decimal() = default;
-    constexpr Decimal(Decimal<T> &&) = default;
+    constexpr Decimal(Decimal<T> &&) noexcept = default;
    constexpr Decimal(const Decimal<T> &) = default;
    constexpr Decimal(const T & value_): value(value_) {}
@ -57,7 +57,7 @@ struct Decimal
    template <typename U>
    constexpr Decimal(const Decimal<U> & x): value(x.value) {}
-    constexpr Decimal<T> & operator = (Decimal<T> &&) = default;
+    constexpr Decimal<T> & operator=(Decimal<T> &&) noexcept = default;
    constexpr Decimal<T> & operator = (const Decimal<T> &) = default;
    constexpr operator T () const { return value; }
--- a/base/base/JSON.cpp
+++ b/base/base/JSON.cpp
@ -12,7 +12,7 @@
 #define JSON_MAX_DEPTH 100
-POCO_IMPLEMENT_EXCEPTION(JSONException, Poco::Exception, "JSONException") // NOLINT(cert-err60-cpp, modernize-use-noexcept)
+POCO_IMPLEMENT_EXCEPTION(JSONException, Poco::Exception, "JSONException") // NOLINT(cert-err60-cpp, modernize-use-noexcept, hicpp-use-noexcept)
 /// Прочитать беззнаковое целое в простом формате из не-0-terminated строки.
--- a/base/base/LineReader.h
+++ b/base/base/LineReader.h
@ -7,6 +7,7 @@
 #include <replxx.hxx>
 #include <base/types.h>
 #include <base/defines.h>
 class LineReader
 {
@ -20,8 +21,8 @@ public:
        void addWords(Words && new_words);
    private:
-        Words words;
+        Words words TSA_GUARDED_BY(mutex);
-        Words words_no_case;
+        Words words_no_case TSA_GUARDED_BY(mutex);
        std::mutex mutex;
    };
@ -29,7 +30,7 @@ public:
    using Patterns = std::vector<const char *>;
    LineReader(const String & history_file_path, bool multiline, Patterns extenders, Patterns delimiters);
-    virtual ~LineReader() {}
+    virtual ~LineReader() = default;
    /// Reads the whole line until delimiter (in multiline mode) or until the last line without extender.
    /// If resulting line is empty, it means the user interrupted the input.
--- a/base/base/ReplxxLineReader.cpp
+++ b/base/base/ReplxxLineReader.cpp
@ -45,14 +45,16 @@ std::string replxx_now_ms_str()
    time_t t = ms.count() / 1000;
    tm broken;
    if (!localtime_r(&t, &broken))
-    {
+        return {};
        return std::string();
    }
    static int const BUFF_SIZE(32);
    char str[BUFF_SIZE];
-    strftime(str, BUFF_SIZE, "%Y-%m-%d %H:%M:%S.", &broken);
+    if (strftime(str, BUFF_SIZE, "%Y-%m-%d %H:%M:%S.", &broken) <= 0)
-    snprintf(str + sizeof("YYYY-mm-dd HH:MM:SS"), 5, "%03d", static_cast<int>(ms.count() % 1000));
+        return {};
    if (snprintf(str + sizeof("YYYY-mm-dd HH:MM:SS"), 5, "%03d", static_cast<int>(ms.count() % 1000)) <= 0)
        return {};
    return str;
 }
@ -378,4 +380,4 @@ void ReplxxLineReader::enableBracketedPaste()
 {
    bracketed_paste_enabled = true;
    rx.enable_bracketed_paste();
-};
+}
--- a/base/base/defines.h
+++ b/base/base/defines.h
@ -105,6 +105,42 @@
 #   define ASAN_POISON_MEMORY_REGION(a, b)
 #endif
 #if !defined(ABORT_ON_LOGICAL_ERROR)
    #if !defined(NDEBUG) || defined(ADDRESS_SANITIZER) || defined(THREAD_SANITIZER) || defined(MEMORY_SANITIZER) || defined(UNDEFINED_BEHAVIOR_SANITIZER)
        #define ABORT_ON_LOGICAL_ERROR
    #endif
 #endif
 /// chassert(x) is similar to assert(x), but:
 ///     - works in builds with sanitizers, not only in debug builds
 ///     - tries to print failed assertion into server log
 /// It can be used for all assertions except heavy ones.
 /// Heavy assertions (that run loops or call complex functions) are allowed in debug builds only.
 #if !defined(chassert)
    #if defined(ABORT_ON_LOGICAL_ERROR)
        #define chassert(x) static_cast<bool>(x) ? void(0) : abortOnFailedAssertion(#x)
    #else
        #define chassert(x) ((void)0)
    #endif
 #endif
 // Macros for Clang Thread Safety Analysis (TSA). They can be safely ignored by other compilers.
 // Feel free to extend, but please stay close to https://clang.llvm.org/docs/ThreadSafetyAnalysis.html#mutexheader
 #if defined(__clang__)
 #    define TSA_GUARDED_BY(...) __attribute__((guarded_by(__VA_ARGS__)))                       // data is protected by given capability
 #    define TSA_PT_GUARDED_BY(...) __attribute__((pt_guarded_by(__VA_ARGS__)))                 // pointed-to data is protected by the given capability
 #    define TSA_REQUIRES(...) __attribute__((requires_capability(__VA_ARGS__)))                // thread needs exclusive possession of given capability
 #    define TSA_REQUIRES_SHARED(...) __attribute__((requires_shared_capability(__VA_ARGS__)))  // thread needs shared possession of given capability
 #    define TSA_ACQUIRED_AFTER(...) __attribute__((acquired_after(__VA_ARGS__)))               // annotated lock must be locked after given lock
 #    define TSA_NO_THREAD_SAFETY_ANALYSIS __attribute__((no_thread_safety_analysis))           // disable TSA for a function
 #else
 #    define TSA_GUARDED_BY(...)
 #    define TSA_PT_GUARDED_BY(...)
 #    define TSA_REQUIRES(...)
 #    define TSA_REQUIRES_SHARED(...)
 #    define TSA_NO_THREAD_SAFETY_ANALYSIS
 #endif
 /// A template function for suppressing warnings about unused variables or function results.
 template <typename... Args>
 constexpr void UNUSED(Args &&... args [[maybe_unused]])
--- a/base/base/errnoToString.cpp
+++ b/base/base/errnoToString.cpp
@ -9,7 +9,7 @@ std::string errnoToString(int code, int the_errno)
    char buf[buf_size];
 #ifndef _GNU_SOURCE
    int rc = strerror_r(the_errno, buf, buf_size);
-#ifdef __APPLE__
+#ifdef OS_DARWIN
    if (rc != 0 && rc != EINVAL)
 #else
    if (rc != 0)
--- a/base/base/getAvailableMemoryAmount.cpp
+++ b/base/base/getAvailableMemoryAmount.cpp
@ -16,7 +16,7 @@ uint64_t getAvailableMemoryAmountOrZero()
 {
 #if defined(_SC_PHYS_PAGES) // linux
    return getPageSize() * sysconf(_SC_PHYS_PAGES);
-#elif defined(__FreeBSD__)
+#elif defined(OS_FREEBSD)
    struct vmtotal vmt;
    size_t vmt_size = sizeof(vmt);
    if (sysctlbyname("vm.vmtotal", &vmt, &vmt_size, NULL, 0) == 0)
--- a/base/base/phdr_cache.cpp
+++ b/base/base/phdr_cache.cpp
@ -6,7 +6,7 @@
 #include <base/defines.h>
-#if defined(__linux__) && !defined(THREAD_SANITIZER) && !defined(USE_MUSL)
+#if defined(OS_LINUX) && !defined(THREAD_SANITIZER) && !defined(USE_MUSL)
    #define USE_PHDR_CACHE 1
 #endif
--- a/base/base/wide_integer_impl.h
+++ b/base/base/wide_integer_impl.h
@ -576,8 +576,8 @@ private:
        else if constexpr (Bits == 128 && sizeof(base_type) == 8)
        {
            using CompilerUInt128 = unsigned __int128;
-            CompilerUInt128 a = (CompilerUInt128(lhs.items[1]) << 64) + lhs.items[0];
+            CompilerUInt128 a = (CompilerUInt128(lhs.items[1]) << 64) + lhs.items[0]; // NOLINT(clang-analyzer-core.UndefinedBinaryOperatorResult)
-            CompilerUInt128 b = (CompilerUInt128(rhs.items[1]) << 64) + rhs.items[0];
+            CompilerUInt128 b = (CompilerUInt128(rhs.items[1]) << 64) + rhs.items[0]; // NOLINT(clang-analyzer-core.UndefinedBinaryOperatorResult)
            CompilerUInt128 c = a * b;
            integer<Bits, Signed> res;
            res.items[0] = c;
@ -841,8 +841,8 @@ public:
        {
            using CompilerUInt128 = unsigned __int128;
-            CompilerUInt128 a = (CompilerUInt128(numerator.items[1]) << 64) + numerator.items[0];
+            CompilerUInt128 a = (CompilerUInt128(numerator.items[1]) << 64) + numerator.items[0]; // NOLINT(clang-analyzer-core.UndefinedBinaryOperatorResult)
-            CompilerUInt128 b = (CompilerUInt128(denominator.items[1]) << 64) + denominator.items[0];
+            CompilerUInt128 b = (CompilerUInt128(denominator.items[1]) << 64) + denominator.items[0]; // NOLINT(clang-analyzer-core.UndefinedBinaryOperatorResult)
            CompilerUInt128 c = a / b; // NOLINT
            integer<Bits, Signed> res;
@ -1204,7 +1204,7 @@ constexpr integer<Bits, Signed>::operator T() const noexcept
    UnsignedT res{};
    for (unsigned i = 0; i < _impl::item_count && i < (sizeof(T) + sizeof(base_type) - 1) / sizeof(base_type); ++i)
-        res += UnsignedT(items[i]) << (sizeof(base_type) * 8 * i);
+        res += UnsignedT(items[i]) << (sizeof(base_type) * 8 * i); // NOLINT(clang-analyzer-core.UndefinedBinaryOperatorResult)
    return res;
 }
--- a/base/harmful/harmful.c
+++ b/base/harmful/harmful.c
@ -260,4 +260,35 @@ TRAP(mq_timedreceive)
 TRAP(wordexp)
 TRAP(wordfree)
 /// C11 threading primitives are not supported by ThreadSanitizer.
 /// Also we should avoid using them for compatibility with old libc.
 TRAP(thrd_create)
 TRAP(thrd_equal)
 TRAP(thrd_current)
 TRAP(thrd_sleep)
 TRAP(thrd_yield)
 TRAP(thrd_exit)
 TRAP(thrd_detach)
 TRAP(thrd_join)
 TRAP(mtx_init)
 TRAP(mtx_lock)
 TRAP(mtx_timedlock)
 TRAP(mtx_trylock)
 TRAP(mtx_unlock)
 TRAP(mtx_destroy)
 TRAP(call_once)
 TRAP(cnd_init)
 TRAP(cnd_signal)
 TRAP(cnd_broadcast)
 TRAP(cnd_wait)
 TRAP(cnd_timedwait)
 TRAP(cnd_destroy)
 TRAP(tss_create)
 TRAP(tss_get)
 TRAP(tss_set)
 TRAP(tss_delete)
 #endif
--- a/benchmark/benchmark.sh
+++ b/benchmark/benchmark.sh
@ -1,180 +0,0 @@
 #!/usr/bin/env bash
 # script to run query to databases
 function usage()
 {
        cat <<EOF
 usage: $0 options
 This script run benhmark for database
 OPTIONS:
   -c            config file where some script variables are defined
   -n            table name
   -h            Show this message
   -t            how many times execute each query. default is '3'
   -q            query file
   -e            expect file
   -s            /etc/init.d/service
   -p            table name pattern to be replaced to name. default is 'hits_10m'
 EOF
 }
 TIMES=3
 table_name_pattern=hits_10m
 while getopts “c:ht:n:q:e:s:r” OPTION
 do
     case $OPTION in
     c)
         source $OPTARG
         ;;
     ?)
         ;;
     esac
 done
 OPTIND=1
 while getopts “c:ht:n:q:e:s:r” OPTION
 do
     case $OPTION in
     h)
             usage
             exit 0
             ;;
         t)
         TIMES=$OPTARG
         ;;
     n)
         table_name=$OPTARG
         ;;
     q)
         test_file=$OPTARG
         ;;
     e)
         expect_file=$OPTARG
         ;;
     s)
         etc_init_d_service=$OPTARG
         ;;
     p)
         table_name_pattern=$OPTARG
         ;;
     c)
         ;;
     r)
         restart_server_each_query=1
         ;;
         ?)
             usage
             exit 0
             ;;
     esac
 done
 if [[ ! -f $expect_file ]]; then
    echo "Not found: expect file"
    exit 1
 fi
 if [[ ! -f $test_file ]]; then
    echo "Not found: test file"
    exit 1
 fi
 if [[ ! -f $etc_init_d_service ]]; then
    echo "Not found: /etc/init.d/service with path=$etc_init_d_service"
    use_service=0
 else
    use_service=1
 fi
 if [[ "$table_name_pattern" == "" ]]; then
    echo "Empty table_name_pattern"
    exit 1
 fi
 if [[  "$table_name" == "" ]]; then
    echo "Empty table_name"
    exit 1
 fi
 function execute()
 {
    queries=("${@}")
    queries_count=${#queries[@]}
    if [ -z $TIMES ]; then
    TIMES=1
    fi
    index=0
    while [ "$index" -lt "$queries_count" ]; do
    query=${queries[$index]}
    if [[ $query == "" ]]; then
        let "index = $index + 1"
        continue
    fi
       comment_re='--.*'
    if [[ $query =~ $comment_re ]]; then
        echo "$query"
        echo
    else
        sync
        sudo sh -c "echo 3 > /proc/sys/vm/drop_caches"
        if [[  "$restart_server_each_query" == "1"  && "$use_service" == "1" ]]; then
        echo "restart server: $etc_init_d_service restart"
        sudo $etc_init_d_service restart
        fi
        for i in $(seq $TIMES)
        do
        if [[ -f $etc_init_d_service && "$use_service" == "1" ]]; then
            sudo $etc_init_d_service status
            server_status=$?
                    expect -f $expect_file ""
            if [[ "$?" != "0" || $server_status != "0" ]]; then
            echo "restart server: $etc_init_d_service restart"
            sudo $etc_init_d_service restart
            fi
            #wait until can connect to server
            restart_timer=0
            restart_limit=60
                    expect -f $expect_file "" &> /dev/null
            while [ "$?" != "0" ]; do
            echo "waiting"
            sleep 1
            let "restart_timer = $restart_timer + 1"
            if (( $restart_limit < $restart_timer )); then
                sudo $etc_init_d_service restart
                restart_timer=0
            fi
            expect -f $expect_file "" &> /dev/null
            done
        fi
        echo
        echo "times: $i"
        echo "query:" "$query"
                expect -f $expect_file "$query"
        done
    fi
    let "index = $index + 1"
    done
 }
 temp_test_file=temp_queries_$table_name
 cat $test_file | sed s/$table_name_pattern/$table_name/g > $temp_test_file
 mapfile -t test_queries < $temp_test_file
 echo "start time: $(date)"
 time execute "${test_queries[@]}"
 echo "stop time: $(date)"
--- a/benchmark/create_dump.sh
+++ b/benchmark/create_dump.sh
@ -1,3 +0,0 @@
 #!/usr/bin/env bash
 table=hits_10m; time clickhouse-client --max_bytes_before_external_sort=30000000000 --query="SELECT toInt64(WatchID), JavaEnable, Title, GoodEvent, (EventTime < toDateTime('1971-01-01 00:00:00') ? toDateTime('1971-01-01 00:00:01') : EventTime), (EventDate < toDate('1971-01-01') ? toDate('1971-01-01') : EventDate), CounterID, ClientIP, RegionID, toInt64(UserID), CounterClass, OS, UserAgent, URL, Referer, Refresh, RefererCategoryID, RefererRegionID, URLCategoryID, URLRegionID, ResolutionWidth, ResolutionHeight, ResolutionDepth, FlashMajor, FlashMinor, FlashMinor2, NetMajor, NetMinor, UserAgentMajor, UserAgentMinor, CookieEnable, JavascriptEnable, IsMobile, MobilePhone, MobilePhoneModel, Params, IPNetworkID, TraficSourceID, SearchEngineID, SearchPhrase, AdvEngineID, IsArtifical, WindowClientWidth, WindowClientHeight, ClientTimeZone, (ClientEventTime < toDateTime('1971-01-01 00:00:01') ? toDateTime('1971-01-01 00:00:01') : ClientEventTime), SilverlightVersion1, SilverlightVersion2, SilverlightVersion3, SilverlightVersion4, PageCharset, CodeVersion, IsLink, IsDownload, IsNotBounce, toInt64(FUniqID), OriginalURL, HID, IsOldCounter, IsEvent, IsParameter, DontCountHits, WithHash, HitColor, (LocalEventTime < toDateTime('1971-01-01 00:00:01') ? toDateTime('1971-01-01 00:00:01') : LocalEventTime), Age, Sex, Income, Interests, Robotness, RemoteIP, WindowName, OpenerName, HistoryLength, BrowserLanguage, BrowserCountry, SocialNetwork, SocialAction, HTTPError, SendTiming, DNSTiming, ConnectTiming, ResponseStartTiming, ResponseEndTiming, FetchTiming, SocialSourceNetworkID, SocialSourcePage, ParamPrice, ParamOrderID, ParamCurrency, ParamCurrencyID, OpenstatServiceName, OpenstatCampaignID, OpenstatAdID, OpenstatSourceID, UTMSource, UTMMedium, UTMCampaign, UTMContent, UTMTerm, FromTag, HasGCLID, toInt64(RefererHash), toInt64(URLHash), CLID FROM $table ORDER BY rand()" | corrector_utf8 > /opt/dumps/${table}_corrected.tsv
--- a/benchmark/hardware.sh
+++ b/benchmark/hardware.sh
@ -1,107 +1,25 @@
 #!/bin/bash -e
 if [[ -n $1 ]]; then
    SCALE=$1
 else
    SCALE=100
 fi
 TABLE="hits_${SCALE}m_obfuscated"
 DATASET="${TABLE}_v1.tar.xz"
 QUERIES_FILE="queries.sql"
 TRIES=3
-# Note: on older Ubuntu versions, 'axel' does not support IPv6. If you are using IPv6-only servers on very old Ubuntu, just don't install 'axel'.
+mkdir -p clickhouse-benchmark
 pushd clickhouse-benchmark
-FASTER_DOWNLOAD=wget
+# Download the binary
-if command -v axel >/dev/null; then
+if [[ ! -x clickhouse ]]; then
-    FASTER_DOWNLOAD=axel
+    curl https://clickhouse.com/ | sh
 else
    echo "It's recommended to install 'axel' for faster downloads."
 fi
 if command -v pixz >/dev/null; then
    TAR_PARAMS='-Ipixz'
 else
    echo "It's recommended to install 'pixz' for faster decompression of the dataset."
 fi
 mkdir -p clickhouse-benchmark-$SCALE
 pushd clickhouse-benchmark-$SCALE
 OS=$(uname -s)
 ARCH=$(uname -m)
 DIR=
 if [ "${OS}" = "Linux" ]
 then
    if [ "${ARCH}" = "x86_64" ]
    then
        DIR="amd64"
    elif [ "${ARCH}" = "aarch64" ]
    then
        DIR="aarch64"
    elif [ "${ARCH}" = "powerpc64le" ]
    then
        DIR="powerpc64le"
    fi
 elif [ "${OS}" = "FreeBSD" ]
 then
    if [ "${ARCH}" = "x86_64" ]
    then
        DIR="freebsd"
    elif [ "${ARCH}" = "aarch64" ]
    then
        DIR="freebsd-aarch64"
    elif [ "${ARCH}" = "powerpc64le" ]
    then
        DIR="freebsd-powerpc64le"
    fi
 elif [ "${OS}" = "Darwin" ]
 then
    if [ "${ARCH}" = "x86_64" ]
    then
        DIR="macos"
    elif [ "${ARCH}" = "aarch64" -o "${ARCH}" = "arm64" ]
    then
        DIR="macos-aarch64"
    fi
 fi
 if [ -z "${DIR}" ]
 then
    echo "The '${OS}' operating system with the '${ARCH}' architecture is not supported."
    exit 1
 fi
 URL="https://builds.clickhouse.com/master/${DIR}/clickhouse"
 echo
 echo "Will download ${URL}"
 echo
 curl -O "${URL}" && chmod a+x clickhouse || exit 1
 echo
 echo "Successfully downloaded the ClickHouse binary"
 chmod a+x clickhouse
 if [[ ! -f $QUERIES_FILE ]]; then
    wget "https://raw.githubusercontent.com/ClickHouse/ClickHouse/master/benchmark/clickhouse/$QUERIES_FILE"
 fi
 if [[ ! -d data ]]; then
    if [[ ! -f $DATASET ]]; then
        $FASTER_DOWNLOAD "https://datasets.clickhouse.com/hits/partitions/$DATASET"
    fi
    tar $TAR_PARAMS --strip-components=1 --directory=. -x -v -f $DATASET
 fi
 uptime
 echo "Starting clickhouse-server"
-./clickhouse server > server.log 2>&1 &
+./clickhouse server >/dev/null 2>&1 &
 PID=$!
 function finish {
@ -114,15 +32,36 @@ echo "Waiting for clickhouse-server to start"
 for i in {1..30}; do
    sleep 1
-    ./clickhouse client --query "SELECT 'The dataset size is: ', count() FROM $TABLE" 2>/dev/null && break || echo '.'
+    ./clickhouse client --query "SELECT 'Ok.'" 2>/dev/null && break || echo -n '.'
    if [[ $i == 30 ]]; then exit 1; fi
 done
 if [[ $(./clickhouse client --query "EXISTS hits") == '1' && $(./clickhouse client --query "SELECT count() FROM hits") == '100000000' ]]; then
    echo "Dataset already downloaded"
 else
    echo "Will download the dataset"
    ./clickhouse client --receive_timeout 1000 --max_insert_threads $(nproc || 4) --progress --query "
        CREATE OR REPLACE TABLE hits ENGINE = MergeTree PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDate, intHash32(UserID), EventTime)
        AS SELECT * FROM url('https://datasets.clickhouse.com/hits/native/hits_100m_obfuscated_{0..255}.native.zst')"
    ./clickhouse client --query "SELECT 'The dataset size is: ', count() FROM hits"
 fi
 if [[ $(./clickhouse client --query "SELECT count() FROM system.parts WHERE table = 'hits' AND database = 'default' AND active") == '1' ]]; then
    echo "Dataset already prepared"
 else
    echo "Will prepare the dataset"
    ./clickhouse client --receive_timeout 1000 --query "OPTIMIZE TABLE hits FINAL"
 fi
 echo
 echo "Will perform benchmark. Results:"
 echo
-cat "$QUERIES_FILE" | sed "s/{table}/${TABLE}/g" | while read query; do
+>result.csv
 QUERY_NUM=1
 cat "$QUERIES_FILE" | sed "s/{table}/hits/g" | while read query; do
    sync
    if [ "${OS}" = "Darwin" ] 
    then 
@ -133,11 +72,15 @@ cat "$QUERIES_FILE" | sed "s/{table}/${TABLE}/g" | while read query; do
    echo -n "["
    for i in $(seq 1 $TRIES); do
-        RES=$(./clickhouse client --max_memory_usage 100G --time --format=Null --query="$query" 2>&1 ||:)
+        RES=$(./clickhouse client --time --format=Null --query="$query" 2>&1 ||:)
        [[ "$?" == "0" ]] && echo -n "${RES}" || echo -n "null"
        [[ "$i" != $TRIES ]] && echo -n ", "
        echo "${QUERY_NUM},${i},${RES}" >> result.csv
    done
    echo "],"
    QUERY_NUM=$((QUERY_NUM + 1))
 done
@ -145,22 +88,23 @@ echo
 echo "Benchmark complete. System info:"
 echo
 touch {cpu_model,cpu,df,memory,memory_total,blk,mdstat,instance}.txt
 if [ "${OS}" = "Darwin" ] 
 then 
    echo '----Version, build id-----------'
    ./clickhouse local --query "SELECT format('Version: {}', version())"
    sw_vers | grep BuildVersion
    ./clickhouse local --query "SELECT format('The number of threads is: {}', value) FROM system.settings WHERE name = 'max_threads'" --output-format TSVRaw
    ./clickhouse local --query "SELECT format('Current time: {}', toString(now(), 'UTC'))"
    echo '----CPU-------------------------'
-    sysctl hw.model 
+    sysctl hw.model | tee cpu_model.txt
-    sysctl -a | grep -E 'hw.activecpu|hw.memsize|hw.byteorder|cachesize'
+    sysctl -a | grep -E 'hw.activecpu|hw.memsize|hw.byteorder|cachesize' | tee cpu.txt
    echo '----Disk Free and Total--------'
-    df -h .
+    df -h . | tee df.txt
    echo '----Memory Free and Total-------'
-    vm_stat
+    vm_stat | tee memory.txt
    echo '----Physical Memory Amount------'
-    ls -l /var/vm
+    ls -l /var/vm | tee memory_total.txt
    echo '--------------------------------'
 else
    echo '----Version, build id-----------'
@ -168,22 +112,103 @@ else
    ./clickhouse local --query "SELECT format('The number of threads is: {}', value) FROM system.settings WHERE name = 'max_threads'" --output-format TSVRaw
    ./clickhouse local --query "SELECT format('Current time: {}', toString(now(), 'UTC'))"
    echo '----CPU-------------------------'
-    cat /proc/cpuinfo | grep -i -F 'model name' | uniq
+    cat /proc/cpuinfo | grep -i -F 'model name' | uniq | tee cpu_model.txt
-    lscpu
+    lscpu | tee cpu.txt
    echo '----Block Devices---------------'
-    lsblk
+    lsblk | tee blk.txt
    echo '----Disk Free and Total--------'
-    df -h .
+    df -h . | tee df.txt
    echo '----Memory Free and Total-------'
-    free -h
+    free -h | tee memory.txt
    echo '----Physical Memory Amount------'
-    cat /proc/meminfo | grep MemTotal
+    cat /proc/meminfo | grep MemTotal | tee memory_total.txt
    echo '----RAID Info-------------------'
-    cat /proc/mdstat
+    cat /proc/mdstat| tee mdstat.txt
    #echo '----PCI-------------------------'
    #lspci
    #echo '----All Hardware Info-----------'
    #lshw
    echo '--------------------------------'
 fi
 echo
 echo "Instance type from IMDS (if available):"
 curl -s --connect-timeout 1 'http://169.254.169.254/latest/meta-data/instance-type' | tee instance.txt
 echo
 echo "Uploading the results (if possible)"
 UUID=$(./clickhouse local --query "SELECT generateUUIDv4()")
 ./clickhouse local --query "
  SELECT
    '${UUID}' AS run_id,
    version() AS version,
    now() AS test_time,
    (SELECT value FROM system.settings WHERE name = 'max_threads') AS threads,
    filesystemCapacity() AS fs_capacity,
    filesystemAvailable() AS fs_available,
    file('cpu_model.txt') AS cpu_model,
    file('cpu.txt') AS cpu,
    file('df.txt') AS df,
    file('memory.txt') AS memory,
    file('memory_total.txt') AS memory_total,
    file('blk.txt') AS blk,
    file('mdstat.txt') AS mdstat,
    file('instance.txt') AS instance
 " | tee meta.tsv | ./clickhouse client --host play.clickhouse.com --secure --user benchmark --query "
  INSERT INTO benchmark_runs
  (run_id, version, test_time, threads, fs_capacity, fs_available, cpu_model, cpu, df, memory, memory_total, blk, mdstat, instance)
  FORMAT TSV" || echo "Cannot upload results."
 ./clickhouse local --query "
  SELECT
    '${UUID}' AS run_id,
    c1 AS query_num,
    c2 AS try_num,
    c3 AS time
  FROM file('result.csv')
 " | tee results.tsv | ./clickhouse client --host play.clickhouse.com --secure --user benchmark --query "
  INSERT INTO benchmark_results
  (run_id, query_num, try_num, time)
  FORMAT TSV" || echo "Cannot upload results. Please send the output to feedback@clickhouse.com"
 <<////
 Server Setup:
 CREATE TABLE benchmark_runs
 (
    run_id UUID,
    version String,
    test_time DateTime,
    threads String,
    fs_capacity UInt64,
    fs_available UInt64,
    cpu_model String,
    cpu String,
    df String,
    memory String,
    memory_total String,
    blk String,
    mdstat String,
    instance String
 ) ENGINE = ReplicatedMergeTree ORDER BY run_id;
 CREATE TABLE benchmark_results
 (
    run_id UUID,
    query_num UInt8,
    try_num UInt8,
    time Decimal32(3)
 ) ENGINE = ReplicatedMergeTree ORDER BY (run_id, query_num, try_num);
 CREATE USER benchmark IDENTIFIED WITH no_password SETTINGS max_rows_to_read = 1, max_result_rows = 1, max_execution_time = 1;
 CREATE QUOTA benchmark
 KEYED BY ip_address
 FOR RANDOMIZED INTERVAL 1 MINUTE MAX query_inserts = 4, written_bytes = 100000,
 FOR RANDOMIZED INTERVAL 1 HOUR MAX query_inserts = 10, written_bytes = 500000,
 FOR RANDOMIZED INTERVAL 1 DAY MAX query_inserts = 50, written_bytes = 2000000
 TO benchmark;
 GRANT INSERT ON benchmark_runs TO benchmark;
 GRANT INSERT ON benchmark_results TO benchmark;
 ////
--- a/cmake/autogenerated_versions.txt
+++ b/cmake/autogenerated_versions.txt
@ -2,11 +2,11 @@
 # NOTE: has nothing common with DBMS_TCP_PROTOCOL_VERSION,
 # only DBMS_TCP_PROTOCOL_VERSION should be incremented on protocol changes.
-SET(VERSION_REVISION 54462)
+SET(VERSION_REVISION 54464)
 SET(VERSION_MAJOR 22)
-SET(VERSION_MINOR 5)
+SET(VERSION_MINOR 7)
 SET(VERSION_PATCH 1)
-SET(VERSION_GITHASH 77a82cc090dd5dba2d995946e82a12a2cadaaff3)
+SET(VERSION_GITHASH 7000c4e0033bb9e69050ab8ef73e8e7465f78059)
-SET(VERSION_DESCRIBE v22.5.1.1-testing)
+SET(VERSION_DESCRIBE v22.7.1.1-testing)
-SET(VERSION_STRING 22.5.1.1)
+SET(VERSION_STRING 22.7.1.1)
 # end of autochange
--- a/cmake/ccache.cmake
+++ b/cmake/ccache.cmake
@ -1,56 +1,53 @@
 # Setup integration with ccache to speed up builds, see https://ccache.dev/
 if (CMAKE_CXX_COMPILER_LAUNCHER MATCHES "ccache" OR CMAKE_C_COMPILER_LAUNCHER MATCHES "ccache")
-    set(COMPILER_MATCHES_CCACHE 1)
+    # custom compiler launcher already defined, most likely because cmake was invoked with like "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache" or
-else()
+    # via environment variable --> respect setting and trust that the launcher was specified correctly
-    set(COMPILER_MATCHES_CCACHE 0)
+    message(STATUS "Using custom C compiler launcher: ${CMAKE_C_COMPILER_LAUNCHER}")
-endif()
+    message(STATUS "Using custom C++ compiler launcher: ${CMAKE_CXX_COMPILER_LAUNCHER}")
 if ((ENABLE_CCACHE OR NOT DEFINED ENABLE_CCACHE) AND NOT COMPILER_MATCHES_CCACHE)
    find_program (CCACHE_FOUND ccache)
    if (CCACHE_FOUND)
        set(ENABLE_CCACHE_BY_DEFAULT 1)
    else()
        set(ENABLE_CCACHE_BY_DEFAULT 0)
    endif()
 endif()
 if (NOT CCACHE_FOUND AND NOT DEFINED ENABLE_CCACHE AND NOT COMPILER_MATCHES_CCACHE)
    message(WARNING "CCache is not found. We recommend setting it up if you build ClickHouse from source often. "
            "Setting it up will significantly reduce compilation time for 2nd and consequent builds")
 endif()
 # https://ccache.dev/
 option(ENABLE_CCACHE "Speedup re-compilations using ccache (external tool)" ${ENABLE_CCACHE_BY_DEFAULT})
 if (NOT ENABLE_CCACHE)
    return()
 endif()
-if (CCACHE_FOUND AND NOT COMPILER_MATCHES_CCACHE)
+option(ENABLE_CCACHE "Speedup re-compilations using ccache (external tool)" ON)
   execute_process(COMMAND ${CCACHE_FOUND} "-V" OUTPUT_VARIABLE CCACHE_VERSION)
   string(REGEX REPLACE "ccache version ([0-9\\.]+).*" "\\1" CCACHE_VERSION ${CCACHE_VERSION})
-   if (CCACHE_VERSION VERSION_GREATER "3.2.0" OR NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+if (NOT ENABLE_CCACHE)
-      message(STATUS "Using ccache: ${CCACHE_FOUND} (version ${CCACHE_VERSION})")
+    message(STATUS "Using ccache: no (disabled via configuration)")
-      set(LAUNCHER ${CCACHE_FOUND})
+    return()
 endif()
-      # debian (debhelpers) set SOURCE_DATE_EPOCH environment variable, that is
+find_program (CCACHE_EXECUTABLE ccache)
      # filled from the debian/changelog or current time.
      #
      # - 4.0+ ccache always includes this environment variable into the hash
      #   of the manifest, which do not allow to use previous cache,
      # - 4.2+ ccache ignores SOURCE_DATE_EPOCH for every file w/o __DATE__/__TIME__
      #
      # Exclude SOURCE_DATE_EPOCH env for ccache versions between [4.0, 4.2).
      if (CCACHE_VERSION VERSION_GREATER_EQUAL "4.0" AND CCACHE_VERSION VERSION_LESS "4.2")
         message(STATUS "Ignore SOURCE_DATE_EPOCH for ccache")
         set(LAUNCHER env -u SOURCE_DATE_EPOCH ${CCACHE_FOUND})
      endif()
-      set (CMAKE_CXX_COMPILER_LAUNCHER ${LAUNCHER} ${CMAKE_CXX_COMPILER_LAUNCHER})
+if (NOT CCACHE_EXECUTABLE)
-      set (CMAKE_C_COMPILER_LAUNCHER ${LAUNCHER} ${CMAKE_C_COMPILER_LAUNCHER})
+    message(${RECONFIGURE_MESSAGE_LEVEL} "Using ccache: no (Could not find find ccache. To significantly reduce compile times for the 2nd, 3rd, etc. build, it is highly recommended to install ccache. To suppress this message, run cmake with -DENABLE_CCACHE=0)")
-   else ()
+    return()
-       message(${RECONFIGURE_MESSAGE_LEVEL} "Using ccache: No. Found ${CCACHE_FOUND} (version ${CCACHE_VERSION}) but disabled because of bug: https://bugzilla.samba.org/show_bug.cgi?id=8118")
+endif()
-   endif ()
+
-elseif (NOT CCACHE_FOUND AND NOT COMPILER_MATCHES_CCACHE)
+execute_process(COMMAND ${CCACHE_EXECUTABLE} "-V" OUTPUT_VARIABLE CCACHE_VERSION)
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Using ccache: No")
+string(REGEX REPLACE "ccache version ([0-9\\.]+).*" "\\1" CCACHE_VERSION ${CCACHE_VERSION})
-endif ()
+
 set (CCACHE_MINIMUM_VERSION 3.3)
 if (CCACHE_VERSION VERSION_LESS_EQUAL ${CCACHE_MINIMUM_VERSION})
    message(${RECONFIGURE_MESSAGE_LEVEL} "Using ccache: no (found ${CCACHE_EXECUTABLE} (version ${CCACHE_VERSION}), the minimum required version is ${CCACHE_MINIMUM_VERSION}")
    return()
 endif()
 message(STATUS "Using ccache: ${CCACHE_EXECUTABLE} (version ${CCACHE_VERSION})")
 set(LAUNCHER ${CCACHE_EXECUTABLE})
 # Work around a well-intended but unfortunate behavior of ccache 4.0 & 4.1 with
 # environment variable SOURCE_DATE_EPOCH. This variable provides an alternative
 # to source-code embedded timestamps (__DATE__/__TIME__) and therefore helps with
 # reproducible builds (*). SOURCE_DATE_EPOCH is set automatically by the
 # distribution, e.g. Debian. Ccache 4.0 & 4.1 incorporate SOURCE_DATE_EPOCH into
 # the hash calculation regardless they contain timestamps or not. This invalidates
 # the cache whenever SOURCE_DATE_EPOCH changes. As a fix, ignore SOURCE_DATE_EPOCH.
 #
 # (*) https://reproducible-builds.org/specs/source-date-epoch/
 if (CCACHE_VERSION VERSION_GREATER_EQUAL "4.0" AND CCACHE_VERSION VERSION_LESS "4.2")
    message(STATUS "Ignore SOURCE_DATE_EPOCH for ccache 4.0 / 4.1")
    set(LAUNCHER env -u SOURCE_DATE_EPOCH ${CCACHE_EXECUTABLE})
 endif()
 set (CMAKE_CXX_COMPILER_LAUNCHER ${LAUNCHER} ${CMAKE_CXX_COMPILER_LAUNCHER})
 set (CMAKE_C_COMPILER_LAUNCHER ${LAUNCHER} ${CMAKE_C_COMPILER_LAUNCHER})
--- a/cmake/cpu_features.cmake
+++ b/cmake/cpu_features.cmake
@ -29,10 +29,11 @@ if (ARCH_NATIVE)
    set (COMPILER_FLAGS "${COMPILER_FLAGS} -march=native")
 elseif (ARCH_AARCH64)
-    set (COMPILER_FLAGS "${COMPILER_FLAGS} -march=armv8-a+crc")
+    set (COMPILER_FLAGS "${COMPILER_FLAGS} -march=armv8-a+crc+simd+crypto+dotprod+ssbs")
 elseif (ARCH_PPC64LE)
-    set (COMPILER_FLAGS "${COMPILER_FLAGS} -maltivec -mcpu=power8 -DNO_WARN_X86_INTRINSICS")
+    # Note that gcc and clang have support for x86 SSE2 intrinsics when building for PowerPC
    set (COMPILER_FLAGS "${COMPILER_FLAGS} -maltivec -mcpu=power8 -D__SSE2__=1 -DNO_WARN_X86_INTRINSICS")
 elseif (ARCH_AMD64)
    set (TEST_FLAG "-mssse3")
--- a/cmake/dbms_glob_sources.cmake
+++ b/cmake/dbms_glob_sources.cmake
@ -1,5 +1,5 @@
 macro(add_glob cur_list)
-    file(GLOB __tmp RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${ARGN})
+    file(GLOB __tmp CONFIGURE_DEPENDS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${ARGN})
    list(APPEND ${cur_list} ${__tmp})
 endmacro()
--- a/cmake/generate_code.cmake
+++ b/cmake/generate_code.cmake
@ -1,5 +0,0 @@
 function(generate_code TEMPLATE_FILE)
    foreach(NAME IN LISTS ARGN)
       configure_file (${TEMPLATE_FILE}.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/generated/${TEMPLATE_FILE}_${NAME}.cpp)
    endforeach()
 endfunction()
--- a/cmake/git_status.cmake
+++ b/cmake/git_status.cmake
@ -1,17 +1,22 @@
 # Print the status of the git repository (if git is available).
 # This is useful for troubleshooting build failure reports
 find_package(Git)
 if (Git_FOUND)
  execute_process(
    COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
    OUTPUT_VARIABLE GIT_COMMIT_ID
    OUTPUT_STRIP_TRAILING_WHITESPACE)
  message(STATUS "HEAD's commit hash ${GIT_COMMIT_ID}")
  execute_process(
    COMMAND ${GIT_EXECUTABLE} status
    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_STRIP_TRAILING_WHITESPACE)
 else()
-  message(STATUS "The git program could not be found.")
+  message(STATUS "Git could not be found.")
 endif()
--- a/cmake/strip_binary.cmake
+++ b/cmake/strip_binary.cmake
@ -19,15 +19,18 @@ macro(clickhouse_strip_binary)
       COMMAND mkdir -p "${STRIP_DESTINATION_DIR}/lib/debug/bin"
       COMMAND mkdir -p "${STRIP_DESTINATION_DIR}/bin"
       COMMAND cp "${STRIP_BINARY_PATH}" "${STRIP_DESTINATION_DIR}/bin/${STRIP_TARGET}"
       # Splits debug symbols into separate file, leaves the binary untouched:
       COMMAND "${OBJCOPY_PATH}" --only-keep-debug --compress-debug-sections "${STRIP_DESTINATION_DIR}/bin/${STRIP_TARGET}" "${STRIP_DESTINATION_DIR}/lib/debug/bin/${STRIP_TARGET}.debug"
       COMMAND chmod 0644 "${STRIP_DESTINATION_DIR}/lib/debug/bin/${STRIP_TARGET}.debug"
-       COMMAND "${STRIP_PATH}" --remove-section=.comment --remove-section=.note "${STRIP_DESTINATION_DIR}/bin/${STRIP_TARGET}"
+       # Strips binary, sections '.note' & '.comment' are removed in line with Debian's stripping policy: www.debian.org/doc/debian-policy/ch-files.html, section '.clickhouse.hash' is needed for integrity check:
       COMMAND "${STRIP_PATH}" --remove-section=.comment --remove-section=.note --keep-section=.clickhouse.hash "${STRIP_DESTINATION_DIR}/bin/${STRIP_TARGET}"
       # Associate stripped binary with debug symbols:
       COMMAND "${OBJCOPY_PATH}" --add-gnu-debuglink "${STRIP_DESTINATION_DIR}/lib/debug/bin/${STRIP_TARGET}.debug" "${STRIP_DESTINATION_DIR}/bin/${STRIP_TARGET}"
       COMMENT "Stripping clickhouse binary" VERBATIM
   )
   install(PROGRAMS ${STRIP_DESTINATION_DIR}/bin/${STRIP_TARGET} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
-   install(FILES ${STRIP_DESTINATION_DIR}/lib/debug/bin/${STRIP_TARGET}.debug DESTINATION ${CMAKE_INSTALL_LIBDIR}/debug/${CMAKE_INSTALL_FULL_BINDIR}/${STRIP_TARGET}.debug COMPONENT clickhouse)
+   install(FILES ${STRIP_DESTINATION_DIR}/lib/debug/bin/${STRIP_TARGET}.debug DESTINATION ${CMAKE_INSTALL_LIBDIR}/debug/${CMAKE_INSTALL_FULL_BINDIR} COMPONENT clickhouse)
 endmacro()
--- a/cmake/tools.cmake
+++ b/cmake/tools.cmake
@ -77,6 +77,7 @@ if (OS_LINUX AND NOT LINKER_NAME)
    if (NOT LINKER_NAME)
        if (GOLD_PATH)
            message (WARNING "Linking with gold is not recommended. Please use lld.")
            if (COMPILER_GCC)
                set (LINKER_NAME "gold")
            else ()
@ -111,7 +112,7 @@ endif()
 # Archiver
 if (COMPILER_GCC)
-    find_program (LLVM_AR_PATH NAMES "llvm-ar" "llvm-ar-13" "llvm-ar-12" "llvm-ar-11")
+    find_program (LLVM_AR_PATH NAMES "llvm-ar" "llvm-ar-14" "llvm-ar-13" "llvm-ar-12")
 else ()
    find_program (LLVM_AR_PATH NAMES "llvm-ar-${COMPILER_VERSION_MAJOR}" "llvm-ar")
 endif ()
@ -125,7 +126,7 @@ message(STATUS "Using archiver: ${CMAKE_AR}")
 # Ranlib
 if (COMPILER_GCC)
-    find_program (LLVM_RANLIB_PATH NAMES "llvm-ranlib" "llvm-ranlib-13" "llvm-ranlib-12" "llvm-ranlib-11")
+    find_program (LLVM_RANLIB_PATH NAMES "llvm-ranlib" "llvm-ranlib-14" "llvm-ranlib-13" "llvm-ranlib-12")
 else ()
    find_program (LLVM_RANLIB_PATH NAMES "llvm-ranlib-${COMPILER_VERSION_MAJOR}" "llvm-ranlib")
 endif ()
@ -139,7 +140,7 @@ message(STATUS "Using ranlib: ${CMAKE_RANLIB}")
 # Install Name Tool
 if (COMPILER_GCC)
-    find_program (LLVM_INSTALL_NAME_TOOL_PATH NAMES "llvm-install-name-tool" "llvm-install-name-tool-13" "llvm-install-name-tool-12" "llvm-install-name-tool-11")
+    find_program (LLVM_INSTALL_NAME_TOOL_PATH NAMES "llvm-install-name-tool" "llvm-install-name-tool-14" "llvm-install-name-tool-13" "llvm-install-name-tool-12")
 else ()
    find_program (LLVM_INSTALL_NAME_TOOL_PATH NAMES "llvm-install-name-tool-${COMPILER_VERSION_MAJOR}" "llvm-install-name-tool")
 endif ()
@ -153,7 +154,7 @@ message(STATUS "Using install-name-tool: ${CMAKE_INSTALL_NAME_TOOL}")
 # Objcopy
 if (COMPILER_GCC)
-    find_program (OBJCOPY_PATH NAMES "llvm-objcopy" "llvm-objcopy-13" "llvm-objcopy-12" "llvm-objcopy-11" "objcopy")
+    find_program (OBJCOPY_PATH NAMES "llvm-objcopy" "llvm-objcopy-14" "llvm-objcopy-13" "llvm-objcopy-12" "objcopy")
 else ()
    find_program (OBJCOPY_PATH NAMES "llvm-objcopy-${COMPILER_VERSION_MAJOR}" "llvm-objcopy" "objcopy")
 endif ()
@ -167,7 +168,7 @@ endif ()
 # Strip
 if (COMPILER_GCC)
-    find_program (STRIP_PATH NAMES "llvm-strip" "llvm-strip-13" "llvm-strip-12" "llvm-strip-11" "strip")
+    find_program (STRIP_PATH NAMES "llvm-strip" "llvm-strip-14" "llvm-strip-13" "llvm-strip-12" "strip")
 else ()
    find_program (STRIP_PATH NAMES "llvm-strip-${COMPILER_VERSION_MAJOR}" "llvm-strip" "strip")
 endif ()
@ -177,3 +178,17 @@ if (STRIP_PATH)
 else ()
    message (FATAL_ERROR "Cannot find strip.")
 endif ()
 if (OS_DARWIN AND NOT CMAKE_TOOLCHAIN_FILE)
    # utils/list-licenses/list-licenses.sh (which generates system table system.licenses) needs the GNU versions of find and grep. These are
    # not available out-of-the-box on Mac. As a special case, Darwin builds in CI are cross-compiled from x86 Linux where the GNU userland is
    # available.
    find_program(GFIND_PATH NAMES "gfind")
    if (NOT GFIND_PATH)
        message (FATAL_ERROR "GNU find not found. You can install it with 'brew install findutils'.")
    endif()
    find_program(GGREP_PATH NAMES "ggrep")
    if (NOT GGREP_PATH)
        message (FATAL_ERROR "GNU grep not found. You can install it with 'brew install grep'.")
    endif()
 endif ()
--- a/cmake/warnings.cmake
+++ b/cmake/warnings.cmake
@ -9,11 +9,6 @@
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
 # Add some warnings that are not available even with -Wall -Wextra -Wpedantic.
 # Intended for exploration of new compiler warnings that may be found useful.
 # Applies to clang only
 option (WEVERYTHING "Enable -Weverything option with some exceptions." ON)
 # Control maximum size of stack frames. It can be important if the code is run in fibers with small stack size.
 # Only in release build because debug has too large stack frames.
 if ((NOT CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG") AND (NOT SANITIZE) AND (NOT CMAKE_CXX_COMPILER_ID MATCHES "AppleClang"))
@ -21,81 +16,42 @@ if ((NOT CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG") AND (NOT SANITIZE) AND (NOT CMAKE
 endif ()
 if (COMPILER_CLANG)
    # Add some warnings that are not available even with -Wall -Wextra -Wpedantic.
    # We want to get everything out of the compiler for code quality.
    add_warning(everything)
    add_warning(pedantic)
    no_warning(vla-extension)
    no_warning(zero-length-array)
    no_warning(c11-extensions)
    no_warning(unused-command-line-argument)
-
+    no_warning(c++98-compat-pedantic)
-    if (WEVERYTHING)
+    no_warning(c++98-compat)
-        add_warning(everything)
+    no_warning(c99-extensions)
-        no_warning(c++98-compat-pedantic)
+    no_warning(conversion)
-        no_warning(c++98-compat)
+    no_warning(ctad-maybe-unsupported) # clang 9+, linux-only
-        no_warning(c99-extensions)
+    no_warning(deprecated-dynamic-exception-spec)
-        no_warning(conversion)
+    no_warning(disabled-macro-expansion)
-        no_warning(ctad-maybe-unsupported) # clang 9+, linux-only
+    no_warning(documentation-unknown-command)
-        no_warning(deprecated-dynamic-exception-spec)
+    no_warning(double-promotion)
-        no_warning(disabled-macro-expansion)
+    no_warning(exit-time-destructors)
-        no_warning(documentation-unknown-command)
+    no_warning(float-equal)
-        no_warning(double-promotion)
+    no_warning(global-constructors)
-        no_warning(exit-time-destructors)
+    no_warning(missing-prototypes)
-        no_warning(float-equal)
+    no_warning(missing-variable-declarations)
-        no_warning(global-constructors)
+    no_warning(nested-anon-types)
-        no_warning(missing-prototypes)
+    no_warning(packed)
-        no_warning(missing-variable-declarations)
+    no_warning(padded)
-        no_warning(nested-anon-types)
+    no_warning(return-std-move-in-c++11) # clang 7+
-        no_warning(packed)
+    no_warning(shift-sign-overflow)
-        no_warning(padded)
+    no_warning(sign-conversion)
-        no_warning(return-std-move-in-c++11) # clang 7+
+    no_warning(switch-enum)
-        no_warning(shift-sign-overflow)
+    no_warning(undefined-func-template)
-        no_warning(sign-conversion)
+    no_warning(unused-template)
-        no_warning(switch-enum)
+    no_warning(vla)
-        no_warning(undefined-func-template)
+    no_warning(weak-template-vtables)
-        no_warning(unused-template)
+    no_warning(weak-vtables)
-        no_warning(vla)
+    no_warning(thread-safety-negative) # experimental flag, too many false positives
-        no_warning(weak-template-vtables)
+    # TODO Enable conversion, sign-conversion, double-promotion warnings.
        no_warning(weak-vtables)
        # TODO Enable conversion, sign-conversion, double-promotion warnings.
    else ()
        add_warning(comma)
        add_warning(conditional-uninitialized)
        add_warning(covered-switch-default)
        add_warning(deprecated)
        add_warning(embedded-directive)
        add_warning(empty-init-stmt) # linux-only
        add_warning(extra-semi-stmt) # linux-only
        add_warning(extra-semi)
        add_warning(gnu-case-range)
        add_warning(inconsistent-missing-destructor-override)
        add_warning(newline-eof)
        add_warning(old-style-cast)
        add_warning(range-loop-analysis)
        add_warning(redundant-parens)
        add_warning(reserved-id-macro)
        add_warning(shadow-field)
        add_warning(shadow-uncaptured-local)
        add_warning(shadow)
        add_warning(string-plus-int)
        add_warning(undef)
        add_warning(unreachable-code-return)
        add_warning(unreachable-code)
        add_warning(unused-exception-parameter)
        add_warning(unused-macros)
        add_warning(unused-member-function)
        add_warning(unneeded-internal-declaration)
        add_warning(implicit-int-float-conversion)
        add_warning(no-delete-null-pointer-checks)
        add_warning(anon-enum-enum-conversion)
        add_warning(assign-enum)
        add_warning(bitwise-op-parentheses)
        add_warning(int-in-bool-context)
        add_warning(sometimes-uninitialized)
        add_warning(tautological-bitwise-compare)
        # XXX: libstdc++ has some of these for 3way compare
        add_warning(zero-as-null-pointer-constant)
    endif ()
 elseif (COMPILER_GCC)
    # Add compiler options only to c++ compiler
    function(add_cxx_compile_options option)
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@ -37,6 +37,8 @@ function(add_contrib cmake_folder)
        file(GLOB contrib_files "${base_folder}/*")
        if (NOT contrib_files)
            # Checking out *all* submodules takes > 5 min. Therefore, the smoke build ("FastTest") in CI initializes only the set of
            # submodules minimally needed for a build and we cannot assume here that all submodules are populated.
            message(STATUS "submodule ${base_folder} is missing or empty. to fix try run:")
            message(STATUS "    git submodule update --init")
            return()
@ -56,7 +58,7 @@ add_contrib (boost-cmake boost)
 add_contrib (cctz-cmake cctz)
 add_contrib (consistent-hashing)
 add_contrib (dragonbox-cmake dragonbox)
-add_contrib (hyperscan-cmake hyperscan)
+add_contrib (vectorscan-cmake vectorscan)
 add_contrib (jemalloc-cmake jemalloc)
 add_contrib (libcpuid-cmake libcpuid)
 add_contrib (libdivide)
@ -140,6 +142,7 @@ add_contrib (libpq-cmake libpq)
 add_contrib (nuraft-cmake NuRaft)
 add_contrib (fast_float-cmake fast_float)
 add_contrib (datasketches-cpp-cmake datasketches-cpp)
 add_contrib (hashidsxx-cmake hashidsxx)
 option(ENABLE_NLP "Enable NLP functions support" ${ENABLE_LIBRARIES})
 if (ENABLE_NLP)
@ -152,7 +155,7 @@ endif()
 add_contrib (sqlite-cmake sqlite-amalgamation)
 add_contrib (s2geometry-cmake s2geometry)
-add_contrib (eigen-cmake eigen)
+add_contrib (base-x-cmake base-x)
 # Put all targets defined here and in subdirectories under "contrib/<immediate-subdir>" folders in GUI-based IDEs.
 # Some of third-party projects may override CMAKE_FOLDER or FOLDER property of their targets, so they would not appear
--- a/contrib/NuRaft
+++ b/contrib/NuRaft
@ -1 +1 @@
-Subproject commit 24a13f15cf0838b93f3b1beb62ed010dffdb2117
+Subproject commit 1334b9ae72576821a698d657d08838861cf33007
--- a/contrib/abseil-cpp-cmake/CMakeLists.txt
+++ b/contrib/abseil-cpp-cmake/CMakeLists.txt
@ -1,7 +1,4 @@
 set(ABSL_ROOT_DIR "${ClickHouse_SOURCE_DIR}/contrib/abseil-cpp")
 if(NOT EXISTS "${ABSL_ROOT_DIR}/CMakeLists.txt")
  message(FATAL_ERROR " submodule third_party/abseil-cpp is missing. To fix try run: \n git submodule update --init --recursive")
 endif()
 set(BUILD_TESTING OFF)
 set(ABSL_PROPAGATE_CXX_STD ON)
 add_subdirectory("${ABSL_ROOT_DIR}" "${ClickHouse_BINARY_DIR}/contrib/abseil-cpp")
--- a/contrib/amqpcpp-cmake/CMakeLists.txt
+++ b/contrib/amqpcpp-cmake/CMakeLists.txt
@ -5,6 +5,12 @@ if (NOT ENABLE_AMQPCPP)
    return()
 endif()
 # can be removed once libuv build on MacOS with GCC is possible
 if (NOT TARGET ch_contrib::uv)
    message(STATUS "Not using AMQP-CPP because libuv is disabled")
    return()
 endif()
 set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/AMQP-CPP")
 set (SRCS
@ -32,21 +38,6 @@ set (SRCS
 add_library(_amqp-cpp ${SRCS})
 target_compile_options (_amqp-cpp
    PRIVATE
        -Wno-old-style-cast
        -Wno-inconsistent-missing-destructor-override
        -Wno-deprecated
        -Wno-unused-parameter
        -Wno-shadow
        -Wno-tautological-type-limit-compare
        -Wno-extra-semi
 # NOTE: disable all warnings at last because the warning:
        #       "conversion function converting 'XXX' to itself will never be used"
        #       doesn't have it's own diagnostic flag yet.
        -w
 )
 target_include_directories (_amqp-cpp SYSTEM BEFORE PUBLIC "${LIBRARY_DIR}/include" "${LIBRARY_DIR}")
 target_link_libraries (_amqp-cpp PUBLIC OpenSSL::Crypto OpenSSL::SSL ch_contrib::uv)
 add_library (ch_contrib::amqp_cpp ALIAS _amqp-cpp)
--- a/contrib/arrow-cmake/CMakeLists.txt
+++ b/contrib/arrow-cmake/CMakeLists.txt
@ -20,7 +20,7 @@ endif()
 option (ENABLE_PARQUET "Enable parquet" ${ENABLE_PARQUET_DEFAULT})
 if (NOT ENABLE_PARQUET)
-    message(STATUS "Building without Parquet support")
+    message(STATUS "Not using parquet")
    return()
 endif()
--- a/contrib/avro-cmake/CMakeLists.txt
+++ b/contrib/avro-cmake/CMakeLists.txt
@ -60,14 +60,6 @@ target_compile_definitions (_avrocpp PUBLIC SNAPPY_CODEC_AVAILABLE)
 target_include_directories (_avrocpp PRIVATE ${SNAPPY_INCLUDE_DIR})
 target_link_libraries (_avrocpp PRIVATE ch_contrib::snappy)
 if (COMPILER_GCC)
    set (SUPPRESS_WARNINGS -Wno-non-virtual-dtor)
 elseif (COMPILER_CLANG)
    set (SUPPRESS_WARNINGS -Wno-non-virtual-dtor)
 endif ()
 target_compile_options(_avrocpp PRIVATE ${SUPPRESS_WARNINGS})
 # create a symlink to include headers with <avro/...>
 set(AVRO_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/include")
 ADD_CUSTOM_TARGET(avro_symlink_headers ALL
--- a/contrib/azure-cmake/CMakeLists.txt
+++ b/contrib/azure-cmake/CMakeLists.txt
@ -52,20 +52,6 @@ include("${AZURE_DIR}/cmake-modules/AzureTransportAdapters.cmake")
 add_library(_azure_sdk ${AZURE_SDK_UNIFIED_SRC})
 if (COMPILER_CLANG)
    target_compile_options(_azure_sdk PRIVATE
        -Wno-deprecated-copy-dtor
        -Wno-extra-semi
        -Wno-suggest-destructor-override
        -Wno-inconsistent-missing-destructor-override
        -Wno-error=unknown-warning-option
    )
    if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13)
        target_compile_options(_azure_sdk PRIVATE -Wno-reserved-identifier)
    endif()
 endif()
 # Originally, on Windows azure-core is built with bcrypt and crypt32 by default
 if (TARGET OpenSSL::SSL)
    target_link_libraries(_azure_sdk PRIVATE OpenSSL::Crypto OpenSSL::SSL)
--- a/contrib/base-x
+++ b/contrib/base-x
@ -0,0 +1 @@
 Subproject commit a85f98fb4ed52c2f4029a4b6ac1ef0bafdfc56f5
--- a/contrib/base-x-cmake/CMakeLists.txt
+++ b/contrib/base-x-cmake/CMakeLists.txt
@ -0,0 +1,28 @@
 option (ENABLE_BASEX "Enable base-x" ${ENABLE_LIBRARIES})
 if (NOT ENABLE_BASEX)
    message(STATUS "Not using base-x")
    return()
 endif()
 set(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/base-x")
 set (SRCS
        ${LIBRARY_DIR}/base_x.hh
        ${LIBRARY_DIR}/uinteger_t.hh
        )
 add_library(_base-x INTERFACE)
 target_include_directories(_base-x SYSTEM BEFORE INTERFACE "${ClickHouse_SOURCE_DIR}/contrib/base-x")
 if (XCODE OR XCODE_VERSION)
    # https://gitlab.kitware.com/cmake/cmake/issues/17457
    #     Some native build systems may not like targets that have only object files, so consider adding at least one real source file
    # This applies to Xcode.
    if (NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/dummy.c")
        file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/dummy.c" "")
    endif ()
    target_sources(_base-x PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/dummy.c")
 endif ()
 add_library(ch_contrib::base-x ALIAS _base-x)
--- a/contrib/boringssl
+++ b/contrib/boringssl
@ -1 +1 @@
-Subproject commit 9c0715ce459de443e7b08f270a518c1702f1a380
+Subproject commit c1e01a441d6db234f4f12e63a7657d1f9e6db9c1
--- a/contrib/boringssl-cmake/CMakeLists.txt
+++ b/contrib/boringssl-cmake/CMakeLists.txt
@ -1,7 +1,12 @@
 # Needed for:
 # - securely connecting to an external server, e.g. clickhouse-client --host ... --secure
 # - lots of thirdparty libraries
-option(ENABLE_SSL "Enable ssl" ${ENABLE_LIBRARIES})
+
 # Actually, so many 3rd party libraries + unit tests need SSL that we cannot disable it
 # without breaking the build ...
 option(ENABLE_SSL "Enable ssl" ON) # breaks if OFF
 # TODO: Making SSL dependent on ENABLE_LIBRARIES is desirable but needs fixing dependent libs + tests.
 # option(ENABLE_SSL "Enable ssl" ${ENABLE_LIBRARIES})
 if(NOT ENABLE_SSL)
  message(STATUS "Not using openssl")
@ -154,14 +159,12 @@ set(
  ios-aarch64/crypto/fipsmodule/sha512-armv8.S
  ios-aarch64/crypto/fipsmodule/vpaes-armv8.S
  ios-aarch64/crypto/test/trampoline-armv8.S
  ios-aarch64/crypto/third_party/sike/asm/fp-armv8.S
 )
 set(
  CRYPTO_ios_arm_SOURCES
  ios-arm/crypto/chacha/chacha-armv4.S
  ios-arm/crypto/fipsmodule/aes-armv4.S
  ios-arm/crypto/fipsmodule/aesv8-armx32.S
  ios-arm/crypto/fipsmodule/armv4-mont.S
  ios-arm/crypto/fipsmodule/bsaes-armv7.S
@ -187,14 +190,12 @@ set(
  linux-aarch64/crypto/fipsmodule/sha512-armv8.S
  linux-aarch64/crypto/fipsmodule/vpaes-armv8.S
  linux-aarch64/crypto/test/trampoline-armv8.S
  linux-aarch64/crypto/third_party/sike/asm/fp-armv8.S
 )
 set(
  CRYPTO_linux_arm_SOURCES
  linux-arm/crypto/chacha/chacha-armv4.S
  linux-arm/crypto/fipsmodule/aes-armv4.S
  linux-arm/crypto/fipsmodule/aesv8-armx32.S
  linux-arm/crypto/fipsmodule/armv4-mont.S
  linux-arm/crypto/fipsmodule/bsaes-armv7.S
@ -214,13 +215,13 @@ set(
  linux-ppc64le/crypto/fipsmodule/aesp8-ppc.S
  linux-ppc64le/crypto/fipsmodule/ghashp8-ppc.S
  linux-ppc64le/crypto/test/trampoline-ppc.S
 )
 set(
  CRYPTO_linux_x86_SOURCES
  linux-x86/crypto/chacha/chacha-x86.S
  linux-x86/crypto/fipsmodule/aes-586.S
  linux-x86/crypto/fipsmodule/aesni-x86.S
  linux-x86/crypto/fipsmodule/bn-586.S
  linux-x86/crypto/fipsmodule/co-586.S
@ -241,7 +242,6 @@ set(
  linux-x86_64/crypto/chacha/chacha-x86_64.S
  linux-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S
  linux-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64.S
  linux-x86_64/crypto/fipsmodule/aes-x86_64.S
  linux-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S
  linux-x86_64/crypto/fipsmodule/aesni-x86_64.S
  linux-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64.S
@ -258,7 +258,6 @@ set(
  linux-x86_64/crypto/fipsmodule/x86_64-mont.S
  linux-x86_64/crypto/fipsmodule/x86_64-mont5.S
  linux-x86_64/crypto/test/trampoline-x86_64.S
  linux-x86_64/crypto/third_party/sike/asm/fp-x86_64.S
  "${BORINGSSL_SOURCE_DIR}/crypto/hrss/asm/poly_rq_mul.S"
 )
@ -266,7 +265,6 @@ set(
  CRYPTO_mac_x86_SOURCES
  mac-x86/crypto/chacha/chacha-x86.S
  mac-x86/crypto/fipsmodule/aes-586.S
  mac-x86/crypto/fipsmodule/aesni-x86.S
  mac-x86/crypto/fipsmodule/bn-586.S
  mac-x86/crypto/fipsmodule/co-586.S
@ -287,7 +285,6 @@ set(
  mac-x86_64/crypto/chacha/chacha-x86_64.S
  mac-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S
  mac-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64.S
  mac-x86_64/crypto/fipsmodule/aes-x86_64.S
  mac-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S
  mac-x86_64/crypto/fipsmodule/aesni-x86_64.S
  mac-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64.S
@ -304,7 +301,6 @@ set(
  mac-x86_64/crypto/fipsmodule/x86_64-mont.S
  mac-x86_64/crypto/fipsmodule/x86_64-mont5.S
  mac-x86_64/crypto/test/trampoline-x86_64.S
  mac-x86_64/crypto/third_party/sike/asm/fp-x86_64.S
 )
 set(
@ -326,7 +322,6 @@ set(
  CRYPTO_win_x86_SOURCES
  win-x86/crypto/chacha/chacha-x86.asm
  win-x86/crypto/fipsmodule/aes-586.asm
  win-x86/crypto/fipsmodule/aesni-x86.asm
  win-x86/crypto/fipsmodule/bn-586.asm
  win-x86/crypto/fipsmodule/co-586.asm
@ -347,7 +342,6 @@ set(
  win-x86_64/crypto/chacha/chacha-x86_64.asm
  win-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.asm
  win-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64.asm
  win-x86_64/crypto/fipsmodule/aes-x86_64.asm
  win-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.asm
  win-x86_64/crypto/fipsmodule/aesni-x86_64.asm
  win-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64.asm
@ -364,7 +358,6 @@ set(
  win-x86_64/crypto/fipsmodule/x86_64-mont.asm
  win-x86_64/crypto/fipsmodule/x86_64-mont5.asm
  win-x86_64/crypto/test/trampoline-x86_64.asm
  win-x86_64/crypto/third_party/sike/asm/fp-x86_64.asm
 )
 if(APPLE AND ARCH STREQUAL "aarch64")
@ -396,6 +389,7 @@ add_library(
  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_object.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_octet.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_print.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_strex.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_strnid.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_time.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_type.c"
@ -425,6 +419,7 @@ add_library(
  "${BORINGSSL_SOURCE_DIR}/crypto/bio/printf.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/bio/socket.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/bio/socket_helper.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/blake2/blake2.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/bn_extra/bn_asn1.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/bn_extra/convert.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/buf/buf.c"
@ -449,20 +444,22 @@ add_library(
  "${BORINGSSL_SOURCE_DIR}/crypto/conf/conf.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/cpu-aarch64-fuchsia.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/cpu-aarch64-linux.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/cpu-aarch64-win.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/cpu-arm-linux.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/cpu-arm.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/cpu-intel.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/cpu-ppc64le.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/crypto.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/curve25519/curve25519.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/curve25519/spake25519.c"
-  "${BORINGSSL_SOURCE_DIR}/crypto/dh/check.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/dh_extra/dh_asn1.c"
-  "${BORINGSSL_SOURCE_DIR}/crypto/dh/dh.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/dh_extra/params.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/dh/dh_asn1.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/dh/params.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/digest_extra/digest_extra.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/dsa/dsa.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/dsa/dsa_asn1.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/ec_extra/ec_asn1.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/ec_extra/ec_derive.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/ec_extra/hash_to_curve.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/ecdh_extra/ecdh_extra.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/ecdsa_extra/ecdsa_asn1.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/engine/engine.c"
@ -487,8 +484,8 @@ add_library(
  "${BORINGSSL_SOURCE_DIR}/crypto/ex_data.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/fipsmodule/bcm.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/fipsmodule/fips_shared_support.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/fipsmodule/is_fips.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/hkdf/hkdf.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/hpke/hpke.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/hrss/hrss.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/lhash/lhash.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/mem.c"
@ -514,6 +511,7 @@ add_library(
  "${BORINGSSL_SOURCE_DIR}/crypto/rand_extra/deterministic.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/rand_extra/forkunsafe.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/rand_extra/fuchsia.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/rand_extra/passive.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/rand_extra/rand_extra.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/rand_extra/windows.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/rc4/rc4.c"
@ -527,15 +525,18 @@ add_library(
  "${BORINGSSL_SOURCE_DIR}/crypto/thread_none.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/thread_pthread.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/thread_win.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/trust_token/pmbtoken.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/trust_token/trust_token.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/trust_token/voprf.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/x509/a_digest.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/x509/a_sign.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/x509/a_strex.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/x509/a_verify.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/x509/algorithm.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/x509/asn1_gen.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/x509/by_dir.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/x509/by_file.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/x509/i2d_pr.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/x509/name_print.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/x509/rsa_pss.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/x509/t_crl.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/x509/t_req.c"
@ -601,19 +602,11 @@ add_library(
  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_pci.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_pcia.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_pcons.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_pku.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_pmaps.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_prn.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_purp.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_skey.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_sxnet.c"
  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_utl.c"
  "${BORINGSSL_SOURCE_DIR}/third_party/fiat/curve25519.c"
  "${BORINGSSL_SOURCE_DIR}/third_party/sike/asm/fp_generic.c"
  "${BORINGSSL_SOURCE_DIR}/third_party/sike/curve_params.c"
  "${BORINGSSL_SOURCE_DIR}/third_party/sike/fpx.c"
  "${BORINGSSL_SOURCE_DIR}/third_party/sike/isogeny.c"
  "${BORINGSSL_SOURCE_DIR}/third_party/sike/sike.c"
 )
 add_library(
@ -626,6 +619,8 @@ add_library(
  "${BORINGSSL_SOURCE_DIR}/ssl/d1_srtp.cc"
  "${BORINGSSL_SOURCE_DIR}/ssl/dtls_method.cc"
  "${BORINGSSL_SOURCE_DIR}/ssl/dtls_record.cc"
  "${BORINGSSL_SOURCE_DIR}/ssl/encrypted_client_hello.cc"
  "${BORINGSSL_SOURCE_DIR}/ssl/extensions.cc"
  "${BORINGSSL_SOURCE_DIR}/ssl/handoff.cc"
  "${BORINGSSL_SOURCE_DIR}/ssl/handshake.cc"
  "${BORINGSSL_SOURCE_DIR}/ssl/handshake_client.cc"
@ -648,7 +643,6 @@ add_library(
  "${BORINGSSL_SOURCE_DIR}/ssl/ssl_versions.cc"
  "${BORINGSSL_SOURCE_DIR}/ssl/ssl_x509.cc"
  "${BORINGSSL_SOURCE_DIR}/ssl/t1_enc.cc"
  "${BORINGSSL_SOURCE_DIR}/ssl/t1_lib.cc"
  "${BORINGSSL_SOURCE_DIR}/ssl/tls13_both.cc"
  "${BORINGSSL_SOURCE_DIR}/ssl/tls13_client.cc"
  "${BORINGSSL_SOURCE_DIR}/ssl/tls13_enc.cc"
@ -669,7 +663,9 @@ add_executable(
  "${BORINGSSL_SOURCE_DIR}/tool/client.cc"
  "${BORINGSSL_SOURCE_DIR}/tool/const.cc"
  "${BORINGSSL_SOURCE_DIR}/tool/digest.cc"
  "${BORINGSSL_SOURCE_DIR}/tool/fd.cc"
  "${BORINGSSL_SOURCE_DIR}/tool/file.cc"
  "${BORINGSSL_SOURCE_DIR}/tool/generate_ech.cc"
  "${BORINGSSL_SOURCE_DIR}/tool/generate_ed25519.cc"
  "${BORINGSSL_SOURCE_DIR}/tool/genrsa.cc"
  "${BORINGSSL_SOURCE_DIR}/tool/pkcs12.cc"
@ -700,3 +696,109 @@ target_compile_options(_crypto PRIVATE -Wno-gnu-anonymous-struct)
 add_library(OpenSSL::Crypto ALIAS _crypto)
 add_library(OpenSSL::SSL ALIAS _ssl)
 # Helper function used in the populate_openssl_vars function below
 function(from_hex HEX DEC)
  string(TOUPPER "${HEX}" HEX)
  set(_res 0)
  string(LENGTH "${HEX}" _strlen)
  while (_strlen GREATER 0)
    math(EXPR _res "${_res} * 16")
    string(SUBSTRING "${HEX}" 0 1 NIBBLE)
    string(SUBSTRING "${HEX}" 1 -1 HEX)
    if (NIBBLE STREQUAL "A")
      math(EXPR _res "${_res} + 10")
    elseif (NIBBLE STREQUAL "B")
      math(EXPR _res "${_res} + 11")
    elseif (NIBBLE STREQUAL "C")
      math(EXPR _res "${_res} + 12")
    elseif (NIBBLE STREQUAL "D")
      math(EXPR _res "${_res} + 13")
    elseif (NIBBLE STREQUAL "E")
      math(EXPR _res "${_res} + 14")
    elseif (NIBBLE STREQUAL "F")
      math(EXPR _res "${_res} + 15")
    else ()
      math(EXPR _res "${_res} + ${NIBBLE}")
    endif ()
    string(LENGTH "${HEX}" _strlen)
  endwhile ()
  set(${DEC} ${_res} PARENT_SCOPE)
 endfunction()
 # ClickHouse uses BoringSSL which is a fork of OpenSSL.
 # This populates CMAKE var OPENSSL_VERSION from the OPENSSL_VERSION_NUMBER defined
 # in contrib/boringssl/include/openssl/base.h. It also sets the CMAKE var OPENSSL_IS_BORING_SSL
 # if it's defined in the file. Both OPENSSL_VERSION and OPENSSL_IS_BORING_SSL variables will be
 # used to populate flags in the `system.build_options` table for more context on ssl version used.
 # This cmake script is adopted from FindOpenSSL cmake module and slightly modified for this use-case .
 if (EXISTS "${BORINGSSL_SOURCE_DIR}/include/openssl/base.h")
  file(STRINGS "${BORINGSSL_SOURCE_DIR}/include/openssl/base.h" openssl_version_str
          REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
  file(STRINGS "${BORINGSSL_SOURCE_DIR}/include/openssl/base.h" openssl_is_boringssl
          REGEX "^#[\t ]*define[\t ]+OPENSSL_IS_BORINGSSL.*")
  # Set to true if OPENSSL_IS_BORING_SSL is defined
  if (openssl_is_boringssl)
    set(OPENSSL_IS_BORING_SSL 1)
  endif ()
  # If openssl_version_str is defined extrapolate and set OPENSSL_VERSION
  if (openssl_version_str)
    # The version number is encoded as 0xMNNFFPPS: major minor fix patch status
    # The status gives if this is a developer or prerelease and is ignored here.
    # Major, minor, and fix directly translate into the version numbers shown in
    # the string. The patch field translates to the single character suffix that
    # indicates the bug fix state, which 00 -> nothing, 01 -> a, 02 -> b and so
    # on.
    string(REGEX REPLACE "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F]).*$"
            "\\1;\\2;\\3;\\4;\\5" OPENSSL_VERSION_LIST "${openssl_version_str}")
    list(GET OPENSSL_VERSION_LIST 0 OPENSSL_VERSION_MAJOR)
    list(GET OPENSSL_VERSION_LIST 1 OPENSSL_VERSION_MINOR)
    from_hex("${OPENSSL_VERSION_MINOR}" OPENSSL_VERSION_MINOR)
    list(GET OPENSSL_VERSION_LIST 2 OPENSSL_VERSION_FIX)
    from_hex("${OPENSSL_VERSION_FIX}" OPENSSL_VERSION_FIX)
    list(GET OPENSSL_VERSION_LIST 3 OPENSSL_VERSION_PATCH)
    if (NOT OPENSSL_VERSION_PATCH STREQUAL "00")
      from_hex("${OPENSSL_VERSION_PATCH}" _tmp)
      # 96 is the ASCII code of 'a' minus 1
      math(EXPR OPENSSL_VERSION_PATCH_ASCII "${_tmp} + 96")
      unset(_tmp)
      # Once anyone knows how OpenSSL would call the patch versions beyond 'z'
      # this should be updated to handle that, too. This has not happened yet
      # so it is simply ignored here for now.
      string(ASCII "${OPENSSL_VERSION_PATCH_ASCII}" OPENSSL_VERSION_PATCH_STRING)
    endif ()
    set(OPENSSL_VERSION "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}${OPENSSL_VERSION_PATCH_STRING}")
  else ()
    # Since OpenSSL 3.0.0, the new version format is MAJOR.MINOR.PATCH and
    # a new OPENSSL_VERSION_STR macro contains exactly that
    file(STRINGS "${BORINGSSL_SOURCE_DIR}/include/openssl/base.h" OPENSSL_VERSION_STR
            REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_STR[\t ]+\"([0-9])+\\.([0-9])+\\.([0-9])+\".*")
    string(REGEX REPLACE "^.*OPENSSL_VERSION_STR[\t ]+\"([0-9]+\\.[0-9]+\\.[0-9]+)\".*$"
            "\\1" OPENSSL_VERSION_STR "${OPENSSL_VERSION_STR}")
    set(OPENSSL_VERSION "${OPENSSL_VERSION_STR}")
    # Setting OPENSSL_VERSION_MAJOR OPENSSL_VERSION_MINOR and OPENSSL_VERSION_FIX
    string(REGEX MATCHALL "([0-9])+" OPENSSL_VERSION_NUMBER "${OPENSSL_VERSION}")
    list(POP_FRONT OPENSSL_VERSION_NUMBER
            OPENSSL_VERSION_MAJOR
            OPENSSL_VERSION_MINOR
            OPENSSL_VERSION_FIX)
    unset(OPENSSL_VERSION_NUMBER)
    unset(OPENSSL_VERSION_STR)
  endif ()
 endif ()
 # Set CMAKE variables so that they can be referenced properly from everywhere
 set(OPENSSL_VERSION "${OPENSSL_VERSION}" CACHE INTERNAL "")
 set(OPENSSL_IS_BORING_SSL "${OPENSSL_IS_BORING_SSL}" CACHE INTERNAL 0)
--- a/contrib/boringssl-cmake/crypto_test_data.cc
+++ b/contrib/boringssl-cmake/crypto_test_data.cc
--- a/contrib/boringssl-cmake/err_data.c
+++ b/contrib/boringssl-cmake/err_data.c
--- a/contrib/boringssl-cmake/ios-aarch64/crypto/chacha/chacha-armv8.S
+++ b/contrib/boringssl-cmake/ios-aarch64/crypto/chacha/chacha-armv8.S
@ -33,6 +33,7 @@ Lone:
 .align	5
 _ChaCha20_ctr32:
 	AARCH64_VALID_CALL_TARGET
 	cbz	x2,Labort
 #if __has_feature(hwaddress_sanitizer) && __clang_major__ >= 10
 	adrp	x5,:pg_hi21_nc:_OPENSSL_armcap_P
@ -46,6 +47,7 @@ _ChaCha20_ctr32:
 	b.ne	ChaCha20_neon
 Lshort:
 	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-96]!
 	add	x29,sp,#0
@ -258,6 +260,7 @@ Loop:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#96
 	AARCH64_VALIDATE_LINK_REGISTER
 Labort:
 	ret
@ -314,12 +317,14 @@ Loop_tail:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#96
 	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .align	5
 ChaCha20_neon:
 	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-96]!
 	add	x29,sp,#0
@ -700,6 +705,7 @@ Loop_neon:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#96
 	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 Ltail_neon:
@ -809,11 +815,13 @@ Ldone_neon:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#96
 	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .align	5
 ChaCha20_512_neon:
 	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-96]!
 	add	x29,sp,#0
@ -1977,6 +1985,7 @@ Ldone_512_neon:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#96
 	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 #endif  // !OPENSSL_NO_ASM
--- a/contrib/boringssl-cmake/ios-aarch64/crypto/fipsmodule/aesv8-armx64.S
+++ b/contrib/boringssl-cmake/ios-aarch64/crypto/fipsmodule/aesv8-armx64.S
@ -32,6 +32,8 @@ Lrcon:
 .align	5
 _aes_hw_set_encrypt_key:
 Lenc_key:
 	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	AARCH64_VALID_CALL_TARGET
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	mov	x3,#-1
@ -200,6 +202,7 @@ Lenc_key_abort:
 .align	5
 _aes_hw_set_decrypt_key:
 	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	bl	Lenc_key
@ -233,6 +236,7 @@ Loop_imc:
 	eor	x0,x0,x0		// return value
 Ldec_key_abort:
 	ldp	x29,x30,[sp],#16
 	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .globl	_aes_hw_encrypt
@ -240,6 +244,7 @@ Ldec_key_abort:
 .align	5
 _aes_hw_encrypt:
 	AARCH64_VALID_CALL_TARGET
 	ldr	w3,[x2,#240]
 	ld1	{v0.4s},[x2],#16
 	ld1	{v2.16b},[x0]
@ -270,6 +275,7 @@ Loop_enc:
 .align	5
 _aes_hw_decrypt:
 	AARCH64_VALID_CALL_TARGET
 	ldr	w3,[x2,#240]
 	ld1	{v0.4s},[x2],#16
 	ld1	{v2.16b},[x0]
@ -300,6 +306,8 @@ Loop_dec:
 .align	5
 _aes_hw_cbc_encrypt:
 	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	AARCH64_VALID_CALL_TARGET
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	subs	x2,x2,#16
@ -591,6 +599,8 @@ Lcbc_abort:
 .align	5
 _aes_hw_ctr32_encrypt_blocks:
 	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	AARCH64_VALID_CALL_TARGET
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	ldr	w5,[x3,#240]
--- a/contrib/boringssl-cmake/ios-aarch64/crypto/fipsmodule/armv8-mont.S
+++ b/contrib/boringssl-cmake/ios-aarch64/crypto/fipsmodule/armv8-mont.S
@ -12,6 +12,8 @@
 #if defined(BORINGSSL_PREFIX)
 #include <boringssl_prefix_symbols_asm.h>
 #endif
 #include <openssl/arm_arch.h>
 .text
 .globl	_bn_mul_mont
@ -19,6 +21,7 @@
 .align	5
 _bn_mul_mont:
 	AARCH64_SIGN_LINK_REGISTER
 	tst	x5,#7
 	b.eq	__bn_sqr8x_mont
 	tst	x5,#3
@ -216,11 +219,14 @@ Lcond_copy:
 	mov	x0,#1
 	ldp	x23,x24,[x29,#48]
 	ldr	x29,[sp],#64
 	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .align	5
 __bn_sqr8x_mont:
 	// Not adding AARCH64_SIGN_LINK_REGISTER here because __bn_sqr8x_mont is jumped to
 	// only from bn_mul_mont which has already signed the return address.
 	cmp	x1,x2
 	b.ne	__bn_mul4x_mont
 Lsqr8x_mont:
@ -974,11 +980,16 @@ Lsqr8x_done:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldr	x29,[sp],#128
 	// x30 is popped earlier
 	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .align	5
 __bn_mul4x_mont:
 	// Not adding AARCH64_SIGN_LINK_REGISTER here because __bn_mul4x_mont is jumped to
 	// only from bn_mul_mont or __bn_mul8x_mont which have already signed the
 	// return address.
 	stp	x29,x30,[sp,#-128]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
@ -1412,6 +1423,8 @@ Lmul4x_done:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldr	x29,[sp],#128
 	// x30 is popped earlier
 	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .byte	77,111,110,116,103,111,109,101,114,121,32,77,117,108,116,105,112,108,105,99,97,116,105,111,110,32,102,111,114,32,65,82,77,118,56,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
--- a/contrib/boringssl-cmake/ios-aarch64/crypto/fipsmodule/ghash-neon-armv8.S
+++ b/contrib/boringssl-cmake/ios-aarch64/crypto/fipsmodule/ghash-neon-armv8.S
@ -12,6 +12,8 @@
 #if defined(BORINGSSL_PREFIX)
 #include <boringssl_prefix_symbols_asm.h>
 #endif
 #include <openssl/arm_arch.h>
 .text
 .globl	_gcm_init_neon
@ -19,6 +21,7 @@
 .align	4
 _gcm_init_neon:
 	AARCH64_VALID_CALL_TARGET
 	// This function is adapted from gcm_init_v8. xC2 is t3.
 	ld1	{v17.2d}, [x1]			// load H
 	movi	v19.16b, #0xe1
@ -44,6 +47,7 @@ _gcm_init_neon:
 .align	4
 _gcm_gmult_neon:
 	AARCH64_VALID_CALL_TARGET
 	ld1	{v3.16b}, [x0]		// load Xi
 	ld1	{v5.1d}, [x1], #8		// load twisted H
 	ld1	{v6.1d}, [x1]
@ -63,6 +67,7 @@ _gcm_gmult_neon:
 .align	4
 _gcm_ghash_neon:
 	AARCH64_VALID_CALL_TARGET
 	ld1	{v0.16b}, [x0]		// load Xi
 	ld1	{v5.1d}, [x1], #8		// load twisted H
 	ld1	{v6.1d}, [x1]
--- a/contrib/boringssl-cmake/ios-aarch64/crypto/fipsmodule/ghashv8-armx64.S
+++ b/contrib/boringssl-cmake/ios-aarch64/crypto/fipsmodule/ghashv8-armx64.S
@ -21,6 +21,7 @@
 .align	4
 _gcm_init_v8:
 	AARCH64_VALID_CALL_TARGET
 	ld1	{v17.2d},[x1]		//load input H
 	movi	v19.16b,#0xe1
 	shl	v19.2d,v19.2d,#57		//0xc2.0
@ -72,6 +73,7 @@ _gcm_init_v8:
 .align	4
 _gcm_gmult_v8:
 	AARCH64_VALID_CALL_TARGET
 	ld1	{v17.2d},[x0]		//load Xi
 	movi	v19.16b,#0xe1
 	ld1	{v20.2d,v21.2d},[x1]	//load twisted H, ...
@ -114,6 +116,7 @@ _gcm_gmult_v8:
 .align	4
 _gcm_ghash_v8:
 	AARCH64_VALID_CALL_TARGET
 	ld1	{v0.2d},[x0]		//load [rotated] Xi
 						//"[rotated]" means that
 						//loaded value would have
--- a/contrib/boringssl-cmake/ios-aarch64/crypto/fipsmodule/sha1-armv8.S
+++ b/contrib/boringssl-cmake/ios-aarch64/crypto/fipsmodule/sha1-armv8.S
@ -22,6 +22,8 @@
 .align	6
 _sha1_block_data_order:
 	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	AARCH64_VALID_CALL_TARGET
 #if __has_feature(hwaddress_sanitizer) && __clang_major__ >= 10
 	adrp	x16,:pg_hi21_nc:_OPENSSL_armcap_P
 #else
@ -1089,6 +1091,8 @@ Loop:
 .align	6
 sha1_block_armv8:
 	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	AARCH64_VALID_CALL_TARGET
 Lv8_entry:
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
--- a/contrib/boringssl-cmake/ios-aarch64/crypto/fipsmodule/sha256-armv8.S
+++ b/contrib/boringssl-cmake/ios-aarch64/crypto/fipsmodule/sha256-armv8.S
@ -63,6 +63,7 @@
 .align	6
 _sha256_block_data_order:
 	AARCH64_VALID_CALL_TARGET
 #ifndef	__KERNEL__
 #if __has_feature(hwaddress_sanitizer) && __clang_major__ >= 10
 	adrp	x16,:pg_hi21_nc:_OPENSSL_armcap_P
@ -73,6 +74,7 @@ _sha256_block_data_order:
 	tst	w16,#ARMV8_SHA256
 	b.ne	Lv8_entry
 #endif
 	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-128]!
 	add	x29,sp,#0
@ -1033,6 +1035,7 @@ Loop_16_xx:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#128
 	AARCH64_VALIDATE_LINK_REGISTER
 	ret
@ -1067,6 +1070,7 @@ LK256:
 .align	6
 sha256_block_armv8:
 Lv8_entry:
 	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
--- a/contrib/boringssl-cmake/ios-aarch64/crypto/fipsmodule/sha512-armv8.S
+++ b/contrib/boringssl-cmake/ios-aarch64/crypto/fipsmodule/sha512-armv8.S
@ -63,6 +63,7 @@
 .align	6
 _sha512_block_data_order:
 	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-128]!
 	add	x29,sp,#0
@ -1023,6 +1024,7 @@ Loop_16_xx:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#128
 	AARCH64_VALIDATE_LINK_REGISTER
 	ret
--- a/contrib/boringssl-cmake/ios-aarch64/crypto/fipsmodule/vpaes-armv8.S
+++ b/contrib/boringssl-cmake/ios-aarch64/crypto/fipsmodule/vpaes-armv8.S
@ -12,6 +12,8 @@
 #if defined(BORINGSSL_PREFIX)
 #include <boringssl_prefix_symbols_asm.h>
 #endif
 #include <openssl/arm_arch.h>
 .section	__TEXT,__const
@ -214,6 +216,7 @@ Lenc_entry:
 .align	4
 _vpaes_encrypt:
 	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
@ -223,6 +226,7 @@ _vpaes_encrypt:
 	st1	{v0.16b}, [x1]
 	ldp	x29,x30,[sp],#16
 	AARCH64_VALIDATE_LINK_REGISTER
 	ret
@ -451,6 +455,7 @@ Ldec_entry:
 .align	4
 _vpaes_decrypt:
 	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
@ -460,6 +465,7 @@ _vpaes_decrypt:
 	st1	{v0.16b}, [x1]
 	ldp	x29,x30,[sp],#16
 	AARCH64_VALIDATE_LINK_REGISTER
 	ret
@ -629,6 +635,7 @@ _vpaes_key_preheat:
 .align	4
 _vpaes_schedule_core:
 	AARCH64_SIGN_LINK_REGISTER
 	stp	x29, x30, [sp,#-16]!
 	add	x29,sp,#0
@ -798,6 +805,7 @@ Lschedule_mangle_last_dec:
 	eor	v6.16b, v6.16b, v6.16b		// vpxor	%xmm6,	%xmm6,	%xmm6
 	eor	v7.16b, v7.16b, v7.16b		// vpxor	%xmm7,	%xmm7,	%xmm7
 	ldp	x29, x30, [sp],#16
 	AARCH64_VALIDATE_LINK_REGISTER
 	ret
@ -1011,6 +1019,7 @@ Lschedule_mangle_both:
 .align	4
 _vpaes_set_encrypt_key:
 	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	stp	d8,d9,[sp,#-16]!	// ABI spec says so
@ -1026,6 +1035,7 @@ _vpaes_set_encrypt_key:
 	ldp	d8,d9,[sp],#16
 	ldp	x29,x30,[sp],#16
 	AARCH64_VALIDATE_LINK_REGISTER
 	ret
@ -1034,6 +1044,7 @@ _vpaes_set_encrypt_key:
 .align	4
 _vpaes_set_decrypt_key:
 	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	stp	d8,d9,[sp,#-16]!	// ABI spec says so
@ -1053,6 +1064,7 @@ _vpaes_set_decrypt_key:
 	ldp	d8,d9,[sp],#16
 	ldp	x29,x30,[sp],#16
 	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .globl	_vpaes_cbc_encrypt
@ -1060,6 +1072,7 @@ _vpaes_set_decrypt_key:
 .align	4
 _vpaes_cbc_encrypt:
 	AARCH64_SIGN_LINK_REGISTER
 	cbz	x2, Lcbc_abort
 	cmp	w5, #0			// check direction
 	b.eq	vpaes_cbc_decrypt
@ -1086,6 +1099,7 @@ Lcbc_enc_loop:
 	st1	{v0.16b}, [x4]	// write ivec
 	ldp	x29,x30,[sp],#16
 	AARCH64_VALIDATE_LINK_REGISTER
 Lcbc_abort:
 	ret
@ -1093,6 +1107,8 @@ Lcbc_abort:
 .align	4
 vpaes_cbc_decrypt:
 	// Not adding AARCH64_SIGN_LINK_REGISTER here because vpaes_cbc_decrypt is jumped to
 	// only from vpaes_cbc_encrypt which has already signed the return address.
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	stp	d8,d9,[sp,#-16]!	// ABI spec says so
@ -1134,6 +1150,7 @@ Lcbc_dec_done:
 	ldp	d10,d11,[sp],#16
 	ldp	d8,d9,[sp],#16
 	ldp	x29,x30,[sp],#16
 	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .globl	_vpaes_ctr32_encrypt_blocks
@ -1141,6 +1158,7 @@ Lcbc_dec_done:
 .align	4
 _vpaes_ctr32_encrypt_blocks:
 	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	stp	d8,d9,[sp,#-16]!	// ABI spec says so
@ -1208,6 +1226,7 @@ Lctr32_done:
 	ldp	d10,d11,[sp],#16
 	ldp	d8,d9,[sp],#16
 	ldp	x29,x30,[sp],#16
 	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 #endif  // !OPENSSL_NO_ASM
--- a/contrib/boringssl-cmake/ios-aarch64/crypto/test/trampoline-armv8.S
+++ b/contrib/boringssl-cmake/ios-aarch64/crypto/test/trampoline-armv8.S
@ -12,6 +12,8 @@
 #if defined(BORINGSSL_PREFIX)
 #include <boringssl_prefix_symbols_asm.h>
 #endif
 #include <openssl/arm_arch.h>
 .text
 // abi_test_trampoline loads callee-saved registers from |state|, calls |func|
@ -26,6 +28,7 @@
 .align	4
 _abi_test_trampoline:
 Labi_test_trampoline_begin:
 	AARCH64_SIGN_LINK_REGISTER
 	// Stack layout (low to high addresses)
 	//   x29,x30 (16 bytes)
 	//    d8-d15 (64 bytes)
@ -128,6 +131,7 @@ Lx29_ok:
 	ldp	x27, x28, [sp, #144]
 	ldp	x29, x30, [sp], #176
 	AARCH64_VALIDATE_LINK_REGISTER
 	ret
@ -135,6 +139,7 @@ Lx29_ok:
 .private_extern	_abi_test_clobber_x0
 .align	4
 _abi_test_clobber_x0:
 	AARCH64_VALID_CALL_TARGET
 	mov	x0, xzr
 	ret
@ -143,6 +148,7 @@ _abi_test_clobber_x0:
 .private_extern	_abi_test_clobber_x1
 .align	4
 _abi_test_clobber_x1:
 	AARCH64_VALID_CALL_TARGET
 	mov	x1, xzr
 	ret
@ -151,6 +157,7 @@ _abi_test_clobber_x1:
 .private_extern	_abi_test_clobber_x2
 .align	4
 _abi_test_clobber_x2:
 	AARCH64_VALID_CALL_TARGET
 	mov	x2, xzr
 	ret
@ -159,6 +166,7 @@ _abi_test_clobber_x2:
 .private_extern	_abi_test_clobber_x3
 .align	4
 _abi_test_clobber_x3:
 	AARCH64_VALID_CALL_TARGET
 	mov	x3, xzr
 	ret
@ -167,6 +175,7 @@ _abi_test_clobber_x3:
 .private_extern	_abi_test_clobber_x4
 .align	4
 _abi_test_clobber_x4:
 	AARCH64_VALID_CALL_TARGET
 	mov	x4, xzr
 	ret
@ -175,6 +184,7 @@ _abi_test_clobber_x4:
 .private_extern	_abi_test_clobber_x5
 .align	4
 _abi_test_clobber_x5:
 	AARCH64_VALID_CALL_TARGET
 	mov	x5, xzr
 	ret
@ -183,6 +193,7 @@ _abi_test_clobber_x5:
 .private_extern	_abi_test_clobber_x6
 .align	4
 _abi_test_clobber_x6:
 	AARCH64_VALID_CALL_TARGET
 	mov	x6, xzr
 	ret
@ -191,6 +202,7 @@ _abi_test_clobber_x6:
 .private_extern	_abi_test_clobber_x7
 .align	4
 _abi_test_clobber_x7:
 	AARCH64_VALID_CALL_TARGET
 	mov	x7, xzr
 	ret
@ -199,6 +211,7 @@ _abi_test_clobber_x7:
 .private_extern	_abi_test_clobber_x8
 .align	4
 _abi_test_clobber_x8:
 	AARCH64_VALID_CALL_TARGET
 	mov	x8, xzr
 	ret
@ -207,6 +220,7 @@ _abi_test_clobber_x8:
 .private_extern	_abi_test_clobber_x9
 .align	4
 _abi_test_clobber_x9:
 	AARCH64_VALID_CALL_TARGET
 	mov	x9, xzr
 	ret
@ -215,6 +229,7 @@ _abi_test_clobber_x9:
 .private_extern	_abi_test_clobber_x10
 .align	4
 _abi_test_clobber_x10:
 	AARCH64_VALID_CALL_TARGET
 	mov	x10, xzr
 	ret
@ -223,6 +238,7 @@ _abi_test_clobber_x10:
 .private_extern	_abi_test_clobber_x11
 .align	4
 _abi_test_clobber_x11:
 	AARCH64_VALID_CALL_TARGET
 	mov	x11, xzr
 	ret
@ -231,6 +247,7 @@ _abi_test_clobber_x11:
 .private_extern	_abi_test_clobber_x12
 .align	4
 _abi_test_clobber_x12:
 	AARCH64_VALID_CALL_TARGET
 	mov	x12, xzr
 	ret
@ -239,6 +256,7 @@ _abi_test_clobber_x12:
 .private_extern	_abi_test_clobber_x13
 .align	4
 _abi_test_clobber_x13:
 	AARCH64_VALID_CALL_TARGET
 	mov	x13, xzr
 	ret
@ -247,6 +265,7 @@ _abi_test_clobber_x13:
 .private_extern	_abi_test_clobber_x14
 .align	4
 _abi_test_clobber_x14:
 	AARCH64_VALID_CALL_TARGET
 	mov	x14, xzr
 	ret
@ -255,6 +274,7 @@ _abi_test_clobber_x14:
 .private_extern	_abi_test_clobber_x15
 .align	4
 _abi_test_clobber_x15:
 	AARCH64_VALID_CALL_TARGET
 	mov	x15, xzr
 	ret
@ -263,6 +283,7 @@ _abi_test_clobber_x15:
 .private_extern	_abi_test_clobber_x16
 .align	4
 _abi_test_clobber_x16:
 	AARCH64_VALID_CALL_TARGET
 	mov	x16, xzr
 	ret
@ -271,6 +292,7 @@ _abi_test_clobber_x16:
 .private_extern	_abi_test_clobber_x17
 .align	4
 _abi_test_clobber_x17:
 	AARCH64_VALID_CALL_TARGET
 	mov	x17, xzr
 	ret
@ -279,6 +301,7 @@ _abi_test_clobber_x17:
 .private_extern	_abi_test_clobber_x19
 .align	4
 _abi_test_clobber_x19:
 	AARCH64_VALID_CALL_TARGET
 	mov	x19, xzr
 	ret
@ -287,6 +310,7 @@ _abi_test_clobber_x19:
 .private_extern	_abi_test_clobber_x20
 .align	4
 _abi_test_clobber_x20:
 	AARCH64_VALID_CALL_TARGET
 	mov	x20, xzr
 	ret
@ -295,6 +319,7 @@ _abi_test_clobber_x20:
 .private_extern	_abi_test_clobber_x21
 .align	4
 _abi_test_clobber_x21:
 	AARCH64_VALID_CALL_TARGET
 	mov	x21, xzr
 	ret
@ -303,6 +328,7 @@ _abi_test_clobber_x21:
 .private_extern	_abi_test_clobber_x22
 .align	4
 _abi_test_clobber_x22:
 	AARCH64_VALID_CALL_TARGET
 	mov	x22, xzr
 	ret
@ -311,6 +337,7 @@ _abi_test_clobber_x22:
 .private_extern	_abi_test_clobber_x23
 .align	4
 _abi_test_clobber_x23:
 	AARCH64_VALID_CALL_TARGET
 	mov	x23, xzr
 	ret
@ -319,6 +346,7 @@ _abi_test_clobber_x23:
 .private_extern	_abi_test_clobber_x24
 .align	4
 _abi_test_clobber_x24:
 	AARCH64_VALID_CALL_TARGET
 	mov	x24, xzr
 	ret
@ -327,6 +355,7 @@ _abi_test_clobber_x24:
 .private_extern	_abi_test_clobber_x25
 .align	4
 _abi_test_clobber_x25:
 	AARCH64_VALID_CALL_TARGET
 	mov	x25, xzr
 	ret
@ -335,6 +364,7 @@ _abi_test_clobber_x25:
 .private_extern	_abi_test_clobber_x26
 .align	4
 _abi_test_clobber_x26:
 	AARCH64_VALID_CALL_TARGET
 	mov	x26, xzr
 	ret
@ -343,6 +373,7 @@ _abi_test_clobber_x26:
 .private_extern	_abi_test_clobber_x27
 .align	4
 _abi_test_clobber_x27:
 	AARCH64_VALID_CALL_TARGET
 	mov	x27, xzr
 	ret
@ -351,6 +382,7 @@ _abi_test_clobber_x27:
 .private_extern	_abi_test_clobber_x28
 .align	4
 _abi_test_clobber_x28:
 	AARCH64_VALID_CALL_TARGET
 	mov	x28, xzr
 	ret
@ -359,6 +391,7 @@ _abi_test_clobber_x28:
 .private_extern	_abi_test_clobber_x29
 .align	4
 _abi_test_clobber_x29:
 	AARCH64_VALID_CALL_TARGET
 	mov	x29, xzr
 	ret
@ -367,6 +400,7 @@ _abi_test_clobber_x29:
 .private_extern	_abi_test_clobber_d0
 .align	4
 _abi_test_clobber_d0:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d0, xzr
 	ret
@ -375,6 +409,7 @@ _abi_test_clobber_d0:
 .private_extern	_abi_test_clobber_d1
 .align	4
 _abi_test_clobber_d1:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d1, xzr
 	ret
@ -383,6 +418,7 @@ _abi_test_clobber_d1:
 .private_extern	_abi_test_clobber_d2
 .align	4
 _abi_test_clobber_d2:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d2, xzr
 	ret
@ -391,6 +427,7 @@ _abi_test_clobber_d2:
 .private_extern	_abi_test_clobber_d3
 .align	4
 _abi_test_clobber_d3:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d3, xzr
 	ret
@ -399,6 +436,7 @@ _abi_test_clobber_d3:
 .private_extern	_abi_test_clobber_d4
 .align	4
 _abi_test_clobber_d4:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d4, xzr
 	ret
@ -407,6 +445,7 @@ _abi_test_clobber_d4:
 .private_extern	_abi_test_clobber_d5
 .align	4
 _abi_test_clobber_d5:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d5, xzr
 	ret
@ -415,6 +454,7 @@ _abi_test_clobber_d5:
 .private_extern	_abi_test_clobber_d6
 .align	4
 _abi_test_clobber_d6:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d6, xzr
 	ret
@ -423,6 +463,7 @@ _abi_test_clobber_d6:
 .private_extern	_abi_test_clobber_d7
 .align	4
 _abi_test_clobber_d7:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d7, xzr
 	ret
@ -431,6 +472,7 @@ _abi_test_clobber_d7:
 .private_extern	_abi_test_clobber_d8
 .align	4
 _abi_test_clobber_d8:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d8, xzr
 	ret
@ -439,6 +481,7 @@ _abi_test_clobber_d8:
 .private_extern	_abi_test_clobber_d9
 .align	4
 _abi_test_clobber_d9:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d9, xzr
 	ret
@ -447,6 +490,7 @@ _abi_test_clobber_d9:
 .private_extern	_abi_test_clobber_d10
 .align	4
 _abi_test_clobber_d10:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d10, xzr
 	ret
@ -455,6 +499,7 @@ _abi_test_clobber_d10:
 .private_extern	_abi_test_clobber_d11
 .align	4
 _abi_test_clobber_d11:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d11, xzr
 	ret
@ -463,6 +508,7 @@ _abi_test_clobber_d11:
 .private_extern	_abi_test_clobber_d12
 .align	4
 _abi_test_clobber_d12:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d12, xzr
 	ret
@ -471,6 +517,7 @@ _abi_test_clobber_d12:
 .private_extern	_abi_test_clobber_d13
 .align	4
 _abi_test_clobber_d13:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d13, xzr
 	ret
@ -479,6 +526,7 @@ _abi_test_clobber_d13:
 .private_extern	_abi_test_clobber_d14
 .align	4
 _abi_test_clobber_d14:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d14, xzr
 	ret
@ -487,6 +535,7 @@ _abi_test_clobber_d14:
 .private_extern	_abi_test_clobber_d15
 .align	4
 _abi_test_clobber_d15:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d15, xzr
 	ret
@ -495,6 +544,7 @@ _abi_test_clobber_d15:
 .private_extern	_abi_test_clobber_d16
 .align	4
 _abi_test_clobber_d16:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d16, xzr
 	ret
@ -503,6 +553,7 @@ _abi_test_clobber_d16:
 .private_extern	_abi_test_clobber_d17
 .align	4
 _abi_test_clobber_d17:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d17, xzr
 	ret
@ -511,6 +562,7 @@ _abi_test_clobber_d17:
 .private_extern	_abi_test_clobber_d18
 .align	4
 _abi_test_clobber_d18:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d18, xzr
 	ret
@ -519,6 +571,7 @@ _abi_test_clobber_d18:
 .private_extern	_abi_test_clobber_d19
 .align	4
 _abi_test_clobber_d19:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d19, xzr
 	ret
@ -527,6 +580,7 @@ _abi_test_clobber_d19:
 .private_extern	_abi_test_clobber_d20
 .align	4
 _abi_test_clobber_d20:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d20, xzr
 	ret
@ -535,6 +589,7 @@ _abi_test_clobber_d20:
 .private_extern	_abi_test_clobber_d21
 .align	4
 _abi_test_clobber_d21:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d21, xzr
 	ret
@ -543,6 +598,7 @@ _abi_test_clobber_d21:
 .private_extern	_abi_test_clobber_d22
 .align	4
 _abi_test_clobber_d22:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d22, xzr
 	ret
@ -551,6 +607,7 @@ _abi_test_clobber_d22:
 .private_extern	_abi_test_clobber_d23
 .align	4
 _abi_test_clobber_d23:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d23, xzr
 	ret
@ -559,6 +616,7 @@ _abi_test_clobber_d23:
 .private_extern	_abi_test_clobber_d24
 .align	4
 _abi_test_clobber_d24:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d24, xzr
 	ret
@ -567,6 +625,7 @@ _abi_test_clobber_d24:
 .private_extern	_abi_test_clobber_d25
 .align	4
 _abi_test_clobber_d25:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d25, xzr
 	ret
@ -575,6 +634,7 @@ _abi_test_clobber_d25:
 .private_extern	_abi_test_clobber_d26
 .align	4
 _abi_test_clobber_d26:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d26, xzr
 	ret
@ -583,6 +643,7 @@ _abi_test_clobber_d26:
 .private_extern	_abi_test_clobber_d27
 .align	4
 _abi_test_clobber_d27:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d27, xzr
 	ret
@ -591,6 +652,7 @@ _abi_test_clobber_d27:
 .private_extern	_abi_test_clobber_d28
 .align	4
 _abi_test_clobber_d28:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d28, xzr
 	ret
@ -599,6 +661,7 @@ _abi_test_clobber_d28:
 .private_extern	_abi_test_clobber_d29
 .align	4
 _abi_test_clobber_d29:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d29, xzr
 	ret
@ -607,6 +670,7 @@ _abi_test_clobber_d29:
 .private_extern	_abi_test_clobber_d30
 .align	4
 _abi_test_clobber_d30:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d30, xzr
 	ret
@ -615,6 +679,7 @@ _abi_test_clobber_d30:
 .private_extern	_abi_test_clobber_d31
 .align	4
 _abi_test_clobber_d31:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d31, xzr
 	ret
@ -623,6 +688,7 @@ _abi_test_clobber_d31:
 .private_extern	_abi_test_clobber_v8_upper
 .align	4
 _abi_test_clobber_v8_upper:
 	AARCH64_VALID_CALL_TARGET
 	fmov	v8.d[1], xzr
 	ret
@ -631,6 +697,7 @@ _abi_test_clobber_v8_upper:
 .private_extern	_abi_test_clobber_v9_upper
 .align	4
 _abi_test_clobber_v9_upper:
 	AARCH64_VALID_CALL_TARGET
 	fmov	v9.d[1], xzr
 	ret
@ -639,6 +706,7 @@ _abi_test_clobber_v9_upper:
 .private_extern	_abi_test_clobber_v10_upper
 .align	4
 _abi_test_clobber_v10_upper:
 	AARCH64_VALID_CALL_TARGET
 	fmov	v10.d[1], xzr
 	ret
@ -647,6 +715,7 @@ _abi_test_clobber_v10_upper:
 .private_extern	_abi_test_clobber_v11_upper
 .align	4
 _abi_test_clobber_v11_upper:
 	AARCH64_VALID_CALL_TARGET
 	fmov	v11.d[1], xzr
 	ret
@ -655,6 +724,7 @@ _abi_test_clobber_v11_upper:
 .private_extern	_abi_test_clobber_v12_upper
 .align	4
 _abi_test_clobber_v12_upper:
 	AARCH64_VALID_CALL_TARGET
 	fmov	v12.d[1], xzr
 	ret
@ -663,6 +733,7 @@ _abi_test_clobber_v12_upper:
 .private_extern	_abi_test_clobber_v13_upper
 .align	4
 _abi_test_clobber_v13_upper:
 	AARCH64_VALID_CALL_TARGET
 	fmov	v13.d[1], xzr
 	ret
@ -671,6 +742,7 @@ _abi_test_clobber_v13_upper:
 .private_extern	_abi_test_clobber_v14_upper
 .align	4
 _abi_test_clobber_v14_upper:
 	AARCH64_VALID_CALL_TARGET
 	fmov	v14.d[1], xzr
 	ret
@ -679,6 +751,7 @@ _abi_test_clobber_v14_upper:
 .private_extern	_abi_test_clobber_v15_upper
 .align	4
 _abi_test_clobber_v15_upper:
 	AARCH64_VALID_CALL_TARGET
 	fmov	v15.d[1], xzr
 	ret
--- a/contrib/boringssl-cmake/ios-aarch64/crypto/third_party/sike/asm/fp-armv8.S
+++ b/contrib/boringssl-cmake/ios-aarch64/crypto/third_party/sike/asm/fp-armv8.S
@ -1,996 +0,0 @@
 // This file is generated from a similarly-named Perl script in the BoringSSL
 // source tree. Do not edit by hand.
 #if !defined(__has_feature)
 #define __has_feature(x) 0
 #endif
 #if __has_feature(memory_sanitizer) && !defined(OPENSSL_NO_ASM)
 #define OPENSSL_NO_ASM
 #endif
 #if !defined(OPENSSL_NO_ASM)
 #if defined(BORINGSSL_PREFIX)
 #include <boringssl_prefix_symbols_asm.h>
 #endif
 .section	__TEXT,__const
 # p434 x 2
 Lp434x2:
 .quad	0xFFFFFFFFFFFFFFFE, 0xFFFFFFFFFFFFFFFF
 .quad	0xFB82ECF5C5FFFFFF, 0xF78CB8F062B15D47
 .quad	0xD9F8BFAD038A40AC, 0x0004683E4E2EE688
 # p434 + 1
 Lp434p1:
 .quad	0xFDC1767AE3000000, 0x7BC65C783158AEA3
 .quad	0x6CFC5FD681C52056, 0x0002341F27177344
 .text
 .globl	_sike_mpmul
 .private_extern	_sike_mpmul
 .align	4
 _sike_mpmul:
 	stp	x29, x30, [sp,#-96]!
 	add	x29, sp, #0
 	stp	x19, x20, [sp,#16]
 	stp	x21, x22, [sp,#32]
 	stp	x23, x24, [sp,#48]
 	stp	x25, x26, [sp,#64]
 	stp	x27, x28, [sp,#80]
 	ldp	x3,  x4, [x0]
 	ldp	x5,  x6, [x0,#16]
 	ldp	x7,  x8, [x0,#32]
 	ldr	x9,      [x0,#48]
 	ldp	x10, x11, [x1,#0]
 	ldp	x12, x13, [x1,#16]
 	ldp	x14, x15, [x1,#32]
 	ldr	x16,      [x1,#48]
        // x3-x7 <- AH + AL, x7 <- carry
 	adds	x3, x3, x7
 	adcs	x4, x4, x8
 	adcs	x5, x5, x9
 	adcs	x6, x6, xzr
 	adc	x7, xzr, xzr
        // x10-x13 <- BH + BL, x8 <- carry
 	adds	x10, x10, x14
 	adcs	x11, x11, x15
 	adcs	x12, x12, x16
 	adcs	x13, x13, xzr
 	adc	x8, xzr, xzr
        // x9 <- combined carry
 	and	x9, x7, x8
        // x7-x8 <- mask
 	sub	x7, xzr, x7
 	sub	x8, xzr, x8
        // x15-x19 <- masked (BH + BL)
 	and	x14, x10, x7
 	and	x15, x11, x7
 	and	x16, x12, x7
 	and	x17, x13, x7
        // x20-x23 <- masked (AH + AL)
 	and	x20, x3, x8
 	and	x21, x4, x8
 	and	x22, x5, x8
 	and	x23, x6, x8
        // x15-x19, x7 <- masked (AH+AL) + masked (BH+BL), step 1
 	adds	x14, x14, x20
 	adcs	x15, x15, x21
 	adcs	x16, x16, x22
 	adcs	x17, x17, x23
 	adc	x7, x9, xzr
        // x8-x9,x19,x20-x24 <- (AH+AL) x (BH+BL), low part
 	stp	x3, x4, [x2,#0]
                // A0-A1 <- AH + AL, T0 <- mask
 	adds	x3, x3, x5
 	adcs	x4, x4, x6
 	adc	x25, xzr, xzr
        // C6, T1 <- BH + BL, C7 <- mask
 	adds	x23, x10, x12
 	adcs	x26, x11, x13
 	adc	x24, xzr, xzr
        // C0-C1 <- masked (BH + BL)
 	sub	x19, xzr, x25
 	sub	x20, xzr, x24
 	and	x8, x23, x19
 	and	x9, x26, x19
        // C4-C5 <- masked (AH + AL), T0 <- combined carry
 	and	x21, x3, x20
 	and	x22, x4, x20
 	mul	x19, x3, x23
 	mul	x20, x3, x26
 	and	x25, x25, x24
        // C0-C1, T0 <- (AH+AL) x (BH+BL), part 1
 	adds	x8, x21, x8
 	umulh	x21, x3, x26
 	adcs	x9, x22, x9
 	umulh	x22, x3, x23
 	adc	x25, x25, xzr
        // C2-C5 <- (AH+AL) x (BH+BL), low part
 	mul	x3, x4, x23
 	umulh	x23, x4, x23
 	adds	x20, x20, x22
 	adc	x21, x21, xzr
 	mul	x24, x4, x26
 	umulh	x26, x4, x26
 	adds	x20, x20, x3
 	adcs	x21, x21, x23
 	adc	x22, xzr, xzr
 	adds	x21, x21, x24
 	adc	x22, x22, x26
 	ldp	x3, x4, [x2,#0]
        // C2-C5, T0 <- (AH+AL) x (BH+BL), final part
 	adds	x21, x8, x21
 	umulh	x24, x3, x10
 	umulh	x26, x3, x11
 	adcs	x22, x9, x22
 	mul	x8, x3, x10
 	mul	x9, x3, x11
 	adc	x25, x25, xzr
        // C0-C1, T1, C7 <- AL x BL
 	mul	x3, x4, x10
 	umulh	x10, x4, x10
 	adds	x9, x9, x24
 	adc	x26, x26, xzr
 	mul	x23, x4, x11
 	umulh	x11, x4, x11
 	adds	x9, x9, x3
 	adcs	x26, x26, x10
 	adc	x24, xzr, xzr
 	adds	x26, x26, x23
 	adc	x24, x24, x11
        // C2-C5, T0 <- (AH+AL) x (BH+BL) - ALxBL
 	mul	x3, x5, x12
 	umulh	x10, x5, x12
 	subs	x19, x19, x8
 	sbcs	x20, x20, x9
 	sbcs	x21, x21, x26
 	mul	x4, x5, x13
 	umulh	x23, x5, x13
 	sbcs	x22, x22, x24
 	sbc	x25, x25, xzr
        // A0, A1, C6, B0 <- AH x BH
 	mul	x5, x6, x12
 	umulh	x12, x6, x12
 	adds	x4, x4, x10
 	adc	x23, x23, xzr
 	mul	x11, x6, x13
 	umulh	x13, x6, x13
 	adds	x4, x4, x5
 	adcs	x23, x23, x12
 	adc	x10, xzr, xzr
 	adds	x23, x23, x11
 	adc	x10, x10, x13
        // C2-C5, T0 <- (AH+AL) x (BH+BL) - ALxBL - AHxBH
 	subs	x19, x19, x3
 	sbcs	x20, x20, x4
 	sbcs	x21, x21, x23
 	sbcs	x22, x22, x10
 	sbc	x25, x25, xzr
 	adds	x19, x19, x26
 	adcs	x20, x20, x24
 	adcs	x21, x21, x3
 	adcs	x22, x22, x4
 	adcs	x23, x25, x23
 	adc	x24, x10, xzr
        // x15-x19, x7 <- (AH+AL) x (BH+BL), final step
 	adds	x14, x14, x21
 	adcs	x15, x15, x22
 	adcs	x16, x16, x23
 	adcs	x17, x17, x24
 	adc	x7, x7, xzr
        // Load AL
 	ldp	x3, x4, [x0]
 	ldp	x5, x6, [x0,#16]
        // Load BL
 	ldp	x10, x11, [x1,#0]
 	ldp	x12, x13, [x1,#16]
        // Temporarily store x8 in x2
 	stp	x8, x9, [x2,#0]
        // x21-x28 <- AL x BL
                // A0-A1 <- AH + AL, T0 <- mask
 	adds	x3, x3, x5
 	adcs	x4, x4, x6
 	adc	x8, xzr, xzr
        // C6, T1 <- BH + BL, C7 <- mask
 	adds	x27, x10, x12
 	adcs	x9, x11, x13
 	adc	x28, xzr, xzr
        // C0-C1 <- masked (BH + BL)
 	sub	x23, xzr, x8
 	sub	x24, xzr, x28
 	and	x21, x27, x23
 	and	x22, x9, x23
        // C4-C5 <- masked (AH + AL), T0 <- combined carry
 	and	x25, x3, x24
 	and	x26, x4, x24
 	mul	x23, x3, x27
 	mul	x24, x3, x9
 	and	x8, x8, x28
        // C0-C1, T0 <- (AH+AL) x (BH+BL), part 1
 	adds	x21, x25, x21
 	umulh	x25, x3, x9
 	adcs	x22, x26, x22
 	umulh	x26, x3, x27
 	adc	x8, x8, xzr
        // C2-C5 <- (AH+AL) x (BH+BL), low part
 	mul	x3, x4, x27
 	umulh	x27, x4, x27
 	adds	x24, x24, x26
 	adc	x25, x25, xzr
 	mul	x28, x4, x9
 	umulh	x9, x4, x9
 	adds	x24, x24, x3
 	adcs	x25, x25, x27
 	adc	x26, xzr, xzr
 	adds	x25, x25, x28
 	adc	x26, x26, x9
 	ldp	x3, x4, [x0,#0]
        // C2-C5, T0 <- (AH+AL) x (BH+BL), final part
 	adds	x25, x21, x25
 	umulh	x28, x3, x10
 	umulh	x9, x3, x11
 	adcs	x26, x22, x26
 	mul	x21, x3, x10
 	mul	x22, x3, x11
 	adc	x8, x8, xzr
        // C0-C1, T1, C7 <- AL x BL
 	mul	x3, x4, x10
 	umulh	x10, x4, x10
 	adds	x22, x22, x28
 	adc	x9, x9, xzr
 	mul	x27, x4, x11
 	umulh	x11, x4, x11
 	adds	x22, x22, x3
 	adcs	x9, x9, x10
 	adc	x28, xzr, xzr
 	adds	x9, x9, x27
 	adc	x28, x28, x11
        // C2-C5, T0 <- (AH+AL) x (BH+BL) - ALxBL
 	mul	x3, x5, x12
 	umulh	x10, x5, x12
 	subs	x23, x23, x21
 	sbcs	x24, x24, x22
 	sbcs	x25, x25, x9
 	mul	x4, x5, x13
 	umulh	x27, x5, x13
 	sbcs	x26, x26, x28
 	sbc	x8, x8, xzr
        // A0, A1, C6, B0 <- AH x BH
 	mul	x5, x6, x12
 	umulh	x12, x6, x12
 	adds	x4, x4, x10
 	adc	x27, x27, xzr
 	mul	x11, x6, x13
 	umulh	x13, x6, x13
 	adds	x4, x4, x5
 	adcs	x27, x27, x12
 	adc	x10, xzr, xzr
 	adds	x27, x27, x11
 	adc	x10, x10, x13
        // C2-C5, T0 <- (AH+AL) x (BH+BL) - ALxBL - AHxBH
 	subs	x23, x23, x3
 	sbcs	x24, x24, x4
 	sbcs	x25, x25, x27
 	sbcs	x26, x26, x10
 	sbc	x8, x8, xzr
 	adds	x23, x23, x9
 	adcs	x24, x24, x28
 	adcs	x25, x25, x3
 	adcs	x26, x26, x4
 	adcs	x27, x8, x27
 	adc	x28, x10, xzr
        // Restore x8
 	ldp	x8, x9, [x2,#0]
        // x8-x10,x20,x15-x17,x19 <- maskd (AH+AL) x (BH+BL) - ALxBL
 	subs	x8, x8, x21
 	sbcs	x9, x9, x22
 	sbcs	x19, x19, x23
 	sbcs	x20, x20, x24
 	sbcs	x14, x14, x25
 	sbcs	x15, x15, x26
 	sbcs	x16, x16, x27
 	sbcs	x17, x17, x28
 	sbc	x7, x7, xzr
        // Store ALxBL, low
 	stp	x21, x22, [x2]
 	stp	x23, x24, [x2,#16]
        // Load AH
 	ldp	x3, x4, [x0,#32]
 	ldr	x5,     [x0,#48]
        // Load BH
 	ldp	x10, x11, [x1,#32]
 	ldr	x12,      [x1,#48]
 	adds	x8,  x8, x25
 	adcs	x9,  x9, x26
 	adcs	x19, x19, x27
 	adcs	x20, x20, x28
 	adc	x1, xzr, xzr
 	add	x0, x0, #32
        // Temporarily store x8,x9 in x2
 	stp	x8,x9, [x2,#32]
        // x21-x28 <- AH x BH
        // A0 * B0
 	mul	x21, x3, x10  // C0
 	umulh	x24, x3, x10
        // A0 * B1
 	mul	x22, x3, x11
 	umulh	x23, x3, x11
        // A1 * B0
 	mul	x8, x4, x10
 	umulh	x9, x4, x10
 	adds	x22, x22, x24
 	adc	x23, x23, xzr
        // A0 * B2
 	mul	x27, x3, x12
 	umulh	x28, x3, x12
 	adds	x22, x22, x8  // C1
 	adcs	x23, x23, x9
 	adc	x24, xzr, xzr
        // A2 * B0
 	mul	x8, x5, x10
 	umulh	x25, x5, x10
 	adds	x23, x23, x27
 	adcs	x24, x24, x25
 	adc	x25, xzr, xzr
        // A1 * B1
 	mul	x27, x4, x11
 	umulh	x9, x4, x11
 	adds	x23, x23, x8
 	adcs	x24, x24, x28
 	adc	x25, x25, xzr
        // A1 * B2
 	mul	x8, x4, x12
 	umulh	x28, x4, x12
 	adds	x23, x23, x27 // C2
 	adcs	x24, x24, x9
 	adc	x25, x25, xzr
        // A2 * B1
 	mul	x27, x5, x11
 	umulh	x9, x5, x11
 	adds	x24, x24, x8
 	adcs	x25, x25, x28
 	adc	x26, xzr, xzr
        // A2 * B2
 	mul	x8, x5, x12
 	umulh	x28, x5, x12
 	adds	x24, x24, x27 // C3
 	adcs	x25, x25, x9
 	adc	x26, x26, xzr
 	adds	x25, x25, x8 // C4
 	adc	x26, x26, x28 // C5
        // Restore x8,x9
 	ldp	x8,x9, [x2,#32]
 	neg	x1, x1
        // x8-x9,x19,x20,x14-x17 <- (AH+AL) x (BH+BL) - ALxBL - AHxBH
 	subs	x8, x8, x21
 	sbcs	x9, x9, x22
 	sbcs	x19, x19, x23
 	sbcs	x20, x20, x24
 	sbcs	x14, x14, x25
 	sbcs	x15, x15, x26
 	sbcs	x16, x16, xzr
 	sbcs	x17, x17, xzr
 	sbc	x7, x7, xzr
        // Store (AH+AL) x (BH+BL) - ALxBL - AHxBH, low
 	stp	x8,  x9, [x2,#32]
 	stp	x19, x20, [x2,#48]
 	adds	x1,  x1, #1
 	adcs	x14, x14, x21
 	adcs	x15, x15, x22
 	adcs	x16, x16, x23
 	adcs	x17, x17, x24
 	adcs	x25,  x7, x25
 	adc	x26, x26, xzr
 	stp	x14, x15, [x2,#64]
 	stp	x16, x17, [x2,#80]
 	stp	x25, x26, [x2,#96]
 	ldp	x19, x20, [x29,#16]
 	ldp	x21, x22, [x29,#32]
 	ldp	x23, x24, [x29,#48]
 	ldp	x25, x26, [x29,#64]
 	ldp	x27, x28, [x29,#80]
 	ldp	x29, x30, [sp],#96
 	ret
 .globl	_sike_fprdc
 .private_extern	_sike_fprdc
 .align	4
 _sike_fprdc:
 	stp	x29, x30, [sp, #-96]!
 	add	x29, sp, xzr
 	stp	x19, x20, [sp,#16]
 	stp	x21, x22, [sp,#32]
 	stp	x23, x24, [sp,#48]
 	stp	x25, x26, [sp,#64]
 	stp	x27, x28, [sp,#80]
 	ldp	x2, x3, [x0,#0]       // a[0-1]
        // Load the prime constant
 	adrp	x26, Lp434p1@PAGE
 	add	x26, x26, Lp434p1@PAGEOFF
 	ldp	x23, x24, [x26, #0x0]
 	ldp	x25, x26, [x26,#0x10]
        // a[0-1] * p434+1
 	mul	x4, x2, x23  // C0
 	umulh	x7, x2, x23
 	mul	x5, x2, x24
 	umulh	x6, x2, x24
 	mul	x10, x3, x23
 	umulh	x11, x3, x23
 	adds	x5, x5, x7
 	adc	x6, x6, xzr
 	mul	x27, x2, x25
 	umulh	x28, x2, x25
 	adds	x5, x5, x10  // C1
 	adcs	x6, x6, x11
 	adc	x7, xzr, xzr
 	mul	x10, x3, x24
 	umulh	x11, x3, x24
 	adds	x6, x6, x27
 	adcs	x7, x7, x28
 	adc	x8, xzr, xzr
 	mul	x27, x2, x26
 	umulh	x28, x2, x26
 	adds	x6, x6, x10  // C2
 	adcs	x7, x7, x11
 	adc	x8, x8, xzr
 	mul	x10, x3, x25
 	umulh	x11, x3, x25
 	adds	x7, x7, x27
 	adcs	x8, x8, x28
 	adc	x9, xzr, xzr
 	mul	x27, x3, x26
 	umulh	x28, x3, x26
 	adds	x7, x7, x10  // C3
 	adcs	x8, x8, x11
 	adc	x9, x9, xzr
 	adds	x8, x8, x27  // C4
 	adc	x9, x9, x28  // C5
 	ldp	x10, x11, [x0, #0x18]
 	ldp	x12, x13, [x0, #0x28]
 	ldp	x14, x15, [x0, #0x38]
 	ldp	x16, x17, [x0, #0x48]
 	ldp	x19, x20, [x0, #0x58]
 	ldr	x21,      [x0, #0x68]
 	adds	x10, x10, x4
 	adcs	x11, x11, x5
 	adcs	x12, x12, x6
 	adcs	x13, x13, x7
 	adcs	x14, x14, x8
 	adcs	x15, x15, x9
 	adcs	x22, x16, xzr
 	adcs	x17, x17, xzr
 	adcs	x19, x19, xzr
 	adcs	x20, x20, xzr
 	adc	x21, x21, xzr
 	ldr	x2,  [x0,#0x10]       // a[2]
        // a[2-3] * p434+1
 	mul	x4, x2, x23  // C0
 	umulh	x7, x2, x23
 	mul	x5, x2, x24
 	umulh	x6, x2, x24
 	mul	x0, x10, x23
 	umulh	x3, x10, x23
 	adds	x5, x5, x7
 	adc	x6, x6, xzr
 	mul	x27, x2, x25
 	umulh	x28, x2, x25
 	adds	x5, x5, x0  // C1
 	adcs	x6, x6, x3
 	adc	x7, xzr, xzr
 	mul	x0, x10, x24
 	umulh	x3, x10, x24
 	adds	x6, x6, x27
 	adcs	x7, x7, x28
 	adc	x8, xzr, xzr
 	mul	x27, x2, x26
 	umulh	x28, x2, x26
 	adds	x6, x6, x0  // C2
 	adcs	x7, x7, x3
 	adc	x8, x8, xzr
 	mul	x0, x10, x25
 	umulh	x3, x10, x25
 	adds	x7, x7, x27
 	adcs	x8, x8, x28
 	adc	x9, xzr, xzr
 	mul	x27, x10, x26
 	umulh	x28, x10, x26
 	adds	x7, x7, x0  // C3
 	adcs	x8, x8, x3
 	adc	x9, x9, xzr
 	adds	x8, x8, x27  // C4
 	adc	x9, x9, x28  // C5
 	adds	x12, x12, x4
 	adcs	x13, x13, x5
 	adcs	x14, x14, x6
 	adcs	x15, x15, x7
 	adcs	x16, x22, x8
 	adcs	x17, x17, x9
 	adcs	x22, x19, xzr
 	adcs	x20, x20, xzr
 	adc	x21, x21, xzr
 	mul	x4, x11, x23  // C0
 	umulh	x7, x11, x23
 	mul	x5, x11, x24
 	umulh	x6, x11, x24
 	mul	x10, x12, x23
 	umulh	x3, x12, x23
 	adds	x5, x5, x7
 	adc	x6, x6, xzr
 	mul	x27, x11, x25
 	umulh	x28, x11, x25
 	adds	x5, x5, x10  // C1
 	adcs	x6, x6, x3
 	adc	x7, xzr, xzr
 	mul	x10, x12, x24
 	umulh	x3, x12, x24
 	adds	x6, x6, x27
 	adcs	x7, x7, x28
 	adc	x8, xzr, xzr
 	mul	x27, x11, x26
 	umulh	x28, x11, x26
 	adds	x6, x6, x10  // C2
 	adcs	x7, x7, x3
 	adc	x8, x8, xzr
 	mul	x10, x12, x25
 	umulh	x3, x12, x25
 	adds	x7, x7, x27
 	adcs	x8, x8, x28
 	adc	x9, xzr, xzr
 	mul	x27, x12, x26
 	umulh	x28, x12, x26
 	adds	x7, x7, x10  // C3
 	adcs	x8, x8, x3
 	adc	x9, x9, xzr
 	adds	x8, x8, x27  // C4
 	adc	x9, x9, x28  // C5
 	adds	x14, x14, x4
 	adcs	x15, x15, x5
 	adcs	x16, x16, x6
 	adcs	x17, x17, x7
 	adcs	x19, x22, x8
 	adcs	x20, x20, x9
 	adc	x22, x21, xzr
 	stp	x14, x15, [x1, #0x0]     // C0, C1
 	mul	x4, x13, x23    // C0
 	umulh	x10, x13, x23
 	mul	x5, x13, x24
 	umulh	x27, x13, x24
 	adds	x5, x5, x10    // C1
 	adc	x10, xzr, xzr
 	mul	x6, x13, x25
 	umulh	x28, x13, x25
 	adds	x27, x10, x27
 	adcs	x6, x6, x27    // C2
 	adc	x10, xzr, xzr
 	mul	x7, x13, x26
 	umulh	x8, x13, x26
 	adds	x28, x10, x28
 	adcs	x7, x7, x28    // C3
 	adc	x8, x8, xzr    // C4
 	adds	x16, x16, x4
 	adcs	x17, x17, x5
 	adcs	x19, x19, x6
 	adcs	x20, x20, x7
 	adc	x21, x22, x8
 	str	x16,       [x1, #0x10]
 	stp	x17, x19,  [x1, #0x18]
 	stp	x20, x21,  [x1, #0x28]
 	ldp	x19, x20, [x29,#16]
 	ldp	x21, x22, [x29,#32]
 	ldp	x23, x24, [x29,#48]
 	ldp	x25, x26, [x29,#64]
 	ldp	x27, x28, [x29,#80]
 	ldp	x29, x30, [sp],#96
 	ret
 .globl	_sike_fpadd
 .private_extern	_sike_fpadd
 .align	4
 _sike_fpadd:
 	stp	x29,x30, [sp,#-16]!
 	add	x29, sp, #0
 	ldp	x3, x4,   [x0,#0]
 	ldp	x5, x6,   [x0,#16]
 	ldp	x7, x8,   [x0,#32]
 	ldr	x9,       [x0,#48]
 	ldp	x11, x12, [x1,#0]
 	ldp	x13, x14, [x1,#16]
 	ldp	x15, x16, [x1,#32]
 	ldr	x17,      [x1,#48]
        // Add a + b
 	adds	x3, x3, x11
 	adcs	x4, x4, x12
 	adcs	x5, x5, x13
 	adcs	x6, x6, x14
 	adcs	x7, x7, x15
 	adcs	x8, x8, x16
 	adc	x9, x9, x17
        //  Subtract 2xp434
 	adrp	x17, Lp434x2@PAGE
 	add	x17, x17, Lp434x2@PAGEOFF
 	ldp	x11, x12, [x17, #0]
 	ldp	x13, x14, [x17, #16]
 	ldp	x15, x16, [x17, #32]
 	subs	x3, x3, x11
 	sbcs	x4, x4, x12
 	sbcs	x5, x5, x12
 	sbcs	x6, x6, x13
 	sbcs	x7, x7, x14
 	sbcs	x8, x8, x15
 	sbcs	x9, x9, x16
 	sbc	x0, xzr, xzr    // x0 can be reused now
        // Add 2xp434 anded with the mask in x0
 	and	x11, x11, x0
 	and	x12, x12, x0
 	and	x13, x13, x0
 	and	x14, x14, x0
 	and	x15, x15, x0
 	and	x16, x16, x0
 	adds	x3, x3, x11
 	adcs	x4, x4, x12
 	adcs	x5, x5, x12
 	adcs	x6, x6, x13
 	adcs	x7, x7, x14
 	adcs	x8, x8, x15
 	adc	x9, x9, x16
 	stp	x3, x4,  [x2,#0]
 	stp	x5, x6,  [x2,#16]
 	stp	x7, x8,  [x2,#32]
 	str	x9,      [x2,#48]
 	ldp	x29, x30, [sp],#16
 	ret
 .globl	_sike_fpsub
 .private_extern	_sike_fpsub
 .align	4
 _sike_fpsub:
 	stp	x29, x30, [sp,#-16]!
 	add	x29, sp, #0
 	ldp	x3, x4,   [x0,#0]
 	ldp	x5, x6,   [x0,#16]
 	ldp	x7, x8,   [x0,#32]
 	ldr	x9,       [x0,#48]
 	ldp	x11, x12, [x1,#0]
 	ldp	x13, x14, [x1,#16]
 	ldp	x15, x16, [x1,#32]
 	ldr	x17,      [x1,#48]
        // Subtract a - b
 	subs	x3, x3, x11
 	sbcs	x4, x4, x12
 	sbcs	x5, x5, x13
 	sbcs	x6, x6, x14
 	sbcs	x7, x7, x15
 	sbcs	x8, x8, x16
 	sbcs	x9, x9, x17
 	sbc	x0, xzr, xzr
        // Add 2xp434 anded with the mask in x0
 	adrp	x17, Lp434x2@PAGE
 	add	x17, x17, Lp434x2@PAGEOFF
        // First half
 	ldp	x11, x12, [x17, #0]
 	ldp	x13, x14, [x17, #16]
 	ldp	x15, x16, [x17, #32]
        // Add 2xp434 anded with the mask in x0
 	and	x11, x11, x0
 	and	x12, x12, x0
 	and	x13, x13, x0
 	and	x14, x14, x0
 	and	x15, x15, x0
 	and	x16, x16, x0
 	adds	x3, x3, x11
 	adcs	x4, x4, x12
 	adcs	x5, x5, x12
 	adcs	x6, x6, x13
 	adcs	x7, x7, x14
 	adcs	x8, x8, x15
 	adc	x9, x9, x16
 	stp	x3, x4,  [x2,#0]
 	stp	x5, x6,  [x2,#16]
 	stp	x7, x8,  [x2,#32]
 	str	x9,      [x2,#48]
 	ldp	x29, x30, [sp],#16
 	ret
 .globl	_sike_mpadd_asm
 .private_extern	_sike_mpadd_asm
 .align	4
 _sike_mpadd_asm:
 	stp	x29, x30, [sp,#-16]!
 	add	x29, sp, #0
 	ldp	x3, x4,   [x0,#0]
 	ldp	x5, x6,   [x0,#16]
 	ldp	x7, x8,   [x0,#32]
 	ldr	x9,       [x0,#48]
 	ldp	x11, x12, [x1,#0]
 	ldp	x13, x14, [x1,#16]
 	ldp	x15, x16, [x1,#32]
 	ldr	x17,      [x1,#48]
 	adds	x3, x3, x11
 	adcs	x4, x4, x12
 	adcs	x5, x5, x13
 	adcs	x6, x6, x14
 	adcs	x7, x7, x15
 	adcs	x8, x8, x16
 	adc	x9, x9, x17
 	stp	x3, x4,   [x2,#0]
 	stp	x5, x6,   [x2,#16]
 	stp	x7, x8,   [x2,#32]
 	str	x9,       [x2,#48]
 	ldp	x29, x30, [sp],#16
 	ret
 .globl	_sike_mpsubx2_asm
 .private_extern	_sike_mpsubx2_asm
 .align	4
 _sike_mpsubx2_asm:
 	stp	x29, x30, [sp,#-16]!
 	add	x29, sp, #0
 	ldp	x3, x4,   [x0,#0]
 	ldp	x5, x6,   [x0,#16]
 	ldp	x11, x12, [x1,#0]
 	ldp	x13, x14, [x1,#16]
 	subs	x3, x3, x11
 	sbcs	x4, x4, x12
 	sbcs	x5, x5, x13
 	sbcs	x6, x6, x14
 	ldp	x7, x8,   [x0,#32]
 	ldp	x9, x10,  [x0,#48]
 	ldp	x11, x12, [x1,#32]
 	ldp	x13, x14, [x1,#48]
 	sbcs	x7, x7, x11
 	sbcs	x8, x8, x12
 	sbcs	x9, x9, x13
 	sbcs	x10, x10, x14
 	stp	x3, x4,   [x2,#0]
 	stp	x5, x6,   [x2,#16]
 	stp	x7, x8,   [x2,#32]
 	stp	x9, x10,  [x2,#48]
 	ldp	x3, x4,   [x0,#64]
 	ldp	x5, x6,   [x0,#80]
 	ldp	x11, x12, [x1,#64]
 	ldp	x13, x14, [x1,#80]
 	sbcs	x3, x3, x11
 	sbcs	x4, x4, x12
 	sbcs	x5, x5, x13
 	sbcs	x6, x6, x14
 	ldp	x7, x8,   [x0,#96]
 	ldp	x11, x12, [x1,#96]
 	sbcs	x7, x7, x11
 	sbcs	x8, x8, x12
 	sbc	x0, xzr, xzr
 	stp	x3, x4,   [x2,#64]
 	stp	x5, x6,   [x2,#80]
 	stp	x7, x8,   [x2,#96]
 	ldp	x29, x30, [sp],#16
 	ret
 .globl	_sike_mpdblsubx2_asm
 .private_extern	_sike_mpdblsubx2_asm
 .align	4
 _sike_mpdblsubx2_asm:
 	stp	x29, x30, [sp, #-16]!
 	add	x29, sp, #0
 	ldp	x3, x4,   [x2, #0]
 	ldp	x5, x6,   [x2,#16]
 	ldp	x7, x8,   [x2,#32]
 	ldp	x11, x12, [x0, #0]
 	ldp	x13, x14, [x0,#16]
 	ldp	x15, x16, [x0,#32]
 	subs	x3, x3, x11
 	sbcs	x4, x4, x12
 	sbcs	x5, x5, x13
 	sbcs	x6, x6, x14
 	sbcs	x7, x7, x15
 	sbcs	x8, x8, x16
        // x9 stores carry
 	adc	x9, xzr, xzr
 	ldp	x11, x12, [x1, #0]
 	ldp	x13, x14, [x1,#16]
 	ldp	x15, x16, [x1,#32]
 	subs	x3, x3, x11
 	sbcs	x4, x4, x12
 	sbcs	x5, x5, x13
 	sbcs	x6, x6, x14
 	sbcs	x7, x7, x15
 	sbcs	x8, x8, x16
 	adc	x9, x9, xzr
 	stp	x3, x4,   [x2, #0]
 	stp	x5, x6,   [x2,#16]
 	stp	x7, x8,   [x2,#32]
 	ldp	x3, x4,   [x2,#48]
 	ldp	x5, x6,   [x2,#64]
 	ldp	x7, x8,   [x2,#80]
 	ldp	x11, x12, [x0,#48]
 	ldp	x13, x14, [x0,#64]
 	ldp	x15, x16, [x0,#80]
        // x9 = 2 - x9
 	neg	x9, x9
 	add	x9, x9, #2
 	subs	x3, x3, x9
 	sbcs	x3, x3, x11
 	sbcs	x4, x4, x12
 	sbcs	x5, x5, x13
 	sbcs	x6, x6, x14
 	sbcs	x7, x7, x15
 	sbcs	x8, x8, x16
 	adc	x9, xzr, xzr
 	ldp	x11, x12, [x1,#48]
 	ldp	x13, x14, [x1,#64]
 	ldp	x15, x16, [x1,#80]
 	subs	x3, x3, x11
 	sbcs	x4, x4, x12
 	sbcs	x5, x5, x13
 	sbcs	x6, x6, x14
 	sbcs	x7, x7, x15
 	sbcs	x8, x8, x16
 	adc	x9, x9, xzr
 	stp	x3, x4,   [x2,#48]
 	stp	x5, x6,   [x2,#64]
 	stp	x7, x8,   [x2,#80]
 	ldp	x3,  x4, [x2,#96]
 	ldp	x11, x12, [x0,#96]
 	ldp	x13, x14, [x1,#96]
        // x9 = 2 - x9
 	neg	x9, x9
 	add	x9, x9, #2
 	subs	x3, x3, x9
 	sbcs	x3, x3, x11
 	sbcs	x4, x4, x12
 	subs	x3, x3, x13
 	sbc	x4, x4, x14
 	stp	x3, x4,   [x2,#96]
 	ldp	x29, x30, [sp],#16
 	ret
 #endif  // !OPENSSL_NO_ASM
--- a/contrib/boringssl-cmake/ios-arm/crypto/fipsmodule/aes-armv4.S
+++ b/contrib/boringssl-cmake/ios-arm/crypto/fipsmodule/aes-armv4.S
--- a/contrib/boringssl-cmake/ios-arm/crypto/fipsmodule/ghash-armv4.S
+++ b/contrib/boringssl-cmake/ios-arm/crypto/fipsmodule/ghash-armv4.S
@ -30,348 +30,6 @@
 #else
 .code	32
 #endif
 .align	5
 rem_4bit:
 .short	0x0000,0x1C20,0x3840,0x2460
 .short	0x7080,0x6CA0,0x48C0,0x54E0
 .short	0xE100,0xFD20,0xD940,0xC560
 .short	0x9180,0x8DA0,0xA9C0,0xB5E0
 #ifdef __thumb2__
 .thumb_func	rem_4bit_get
 #endif
 rem_4bit_get:
 #if defined(__thumb2__)
 	adr	r2,rem_4bit
 #else
 	sub	r2,pc,#8+32	@ &rem_4bit
 #endif
 	b	Lrem_4bit_got
 	nop
 	nop
 .globl	_gcm_ghash_4bit
 .private_extern	_gcm_ghash_4bit
 #ifdef __thumb2__
 .thumb_func	_gcm_ghash_4bit
 #endif
 .align	4
 _gcm_ghash_4bit:
 #if defined(__thumb2__)
 	adr	r12,rem_4bit
 #else
 	sub	r12,pc,#8+48		@ &rem_4bit
 #endif
 	add	r3,r2,r3		@ r3 to point at the end
 	stmdb	sp!,{r3,r4,r5,r6,r7,r8,r9,r10,r11,lr}		@ save r3/end too
 	ldmia	r12,{r4,r5,r6,r7,r8,r9,r10,r11}		@ copy rem_4bit ...
 	stmdb	sp!,{r4,r5,r6,r7,r8,r9,r10,r11}		@ ... to stack
 	ldrb	r12,[r2,#15]
 	ldrb	r14,[r0,#15]
 Louter:
 	eor	r12,r12,r14
 	and	r14,r12,#0xf0
 	and	r12,r12,#0x0f
 	mov	r3,#14
 	add	r7,r1,r12,lsl#4
 	ldmia	r7,{r4,r5,r6,r7}	@ load Htbl[nlo]
 	add	r11,r1,r14
 	ldrb	r12,[r2,#14]
 	and	r14,r4,#0xf		@ rem
 	ldmia	r11,{r8,r9,r10,r11}	@ load Htbl[nhi]
 	add	r14,r14,r14
 	eor	r4,r8,r4,lsr#4
 	ldrh	r8,[sp,r14]		@ rem_4bit[rem]
 	eor	r4,r4,r5,lsl#28
 	ldrb	r14,[r0,#14]
 	eor	r5,r9,r5,lsr#4
 	eor	r5,r5,r6,lsl#28
 	eor	r6,r10,r6,lsr#4
 	eor	r6,r6,r7,lsl#28
 	eor	r7,r11,r7,lsr#4
 	eor	r12,r12,r14
 	and	r14,r12,#0xf0
 	and	r12,r12,#0x0f
 	eor	r7,r7,r8,lsl#16
 Linner:
 	add	r11,r1,r12,lsl#4
 	and	r12,r4,#0xf		@ rem
 	subs	r3,r3,#1
 	add	r12,r12,r12
 	ldmia	r11,{r8,r9,r10,r11}	@ load Htbl[nlo]
 	eor	r4,r8,r4,lsr#4
 	eor	r4,r4,r5,lsl#28
 	eor	r5,r9,r5,lsr#4
 	eor	r5,r5,r6,lsl#28
 	ldrh	r8,[sp,r12]		@ rem_4bit[rem]
 	eor	r6,r10,r6,lsr#4
 #ifdef	__thumb2__
 	it	pl
 #endif
 	ldrplb	r12,[r2,r3]
 	eor	r6,r6,r7,lsl#28
 	eor	r7,r11,r7,lsr#4
 	add	r11,r1,r14
 	and	r14,r4,#0xf		@ rem
 	eor	r7,r7,r8,lsl#16	@ ^= rem_4bit[rem]
 	add	r14,r14,r14
 	ldmia	r11,{r8,r9,r10,r11}	@ load Htbl[nhi]
 	eor	r4,r8,r4,lsr#4
 #ifdef	__thumb2__
 	it	pl
 #endif
 	ldrplb	r8,[r0,r3]
 	eor	r4,r4,r5,lsl#28
 	eor	r5,r9,r5,lsr#4
 	ldrh	r9,[sp,r14]
 	eor	r5,r5,r6,lsl#28
 	eor	r6,r10,r6,lsr#4
 	eor	r6,r6,r7,lsl#28
 #ifdef	__thumb2__
 	it	pl
 #endif
 	eorpl	r12,r12,r8
 	eor	r7,r11,r7,lsr#4
 #ifdef	__thumb2__
 	itt	pl
 #endif
 	andpl	r14,r12,#0xf0
 	andpl	r12,r12,#0x0f
 	eor	r7,r7,r9,lsl#16	@ ^= rem_4bit[rem]
 	bpl	Linner
 	ldr	r3,[sp,#32]		@ re-load r3/end
 	add	r2,r2,#16
 	mov	r14,r4
 #if __ARM_ARCH__>=7 && defined(__ARMEL__)
 	rev	r4,r4
 	str	r4,[r0,#12]
 #elif defined(__ARMEB__)
 	str	r4,[r0,#12]
 #else
 	mov	r9,r4,lsr#8
 	strb	r4,[r0,#12+3]
 	mov	r10,r4,lsr#16
 	strb	r9,[r0,#12+2]
 	mov	r11,r4,lsr#24
 	strb	r10,[r0,#12+1]
 	strb	r11,[r0,#12]
 #endif
 	cmp	r2,r3
 #if __ARM_ARCH__>=7 && defined(__ARMEL__)
 	rev	r5,r5
 	str	r5,[r0,#8]
 #elif defined(__ARMEB__)
 	str	r5,[r0,#8]
 #else
 	mov	r9,r5,lsr#8
 	strb	r5,[r0,#8+3]
 	mov	r10,r5,lsr#16
 	strb	r9,[r0,#8+2]
 	mov	r11,r5,lsr#24
 	strb	r10,[r0,#8+1]
 	strb	r11,[r0,#8]
 #endif
 #ifdef __thumb2__
 	it	ne
 #endif
 	ldrneb	r12,[r2,#15]
 #if __ARM_ARCH__>=7 && defined(__ARMEL__)
 	rev	r6,r6
 	str	r6,[r0,#4]
 #elif defined(__ARMEB__)
 	str	r6,[r0,#4]
 #else
 	mov	r9,r6,lsr#8
 	strb	r6,[r0,#4+3]
 	mov	r10,r6,lsr#16
 	strb	r9,[r0,#4+2]
 	mov	r11,r6,lsr#24
 	strb	r10,[r0,#4+1]
 	strb	r11,[r0,#4]
 #endif
 #if __ARM_ARCH__>=7 && defined(__ARMEL__)
 	rev	r7,r7
 	str	r7,[r0,#0]
 #elif defined(__ARMEB__)
 	str	r7,[r0,#0]
 #else
 	mov	r9,r7,lsr#8
 	strb	r7,[r0,#0+3]
 	mov	r10,r7,lsr#16
 	strb	r9,[r0,#0+2]
 	mov	r11,r7,lsr#24
 	strb	r10,[r0,#0+1]
 	strb	r11,[r0,#0]
 #endif
 	bne	Louter
 	add	sp,sp,#36
 #if __ARM_ARCH__>=5
 	ldmia	sp!,{r4,r5,r6,r7,r8,r9,r10,r11,pc}
 #else
 	ldmia	sp!,{r4,r5,r6,r7,r8,r9,r10,r11,lr}
 	tst	lr,#1
 	moveq	pc,lr			@ be binary compatible with V4, yet
 .word	0xe12fff1e			@ interoperable with Thumb ISA:-)
 #endif
 .globl	_gcm_gmult_4bit
 .private_extern	_gcm_gmult_4bit
 #ifdef __thumb2__
 .thumb_func	_gcm_gmult_4bit
 #endif
 _gcm_gmult_4bit:
 	stmdb	sp!,{r4,r5,r6,r7,r8,r9,r10,r11,lr}
 	ldrb	r12,[r0,#15]
 	b	rem_4bit_get
 Lrem_4bit_got:
 	and	r14,r12,#0xf0
 	and	r12,r12,#0x0f
 	mov	r3,#14
 	add	r7,r1,r12,lsl#4
 	ldmia	r7,{r4,r5,r6,r7}	@ load Htbl[nlo]
 	ldrb	r12,[r0,#14]
 	add	r11,r1,r14
 	and	r14,r4,#0xf		@ rem
 	ldmia	r11,{r8,r9,r10,r11}	@ load Htbl[nhi]
 	add	r14,r14,r14
 	eor	r4,r8,r4,lsr#4
 	ldrh	r8,[r2,r14]	@ rem_4bit[rem]
 	eor	r4,r4,r5,lsl#28
 	eor	r5,r9,r5,lsr#4
 	eor	r5,r5,r6,lsl#28
 	eor	r6,r10,r6,lsr#4
 	eor	r6,r6,r7,lsl#28
 	eor	r7,r11,r7,lsr#4
 	and	r14,r12,#0xf0
 	eor	r7,r7,r8,lsl#16
 	and	r12,r12,#0x0f
 Loop:
 	add	r11,r1,r12,lsl#4
 	and	r12,r4,#0xf		@ rem
 	subs	r3,r3,#1
 	add	r12,r12,r12
 	ldmia	r11,{r8,r9,r10,r11}	@ load Htbl[nlo]
 	eor	r4,r8,r4,lsr#4
 	eor	r4,r4,r5,lsl#28
 	eor	r5,r9,r5,lsr#4
 	eor	r5,r5,r6,lsl#28
 	ldrh	r8,[r2,r12]	@ rem_4bit[rem]
 	eor	r6,r10,r6,lsr#4
 #ifdef	__thumb2__
 	it	pl
 #endif
 	ldrplb	r12,[r0,r3]
 	eor	r6,r6,r7,lsl#28
 	eor	r7,r11,r7,lsr#4
 	add	r11,r1,r14
 	and	r14,r4,#0xf		@ rem
 	eor	r7,r7,r8,lsl#16	@ ^= rem_4bit[rem]
 	add	r14,r14,r14
 	ldmia	r11,{r8,r9,r10,r11}	@ load Htbl[nhi]
 	eor	r4,r8,r4,lsr#4
 	eor	r4,r4,r5,lsl#28
 	eor	r5,r9,r5,lsr#4
 	ldrh	r8,[r2,r14]	@ rem_4bit[rem]
 	eor	r5,r5,r6,lsl#28
 	eor	r6,r10,r6,lsr#4
 	eor	r6,r6,r7,lsl#28
 	eor	r7,r11,r7,lsr#4
 #ifdef	__thumb2__
 	itt	pl
 #endif
 	andpl	r14,r12,#0xf0
 	andpl	r12,r12,#0x0f
 	eor	r7,r7,r8,lsl#16	@ ^= rem_4bit[rem]
 	bpl	Loop
 #if __ARM_ARCH__>=7 && defined(__ARMEL__)
 	rev	r4,r4
 	str	r4,[r0,#12]
 #elif defined(__ARMEB__)
 	str	r4,[r0,#12]
 #else
 	mov	r9,r4,lsr#8
 	strb	r4,[r0,#12+3]
 	mov	r10,r4,lsr#16
 	strb	r9,[r0,#12+2]
 	mov	r11,r4,lsr#24
 	strb	r10,[r0,#12+1]
 	strb	r11,[r0,#12]
 #endif
 #if __ARM_ARCH__>=7 && defined(__ARMEL__)
 	rev	r5,r5
 	str	r5,[r0,#8]
 #elif defined(__ARMEB__)
 	str	r5,[r0,#8]
 #else
 	mov	r9,r5,lsr#8
 	strb	r5,[r0,#8+3]
 	mov	r10,r5,lsr#16
 	strb	r9,[r0,#8+2]
 	mov	r11,r5,lsr#24
 	strb	r10,[r0,#8+1]
 	strb	r11,[r0,#8]
 #endif
 #if __ARM_ARCH__>=7 && defined(__ARMEL__)
 	rev	r6,r6
 	str	r6,[r0,#4]
 #elif defined(__ARMEB__)
 	str	r6,[r0,#4]
 #else
 	mov	r9,r6,lsr#8
 	strb	r6,[r0,#4+3]
 	mov	r10,r6,lsr#16
 	strb	r9,[r0,#4+2]
 	mov	r11,r6,lsr#24
 	strb	r10,[r0,#4+1]
 	strb	r11,[r0,#4]
 #endif
 #if __ARM_ARCH__>=7 && defined(__ARMEL__)
 	rev	r7,r7
 	str	r7,[r0,#0]
 #elif defined(__ARMEB__)
 	str	r7,[r0,#0]
 #else
 	mov	r9,r7,lsr#8
 	strb	r7,[r0,#0+3]
 	mov	r10,r7,lsr#16
 	strb	r9,[r0,#0+2]
 	mov	r11,r7,lsr#24
 	strb	r10,[r0,#0+1]
 	strb	r11,[r0,#0]
 #endif
 #if __ARM_ARCH__>=5
 	ldmia	sp!,{r4,r5,r6,r7,r8,r9,r10,r11,pc}
 #else
 	ldmia	sp!,{r4,r5,r6,r7,r8,r9,r10,r11,lr}
 	tst	lr,#1
 	moveq	pc,lr			@ be binary compatible with V4, yet
 .word	0xe12fff1e			@ interoperable with Thumb ISA:-)
 #endif
 #if __ARM_MAX_ARCH__>=7
--- a/contrib/boringssl-cmake/ios-arm/crypto/fipsmodule/vpaes-armv7.S
+++ b/contrib/boringssl-cmake/ios-arm/crypto/fipsmodule/vpaes-armv7.S
--- a/contrib/boringssl-cmake/ios-arm/crypto/test/trampoline-armv4.S
+++ b/contrib/boringssl-cmake/ios-arm/crypto/test/trampoline-armv4.S
@ -30,7 +30,6 @@
 .private_extern	_abi_test_trampoline
 .align	4
 _abi_test_trampoline:
 Labi_test_trampoline_begin:
 	@ Save parameters and all callee-saved registers. For convenience, we
 	@ save r9 on iOS even though it's volatile.
 	vstmdb	sp!, {d8,d9,d10,d11,d12,d13,d14,d15}
--- a/contrib/boringssl-cmake/linux-aarch64/crypto/chacha/chacha-armv8.S
+++ b/contrib/boringssl-cmake/linux-aarch64/crypto/chacha/chacha-armv8.S
@ -34,6 +34,7 @@
 .type	ChaCha20_ctr32,%function
 .align	5
 ChaCha20_ctr32:
 	AARCH64_VALID_CALL_TARGET
 	cbz	x2,.Labort
 #if __has_feature(hwaddress_sanitizer) && __clang_major__ >= 10
 	adrp	x5,:pg_hi21_nc:OPENSSL_armcap_P
@ -47,6 +48,7 @@ ChaCha20_ctr32:
 	b.ne	ChaCha20_neon
 .Lshort:
 	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-96]!
 	add	x29,sp,#0
@ -259,6 +261,7 @@ ChaCha20_ctr32:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#96
 	AARCH64_VALIDATE_LINK_REGISTER
 .Labort:
 	ret
@ -315,12 +318,14 @@ ChaCha20_ctr32:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#96
 	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ChaCha20_ctr32,.-ChaCha20_ctr32
 .type	ChaCha20_neon,%function
 .align	5
 ChaCha20_neon:
 	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-96]!
 	add	x29,sp,#0
@ -701,6 +706,7 @@ ChaCha20_neon:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#96
 	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .Ltail_neon:
@ -810,11 +816,13 @@ ChaCha20_neon:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#96
 	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ChaCha20_neon,.-ChaCha20_neon
 .type	ChaCha20_512_neon,%function
 .align	5
 ChaCha20_512_neon:
 	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-96]!
 	add	x29,sp,#0
@ -1978,7 +1986,9 @@ ChaCha20_512_neon:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#96
 	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	ChaCha20_512_neon,.-ChaCha20_512_neon
 #endif
 #endif  // !OPENSSL_NO_ASM
 .section	.note.GNU-stack,"",%progbits
--- a/contrib/boringssl-cmake/linux-aarch64/crypto/fipsmodule/aesv8-armx64.S
+++ b/contrib/boringssl-cmake/linux-aarch64/crypto/fipsmodule/aesv8-armx64.S
@ -33,6 +33,8 @@
 .align	5
 aes_hw_set_encrypt_key:
 .Lenc_key:
 	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	AARCH64_VALID_CALL_TARGET
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	mov	x3,#-1
@ -201,6 +203,7 @@ aes_hw_set_encrypt_key:
 .type	aes_hw_set_decrypt_key,%function
 .align	5
 aes_hw_set_decrypt_key:
 	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	bl	.Lenc_key
@ -234,6 +237,7 @@ aes_hw_set_decrypt_key:
 	eor	x0,x0,x0		// return value
 .Ldec_key_abort:
 	ldp	x29,x30,[sp],#16
 	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	aes_hw_set_decrypt_key,.-aes_hw_set_decrypt_key
 .globl	aes_hw_encrypt
@ -241,6 +245,7 @@ aes_hw_set_decrypt_key:
 .type	aes_hw_encrypt,%function
 .align	5
 aes_hw_encrypt:
 	AARCH64_VALID_CALL_TARGET
 	ldr	w3,[x2,#240]
 	ld1	{v0.4s},[x2],#16
 	ld1	{v2.16b},[x0]
@ -271,6 +276,7 @@ aes_hw_encrypt:
 .type	aes_hw_decrypt,%function
 .align	5
 aes_hw_decrypt:
 	AARCH64_VALID_CALL_TARGET
 	ldr	w3,[x2,#240]
 	ld1	{v0.4s},[x2],#16
 	ld1	{v2.16b},[x0]
@ -301,6 +307,8 @@ aes_hw_decrypt:
 .type	aes_hw_cbc_encrypt,%function
 .align	5
 aes_hw_cbc_encrypt:
 	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	AARCH64_VALID_CALL_TARGET
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	subs	x2,x2,#16
@ -592,6 +600,8 @@ aes_hw_cbc_encrypt:
 .type	aes_hw_ctr32_encrypt_blocks,%function
 .align	5
 aes_hw_ctr32_encrypt_blocks:
 	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	AARCH64_VALID_CALL_TARGET
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	ldr	w5,[x3,#240]
@ -772,3 +782,4 @@ aes_hw_ctr32_encrypt_blocks:
 #endif
 #endif
 #endif  // !OPENSSL_NO_ASM
 .section	.note.GNU-stack,"",%progbits
--- a/contrib/boringssl-cmake/linux-aarch64/crypto/fipsmodule/armv8-mont.S
+++ b/contrib/boringssl-cmake/linux-aarch64/crypto/fipsmodule/armv8-mont.S
@ -13,6 +13,8 @@
 #if defined(BORINGSSL_PREFIX)
 #include <boringssl_prefix_symbols_asm.h>
 #endif
 #include <openssl/arm_arch.h>
 .text
 .globl	bn_mul_mont
@ -20,6 +22,7 @@
 .type	bn_mul_mont,%function
 .align	5
 bn_mul_mont:
 	AARCH64_SIGN_LINK_REGISTER
 	tst	x5,#7
 	b.eq	__bn_sqr8x_mont
 	tst	x5,#3
@ -217,11 +220,14 @@ bn_mul_mont:
 	mov	x0,#1
 	ldp	x23,x24,[x29,#48]
 	ldr	x29,[sp],#64
 	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	bn_mul_mont,.-bn_mul_mont
 .type	__bn_sqr8x_mont,%function
 .align	5
 __bn_sqr8x_mont:
 	// Not adding AARCH64_SIGN_LINK_REGISTER here because __bn_sqr8x_mont is jumped to
 	// only from bn_mul_mont which has already signed the return address.
 	cmp	x1,x2
 	b.ne	__bn_mul4x_mont
 .Lsqr8x_mont:
@ -975,11 +981,16 @@ __bn_sqr8x_mont:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldr	x29,[sp],#128
 	// x30 is popped earlier
 	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	__bn_sqr8x_mont,.-__bn_sqr8x_mont
 .type	__bn_mul4x_mont,%function
 .align	5
 __bn_mul4x_mont:
 	// Not adding AARCH64_SIGN_LINK_REGISTER here because __bn_mul4x_mont is jumped to
 	// only from bn_mul_mont or __bn_mul8x_mont which have already signed the
 	// return address.
 	stp	x29,x30,[sp,#-128]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
@ -1413,6 +1424,8 @@ __bn_mul4x_mont:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldr	x29,[sp],#128
 	// x30 is popped earlier
 	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	__bn_mul4x_mont,.-__bn_mul4x_mont
 .byte	77,111,110,116,103,111,109,101,114,121,32,77,117,108,116,105,112,108,105,99,97,116,105,111,110,32,102,111,114,32,65,82,77,118,56,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
@ -1420,3 +1433,4 @@ __bn_mul4x_mont:
 .align	4
 #endif
 #endif  // !OPENSSL_NO_ASM
 .section	.note.GNU-stack,"",%progbits
--- a/contrib/boringssl-cmake/linux-aarch64/crypto/fipsmodule/ghash-neon-armv8.S
+++ b/contrib/boringssl-cmake/linux-aarch64/crypto/fipsmodule/ghash-neon-armv8.S
@ -13,6 +13,8 @@
 #if defined(BORINGSSL_PREFIX)
 #include <boringssl_prefix_symbols_asm.h>
 #endif
 #include <openssl/arm_arch.h>
 .text
 .globl	gcm_init_neon
@ -20,6 +22,7 @@
 .type	gcm_init_neon,%function
 .align	4
 gcm_init_neon:
 	AARCH64_VALID_CALL_TARGET
 	// This function is adapted from gcm_init_v8. xC2 is t3.
 	ld1	{v17.2d}, [x1]			// load H
 	movi	v19.16b, #0xe1
@ -45,6 +48,7 @@ gcm_init_neon:
 .type	gcm_gmult_neon,%function
 .align	4
 gcm_gmult_neon:
 	AARCH64_VALID_CALL_TARGET
 	ld1	{v3.16b}, [x0]		// load Xi
 	ld1	{v5.1d}, [x1], #8		// load twisted H
 	ld1	{v6.1d}, [x1]
@ -64,6 +68,7 @@ gcm_gmult_neon:
 .type	gcm_ghash_neon,%function
 .align	4
 gcm_ghash_neon:
 	AARCH64_VALID_CALL_TARGET
 	ld1	{v0.16b}, [x0]		// load Xi
 	ld1	{v5.1d}, [x1], #8		// load twisted H
 	ld1	{v6.1d}, [x1]
@ -338,3 +343,4 @@ gcm_ghash_neon:
 .align	2
 #endif
 #endif  // !OPENSSL_NO_ASM
 .section	.note.GNU-stack,"",%progbits
--- a/contrib/boringssl-cmake/linux-aarch64/crypto/fipsmodule/ghashv8-armx64.S
+++ b/contrib/boringssl-cmake/linux-aarch64/crypto/fipsmodule/ghashv8-armx64.S
@ -22,6 +22,7 @@
 .type	gcm_init_v8,%function
 .align	4
 gcm_init_v8:
 	AARCH64_VALID_CALL_TARGET
 	ld1	{v17.2d},[x1]		//load input H
 	movi	v19.16b,#0xe1
 	shl	v19.2d,v19.2d,#57		//0xc2.0
@ -73,6 +74,7 @@ gcm_init_v8:
 .type	gcm_gmult_v8,%function
 .align	4
 gcm_gmult_v8:
 	AARCH64_VALID_CALL_TARGET
 	ld1	{v17.2d},[x0]		//load Xi
 	movi	v19.16b,#0xe1
 	ld1	{v20.2d,v21.2d},[x1]	//load twisted H, ...
@ -115,6 +117,7 @@ gcm_gmult_v8:
 .type	gcm_ghash_v8,%function
 .align	4
 gcm_ghash_v8:
 	AARCH64_VALID_CALL_TARGET
 	ld1	{v0.2d},[x0]		//load [rotated] Xi
 						//"[rotated]" means that
 						//loaded value would have
@ -246,3 +249,4 @@ gcm_ghash_v8:
 .align	2
 #endif
 #endif  // !OPENSSL_NO_ASM
 .section	.note.GNU-stack,"",%progbits
--- a/contrib/boringssl-cmake/linux-aarch64/crypto/fipsmodule/sha1-armv8.S
+++ b/contrib/boringssl-cmake/linux-aarch64/crypto/fipsmodule/sha1-armv8.S
@ -23,6 +23,8 @@
 .type	sha1_block_data_order,%function
 .align	6
 sha1_block_data_order:
 	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	AARCH64_VALID_CALL_TARGET
 #if __has_feature(hwaddress_sanitizer) && __clang_major__ >= 10
 	adrp	x16,:pg_hi21_nc:OPENSSL_armcap_P
 #else
@ -1090,6 +1092,8 @@ sha1_block_data_order:
 .type	sha1_block_armv8,%function
 .align	6
 sha1_block_armv8:
 	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	AARCH64_VALID_CALL_TARGET
 .Lv8_entry:
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
@ -1232,3 +1236,4 @@ sha1_block_armv8:
 .hidden	OPENSSL_armcap_P
 #endif
 #endif  // !OPENSSL_NO_ASM
 .section	.note.GNU-stack,"",%progbits
--- a/contrib/boringssl-cmake/linux-aarch64/crypto/fipsmodule/sha256-armv8.S
+++ b/contrib/boringssl-cmake/linux-aarch64/crypto/fipsmodule/sha256-armv8.S
@ -64,6 +64,7 @@
 .type	sha256_block_data_order,%function
 .align	6
 sha256_block_data_order:
 	AARCH64_VALID_CALL_TARGET
 #ifndef	__KERNEL__
 #if __has_feature(hwaddress_sanitizer) && __clang_major__ >= 10
 	adrp	x16,:pg_hi21_nc:OPENSSL_armcap_P
@ -74,6 +75,7 @@ sha256_block_data_order:
 	tst	w16,#ARMV8_SHA256
 	b.ne	.Lv8_entry
 #endif
 	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-128]!
 	add	x29,sp,#0
@ -1034,6 +1036,7 @@ sha256_block_data_order:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#128
 	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	sha256_block_data_order,.-sha256_block_data_order
@ -1068,6 +1071,7 @@ sha256_block_data_order:
 .align	6
 sha256_block_armv8:
 .Lv8_entry:
 	// Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
@ -1210,3 +1214,4 @@ sha256_block_armv8:
 #endif
 #endif
 #endif  // !OPENSSL_NO_ASM
 .section	.note.GNU-stack,"",%progbits
--- a/contrib/boringssl-cmake/linux-aarch64/crypto/fipsmodule/sha512-armv8.S
+++ b/contrib/boringssl-cmake/linux-aarch64/crypto/fipsmodule/sha512-armv8.S
@ -64,6 +64,7 @@
 .type	sha512_block_data_order,%function
 .align	6
 sha512_block_data_order:
 	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-128]!
 	add	x29,sp,#0
@ -1024,6 +1025,7 @@ sha512_block_data_order:
 	ldp	x25,x26,[x29,#64]
 	ldp	x27,x28,[x29,#80]
 	ldp	x29,x30,[sp],#128
 	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	sha512_block_data_order,.-sha512_block_data_order
@ -1082,3 +1084,4 @@ sha512_block_data_order:
 #endif
 #endif
 #endif  // !OPENSSL_NO_ASM
 .section	.note.GNU-stack,"",%progbits
--- a/contrib/boringssl-cmake/linux-aarch64/crypto/fipsmodule/vpaes-armv8.S
+++ b/contrib/boringssl-cmake/linux-aarch64/crypto/fipsmodule/vpaes-armv8.S
@ -13,6 +13,8 @@
 #if defined(BORINGSSL_PREFIX)
 #include <boringssl_prefix_symbols_asm.h>
 #endif
 #include <openssl/arm_arch.h>
 .section	.rodata
 .type	_vpaes_consts,%object
@ -215,6 +217,7 @@ _vpaes_encrypt_core:
 .type	vpaes_encrypt,%function
 .align	4
 vpaes_encrypt:
 	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
@ -224,6 +227,7 @@ vpaes_encrypt:
 	st1	{v0.16b}, [x1]
 	ldp	x29,x30,[sp],#16
 	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	vpaes_encrypt,.-vpaes_encrypt
@ -452,6 +456,7 @@ _vpaes_decrypt_core:
 .type	vpaes_decrypt,%function
 .align	4
 vpaes_decrypt:
 	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
@ -461,6 +466,7 @@ vpaes_decrypt:
 	st1	{v0.16b}, [x1]
 	ldp	x29,x30,[sp],#16
 	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	vpaes_decrypt,.-vpaes_decrypt
@ -630,6 +636,7 @@ _vpaes_key_preheat:
 .type	_vpaes_schedule_core,%function
 .align	4
 _vpaes_schedule_core:
 	AARCH64_SIGN_LINK_REGISTER
 	stp	x29, x30, [sp,#-16]!
 	add	x29,sp,#0
@ -799,6 +806,7 @@ _vpaes_schedule_core:
 	eor	v6.16b, v6.16b, v6.16b		// vpxor	%xmm6,	%xmm6,	%xmm6
 	eor	v7.16b, v7.16b, v7.16b		// vpxor	%xmm7,	%xmm7,	%xmm7
 	ldp	x29, x30, [sp],#16
 	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	_vpaes_schedule_core,.-_vpaes_schedule_core
@ -1012,6 +1020,7 @@ _vpaes_schedule_mangle:
 .type	vpaes_set_encrypt_key,%function
 .align	4
 vpaes_set_encrypt_key:
 	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	stp	d8,d9,[sp,#-16]!	// ABI spec says so
@ -1027,6 +1036,7 @@ vpaes_set_encrypt_key:
 	ldp	d8,d9,[sp],#16
 	ldp	x29,x30,[sp],#16
 	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	vpaes_set_encrypt_key,.-vpaes_set_encrypt_key
@ -1035,6 +1045,7 @@ vpaes_set_encrypt_key:
 .type	vpaes_set_decrypt_key,%function
 .align	4
 vpaes_set_decrypt_key:
 	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	stp	d8,d9,[sp,#-16]!	// ABI spec says so
@ -1054,6 +1065,7 @@ vpaes_set_decrypt_key:
 	ldp	d8,d9,[sp],#16
 	ldp	x29,x30,[sp],#16
 	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	vpaes_set_decrypt_key,.-vpaes_set_decrypt_key
 .globl	vpaes_cbc_encrypt
@ -1061,6 +1073,7 @@ vpaes_set_decrypt_key:
 .type	vpaes_cbc_encrypt,%function
 .align	4
 vpaes_cbc_encrypt:
 	AARCH64_SIGN_LINK_REGISTER
 	cbz	x2, .Lcbc_abort
 	cmp	w5, #0			// check direction
 	b.eq	vpaes_cbc_decrypt
@ -1087,6 +1100,7 @@ vpaes_cbc_encrypt:
 	st1	{v0.16b}, [x4]	// write ivec
 	ldp	x29,x30,[sp],#16
 	AARCH64_VALIDATE_LINK_REGISTER
 .Lcbc_abort:
 	ret
 .size	vpaes_cbc_encrypt,.-vpaes_cbc_encrypt
@ -1094,6 +1108,8 @@ vpaes_cbc_encrypt:
 .type	vpaes_cbc_decrypt,%function
 .align	4
 vpaes_cbc_decrypt:
 	// Not adding AARCH64_SIGN_LINK_REGISTER here because vpaes_cbc_decrypt is jumped to
 	// only from vpaes_cbc_encrypt which has already signed the return address.
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	stp	d8,d9,[sp,#-16]!	// ABI spec says so
@ -1135,6 +1151,7 @@ vpaes_cbc_decrypt:
 	ldp	d10,d11,[sp],#16
 	ldp	d8,d9,[sp],#16
 	ldp	x29,x30,[sp],#16
 	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	vpaes_cbc_decrypt,.-vpaes_cbc_decrypt
 .globl	vpaes_ctr32_encrypt_blocks
@ -1142,6 +1159,7 @@ vpaes_cbc_decrypt:
 .type	vpaes_ctr32_encrypt_blocks,%function
 .align	4
 vpaes_ctr32_encrypt_blocks:
 	AARCH64_SIGN_LINK_REGISTER
 	stp	x29,x30,[sp,#-16]!
 	add	x29,sp,#0
 	stp	d8,d9,[sp,#-16]!	// ABI spec says so
@ -1209,7 +1227,9 @@ vpaes_ctr32_encrypt_blocks:
 	ldp	d10,d11,[sp],#16
 	ldp	d8,d9,[sp],#16
 	ldp	x29,x30,[sp],#16
 	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	vpaes_ctr32_encrypt_blocks,.-vpaes_ctr32_encrypt_blocks
 #endif
 #endif  // !OPENSSL_NO_ASM
 .section	.note.GNU-stack,"",%progbits
--- a/contrib/boringssl-cmake/linux-aarch64/crypto/test/trampoline-armv8.S
+++ b/contrib/boringssl-cmake/linux-aarch64/crypto/test/trampoline-armv8.S
@ -13,6 +13,8 @@
 #if defined(BORINGSSL_PREFIX)
 #include <boringssl_prefix_symbols_asm.h>
 #endif
 #include <openssl/arm_arch.h>
 .text
 // abi_test_trampoline loads callee-saved registers from |state|, calls |func|
@ -27,6 +29,7 @@
 .align	4
 abi_test_trampoline:
 .Labi_test_trampoline_begin:
 	AARCH64_SIGN_LINK_REGISTER
 	// Stack layout (low to high addresses)
 	//   x29,x30 (16 bytes)
 	//    d8-d15 (64 bytes)
@ -129,6 +132,7 @@ abi_test_trampoline:
 	ldp	x27, x28, [sp, #144]
 	ldp	x29, x30, [sp], #176
 	AARCH64_VALIDATE_LINK_REGISTER
 	ret
 .size	abi_test_trampoline,.-abi_test_trampoline
 .type	abi_test_clobber_x0, %function
@ -136,6 +140,7 @@ abi_test_trampoline:
 .hidden	abi_test_clobber_x0
 .align	4
 abi_test_clobber_x0:
 	AARCH64_VALID_CALL_TARGET
 	mov	x0, xzr
 	ret
 .size	abi_test_clobber_x0,.-abi_test_clobber_x0
@ -144,6 +149,7 @@ abi_test_clobber_x0:
 .hidden	abi_test_clobber_x1
 .align	4
 abi_test_clobber_x1:
 	AARCH64_VALID_CALL_TARGET
 	mov	x1, xzr
 	ret
 .size	abi_test_clobber_x1,.-abi_test_clobber_x1
@ -152,6 +158,7 @@ abi_test_clobber_x1:
 .hidden	abi_test_clobber_x2
 .align	4
 abi_test_clobber_x2:
 	AARCH64_VALID_CALL_TARGET
 	mov	x2, xzr
 	ret
 .size	abi_test_clobber_x2,.-abi_test_clobber_x2
@ -160,6 +167,7 @@ abi_test_clobber_x2:
 .hidden	abi_test_clobber_x3
 .align	4
 abi_test_clobber_x3:
 	AARCH64_VALID_CALL_TARGET
 	mov	x3, xzr
 	ret
 .size	abi_test_clobber_x3,.-abi_test_clobber_x3
@ -168,6 +176,7 @@ abi_test_clobber_x3:
 .hidden	abi_test_clobber_x4
 .align	4
 abi_test_clobber_x4:
 	AARCH64_VALID_CALL_TARGET
 	mov	x4, xzr
 	ret
 .size	abi_test_clobber_x4,.-abi_test_clobber_x4
@ -176,6 +185,7 @@ abi_test_clobber_x4:
 .hidden	abi_test_clobber_x5
 .align	4
 abi_test_clobber_x5:
 	AARCH64_VALID_CALL_TARGET
 	mov	x5, xzr
 	ret
 .size	abi_test_clobber_x5,.-abi_test_clobber_x5
@ -184,6 +194,7 @@ abi_test_clobber_x5:
 .hidden	abi_test_clobber_x6
 .align	4
 abi_test_clobber_x6:
 	AARCH64_VALID_CALL_TARGET
 	mov	x6, xzr
 	ret
 .size	abi_test_clobber_x6,.-abi_test_clobber_x6
@ -192,6 +203,7 @@ abi_test_clobber_x6:
 .hidden	abi_test_clobber_x7
 .align	4
 abi_test_clobber_x7:
 	AARCH64_VALID_CALL_TARGET
 	mov	x7, xzr
 	ret
 .size	abi_test_clobber_x7,.-abi_test_clobber_x7
@ -200,6 +212,7 @@ abi_test_clobber_x7:
 .hidden	abi_test_clobber_x8
 .align	4
 abi_test_clobber_x8:
 	AARCH64_VALID_CALL_TARGET
 	mov	x8, xzr
 	ret
 .size	abi_test_clobber_x8,.-abi_test_clobber_x8
@ -208,6 +221,7 @@ abi_test_clobber_x8:
 .hidden	abi_test_clobber_x9
 .align	4
 abi_test_clobber_x9:
 	AARCH64_VALID_CALL_TARGET
 	mov	x9, xzr
 	ret
 .size	abi_test_clobber_x9,.-abi_test_clobber_x9
@ -216,6 +230,7 @@ abi_test_clobber_x9:
 .hidden	abi_test_clobber_x10
 .align	4
 abi_test_clobber_x10:
 	AARCH64_VALID_CALL_TARGET
 	mov	x10, xzr
 	ret
 .size	abi_test_clobber_x10,.-abi_test_clobber_x10
@ -224,6 +239,7 @@ abi_test_clobber_x10:
 .hidden	abi_test_clobber_x11
 .align	4
 abi_test_clobber_x11:
 	AARCH64_VALID_CALL_TARGET
 	mov	x11, xzr
 	ret
 .size	abi_test_clobber_x11,.-abi_test_clobber_x11
@ -232,6 +248,7 @@ abi_test_clobber_x11:
 .hidden	abi_test_clobber_x12
 .align	4
 abi_test_clobber_x12:
 	AARCH64_VALID_CALL_TARGET
 	mov	x12, xzr
 	ret
 .size	abi_test_clobber_x12,.-abi_test_clobber_x12
@ -240,6 +257,7 @@ abi_test_clobber_x12:
 .hidden	abi_test_clobber_x13
 .align	4
 abi_test_clobber_x13:
 	AARCH64_VALID_CALL_TARGET
 	mov	x13, xzr
 	ret
 .size	abi_test_clobber_x13,.-abi_test_clobber_x13
@ -248,6 +266,7 @@ abi_test_clobber_x13:
 .hidden	abi_test_clobber_x14
 .align	4
 abi_test_clobber_x14:
 	AARCH64_VALID_CALL_TARGET
 	mov	x14, xzr
 	ret
 .size	abi_test_clobber_x14,.-abi_test_clobber_x14
@ -256,6 +275,7 @@ abi_test_clobber_x14:
 .hidden	abi_test_clobber_x15
 .align	4
 abi_test_clobber_x15:
 	AARCH64_VALID_CALL_TARGET
 	mov	x15, xzr
 	ret
 .size	abi_test_clobber_x15,.-abi_test_clobber_x15
@ -264,6 +284,7 @@ abi_test_clobber_x15:
 .hidden	abi_test_clobber_x16
 .align	4
 abi_test_clobber_x16:
 	AARCH64_VALID_CALL_TARGET
 	mov	x16, xzr
 	ret
 .size	abi_test_clobber_x16,.-abi_test_clobber_x16
@ -272,6 +293,7 @@ abi_test_clobber_x16:
 .hidden	abi_test_clobber_x17
 .align	4
 abi_test_clobber_x17:
 	AARCH64_VALID_CALL_TARGET
 	mov	x17, xzr
 	ret
 .size	abi_test_clobber_x17,.-abi_test_clobber_x17
@ -280,6 +302,7 @@ abi_test_clobber_x17:
 .hidden	abi_test_clobber_x19
 .align	4
 abi_test_clobber_x19:
 	AARCH64_VALID_CALL_TARGET
 	mov	x19, xzr
 	ret
 .size	abi_test_clobber_x19,.-abi_test_clobber_x19
@ -288,6 +311,7 @@ abi_test_clobber_x19:
 .hidden	abi_test_clobber_x20
 .align	4
 abi_test_clobber_x20:
 	AARCH64_VALID_CALL_TARGET
 	mov	x20, xzr
 	ret
 .size	abi_test_clobber_x20,.-abi_test_clobber_x20
@ -296,6 +320,7 @@ abi_test_clobber_x20:
 .hidden	abi_test_clobber_x21
 .align	4
 abi_test_clobber_x21:
 	AARCH64_VALID_CALL_TARGET
 	mov	x21, xzr
 	ret
 .size	abi_test_clobber_x21,.-abi_test_clobber_x21
@ -304,6 +329,7 @@ abi_test_clobber_x21:
 .hidden	abi_test_clobber_x22
 .align	4
 abi_test_clobber_x22:
 	AARCH64_VALID_CALL_TARGET
 	mov	x22, xzr
 	ret
 .size	abi_test_clobber_x22,.-abi_test_clobber_x22
@ -312,6 +338,7 @@ abi_test_clobber_x22:
 .hidden	abi_test_clobber_x23
 .align	4
 abi_test_clobber_x23:
 	AARCH64_VALID_CALL_TARGET
 	mov	x23, xzr
 	ret
 .size	abi_test_clobber_x23,.-abi_test_clobber_x23
@ -320,6 +347,7 @@ abi_test_clobber_x23:
 .hidden	abi_test_clobber_x24
 .align	4
 abi_test_clobber_x24:
 	AARCH64_VALID_CALL_TARGET
 	mov	x24, xzr
 	ret
 .size	abi_test_clobber_x24,.-abi_test_clobber_x24
@ -328,6 +356,7 @@ abi_test_clobber_x24:
 .hidden	abi_test_clobber_x25
 .align	4
 abi_test_clobber_x25:
 	AARCH64_VALID_CALL_TARGET
 	mov	x25, xzr
 	ret
 .size	abi_test_clobber_x25,.-abi_test_clobber_x25
@ -336,6 +365,7 @@ abi_test_clobber_x25:
 .hidden	abi_test_clobber_x26
 .align	4
 abi_test_clobber_x26:
 	AARCH64_VALID_CALL_TARGET
 	mov	x26, xzr
 	ret
 .size	abi_test_clobber_x26,.-abi_test_clobber_x26
@ -344,6 +374,7 @@ abi_test_clobber_x26:
 .hidden	abi_test_clobber_x27
 .align	4
 abi_test_clobber_x27:
 	AARCH64_VALID_CALL_TARGET
 	mov	x27, xzr
 	ret
 .size	abi_test_clobber_x27,.-abi_test_clobber_x27
@ -352,6 +383,7 @@ abi_test_clobber_x27:
 .hidden	abi_test_clobber_x28
 .align	4
 abi_test_clobber_x28:
 	AARCH64_VALID_CALL_TARGET
 	mov	x28, xzr
 	ret
 .size	abi_test_clobber_x28,.-abi_test_clobber_x28
@ -360,6 +392,7 @@ abi_test_clobber_x28:
 .hidden	abi_test_clobber_x29
 .align	4
 abi_test_clobber_x29:
 	AARCH64_VALID_CALL_TARGET
 	mov	x29, xzr
 	ret
 .size	abi_test_clobber_x29,.-abi_test_clobber_x29
@ -368,6 +401,7 @@ abi_test_clobber_x29:
 .hidden	abi_test_clobber_d0
 .align	4
 abi_test_clobber_d0:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d0, xzr
 	ret
 .size	abi_test_clobber_d0,.-abi_test_clobber_d0
@ -376,6 +410,7 @@ abi_test_clobber_d0:
 .hidden	abi_test_clobber_d1
 .align	4
 abi_test_clobber_d1:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d1, xzr
 	ret
 .size	abi_test_clobber_d1,.-abi_test_clobber_d1
@ -384,6 +419,7 @@ abi_test_clobber_d1:
 .hidden	abi_test_clobber_d2
 .align	4
 abi_test_clobber_d2:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d2, xzr
 	ret
 .size	abi_test_clobber_d2,.-abi_test_clobber_d2
@ -392,6 +428,7 @@ abi_test_clobber_d2:
 .hidden	abi_test_clobber_d3
 .align	4
 abi_test_clobber_d3:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d3, xzr
 	ret
 .size	abi_test_clobber_d3,.-abi_test_clobber_d3
@ -400,6 +437,7 @@ abi_test_clobber_d3:
 .hidden	abi_test_clobber_d4
 .align	4
 abi_test_clobber_d4:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d4, xzr
 	ret
 .size	abi_test_clobber_d4,.-abi_test_clobber_d4
@ -408,6 +446,7 @@ abi_test_clobber_d4:
 .hidden	abi_test_clobber_d5
 .align	4
 abi_test_clobber_d5:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d5, xzr
 	ret
 .size	abi_test_clobber_d5,.-abi_test_clobber_d5
@ -416,6 +455,7 @@ abi_test_clobber_d5:
 .hidden	abi_test_clobber_d6
 .align	4
 abi_test_clobber_d6:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d6, xzr
 	ret
 .size	abi_test_clobber_d6,.-abi_test_clobber_d6
@ -424,6 +464,7 @@ abi_test_clobber_d6:
 .hidden	abi_test_clobber_d7
 .align	4
 abi_test_clobber_d7:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d7, xzr
 	ret
 .size	abi_test_clobber_d7,.-abi_test_clobber_d7
@ -432,6 +473,7 @@ abi_test_clobber_d7:
 .hidden	abi_test_clobber_d8
 .align	4
 abi_test_clobber_d8:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d8, xzr
 	ret
 .size	abi_test_clobber_d8,.-abi_test_clobber_d8
@ -440,6 +482,7 @@ abi_test_clobber_d8:
 .hidden	abi_test_clobber_d9
 .align	4
 abi_test_clobber_d9:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d9, xzr
 	ret
 .size	abi_test_clobber_d9,.-abi_test_clobber_d9
@ -448,6 +491,7 @@ abi_test_clobber_d9:
 .hidden	abi_test_clobber_d10
 .align	4
 abi_test_clobber_d10:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d10, xzr
 	ret
 .size	abi_test_clobber_d10,.-abi_test_clobber_d10
@ -456,6 +500,7 @@ abi_test_clobber_d10:
 .hidden	abi_test_clobber_d11
 .align	4
 abi_test_clobber_d11:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d11, xzr
 	ret
 .size	abi_test_clobber_d11,.-abi_test_clobber_d11
@ -464,6 +509,7 @@ abi_test_clobber_d11:
 .hidden	abi_test_clobber_d12
 .align	4
 abi_test_clobber_d12:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d12, xzr
 	ret
 .size	abi_test_clobber_d12,.-abi_test_clobber_d12
@ -472,6 +518,7 @@ abi_test_clobber_d12:
 .hidden	abi_test_clobber_d13
 .align	4
 abi_test_clobber_d13:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d13, xzr
 	ret
 .size	abi_test_clobber_d13,.-abi_test_clobber_d13
@ -480,6 +527,7 @@ abi_test_clobber_d13:
 .hidden	abi_test_clobber_d14
 .align	4
 abi_test_clobber_d14:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d14, xzr
 	ret
 .size	abi_test_clobber_d14,.-abi_test_clobber_d14
@ -488,6 +536,7 @@ abi_test_clobber_d14:
 .hidden	abi_test_clobber_d15
 .align	4
 abi_test_clobber_d15:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d15, xzr
 	ret
 .size	abi_test_clobber_d15,.-abi_test_clobber_d15
@ -496,6 +545,7 @@ abi_test_clobber_d15:
 .hidden	abi_test_clobber_d16
 .align	4
 abi_test_clobber_d16:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d16, xzr
 	ret
 .size	abi_test_clobber_d16,.-abi_test_clobber_d16
@ -504,6 +554,7 @@ abi_test_clobber_d16:
 .hidden	abi_test_clobber_d17
 .align	4
 abi_test_clobber_d17:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d17, xzr
 	ret
 .size	abi_test_clobber_d17,.-abi_test_clobber_d17
@ -512,6 +563,7 @@ abi_test_clobber_d17:
 .hidden	abi_test_clobber_d18
 .align	4
 abi_test_clobber_d18:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d18, xzr
 	ret
 .size	abi_test_clobber_d18,.-abi_test_clobber_d18
@ -520,6 +572,7 @@ abi_test_clobber_d18:
 .hidden	abi_test_clobber_d19
 .align	4
 abi_test_clobber_d19:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d19, xzr
 	ret
 .size	abi_test_clobber_d19,.-abi_test_clobber_d19
@ -528,6 +581,7 @@ abi_test_clobber_d19:
 .hidden	abi_test_clobber_d20
 .align	4
 abi_test_clobber_d20:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d20, xzr
 	ret
 .size	abi_test_clobber_d20,.-abi_test_clobber_d20
@ -536,6 +590,7 @@ abi_test_clobber_d20:
 .hidden	abi_test_clobber_d21
 .align	4
 abi_test_clobber_d21:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d21, xzr
 	ret
 .size	abi_test_clobber_d21,.-abi_test_clobber_d21
@ -544,6 +599,7 @@ abi_test_clobber_d21:
 .hidden	abi_test_clobber_d22
 .align	4
 abi_test_clobber_d22:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d22, xzr
 	ret
 .size	abi_test_clobber_d22,.-abi_test_clobber_d22
@ -552,6 +608,7 @@ abi_test_clobber_d22:
 .hidden	abi_test_clobber_d23
 .align	4
 abi_test_clobber_d23:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d23, xzr
 	ret
 .size	abi_test_clobber_d23,.-abi_test_clobber_d23
@ -560,6 +617,7 @@ abi_test_clobber_d23:
 .hidden	abi_test_clobber_d24
 .align	4
 abi_test_clobber_d24:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d24, xzr
 	ret
 .size	abi_test_clobber_d24,.-abi_test_clobber_d24
@ -568,6 +626,7 @@ abi_test_clobber_d24:
 .hidden	abi_test_clobber_d25
 .align	4
 abi_test_clobber_d25:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d25, xzr
 	ret
 .size	abi_test_clobber_d25,.-abi_test_clobber_d25
@ -576,6 +635,7 @@ abi_test_clobber_d25:
 .hidden	abi_test_clobber_d26
 .align	4
 abi_test_clobber_d26:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d26, xzr
 	ret
 .size	abi_test_clobber_d26,.-abi_test_clobber_d26
@ -584,6 +644,7 @@ abi_test_clobber_d26:
 .hidden	abi_test_clobber_d27
 .align	4
 abi_test_clobber_d27:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d27, xzr
 	ret
 .size	abi_test_clobber_d27,.-abi_test_clobber_d27
@ -592,6 +653,7 @@ abi_test_clobber_d27:
 .hidden	abi_test_clobber_d28
 .align	4
 abi_test_clobber_d28:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d28, xzr
 	ret
 .size	abi_test_clobber_d28,.-abi_test_clobber_d28
@ -600,6 +662,7 @@ abi_test_clobber_d28:
 .hidden	abi_test_clobber_d29
 .align	4
 abi_test_clobber_d29:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d29, xzr
 	ret
 .size	abi_test_clobber_d29,.-abi_test_clobber_d29
@ -608,6 +671,7 @@ abi_test_clobber_d29:
 .hidden	abi_test_clobber_d30
 .align	4
 abi_test_clobber_d30:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d30, xzr
 	ret
 .size	abi_test_clobber_d30,.-abi_test_clobber_d30
@ -616,6 +680,7 @@ abi_test_clobber_d30:
 .hidden	abi_test_clobber_d31
 .align	4
 abi_test_clobber_d31:
 	AARCH64_VALID_CALL_TARGET
 	fmov	d31, xzr
 	ret
 .size	abi_test_clobber_d31,.-abi_test_clobber_d31
@ -624,6 +689,7 @@ abi_test_clobber_d31:
 .hidden	abi_test_clobber_v8_upper
 .align	4
 abi_test_clobber_v8_upper:
 	AARCH64_VALID_CALL_TARGET
 	fmov	v8.d[1], xzr
 	ret
 .size	abi_test_clobber_v8_upper,.-abi_test_clobber_v8_upper
@ -632,6 +698,7 @@ abi_test_clobber_v8_upper:
 .hidden	abi_test_clobber_v9_upper
 .align	4
 abi_test_clobber_v9_upper:
 	AARCH64_VALID_CALL_TARGET
 	fmov	v9.d[1], xzr
 	ret
 .size	abi_test_clobber_v9_upper,.-abi_test_clobber_v9_upper
@ -640,6 +707,7 @@ abi_test_clobber_v9_upper:
 .hidden	abi_test_clobber_v10_upper
 .align	4
 abi_test_clobber_v10_upper:
 	AARCH64_VALID_CALL_TARGET
 	fmov	v10.d[1], xzr
 	ret
 .size	abi_test_clobber_v10_upper,.-abi_test_clobber_v10_upper
@ -648,6 +716,7 @@ abi_test_clobber_v10_upper:
 .hidden	abi_test_clobber_v11_upper
 .align	4
 abi_test_clobber_v11_upper:
 	AARCH64_VALID_CALL_TARGET
 	fmov	v11.d[1], xzr
 	ret
 .size	abi_test_clobber_v11_upper,.-abi_test_clobber_v11_upper
@ -656,6 +725,7 @@ abi_test_clobber_v11_upper:
 .hidden	abi_test_clobber_v12_upper
 .align	4
 abi_test_clobber_v12_upper:
 	AARCH64_VALID_CALL_TARGET
 	fmov	v12.d[1], xzr
 	ret
 .size	abi_test_clobber_v12_upper,.-abi_test_clobber_v12_upper
@ -664,6 +734,7 @@ abi_test_clobber_v12_upper:
 .hidden	abi_test_clobber_v13_upper
 .align	4
 abi_test_clobber_v13_upper:
 	AARCH64_VALID_CALL_TARGET
 	fmov	v13.d[1], xzr
 	ret
 .size	abi_test_clobber_v13_upper,.-abi_test_clobber_v13_upper
@ -672,6 +743,7 @@ abi_test_clobber_v13_upper:
 .hidden	abi_test_clobber_v14_upper
 .align	4
 abi_test_clobber_v14_upper:
 	AARCH64_VALID_CALL_TARGET
 	fmov	v14.d[1], xzr
 	ret
 .size	abi_test_clobber_v14_upper,.-abi_test_clobber_v14_upper
@ -680,8 +752,10 @@ abi_test_clobber_v14_upper:
 .hidden	abi_test_clobber_v15_upper
 .align	4
 abi_test_clobber_v15_upper:
 	AARCH64_VALID_CALL_TARGET
 	fmov	v15.d[1], xzr
 	ret
 .size	abi_test_clobber_v15_upper,.-abi_test_clobber_v15_upper
 #endif
 #endif  // !OPENSSL_NO_ASM
 .section	.note.GNU-stack,"",%progbits
--- a/contrib/boringssl-cmake/linux-aarch64/crypto/third_party/sike/asm/fp-armv8.S
+++ b/contrib/boringssl-cmake/linux-aarch64/crypto/third_party/sike/asm/fp-armv8.S
@ -1,998 +0,0 @@
 // This file is generated from a similarly-named Perl script in the BoringSSL
 // source tree. Do not edit by hand.
 #if !defined(__has_feature)
 #define __has_feature(x) 0
 #endif
 #if __has_feature(memory_sanitizer) && !defined(OPENSSL_NO_ASM)
 #define OPENSSL_NO_ASM
 #endif
 #if !defined(OPENSSL_NO_ASM)
 #if defined(__aarch64__)
 #if defined(BORINGSSL_PREFIX)
 #include <boringssl_prefix_symbols_asm.h>
 #endif
 .section	.rodata
 # p434 x 2
 .Lp434x2:
 .quad	0xFFFFFFFFFFFFFFFE, 0xFFFFFFFFFFFFFFFF
 .quad	0xFB82ECF5C5FFFFFF, 0xF78CB8F062B15D47
 .quad	0xD9F8BFAD038A40AC, 0x0004683E4E2EE688
 # p434 + 1
 .Lp434p1:
 .quad	0xFDC1767AE3000000, 0x7BC65C783158AEA3
 .quad	0x6CFC5FD681C52056, 0x0002341F27177344
 .text
 .globl	sike_mpmul
 .hidden	sike_mpmul
 .align	4
 sike_mpmul:
 	stp	x29, x30, [sp,#-96]!
 	add	x29, sp, #0
 	stp	x19, x20, [sp,#16]
 	stp	x21, x22, [sp,#32]
 	stp	x23, x24, [sp,#48]
 	stp	x25, x26, [sp,#64]
 	stp	x27, x28, [sp,#80]
 	ldp	x3,  x4, [x0]
 	ldp	x5,  x6, [x0,#16]
 	ldp	x7,  x8, [x0,#32]
 	ldr	x9,      [x0,#48]
 	ldp	x10, x11, [x1,#0]
 	ldp	x12, x13, [x1,#16]
 	ldp	x14, x15, [x1,#32]
 	ldr	x16,      [x1,#48]
        // x3-x7 <- AH + AL, x7 <- carry
 	adds	x3, x3, x7
 	adcs	x4, x4, x8
 	adcs	x5, x5, x9
 	adcs	x6, x6, xzr
 	adc	x7, xzr, xzr
        // x10-x13 <- BH + BL, x8 <- carry
 	adds	x10, x10, x14
 	adcs	x11, x11, x15
 	adcs	x12, x12, x16
 	adcs	x13, x13, xzr
 	adc	x8, xzr, xzr
        // x9 <- combined carry
 	and	x9, x7, x8
        // x7-x8 <- mask
 	sub	x7, xzr, x7
 	sub	x8, xzr, x8
        // x15-x19 <- masked (BH + BL)
 	and	x14, x10, x7
 	and	x15, x11, x7
 	and	x16, x12, x7
 	and	x17, x13, x7
        // x20-x23 <- masked (AH + AL)
 	and	x20, x3, x8
 	and	x21, x4, x8
 	and	x22, x5, x8
 	and	x23, x6, x8
        // x15-x19, x7 <- masked (AH+AL) + masked (BH+BL), step 1
 	adds	x14, x14, x20
 	adcs	x15, x15, x21
 	adcs	x16, x16, x22
 	adcs	x17, x17, x23
 	adc	x7, x9, xzr
        // x8-x9,x19,x20-x24 <- (AH+AL) x (BH+BL), low part
 	stp	x3, x4, [x2,#0]
                // A0-A1 <- AH + AL, T0 <- mask
 	adds	x3, x3, x5
 	adcs	x4, x4, x6
 	adc	x25, xzr, xzr
        // C6, T1 <- BH + BL, C7 <- mask
 	adds	x23, x10, x12
 	adcs	x26, x11, x13
 	adc	x24, xzr, xzr
        // C0-C1 <- masked (BH + BL)
 	sub	x19, xzr, x25
 	sub	x20, xzr, x24
 	and	x8, x23, x19
 	and	x9, x26, x19
        // C4-C5 <- masked (AH + AL), T0 <- combined carry
 	and	x21, x3, x20
 	and	x22, x4, x20
 	mul	x19, x3, x23
 	mul	x20, x3, x26
 	and	x25, x25, x24
        // C0-C1, T0 <- (AH+AL) x (BH+BL), part 1
 	adds	x8, x21, x8
 	umulh	x21, x3, x26
 	adcs	x9, x22, x9
 	umulh	x22, x3, x23
 	adc	x25, x25, xzr
        // C2-C5 <- (AH+AL) x (BH+BL), low part
 	mul	x3, x4, x23
 	umulh	x23, x4, x23
 	adds	x20, x20, x22
 	adc	x21, x21, xzr
 	mul	x24, x4, x26
 	umulh	x26, x4, x26
 	adds	x20, x20, x3
 	adcs	x21, x21, x23
 	adc	x22, xzr, xzr
 	adds	x21, x21, x24
 	adc	x22, x22, x26
 	ldp	x3, x4, [x2,#0]
        // C2-C5, T0 <- (AH+AL) x (BH+BL), final part
 	adds	x21, x8, x21
 	umulh	x24, x3, x10
 	umulh	x26, x3, x11
 	adcs	x22, x9, x22
 	mul	x8, x3, x10
 	mul	x9, x3, x11
 	adc	x25, x25, xzr
        // C0-C1, T1, C7 <- AL x BL
 	mul	x3, x4, x10
 	umulh	x10, x4, x10
 	adds	x9, x9, x24
 	adc	x26, x26, xzr
 	mul	x23, x4, x11
 	umulh	x11, x4, x11
 	adds	x9, x9, x3
 	adcs	x26, x26, x10
 	adc	x24, xzr, xzr
 	adds	x26, x26, x23
 	adc	x24, x24, x11
        // C2-C5, T0 <- (AH+AL) x (BH+BL) - ALxBL
 	mul	x3, x5, x12
 	umulh	x10, x5, x12
 	subs	x19, x19, x8
 	sbcs	x20, x20, x9
 	sbcs	x21, x21, x26
 	mul	x4, x5, x13
 	umulh	x23, x5, x13
 	sbcs	x22, x22, x24
 	sbc	x25, x25, xzr
        // A0, A1, C6, B0 <- AH x BH
 	mul	x5, x6, x12
 	umulh	x12, x6, x12
 	adds	x4, x4, x10
 	adc	x23, x23, xzr
 	mul	x11, x6, x13
 	umulh	x13, x6, x13
 	adds	x4, x4, x5
 	adcs	x23, x23, x12
 	adc	x10, xzr, xzr
 	adds	x23, x23, x11
 	adc	x10, x10, x13
        // C2-C5, T0 <- (AH+AL) x (BH+BL) - ALxBL - AHxBH
 	subs	x19, x19, x3
 	sbcs	x20, x20, x4
 	sbcs	x21, x21, x23
 	sbcs	x22, x22, x10
 	sbc	x25, x25, xzr
 	adds	x19, x19, x26
 	adcs	x20, x20, x24
 	adcs	x21, x21, x3
 	adcs	x22, x22, x4
 	adcs	x23, x25, x23
 	adc	x24, x10, xzr
        // x15-x19, x7 <- (AH+AL) x (BH+BL), final step
 	adds	x14, x14, x21
 	adcs	x15, x15, x22
 	adcs	x16, x16, x23
 	adcs	x17, x17, x24
 	adc	x7, x7, xzr
        // Load AL
 	ldp	x3, x4, [x0]
 	ldp	x5, x6, [x0,#16]
        // Load BL
 	ldp	x10, x11, [x1,#0]
 	ldp	x12, x13, [x1,#16]
        // Temporarily store x8 in x2
 	stp	x8, x9, [x2,#0]
        // x21-x28 <- AL x BL
                // A0-A1 <- AH + AL, T0 <- mask
 	adds	x3, x3, x5
 	adcs	x4, x4, x6
 	adc	x8, xzr, xzr
        // C6, T1 <- BH + BL, C7 <- mask
 	adds	x27, x10, x12
 	adcs	x9, x11, x13
 	adc	x28, xzr, xzr
        // C0-C1 <- masked (BH + BL)
 	sub	x23, xzr, x8
 	sub	x24, xzr, x28
 	and	x21, x27, x23
 	and	x22, x9, x23
        // C4-C5 <- masked (AH + AL), T0 <- combined carry
 	and	x25, x3, x24
 	and	x26, x4, x24
 	mul	x23, x3, x27
 	mul	x24, x3, x9
 	and	x8, x8, x28
        // C0-C1, T0 <- (AH+AL) x (BH+BL), part 1
 	adds	x21, x25, x21
 	umulh	x25, x3, x9
 	adcs	x22, x26, x22
 	umulh	x26, x3, x27
 	adc	x8, x8, xzr
        // C2-C5 <- (AH+AL) x (BH+BL), low part
 	mul	x3, x4, x27
 	umulh	x27, x4, x27
 	adds	x24, x24, x26
 	adc	x25, x25, xzr
 	mul	x28, x4, x9
 	umulh	x9, x4, x9
 	adds	x24, x24, x3
 	adcs	x25, x25, x27
 	adc	x26, xzr, xzr
 	adds	x25, x25, x28
 	adc	x26, x26, x9
 	ldp	x3, x4, [x0,#0]
        // C2-C5, T0 <- (AH+AL) x (BH+BL), final part
 	adds	x25, x21, x25
 	umulh	x28, x3, x10
 	umulh	x9, x3, x11
 	adcs	x26, x22, x26
 	mul	x21, x3, x10
 	mul	x22, x3, x11
 	adc	x8, x8, xzr
        // C0-C1, T1, C7 <- AL x BL
 	mul	x3, x4, x10
 	umulh	x10, x4, x10
 	adds	x22, x22, x28
 	adc	x9, x9, xzr
 	mul	x27, x4, x11
 	umulh	x11, x4, x11
 	adds	x22, x22, x3
 	adcs	x9, x9, x10
 	adc	x28, xzr, xzr
 	adds	x9, x9, x27
 	adc	x28, x28, x11
        // C2-C5, T0 <- (AH+AL) x (BH+BL) - ALxBL
 	mul	x3, x5, x12
 	umulh	x10, x5, x12
 	subs	x23, x23, x21
 	sbcs	x24, x24, x22
 	sbcs	x25, x25, x9
 	mul	x4, x5, x13
 	umulh	x27, x5, x13
 	sbcs	x26, x26, x28
 	sbc	x8, x8, xzr
        // A0, A1, C6, B0 <- AH x BH
 	mul	x5, x6, x12
 	umulh	x12, x6, x12
 	adds	x4, x4, x10
 	adc	x27, x27, xzr
 	mul	x11, x6, x13
 	umulh	x13, x6, x13
 	adds	x4, x4, x5
 	adcs	x27, x27, x12
 	adc	x10, xzr, xzr
 	adds	x27, x27, x11
 	adc	x10, x10, x13
        // C2-C5, T0 <- (AH+AL) x (BH+BL) - ALxBL - AHxBH
 	subs	x23, x23, x3
 	sbcs	x24, x24, x4
 	sbcs	x25, x25, x27
 	sbcs	x26, x26, x10
 	sbc	x8, x8, xzr
 	adds	x23, x23, x9
 	adcs	x24, x24, x28
 	adcs	x25, x25, x3
 	adcs	x26, x26, x4
 	adcs	x27, x8, x27
 	adc	x28, x10, xzr
        // Restore x8
 	ldp	x8, x9, [x2,#0]
        // x8-x10,x20,x15-x17,x19 <- maskd (AH+AL) x (BH+BL) - ALxBL
 	subs	x8, x8, x21
 	sbcs	x9, x9, x22
 	sbcs	x19, x19, x23
 	sbcs	x20, x20, x24
 	sbcs	x14, x14, x25
 	sbcs	x15, x15, x26
 	sbcs	x16, x16, x27
 	sbcs	x17, x17, x28
 	sbc	x7, x7, xzr
        // Store ALxBL, low
 	stp	x21, x22, [x2]
 	stp	x23, x24, [x2,#16]
        // Load AH
 	ldp	x3, x4, [x0,#32]
 	ldr	x5,     [x0,#48]
        // Load BH
 	ldp	x10, x11, [x1,#32]
 	ldr	x12,      [x1,#48]
 	adds	x8,  x8, x25
 	adcs	x9,  x9, x26
 	adcs	x19, x19, x27
 	adcs	x20, x20, x28
 	adc	x1, xzr, xzr
 	add	x0, x0, #32
        // Temporarily store x8,x9 in x2
 	stp	x8,x9, [x2,#32]
        // x21-x28 <- AH x BH
        // A0 * B0
 	mul	x21, x3, x10  // C0
 	umulh	x24, x3, x10
        // A0 * B1
 	mul	x22, x3, x11
 	umulh	x23, x3, x11
        // A1 * B0
 	mul	x8, x4, x10
 	umulh	x9, x4, x10
 	adds	x22, x22, x24
 	adc	x23, x23, xzr
        // A0 * B2
 	mul	x27, x3, x12
 	umulh	x28, x3, x12
 	adds	x22, x22, x8  // C1
 	adcs	x23, x23, x9
 	adc	x24, xzr, xzr
        // A2 * B0
 	mul	x8, x5, x10
 	umulh	x25, x5, x10
 	adds	x23, x23, x27
 	adcs	x24, x24, x25
 	adc	x25, xzr, xzr
        // A1 * B1
 	mul	x27, x4, x11
 	umulh	x9, x4, x11
 	adds	x23, x23, x8
 	adcs	x24, x24, x28
 	adc	x25, x25, xzr
        // A1 * B2
 	mul	x8, x4, x12
 	umulh	x28, x4, x12
 	adds	x23, x23, x27 // C2
 	adcs	x24, x24, x9
 	adc	x25, x25, xzr
        // A2 * B1
 	mul	x27, x5, x11
 	umulh	x9, x5, x11
 	adds	x24, x24, x8
 	adcs	x25, x25, x28
 	adc	x26, xzr, xzr
        // A2 * B2
 	mul	x8, x5, x12
 	umulh	x28, x5, x12
 	adds	x24, x24, x27 // C3
 	adcs	x25, x25, x9
 	adc	x26, x26, xzr
 	adds	x25, x25, x8 // C4
 	adc	x26, x26, x28 // C5
        // Restore x8,x9
 	ldp	x8,x9, [x2,#32]
 	neg	x1, x1
        // x8-x9,x19,x20,x14-x17 <- (AH+AL) x (BH+BL) - ALxBL - AHxBH
 	subs	x8, x8, x21
 	sbcs	x9, x9, x22
 	sbcs	x19, x19, x23
 	sbcs	x20, x20, x24
 	sbcs	x14, x14, x25
 	sbcs	x15, x15, x26
 	sbcs	x16, x16, xzr
 	sbcs	x17, x17, xzr
 	sbc	x7, x7, xzr
        // Store (AH+AL) x (BH+BL) - ALxBL - AHxBH, low
 	stp	x8,  x9, [x2,#32]
 	stp	x19, x20, [x2,#48]
 	adds	x1,  x1, #1
 	adcs	x14, x14, x21
 	adcs	x15, x15, x22
 	adcs	x16, x16, x23
 	adcs	x17, x17, x24
 	adcs	x25,  x7, x25
 	adc	x26, x26, xzr
 	stp	x14, x15, [x2,#64]
 	stp	x16, x17, [x2,#80]
 	stp	x25, x26, [x2,#96]
 	ldp	x19, x20, [x29,#16]
 	ldp	x21, x22, [x29,#32]
 	ldp	x23, x24, [x29,#48]
 	ldp	x25, x26, [x29,#64]
 	ldp	x27, x28, [x29,#80]
 	ldp	x29, x30, [sp],#96
 	ret
 .globl	sike_fprdc
 .hidden	sike_fprdc
 .align	4
 sike_fprdc:
 	stp	x29, x30, [sp, #-96]!
 	add	x29, sp, xzr
 	stp	x19, x20, [sp,#16]
 	stp	x21, x22, [sp,#32]
 	stp	x23, x24, [sp,#48]
 	stp	x25, x26, [sp,#64]
 	stp	x27, x28, [sp,#80]
 	ldp	x2, x3, [x0,#0]       // a[0-1]
        // Load the prime constant
 	adrp	x26, .Lp434p1
 	add	x26, x26, :lo12:.Lp434p1
 	ldp	x23, x24, [x26, #0x0]
 	ldp	x25, x26, [x26,#0x10]
        // a[0-1] * p434+1
 	mul	x4, x2, x23  // C0
 	umulh	x7, x2, x23
 	mul	x5, x2, x24
 	umulh	x6, x2, x24
 	mul	x10, x3, x23
 	umulh	x11, x3, x23
 	adds	x5, x5, x7
 	adc	x6, x6, xzr
 	mul	x27, x2, x25
 	umulh	x28, x2, x25
 	adds	x5, x5, x10  // C1
 	adcs	x6, x6, x11
 	adc	x7, xzr, xzr
 	mul	x10, x3, x24
 	umulh	x11, x3, x24
 	adds	x6, x6, x27
 	adcs	x7, x7, x28
 	adc	x8, xzr, xzr
 	mul	x27, x2, x26
 	umulh	x28, x2, x26
 	adds	x6, x6, x10  // C2
 	adcs	x7, x7, x11
 	adc	x8, x8, xzr
 	mul	x10, x3, x25
 	umulh	x11, x3, x25
 	adds	x7, x7, x27
 	adcs	x8, x8, x28
 	adc	x9, xzr, xzr
 	mul	x27, x3, x26
 	umulh	x28, x3, x26
 	adds	x7, x7, x10  // C3
 	adcs	x8, x8, x11
 	adc	x9, x9, xzr
 	adds	x8, x8, x27  // C4
 	adc	x9, x9, x28  // C5
 	ldp	x10, x11, [x0, #0x18]
 	ldp	x12, x13, [x0, #0x28]
 	ldp	x14, x15, [x0, #0x38]
 	ldp	x16, x17, [x0, #0x48]
 	ldp	x19, x20, [x0, #0x58]
 	ldr	x21,      [x0, #0x68]
 	adds	x10, x10, x4
 	adcs	x11, x11, x5
 	adcs	x12, x12, x6
 	adcs	x13, x13, x7
 	adcs	x14, x14, x8
 	adcs	x15, x15, x9
 	adcs	x22, x16, xzr
 	adcs	x17, x17, xzr
 	adcs	x19, x19, xzr
 	adcs	x20, x20, xzr
 	adc	x21, x21, xzr
 	ldr	x2,  [x0,#0x10]       // a[2]
        // a[2-3] * p434+1
 	mul	x4, x2, x23  // C0
 	umulh	x7, x2, x23
 	mul	x5, x2, x24
 	umulh	x6, x2, x24
 	mul	x0, x10, x23
 	umulh	x3, x10, x23
 	adds	x5, x5, x7
 	adc	x6, x6, xzr
 	mul	x27, x2, x25
 	umulh	x28, x2, x25
 	adds	x5, x5, x0  // C1
 	adcs	x6, x6, x3
 	adc	x7, xzr, xzr
 	mul	x0, x10, x24
 	umulh	x3, x10, x24
 	adds	x6, x6, x27
 	adcs	x7, x7, x28
 	adc	x8, xzr, xzr
 	mul	x27, x2, x26
 	umulh	x28, x2, x26
 	adds	x6, x6, x0  // C2
 	adcs	x7, x7, x3
 	adc	x8, x8, xzr
 	mul	x0, x10, x25
 	umulh	x3, x10, x25
 	adds	x7, x7, x27
 	adcs	x8, x8, x28
 	adc	x9, xzr, xzr
 	mul	x27, x10, x26
 	umulh	x28, x10, x26
 	adds	x7, x7, x0  // C3
 	adcs	x8, x8, x3
 	adc	x9, x9, xzr
 	adds	x8, x8, x27  // C4
 	adc	x9, x9, x28  // C5
 	adds	x12, x12, x4
 	adcs	x13, x13, x5
 	adcs	x14, x14, x6
 	adcs	x15, x15, x7
 	adcs	x16, x22, x8
 	adcs	x17, x17, x9
 	adcs	x22, x19, xzr
 	adcs	x20, x20, xzr
 	adc	x21, x21, xzr
 	mul	x4, x11, x23  // C0
 	umulh	x7, x11, x23
 	mul	x5, x11, x24
 	umulh	x6, x11, x24
 	mul	x10, x12, x23
 	umulh	x3, x12, x23
 	adds	x5, x5, x7
 	adc	x6, x6, xzr
 	mul	x27, x11, x25
 	umulh	x28, x11, x25
 	adds	x5, x5, x10  // C1
 	adcs	x6, x6, x3
 	adc	x7, xzr, xzr
 	mul	x10, x12, x24
 	umulh	x3, x12, x24
 	adds	x6, x6, x27
 	adcs	x7, x7, x28
 	adc	x8, xzr, xzr
 	mul	x27, x11, x26
 	umulh	x28, x11, x26
 	adds	x6, x6, x10  // C2
 	adcs	x7, x7, x3
 	adc	x8, x8, xzr
 	mul	x10, x12, x25
 	umulh	x3, x12, x25
 	adds	x7, x7, x27
 	adcs	x8, x8, x28
 	adc	x9, xzr, xzr
 	mul	x27, x12, x26
 	umulh	x28, x12, x26
 	adds	x7, x7, x10  // C3
 	adcs	x8, x8, x3
 	adc	x9, x9, xzr
 	adds	x8, x8, x27  // C4
 	adc	x9, x9, x28  // C5
 	adds	x14, x14, x4
 	adcs	x15, x15, x5
 	adcs	x16, x16, x6
 	adcs	x17, x17, x7
 	adcs	x19, x22, x8
 	adcs	x20, x20, x9
 	adc	x22, x21, xzr
 	stp	x14, x15, [x1, #0x0]     // C0, C1
 	mul	x4, x13, x23    // C0
 	umulh	x10, x13, x23
 	mul	x5, x13, x24
 	umulh	x27, x13, x24
 	adds	x5, x5, x10    // C1
 	adc	x10, xzr, xzr
 	mul	x6, x13, x25
 	umulh	x28, x13, x25
 	adds	x27, x10, x27
 	adcs	x6, x6, x27    // C2
 	adc	x10, xzr, xzr
 	mul	x7, x13, x26
 	umulh	x8, x13, x26
 	adds	x28, x10, x28
 	adcs	x7, x7, x28    // C3
 	adc	x8, x8, xzr    // C4
 	adds	x16, x16, x4
 	adcs	x17, x17, x5
 	adcs	x19, x19, x6
 	adcs	x20, x20, x7
 	adc	x21, x22, x8
 	str	x16,       [x1, #0x10]
 	stp	x17, x19,  [x1, #0x18]
 	stp	x20, x21,  [x1, #0x28]
 	ldp	x19, x20, [x29,#16]
 	ldp	x21, x22, [x29,#32]
 	ldp	x23, x24, [x29,#48]
 	ldp	x25, x26, [x29,#64]
 	ldp	x27, x28, [x29,#80]
 	ldp	x29, x30, [sp],#96
 	ret
 .globl	sike_fpadd
 .hidden	sike_fpadd
 .align	4
 sike_fpadd:
 	stp	x29,x30, [sp,#-16]!
 	add	x29, sp, #0
 	ldp	x3, x4,   [x0,#0]
 	ldp	x5, x6,   [x0,#16]
 	ldp	x7, x8,   [x0,#32]
 	ldr	x9,       [x0,#48]
 	ldp	x11, x12, [x1,#0]
 	ldp	x13, x14, [x1,#16]
 	ldp	x15, x16, [x1,#32]
 	ldr	x17,      [x1,#48]
        // Add a + b
 	adds	x3, x3, x11
 	adcs	x4, x4, x12
 	adcs	x5, x5, x13
 	adcs	x6, x6, x14
 	adcs	x7, x7, x15
 	adcs	x8, x8, x16
 	adc	x9, x9, x17
        //  Subtract 2xp434
 	adrp	x17, .Lp434x2
 	add	x17, x17, :lo12:.Lp434x2
 	ldp	x11, x12, [x17, #0]
 	ldp	x13, x14, [x17, #16]
 	ldp	x15, x16, [x17, #32]
 	subs	x3, x3, x11
 	sbcs	x4, x4, x12
 	sbcs	x5, x5, x12
 	sbcs	x6, x6, x13
 	sbcs	x7, x7, x14
 	sbcs	x8, x8, x15
 	sbcs	x9, x9, x16
 	sbc	x0, xzr, xzr    // x0 can be reused now
        // Add 2xp434 anded with the mask in x0
 	and	x11, x11, x0
 	and	x12, x12, x0
 	and	x13, x13, x0
 	and	x14, x14, x0
 	and	x15, x15, x0
 	and	x16, x16, x0
 	adds	x3, x3, x11
 	adcs	x4, x4, x12
 	adcs	x5, x5, x12
 	adcs	x6, x6, x13
 	adcs	x7, x7, x14
 	adcs	x8, x8, x15
 	adc	x9, x9, x16
 	stp	x3, x4,  [x2,#0]
 	stp	x5, x6,  [x2,#16]
 	stp	x7, x8,  [x2,#32]
 	str	x9,      [x2,#48]
 	ldp	x29, x30, [sp],#16
 	ret
 .globl	sike_fpsub
 .hidden	sike_fpsub
 .align	4
 sike_fpsub:
 	stp	x29, x30, [sp,#-16]!
 	add	x29, sp, #0
 	ldp	x3, x4,   [x0,#0]
 	ldp	x5, x6,   [x0,#16]
 	ldp	x7, x8,   [x0,#32]
 	ldr	x9,       [x0,#48]
 	ldp	x11, x12, [x1,#0]
 	ldp	x13, x14, [x1,#16]
 	ldp	x15, x16, [x1,#32]
 	ldr	x17,      [x1,#48]
        // Subtract a - b
 	subs	x3, x3, x11
 	sbcs	x4, x4, x12
 	sbcs	x5, x5, x13
 	sbcs	x6, x6, x14
 	sbcs	x7, x7, x15
 	sbcs	x8, x8, x16
 	sbcs	x9, x9, x17
 	sbc	x0, xzr, xzr
        // Add 2xp434 anded with the mask in x0
 	adrp	x17, .Lp434x2
 	add	x17, x17, :lo12:.Lp434x2
        // First half
 	ldp	x11, x12, [x17, #0]
 	ldp	x13, x14, [x17, #16]
 	ldp	x15, x16, [x17, #32]
        // Add 2xp434 anded with the mask in x0
 	and	x11, x11, x0
 	and	x12, x12, x0
 	and	x13, x13, x0
 	and	x14, x14, x0
 	and	x15, x15, x0
 	and	x16, x16, x0
 	adds	x3, x3, x11
 	adcs	x4, x4, x12
 	adcs	x5, x5, x12
 	adcs	x6, x6, x13
 	adcs	x7, x7, x14
 	adcs	x8, x8, x15
 	adc	x9, x9, x16
 	stp	x3, x4,  [x2,#0]
 	stp	x5, x6,  [x2,#16]
 	stp	x7, x8,  [x2,#32]
 	str	x9,      [x2,#48]
 	ldp	x29, x30, [sp],#16
 	ret
 .globl	sike_mpadd_asm
 .hidden	sike_mpadd_asm
 .align	4
 sike_mpadd_asm:
 	stp	x29, x30, [sp,#-16]!
 	add	x29, sp, #0
 	ldp	x3, x4,   [x0,#0]
 	ldp	x5, x6,   [x0,#16]
 	ldp	x7, x8,   [x0,#32]
 	ldr	x9,       [x0,#48]
 	ldp	x11, x12, [x1,#0]
 	ldp	x13, x14, [x1,#16]
 	ldp	x15, x16, [x1,#32]
 	ldr	x17,      [x1,#48]
 	adds	x3, x3, x11
 	adcs	x4, x4, x12
 	adcs	x5, x5, x13
 	adcs	x6, x6, x14
 	adcs	x7, x7, x15
 	adcs	x8, x8, x16
 	adc	x9, x9, x17
 	stp	x3, x4,   [x2,#0]
 	stp	x5, x6,   [x2,#16]
 	stp	x7, x8,   [x2,#32]
 	str	x9,       [x2,#48]
 	ldp	x29, x30, [sp],#16
 	ret
 .globl	sike_mpsubx2_asm
 .hidden	sike_mpsubx2_asm
 .align	4
 sike_mpsubx2_asm:
 	stp	x29, x30, [sp,#-16]!
 	add	x29, sp, #0
 	ldp	x3, x4,   [x0,#0]
 	ldp	x5, x6,   [x0,#16]
 	ldp	x11, x12, [x1,#0]
 	ldp	x13, x14, [x1,#16]
 	subs	x3, x3, x11
 	sbcs	x4, x4, x12
 	sbcs	x5, x5, x13
 	sbcs	x6, x6, x14
 	ldp	x7, x8,   [x0,#32]
 	ldp	x9, x10,  [x0,#48]
 	ldp	x11, x12, [x1,#32]
 	ldp	x13, x14, [x1,#48]
 	sbcs	x7, x7, x11
 	sbcs	x8, x8, x12
 	sbcs	x9, x9, x13
 	sbcs	x10, x10, x14
 	stp	x3, x4,   [x2,#0]
 	stp	x5, x6,   [x2,#16]
 	stp	x7, x8,   [x2,#32]
 	stp	x9, x10,  [x2,#48]
 	ldp	x3, x4,   [x0,#64]
 	ldp	x5, x6,   [x0,#80]
 	ldp	x11, x12, [x1,#64]
 	ldp	x13, x14, [x1,#80]
 	sbcs	x3, x3, x11
 	sbcs	x4, x4, x12
 	sbcs	x5, x5, x13
 	sbcs	x6, x6, x14
 	ldp	x7, x8,   [x0,#96]
 	ldp	x11, x12, [x1,#96]
 	sbcs	x7, x7, x11
 	sbcs	x8, x8, x12
 	sbc	x0, xzr, xzr
 	stp	x3, x4,   [x2,#64]
 	stp	x5, x6,   [x2,#80]
 	stp	x7, x8,   [x2,#96]
 	ldp	x29, x30, [sp],#16
 	ret
 .globl	sike_mpdblsubx2_asm
 .hidden	sike_mpdblsubx2_asm
 .align	4
 sike_mpdblsubx2_asm:
 	stp	x29, x30, [sp, #-16]!
 	add	x29, sp, #0
 	ldp	x3, x4,   [x2, #0]
 	ldp	x5, x6,   [x2,#16]
 	ldp	x7, x8,   [x2,#32]
 	ldp	x11, x12, [x0, #0]
 	ldp	x13, x14, [x0,#16]
 	ldp	x15, x16, [x0,#32]
 	subs	x3, x3, x11
 	sbcs	x4, x4, x12
 	sbcs	x5, x5, x13
 	sbcs	x6, x6, x14
 	sbcs	x7, x7, x15
 	sbcs	x8, x8, x16
        // x9 stores carry
 	adc	x9, xzr, xzr
 	ldp	x11, x12, [x1, #0]
 	ldp	x13, x14, [x1,#16]
 	ldp	x15, x16, [x1,#32]
 	subs	x3, x3, x11
 	sbcs	x4, x4, x12
 	sbcs	x5, x5, x13
 	sbcs	x6, x6, x14
 	sbcs	x7, x7, x15
 	sbcs	x8, x8, x16
 	adc	x9, x9, xzr
 	stp	x3, x4,   [x2, #0]
 	stp	x5, x6,   [x2,#16]
 	stp	x7, x8,   [x2,#32]
 	ldp	x3, x4,   [x2,#48]
 	ldp	x5, x6,   [x2,#64]
 	ldp	x7, x8,   [x2,#80]
 	ldp	x11, x12, [x0,#48]
 	ldp	x13, x14, [x0,#64]
 	ldp	x15, x16, [x0,#80]
        // x9 = 2 - x9
 	neg	x9, x9
 	add	x9, x9, #2
 	subs	x3, x3, x9
 	sbcs	x3, x3, x11
 	sbcs	x4, x4, x12
 	sbcs	x5, x5, x13
 	sbcs	x6, x6, x14
 	sbcs	x7, x7, x15
 	sbcs	x8, x8, x16
 	adc	x9, xzr, xzr
 	ldp	x11, x12, [x1,#48]
 	ldp	x13, x14, [x1,#64]
 	ldp	x15, x16, [x1,#80]
 	subs	x3, x3, x11
 	sbcs	x4, x4, x12
 	sbcs	x5, x5, x13
 	sbcs	x6, x6, x14
 	sbcs	x7, x7, x15
 	sbcs	x8, x8, x16
 	adc	x9, x9, xzr
 	stp	x3, x4,   [x2,#48]
 	stp	x5, x6,   [x2,#64]
 	stp	x7, x8,   [x2,#80]
 	ldp	x3,  x4, [x2,#96]
 	ldp	x11, x12, [x0,#96]
 	ldp	x13, x14, [x1,#96]
        // x9 = 2 - x9
 	neg	x9, x9
 	add	x9, x9, #2
 	subs	x3, x3, x9
 	sbcs	x3, x3, x11
 	sbcs	x4, x4, x12
 	subs	x3, x3, x13
 	sbc	x4, x4, x14
 	stp	x3, x4,   [x2,#96]
 	ldp	x29, x30, [sp],#16
 	ret
 #endif
 #endif  // !OPENSSL_NO_ASM
--- a/contrib/boringssl-cmake/linux-arm/crypto/chacha/chacha-armv4.S
+++ b/contrib/boringssl-cmake/linux-arm/crypto/chacha/chacha-armv4.S
@ -1490,3 +1490,4 @@ ChaCha20_neon:
 #endif
 #endif
 #endif  // !OPENSSL_NO_ASM
 .section	.note.GNU-stack,"",%progbits
--- a/contrib/boringssl-cmake/linux-arm/crypto/fipsmodule/aes-armv4.S
+++ b/contrib/boringssl-cmake/linux-arm/crypto/fipsmodule/aes-armv4.S
--- a/contrib/boringssl-cmake/linux-arm/crypto/fipsmodule/aesv8-armx32.S
+++ b/contrib/boringssl-cmake/linux-arm/crypto/fipsmodule/aesv8-armx32.S
@ -778,3 +778,4 @@ aes_hw_ctr32_encrypt_blocks:
 #endif
 #endif
 #endif  // !OPENSSL_NO_ASM
 .section	.note.GNU-stack,"",%progbits
--- a/contrib/boringssl-cmake/linux-arm/crypto/fipsmodule/armv4-mont.S
+++ b/contrib/boringssl-cmake/linux-arm/crypto/fipsmodule/armv4-mont.S
@ -974,3 +974,4 @@ bn_mul8x_mont_neon:
 #endif
 #endif
 #endif  // !OPENSSL_NO_ASM
 .section	.note.GNU-stack,"",%progbits
--- a/contrib/boringssl-cmake/linux-arm/crypto/fipsmodule/bsaes-armv7.S
+++ b/contrib/boringssl-cmake/linux-arm/crypto/fipsmodule/bsaes-armv7.S
@ -1526,3 +1526,4 @@ bsaes_ctr32_encrypt_blocks:
 #endif
 #endif
 #endif  // !OPENSSL_NO_ASM
 .section	.note.GNU-stack,"",%progbits
--- a/contrib/boringssl-cmake/linux-arm/crypto/fipsmodule/ghash-armv4.S
+++ b/contrib/boringssl-cmake/linux-arm/crypto/fipsmodule/ghash-armv4.S
@ -31,342 +31,6 @@
 #else
 .code	32
 #endif
 .type	rem_4bit,%object
 .align	5
 rem_4bit:
 .short	0x0000,0x1C20,0x3840,0x2460
 .short	0x7080,0x6CA0,0x48C0,0x54E0
 .short	0xE100,0xFD20,0xD940,0xC560
 .short	0x9180,0x8DA0,0xA9C0,0xB5E0
 .size	rem_4bit,.-rem_4bit
 .type	rem_4bit_get,%function
 rem_4bit_get:
 #if defined(__thumb2__)
 	adr	r2,rem_4bit
 #else
 	sub	r2,pc,#8+32	@ &rem_4bit
 #endif
 	b	.Lrem_4bit_got
 	nop
 	nop
 .size	rem_4bit_get,.-rem_4bit_get
 .globl	gcm_ghash_4bit
 .hidden	gcm_ghash_4bit
 .type	gcm_ghash_4bit,%function
 .align	4
 gcm_ghash_4bit:
 #if defined(__thumb2__)
 	adr	r12,rem_4bit
 #else
 	sub	r12,pc,#8+48		@ &rem_4bit
 #endif
 	add	r3,r2,r3		@ r3 to point at the end
 	stmdb	sp!,{r3,r4,r5,r6,r7,r8,r9,r10,r11,lr}		@ save r3/end too
 	ldmia	r12,{r4,r5,r6,r7,r8,r9,r10,r11}		@ copy rem_4bit ...
 	stmdb	sp!,{r4,r5,r6,r7,r8,r9,r10,r11}		@ ... to stack
 	ldrb	r12,[r2,#15]
 	ldrb	r14,[r0,#15]
 .Louter:
 	eor	r12,r12,r14
 	and	r14,r12,#0xf0
 	and	r12,r12,#0x0f
 	mov	r3,#14
 	add	r7,r1,r12,lsl#4
 	ldmia	r7,{r4,r5,r6,r7}	@ load Htbl[nlo]
 	add	r11,r1,r14
 	ldrb	r12,[r2,#14]
 	and	r14,r4,#0xf		@ rem
 	ldmia	r11,{r8,r9,r10,r11}	@ load Htbl[nhi]
 	add	r14,r14,r14
 	eor	r4,r8,r4,lsr#4
 	ldrh	r8,[sp,r14]		@ rem_4bit[rem]
 	eor	r4,r4,r5,lsl#28
 	ldrb	r14,[r0,#14]
 	eor	r5,r9,r5,lsr#4
 	eor	r5,r5,r6,lsl#28
 	eor	r6,r10,r6,lsr#4
 	eor	r6,r6,r7,lsl#28
 	eor	r7,r11,r7,lsr#4
 	eor	r12,r12,r14
 	and	r14,r12,#0xf0
 	and	r12,r12,#0x0f
 	eor	r7,r7,r8,lsl#16
 .Linner:
 	add	r11,r1,r12,lsl#4
 	and	r12,r4,#0xf		@ rem
 	subs	r3,r3,#1
 	add	r12,r12,r12
 	ldmia	r11,{r8,r9,r10,r11}	@ load Htbl[nlo]
 	eor	r4,r8,r4,lsr#4
 	eor	r4,r4,r5,lsl#28
 	eor	r5,r9,r5,lsr#4
 	eor	r5,r5,r6,lsl#28
 	ldrh	r8,[sp,r12]		@ rem_4bit[rem]
 	eor	r6,r10,r6,lsr#4
 #ifdef	__thumb2__
 	it	pl
 #endif
 	ldrplb	r12,[r2,r3]
 	eor	r6,r6,r7,lsl#28
 	eor	r7,r11,r7,lsr#4
 	add	r11,r1,r14
 	and	r14,r4,#0xf		@ rem
 	eor	r7,r7,r8,lsl#16	@ ^= rem_4bit[rem]
 	add	r14,r14,r14
 	ldmia	r11,{r8,r9,r10,r11}	@ load Htbl[nhi]
 	eor	r4,r8,r4,lsr#4
 #ifdef	__thumb2__
 	it	pl
 #endif
 	ldrplb	r8,[r0,r3]
 	eor	r4,r4,r5,lsl#28
 	eor	r5,r9,r5,lsr#4
 	ldrh	r9,[sp,r14]
 	eor	r5,r5,r6,lsl#28
 	eor	r6,r10,r6,lsr#4
 	eor	r6,r6,r7,lsl#28
 #ifdef	__thumb2__
 	it	pl
 #endif
 	eorpl	r12,r12,r8
 	eor	r7,r11,r7,lsr#4
 #ifdef	__thumb2__
 	itt	pl
 #endif
 	andpl	r14,r12,#0xf0
 	andpl	r12,r12,#0x0f
 	eor	r7,r7,r9,lsl#16	@ ^= rem_4bit[rem]
 	bpl	.Linner
 	ldr	r3,[sp,#32]		@ re-load r3/end
 	add	r2,r2,#16
 	mov	r14,r4
 #if __ARM_ARCH__>=7 && defined(__ARMEL__)
 	rev	r4,r4
 	str	r4,[r0,#12]
 #elif defined(__ARMEB__)
 	str	r4,[r0,#12]
 #else
 	mov	r9,r4,lsr#8
 	strb	r4,[r0,#12+3]
 	mov	r10,r4,lsr#16
 	strb	r9,[r0,#12+2]
 	mov	r11,r4,lsr#24
 	strb	r10,[r0,#12+1]
 	strb	r11,[r0,#12]
 #endif
 	cmp	r2,r3
 #if __ARM_ARCH__>=7 && defined(__ARMEL__)
 	rev	r5,r5
 	str	r5,[r0,#8]
 #elif defined(__ARMEB__)
 	str	r5,[r0,#8]
 #else
 	mov	r9,r5,lsr#8
 	strb	r5,[r0,#8+3]
 	mov	r10,r5,lsr#16
 	strb	r9,[r0,#8+2]
 	mov	r11,r5,lsr#24
 	strb	r10,[r0,#8+1]
 	strb	r11,[r0,#8]
 #endif
 #ifdef __thumb2__
 	it	ne
 #endif
 	ldrneb	r12,[r2,#15]
 #if __ARM_ARCH__>=7 && defined(__ARMEL__)
 	rev	r6,r6
 	str	r6,[r0,#4]
 #elif defined(__ARMEB__)
 	str	r6,[r0,#4]
 #else
 	mov	r9,r6,lsr#8
 	strb	r6,[r0,#4+3]
 	mov	r10,r6,lsr#16
 	strb	r9,[r0,#4+2]
 	mov	r11,r6,lsr#24
 	strb	r10,[r0,#4+1]
 	strb	r11,[r0,#4]
 #endif
 #if __ARM_ARCH__>=7 && defined(__ARMEL__)
 	rev	r7,r7
 	str	r7,[r0,#0]
 #elif defined(__ARMEB__)
 	str	r7,[r0,#0]
 #else
 	mov	r9,r7,lsr#8
 	strb	r7,[r0,#0+3]
 	mov	r10,r7,lsr#16
 	strb	r9,[r0,#0+2]
 	mov	r11,r7,lsr#24
 	strb	r10,[r0,#0+1]
 	strb	r11,[r0,#0]
 #endif
 	bne	.Louter
 	add	sp,sp,#36
 #if __ARM_ARCH__>=5
 	ldmia	sp!,{r4,r5,r6,r7,r8,r9,r10,r11,pc}
 #else
 	ldmia	sp!,{r4,r5,r6,r7,r8,r9,r10,r11,lr}
 	tst	lr,#1
 	moveq	pc,lr			@ be binary compatible with V4, yet
 .word	0xe12fff1e			@ interoperable with Thumb ISA:-)
 #endif
 .size	gcm_ghash_4bit,.-gcm_ghash_4bit
 .globl	gcm_gmult_4bit
 .hidden	gcm_gmult_4bit
 .type	gcm_gmult_4bit,%function
 gcm_gmult_4bit:
 	stmdb	sp!,{r4,r5,r6,r7,r8,r9,r10,r11,lr}
 	ldrb	r12,[r0,#15]
 	b	rem_4bit_get
 .Lrem_4bit_got:
 	and	r14,r12,#0xf0
 	and	r12,r12,#0x0f
 	mov	r3,#14
 	add	r7,r1,r12,lsl#4
 	ldmia	r7,{r4,r5,r6,r7}	@ load Htbl[nlo]
 	ldrb	r12,[r0,#14]
 	add	r11,r1,r14
 	and	r14,r4,#0xf		@ rem
 	ldmia	r11,{r8,r9,r10,r11}	@ load Htbl[nhi]
 	add	r14,r14,r14
 	eor	r4,r8,r4,lsr#4
 	ldrh	r8,[r2,r14]	@ rem_4bit[rem]
 	eor	r4,r4,r5,lsl#28
 	eor	r5,r9,r5,lsr#4
 	eor	r5,r5,r6,lsl#28
 	eor	r6,r10,r6,lsr#4
 	eor	r6,r6,r7,lsl#28
 	eor	r7,r11,r7,lsr#4
 	and	r14,r12,#0xf0
 	eor	r7,r7,r8,lsl#16
 	and	r12,r12,#0x0f
 .Loop:
 	add	r11,r1,r12,lsl#4
 	and	r12,r4,#0xf		@ rem
 	subs	r3,r3,#1
 	add	r12,r12,r12
 	ldmia	r11,{r8,r9,r10,r11}	@ load Htbl[nlo]
 	eor	r4,r8,r4,lsr#4
 	eor	r4,r4,r5,lsl#28
 	eor	r5,r9,r5,lsr#4
 	eor	r5,r5,r6,lsl#28
 	ldrh	r8,[r2,r12]	@ rem_4bit[rem]
 	eor	r6,r10,r6,lsr#4
 #ifdef	__thumb2__
 	it	pl
 #endif
 	ldrplb	r12,[r0,r3]
 	eor	r6,r6,r7,lsl#28
 	eor	r7,r11,r7,lsr#4
 	add	r11,r1,r14
 	and	r14,r4,#0xf		@ rem
 	eor	r7,r7,r8,lsl#16	@ ^= rem_4bit[rem]
 	add	r14,r14,r14
 	ldmia	r11,{r8,r9,r10,r11}	@ load Htbl[nhi]
 	eor	r4,r8,r4,lsr#4
 	eor	r4,r4,r5,lsl#28
 	eor	r5,r9,r5,lsr#4
 	ldrh	r8,[r2,r14]	@ rem_4bit[rem]
 	eor	r5,r5,r6,lsl#28
 	eor	r6,r10,r6,lsr#4
 	eor	r6,r6,r7,lsl#28
 	eor	r7,r11,r7,lsr#4
 #ifdef	__thumb2__
 	itt	pl
 #endif
 	andpl	r14,r12,#0xf0
 	andpl	r12,r12,#0x0f
 	eor	r7,r7,r8,lsl#16	@ ^= rem_4bit[rem]
 	bpl	.Loop
 #if __ARM_ARCH__>=7 && defined(__ARMEL__)
 	rev	r4,r4
 	str	r4,[r0,#12]
 #elif defined(__ARMEB__)
 	str	r4,[r0,#12]
 #else
 	mov	r9,r4,lsr#8
 	strb	r4,[r0,#12+3]
 	mov	r10,r4,lsr#16
 	strb	r9,[r0,#12+2]
 	mov	r11,r4,lsr#24
 	strb	r10,[r0,#12+1]
 	strb	r11,[r0,#12]
 #endif
 #if __ARM_ARCH__>=7 && defined(__ARMEL__)
 	rev	r5,r5
 	str	r5,[r0,#8]
 #elif defined(__ARMEB__)
 	str	r5,[r0,#8]
 #else
 	mov	r9,r5,lsr#8
 	strb	r5,[r0,#8+3]
 	mov	r10,r5,lsr#16
 	strb	r9,[r0,#8+2]
 	mov	r11,r5,lsr#24
 	strb	r10,[r0,#8+1]
 	strb	r11,[r0,#8]
 #endif
 #if __ARM_ARCH__>=7 && defined(__ARMEL__)
 	rev	r6,r6
 	str	r6,[r0,#4]
 #elif defined(__ARMEB__)
 	str	r6,[r0,#4]
 #else
 	mov	r9,r6,lsr#8
 	strb	r6,[r0,#4+3]
 	mov	r10,r6,lsr#16
 	strb	r9,[r0,#4+2]
 	mov	r11,r6,lsr#24
 	strb	r10,[r0,#4+1]
 	strb	r11,[r0,#4]
 #endif
 #if __ARM_ARCH__>=7 && defined(__ARMEL__)
 	rev	r7,r7
 	str	r7,[r0,#0]
 #elif defined(__ARMEB__)
 	str	r7,[r0,#0]
 #else
 	mov	r9,r7,lsr#8
 	strb	r7,[r0,#0+3]
 	mov	r10,r7,lsr#16
 	strb	r9,[r0,#0+2]
 	mov	r11,r7,lsr#24
 	strb	r10,[r0,#0+1]
 	strb	r11,[r0,#0]
 #endif
 #if __ARM_ARCH__>=5
 	ldmia	sp!,{r4,r5,r6,r7,r8,r9,r10,r11,pc}
 #else
 	ldmia	sp!,{r4,r5,r6,r7,r8,r9,r10,r11,lr}
 	tst	lr,#1
 	moveq	pc,lr			@ be binary compatible with V4, yet
 .word	0xe12fff1e			@ interoperable with Thumb ISA:-)
 #endif
 .size	gcm_gmult_4bit,.-gcm_gmult_4bit
 #if __ARM_MAX_ARCH__>=7
 .arch	armv7-a
 .fpu	neon
@ -588,3 +252,4 @@ gcm_ghash_neon:
 .align	2
 #endif
 #endif  // !OPENSSL_NO_ASM
 .section	.note.GNU-stack,"",%progbits
--- a/contrib/boringssl-cmake/linux-arm/crypto/fipsmodule/ghashv8-armx32.S
+++ b/contrib/boringssl-cmake/linux-arm/crypto/fipsmodule/ghashv8-armx32.S
@ -250,3 +250,4 @@ gcm_ghash_v8:
 .align	2
 #endif
 #endif  // !OPENSSL_NO_ASM
 .section	.note.GNU-stack,"",%progbits
--- a/contrib/boringssl-cmake/linux-arm/crypto/fipsmodule/sha1-armv4-large.S
+++ b/contrib/boringssl-cmake/linux-arm/crypto/fipsmodule/sha1-armv4-large.S
@ -1508,3 +1508,4 @@ sha1_block_data_order_armv8:
 #endif
 #endif
 #endif  // !OPENSSL_NO_ASM
 .section	.note.GNU-stack,"",%progbits
--- a/contrib/boringssl-cmake/linux-arm/crypto/fipsmodule/sha256-armv4.S
+++ b/contrib/boringssl-cmake/linux-arm/crypto/fipsmodule/sha256-armv4.S
@ -2836,3 +2836,4 @@ sha256_block_data_order_armv8:
 #endif
 #endif
 #endif  // !OPENSSL_NO_ASM
 .section	.note.GNU-stack,"",%progbits
--- a/contrib/boringssl-cmake/linux-arm/crypto/fipsmodule/sha512-armv4.S
+++ b/contrib/boringssl-cmake/linux-arm/crypto/fipsmodule/sha512-armv4.S
@ -1891,3 +1891,4 @@ sha512_block_data_order_neon:
 #endif
 #endif
 #endif  // !OPENSSL_NO_ASM
 .section	.note.GNU-stack,"",%progbits
--- a/contrib/boringssl-cmake/linux-arm/crypto/fipsmodule/vpaes-armv7.S
+++ b/contrib/boringssl-cmake/linux-arm/crypto/fipsmodule/vpaes-armv7.S
--- a/contrib/boringssl-cmake/linux-arm/crypto/test/trampoline-armv4.S
+++ b/contrib/boringssl-cmake/linux-arm/crypto/test/trampoline-armv4.S
@ -31,7 +31,6 @@
 .hidden	abi_test_trampoline
 .align	4
 abi_test_trampoline:
 .Labi_test_trampoline_begin:
 	@ Save parameters and all callee-saved registers. For convenience, we
 	@ save r9 on iOS even though it's volatile.
 	vstmdb	sp!, {d8,d9,d10,d11,d12,d13,d14,d15}
@ -377,3 +376,4 @@ abi_test_clobber_d15:
 .size	abi_test_clobber_d15,.-abi_test_clobber_d15
 #endif
 #endif  // !OPENSSL_NO_ASM
 .section	.note.GNU-stack,"",%progbits
--- a/contrib/boringssl-cmake/linux-ppc64le/crypto/fipsmodule/aesp8-ppc.S
+++ b/contrib/boringssl-cmake/linux-ppc64le/crypto/fipsmodule/aesp8-ppc.S
@ -3667,3 +3667,4 @@ _aesp8_xts_dec5x:
 .long	0
 .byte	0,12,0x14,0,0,0,0,0
 #endif  // !OPENSSL_NO_ASM && __powerpc64__
 .section	.note.GNU-stack,"",@progbits
--- a/contrib/boringssl-cmake/linux-ppc64le/crypto/fipsmodule/ghashp8-ppc.S
+++ b/contrib/boringssl-cmake/linux-ppc64le/crypto/fipsmodule/ghashp8-ppc.S
@ -584,3 +584,4 @@ gcm_ghash_p8:
 .align	2
 .align	2
 #endif  // !OPENSSL_NO_ASM && __powerpc64__
 .section	.note.GNU-stack,"",@progbits
--- a/contrib/boringssl-cmake/linux-ppc64le/crypto/test/trampoline-ppc.S
+++ b/contrib/boringssl-cmake/linux-ppc64le/crypto/test/trampoline-ppc.S
--- a/contrib/boringssl-cmake/linux-x86/crypto/chacha/chacha-x86.S
+++ b/contrib/boringssl-cmake/linux-x86/crypto/chacha/chacha-x86.S
@ -972,3 +972,4 @@ ChaCha20_ssse3:
 .byte	60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111
 .byte	114,103,62,0
 #endif
 .section	.note.GNU-stack,"",@progbits
--- a/contrib/boringssl-cmake/linux-x86/crypto/fipsmodule/aes-586.S
+++ b/contrib/boringssl-cmake/linux-x86/crypto/fipsmodule/aes-586.S
--- a/contrib/boringssl-cmake/linux-x86/crypto/fipsmodule/aesni-x86.S
+++ b/contrib/boringssl-cmake/linux-x86/crypto/fipsmodule/aesni-x86.S
@ -6,7 +6,7 @@
 #include <boringssl_prefix_symbols_asm.h>
 #endif
 .text
-#ifndef NDEBUG
+#ifdef BORINGSSL_DISPATCH_TEST
 #endif
 .globl	aes_hw_encrypt
 .hidden	aes_hw_encrypt
@ -14,7 +14,7 @@
 .align	16
 aes_hw_encrypt:
 .L_aes_hw_encrypt_begin:
-#ifndef NDEBUG
+#ifdef BORINGSSL_DISPATCH_TEST
 	pushl	%ebx
 	pushl	%edx
 	call	.L000pic
@ -845,7 +845,7 @@ aes_hw_ctr32_encrypt_blocks:
 	pushl	%ebx
 	pushl	%esi
 	pushl	%edi
-#ifndef NDEBUG
+#ifdef BORINGSSL_DISPATCH_TEST
 	pushl	%ebx
 	pushl	%edx
 	call	.L038pic
@ -2440,7 +2440,7 @@ _aesni_set_encrypt_key:
 .align	16
 aes_hw_set_encrypt_key:
 .L_aes_hw_set_encrypt_key_begin:
-#ifndef NDEBUG
+#ifdef BORINGSSL_DISPATCH_TEST
 	pushl	%ebx
 	pushl	%edx
 	call	.L116pic
@ -2510,3 +2510,4 @@ aes_hw_set_decrypt_key:
 .byte	32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115
 .byte	115,108,46,111,114,103,62,0
 #endif
 .section	.note.GNU-stack,"",@progbits
--- a/contrib/boringssl-cmake/linux-x86/crypto/fipsmodule/bn-586.S
+++ b/contrib/boringssl-cmake/linux-x86/crypto/fipsmodule/bn-586.S
@ -993,551 +993,5 @@ bn_sub_words:
 	popl	%ebp
 	ret
 .size	bn_sub_words,.-.L_bn_sub_words_begin
 .globl	bn_sub_part_words
 .hidden	bn_sub_part_words
 .type	bn_sub_part_words,@function
 .align	16
 bn_sub_part_words:
 .L_bn_sub_part_words_begin:
 	pushl	%ebp
 	pushl	%ebx
 	pushl	%esi
 	pushl	%edi
 	movl	20(%esp),%ebx
 	movl	24(%esp),%esi
 	movl	28(%esp),%edi
 	movl	32(%esp),%ebp
 	xorl	%eax,%eax
 	andl	$4294967288,%ebp
 	jz	.L029aw_finish
 .L030aw_loop:
 	movl	(%esi),%ecx
 	movl	(%edi),%edx
 	subl	%eax,%ecx
 	movl	$0,%eax
 	adcl	%eax,%eax
 	subl	%edx,%ecx
 	adcl	$0,%eax
 	movl	%ecx,(%ebx)
 	movl	4(%esi),%ecx
 	movl	4(%edi),%edx
 	subl	%eax,%ecx
 	movl	$0,%eax
 	adcl	%eax,%eax
 	subl	%edx,%ecx
 	adcl	$0,%eax
 	movl	%ecx,4(%ebx)
 	movl	8(%esi),%ecx
 	movl	8(%edi),%edx
 	subl	%eax,%ecx
 	movl	$0,%eax
 	adcl	%eax,%eax
 	subl	%edx,%ecx
 	adcl	$0,%eax
 	movl	%ecx,8(%ebx)
 	movl	12(%esi),%ecx
 	movl	12(%edi),%edx
 	subl	%eax,%ecx
 	movl	$0,%eax
 	adcl	%eax,%eax
 	subl	%edx,%ecx
 	adcl	$0,%eax
 	movl	%ecx,12(%ebx)
 	movl	16(%esi),%ecx
 	movl	16(%edi),%edx
 	subl	%eax,%ecx
 	movl	$0,%eax
 	adcl	%eax,%eax
 	subl	%edx,%ecx
 	adcl	$0,%eax
 	movl	%ecx,16(%ebx)
 	movl	20(%esi),%ecx
 	movl	20(%edi),%edx
 	subl	%eax,%ecx
 	movl	$0,%eax
 	adcl	%eax,%eax
 	subl	%edx,%ecx
 	adcl	$0,%eax
 	movl	%ecx,20(%ebx)
 	movl	24(%esi),%ecx
 	movl	24(%edi),%edx
 	subl	%eax,%ecx
 	movl	$0,%eax
 	adcl	%eax,%eax
 	subl	%edx,%ecx
 	adcl	$0,%eax
 	movl	%ecx,24(%ebx)
 	movl	28(%esi),%ecx
 	movl	28(%edi),%edx
 	subl	%eax,%ecx
 	movl	$0,%eax
 	adcl	%eax,%eax
 	subl	%edx,%ecx
 	adcl	$0,%eax
 	movl	%ecx,28(%ebx)
 	addl	$32,%esi
 	addl	$32,%edi
 	addl	$32,%ebx
 	subl	$8,%ebp
 	jnz	.L030aw_loop
 .L029aw_finish:
 	movl	32(%esp),%ebp
 	andl	$7,%ebp
 	jz	.L031aw_end
 	movl	(%esi),%ecx
 	movl	(%edi),%edx
 	subl	%eax,%ecx
 	movl	$0,%eax
 	adcl	%eax,%eax
 	subl	%edx,%ecx
 	adcl	$0,%eax
 	movl	%ecx,(%ebx)
 	addl	$4,%esi
 	addl	$4,%edi
 	addl	$4,%ebx
 	decl	%ebp
 	jz	.L031aw_end
 	movl	(%esi),%ecx
 	movl	(%edi),%edx
 	subl	%eax,%ecx
 	movl	$0,%eax
 	adcl	%eax,%eax
 	subl	%edx,%ecx
 	adcl	$0,%eax
 	movl	%ecx,(%ebx)
 	addl	$4,%esi
 	addl	$4,%edi
 	addl	$4,%ebx
 	decl	%ebp
 	jz	.L031aw_end
 	movl	(%esi),%ecx
 	movl	(%edi),%edx
 	subl	%eax,%ecx
 	movl	$0,%eax
 	adcl	%eax,%eax
 	subl	%edx,%ecx
 	adcl	$0,%eax
 	movl	%ecx,(%ebx)
 	addl	$4,%esi
 	addl	$4,%edi
 	addl	$4,%ebx
 	decl	%ebp
 	jz	.L031aw_end
 	movl	(%esi),%ecx
 	movl	(%edi),%edx
 	subl	%eax,%ecx
 	movl	$0,%eax
 	adcl	%eax,%eax
 	subl	%edx,%ecx
 	adcl	$0,%eax
 	movl	%ecx,(%ebx)
 	addl	$4,%esi
 	addl	$4,%edi
 	addl	$4,%ebx
 	decl	%ebp
 	jz	.L031aw_end
 	movl	(%esi),%ecx
 	movl	(%edi),%edx
 	subl	%eax,%ecx
 	movl	$0,%eax
 	adcl	%eax,%eax
 	subl	%edx,%ecx
 	adcl	$0,%eax
 	movl	%ecx,(%ebx)
 	addl	$4,%esi
 	addl	$4,%edi
 	addl	$4,%ebx
 	decl	%ebp
 	jz	.L031aw_end
 	movl	(%esi),%ecx
 	movl	(%edi),%edx
 	subl	%eax,%ecx
 	movl	$0,%eax
 	adcl	%eax,%eax
 	subl	%edx,%ecx
 	adcl	$0,%eax
 	movl	%ecx,(%ebx)
 	addl	$4,%esi
 	addl	$4,%edi
 	addl	$4,%ebx
 	decl	%ebp
 	jz	.L031aw_end
 	movl	(%esi),%ecx
 	movl	(%edi),%edx
 	subl	%eax,%ecx
 	movl	$0,%eax
 	adcl	%eax,%eax
 	subl	%edx,%ecx
 	adcl	$0,%eax
 	movl	%ecx,(%ebx)
 	addl	$4,%esi
 	addl	$4,%edi
 	addl	$4,%ebx
 .L031aw_end:
 	cmpl	$0,36(%esp)
 	je	.L032pw_end
 	movl	36(%esp),%ebp
 	cmpl	$0,%ebp
 	je	.L032pw_end
 	jge	.L033pw_pos
 	movl	$0,%edx
 	subl	%ebp,%edx
 	movl	%edx,%ebp
 	andl	$4294967288,%ebp
 	jz	.L034pw_neg_finish
 .L035pw_neg_loop:
 	movl	$0,%ecx
 	movl	(%edi),%edx
 	subl	%eax,%ecx
 	movl	$0,%eax
 	adcl	%eax,%eax
 	subl	%edx,%ecx
 	adcl	$0,%eax
 	movl	%ecx,(%ebx)
 	movl	$0,%ecx
 	movl	4(%edi),%edx
 	subl	%eax,%ecx
 	movl	$0,%eax
 	adcl	%eax,%eax
 	subl	%edx,%ecx
 	adcl	$0,%eax
 	movl	%ecx,4(%ebx)
 	movl	$0,%ecx
 	movl	8(%edi),%edx
 	subl	%eax,%ecx
 	movl	$0,%eax
 	adcl	%eax,%eax
 	subl	%edx,%ecx
 	adcl	$0,%eax
 	movl	%ecx,8(%ebx)
 	movl	$0,%ecx
 	movl	12(%edi),%edx
 	subl	%eax,%ecx
 	movl	$0,%eax
 	adcl	%eax,%eax
 	subl	%edx,%ecx
 	adcl	$0,%eax
 	movl	%ecx,12(%ebx)
 	movl	$0,%ecx
 	movl	16(%edi),%edx
 	subl	%eax,%ecx
 	movl	$0,%eax
 	adcl	%eax,%eax
 	subl	%edx,%ecx
 	adcl	$0,%eax
 	movl	%ecx,16(%ebx)
 	movl	$0,%ecx
 	movl	20(%edi),%edx
 	subl	%eax,%ecx
 	movl	$0,%eax
 	adcl	%eax,%eax
 	subl	%edx,%ecx
 	adcl	$0,%eax
 	movl	%ecx,20(%ebx)
 	movl	$0,%ecx
 	movl	24(%edi),%edx
 	subl	%eax,%ecx
 	movl	$0,%eax
 	adcl	%eax,%eax
 	subl	%edx,%ecx
 	adcl	$0,%eax
 	movl	%ecx,24(%ebx)
 	movl	$0,%ecx
 	movl	28(%edi),%edx
 	subl	%eax,%ecx
 	movl	$0,%eax
 	adcl	%eax,%eax
 	subl	%edx,%ecx
 	adcl	$0,%eax
 	movl	%ecx,28(%ebx)
 	addl	$32,%edi
 	addl	$32,%ebx
 	subl	$8,%ebp
 	jnz	.L035pw_neg_loop
 .L034pw_neg_finish:
 	movl	36(%esp),%edx
 	movl	$0,%ebp
 	subl	%edx,%ebp
 	andl	$7,%ebp
 	jz	.L032pw_end
 	movl	$0,%ecx
 	movl	(%edi),%edx
 	subl	%eax,%ecx
 	movl	$0,%eax
 	adcl	%eax,%eax
 	subl	%edx,%ecx
 	adcl	$0,%eax
 	decl	%ebp
 	movl	%ecx,(%ebx)
 	jz	.L032pw_end
 	movl	$0,%ecx
 	movl	4(%edi),%edx
 	subl	%eax,%ecx
 	movl	$0,%eax
 	adcl	%eax,%eax
 	subl	%edx,%ecx
 	adcl	$0,%eax
 	decl	%ebp
 	movl	%ecx,4(%ebx)
 	jz	.L032pw_end
 	movl	$0,%ecx
 	movl	8(%edi),%edx
 	subl	%eax,%ecx
 	movl	$0,%eax
 	adcl	%eax,%eax
 	subl	%edx,%ecx
 	adcl	$0,%eax
 	decl	%ebp
 	movl	%ecx,8(%ebx)
 	jz	.L032pw_end
 	movl	$0,%ecx
 	movl	12(%edi),%edx
 	subl	%eax,%ecx
 	movl	$0,%eax
 	adcl	%eax,%eax
 	subl	%edx,%ecx
 	adcl	$0,%eax
 	decl	%ebp
 	movl	%ecx,12(%ebx)
 	jz	.L032pw_end
 	movl	$0,%ecx
 	movl	16(%edi),%edx
 	subl	%eax,%ecx
 	movl	$0,%eax
 	adcl	%eax,%eax
 	subl	%edx,%ecx
 	adcl	$0,%eax
 	decl	%ebp
 	movl	%ecx,16(%ebx)
 	jz	.L032pw_end
 	movl	$0,%ecx
 	movl	20(%edi),%edx
 	subl	%eax,%ecx
 	movl	$0,%eax
 	adcl	%eax,%eax
 	subl	%edx,%ecx
 	adcl	$0,%eax
 	decl	%ebp
 	movl	%ecx,20(%ebx)
 	jz	.L032pw_end
 	movl	$0,%ecx
 	movl	24(%edi),%edx
 	subl	%eax,%ecx
 	movl	$0,%eax
 	adcl	%eax,%eax
 	subl	%edx,%ecx
 	adcl	$0,%eax
 	movl	%ecx,24(%ebx)
 	jmp	.L032pw_end
 .L033pw_pos:
 	andl	$4294967288,%ebp
 	jz	.L036pw_pos_finish
 .L037pw_pos_loop:
 	movl	(%esi),%ecx
 	subl	%eax,%ecx
 	movl	%ecx,(%ebx)
 	jnc	.L038pw_nc0
 	movl	4(%esi),%ecx
 	subl	%eax,%ecx
 	movl	%ecx,4(%ebx)
 	jnc	.L039pw_nc1
 	movl	8(%esi),%ecx
 	subl	%eax,%ecx
 	movl	%ecx,8(%ebx)
 	jnc	.L040pw_nc2
 	movl	12(%esi),%ecx
 	subl	%eax,%ecx
 	movl	%ecx,12(%ebx)
 	jnc	.L041pw_nc3
 	movl	16(%esi),%ecx
 	subl	%eax,%ecx
 	movl	%ecx,16(%ebx)
 	jnc	.L042pw_nc4
 	movl	20(%esi),%ecx
 	subl	%eax,%ecx
 	movl	%ecx,20(%ebx)
 	jnc	.L043pw_nc5
 	movl	24(%esi),%ecx
 	subl	%eax,%ecx
 	movl	%ecx,24(%ebx)
 	jnc	.L044pw_nc6
 	movl	28(%esi),%ecx
 	subl	%eax,%ecx
 	movl	%ecx,28(%ebx)
 	jnc	.L045pw_nc7
 	addl	$32,%esi
 	addl	$32,%ebx
 	subl	$8,%ebp
 	jnz	.L037pw_pos_loop
 .L036pw_pos_finish:
 	movl	36(%esp),%ebp
 	andl	$7,%ebp
 	jz	.L032pw_end
 	movl	(%esi),%ecx
 	subl	%eax,%ecx
 	movl	%ecx,(%ebx)
 	jnc	.L046pw_tail_nc0
 	decl	%ebp
 	jz	.L032pw_end
 	movl	4(%esi),%ecx
 	subl	%eax,%ecx
 	movl	%ecx,4(%ebx)
 	jnc	.L047pw_tail_nc1
 	decl	%ebp
 	jz	.L032pw_end
 	movl	8(%esi),%ecx
 	subl	%eax,%ecx
 	movl	%ecx,8(%ebx)
 	jnc	.L048pw_tail_nc2
 	decl	%ebp
 	jz	.L032pw_end
 	movl	12(%esi),%ecx
 	subl	%eax,%ecx
 	movl	%ecx,12(%ebx)
 	jnc	.L049pw_tail_nc3
 	decl	%ebp
 	jz	.L032pw_end
 	movl	16(%esi),%ecx
 	subl	%eax,%ecx
 	movl	%ecx,16(%ebx)
 	jnc	.L050pw_tail_nc4
 	decl	%ebp
 	jz	.L032pw_end
 	movl	20(%esi),%ecx
 	subl	%eax,%ecx
 	movl	%ecx,20(%ebx)
 	jnc	.L051pw_tail_nc5
 	decl	%ebp
 	jz	.L032pw_end
 	movl	24(%esi),%ecx
 	subl	%eax,%ecx
 	movl	%ecx,24(%ebx)
 	jnc	.L052pw_tail_nc6
 	movl	$1,%eax
 	jmp	.L032pw_end
 .L053pw_nc_loop:
 	movl	(%esi),%ecx
 	movl	%ecx,(%ebx)
 .L038pw_nc0:
 	movl	4(%esi),%ecx
 	movl	%ecx,4(%ebx)
 .L039pw_nc1:
 	movl	8(%esi),%ecx
 	movl	%ecx,8(%ebx)
 .L040pw_nc2:
 	movl	12(%esi),%ecx
 	movl	%ecx,12(%ebx)
 .L041pw_nc3:
 	movl	16(%esi),%ecx
 	movl	%ecx,16(%ebx)
 .L042pw_nc4:
 	movl	20(%esi),%ecx
 	movl	%ecx,20(%ebx)
 .L043pw_nc5:
 	movl	24(%esi),%ecx
 	movl	%ecx,24(%ebx)
 .L044pw_nc6:
 	movl	28(%esi),%ecx
 	movl	%ecx,28(%ebx)
 .L045pw_nc7:
 	addl	$32,%esi
 	addl	$32,%ebx
 	subl	$8,%ebp
 	jnz	.L053pw_nc_loop
 	movl	36(%esp),%ebp
 	andl	$7,%ebp
 	jz	.L054pw_nc_end
 	movl	(%esi),%ecx
 	movl	%ecx,(%ebx)
 .L046pw_tail_nc0:
 	decl	%ebp
 	jz	.L054pw_nc_end
 	movl	4(%esi),%ecx
 	movl	%ecx,4(%ebx)
 .L047pw_tail_nc1:
 	decl	%ebp
 	jz	.L054pw_nc_end
 	movl	8(%esi),%ecx
 	movl	%ecx,8(%ebx)
 .L048pw_tail_nc2:
 	decl	%ebp
 	jz	.L054pw_nc_end
 	movl	12(%esi),%ecx
 	movl	%ecx,12(%ebx)
 .L049pw_tail_nc3:
 	decl	%ebp
 	jz	.L054pw_nc_end
 	movl	16(%esi),%ecx
 	movl	%ecx,16(%ebx)
 .L050pw_tail_nc4:
 	decl	%ebp
 	jz	.L054pw_nc_end
 	movl	20(%esi),%ecx
 	movl	%ecx,20(%ebx)
 .L051pw_tail_nc5:
 	decl	%ebp
 	jz	.L054pw_nc_end
 	movl	24(%esi),%ecx
 	movl	%ecx,24(%ebx)
 .L052pw_tail_nc6:
 .L054pw_nc_end:
 	movl	$0,%eax
 .L032pw_end:
 	popl	%edi
 	popl	%esi
 	popl	%ebx
 	popl	%ebp
 	ret
 .size	bn_sub_part_words,.-.L_bn_sub_part_words_begin
 #endif
 .section	.note.GNU-stack,"",@progbits
--- a/Show More
+++ b/Show More
		`@ -1,3 +0,0 @@`
			`#!/usr/bin/env bash`

			table=hits_10m; time clickhouse-client --max_bytes_before_external_sort=30000000000 --query="SELECT toInt64(WatchID), JavaEnable, Title, GoodEvent, (EventTime < toDateTime('1971-01-01 00:00:00') ? toDateTime('1971-01-01 00:00:01') : EventTime), (EventDate < toDate('1971-01-01') ? toDate('1971-01-01') : EventDate), CounterID, ClientIP, RegionID, toInt64(UserID), CounterClass, OS, UserAgent, URL, Referer, Refresh, RefererCategoryID, RefererRegionID, URLCategoryID, URLRegionID, ResolutionWidth, ResolutionHeight, ResolutionDepth, FlashMajor, FlashMinor, FlashMinor2, NetMajor, NetMinor, UserAgentMajor, UserAgentMinor, CookieEnable, JavascriptEnable, IsMobile, MobilePhone, MobilePhoneModel, Params, IPNetworkID, TraficSourceID, SearchEngineID, SearchPhrase, AdvEngineID, IsArtifical, WindowClientWidth, WindowClientHeight, ClientTimeZone, (ClientEventTime < toDateTime('1971-01-01 00:00:01') ? toDateTime('1971-01-01 00:00:01') : ClientEventTime), SilverlightVersion1, SilverlightVersion2, SilverlightVersion3, SilverlightVersion4, PageCharset, CodeVersion, IsLink, IsDownload, IsNotBounce, toInt64(FUniqID), OriginalURL, HID, IsOldCounter, IsEvent, IsParameter, DontCountHits, WithHash, HitColor, (LocalEventTime < toDateTime('1971-01-01 00:00:01') ? toDateTime('1971-01-01 00:00:01') : LocalEventTime), Age, Sex, Income, Interests, Robotness, RemoteIP, WindowName, OpenerName, HistoryLength, BrowserLanguage, BrowserCountry, SocialNetwork, SocialAction, HTTPError, SendTiming, DNSTiming, ConnectTiming, ResponseStartTiming, ResponseEndTiming, FetchTiming, SocialSourceNetworkID, SocialSourcePage, ParamPrice, ParamOrderID, ParamCurrency, ParamCurrencyID, OpenstatServiceName, OpenstatCampaignID, OpenstatAdID, OpenstatSourceID, UTMSource, UTMMedium, UTMCampaign, UTMContent, UTMTerm, FromTag, HasGCLID, toInt64(RefererHash), toInt64(URLHash), CLID FROM $table ORDER BY rand()" \| corrector_utf8 > /opt/dumps/${table}_corrected.tsv
		`@ -1 +1 @@`
			`Subproject commit 24a13f15cf0838b93f3b1beb62ed010dffdb2117`				`Subproject commit 1334b9ae72576821a698d657d08838861cf33007`
		`@ -0,0 +1 @@`
							`Subproject commit a85f98fb4ed52c2f4029a4b6ac1ef0bafdfc56f5`
		`@ -1 +1 @@`
			`Subproject commit 9c0715ce459de443e7b08f270a518c1702f1a380`				`Subproject commit c1e01a441d6db234f4f12e63a7657d1f9e6db9c1`