Merge "Revert "Re-enable stack frame size errors""

This commit is contained in:
Treehugger Robot 2023-03-21 20:00:41 +00:00 committed by Gerrit Code Review
commit c47a46adcd

View file

@ -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() {