diff options
| -rw-r--r-- | src/codegen.cpp | 17 | ||||
| -rw-r--r-- | src/link.cpp | 79 | ||||
| -rw-r--r-- | src/main.cpp | 12 |
3 files changed, 86 insertions, 22 deletions
diff --git a/src/codegen.cpp b/src/codegen.cpp index 175aca5346..d106c7dab6 100644 --- a/src/codegen.cpp +++ b/src/codegen.cpp @@ -190,6 +190,9 @@ CodeGen *codegen_create(Buf *main_pkg_path, Buf *root_src_path, const ZigTarget g->link_libs_list.append(g->libc_link_lib); } + get_target_triple(&g->triple_str, g->zig_target); + g->pointer_size_bytes = target_arch_pointer_bit_width(g->zig_target->arch) / 8; + return g; } @@ -7786,16 +7789,6 @@ static void init(CodeGen *g) { if (g->module) return; - if (g->llvm_argv_len > 0) { - const char **args = allocate_nonzero<const char *>(g->llvm_argv_len + 2); - args[0] = "zig (LLVM option parsing)"; - for (size_t i = 0; i < g->llvm_argv_len; i += 1) { - args[i + 1] = g->llvm_argv[i]; - } - args[g->llvm_argv_len + 1] = nullptr; - ZigLLVMParseCommandLineOptions(g->llvm_argv_len + 1, args); - } - if (g->is_test_build) { g->subsystem = TargetSubsystemConsole; } @@ -7803,8 +7796,6 @@ static void init(CodeGen *g) { assert(g->root_out_name); g->module = LLVMModuleCreateWithName(buf_ptr(g->root_out_name)); - get_target_triple(&g->triple_str, g->zig_target); - LLVMSetTarget(g->module, buf_ptr(&g->triple_str)); if (target_object_format(g->zig_target) == ZigLLVM_COFF) { @@ -7860,7 +7851,7 @@ static void init(CodeGen *g) { LLVMSetDataLayout(g->module, layout_str); - g->pointer_size_bytes = LLVMPointerSize(g->target_data_ref); + assert(g->pointer_size_bytes == LLVMPointerSize(g->target_data_ref)); g->is_big_endian = (LLVMByteOrder(g->target_data_ref) == LLVMBigEndian); g->builder = LLVMCreateBuilder(); diff --git a/src/link.cpp b/src/link.cpp index d3d69d5422..6459347e0b 100644 --- a/src/link.cpp +++ b/src/link.cpp @@ -32,6 +32,7 @@ static CodeGen *create_child_codegen(CodeGen *parent_gen, Buf *root_src_path, Ou child_gen->verbose_llvm_ir = parent_gen->verbose_llvm_ir; child_gen->verbose_cimport = parent_gen->verbose_cimport; child_gen->verbose_cc = parent_gen->verbose_cc; + child_gen->llvm_argv = parent_gen->llvm_argv; codegen_set_strip(child_gen, parent_gen->strip_debug_symbols); child_gen->disable_pic = parent_gen->disable_pic; @@ -161,6 +162,7 @@ static void glibc_add_include_dirs_arch(CFile *c_file, ZigLLVM_ArchType arch, co bool is_arm = arch == ZigLLVM_arm || arch == ZigLLVM_armeb; bool is_ppc = arch == ZigLLVM_ppc || arch == ZigLLVM_ppc64 || arch == ZigLLVM_ppc64le; bool is_riscv = arch == ZigLLVM_riscv32 || arch == ZigLLVM_riscv64; + bool is_sparc = arch == ZigLLVM_sparc || arch == ZigLLVM_sparcel || arch == ZigLLVM_sparcv9; bool is_64 = target_arch_pointer_bit_width(arch) == 64; if (is_x86) { @@ -195,14 +197,29 @@ static void glibc_add_include_dirs_arch(CFile *c_file, ZigLLVM_ArchType arch, co } else { if (is_64) { c_file->args.append("-I"); - c_file->args.append(buf_ptr(buf_sprintf("%s" OS_SEP "mips64", dir))); + c_file->args.append(buf_ptr(buf_sprintf("%s" OS_SEP "mips" OS_SEP "mips64", dir))); } else { c_file->args.append("-I"); - c_file->args.append(buf_ptr(buf_sprintf("%s" OS_SEP "mips32", dir))); + c_file->args.append(buf_ptr(buf_sprintf("%s" OS_SEP "mips" OS_SEP "mips32", dir))); } c_file->args.append("-I"); c_file->args.append(buf_ptr(buf_sprintf("%s" OS_SEP "mips", dir))); } + } else if (is_sparc) { + if (nptl != nullptr) { + c_file->args.append("-I"); + c_file->args.append(buf_ptr(buf_sprintf("%s" OS_SEP "sparc" OS_SEP "%s", dir, nptl))); + } else { + if (is_64) { + c_file->args.append("-I"); + c_file->args.append(buf_ptr(buf_sprintf("%s" OS_SEP "sparc" OS_SEP "sparc64", dir))); + } else { + c_file->args.append("-I"); + c_file->args.append(buf_ptr(buf_sprintf("%s" OS_SEP "sparc" OS_SEP "sparc32", dir))); + } + c_file->args.append("-I"); + c_file->args.append(buf_ptr(buf_sprintf("%s" OS_SEP "sparc", dir))); + } } else if (is_aarch64) { if (nptl != nullptr) { c_file->args.append("-I"); @@ -218,10 +235,10 @@ static void glibc_add_include_dirs_arch(CFile *c_file, ZigLLVM_ArchType arch, co } else { if (is_64) { c_file->args.append("-I"); - c_file->args.append(buf_ptr(buf_sprintf("%s" OS_SEP "powerpc64", dir))); + c_file->args.append(buf_ptr(buf_sprintf("%s" OS_SEP "powerpc" OS_SEP "powerpc64", dir))); } else { c_file->args.append("-I"); - c_file->args.append(buf_ptr(buf_sprintf("%s" OS_SEP "powerpc32", dir))); + c_file->args.append(buf_ptr(buf_sprintf("%s" OS_SEP "powerpc" OS_SEP "powerpc32", dir))); } c_file->args.append("-I"); c_file->args.append(buf_ptr(buf_sprintf("%s" OS_SEP "powerpc", dir))); @@ -288,11 +305,59 @@ static void glibc_add_include_dirs(CodeGen *parent, CFile *c_file) { c_file->args.append(path_from_libc(parent, "glibc")); } +static const char *glibc_start_asm_path(CodeGen *parent, const char *file) { + ZigLLVM_ArchType arch = parent->zig_target->arch; + bool is_aarch64 = arch == ZigLLVM_aarch64 || arch == ZigLLVM_aarch64_be; + bool is_mips = arch == ZigLLVM_mips || arch == ZigLLVM_mipsel || + arch == ZigLLVM_mips64el || arch == ZigLLVM_mips64; + bool is_arm = arch == ZigLLVM_arm || arch == ZigLLVM_armeb; + bool is_ppc = arch == ZigLLVM_ppc || arch == ZigLLVM_ppc64 || arch == ZigLLVM_ppc64le; + bool is_riscv = arch == ZigLLVM_riscv32 || arch == ZigLLVM_riscv64; + bool is_sparc = arch == ZigLLVM_sparc || arch == ZigLLVM_sparcel || arch == ZigLLVM_sparcv9; + bool is_64 = target_arch_pointer_bit_width(arch) == 64; + + Buf result = BUF_INIT; + buf_resize(&result, 0); + buf_append_buf(&result, parent->zig_lib_dir); + buf_append_str(&result, OS_SEP "libc" OS_SEP "glibc" OS_SEP "sysdeps" OS_SEP); + if (arch == ZigLLVM_nios2) { + buf_append_str(&result, "nios2"); + } else if (is_sparc) { + if (is_64) { + buf_append_str(&result, "sparc" OS_SEP "sparc64"); + } else { + buf_append_str(&result, "sparc" OS_SEP "sparc32"); + } + } else if (is_arm) { + buf_append_str(&result, "arm"); + } else if (is_mips) { + buf_append_str(&result, "mips"); + } else if (arch == ZigLLVM_x86_64) { + buf_append_str(&result, "x86_64"); + } else if (arch == ZigLLVM_x86) { + buf_append_str(&result, "i386"); + } else if (is_aarch64) { + buf_append_str(&result, "aarch64"); + } else if (is_riscv) { + buf_append_str(&result, "riscv"); + } else if (is_ppc) { + if (is_64) { + buf_append_str(&result, "powerpc" OS_SEP "powerpc64"); + } else { + buf_append_str(&result, "powerpc" OS_SEP "powerpc32"); + } + } + + buf_append_str(&result, OS_SEP); + buf_append_str(&result, file); + return buf_ptr(&result); +} + static const char *get_libc_crt_file(CodeGen *parent, const char *file) { if (parent->libc == nullptr && target_is_glibc(parent)) { if (strcmp(file, "crti.o") == 0) { CFile *c_file = allocate<CFile>(1); - c_file->source_path = path_from_libc(parent, "glibc" OS_SEP "sysdeps" OS_SEP "x86_64" OS_SEP "crti.S"); + c_file->source_path = glibc_start_asm_path(parent, "crti.S"); glibc_add_include_dirs(parent, c_file); c_file->args.append("-D_LIBC_REENTRANT"); c_file->args.append("-include"); @@ -314,7 +379,7 @@ static const char *get_libc_crt_file(CodeGen *parent, const char *file) { return build_libc_object(parent, "crti", c_file); } else if (strcmp(file, "crtn.o") == 0) { CFile *c_file = allocate<CFile>(1); - c_file->source_path = path_from_libc(parent, "glibc" OS_SEP "sysdeps" OS_SEP "x86_64" OS_SEP "crtn.S"); + c_file->source_path = glibc_start_asm_path(parent, "crtn.S"); glibc_add_include_dirs(parent, c_file); c_file->args.append("-D_LIBC_REENTRANT"); c_file->args.append("-DMODULE_NAME=libc"); @@ -325,7 +390,7 @@ static const char *get_libc_crt_file(CodeGen *parent, const char *file) { return build_libc_object(parent, "crtn", c_file); } else if (strcmp(file, "start.os") == 0) { CFile *c_file = allocate<CFile>(1); - c_file->source_path = path_from_libc(parent, "glibc" OS_SEP "sysdeps" OS_SEP "x86_64" OS_SEP "start.S"); + c_file->source_path = glibc_start_asm_path(parent, "start.S"); glibc_add_include_dirs(parent, c_file); c_file->args.append("-D_LIBC_REENTRANT"); c_file->args.append("-include"); diff --git a/src/main.cpp b/src/main.cpp index 7d2c5cf029..fd67c71ea3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -409,7 +409,6 @@ int main(int argc, char **argv) { const char *dynamic_linker = nullptr; const char *libc_txt = nullptr; ZigList<const char *> clang_argv = {0}; - ZigList<const char *> llvm_argv = {0}; ZigList<const char *> lib_dirs = {0}; ZigList<const char *> link_libs = {0}; ZigList<const char *> forbidden_link_libs = {0}; @@ -443,6 +442,9 @@ int main(int argc, char **argv) { Buf *main_pkg_path = nullptr; ValgrindSupport valgrind_support = ValgrindSupportAuto; + ZigList<const char *> llvm_argv = {0}; + llvm_argv.append("zig (LLVM option parsing)"); + if (argc >= 2 && strcmp(argv[1], "build") == 0) { Buf zig_exe_path_buf = BUF_INIT; if ((err = os_self_exe_path(&zig_exe_path_buf))) { @@ -1027,7 +1029,13 @@ int main(int argc, char **argv) { codegen_set_each_lib_rpath(g, each_lib_rpath); codegen_set_clang_argv(g, clang_argv.items, clang_argv.length); - codegen_set_llvm_argv(g, llvm_argv.items, llvm_argv.length); + + if (llvm_argv.length > 1) { + llvm_argv.append(nullptr); + ZigLLVMParseCommandLineOptions(llvm_argv.length, llvm_argv.items); + } + + codegen_set_llvm_argv(g, llvm_argv.items + 1, llvm_argv.length - 2); codegen_set_strip(g, strip); codegen_set_is_static(g, is_static); if (dynamic_linker != nullptr) |