-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #13921 from filnet/update_rust
rust: update to 1.65.0
- Loading branch information
Showing
5 changed files
with
77 additions
and
49 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| --- rustc-1.65.0-src/compiler/rustc_target/src/spec/windows_gnullvm_base.rs.orig 2022-11-02 14:36:24.000000000 +0000 | ||
| +++ rustc-1.65.0-src/compiler/rustc_target/src/spec/windows_gnullvm_base.rs 2022-11-05 20:16:01.345559900 +0000 | ||
| @@ -1,4 +1,5 @@ | ||
| -use crate::spec::{cvs, LinkerFlavor, TargetOptions}; | ||
| +use crate::spec::{cvs, DebuginfoKind, LinkerFlavor, SplitDebuginfo, TargetOptions}; | ||
| +use std::borrow::Cow; | ||
|
|
||
| pub fn opts() -> TargetOptions { | ||
| // We cannot use `-nodefaultlibs` because compiler-rt has to be passed | ||
| @@ -34,7 +35,10 @@ | ||
| eh_frame_header: false, | ||
| no_default_libraries: false, | ||
| has_thread_local: true, | ||
| - | ||
| + // FIXME(davidtwco): Support Split DWARF on Windows GNU - may require LLVM changes to | ||
| + // output DWO, despite using DWARF, doesn't use ELF.. | ||
| + debuginfo_kind: DebuginfoKind::Pdb, | ||
| + supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]), | ||
| ..Default::default() | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,11 +5,14 @@ | |
|
|
||
| _realname=rust | ||
| _bootstrapping=yes | ||
| if [[ $MINGW_PACKAGE_PREFIX == *-clang-aarch64 ]]; then | ||
| _bootstrapping=no | ||
| fi | ||
| pkgbase=mingw-w64-${_realname} | ||
| pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" | ||
| "${MINGW_PACKAGE_PREFIX}-rust-docs") | ||
| pkgver=1.64.0 | ||
| pkgrel=2 | ||
| pkgver=1.65.0 | ||
| pkgrel=1 | ||
| pkgdesc="Systems programming language focused on safety, speed and concurrency (mingw-w64)" | ||
| arch=('any') | ||
| mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') | ||
|
|
@@ -37,30 +40,34 @@ source=("https://static.rust-lang.org/dist/${_realname}c-${pkgver}-src.tar.gz"{, | |
| "0005-win32-config.patch" | ||
| "0007-clang-subsystem.patch" | ||
| "0008-disable-self-contained.patch" | ||
| "0009-build-gnullvm-targets-natively.patch") | ||
| sha256sums=('b3cd9f481e1a2901bf6f3808d30c69cc4ea80d93c4cc4e2ed52258b180381205' | ||
| "0009-build-gnullvm-targets-natively.patch" | ||
| "0010-gnullvm-debuginfo-fix.patch") | ||
| sha256sums=('5828bb67f677eabf8c384020582b0ce7af884e1c84389484f7f8d00dd82c0038' | ||
| 'SKIP' | ||
| '7cb1773c288ffb1c1e751edc49b1890c84bf9c362742bc5225d19d474edb73a0' | ||
| '36c531c73a2c12b3e66aa22526a404c3f770f1ab7e0e76c55af6fcc1a17e46fe' | ||
| 'c4e5ffeef84296d39c3e3e8f807fc8b33ce786b1e4edb21eef26b053586aca27' | ||
| 'c38450682a48bb1d5a0ddaa37ae5b324d39a9e0626daa2fc695caec1a53d6c35' | ||
| '29f84cb8e05ce304e102e28912a3b4464add406a8ec37a6c6d717b9b7d81b67b' | ||
| 'c70cb2bceafdd5b0e7d9d58c52a4f5dcff3d639ac57b134a29961d377a97e457') | ||
| 'aa847d81e733543dd8a242f957b7acf39b013952eeee6f0bf7c0f543be1328c4' | ||
| 'a214cd8394ab7416fd170c7fa05daf701a5357d38e4e54149370e6efff208e50' | ||
| 'b0a593a1a954dc51cd214e6ac5aabd2d88922202944eaceb7dd077d78d6dae3a' | ||
| '9c16adfddded1aac5ed812d82768dbe625614162639c05d63a0845e37e74fa0e') | ||
| validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE' # Rust Language (Tag and Release Signing Key) <[email protected]> | ||
| '474E22316ABF4785A88C6E8EA2C794A986419D8A' # Tom Stellard <[email protected]> | ||
| 'B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <[email protected]> | ||
|
|
||
| # hack the bootstrap | ||
| if [[ $MINGW_PACKAGE_PREFIX == *-clang-aarch64 ]]; then | ||
| source+=("https://github.com/mati865/rust-gnullvm-builds/releases/download/1.63.0-v2/cargo-1.63.0-dev-aarch64-pc-windows-gnullvm.tar.xz" | ||
| "https://github.com/mati865/rust-gnullvm-builds/releases/download/1.63.0-v2/rust-std-1.63.0-dev-aarch64-pc-windows-gnullvm.tar.xz" | ||
| "https://github.com/mati865/rust-gnullvm-builds/releases/download/1.63.0-v2/rustc-1.63.0-dev-aarch64-pc-windows-gnullvm.tar.xz") | ||
| _stage0date="2022-08-11" | ||
| _stage0version="1.63.0" | ||
| if [[ $_bootstrapping != "no" && $MINGW_PACKAGE_PREFIX == *-clang-aarch64 ]]; then | ||
| source+=("https://github.com/mati865/rust-gnullvm-builds/releases/download/${_stage0version}-v2/cargo-${_stage0version}-dev-aarch64-pc-windows-gnullvm.tar.xz" | ||
| "https://github.com/mati865/rust-gnullvm-builds/releases/download/${_stage0version}-v2/rust-std-${_stage0version}-dev-aarch64-pc-windows-gnullvm.tar.xz" | ||
| "https://github.com/mati865/rust-gnullvm-builds/releases/download/${_stage0version}-v2/rustc-${_stage0version}-dev-aarch64-pc-windows-gnullvm.tar.xz") | ||
| sha256sums+=('5a72ff6d89277c96f72cb7de7f35c4a3b4686b3dc6ea0d4966883e83179db0a8' | ||
| '0a5087acf06faa2a02ff7f41afb7be42b22575a2ff0b3f790b6bb64418f3ea5d' | ||
| '96c7877b4821fe7bb4aaa35aa8f2056d19d622902d6583d0aef8a35f3fef8dbb') | ||
| noextract+=('cargo-1.63.0-dev-aarch64-pc-windows-gnullvm.tar.xz' | ||
| 'rust-std-1.63.0-dev-aarch64-pc-windows-gnullvm.tar.xz' | ||
| 'rustc-1.63.0-dev-aarch64-pc-windows-gnullvm.tar.xz') | ||
| noextract+=("cargo-${_stage0version}-dev-aarch64-pc-windows-gnullvm.tar.xz" | ||
| "rust-std-${_stage0version}-dev-aarch64-pc-windows-gnullvm.tar.xz" | ||
| "rustc-${_stage0version}-dev-aarch64-pc-windows-gnullvm.tar.xz") | ||
| fi | ||
|
|
||
| # =========================================== # | ||
|
|
@@ -83,7 +90,8 @@ prepare() { | |
| 0001-rustc-llvm-fix-libs.patch \ | ||
| 0004-unbundle-gcc.patch \ | ||
| 0005-win32-config.patch \ | ||
| 0008-disable-self-contained.patch | ||
| 0008-disable-self-contained.patch \ | ||
| 0010-gnullvm-debuginfo-fix.patch | ||
|
|
||
| if [[ $MINGW_PACKAGE_PREFIX == *-clang-x86_64 ]]; then | ||
| apply_patch_with_msg \ | ||
|
|
@@ -110,10 +118,12 @@ build() { | |
| fi | ||
|
|
||
| # hack to inject the bootstrap compiler | ||
| if [[ $MINGW_PACKAGE_PREFIX == *-clang-aarch64 ]]; then | ||
| local rustdate="2022-08-11" | ||
| mkdir -p "build/cache/${rustdate}/" | ||
| cp -f "${srcdir}/cargo-1.63.0-dev-aarch64-pc-windows-gnullvm.tar.xz" "${srcdir}/rust-std-1.63.0-dev-aarch64-pc-windows-gnullvm.tar.xz" "${srcdir}/rustc-1.63.0-dev-aarch64-pc-windows-gnullvm.tar.xz" "build/cache/${rustdate}/" | ||
| if [[ $_bootstrapping != "no" && $MINGW_PACKAGE_PREFIX == *-clang-aarch64 ]]; then | ||
| mkdir -p "build/cache/${_stage0date}/" | ||
| cp -f "${srcdir}/cargo-${_stage0version}-dev-aarch64-pc-windows-gnullvm.tar.xz" \ | ||
| "${srcdir}/rust-std-${_stage0version}-dev-aarch64-pc-windows-gnullvm.tar.xz" \ | ||
| "${srcdir}/rustc-${_stage0version}-dev-aarch64-pc-windows-gnullvm.tar.xz" \ | ||
| "build/cache/${_stage0date}/" | ||
| fi | ||
|
|
||
| if [[ $MINGW_PACKAGE_PREFIX == *-clang-aarch64 ]]; then | ||
|
|
||