From 7cb38c35bbc2c7e3215ec0e102df7c8329894913 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Fri, 25 Dec 2020 23:22:49 +0100 Subject: [PATCH] Drop old patch, upstream now --- debian/patches/gnu-assembler-compat.diff | 72 ------------------------ debian/patches/series | 1 - 2 files changed, 73 deletions(-) delete mode 100644 debian/patches/gnu-assembler-compat.diff diff --git a/debian/patches/gnu-assembler-compat.diff b/debian/patches/gnu-assembler-compat.diff deleted file mode 100644 index f8091019..00000000 --- a/debian/patches/gnu-assembler-compat.diff +++ /dev/null @@ -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 diff --git a/debian/patches/series b/debian/patches/series index 7110ba08..1a792d67 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -132,7 +132,6 @@ workaround-bug-42994-use-linker.diff # bug 939472 #try-to-unbreak-thinlto.diff -D67877.patch x86-fuzzer.patch