Merge "Reland "Re-enable stack frame size errors"" am: c3adf443e7

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2629371

Change-Id: I01a500c1c4652ff96ab65f3fc442fc4abf01123e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Florian Mayer
2023-06-22 21:10:24 +00:00
committed by Automerger Merge Worker

View File

@@ -884,13 +884,8 @@ 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() {