authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-11-13 22:26:31-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-11-13 22:26:31-05:00
logdf07361642e8c7596b27a1291f99fd2deae48a9a
treea494a4ba9498e9f4b64acaf227cbb76d9d413319
parent57cd074959cd529f0648264e877f9819f0209ddf
parent98e3c7911cbbd6dc0d0e45775e424e448b8c651a

Merge branch 'parsec' of https://github.com/dimenus/zig into dimenus-parsec

2 files changed, 10 insertions(+), 5 deletions(-)

src/link.cpp+7-2
......@@ -485,8 +485,13 @@ static void construct_linker_job_coff(LinkJob *lj) {
485485 continue;
486486 }
487487 if (link_lib->provided_explicitly) {
488 Buf *arg = buf_sprintf("-l%s", buf_ptr(link_lib->name));
489 lj->args.append(buf_ptr(arg));
488 if (lj->codegen->zig_target.env_type == ZigLLVM_GNU) {
489 Buf *arg = buf_sprintf("-l%s", buf_ptr(link_lib->name));
490 lj->args.append(buf_ptr(arg));
491 }
492 else {
493 lj->args.append(buf_ptr(link_lib->name));
494 }
490495 } else {
491496 buf_resize(def_contents, 0);
492497 buf_appendf(def_contents, "LIBRARY %s\nEXPORTS\n", buf_ptr(link_lib->name));
src/parsec.cpp+3-3
......@@ -2577,11 +2577,10 @@ static AstNode *resolve_typdef_as_builtin(Context *c, const TypedefNameDecl *typ
25772577}
25782578
25792579static AstNode *resolve_typedef_decl(Context *c, const TypedefNameDecl *typedef_decl) {
2580 auto existing_entry = c->decl_table.maybe_get((void*)typedef_decl);
2580 auto existing_entry = c->decl_table.maybe_get((void*)typedef_decl->getCanonicalDecl());
25812581 if (existing_entry) {
25822582 return existing_entry->value;
25832583 }
2584
25852584 QualType child_qt = typedef_decl->getUnderlyingType();
25862585 Buf *type_name = buf_create_from_str(decl_name(typedef_decl));
25872586
......@@ -2624,7 +2623,7 @@ static AstNode *resolve_typedef_decl(Context *c, const TypedefNameDecl *typedef_
26242623 add_global_var(c, type_name, type_node);
26252624
26262625 AstNode *symbol_node = trans_create_node_symbol(c, type_name);
2627 c->decl_table.put(typedef_decl, symbol_node);
2626 c->decl_table.put(typedef_decl->getCanonicalDecl(), symbol_node);
26282627 return symbol_node;
26292628}
26302629
......@@ -2750,6 +2749,7 @@ static AstNode *resolve_enum_decl(Context *c, const EnumDecl *enum_decl) {
27502749 AstNode *symbol_node = trans_create_node_symbol(c, full_type_name);
27512750 add_global_weak_alias(c, bare_name, full_type_name);
27522751 add_global_var(c, full_type_name, enum_node);
2752 c->decl_table.put(enum_decl->getCanonicalDecl(), symbol_node);
27532753 return symbol_node;
27542754 }
27552755}