llvm: update to 20.1.0
This commit is contained in:
مهدي شينون (Mehdi Chinoune)
committed by
مهدي شينون (Mehdi Chinoune)
مهدي شينون (Mehdi Chinoune)
parent
fcbe9b2f06
commit
6fcd75d396
@@ -1,34 +0,0 @@
|
||||
Index: clang/lib/Driver/Driver.cpp
|
||||
===================================================================
|
||||
--- clang/lib/Driver/Driver.cpp
|
||||
+++ clang/lib/Driver/Driver.cpp
|
||||
@@ -1936,7 +1936,7 @@
|
||||
|
||||
void Driver::PrintVersion(const Compilation &C, raw_ostream &OS) const {
|
||||
if (IsFlangMode()) {
|
||||
- OS << getClangToolFullVersion("flang-new") << '\n';
|
||||
+ OS << getClangToolFullVersion("flang") << '\n';
|
||||
} else {
|
||||
// FIXME: The following handlers should use a callback mechanism, we don't
|
||||
// know what the client would like to do.
|
||||
Index: clang/lib/Driver/ToolChains/Flang.cpp
|
||||
===================================================================
|
||||
--- clang/lib/Driver/ToolChains/Flang.cpp
|
||||
+++ clang/lib/Driver/ToolChains/Flang.cpp
|
||||
@@ -409,14 +409,12 @@
|
||||
|
||||
CmdArgs.push_back(Input.getFilename());
|
||||
|
||||
- // TODO: Replace flang-new with flang once the new driver replaces the
|
||||
- // throwaway driver
|
||||
- const char *Exec = Args.MakeArgString(D.GetProgramPath("flang-new", TC));
|
||||
+ const char *Exec = Args.MakeArgString(D.GetProgramPath("flang", TC));
|
||||
C.addCommand(std::make_unique<Command>(JA, *this,
|
||||
ResponseFileSupport::AtFileUTF8(),
|
||||
Exec, CmdArgs, Inputs, Output));
|
||||
}
|
||||
|
||||
-Flang::Flang(const ToolChain &TC) : Tool("flang-new", "flang frontend", TC) {}
|
||||
+Flang::Flang(const ToolChain &TC) : Tool("flang", "flang frontend", TC) {}
|
||||
|
||||
Flang::~Flang() {}
|
||||
@@ -28,10 +28,8 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-llvm"
|
||||
"${MINGW_PACKAGE_PREFIX}-compiler-rt"
|
||||
$( (( _clangprefix )) && echo "${MINGW_PACKAGE_PREFIX}-gcc-compat" )
|
||||
"${MINGW_PACKAGE_PREFIX}-lld")
|
||||
_version=19.1.7
|
||||
_rc=""
|
||||
_tag=llvmorg-${_version}${_rc}
|
||||
pkgver=${_version}${_rc/-/}
|
||||
_pkgver=20.1.0
|
||||
pkgver=${_pkgver/-/}
|
||||
pkgrel=1
|
||||
pkgdesc="C language family frontend for LLVM (mingw-w64)"
|
||||
arch=('any')
|
||||
@@ -57,14 +55,14 @@ makedepends=($([[ "$_compiler" == "clang" ]] && echo \
|
||||
"${MINGW_PACKAGE_PREFIX}-libc++")
|
||||
"git"
|
||||
)
|
||||
_url=https://github.com/llvm/llvm-project/releases/download/${_tag}
|
||||
source=("${_url}/llvm-${pkgver}.src.tar.xz"{,.sig}
|
||||
"${_url}/clang-${pkgver}.src.tar.xz"{,.sig}
|
||||
"${_url}/clang-tools-extra-${pkgver}.src.tar.xz"{,.sig}
|
||||
"${_url}/compiler-rt-${pkgver}.src.tar.xz"{,.sig}
|
||||
"${_url}/lld-${pkgver}.src.tar.xz"{,.sig}
|
||||
"${_url}/cmake-${pkgver}.src.tar.xz"{,.sig}
|
||||
"${_url}/third-party-${pkgver}.src.tar.xz"{,.sig}
|
||||
_url=https://github.com/llvm/llvm-project/releases/download/llvmorg-${_pkgver}
|
||||
source=("${_url}/llvm-${_pkgver}.src.tar.xz"{,.sig}
|
||||
"${_url}/clang-${_pkgver}.src.tar.xz"{,.sig}
|
||||
"${_url}/clang-tools-extra-${_pkgver}.src.tar.xz"{,.sig}
|
||||
"${_url}/compiler-rt-${_pkgver}.src.tar.xz"{,.sig}
|
||||
"${_url}/lld-${_pkgver}.src.tar.xz"{,.sig}
|
||||
"${_url}/cmake-${_pkgver}.src.tar.xz"{,.sig}
|
||||
"${_url}/third-party-${_pkgver}.src.tar.xz"{,.sig}
|
||||
# 0001-0099 -> llvm
|
||||
"0001-Fix-GetHostTriple-for-mingw-w64-in-msys.patch"
|
||||
"0002-Fix-Findzstd-on-MINGW.patch"
|
||||
@@ -72,40 +70,36 @@ source=("${_url}/llvm-${pkgver}.src.tar.xz"{,.sig}
|
||||
"0004-enable-emutls-for-mingw.patch"
|
||||
# 0101-0199 -> clang
|
||||
"0101-link-pthread-with-mingw.patch"
|
||||
"0102-Rename-flang-new-flang-experimental-exec-to-flang.patch"
|
||||
# 0201-0299 -> rt
|
||||
# 0301-0399 -> lld
|
||||
"0303-ignore-new-bfd-options.patch"
|
||||
# 0401-0499 -> clang-tools-extra
|
||||
# 0901-0999 -> whole tree
|
||||
"0901-wholearchive-import-libs.patch::https://github.com/llvm/llvm-project/commit/4a4a8a1476b1386b523dc5b292ba9a5a6748a9cf.patch"
|
||||
)
|
||||
sha256sums=('96f833c6ad99a3e8e1d9aca5f439b8fd2c7efdcf83b664e0af1c0712c5315910'
|
||||
sha256sums=('29a42977809cb5e1c076e4495a79dc86b17386e5ab9fa4ca1a580aeb0a2ece5e'
|
||||
'SKIP'
|
||||
'11e5e4ecab5338b9914de3b83a4622cb200de466b7c56ba675afb72fa7d64675'
|
||||
'fa505976804aad1625406b6df69ab2dd94b9a98a2c3abab10f1e7fc1d53853fe'
|
||||
'SKIP'
|
||||
'430b088bf820550090a6cf0eec67183d045273c18b3f1d6c5207e46d93391be7'
|
||||
'98e504119931480f6d78a8e03164e56b832525726e6fc73d96e5166a71b97aa6'
|
||||
'SKIP'
|
||||
'c12b6e764202c615c1a3af9a13d477846878757ae0e29e5f8979215a6958fffc'
|
||||
'85798479b6762433a6fc8a87f4cbdb1dc050926220a8240d9e0e126f08e6f25f'
|
||||
'SKIP'
|
||||
'630bf0f31b210e89fd7869bdfd6c376d010fc3b72ee42f08058435035c432e42'
|
||||
'0deea791d2eb1558ba0f266bc68ed38ee6b78fbbfa6b75c343405efe38e9ddbf'
|
||||
'SKIP'
|
||||
'11c5a28f90053b0c43d0dec3d0ad579347fc277199c005206b963c19aae514e3'
|
||||
'9fcd319c6bb87344673f262ef5a6a01262fc9a0a741f3477b7e47e238441268d'
|
||||
'SKIP'
|
||||
'b96deca1d3097c7ffd4ff2bb904a50bdd56bec7ed1413ffb0d1d01af87b72c12'
|
||||
'd647982936703680e9e0e52bbfb2d67fa293db008a23e1e148ea511e917c2208'
|
||||
'SKIP'
|
||||
'eb03df53671df6627768141b3aaa76abe176a14e5e47911c97bec544387c4aff'
|
||||
'7cdf15c7e9c13ab99c42b4fafb15d871b22558f751729bb7173ce3edeffc8db8'
|
||||
'790eb0fccb4ef29c3795bceb8a62c8f4ecd0bdd6c49b2812352b04cfbc552342'
|
||||
'76d2a88733cebb1f01b766ff2ab91a9e095bae1d2e4cc18c1ffcf21fd095efc4'
|
||||
'715cb8862753854b2d9256e0b70003e2d1f57083d83eaeaf5a095fc72b8a4e26'
|
||||
'2770cadf8ccf6b31aece6aee8f76dceb71e6e9d01fdf3be74c3743480ce34899'
|
||||
'fd0253879cc5e31857f57307e6105e56493358e35d7c4540e0b476be607ab94e'
|
||||
'630806c9f232d7755ea8fb2c9e2110a511676d728a4f39e91e4867d1e460c1da')
|
||||
'fd0253879cc5e31857f57307e6105e56493358e35d7c4540e0b476be607ab94e')
|
||||
validpgpkeys=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D' # Hans Wennborg, Google.
|
||||
'474E22316ABF4785A88C6E8EA2C794A986419D8A' # Tom Stellard
|
||||
'D574BD5D1D0E98895E3BF90044F2485E45D59042') # Tobias Hieta
|
||||
noextract=(clang-${pkgver}.src.tar.xz)
|
||||
noextract=(clang-${_pkgver}.src.tar.xz)
|
||||
|
||||
apply_patch_with_msg() {
|
||||
for _patch in "$@"
|
||||
@@ -125,12 +119,12 @@ revert_patch_with_msg() {
|
||||
|
||||
prepare() {
|
||||
cd "${srcdir}"
|
||||
plain "Extracting clang-${pkgver}.src.tar.xz due to symlink(s) without pre-existing target(s)"
|
||||
tar -xJf "${srcdir}"/clang-${pkgver}.src.tar.xz -C "${srcdir}" || true
|
||||
plain "Extracting clang-${_pkgver}.src.tar.xz due to symlink(s) without pre-existing target(s)"
|
||||
tar -xJf "${srcdir}"/clang-${_pkgver}.src.tar.xz -C "${srcdir}" || true
|
||||
|
||||
# Rename Directories
|
||||
for pkg in llvm clang clang-tools-extra compiler-rt lld cmake third-party; do
|
||||
mv ${pkg}-$pkgver.src ${pkg}
|
||||
mv ${pkg}-${_pkgver}.src ${pkg}
|
||||
done
|
||||
|
||||
# Patch llvm
|
||||
@@ -152,9 +146,6 @@ prepare() {
|
||||
apply_patch_with_msg \
|
||||
"0101-link-pthread-with-mingw.patch"
|
||||
fi
|
||||
# https://reviews.llvm.org/D143592
|
||||
apply_patch_with_msg \
|
||||
"0102-Rename-flang-new-flang-experimental-exec-to-flang.patch"
|
||||
|
||||
# Patch lld
|
||||
cd "${srcdir}"/lld
|
||||
@@ -167,9 +158,6 @@ prepare() {
|
||||
|
||||
# Patch whole tree
|
||||
cd "${srcdir}"
|
||||
|
||||
apply_patch_with_msg \
|
||||
"0901-wholearchive-import-libs.patch"
|
||||
}
|
||||
|
||||
build() {
|
||||
@@ -400,7 +388,7 @@ package_compiler-rt() {
|
||||
|
||||
DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install "${srcdir}"/build-${MSYSTEM}/projects/compiler-rt
|
||||
mkdir -p "${pkgdir}"${MINGW_PREFIX}/bin/
|
||||
find "${pkgdir}"${MINGW_PREFIX}/lib/clang/${_version%.[0-9].*}/lib/windows/ \
|
||||
find "${pkgdir}"${MINGW_PREFIX}/lib/clang/${pkgver%.[0-9].*}/lib/windows/ \
|
||||
-name '*.dll' -exec mv '{}' "${pkgdir}"${MINGW_PREFIX}/bin/ \;
|
||||
# remove bin dir we created if it is still empty
|
||||
rmdir "${pkgdir}"${MINGW_PREFIX}/bin/ 2>/dev/null || true
|
||||
|
||||
Reference in New Issue
Block a user