Merge "Add linux_musl arm+arm64"
This commit is contained in:
@@ -430,7 +430,7 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) {
|
||||
}
|
||||
|
||||
// Enable Memtag for all components in the include paths (for Aarch64 only)
|
||||
if ctx.Arch().ArchType == android.Arm64 && ctx.toolchain().Bionic() {
|
||||
if ctx.Arch().ArchType == android.Arm64 {
|
||||
if ctx.Config().MemtagHeapSyncEnabledForPath(ctx.ModuleDir()) {
|
||||
if s.Memtag_heap == nil {
|
||||
s.Memtag_heap = proptools.BoolPtr(true)
|
||||
@@ -460,17 +460,17 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) {
|
||||
}
|
||||
|
||||
// HWASan requires AArch64 hardware feature (top-byte-ignore).
|
||||
if ctx.Arch().ArchType != android.Arm64 || !ctx.toolchain().Bionic() {
|
||||
if ctx.Arch().ArchType != android.Arm64 {
|
||||
s.Hwaddress = nil
|
||||
}
|
||||
|
||||
// SCS is only implemented on AArch64.
|
||||
if ctx.Arch().ArchType != android.Arm64 || !ctx.toolchain().Bionic() {
|
||||
if ctx.Arch().ArchType != android.Arm64 {
|
||||
s.Scs = nil
|
||||
}
|
||||
|
||||
// Memtag_heap is only implemented on AArch64.
|
||||
if ctx.Arch().ArchType != android.Arm64 || !ctx.toolchain().Bionic() {
|
||||
if ctx.Arch().ArchType != android.Arm64 {
|
||||
s.Memtag_heap = nil
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user