diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2020-01-29 23:33:12 -0500 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2020-01-29 23:33:12 -0500 |
| commit | a95dce15ae4bd95cfd2266da51ba860cc6524a1b (patch) | |
| tree | e761ecb74f37ff699d2e1f09d122811b101826e4 /src/zig_llvm.cpp | |
| parent | 800ead2810fa573a7e94979e707a14d4e066ef77 (diff) | |
| parent | 7ebc624a15c5a01d6bee8eaf9c7487b30ed1904c (diff) | |
| download | zig-a95dce15ae4bd95cfd2266da51ba860cc6524a1b.tar.gz zig-a95dce15ae4bd95cfd2266da51ba860cc6524a1b.zip | |
Merge remote-tracking branch 'origin/master' into llvm10
Diffstat (limited to 'src/zig_llvm.cpp')
| -rw-r--r-- | src/zig_llvm.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/zig_llvm.cpp b/src/zig_llvm.cpp index aa635e4274..5dcd2fa74a 100644 --- a/src/zig_llvm.cpp +++ b/src/zig_llvm.cpp @@ -824,7 +824,7 @@ const char *ZigLLVMGetSubArchTypeName(ZigLLVM_SubArchType sub_arch) { case ZigLLVM_ARMSubArch_v8_1a: return "v8.1a"; case ZigLLVM_ARMSubArch_v8: - return "v8"; + return "v8a"; case ZigLLVM_ARMSubArch_v8r: return "v8r"; case ZigLLVM_ARMSubArch_v8m_baseline: @@ -834,7 +834,7 @@ const char *ZigLLVMGetSubArchTypeName(ZigLLVM_SubArchType sub_arch) { case ZigLLVM_ARMSubArch_v8_1m_mainline: return "v8.1m.main"; case ZigLLVM_ARMSubArch_v7: - return "v7"; + return "v7a"; case ZigLLVM_ARMSubArch_v7em: return "v7em"; case ZigLLVM_ARMSubArch_v7m: |