From f949a6c7cf44d076819b75b63896beb49c7172ea Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Tue, 31 Aug 2021 13:22:22 -0700 Subject: [PATCH] Update LLVM to r416183c for M1 support. There's an even newer LLVM that we should be using for r24, but for now I'm staying on the current revision so we can keep r24 and r23 from diverging too much before we need to so testing is easier. Test: ./checkbuild.py && ./run_tests.py Bug: https://github.com/android/ndk/issues/1544 Change-Id: I4d0cfb4dc4df6e7a3f42e7487de87ca43e56f379 (cherry picked from commit e3f5e9f6b72877174becd7e0869f00a23c686286) --- docs/changelogs/Changelog-r23.md | 3 +++ ndk/toolchains.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/changelogs/Changelog-r23.md b/docs/changelogs/Changelog-r23.md index bfb8142a..0f2cb038 100644 --- a/docs/changelogs/Changelog-r23.md +++ b/docs/changelogs/Changelog-r23.md @@ -30,6 +30,8 @@ For Android Studio issues, follow the docs on the [Android Studio site]. ## r23b +* Update LLVM to clang-r416183c, based on LLVM 12 development. + * [Issue 1544]: Now uses universal binaries for M1 Macs. * [Issue 1560]: Fixed pull-up of unsupported API levels when using the new CMake toolchain file. This affects CMake 3.21 and `ANDROID_USE_LEGACY_TOOLCHAIN_FILE=ON` use cases, and was the common case for @@ -37,6 +39,7 @@ For Android Studio issues, follow the docs on the [Android Studio site]. * [Issue 1573]: Fixed `ANDROID_USE_LEGACY_TOOLCHAIN_FILE` not being obeyed during CMake try-compile. +[Issue 1544]: https://github.com/android/ndk/issues/1544 [Issue 1560]: https://github.com/android/ndk/issues/1560 [Issue 1573]: https://github.com/android/ndk/issues/1573 diff --git a/ndk/toolchains.py b/ndk/toolchains.py index 550533b8..32b0c507 100644 --- a/ndk/toolchains.py +++ b/ndk/toolchains.py @@ -22,7 +22,7 @@ import ndk.paths -CLANG_VERSION = 'clang-r416183b' +CLANG_VERSION = 'clang-r416183c' HOST_TRIPLE_MAP = {