From 01344df46ee1744dd1ff7815705564deb43ac7cb Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 5 Aug 2016 10:21:26 -0700 Subject: [PATCH] Remove unused flags.Nocrt Nocrt is handled through deps.CrtBegin/End, flags.Nocrt is unused Change-Id: I8ab5313bb2eb3a00e336504d6dd3813350fbe14d Test: soong builds --- cc/builder.go | 1 - cc/cc.go | 1 - cc/linker.go | 2 -- cc/util.go | 1 - 4 files changed, 5 deletions(-) diff --git a/cc/builder.go b/cc/builder.go index f1282f514..b84c9282e 100644 --- a/cc/builder.go +++ b/cc/builder.go @@ -161,7 +161,6 @@ type builderFlags struct { ldFlags string libFlags string yaccFlags string - nocrt bool toolchain config.Toolchain clang bool diff --git a/cc/cc.go b/cc/cc.go index 54d9a94d5..8af2b8c70 100644 --- a/cc/cc.go +++ b/cc/cc.go @@ -94,7 +94,6 @@ type Flags struct { LdFlags []string // Flags that apply to linker command lines libFlags []string // Flags to add libraries early to the link order - Nocrt bool Toolchain config.Toolchain Clang bool diff --git a/cc/linker.go b/cc/linker.go index 5b7ea8b8b..976775593 100644 --- a/cc/linker.go +++ b/cc/linker.go @@ -136,8 +136,6 @@ func (linker *baseLinker) linkerDeps(ctx BaseModuleContext, deps Deps) Deps { func (linker *baseLinker) linkerFlags(ctx ModuleContext, flags Flags) Flags { toolchain := ctx.toolchain() - flags.Nocrt = Bool(linker.Properties.Nocrt) - if !ctx.noDefaultCompilerFlags() { if ctx.Device() && !Bool(linker.Properties.Allow_undefined_symbols) { flags.LdFlags = append(flags.LdFlags, "-Wl,--no-undefined") diff --git a/cc/util.go b/cc/util.go index ca6aa5d56..9ab74c3eb 100644 --- a/cc/util.go +++ b/cc/util.go @@ -95,7 +95,6 @@ func flagsToBuilderFlags(in Flags) builderFlags { yaccFlags: strings.Join(in.YaccFlags, " "), ldFlags: strings.Join(in.LdFlags, " "), libFlags: strings.Join(in.libFlags, " "), - nocrt: in.Nocrt, toolchain: in.Toolchain, clang: in.Clang, }