Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c47a46ad authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 957cd6bc 25cd9813

cc/sanitize.go

+5 −0
Original line number Diff line number Diff line
@@ -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() {