diff options
author | Yi Kong <yikong@google.com> | 2019-03-19 04:21:20 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-03-19 04:21:20 +0000 |
commit | bdb1ed828db592176cfa88e1b681f2c6e070fd9e (patch) | |
tree | 2356c91f1e014b02d854102b431f86e32c8a7180 /cc | |
parent | c743c37e92a7af54dba79744fd6fb5e5ec1de961 (diff) | |
parent | 6925d2b3005d5b08f8202f5c61024eadff32588e (diff) | |
download | build_soong-bdb1ed828db592176cfa88e1b681f2c6e070fd9e.tar.gz build_soong-bdb1ed828db592176cfa88e1b681f2c6e070fd9e.tar.bz2 build_soong-bdb1ed828db592176cfa88e1b681f2c6e070fd9e.zip |
Merge "Switch clang to r353983"
Diffstat (limited to 'cc')
-rw-r--r-- | cc/config/clang.go | 4 | ||||
-rw-r--r-- | cc/config/global.go | 4 | ||||
-rw-r--r-- | cc/lto.go | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/cc/config/clang.go b/cc/config/clang.go index 6a1c7363..a57bbf86 100644 --- a/cc/config/clang.go +++ b/cc/config/clang.go @@ -174,6 +174,10 @@ func init() { // Disable this warning because we don't care about behavior with older compilers. "-Wno-return-std-move-in-c++11", + + // Disable -Wstring-plus-int until the instances detected by this new warning is + // fixed. + "-Wno-string-plus-int", }, " ")) // Extra cflags for projects under external/ directory diff --git a/cc/config/global.go b/cc/config/global.go index 689b315b..e3fab0c2 100644 --- a/cc/config/global.go +++ b/cc/config/global.go @@ -120,8 +120,8 @@ var ( // prebuilts/clang default settings. ClangDefaultBase = "prebuilts/clang/host" - ClangDefaultVersion = "clang-r349610" - ClangDefaultShortVersion = "8.0.8" + ClangDefaultVersion = "clang-r353983" + ClangDefaultShortVersion = "9.0.1" // Directories with warnings from Android.bp files. WarningAllowedProjects = []string{ @@ -83,8 +83,7 @@ func (lto *lto) flags(ctx BaseModuleContext, flags Flags) Flags { if lto.LTO() { var ltoFlag string if Bool(lto.Properties.Lto.Thin) { - ltoFlag = "-flto=thin" - + ltoFlag = "-flto=thin -fsplit-lto-unit" } else { ltoFlag = "-flto" } |