diff options
| author | Haamed Gheibi <haamed@google.com> | 2021-07-12 20:47:16 +0000 |
|---|---|---|
| committer | Haamed Gheibi <haamed@google.com> | 2021-07-12 20:47:16 +0000 |
| commit | d4fd974eb42fa9bc991011d544a48157aa8e95a7 (patch) | |
| tree | 50a8f5955925465dbbf85d20ac51ff553b16557d /cc | |
| parent | ef25c8777180f88650dad8bd2499e8c8c9d174b7 (diff) | |
| parent | 74d33e1a724ff26b5e9175fed9664b5387c7744f (diff) | |
Merge SP1A.210709.002
Change-Id: I875d10af6b1546ee1b90ad5880874f8ef01f7ed3
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/cc.go | 1 | ||||
| -rw-r--r-- | cc/config/global.go | 4 | ||||
| -rw-r--r-- | cc/sanitize.go | 5 |
3 files changed, 8 insertions, 2 deletions
@@ -3396,6 +3396,7 @@ func DefaultsFactory(props ...interface{}) android.Module { &android.ProtoProperties{}, // RustBindgenProperties is included here so that cc_defaults can be used for rust_bindgen modules. &RustBindgenClangProperties{}, + &prebuiltLinkerProperties{}, ) // Bazel module must be initialized _before_ Defaults to be included in cc_defaults module. diff --git a/cc/config/global.go b/cc/config/global.go index 4c2d783dd..61c5bf1f5 100644 --- a/cc/config/global.go +++ b/cc/config/global.go @@ -165,8 +165,8 @@ var ( // prebuilts/clang default settings. ClangDefaultBase = "prebuilts/clang/host" - ClangDefaultVersion = "clang-r416183b" - ClangDefaultShortVersion = "12.0.5" + ClangDefaultVersion = "clang-r416183b1" + ClangDefaultShortVersion = "12.0.7" // Directories with warnings from Android.bp files. WarningAllowedProjects = []string{ diff --git a/cc/sanitize.go b/cc/sanitize.go index af9ff1e3e..f7dc8a4a8 100644 --- a/cc/sanitize.go +++ b/cc/sanitize.go @@ -521,6 +521,11 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) { if Bool(s.Hwaddress) { s.Address = nil s.Thread = nil + // Disable ubsan diagnosic as a workaround for a compiler bug. + // TODO(b/191808836): re-enable. + s.Diag.Undefined = nil + s.Diag.Integer_overflow = nil + s.Diag.Misc_undefined = nil } // TODO(b/131771163): CFI transiently depends on LTO, and thus Fuzzer is |