tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[rust/coverage] Remove obsolete WAR to pass -z,start-stop-gc

Browse source 
Bug: http://b/199203503

Rust's llvm-project source now includes  https://reviews.llvm.org/D97448
and we no longer need this workaround.

Test: m unicode-xid_test_src_lib and verify __llvm_prf_data section is
      present.
Change-Id: I0387bd3af8bfc765f3aba3b309bfbc7ef49d565d
This commit is contained in:
Pirama Arumuga Nainar 2022-01-25 22:32:39 -08:00
parent 3239bcb16d
commit 668da23096
1 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
rust/coverage.go
View file

@ -57,18 +57,7 @@ func (cov *coverage) flags(ctx ModuleContext, flags Flags, deps PathDeps) (Flags
flags.RustFlags = append(flags.RustFlags,
"-Z instrument-coverage", "-g")
flags.LinkFlags = append(flags.LinkFlags,
profileInstrFlag, "-g", coverage.OutputFile().Path().String(), "-Wl,--wrap,open",
// Upstream LLVM change 6d2d3bd0a6 made
// -z,start-stop-gc the default. It drops metadata
// sections like __llvm_prf_data unless they are marked
// SHF_GNU_RETAIN. https://reviews.llvm.org/D97448
// marks generated sections, including __llvm_prf_data
// as SHF_GNU_RETAIN. However this change is not in
// the Rust toolchain. Since we link Rust libs with
// new lld, we should use nostart-stop-gc until the
// Rust toolchain updates past D97448.
"-Wl,-z,nostart-stop-gc",
)
profileInstrFlag, "-g", coverage.OutputFile().Path().String(), "-Wl,--wrap,open")
deps.StaticLibs = append(deps.StaticLibs, coverage.OutputFile().Path())
}