authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-02-19 22:09:25-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-02-19 22:09:25-05:00
log7c298c8c172c00a2f8c138434c66a8d192031a95
tree59c688162f72f9613cf6737d7985525094ef4d6a
parent884d1504082dcef1ce8edd18f7be0242b11e29e3
signaturelock-open Commit is signed but in an unrecognized format.

fix generation of builtin import

1 files changed, 4 insertions(+), 20 deletions(-)

src/codegen.cpp+4-20
...@@ -8504,25 +8504,9 @@ Buf *codegen_generate_builtin_source(CodeGen *g) {...@@ -8504,25 +8504,9 @@ Buf *codegen_generate_builtin_source(CodeGen *g) {
8504 for (uint32_t arch_i = 0; arch_i < field_count; arch_i += 1) {8504 for (uint32_t arch_i = 0; arch_i < field_count; arch_i += 1) {
8505 ZigLLVM_ArchType arch = target_arch_enum(arch_i);8505 ZigLLVM_ArchType arch = target_arch_enum(arch_i);
8506 const char *arch_name = target_arch_name(arch);8506 const char *arch_name = target_arch_name(arch);
8507 SubArchList sub_arch_list = target_subarch_list(arch);8507 if (arch == g->zig_target->arch) {
8508 if (sub_arch_list == SubArchListNone) {8508 g->target_arch_index = arch_i;
8509 if (arch == g->zig_target->arch) {8509 cur_arch = arch_name;
8510 g->target_arch_index = arch_i;
8511 cur_arch = buf_ptr(buf_sprintf("Arch.%s", arch_name));
8512 }
8513 } else {
8514 const char *sub_arch_list_name = target_subarch_list_name(sub_arch_list);
8515 if (arch == g->zig_target->arch) {
8516 size_t sub_count = target_subarch_count(sub_arch_list);
8517 for (size_t sub_i = 0; sub_i < sub_count; sub_i += 1) {
8518 ZigLLVM_SubArchType sub = target_subarch_enum(sub_arch_list, sub_i);
8519 if (sub == g->zig_target->sub_arch) {
8520 g->target_sub_arch_index = sub_i;
8521 cur_arch = buf_ptr(buf_sprintf("Arch{ .%s = Arch.%s.%s }",
8522 arch_name, sub_arch_list_name, target_subarch_name(sub)));
8523 }
8524 }
8525 }
8526 }8510 }
8527 }8511 }
8528 }8512 }
...@@ -8621,7 +8605,7 @@ Buf *codegen_generate_builtin_source(CodeGen *g) {...@@ -8621,7 +8605,7 @@ Buf *codegen_generate_builtin_source(CodeGen *g) {
8621 buf_appendf(contents, "pub const is_test = %s;\n", bool_to_str(g->is_test_build));8605 buf_appendf(contents, "pub const is_test = %s;\n", bool_to_str(g->is_test_build));
8622 buf_appendf(contents, "pub const single_threaded = %s;\n", bool_to_str(g->is_single_threaded));8606 buf_appendf(contents, "pub const single_threaded = %s;\n", bool_to_str(g->is_single_threaded));
8623 buf_appendf(contents, "pub const os = Os.%s;\n", cur_os);8607 buf_appendf(contents, "pub const os = Os.%s;\n", cur_os);
8624 buf_appendf(contents, "pub const arch = %s;\n", cur_arch);8608 buf_appendf(contents, "pub const arch = Arch.%s;\n", cur_arch);
8625 buf_appendf(contents, "pub const abi = Abi.%s;\n", cur_abi);8609 buf_appendf(contents, "pub const abi = Abi.%s;\n", cur_abi);
8626 {8610 {
8627 buf_append_str(contents, "pub const cpu: Cpu = ");8611 buf_append_str(contents, "pub const cpu: Cpu = ");