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

Commit 24870216 authored by Aditya Kumar's avatar Aditya Kumar
Browse files

Revert "Disable LTO and CFI for riscv64" 

This reverts commit ecf4e664.

Reason for revert: Not needed as emultated tls is now globally disabled https://android-review.git.corp.google.com/c/platform/build/soong/+/2431153

Change-Id: Idc3de2771afbbe2d5976f3c7974b3ffd15441b13
parent ff007311

cc/lto.go

+0 −5
Original line number Diff line number Diff line
@@ -91,11 +91,6 @@ func (lto *lto) flags(ctx BaseModuleContext, flags Flags) Flags { 
		return flags

	}



	// TODO(b/254713216): LTO doesn't work on riscv64 yet.

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

		return flags

	}



	if lto.LTO(ctx) {

		var ltoCFlag string

		var ltoLdFlag string

cc/sanitize.go

+0 −6
Original line number Diff line number Diff line
@@ -653,12 +653,6 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) { 
		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

	if ctx.toolchain().Musl() {

		s.Cfi = nil