From ccdef8c0fb0a80d38ce4f4ac0c57aa2b66bfcfc2 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Wed, 6 Mar 2019 13:22:36 -0500 Subject: cross compile glibc startup files --- src/codegen.cpp | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'src/codegen.cpp') 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(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(); -- cgit v1.2.3