StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Iaa7b53564f61661bfd83b18a286d03384d6cf1fe
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:53:01 +00:00
committed by Automerger Merge Worker
parent ff85c5b916 e25b29206d
commit 75e33fb190
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cc/sanitize.go
View File

@@ -884,13 +884,8 @@ func (s *sanitize) flags(ctx ModuleContext, flags Flags) Flags {
if Bool(sanProps.Memtag_stack) { if Bool(sanProps.Memtag_stack) {
flags.Local.CFlags = append(flags.Local.CFlags, memtagStackCommonFlags...) 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.AsFlags = append(flags.Local.AsFlags, memtagStackCommonFlags...)
flags.Local.LdFlags = append(flags.Local.LdFlags, 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() { if (Bool(sanProps.Memtag_heap) || Bool(sanProps.Memtag_stack)) && ctx.binary() {