diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2019-06-03 19:11:41 -0400 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2019-06-03 19:11:41 -0400 |
| commit | b6108eed522b7a0122d305dc1a74de8f12f20d5b (patch) | |
| tree | 156392d4f61f4afa193c67606673fa789a62657b /src/codegen.cpp | |
| parent | eb8a132d23c5c2a365eb3a8034a381cb74c3436c (diff) | |
| download | zig-b6108eed522b7a0122d305dc1a74de8f12f20d5b.tar.gz zig-b6108eed522b7a0122d305dc1a74de8f12f20d5b.zip | |
fix alignment of consts
Diffstat (limited to 'src/codegen.cpp')
| -rw-r--r-- | src/codegen.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/codegen.cpp b/src/codegen.cpp index da4be1bf23..b03068eb7d 100644 --- a/src/codegen.cpp +++ b/src/codegen.cpp @@ -6599,7 +6599,8 @@ static void render_const_val_global(CodeGen *g, ConstExprValue *const_val, const LLVMSetLinkage(global_value, LLVMInternalLinkage); LLVMSetGlobalConstant(global_value, true); LLVMSetUnnamedAddr(global_value, true); - LLVMSetAlignment(global_value, get_abi_alignment(g, const_val->type)); + LLVMSetAlignment(global_value, (const_val->global_refs->align == 0) ? + get_abi_alignment(g, const_val->type) : const_val->global_refs->align); const_val->global_refs->llvm_global = global_value; } |