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

Commit 95ad0a92 authored by Sami Tolvanen's avatar Sami Tolvanen Committed by Gerrit Code Review
Browse files

Merge "Reapply "Enable CFI for riscv64"" into main

parents 088c4b65 ed78fc85

cc/sanitize.go

+0 −6
Original line number Original line Diff line number Diff line
@@ -679,12 +679,6 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) { 
		s.Integer_overflow = nil

		s.Integer_overflow = nil

	}

	}





	// TODO(b/254713216): CFI doesn't work for riscv64 yet because LTO doesn't work.

	if ctx.Arch().ArchType == android.Riscv64 {

		s.Cfi = nil

		s.Diag.Cfi = nil

	}



	// Disable CFI for musl

	// Disable CFI for musl

	if ctx.toolchain().Musl() {

	if ctx.toolchain().Musl() {

		s.Cfi = nil

		s.Cfi = nil