Drop old patch, upstream now

This commit is contained in:
Gianfranco Costamagna 2020-12-25 23:22:49 +01:00
parent 52edc5972b
commit 7cb38c35bb
2 changed files with 0 additions and 73 deletions

View File

@ -1,72 +0,0 @@
Index: llvm/lib/MC/MCParser/ELFAsmParser.cpp
===================================================================
--- a/llvm/lib/MC/MCParser/ELFAsmParser.cpp
+++ b/llvm/lib/MC/MCParser/ELFAsmParser.cpp
@@ -652,10 +652,13 @@
!(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 || !TypeName.empty()) && Section->getFlags() != Flags)
Error(loc, "changed section flags for " + SectionName + ", expected: 0x" +
utohexstr(Section->getFlags()));
- if (Section->getEntrySize() != Size)
+ if ((Flags || Size || !TypeName.empty()) && Section->getEntrySize() != Size)
Error(loc, "changed section entsize for " + SectionName +
", expected: " + Twine(Section->getEntrySize()));
Index: llvm/test/MC/ELF/section-entsize-changed.s
===================================================================
--- a/llvm/test/MC/ELF/section-entsize-changed.s
+++ b/llvm/test/MC/ELF/section-entsize-changed.s
@@ -10,3 +10,23 @@
.pushsection .foo,"aM",@progbits,4
.pushsection .foo,"aM",@progbits,1
+
+bar:
+.section .bar
+
+# CHECK: {{.*}}.s:[[# @LINE+1]]:1: error: changed section flags for .bar, expected: 0x0
+.section .bar,"awx",@progbits
+
+# CHECK: {{.*}}.s:[[# @LINE+1]]:1: error: changed section flags for .bar, expected: 0x0
+.pushsection .bar,"a",@progbits
+
+.pushsection .bar
+
+foobar:
+.section .foobar,"ax",@progbits
+
+# CHECK: {{.*}}.s:[[# @LINE+1]]:1: error: changed section flags for .foobar, expected: 0x6
+.section .foobar,"",@progbits
+
+# CHECK: {{.*}}.s:[[# @LINE+1]]:1: error: changed section flags for .foobar, expected: 0x6
+.section .foobar,"a",@progbits
Index: llvm/test/MC/ELF/section-omitted-attributes.s
===================================================================
--- /dev/null
+++ llvm/test/MC/ELF/section-omitted-attributes.s
@@ -0,0 +1,19 @@
+# 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
+
+.section .bar,"aM",@progbits,4
+
+.section .bar
+
+.pushsection .bar,"aM",@progbits,4
+
+.pushsection .bar

View File

@ -132,7 +132,6 @@ workaround-bug-42994-use-linker.diff
# bug 939472
#try-to-unbreak-thinlto.diff
D67877.patch
x86-fuzzer.patch