Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

llvm: update to 19.1.7 and add import libs fix for LLD #23136

Merged
merged 8 commits into from
Jan 19, 2025
Merged

llvm: update to 19.1.7 and add import libs fix for LLD #23136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
aeab6b5
llvm: update to 19.1.7 and add import libs fix for LLD
mati865 Jan 17, 2025
dea9781
polly: update to 19.1.7
mati865 Jan 17, 2025
3090614
mlir: update to 19.1.7
mati865 Jan 17, 2025
89bf9e4
llvm-openmp: update to 19.1.7
mati865 Jan 17, 2025
37b6f29
lldb: update to 19.1.7
mati865 Jan 17, 2025
58d09be
libclc: update to 19.1.7
mati865 Jan 17, 2025
db698dd
libc++: update to 19.1.7
mati865 Jan 17, 2025
37ff8f2
flag: update to 19.1.7
mati865 Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions mingw-w64-flang/PKGBUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ _compiler=clang
_realname=flang
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
_version=19.1.6
_version=19.1.7
_rc=""
_tag=llvmorg-${_version}${_rc}
pkgver=${_version}${_rc/-/}
Expand Down Expand Up @@ -46,9 +46,9 @@ source=("${_url}/${_pkgfn}.tar.xz"{,.sig}
"0006-Rename-flang-new-flang-experimental-exec-to-flang.patch"
"0007-add-municode-flag-on-mingw.patch"
"0008-do-not-use-clock_gettime-on-mingw.patch")
sha256sums=('789c41b0c8413c9ed0c2292308a1a053284368435d517282a81290c7c554d517'
sha256sums=('632d598e990500c021a47b4f981efd39518d363b03d99da5ba4c1b14d838c40b'
'SKIP'
'9c7ec82d9a240dc2287b8de89d6881bb64ceea0dcd6ce133c34ef65bda22d99e'
'11c5a28f90053b0c43d0dec3d0ad579347fc277199c005206b963c19aae514e3'
'SKIP'
'ae666c454909f6695bcd69f067b9c5abf8a6e82ce2930955b8598ab3b58a5204'
'77fb0612217b6af7a122f586a9d0d334cd48bb201509bf72e8f8e6244616e895'
Expand Down
14 changes: 7 additions & 7 deletions mingw-w64-libc++/PKGBUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ _realname=libc++
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-libunwind")
_version=19.1.6
_version=19.1.7
_rc=""
_tag=llvmorg-${_version}${_rc}
pkgver=${_version}${_rc/-/}
Expand Down Expand Up @@ -38,17 +38,17 @@ source=("${_url}/libcxx-${pkgver}.src.tar.xz"{,.sig}
"${_url}/runtimes-${pkgver}.src.tar.xz"{,.sig}
"${_url}/llvm-${pkgver}.src.tar.xz"{,.sig}
"${_url}/cmake-${pkgver}.src.tar.xz"{,.sig})
sha256sums=('bfa95b7777d1aafde91df6362542cea4b2f8b8575cf2c4c950e382f5962fe2df'
sha256sums=('b736109650ffc750dbdc506483347b3713ded9d0300f48432b820ad66b6a9052'
'SKIP'
'8821056b55d01f6902cac47ea9db87c27f541922eedea830e27b51c85825d7dc'
'4d25125109e3febe1393e9e30f93153333d82b48ce7bed637bd2daf52bf40172'
'SKIP'
'34eab971069837be770e44f3543f1eb50f385575e8f29d1b5e1a67e7c482f680'
'10e650f436bc416674f01b5e01177405886f4d0f0b2568c6808044eacad52ea0'
'SKIP'
'a242d2aeaafbc259901d0f5b962874ed8e6ff0b51993036e08ae5d28be2f6e68'
'404c54c2df45a307331eba1372917ec480addf3b77ca9943ed4d7ea445efb08f'
'SKIP'
'ad1a3b125ff014ded290094088de40efb9193ce81a24278184230b7d401f8a3e'
'96f833c6ad99a3e8e1d9aca5f439b8fd2c7efdcf83b664e0af1c0712c5315910'
'SKIP'
'9c7ec82d9a240dc2287b8de89d6881bb64ceea0dcd6ce133c34ef65bda22d99e'
'11c5a28f90053b0c43d0dec3d0ad579347fc277199c005206b963c19aae514e3'
'SKIP')
validpgpkeys=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D' # Hans Wennborg, Google.
'474E22316ABF4785A88C6E8EA2C794A986419D8A' # Tom Stellard
Expand Down
4 changes: 2 additions & 2 deletions mingw-w64-libclc/PKGBUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
_realname=libclc
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
_version=19.1.6
_version=19.1.7
_rc=""
_tag=llvmorg-${_version}${_rc}
pkgver=${_version}${_rc/-/}
Expand All @@ -23,7 +23,7 @@ _pkgfn=$_realname-$pkgver.src
source=($_url/$_pkgfn.tar.xz{,.sig}
0001-cmake-copy-instead-symlink.patch
0002-fix-pkgconfig-file.patch)
sha256sums=('9fb7807c245b265cc1158105a52abaf8199a13834e2d2e94d742ce436a1e82d7'
sha256sums=('77e2d71f5cea1d0b1014ba88186299d1a0848eb3dc20948baae649db9e7641cb'
'SKIP'
'0f2b0f1d33e1a14e1e6cc5d3f5ec37b961a775317dd2c58dd530cc8abb06bcd9'
'f0c995d679214dbb1248f15365c6d26440efa0afc76402172068456f99109c25')
Expand Down
6 changes: 3 additions & 3 deletions mingw-w64-lldb/PKGBUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ fi
_realname=lldb
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
_version=19.1.6
_version=19.1.7
_rc=""
_tag=llvmorg-${_version}${_rc}
pkgver=${_version}${_rc/-/}
Expand Down Expand Up @@ -38,9 +38,9 @@ _pkgfn=$_realname-$pkgver.src
source=($_url/$_pkgfn.tar.xz{,.sig}
${_url}/cmake-${pkgver}.src.tar.xz{,.sig}
"104874.patch"::"https://github.com/llvm/llvm-project/pull/104874.patch")
sha256sums=('76b6f578cbb9a7fd1eeb25667d140b0e80fb157a7404099258f30f7d2b37b292'
sha256sums=('376d583c781f83384135ad415d0ccd2b31fe3031711fbc75ed751c65f04c3094'
'SKIP'
'9c7ec82d9a240dc2287b8de89d6881bb64ceea0dcd6ce133c34ef65bda22d99e'
'11c5a28f90053b0c43d0dec3d0ad579347fc277199c005206b963c19aae514e3'
'SKIP'
'87695f7128fe0fb3f0b698a132f6d18cbe513d35ff1e0ebe25afac395ead8e9f')
validpgpkeys=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D' # Hans Wennborg, Google.
Expand Down
6 changes: 3 additions & 3 deletions mingw-w64-llvm-openmp/PKGBUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ fi
_realname=openmp
pkgbase=mingw-w64-llvm-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-llvm-${_realname}")
_version=19.1.6
_version=19.1.7
_rc=""
_tag=llvmorg-${_version}${_rc}
pkgver=${_version}${_rc/-/}
Expand Down Expand Up @@ -38,9 +38,9 @@ source=($_url/$_pkgfn.tar.xz{,.sig}
${_url}/cmake-${pkgver}.src.tar.xz{,.sig}
"001-cast-to-make-gcc-happy.patch"
"002-hacks-for-static-linking.patch")
sha256sums=('549294ef37e2c9ec8317258b539e56f25d479ed811e2db846017e028b69f8da6'
sha256sums=('bd7e6901ab086fd268750363017935fd4a717c153dad3c2aab86cb0140d9e3fe'
'SKIP'
'9c7ec82d9a240dc2287b8de89d6881bb64ceea0dcd6ce133c34ef65bda22d99e'
'11c5a28f90053b0c43d0dec3d0ad579347fc277199c005206b963c19aae514e3'
'SKIP'
'11352ffbe7559a7170f2abd52b3552c877fbcf8fc82cff77b421e8b130a4dd66'
'08e39ea52a99204528740196a13cc29daf1b65a6e230fbd7bdd745dde5d11ef3')
Expand Down
1 change: 1 addition & 0 deletions mingw-w64-llvm/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
"0901-wholearchive-import-libs.patch"
3 changes: 2 additions & 1 deletion mingw-w64-llvm/0002-Fix-Findzstd-on-MINGW.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@
set(zstd_STATIC_LIBRARY "${zstd_LIBRARY}")
elseif (NOT TARGET zstd::libzstd_shared)
add_library(zstd::libzstd_shared SHARED IMPORTED)
- if(MSVC)
- if(MSVC OR "${CMAKE_CXX_SIMULATE_ID}" STREQUAL "MSVC")
+ if(WIN32)
include(GNUInstallDirs) # For CMAKE_INSTALL_LIBDIR and friends.
# IMPORTED_LOCATION is the path to the DLL and IMPORTED_IMPLIB is the "library".
get_filename_component(zstd_DIRNAME "${zstd_LIBRARY}" DIRECTORY)
if(NOT "${CMAKE_INSTALL_LIBDIR}" STREQUAL "" AND NOT "${CMAKE_INSTALL_BINDIR}" STREQUAL "")
Expand Down
37 changes: 27 additions & 10 deletions mingw-w64-llvm/PKGBUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-llvm"
"${MINGW_PACKAGE_PREFIX}-compiler-rt"
$( (( _clangprefix )) && echo "${MINGW_PACKAGE_PREFIX}-gcc-compat" )
"${MINGW_PACKAGE_PREFIX}-lld")
_version=19.1.6
_version=19.1.7
_rc=""
_tag=llvmorg-${_version}${_rc}
pkgver=${_version}${_rc/-/}
Expand Down Expand Up @@ -77,28 +77,31 @@ source=("${_url}/llvm-${pkgver}.src.tar.xz"{,.sig}
# 0301-0399 -> lld
"0303-ignore-new-bfd-options.patch"
# 0401-0499 -> clang-tools-extra
# 9901-9999 -> whole tree
"0901-wholearchive-import-libs.patch::https://github.com/llvm/llvm-project/commit/4a4a8a1476b1386b523dc5b292ba9a5a6748a9cf.patch"
)
sha256sums=('ad1a3b125ff014ded290094088de40efb9193ce81a24278184230b7d401f8a3e'
sha256sums=('96f833c6ad99a3e8e1d9aca5f439b8fd2c7efdcf83b664e0af1c0712c5315910'
'SKIP'
'6358cbb3e14687ca2f3465c61cffc65589b448aaa912ec2c163ef9fc046e8a89'
'11e5e4ecab5338b9914de3b83a4622cb200de466b7c56ba675afb72fa7d64675'
'SKIP'
'417a7d0048d8eb62dbaa8461f1fd474eb6493b09e14d050b39cc1f051e8b71d1'
'430b088bf820550090a6cf0eec67183d045273c18b3f1d6c5207e46d93391be7'
'SKIP'
'0d4f312e1419152282c267e6b6a1fa5914a7a0c753a5e926bee1c8c28e614ae4'
'c12b6e764202c615c1a3af9a13d477846878757ae0e29e5f8979215a6958fffc'
'SKIP'
'44fa50556cefbe3796e8256536267ee2f34ced5f3c1492473bccd75449cadbe6'
'630bf0f31b210e89fd7869bdfd6c376d010fc3b72ee42f08058435035c432e42'
'SKIP'
'9c7ec82d9a240dc2287b8de89d6881bb64ceea0dcd6ce133c34ef65bda22d99e'
'11c5a28f90053b0c43d0dec3d0ad579347fc277199c005206b963c19aae514e3'
'SKIP'
'0e8048333bab2ba3607910e5d074259f08dccf00615778d03a2a55416718eb45'
'b96deca1d3097c7ffd4ff2bb904a50bdd56bec7ed1413ffb0d1d01af87b72c12'
'SKIP'
'eb03df53671df6627768141b3aaa76abe176a14e5e47911c97bec544387c4aff'
'ff8bf96fae9531cf6231b502e8c2f38843f826a9dc7e0d98a37cb80fddd36cf4'
'7cdf15c7e9c13ab99c42b4fafb15d871b22558f751729bb7173ce3edeffc8db8'
'790eb0fccb4ef29c3795bceb8a62c8f4ecd0bdd6c49b2812352b04cfbc552342'
'76d2a88733cebb1f01b766ff2ab91a9e095bae1d2e4cc18c1ffcf21fd095efc4'
'715cb8862753854b2d9256e0b70003e2d1f57083d83eaeaf5a095fc72b8a4e26'
'2770cadf8ccf6b31aece6aee8f76dceb71e6e9d01fdf3be74c3743480ce34899'
'fd0253879cc5e31857f57307e6105e56493358e35d7c4540e0b476be607ab94e')
'fd0253879cc5e31857f57307e6105e56493358e35d7c4540e0b476be607ab94e'
'630806c9f232d7755ea8fb2c9e2110a511676d728a4f39e91e4867d1e460c1da')
validpgpkeys=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D' # Hans Wennborg, Google.
'474E22316ABF4785A88C6E8EA2C794A986419D8A' # Tom Stellard
'D574BD5D1D0E98895E3BF90044F2485E45D59042') # Tobias Hieta
Expand All @@ -112,6 +115,14 @@ apply_patch_with_msg() {
done
}

apply_git_patch_with_msg() {
for _patch in "$@"
do
msg2 "Applying ${_patch}"
patch -Nbp1 -i "${srcdir}/${_patch}"
done
}

Comment on lines +118 to +125
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This function looks exactly like the apply_patch_with_msg function immediately above it. Is there some reason for another copy?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point, this is a leftover.
At first I tried to apply the patch to a specific directory (lld/) but git patches require -p2 so I created this helper. Then I found out it's not going to work because the patch modifies llvm/ and lld/ at once. And here comes my mistake for modifying the new helper instead of using the previous one.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Created #23152

revert_patch_with_msg() {
for _patch in "$@"
do
Expand Down Expand Up @@ -161,6 +172,12 @@ prepare() {

# Patch clang-tools-extra
cd "${srcdir}"/clang-tools-extra

# Patch whole tree
cd "${srcdir}"

apply_git_patch_with_msg \
"0901-wholearchive-import-libs.patch"
}

build() {
Expand Down
6 changes: 3 additions & 3 deletions mingw-w64-mlir/PKGBUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ _compiler=clang
_realname=mlir
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
_version=19.1.6
_version=19.1.7
_rc=""
_tag=llvmorg-${_version}${_rc}
pkgver=${_version}${_rc/-/}
Expand Down Expand Up @@ -35,9 +35,9 @@ source=("${_url}/${_pkgfn}.tar.xz"{,.sig}
0001-tablegen.patch
0002-add-missing-compile-definitions.patch
0003-Fix-build-MLIRExecutionEngineShared.patch)
sha256sums=('b5dafab416bd134cac0283268558aa6a5e5737e72f22425be86044f690bba870'
sha256sums=('4e1ea9ed9a60589466ad89d4b739f12a3a51fb828caaebc3bfc59172c6ce0eee'
'SKIP'
'9c7ec82d9a240dc2287b8de89d6881bb64ceea0dcd6ce133c34ef65bda22d99e'
'11c5a28f90053b0c43d0dec3d0ad579347fc277199c005206b963c19aae514e3'
'SKIP'
'3f61c66d5615e387ac1c00dbeb1b5840305ff578de81d60eb65553ff17ced8c6'
'd007b26d4c97667518f524105d5a7a14c9fe9e5f595fd48562dacb722ea650fa'
Expand Down
6 changes: 3 additions & 3 deletions mingw-w64-polly/PKGBUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ fi
_realname=polly
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
_version=19.1.6
_version=19.1.7
_rc=""
_tag=llvmorg-${_version}${_rc}
pkgver=${_version}${_rc/-/}
Expand All @@ -26,9 +26,9 @@ _url=https://github.com/llvm/llvm-project/releases/download/${_tag}
_pkgfn=$_realname-$pkgver.src
source=($_url/$_pkgfn.tar.xz{,.sig}
${_url}/cmake-${pkgver}.src.tar.xz{,.sig})
sha256sums=('c9b5796eaf95fcc3694d292c93585349b5063c7550da038a9ad23ae735eb8543'
sha256sums=('c19937eb7422741e558a0724609538216b116bb043ebf12622e6f4b99b19813a'
'SKIP'
'9c7ec82d9a240dc2287b8de89d6881bb64ceea0dcd6ce133c34ef65bda22d99e'
'11c5a28f90053b0c43d0dec3d0ad579347fc277199c005206b963c19aae514e3'
'SKIP')
validpgpkeys=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D' # Hans Wennborg, Google.
'474E22316ABF4785A88C6E8EA2C794A986419D8A' # Tom Stellard
Expand Down
Loading