git: 150e5ca73f3e - main - devel/llvm13: update to RC3
Brooks Davis
brooks at FreeBSD.org
Thu Sep 23 23:41:44 UTC 2021
The branch main has been updated by brooks:
URL: https://cgit.FreeBSD.org/ports/commit/?id=150e5ca73f3ea7c84c9eabece43ec5315233f3d9
commit 150e5ca73f3ea7c84c9eabece43ec5315233f3d9
Author: Brooks Davis <brooks at FreeBSD.org>
AuthorDate: 2021-09-23 23:39:45 +0000
Commit: Brooks Davis <brooks at FreeBSD.org>
CommitDate: 2021-09-23 23:39:45 +0000
devel/llvm13: update to RC3
Fix the link to FileCheck
PR: 244439
Sponsored by: DARPA
---
devel/llvm13/Makefile | 6 +-
devel/llvm13/distinfo | 6 +-
devel/llvm13/files/patch-lld-be-compressed-debug | 154 ---------------------
...nmp_libomptarget_plugins_amdgpu_impl_system.cpp | 18 ---
4 files changed, 6 insertions(+), 178 deletions(-)
diff --git a/devel/llvm13/Makefile b/devel/llvm13/Makefile
index ab934b247390..650da0941660 100644
--- a/devel/llvm13/Makefile
+++ b/devel/llvm13/Makefile
@@ -1,6 +1,6 @@
PORTNAME= llvm
-DISTVERSION= 13.0.0rc2
-PORTREVISION= 1
+DISTVERSION= 13.0.0rc3
+PORTREVISION= 0
CATEGORIES= devel lang
MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \
https://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR}
@@ -584,7 +584,7 @@ post-install-LIT-on:
${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/formats
${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/FileCheck \
${STAGEDIR}${LLVM_PREFIX}/bin/
- ${LN} -fs ${LLVM_DIR}/bin/FileCheck \
+ ${LN} -fs ../${LLVM_DIR}/bin/FileCheck \
${STAGEDIR}${PREFIX}/bin/FileCheck${LLVM_SUFFIX}
post-install-LLD-on:
diff --git a/devel/llvm13/distinfo b/devel/llvm13/distinfo
index df22eaa7d588..1df275221367 100644
--- a/devel/llvm13/distinfo
+++ b/devel/llvm13/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1630085619
-SHA256 (llvm-project-13.0.0rc2.src.tar.xz) = 62c80357c23630365758656753268949e81ac12c15e077699919713998514e41
-SIZE (llvm-project-13.0.0rc2.src.tar.xz) = 97559008
+TIMESTAMP = 1632436423
+SHA256 (llvm-project-13.0.0rc3.src.tar.xz) = e48d7ae488f56d1eedfb2dc10443376c230eb770704f508a8fa285a41549dca5
+SIZE (llvm-project-13.0.0rc3.src.tar.xz) = 97573684
diff --git a/devel/llvm13/files/patch-lld-be-compressed-debug b/devel/llvm13/files/patch-lld-be-compressed-debug
deleted file mode 100644
index 5b419a064e9d..000000000000
--- a/devel/llvm13/files/patch-lld-be-compressed-debug
+++ /dev/null
@@ -1,154 +0,0 @@
-commit c6ebc651b6fac9cf1d9f8c00ea49d29093003f85
-Author: Simon Atanasyan <simon at atanasyan.com>
-Date: Fri Aug 6 13:29:47 2021 +0300
-
- [LLD] Support compressed input sections on big-endian targets
-
- This patch enables compressed input sections on big-endian targets by
- checking the target endianness and selecting an appropriate `Chdr`
- structure.
-
- Fixes PR51369
-
- Differential Revision: https://reviews.llvm.org/D107635
-
-diff --git lld/ELF/InputSection.cpp lld/ELF/InputSection.cpp
-index 1f9fa961fc2..7d952e9037f 100644
---- lld/ELF/InputSection.cpp
-+++ lld/ELF/InputSection.cpp
-@@ -88,7 +88,22 @@ InputSectionBase::InputSectionBase(InputFile *file, uint64_t flags,
- if (!zlib::isAvailable())
- error(toString(file) + ": contains a compressed section, " +
- "but zlib is not available");
-- parseCompressedHeader();
-+ switch (config->ekind) {
-+ case ELF32LEKind:
-+ parseCompressedHeader<ELF32LE>();
-+ break;
-+ case ELF32BEKind:
-+ parseCompressedHeader<ELF32BE>();
-+ break;
-+ case ELF64LEKind:
-+ parseCompressedHeader<ELF64LE>();
-+ break;
-+ case ELF64BEKind:
-+ parseCompressedHeader<ELF64BE>();
-+ break;
-+ default:
-+ llvm_unreachable("unknown ELFT");
-+ }
- }
- }
-
-@@ -210,10 +225,7 @@ OutputSection *SectionBase::getOutputSection() {
- // When a section is compressed, `rawData` consists with a header followed
- // by zlib-compressed data. This function parses a header to initialize
- // `uncompressedSize` member and remove the header from `rawData`.
--void InputSectionBase::parseCompressedHeader() {
-- using Chdr64 = typename ELF64LE::Chdr;
-- using Chdr32 = typename ELF32LE::Chdr;
--
-+template <typename ELFT> void InputSectionBase::parseCompressedHeader() {
- // Old-style header
- if (name.startswith(".zdebug")) {
- if (!toStringRef(rawData).startswith("ZLIB")) {
-@@ -239,32 +251,13 @@ void InputSectionBase::parseCompressedHeader() {
- assert(flags & SHF_COMPRESSED);
- flags &= ~(uint64_t)SHF_COMPRESSED;
-
-- // New-style 64-bit header
-- if (config->is64) {
-- if (rawData.size() < sizeof(Chdr64)) {
-- error(toString(this) + ": corrupted compressed section");
-- return;
-- }
--
-- auto *hdr = reinterpret_cast<const Chdr64 *>(rawData.data());
-- if (hdr->ch_type != ELFCOMPRESS_ZLIB) {
-- error(toString(this) + ": unsupported compression type");
-- return;
-- }
--
-- uncompressedSize = hdr->ch_size;
-- alignment = std::max<uint32_t>(hdr->ch_addralign, 1);
-- rawData = rawData.slice(sizeof(*hdr));
-- return;
-- }
--
-- // New-style 32-bit header
-- if (rawData.size() < sizeof(Chdr32)) {
-+ // New-style header
-+ if (rawData.size() < sizeof(typename ELFT::Chdr)) {
- error(toString(this) + ": corrupted compressed section");
- return;
- }
-
-- auto *hdr = reinterpret_cast<const Chdr32 *>(rawData.data());
-+ auto *hdr = reinterpret_cast<const typename ELFT::Chdr *>(rawData.data());
- if (hdr->ch_type != ELFCOMPRESS_ZLIB) {
- error(toString(this) + ": unsupported compression type");
- return;
-diff --git lld/ELF/InputSection.h lld/ELF/InputSection.h
-index 5b91c1c90bd..c914d0b4215 100644
---- lld/ELF/InputSection.h
-+++ lld/ELF/InputSection.h
-@@ -238,6 +238,7 @@ public:
- }
-
- protected:
-+ template <typename ELFT>
- void parseCompressedHeader();
- void uncompress() const;
-
-diff --git lld/test/ELF/compressed-debug-input-err.s lld/test/ELF/compressed-debug-input-err.s
-index 89773eca59d..0495a9eaa08 100644
---- lld/test/ELF/compressed-debug-input-err.s
-+++ lld/test/ELF/compressed-debug-input-err.s
-@@ -3,6 +3,9 @@
- # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
- # RUN: not ld.lld %t.o -o /dev/null -shared 2>&1 | FileCheck %s
-
-+# RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-unknown %s -o %t-be.o
-+# RUN: not ld.lld %t-be.o -o /dev/null -shared 2>&1 | FileCheck %s
-+
- ## Check we are able to report zlib uncompress errors.
- # CHECK: error: {{.*}}.o:(.debug_str): uncompress failed: zlib error: Z_DATA_ERROR
-
-diff --git lld/test/ELF/compressed-debug-input.s lld/test/ELF/compressed-debug-input.s
-index c9bfd3e5162..5b61ea8b384 100644
---- lld/test/ELF/compressed-debug-input.s
-+++ lld/test/ELF/compressed-debug-input.s
-@@ -1,7 +1,9 @@
- # REQUIRES: zlib, x86
-
- # RUN: llvm-mc -compress-debug-sections=zlib -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-+# RUN: llvm-mc -compress-debug-sections=zlib -filetype=obj -triple=powerpc64-unknown-unknown %s -o %t-be
- # RUN: llvm-readobj --sections %t | FileCheck -check-prefix=ZLIB %s
-+# RUN: llvm-readobj --sections %t-be | FileCheck -check-prefix=ZLIB %s
- # ZLIB: Section {
- # ZLIB: Index: 2
- # ZLIB: Name: .debug_str
-@@ -21,7 +23,9 @@
- # ZLIB-NEXT: }
-
- # RUN: llvm-mc -compress-debug-sections=zlib-gnu -filetype=obj -triple=x86_64-unknown-linux %s -o %t2
-+# RUN: llvm-mc -compress-debug-sections=zlib-gnu -filetype=obj -triple=powerpc64-unknown-unknown %s -o %t2-be
- # RUN: llvm-readobj --sections %t2 | FileCheck -check-prefix=GNU %s
-+# RUN: llvm-readobj --sections %t2-be | FileCheck -check-prefix=GNU %s
- # GNU: Section {
- # GNU: Index: 2
- # GNU: Name: .zdebug_str
-@@ -41,9 +45,13 @@
-
- # RUN: ld.lld --hash-style=sysv %t -o %t.so -shared
- # RUN: llvm-readobj --sections --section-data %t.so | FileCheck -check-prefix=DATA %s
-+# RUN: ld.lld --hash-style=sysv %t-be -o %t-be.so -shared
-+# RUN: llvm-readobj --sections --section-data %t-be.so | FileCheck -check-prefix=DATA %s
-
- # RUN: ld.lld --hash-style=sysv %t2 -o %t2.so -shared
- # RUN: llvm-readobj --sections --section-data %t2.so | FileCheck -check-prefix=DATA %s
-+# RUN: ld.lld --hash-style=sysv %t2-be -o %t2-be.so -shared
-+# RUN: llvm-readobj --sections --section-data %t2-be.so | FileCheck -check-prefix=DATA %s
-
- # DATA: Section {
- # DATA: Index: 6
diff --git a/devel/llvm13/files/patch-openmp_libomptarget_plugins_amdgpu_impl_system.cpp b/devel/llvm13/files/patch-openmp_libomptarget_plugins_amdgpu_impl_system.cpp
deleted file mode 100644
index 0fc77118f9d5..000000000000
--- a/devel/llvm13/files/patch-openmp_libomptarget_plugins_amdgpu_impl_system.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
---- openmp/libomptarget/plugins/amdgpu/impl/system.cpp.orig
-+++ openmp/libomptarget/plugins/amdgpu/impl/system.cpp
-@@ -35,6 +35,7 @@
- /*
- * Note descriptors.
- */
-+ #ifndef __FreeBSD__
- typedef struct {
- uint32_t n_namesz; /* Length of note's name. */
- uint32_t n_descsz; /* Length of note's value. */
-@@ -43,6 +44,7 @@
- // then padding, optional
- // then desc, at 4 byte alignment (not 8, despite being elf64)
- } Elf_Note;
-+#endif
-
- // The following include file and following structs/enums
- // have been replicated on a per-use basis below. For example,
More information about the dev-commits-ports-main
mailing list