diff --git a/lib/CodeGen/LoopAligner.cpp b/lib/CodeGen/LoopAligner.cpp
index 60e3f194305..b8d00595d8a 100644
--- a/lib/CodeGen/LoopAligner.cpp
+++ b/lib/CodeGen/LoopAligner.cpp
@@ -59,7 +59,7 @@ bool LoopAligner::runOnMachineFunction(MachineFunction &MF) {
     return false;  // Don't care about loop alignment.
 
   const Function *F = MF.getFunction();
-  if (!F->isDeclaration() && F->hasFnAttr(Attribute::OptimizeForSize))
+  if (F->hasFnAttr(Attribute::OptimizeForSize))
     return false;
 
   for (MachineFunction::iterator I = MF.begin(), E = MF.end(); I != E; ++I) {
diff --git a/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp b/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
index e66edcaa325..5710add416c 100644
--- a/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
+++ b/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
@@ -154,7 +154,7 @@ void X86ATTAsmPrinter::emitFunctionHeader(const MachineFunction &MF) {
   SwitchToSection(TAI->SectionForGlobal(F));
 
   unsigned FnAlign = 4;
-  if (!F->isDeclaration() && F->hasFnAttr(Attribute::OptimizeForSize))
+  if (F->hasFnAttr(Attribute::OptimizeForSize))
     FnAlign = 1;
   switch (F->getLinkage()) {
   default: assert(0 && "Unknown linkage type!");
diff --git a/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp b/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
index a9141d3cfc4..ae869799a97 100644
--- a/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
+++ b/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
@@ -141,7 +141,7 @@ bool X86IntelAsmPrinter::runOnMachineFunction(MachineFunction &MF) {
   SwitchToTextSection("_text", F);
 
   unsigned FnAlign = 4;
-  if (!F->isDeclaration() && F->hasFnAttr(Attribute::OptimizeForSize))
+  if (F->hasFnAttr(Attribute::OptimizeForSize))
     FnAlign = 1;
   switch (F->getLinkage()) {
   default: assert(0 && "Unsupported linkage type!");