Ekdohibs
/
zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

respect link order in source code

master
Andrew Kelley 2016-02-13 23:03:16 -07:00
parent 1141e4f5b2
commit 5771bd805e
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/all_types.hpp
View File

@ -1061,9 +1061,9 @@ struct CodeGen {
LLVMZigDICompileUnit *compile_unit;
ZigList<Buf *> lib_search_paths;
ZigList<Buf *> link_libs;
// reminder: hash tables must be initialized before use
HashMap<Buf *, bool, buf_hash, buf_eql_buf> link_table;
HashMap<Buf *, ImportTableEntry *, buf_hash, buf_eql_buf> import_table;
HashMap<Buf *, BuiltinFnEntry *, buf_hash, buf_eql_buf> builtin_fn_table;
HashMap<Buf *, TypeTableEntry *, buf_hash, buf_eql_buf> primitive_type_table;

4
src/codegen.cpp
View File

@ -24,7 +24,6 @@
CodeGen *codegen_create(Buf *root_source_dir, const ZigTarget *target) {
CodeGen *g = allocate<CodeGen>(1);
g->link_table.init(32);
g->import_table.init(32);
g->builtin_fn_table.init(32);
g->primitive_type_table.init(32);
@ -3831,9 +3830,10 @@ static ImportTableEntry *codegen_add_code(CodeGen *g, Buf *abs_full_path,
if (buf_eql_str(name, "version")) {
set_root_export_version(g, param, directive_node);
} else if (buf_eql_str(name, "link")) {
g->link_table.put(param, true);
if (buf_eql_str(param, "c")) {
g->link_libc = true;
} else {
g->link_libs.append(param);
}
} else {
add_node_error(g, directive_node,

19
src/link.cpp
View File

@ -210,18 +210,11 @@ static void construct_linker_job_linux(LinkJob *lj) {
lj->args.append(buf_ptr(compiler_rt_o_path));
}
auto it = g->link_table.entry_iterator();
for (;;) {
auto *entry = it.next();
if (!entry)
break;
// we handle libc explicitly, don't do it here
if (!buf_eql_str(entry->key, "c")) {
Buf *arg = buf_sprintf("-l%s", buf_ptr(entry->key));
for (int i = 0; i < g->link_libs.length; i += 1) {
Buf *link_lib = g->link_libs.at(i);
Buf *arg = buf_sprintf("-l%s", buf_ptr(link_lib));
lj->args.append(buf_ptr(arg));
}
}
// libc dep
@ -333,6 +326,12 @@ static void construct_linker_job_mingw(LinkJob *lj) {
lj->args.append((const char *)buf_ptr(&lj->out_file_o));
for (int i = 0; i < g->link_libs.length; i += 1) {
Buf *link_lib = g->link_libs.at(i);
Buf *arg = buf_sprintf("-l%s", buf_ptr(link_lib));
lj->args.append(buf_ptr(arg));
}
if (g->link_libc) {
if (g->is_static) {
lj->args.append("--start-group");