Index: llvm/lib/MC/MCParser/ELFAsmParser.cpp
===================================================================
--- llvm/lib/MC/MCParser/ELFAsmParser.cpp
+++ llvm/lib/MC/MCParser/ELFAsmParser.cpp
@@ -652,10 +652,15 @@
       !(SectionName == ".eh_frame" && Type == ELF::SHT_PROGBITS))
     Error(loc, "changed section type for " + SectionName + ", expected: 0x" +
                    utohexstr(Section->getType()));
-  if (Section->getFlags() != Flags)
+  // Check that flags are used consistently. However, the GNU assembler permits
+  // to leave out in subsequent uses of the same sections; for compatibility,
+  // do likewise.
+  if ((Flags || Size) &&
+      Section->getFlags() != Flags)
     Error(loc, "changed section flags for " + SectionName + ", expected: 0x" +
                    utohexstr(Section->getFlags()));
-  if (Section->getEntrySize() != Size)
+  if ((Flags || Size) &&
+      Section->getEntrySize() != Size)
     Error(loc, "changed section entsize for " + SectionName +
                    ", expected: " + Twine(Section->getEntrySize()));
 
Index: llvm/test/MC/ELF/section-entsize-not-repeated.s
===================================================================
--- /dev/null
+++ llvm/test/MC/ELF/section-entsize-not-repeated.s
@@ -0,0 +1,21 @@
+# RUN: llvm-mc -triple=x86_64 %s -o - | FileCheck %s
+
+// CHECK: .section        .foo,"aM",@progbits,1
+// CHECK: .section        .bar,"aM",@progbits,4
+
+foo:
+.section .foo,"aM",@progbits,1
+
+.section .foo
+
+.pushsection .foo
+
+.pushsection .foo
+
+.section .bar,"aM",@progbits,4
+
+.section .bar
+
+.pushsection .bar,"aM",@progbits,4
+
+.pushsection .bar
Index: llvm/test/MC/ELF/section-flags-changed-2.s
===================================================================
--- /dev/null
+++ llvm/test/MC/ELF/section-flags-changed-2.s
@@ -0,0 +1,14 @@
+# RUN: not llvm-mc -triple=x86_64 %s -o /dev/null 2>&1 | FileCheck %s --implicit-check-not=error:
+
+foo:
+.section .foo,"ax",@progbits
+
+.section .foo
+
+# CHECK: {{.*}}.s:[[# @LINE+1]]:1: error: changed section flags for .foo, expected: 0x6
+.section .foo,"awx",@progbits
+
+# CHECK: {{.*}}.s:[[# @LINE+1]]:1: error: changed section flags for .foo, expected: 0x6
+.pushsection .foo,"a",@progbits
+
+.pushsection .foo