diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp
index 0b7d30a..e5bd15e 100644
--- a/lib/CodeGen/CodeGenModule.cpp
+++ b/lib/CodeGen/CodeGenModule.cpp
@@ -477,6 +477,12 @@
          "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