Revert "Build system changes for CFI (Soong)"
This reverts commit d4b484b0707c2dbbe1e3ac096f953344aea2b1dc.
Rationale: second in group of commits that left aosp_x86_64 not
building. (See https://android-build.googleplex.com/builds/
submitted/4426589/aosp_x86_64-eng/latest/logs/build_error.log)
Bug: 30227045
Test: builds
Change-Id: I38ab5284c614d6ee68e7359219bd75c7d50131be
diff --git a/cc/androidmk.go b/cc/androidmk.go
index d028f8c..194faab 100644
--- a/cc/androidmk.go
+++ b/cc/androidmk.go
@@ -86,11 +86,6 @@
c.subAndroidMk(&ret, c.linker)
if c.sanitize != nil {
c.subAndroidMk(&ret, c.sanitize)
- if Bool(c.sanitize.Properties.Sanitize.Cfi) {
- ret.SubName += ".cfi"
- } else if Bool(c.sanitize.Properties.Sanitize.Address) {
- ret.SubName += ".asan"
- }
}
c.subAndroidMk(&ret, c.installer)
diff --git a/cc/cc.go b/cc/cc.go
index 02aaf19..cdbe43e 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -46,9 +46,6 @@
ctx.TopDown("asan_deps", sanitizerDepsMutator(asan))
ctx.BottomUp("asan", sanitizerMutator(asan)).Parallel()
- ctx.TopDown("cfi_deps", sanitizerDepsMutator(cfi))
- ctx.BottomUp("cfi", sanitizerMutator(cfi)).Parallel()
-
ctx.TopDown("tsan_deps", sanitizerDepsMutator(tsan))
ctx.BottomUp("tsan", sanitizerMutator(tsan)).Parallel()
@@ -440,7 +437,12 @@
}
func (ctx *moduleContextImpl) static() bool {
- return ctx.mod.static()
+ if static, ok := ctx.mod.linker.(interface {
+ static() bool
+ }); ok {
+ return static.static()
+ }
+ return false
}
func (ctx *moduleContextImpl) staticBinary() bool {
@@ -1279,15 +1281,6 @@
return android.Paths{}
}
-func (c *Module) static() bool {
- if static, ok := c.linker.(interface {
- static() bool
- }); ok {
- return static.static()
- }
- return false
-}
-
//
// Defaults
//
diff --git a/cc/config/cfi_exports.map b/cc/config/cfi_exports.map
deleted file mode 100644
index 3d8f3e0..0000000
--- a/cc/config/cfi_exports.map
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- global:
- __cfi_check;
-};
diff --git a/cc/library.go b/cc/library.go
index 9d18017..25872c6 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -513,10 +513,6 @@
if versionScript.Valid() {
flags.LdFlags = append(flags.LdFlags, "-Wl,--version-script,"+versionScript.String())
linkerDeps = append(linkerDeps, versionScript.Path())
- if library.sanitize.isSanitizerEnabled(cfi) {
- flags.LdFlags = append(flags.LdFlags, "-Wl,--version-script,"+cfiExportsMap.String())
- linkerDeps = append(linkerDeps, cfiExportsMap)
- }
}
if unexportedSymbols.Valid() {
ctx.PropertyErrorf("unexported_symbols_list", "Only supported on Darwin")
diff --git a/cc/sanitize.go b/cc/sanitize.go
index 53de14b..d5535cb 100644
--- a/cc/sanitize.go
+++ b/cc/sanitize.go
@@ -32,14 +32,12 @@
asanLdflags = []string{"-Wl,-u,__asan_preinit"}
asanLibs = []string{"libasan"}
- cfiCflags = []string{"-flto", "-fsanitize-cfi-cross-dso",
+ cfiCflags = []string{"-flto", "-fsanitize-cfi-cross-dso", "-fvisibility=default",
"-fsanitize-blacklist=external/compiler-rt/lib/cfi/cfi_blacklist.txt"}
// FIXME: revert the __cfi_check flag when clang is updated to r280031.
cfiLdflags = []string{"-flto", "-fsanitize-cfi-cross-dso", "-fsanitize=cfi",
"-Wl,-plugin-opt,O1 -Wl,-export-dynamic-symbol=__cfi_check"}
- cfiArflags = []string{"--plugin ${config.ClangBin}/../lib64/LLVMgold.so"}
- cfiExportsMapPath = "build/soong/cc/config/cfi_exports.map"
- cfiExportsMap android.Path
+ cfiArflags = []string{"--plugin ${config.ClangBin}/../lib64/LLVMgold.so"}
intOverflowCflags = []string{"-fsanitize-blacklist=build/soong/cc/config/integer_overflow_blacklist.txt"}
)
@@ -58,7 +56,6 @@
asan sanitizerType = iota + 1
tsan
intOverflow
- cfi
)
func (t sanitizerType) String() string {
@@ -69,8 +66,6 @@
return "tsan"
case intOverflow:
return "intOverflow"
- case cfi:
- return "cfi"
default:
panic(fmt.Errorf("unknown sanitizerType %d", t))
}
@@ -256,8 +251,6 @@
ctx.ModuleErrorf(`Use of "coverage" also requires "address"`)
}
}
-
- cfiExportsMap = android.PathForSource(ctx, cfiExportsMapPath)
}
func (sanitize *sanitize) deps(ctx BaseModuleContext, deps Deps) Deps {
@@ -369,23 +362,12 @@
flags.LdFlags = append(flags.LdFlags, "-march=armv7-a")
}
sanitizers = append(sanitizers, "cfi")
-
flags.CFlags = append(flags.CFlags, cfiCflags...)
- // Only append the default visibility flag if -fvisibility has not already been set
- // to hidden.
- if !inList("-fvisibility=hidden", flags.CFlags) {
- flags.CFlags = append(flags.CFlags, "-fvisibility=default")
- }
flags.LdFlags = append(flags.LdFlags, cfiLdflags...)
flags.ArFlags = append(flags.ArFlags, cfiArflags...)
if Bool(sanitize.Properties.Sanitize.Diag.Cfi) {
diagSanitizers = append(diagSanitizers, "cfi")
}
-
- if ctx.staticBinary() {
- _, flags.CFlags = removeFromList("-fsanitize-cfi-cross-dso", flags.CFlags)
- _, flags.LdFlags = removeFromList("-fsanitize-cfi-cross-dso", flags.LdFlags)
- }
}
if Bool(sanitize.Properties.Sanitize.Integer_overflow) {
@@ -469,16 +451,18 @@
return sanitize.Properties.InSanitizerDir
}
-func (sanitize *sanitize) getSanitizerBoolPtr(t sanitizerType) *bool {
+func (sanitize *sanitize) Sanitizer(t sanitizerType) bool {
+ if sanitize == nil {
+ return false
+ }
+
switch t {
case asan:
- return sanitize.Properties.Sanitize.Address
+ return Bool(sanitize.Properties.Sanitize.Address)
case tsan:
- return sanitize.Properties.Sanitize.Thread
+ return Bool(sanitize.Properties.Sanitize.Thread)
case intOverflow:
- return sanitize.Properties.Sanitize.Integer_overflow
- case cfi:
- return sanitize.Properties.Sanitize.Cfi
+ return Bool(sanitize.Properties.Sanitize.Integer_overflow)
default:
panic(fmt.Errorf("unknown sanitizerType %d", t))
}
@@ -495,9 +479,6 @@
sanitize.Properties.Sanitize.Thread = boolPtr(b)
case intOverflow:
sanitize.Properties.Sanitize.Integer_overflow = boolPtr(b)
- case cfi:
- sanitize.Properties.Sanitize.Cfi = boolPtr(b)
- sanitize.Properties.Sanitize.Diag.Cfi = boolPtr(b)
default:
panic(fmt.Errorf("unknown sanitizerType %d", t))
}
@@ -506,89 +487,40 @@
}
}
-// Check if the sanitizer is explicitly disabled (as opposed to nil by
-// virtue of not being set).
-func (sanitize *sanitize) isSanitizerExplicitlyDisabled(t sanitizerType) bool {
- if sanitize == nil {
- return false
- }
-
- sanitizerVal := sanitize.getSanitizerBoolPtr(t)
- return sanitizerVal != nil && *sanitizerVal == false
-}
-
-// There isn't an analog of the method above (ie:isSanitizerExplicitlyEnabled)
-// because enabling a sanitizer either directly (via the blueprint) or
-// indirectly (via a mutator) sets the bool ptr to true, and you can't
-// distinguish between the cases. It isn't needed though - both cases can be
-// treated identically.
-func (sanitize *sanitize) isSanitizerEnabled(t sanitizerType) bool {
- if sanitize == nil {
- return false
- }
-
- sanitizerVal := sanitize.getSanitizerBoolPtr(t)
- return sanitizerVal != nil && *sanitizerVal == true
-}
-
// Propagate asan requirements down from binaries
func sanitizerDepsMutator(t sanitizerType) func(android.TopDownMutatorContext) {
return func(mctx android.TopDownMutatorContext) {
- if c, ok := mctx.Module().(*Module); ok && c.sanitize.isSanitizerEnabled(t) {
+ if c, ok := mctx.Module().(*Module); ok && c.sanitize.Sanitizer(t) {
mctx.VisitDepsDepthFirst(func(module android.Module) {
- if d, ok := module.(*Module); ok && d.sanitize != nil &&
- !d.sanitize.Properties.Sanitize.Never &&
- !d.sanitize.isSanitizerExplicitlyDisabled(t) {
- if (t == cfi && d.static()) || t != cfi {
- d.sanitize.Properties.SanitizeDep = true
- }
+ if d, ok := mctx.Module().(*Module); ok && c.sanitize != nil &&
+ !c.sanitize.Properties.Sanitize.Never {
+ d.sanitize.Properties.SanitizeDep = true
}
})
}
}
}
-// Create sanitized variants for modules that need them
+// Create asan variants for modules that need them
func sanitizerMutator(t sanitizerType) func(android.BottomUpMutatorContext) {
return func(mctx android.BottomUpMutatorContext) {
if c, ok := mctx.Module().(*Module); ok && c.sanitize != nil {
- if c.isDependencyRoot() && c.sanitize.isSanitizerEnabled(t) {
+ if c.isDependencyRoot() && c.sanitize.Sanitizer(t) {
modules := mctx.CreateVariations(t.String())
modules[0].(*Module).sanitize.SetSanitizer(t, true)
- } else if c.sanitize.isSanitizerEnabled(t) || c.sanitize.Properties.SanitizeDep {
- // Save original sanitizer status before we assign values to variant
- // 0 as that overwrites the original.
- isSanitizerEnabled := c.sanitize.isSanitizerEnabled(t)
-
+ } else if c.sanitize.Properties.SanitizeDep {
modules := mctx.CreateVariations("", t.String())
modules[0].(*Module).sanitize.SetSanitizer(t, false)
modules[1].(*Module).sanitize.SetSanitizer(t, true)
-
modules[0].(*Module).sanitize.Properties.SanitizeDep = false
modules[1].(*Module).sanitize.Properties.SanitizeDep = false
if mctx.Device() {
- // CFI and ASAN are currently mutually exclusive (CFI defers
- // to ASAN if you try enabling both), so disable CFI is this
- // is an ASAN variant.
- if t == asan {
- modules[1].(*Module).sanitize.Properties.InSanitizerDir = true
- modules[1].(*Module).sanitize.SetSanitizer(cfi, false)
- }
+ modules[1].(*Module).sanitize.Properties.InSanitizerDir = true
} else {
- if isSanitizerEnabled {
- modules[0].(*Module).Properties.PreventInstall = true
- } else {
- modules[1].(*Module).Properties.PreventInstall = true
- }
+ modules[0].(*Module).Properties.PreventInstall = true
}
if mctx.AConfig().EmbeddedInMake() {
- if !mctx.Device() {
- if isSanitizerEnabled {
- modules[0].(*Module).Properties.HideFromMake = true
- } else {
- modules[1].(*Module).Properties.HideFromMake = true
- }
- }
+ modules[0].(*Module).Properties.HideFromMake = true
}
}
c.sanitize.Properties.SanitizeDep = false