From ffebc5b71f811b4d04a32115b636837a5483f6c0 Mon Sep 17 00:00:00 2001 From: Chris Wailes Date: Mon, 10 Jun 2024 18:06:52 +0000 Subject: [PATCH] Revert^8 "Upgrade to clang-r522817" This reverts commit 8c27af21361c320cf5df836cd9f3486dfd5a4983. Reason for revert: Re-land the Rust 1.78.0 and Clang r522817 updates Change-Id: Id1fe3790c9688f2c204ca26b5638e1a245cc65f4 --- cc/config/global.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cc/config/global.go b/cc/config/global.go index 290a27dfb..62a4765f4 100644 --- a/cc/config/global.go +++ b/cc/config/global.go @@ -300,6 +300,9 @@ var ( // New warnings to be fixed after clang-r475365 "-Wno-error=single-bit-bitfield-constant-conversion", // http://b/243965903 "-Wno-error=enum-constexpr-conversion", // http://b/243964282 + // New warnings to be fixed after clang-r522817 + "-Wno-error=invalid-offsetof", + "-Wno-error=thread-safety-reference-return", // Irrelevant on Android because _we_ don't use exceptions, but causes // lots of build noise because libcxx/libcxxabi do. This can probably @@ -307,6 +310,9 @@ var ( // until then because it causes warnings in the _callers_, not the // project itself. "-Wno-deprecated-dynamic-exception-spec", + + // Allow using VLA CXX extension. + "-Wno-vla-cxx-extension", } noOverride64GlobalCflags = []string{} @@ -391,7 +397,7 @@ var ( // prebuilts/clang default settings. ClangDefaultBase = "prebuilts/clang/host" - ClangDefaultVersion = "clang-r510928" + ClangDefaultVersion = "clang-r522817" ClangDefaultShortVersion = "18" // Directories with warnings from Android.bp files.