diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp
index 1887072..af70a9c 100644
--- a/lib/CodeGen/CodeGenModule.cpp
+++ b/lib/CodeGen/CodeGenModule.cpp
@@ -468,7 +468,7 @@
 
   // If the global is a static, defer code generation until later so
   // we can easily omit unused statics.
-  if (isStatic) {
+  if (isStatic && !Features.EmitAllDecls) {
     StaticDecls.push_back(Global);
     return;
   }