Commit df07361642e8c7596b27a1291f99fd2deae48a9a | zig

author	Andrew Kelley <andrew@ziglang.org> 2017-11-13 22:26:31-05:00
committer	Andrew Kelley <andrew@ziglang.org> 2017-11-13 22:26:31-05:00
log	df07361642e8c7596b27a1291f99fd2deae48a9a
tree	a494a4ba9498e9f4b64acaf227cbb76d9d413319
parent	57cd074959cd529f0648264e877f9819f0209ddf
parent	98e3c7911cbbd6dc0d0e45775e424e448b8c651a

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

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

src
- link.cpp
- parsec.cpp

src/link.cpp+7-2

 @@ -485,8 +485,13 @@ static void construct_linker_job_coff(LinkJob *lj) {
             continue;
         }
         if (link_lib->provided_explicitly) {
-            Buf *arg = buf_sprintf("-l%s", buf_ptr(link_lib->name));
+            if (lj->codegen->zig_target.env_type == ZigLLVM_GNU) {
-            lj->args.append(buf_ptr(arg));
+                Buf *arg = buf_sprintf("-l%s", buf_ptr(link_lib->name));
+                lj->args.append(buf_ptr(arg));
+            }
+            else {
+                lj->args.append(buf_ptr(link_lib->name));
+            }
         } else {
             buf_resize(def_contents, 0);
             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	...	@@ -2577,11 +2577,10 @@ static AstNode resolve_typdef_as_builtin(Context c, const TypedefNameDecl *typ
2577	}	2577	}
2578		2578
2579	static AstNode resolve_typedef_decl(Context c, const TypedefNameDecl *typedef_decl) {	2579	static 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());
2581	if (existing_entry) {	2581	if (existing_entry) {
2582	return existing_entry->value;	2582	return existing_entry->value;
2583	}	2583	}
2584
2585	QualType child_qt = typedef_decl->getUnderlyingType();	2584	QualType child_qt = typedef_decl->getUnderlyingType();
2586	Buf *type_name = buf_create_from_str(decl_name(typedef_decl));	2585	Buf *type_name = buf_create_from_str(decl_name(typedef_decl));
2587		2586
...	@@ -2624,7 +2623,7 @@ static AstNode resolve_typedef_decl(Context c, const TypedefNameDecl *typedef_	...	@@ -2624,7 +2623,7 @@ static AstNode resolve_typedef_decl(Context c, const TypedefNameDecl *typedef_
2624	add_global_var(c, type_name, type_node);	2623	add_global_var(c, type_name, type_node);
2625		2624
2626	AstNode *symbol_node = trans_create_node_symbol(c, type_name);	2625	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);
2628	return symbol_node;	2627	return symbol_node;
2629	}	2628	}
2630		2629
...	@@ -2750,6 +2749,7 @@ static AstNode resolve_enum_decl(Context c, const EnumDecl *enum_decl) {	...	@@ -2750,6 +2749,7 @@ static AstNode resolve_enum_decl(Context c, const EnumDecl *enum_decl) {
2750	AstNode *symbol_node = trans_create_node_symbol(c, full_type_name);	2749	AstNode *symbol_node = trans_create_node_symbol(c, full_type_name);
2751	add_global_weak_alias(c, bare_name, full_type_name);	2750	add_global_weak_alias(c, bare_name, full_type_name);
2752	add_global_var(c, full_type_name, enum_node);	2751	add_global_var(c, full_type_name, enum_node);
		2752	c->decl_table.put(enum_decl->getCanonicalDecl(), symbol_node);
2753	return symbol_node;	2753	return symbol_node;
2754	}	2754	}
2755	}	2755	}