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

Merge "Remove execute-only support." am: d0bf3dbea8 am: 5d1461877d am: 50522fe8b8

Browse Source 
Change-Id: I3cb63d6ca2070e296e46bd803fdeca1ea75d78f9
This commit is contained in:
Ivan Lozano
2020-02-14 15:26:59 +00:00
parent 6a3876a027 50522fe8b8
commit 58ed939a67
5 changed files with 0 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cc/cc.go
View File

@@ -450,7 +450,6 @@ type Module struct {
vndkdep *vndkdep
lto *lto
pgo *pgo
xom *xom
outputFile android.OptionalPath
@@ -734,9 +733,6 @@ func (c *Module) Init() android.Module {
if c.pgo != nil {
c.AddProperties(c.pgo.props()...)
}
if c.xom != nil {
c.AddProperties(c.xom.props()...)
}
for _, feature := range c.features {
c.AddProperties(feature.props()...)
}
@@ -1206,7 +1202,6 @@ func newModule(hod android.HostOrDeviceSupported, multilib android.Multilib) *Mo
module.vndkdep = &vndkdep{}
module.lto = &lto{}
module.pgo = &pgo{}
module.xom = &xom{}
return module
}
@@ -1401,9 +1396,6 @@ func (c *Module) GenerateAndroidBuildActions(actx android.ModuleContext) {
if c.pgo != nil {
flags = c.pgo.flags(ctx, flags)
}
if c.xom != nil {
flags = c.xom.flags(ctx, flags)
}
for _, feature := range c.features {
flags = feature.flags(ctx, flags)
}
@@ -2683,7 +2675,6 @@ func DefaultsFactory(props ...interface{}) android.Module {
&VndkProperties{},
&LTOProperties{},
&PgoProperties{},
&XomProperties{},
&android.ProtoProperties{},
)

79
cc/xom.go
View File

@@ -1,79 +0,0 @@
// Copyright 2018 Google Inc. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package cc
import (
"android/soong/android"
)
type XomProperties struct {
Xom *bool
}
type xom struct {
Properties XomProperties
}
func (xom *xom) props() []interface{} {
return []interface{}{&xom.Properties}
}
func (xom *xom) begin(ctx BaseModuleContext) {}
func (xom *xom) deps(ctx BaseModuleContext, deps Deps) Deps {
return deps
}
func (xom *xom) flags(ctx ModuleContext, flags Flags) Flags {
disableXom := false
if !ctx.Config().EnableXOM() || ctx.Config().XOMDisabledForPath(ctx.ModuleDir()) {
disableXom = true
}
if xom.Properties.Xom != nil && !*xom.Properties.Xom {
return flags
}
// If any static dependencies have XOM disabled, we should disable XOM in this module,
// the assumption being if it's been explicitly disabled then there's probably incompatible
// code in the library which may get pulled in.
if !disableXom {
ctx.VisitDirectDeps(func(m android.Module) {
cc, ok := m.(*Module)
if !ok || cc.xom == nil || !cc.static() {
return
}
if cc.xom.Properties.Xom != nil && !*cc.xom.Properties.Xom {
disableXom = true
return
}
})
}
// Enable execute-only if none of the dependencies disable it,
// also if it's explicitly set true (allows overriding dependencies disabling it).
if !disableXom || (xom.Properties.Xom != nil && *xom.Properties.Xom) {
// XOM is only supported on AArch64 when using lld.
if ctx.Arch().ArchType == android.Arm64 && ctx.useClangLld(ctx) {
flags.Local.LdFlags = append(flags.Local.LdFlags,
"-Wl,--execute-only",
"-Wl,-z,separate-code",
)
}
}
return flags
}