aboutsummaryrefslogtreecommitdiff
path: root/lib/CodeGen/CodeGenModule.cpp
diff options
context:
space:
mode:
authorEli Friedman <eli.friedman@gmail.com>2008-05-29 11:10:27 +0000
committerEli Friedman <eli.friedman@gmail.com>2008-05-29 11:10:27 +0000
commit08d7802a406ee4a7cc18e8fce0c137b8c410ea7c (patch)
tree53b6f7e402e9d46c50b46b70e7fea379a8b73ca7 /lib/CodeGen/CodeGenModule.cpp
parent32ea35fee916ed73fe343bad2de9a609eb2cca38 (diff)
Add CodeGen support for alignment on globals, both for unusual natural
alignment and alignment attributes. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@51676 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CodeGenModule.cpp')
-rw-r--r--lib/CodeGen/CodeGenModule.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp
index 0b7d30ac50..e5bd15e856 100644
--- a/lib/CodeGen/CodeGenModule.cpp
+++ b/lib/CodeGen/CodeGenModule.cpp
@@ -477,6 +477,12 @@ void CodeGenModule::EmitGlobalVarInit(const VarDecl *D) {
"Initializer codegen type mismatch!");
GV->setInitializer(Init);
+ unsigned Align = Context.getTypeAlign(D->getType());
+ if (const AlignedAttr* AA = D->getAttr<AlignedAttr>()) {
+ Align = std::max(Align, AA->getAlignment());
+ }
+ GV->setAlignment(Align / 8);
+
if (const VisibilityAttr *attr = D->getAttr<VisibilityAttr>())
setVisibility(GV, attr->getVisibility());
// FIXME: else handle -fvisibility