From 7cb38c35bbc2c7e3215ec0e102df7c8329894913 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Fri, 25 Dec 2020 23:22:49 +0100 Subject: [PATCH 1/5] 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 From 8e7a52d60e52b2af711bc8a278c84fbcda0d6f05 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Fri, 25 Dec 2020 23:29:22 +0100 Subject: [PATCH 2/5] Run dh_makeshlibs with -V parameter (Closes: #977814) --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index a596d71f..5aedc9b0 100755 --- a/debian/rules +++ b/debian/rules @@ -724,7 +724,7 @@ override_dh_makeshlibs: dh_makeshlibs -pliblldb-$(LLVM_VERSION) -V"liblldb-$(LLVM_VERSION) (>= 1:9~svn298832-1~)" dh_makeshlibs -plibllvm$(LLVM_VERSION) -V"libllvm$(LLVM_VERSION) (>= 1:9~svn298832-1~)" dh_makeshlibs -plibomp$(SONAME_OPENMP)-$(LLVM_VERSION) -V"libomp$(SONAME_OPENMP)-$(LLVM_VERSION) (>= 1:9~svn298832-1~)" - dh_makeshlibs --remaining-packages + dh_makeshlibs --remaining-packages -V override_dh_shlibdeps: # Ignore asan libraries. They would trigger dependencies to multiarch libraries From 4c150d6e1a5d905d597a1195c67f2a905b495824 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Sat, 26 Dec 2020 15:31:03 +0100 Subject: [PATCH 3/5] Update changelog --- debian/changelog | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8f302e68..5516d06d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,17 @@ llvm-toolchain-11 (1:11.0.1~++20201216111106+280e47ea0e83-1~exp1) UNRELEASED; urgency=medium + [ Sylvestre Ledru ] * experimental New snapshot release * Remove "gnu-assembler-compat.diff" for apt.llvm.org as applied upstream Should be part of rc2 + * Disable the patch for real + * rebase of the patch - -- Sylvestre Ledru Wed, 16 Dec 2020 11:14:19 +0100 + [ Gianfranco Costamagna ] + * Drop old patch, upstream now + * Run dh_makeshlibs with -V parameter (Closes: #977814) + + -- Gianfranco Costamagna Fri, 25 Dec 2020 23:29:49 +0100 llvm-toolchain-11 (1:11.0.1~+rc1-1~exp2) UNRELEASED; urgency=medium From efe59c3532455ef33c272df802af868d0909deca Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Tue, 5 Jan 2021 13:55:55 +0100 Subject: [PATCH 4/5] Sync changelog with what is in sid --- debian/changelog | 19 ++++++++++++++----- debian/unpack.sh | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5516d06d..35496be8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,6 @@ llvm-toolchain-11 (1:11.0.1~++20201216111106+280e47ea0e83-1~exp1) UNRELEASED; ur [ Sylvestre Ledru ] * experimental New snapshot release - * Remove "gnu-assembler-compat.diff" for apt.llvm.org as applied upstream - Should be part of rc2 * Disable the patch for real * rebase of the patch @@ -13,17 +11,28 @@ llvm-toolchain-11 (1:11.0.1~++20201216111106+280e47ea0e83-1~exp1) UNRELEASED; ur -- Gianfranco Costamagna Fri, 25 Dec 2020 23:29:49 +0100 -llvm-toolchain-11 (1:11.0.1~+rc1-1~exp2) UNRELEASED; urgency=medium +llvm-toolchain-11 (1:11.0.1~+rc2-1) unstable; urgency=medium + + * New snapshot release + * Remove 'gnu-assembler-compat.diff' - merged upstream + + -- Sylvestre Ledru Sat, 19 Dec 2020 09:38:48 +0100 + +llvm-toolchain-11 (1:11.0.1~+rc1-1) unstable; urgency=medium [ Alexander Volkov ] * Fix description of libclang-cpp11-dev package. - -- Alexander Volkov Thu, 26 Nov 2020 21:17:48 +0300 + [ Sylvestre Ledru ] + * Upload to unstable to help doko with gcc + 11.0.1 will be released before the freeze + + -- Sylvestre Ledru Wed, 16 Dec 2020 22:41:48 +0100 llvm-toolchain-11 (1:11.0.1~+rc1-1~exp1) experimental; urgency=medium [ Gianfranco Costamagna ] - * gnu-assembler-compat.diff: Add upstream patch D92052 to fix a + * gnu-assembler-compat.diff: Add upstream patch D92052 to fix a gcn offload compiler issue with gcc (Closes: #975692) [ Sylvestre Ledru ] diff --git a/debian/unpack.sh b/debian/unpack.sh index ae75de6d..a842ba68 100644 --- a/debian/unpack.sh +++ b/debian/unpack.sh @@ -1,6 +1,6 @@ set -e ORIG_VERSION=11 -MAJOR_VERSION=11 # 8.0.1 +MAJOR_VERSION=11.0.1 # 8.0.1 REV=`ls -1 *${ORIG_VERSION}_${MAJOR_VERSION}*~+*xz | tail -1|perl -ne 'print "$1\n" if /~\+(.*)\.orig/;' | sort -ru` VERSION=$REV From 9f251411c973faa6bd9abf1f8fe32ab22fcdbe4a Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 6 Jan 2021 09:24:48 +0100 Subject: [PATCH 5/5] 11.0.1 release --- debian/changelog | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 35496be8..e8baf7dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,13 @@ -llvm-toolchain-11 (1:11.0.1~++20201216111106+280e47ea0e83-1~exp1) UNRELEASED; urgency=medium +llvm-toolchain-11 (1:11.0.1-1) unstable; urgency=medium [ Sylvestre Ledru ] - * experimental New snapshot release - * Disable the patch for real - * rebase of the patch + * New stable release [ Gianfranco Costamagna ] * Drop old patch, upstream now * Run dh_makeshlibs with -V parameter (Closes: #977814) - -- Gianfranco Costamagna Fri, 25 Dec 2020 23:29:49 +0100 + -- Sylvestre Ledru Wed, 06 Jan 2021 09:21:24 +0100 llvm-toolchain-11 (1:11.0.1~+rc2-1) unstable; urgency=medium