diff options
| author | 2025-03-17 13:57:59 -0700 | |
|---|---|---|
| committer | 2025-03-17 13:57:59 -0700 | |
| commit | b546854edbf9f5c26542983bbe0ae5af5e654204 (patch) | |
| tree | 503603808eb186479a05739f210a331c194e5de6 | |
| parent | 2a75c81fbe73df0a0a5b5f05227251c4ace4e833 (diff) | |
| parent | 8f607c7943e80faea5fec30f312587ec6a06ea83 (diff) | |
Merge "Add support for ARMv9.3-A and ARMv9.4-A." into main
| -rw-r--r-- | android/arch_list.go | 8 | ||||
| -rw-r--r-- | cc/config/arm64_device.go | 10 | ||||
| -rw-r--r-- | rust/config/arm64_device.go | 8 |
3 files changed, 26 insertions, 0 deletions
diff --git a/android/arch_list.go b/android/arch_list.go index 389f194e8..8659549ca 100644 --- a/android/arch_list.go +++ b/android/arch_list.go @@ -27,6 +27,8 @@ var archVariants = map[ArchType][]string{ "armv8-2a-dotprod", "armv9-a", "armv9-2a", + "armv9-3a", + "armv9-4a", }, X86: { "alderlake", @@ -151,6 +153,12 @@ var androidArchFeatureMap = map[ArchType]map[string][]string{ "armv9-2a": { "dotprod", }, + "armv9-3a": { + "dotprod", + }, + "armv9-4a": { + "dotprod", + }, }, X86: { "alderlake": { diff --git a/cc/config/arm64_device.go b/cc/config/arm64_device.go index 45b15809f..25edb798d 100644 --- a/cc/config/arm64_device.go +++ b/cc/config/arm64_device.go @@ -53,6 +53,16 @@ var ( "-mbranch-protection=standard", "-fno-stack-protector", }, + "armv9-3a": []string{ + "-march=armv9.3-a", + "-mbranch-protection=standard", + "-fno-stack-protector", + }, + "armv9-4a": []string{ + "-march=armv9.4-a", + "-mbranch-protection=standard", + "-fno-stack-protector", + }, } arm64Ldflags = []string{ diff --git a/rust/config/arm64_device.go b/rust/config/arm64_device.go index 94a445700..efcd56a7b 100644 --- a/rust/config/arm64_device.go +++ b/rust/config/arm64_device.go @@ -45,6 +45,14 @@ var ( "-Z branch-protection=bti,pac-ret", "-Z stack-protector=none", }, + "armv9-3a": []string{ + "-Z branch-protection=bti,pac-ret", + "-Z stack-protector=none", + }, + "armv9-4a": []string{ + "-Z branch-protection=bti,pac-ret", + "-Z stack-protector=none", + }, } ) |