summaryrefslogtreecommitdiffstats
path: root/clang/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
commit174d9c26f14b5503082a4c90abdfe1ac00a3369b (patch)
tree08798278d186df3a6841e2e5060019ab66f3b41e /clang/lib/CodeGen/CodeGenModule.cpp
parentb65ff27f53cb81269bb4d38d406cd850b03789a7 (diff)
downloadbcm5719-llvm-174d9c26f14b5503082a4c90abdfe1ac00a3369b.tar.gz
bcm5719-llvm-174d9c26f14b5503082a4c90abdfe1ac00a3369b.zip
Add CodeGen support for alignment on globals, both for unusual natural
alignment and alignment attributes. llvm-svn: 51676
Diffstat (limited to 'clang/lib/CodeGen/CodeGenModule.cpp')
-rw-r--r--clang/lib/CodeGen/CodeGenModule.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp
index 0b7d30ac500..e5bd15e8566 100644
--- a/clang/lib/CodeGen/CodeGenModule.cpp
+++ b/clang/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
OpenPOWER on IntegriCloud