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

Commit 7a5b46db authored by Vishwath Mohan's avatar Vishwath Mohan
Browse files

Add ar flags for CFI enabled components in Soong. 

CFI enabled components need ar to use the gold linker. This CL adds
that.

Bug: 36290748
Test: Enabling CFI for a Soong component builds without error.
Change-Id: Icbf78fa1ca0d845350516b4dd345b54fbb7ef847
parent 83d9f71c

cc/sanitize.go

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ const ( 
	// FIXME: revert the __cfi_check flag when clang is updated to r280031.

	cfiLdflags = "-flto -fsanitize-cfi-cross-dso -fsanitize=cfi " +

		"-Wl,-plugin-opt,O1 -Wl,-export-dynamic-symbol=__cfi_check"

	cfiArflags = "--plugin ${config.ClangBin}/../lib64/LLVMgold.so"

)



type sanitizerType int
@@ -332,6 +333,7 @@ func (sanitize *sanitize) flags(ctx ModuleContext, flags Flags) Flags { 
		sanitizers = append(sanitizers, "cfi")

		flags.CFlags = append(flags.CFlags, cfiCflags)

		flags.LdFlags = append(flags.LdFlags, cfiLdflags)

		flags.ArFlags = append(flags.ArFlags, cfiArflags)

		if Bool(sanitize.Properties.Sanitize.Diag.Cfi) {

			diagSanitizers = append(diagSanitizers, "cfi")

		}