diff --git a/lib/CodeGen/DwarfWriter.cpp b/lib/CodeGen/DwarfWriter.cpp
index 73ec4efba78..d8f58ba0485 100644
--- a/lib/CodeGen/DwarfWriter.cpp
+++ b/lib/CodeGen/DwarfWriter.cpp
@@ -2979,12 +2979,13 @@ private:
                           sizeof(int8_t) - // LPStart format
                           sizeof(int8_t) - // TType format
                           sizeof(int8_t);  // TType base offset (NEED ULEB128)
-    
+
     // Begin the exception table.
     Asm->SwitchToDataSection(TAI->getDwarfExceptionSection());
     O << "GCC_except_table" << SubprogramCount << ":\n";
+    Asm->EmitAlignment(2);
     EmitLabel("exception", SubprogramCount);
-    
+
     // Emit the header.
     Asm->EmitInt8(DW_EH_PE_omit);
     Asm->EOL("LPStart format (DW_EH_PE_omit)");