summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Florian Mayer <fmayer@google.com> 2023-03-21 16:13:36 +0000
committer Florian Mayer <fmayer@google.com> 2023-03-21 17:25:10 +0000
commit25cd98136288aece8c5abd9e84f2fe6cceefdcb3 (patch)
treec5b660d56b4a9de16bfdae637908f6febdf1ca97
parent6828e1858016c55226f99d98b8311c104367ff5f (diff)
Revert "Re-enable stack frame size errors"
Reason for revert: b/274474681 Change-Id: If4f1eda6a82ce715d8e492292b5c62eb3f5a201f
-rw-r--r--cc/sanitize.go5
1 files changed, 5 insertions, 0 deletions
diff --git a/cc/sanitize.go b/cc/sanitize.go
index d44573239..6678cdb58 100644
--- a/cc/sanitize.go
+++ b/cc/sanitize.go
@@ -827,8 +827,13 @@ func (s *sanitize) flags(ctx ModuleContext, flags Flags) Flags {
if Bool(sanProps.Memtag_stack) {
flags.Local.CFlags = append(flags.Local.CFlags, memtagStackCommonFlags...)
+ // TODO(fmayer): remove -Wno-error once https://reviews.llvm.org/D127917 is in Android toolchain.
+ flags.Local.CFlags = append(flags.Local.CFlags, "-Wno-error=frame-larger-than")
flags.Local.AsFlags = append(flags.Local.AsFlags, memtagStackCommonFlags...)
flags.Local.LdFlags = append(flags.Local.LdFlags, memtagStackCommonFlags...)
+ // This works around LLD complaining about the stack frame size.
+ // TODO(fmayer): remove once https://reviews.llvm.org/D127917 is in Android toolchain.
+ flags.Local.LdFlags = append(flags.Local.LdFlags, "-Wl,--no-fatal-warnings")
}
if (Bool(sanProps.Memtag_heap) || Bool(sanProps.Memtag_stack)) && ctx.binary() {