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

Commit 5007c4a0 authored by Mitch Phillips's avatar Mitch Phillips
Browse files

Revert "[cc_fuzz] Revert 'disable LTO' patches." 

Revert submission 1976512-revert-nolto-fuzzing

Reason for revert: b/222160662
Reverted Changes:
Iacee4fa29:[cc_fuzz] Revert 'disable LTO' patches.
Ic509b00a1:[cc_fuzz] Revert 'disable LTO' patches.
If85931f09:[cc_fuzz] Revert 'disable LTO' patches.

Change-Id: I84e01a4f84145e3331c2955836c8cc9bfa05c36b
parent 7fbac74d

cc/lto.go

+6 −0
Original line number Diff line number Diff line
@@ -82,6 +82,12 @@ func (lto *lto) useClangLld(ctx BaseModuleContext) bool { 
}



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

cc/sanitize.go

+12 −0
Original line number Diff line number Diff line
@@ -540,6 +540,12 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) { 
		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 {
@@ -642,6 +648,12 @@ func (sanitize *sanitize) flags(ctx ModuleContext, flags Flags) Flags { 
	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).