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

Remove flto dependent flags when -flto is removed. am: 9e88ba9f22

Browse Source 
am: 1cc0227af2

Change-Id: I0670019f95fa9f98cb624801d9bbcd165ca0267b
This commit is contained in:
Chih-Hung Hsieh
2018-08-24 13:04:49 -07:00
committed by android-build-merger
parent 356fda2fc9 1cc0227af2
commit e4988b18b1
4 changed files with 52 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cc/builder.go
View File

@@ -240,7 +240,8 @@ type builderFlags struct {
arFlags string arFlags string
asFlags string asFlags string
cFlags string cFlags string
toolingCFlags string // A separate set of Cflags for clang LibTooling tools toolingCFlags string // A separate set of cFlags for clang LibTooling tools
toolingCppFlags string // A separate set of cppFlags for clang LibTooling tools
conlyFlags string conlyFlags string
cppFlags string cppFlags string
ldFlags string ldFlags string
@@ -330,7 +331,7 @@ func TransformSourceToObj(ctx android.ModuleContext, subdir string, srcFiles and
toolingCppflags := strings.Join([]string{ toolingCppflags := strings.Join([]string{
commonFlags, commonFlags,
flags.toolingCFlags, flags.toolingCFlags,
flags.cppFlags, flags.toolingCppFlags,
}, " ") }, " ")
cppflags := strings.Join([]string{ cppflags := strings.Join([]string{

2
cc/config/clang.go
View File

@@ -93,8 +93,10 @@ var ClangUnknownLldflags = sorted([]string{
}) })
var ClangLibToolingUnknownCflags = []string{ var ClangLibToolingUnknownCflags = []string{
// Remove -flto and other flto dependent flags.
"-flto*", "-flto*",
"-fsanitize*", "-fsanitize*",
"-fwhole-program-vtables",
} }
func init() { func init() {

1
cc/sabi.go
View File

@@ -71,6 +71,7 @@ func (sabimod *sabi) flags(ctx ModuleContext, flags Flags) Flags {
// Assuming that the cflags which clang LibTooling tools cannot // Assuming that the cflags which clang LibTooling tools cannot
// understand have not been converted to ninja variables yet. // understand have not been converted to ninja variables yet.
flags.ToolingCFlags = filterOutWithPrefix(flags.CFlags, config.ClangLibToolingUnknownCflags) flags.ToolingCFlags = filterOutWithPrefix(flags.CFlags, config.ClangLibToolingUnknownCflags)
flags.ToolingCppFlags = filterOutWithPrefix(flags.CppFlags, config.ClangLibToolingUnknownCflags)
// RSClang does not support recent mcpu option likes exynos-m2. // RSClang does not support recent mcpu option likes exynos-m2.
// So we need overriding mcpu option when we want to use it. // So we need overriding mcpu option when we want to use it.

1
cc/util.go
View File

@@ -64,6 +64,7 @@ func flagsToBuilderFlags(in Flags) builderFlags {
asFlags: strings.Join(in.AsFlags, " "), asFlags: strings.Join(in.AsFlags, " "),
cFlags: strings.Join(in.CFlags, " "), cFlags: strings.Join(in.CFlags, " "),
toolingCFlags: strings.Join(in.ToolingCFlags, " "), toolingCFlags: strings.Join(in.ToolingCFlags, " "),
toolingCppFlags: strings.Join(in.ToolingCppFlags, " "),
conlyFlags: strings.Join(in.ConlyFlags, " "), conlyFlags: strings.Join(in.ConlyFlags, " "),
cppFlags: strings.Join(in.CppFlags, " "), cppFlags: strings.Join(in.CppFlags, " "),
yaccFlags: strings.Join(in.YaccFlags, " "), yaccFlags: strings.Join(in.YaccFlags, " "),