aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2020-03-30 12:29:37 -0700
committerDan Albert <danalbert@google.com>2020-03-30 13:44:46 -0700
commit7af54f76e0eeecd9204072512d4b6b12a92c9a77 (patch)
treed35e46b814c0dc720287021a5debeb7e6cc2b444
parent82dbb8b7a26a1bb7a6fa8c2aa1ad7c431c1e626a (diff)
downloadndk-7af54f76e0eeecd9204072512d4b6b12a92c9a77.tar.gz
Update LLVM to r365631c1.
This is the r21 toolchain with the cherry-picks for r21b. The following Gerrit query shows the patches it contains: https://android-review.googlesource.com/q/branch:llvm-r365631+status:merged+before:2020-03-30 Test: treehugger Bug: https://github.com/android/ndk/issues/1178 Bug: https://github.com/android/ndk/issues/1184 Bug: https://github.com/android/ndk/issues/1198 Bug: https://github.com/android/ndk/issues/1205 Bug: https://github.com/android/ndk/issues/1206 Change-Id: I223b98e96c32e0c754d9c27486d4f0ccfad32851
-rw-r--r--build/tools/prebuilt-common.sh2
-rw-r--r--docs/changelogs/Changelog-r21.md17
-rw-r--r--ndk/toolchains.py2
3 files changed, 17 insertions, 4 deletions
diff --git a/build/tools/prebuilt-common.sh b/build/tools/prebuilt-common.sh
index 3a0e095f8..8b4423a3e 100644
--- a/build/tools/prebuilt-common.sh
+++ b/build/tools/prebuilt-common.sh
@@ -1247,7 +1247,7 @@ get_llvm_toolchain_binprefix ()
{
local NAME DIR BINPREFIX
local SYSTEM=${1:-$(get_prebuilt_host_tag)}
- local VERSION=r365631c
+ local VERSION=r365631c1
SYSTEM=${SYSTEM%_64} # Trim _64 suffix. We only have one LLVM.
BINPREFIX=$ANDROID_BUILD_TOP/prebuilts/clang/host/$SYSTEM/clang-$VERSION/bin
echo "$BINPREFIX"
diff --git a/docs/changelogs/Changelog-r21.md b/docs/changelogs/Changelog-r21.md
index 6c263cec6..8fd3507fa 100644
--- a/docs/changelogs/Changelog-r21.md
+++ b/docs/changelogs/Changelog-r21.md
@@ -62,15 +62,28 @@ For Android Studio issues, follow the docs on the [Android Studio site].
debugging. The error from gdb that confirms you were affected by this was
`gdb-8.3/gdb/psymtab.c:316: internal-error: sect_index_text not initialized`.
* [Issue 1166]: Rehid unwinder symbols all architectures.
+ * [Issue 1173]: Fix gdb python symbol missing issue on Darwin.
+ * [Issue 1178]: Revert changes to stdatomic.h to maintain compatibility with
+ C's `_Atomic` type qualifier. Note that the C++ standard will likely mandate
+ this breakage in the future. See [P0943R4] for more details.
+ * [Issue 1184]: Fix Clang crash for x86_64.
+ * [Issue 1198]: Fix incorrect constant folding of long doubles on Windows.
* [Issue 1201]: Fixed issue in ndk-build that was causing `APP_PLATFORM` to be
corrupted for API 30+ with LP64 ABIs.
* [Issue 1203]: libc++ prebuilts and CRT objects are no longer built as Neon.
- * [Issue 1173]: Fix gdb python symbol missing issue on Darwin.
+ * [Issue 1205]: Potential fixes for relocation out of range issues with LLD.
+ * [Issue 1206]: LLD support for --fix-cortex-a8.
[Issue 1166]: https://github.com/android/ndk/issues/1166
+[Issue 1173]: https://github.com/android/ndk/issues/1173
+[Issue 1178]: https://github.com/android/ndk/issues/1178
+[Issue 1184]: https://github.com/android/ndk/issues/1184
+[Issue 1198]: https://github.com/android/ndk/issues/1198
[Issue 1201]: https://github.com/android/ndk/issues/1201
[Issue 1203]: https://github.com/android/ndk/issues/1203
-[Issue 1173]: https://github.com/android/ndk/issues/1173
+[Issue 1205]: https://github.com/android/ndk/issues/1205
+[Issue 1206]: https://github.com/android/ndk/issues/1206
+[P0943R4]: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2019/p0943r4.html
## Changes
diff --git a/ndk/toolchains.py b/ndk/toolchains.py
index 669f2527d..d8f9f5ee6 100644
--- a/ndk/toolchains.py
+++ b/ndk/toolchains.py
@@ -23,7 +23,7 @@ from ndk.hosts import Host, get_default_host
import ndk.paths
-CLANG_VERSION = 'clang-r365631c'
+CLANG_VERSION = 'clang-r365631c1'
HOST_TRIPLE_MAP = {