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

Commit bafe1f4d authored by Ivan Lozano's avatar Ivan Lozano Committed by Automerger Merge Worker
Browse files

Merge "rust: Add BTI/PAC for supported targets." into main am: 3eca04b3 am:... 

Merge "rust: Add BTI/PAC for supported targets." into main am: 3eca04b3 am: 4edcc69b am: d2a3eb59 am: 9c0c6460

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2676135



Change-Id: I3f0ae2909874751f90db4f8a02b505421c0b8e7b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 45d2684f 9c0c6460

rust/config/arm64_device.go

+12 −5
Original line number Diff line number Diff line
@@ -27,10 +27,17 @@ var ( 


	Arm64ArchVariantRustFlags = map[string][]string{

		"armv8-a": []string{},

		"armv8-a-branchprot": []string{},

		"armv8-a-branchprot": []string{

			// branch-protection=bti,pac-ret is equivalent to Clang's mbranch-protection=standard

			"-Z branch-protection=bti,pac-ret",

		},

		"armv8-2a":         []string{},

		"armv8-2a-dotprod": []string{},

		"armv9-a":            []string{},

		"armv9-a": []string{

			// branch-protection=bti,pac-ret is equivalent to Clang's mbranch-protection=standard

			"-Z branch-protection=bti,pac-ret",

			"-Z stack-protector=none",

		},

	}

)