authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-08-26 02:39:26-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-08-26 02:39:26-04:00
logf7f11e237c96a357e9a5e8b4a8ce2c6a7499de3b
tree70daeb0c542c319511ff577b2f306ac43a4ea88b
parentcce14f92fc2e284114bc9d08bc93e55d45a55188
parent8047f0eae2da64a88474dbe9106c61b3e26e6871

Merge remote-tracking branch 'origin/master' into llvm7

1 files changed, 3 insertions(+), 2 deletions(-)

src/codegen.cpp+3-2
......@@ -5732,6 +5732,7 @@ static void do_code_gen(CodeGen *g) {
57325732
57335733 LLVMSetLinkage(global_value, LLVMExternalLinkage);
57345734 LLVMSetAlignment(global_value, var->align_bytes);
5735 LLVMSetGlobalConstant(global_value, var->gen_is_const);
57355736 }
57365737 } else {
57375738 bool exported = (var->linkage == VarLinkageExport);
......@@ -5752,9 +5753,9 @@ static void do_code_gen(CodeGen *g) {
57525753 if (var->gen_is_const && var->value->type->id != TypeTableEntryIdFn) {
57535754 gen_global_var(g, var, var->value->global_refs->llvm_value, var->value->type);
57545755 }
5755 }
57565756
5757 LLVMSetGlobalConstant(global_value, var->gen_is_const);
5757 LLVMSetGlobalConstant(global_value, var->gen_is_const);
5758 }
57585759
57595760 var->value_ref = global_value;
57605761 }