Re: git: 8855efffd4fa - main - devel/llvm23: 23.1.0-rc3
Mark Millard <[email protected]>
| Newsgroups | gmane.os.freebsd.devel.cvs.ports |
|---|---|
| Message-ID | <[email protected]> |
On 8/14/26 02:17, Brooks Davis wrote: > The branch main has been updated by brooks: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=8855efffd4fa0467a5faff409d18444f76c0dbfb > > commit 8855efffd4fa0467a5faff409d18444f76c0dbfb > Author: Brooks Davis <[email protected]> > AuthorDate: 2026-08-14 09:16:40 +0000 > Commit: Brooks Davis <[email protected]> > CommitDate: 2026-08-14 09:17:12 +0000 > > devel/llvm23: 23.1.0-rc3 > > Attempt to fix compilation on 32-bit targets. Hmm. When I previously tried the build that included .r2 in its /usr/ports ugrade, the build got: . . . [02:40:33] [06] [02:39:47] Finished devel/llvm23@default | llvm23-23.1.0.r2: Success . . . [02:41:09] Committing packages to repository: /usr/local/poudriere/data/packages/main-armv7-default/.real_1786620042 via .latest symlink . . . (It was armv7 poudriere-devel jail on aarch64 Windows Dev Kit 2023, which supports armv7 user space code. The jail is from an official upstream pkgbase distribution for armv7 main.) So, what is sometimes broken about the compilation of llvm23-23.1.0.r2 ? (I also have a context tailored to Cortex-A7 targeting and it also built.) > > Sponsored by: DARPA, AFRL > --- > devel/llvm23/Makefile | 12 ++---------- > devel/llvm23/distinfo | 6 +++--- > .../files/patch-llvm_include_llvm_Support_Allocator.h | 14 ++++++++++++++ > 3 files changed, 19 insertions(+), 13 deletions(-) > > diff --git a/devel/llvm23/Makefile b/devel/llvm23/Makefile > index 9a6cf7b196b4..d8bb78967158 100644 > --- a/devel/llvm23/Makefile > +++ b/devel/llvm23/Makefile > @@ -1,5 +1,5 @@ > PORTNAME= llvm > -DISTVERSION= 23.1.0-rc2 > +DISTVERSION= 23.1.0-rc3 > PORTREVISION= 0 > CATEGORIES= devel lang > MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION}/ > @@ -428,17 +428,9 @@ _BE_LIBS_${BE}+= ${_BE_LIBS_COMMON:S/^/${BE_ARCH}/} \ > ${_BE_LIBS_${BE_ARCH}:S/^/${BE_ARCH}/} \ > ${_BE_LIBS_BACKWARDS_${BE_ARCH}:S/$/${BE_ARCH}/} > _BE_INCS_${BE}+= ${_BE_INCS_${BE_ARCH}} > -_BE_MODS_${BE}+= ${_BE_MODS_${BE_ARCH}} > .endfor > .endfor > -BE_PATTERN=LLVM(${_BE_LIBS_STANDARD:O:S/$/.a/:ts|})|${_BE_INCS_STANDARD:ts|}|${_BE_MODS_STANDARD:ts|} > - > -.if ${PORT_OPTIONS:MFLANG} > -.for BE in FREEBSD NATIVE STANDARD > -BE_${BE}_PLIST_FILES+= \ > - ${_BE_MODS_${BE}:S|^|${LLVM_DIR}/include/flang/|:N${LLVM_DIR}/include/flang/$} > -.endfor > -.endif > +BE_PATTERN=LLVM(${_BE_LIBS_STANDARD:O:S/$/.a/:ts|})|${_BE_INCS_STANDARD:ts|} > > .if ${ARCH} == "aarch64" > COMPILER_RT_ARCHS= aarch64 > diff --git a/devel/llvm23/distinfo b/devel/llvm23/distinfo > index 8024cee53fa3..4aa0c2be508e 100644 > --- a/devel/llvm23/distinfo > +++ b/devel/llvm23/distinfo > @@ -1,3 +1,3 @@ > -TIMESTAMP = 1785252231 > -SHA256 (llvm-project-23.1.0-rc2.src.tar.xz) = d4ad0bd64235891cae1a81a3bec6f38ec5d285be7a2d7cb194ce08e4ab67eee9 > -SIZE (llvm-project-23.1.0-rc2.src.tar.xz) = 179079292 > +TIMESTAMP = 1786637443 > +SHA256 (llvm-project-23.1.0-rc3.src.tar.xz) = 15796d21e2c5818895edf06a46d7748972b0cb799a499112045b056972f9984b > +SIZE (llvm-project-23.1.0-rc3.src.tar.xz) = 179126732 > diff --git a/devel/llvm23/files/patch-llvm_include_llvm_Support_Allocator.h b/devel/llvm23/files/patch-llvm_include_llvm_Support_Allocator.h > new file mode 100644 > index 000000000000..3895eb68d164 > --- /dev/null > +++ b/devel/llvm23/files/patch-llvm_include_llvm_Support_Allocator.h > @@ -0,0 +1,14 @@ > +--- llvm/include/llvm/Support/Allocator.h.orig > ++++ llvm/include/llvm/Support/Allocator.h > +@@ -64,7 +64,11 @@ > + /// CurPtr when the requested alignment is no greater than MinAlign. > + template <typename AllocatorT = MallocAllocator, size_t SlabSize = 4096, > + size_t SizeThreshold = SlabSize, size_t GrowthDelay = 128, > ++#ifdef __ILP32__ > ++ size_t MinAlign = 4> > ++#else > + size_t MinAlign = 8> > ++#endif > + class BumpPtrAllocatorImpl > + : public AllocatorBase<BumpPtrAllocatorImpl< > + AllocatorT, SlabSize, SizeThreshold, GrowthDelay, MinAlign>>, > > -- === Mark Millard marklmi at yahoo.com