[cc_fuzz] Revert 'disable LTO' patches.
The toolchain no longer has a problem with sancov + LTO.
Bug: 131771163
Test: make haiku
Change-Id: If85931f092c41336a8a5e0e7999ad39dd8ec3daf
diff --git a/cc/lto.go b/cc/lto.go
index 6d55579..a48a12c 100644
--- a/cc/lto.go
+++ b/cc/lto.go
@@ -82,12 +82,6 @@
}
func (lto *lto) flags(ctx BaseModuleContext, flags Flags) Flags {
- // TODO(b/131771163): Disable LTO when using explicit fuzzing configurations.
- // LTO breaks fuzzer builds.
- if inList("-fsanitize=fuzzer-no-link", flags.Local.CFlags) {
- return flags
- }
-
if lto.LTO(ctx) {
var ltoCFlag string
var ltoLdFlag string
diff --git a/cc/sanitize.go b/cc/sanitize.go
index 6c68822..9e047d5 100644
--- a/cc/sanitize.go
+++ b/cc/sanitize.go
@@ -540,12 +540,6 @@
s.Address = nil
s.Thread = nil
}
-
- // TODO(b/131771163): CFI transiently depends on LTO, and thus Fuzzer is
- // mutually incompatible.
- if Bool(s.Fuzzer) {
- s.Cfi = nil
- }
}
func toDisableImplicitIntegerChange(flags []string) bool {
@@ -648,12 +642,6 @@
if Bool(sanitize.Properties.Sanitize.Fuzzer) {
flags.Local.CFlags = append(flags.Local.CFlags, "-fsanitize=fuzzer-no-link")
- // TODO(b/131771163): LTO and Fuzzer support is mutually incompatible.
- _, flags.Local.LdFlags = removeFromList("-flto", flags.Local.LdFlags)
- _, flags.Local.CFlags = removeFromList("-flto", flags.Local.CFlags)
- flags.Local.LdFlags = append(flags.Local.LdFlags, "-fno-lto")
- flags.Local.CFlags = append(flags.Local.CFlags, "-fno-lto")
-
// TODO(b/142430592): Upstream linker scripts for sanitizer runtime libraries
// discard the sancov_lowest_stack symbol, because it's emulated TLS (and thus
// doesn't match the linker script due to the "__emutls_v." prefix).