StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Update clang version to clang-r475365""

Browse Source
This commit is contained in:
Yabin Cui
2022-11-30 02:02:37 +00:00
committed by Gerrit Code Review
parent acf23fe098 a558be6472
commit a7526ad43a
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cc/config/global.go
View File

@@ -242,10 +242,6 @@ var (
// New warnings to be fixed after clang-r468909 // New warnings to be fixed after clang-r468909
"-Wno-error=deprecated-builtins", // http://b/241601211 "-Wno-error=deprecated-builtins", // http://b/241601211
"-Wno-error=deprecated", // in external/googletest/googletest "-Wno-error=deprecated", // in external/googletest/googletest
// New warnings to be fixed after clang-r475365
"-Wno-error=single-bit-bitfield-constant-conversion", // http://b/243965903
"-Wno-error=incompatible-function-pointer-types", // http://b/257101299
"-Wno-error=enum-constexpr-conversion", // http://b/243964282
} }
noOverrideExternalGlobalCflags = []string{ noOverrideExternalGlobalCflags = []string{
@@ -297,6 +293,8 @@ var (
llvmNextExtraCommonGlobalCflags = []string{ llvmNextExtraCommonGlobalCflags = []string{
// New warnings to be fixed after clang-r475365 // New warnings to be fixed after clang-r475365
"-Wno-error=single-bit-bitfield-constant-conversion", // http://b/243965903 "-Wno-error=single-bit-bitfield-constant-conversion", // http://b/243965903
// Skip deprecated flags.
"-Wno-unused-command-line-argument",
} }
IllegalFlags = []string{ IllegalFlags = []string{
@@ -310,8 +308,8 @@ var (
// prebuilts/clang default settings. // prebuilts/clang default settings.
ClangDefaultBase = "prebuilts/clang/host" ClangDefaultBase = "prebuilts/clang/host"
ClangDefaultVersion = "clang-r475365" ClangDefaultVersion = "clang-r468909b"
ClangDefaultShortVersion = "16.0.1" ClangDefaultShortVersion = "15.0.3"
// Directories with warnings from Android.bp files. // Directories with warnings from Android.bp files.
WarningAllowedProjects = []string{ WarningAllowedProjects = []string{
@@ -352,7 +350,6 @@ func init() {
// Default to zero initialization. // Default to zero initialization.
"-ftrivial-auto-var-init=zero", "-ftrivial-auto-var-init=zero",
"-enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang", "-enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang",
"-Wno-unused-command-line-argument",
}...) }...)
exportedVars.ExportStringList("CommonGlobalCflags", bazelCommonGlobalCflags) exportedVars.ExportStringList("CommonGlobalCflags", bazelCommonGlobalCflags)
@@ -363,14 +360,14 @@ func init() {
// Automatically initialize any uninitialized stack variables. // Automatically initialize any uninitialized stack variables.
// Prefer zero-init if multiple options are set. // Prefer zero-init if multiple options are set.
if ctx.Config().IsEnvTrue("AUTO_ZERO_INITIALIZE") { if ctx.Config().IsEnvTrue("AUTO_ZERO_INITIALIZE") {
flags = append(flags, "-ftrivial-auto-var-init=zero -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang -Wno-unused-command-line-argument") flags = append(flags, "-ftrivial-auto-var-init=zero -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang")
} else if ctx.Config().IsEnvTrue("AUTO_PATTERN_INITIALIZE") { } else if ctx.Config().IsEnvTrue("AUTO_PATTERN_INITIALIZE") {
flags = append(flags, "-ftrivial-auto-var-init=pattern") flags = append(flags, "-ftrivial-auto-var-init=pattern")
} else if ctx.Config().IsEnvTrue("AUTO_UNINITIALIZE") { } else if ctx.Config().IsEnvTrue("AUTO_UNINITIALIZE") {
flags = append(flags, "-ftrivial-auto-var-init=uninitialized") flags = append(flags, "-ftrivial-auto-var-init=uninitialized")
} else { } else {
// Default to zero initialization. // Default to zero initialization.
flags = append(flags, "-ftrivial-auto-var-init=zero -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang -Wno-unused-command-line-argument") flags = append(flags, "-ftrivial-auto-var-init=zero -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang")
} }
// Workaround for ccache with clang. // Workaround for ccache with clang.