aboutsummaryrefslogtreecommitdiffstats
path: root/cc
diff options
context:
space:
mode:
authorVishwath Mohan <vishwath@google.com>2017-02-13 20:49:19 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-02-13 20:49:20 +0000
commite13374d3c1e33176ac229317505c5e2b4d8d5240 (patch)
tree65dc7b82445f127dffe1b915f05ec0a57d76aaab /cc
parent040ffff84b7ee65faf8c2a250ad580dd332d6835 (diff)
parent6d67e6e68e5b8f53f997201d6c967aab5798b7c1 (diff)
downloadbuild_soong-e13374d3c1e33176ac229317505c5e2b4d8d5240.tar.gz
build_soong-e13374d3c1e33176ac229317505c5e2b4d8d5240.tar.bz2
build_soong-e13374d3c1e33176ac229317505c5e2b4d8d5240.zip
Merge "Disble CFI for ARM32 processes."
Diffstat (limited to 'cc')
-rw-r--r--cc/sanitize.go6
1 files changed, 6 insertions, 0 deletions
diff --git a/cc/sanitize.go b/cc/sanitize.go
index b98797a7..7eb191f5 100644
--- a/cc/sanitize.go
+++ b/cc/sanitize.go
@@ -173,6 +173,12 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) {
s.Diag.Cfi = nil
}
+ // Also disable CFI for arm32 until b/35157333 is fixed.
+ if ctx.Arch().ArchType == android.Arm {
+ s.Cfi = nil
+ s.Diag.Cfi = nil
+ }
+
if ctx.staticBinary() {
s.Address = nil
s.Coverage = nil