Skip to content

Commit

Permalink
llvm, compiler-rt, rust: bumped (#67)
Browse files Browse the repository at this point in the history
* rust: 1.77.1 -> 1.78.0

* compiler-rt: 18.1.4 -> 18.1.5

* llvm: 18.1.4 -> 18.1.5
  • Loading branch information
TimB87 authored May 7, 2024
1 parent ad651f4 commit 1a1f18d
Show file tree
Hide file tree
Showing 11 changed files with 138 additions and 1,326 deletions.
4 changes: 2 additions & 2 deletions compiler-rt/Pkgfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
# Optional: clang

name=compiler-rt
version=18.1.4
release=2
version=18.1.5
release=1
source=(https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/compiler-rt-$version.src.tar.xz
https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/llvm-$version.src.tar.xz
https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/cmake-$version.src.tar.xz)
Expand Down
14 changes: 7 additions & 7 deletions llvm/.footprint
Original file line number Diff line number Diff line change
Expand Up @@ -2396,13 +2396,13 @@ lrwxrwxrwx root/root usr/lib/libRemarks.so -> libRemarks.so.18.1
-rwxr-xr-x root/root usr/lib/libRemarks.so.18.1
drwxr-xr-x root/root usr/lib/python3.10/
drwxr-xr-x root/root usr/lib/python3.10/site-packages/
drwxr-xr-x root/root usr/lib/python3.10/site-packages/lit-18.1.4.dev0-py3.10.egg-info/
-rw-r--r-- root/root usr/lib/python3.10/site-packages/lit-18.1.4.dev0-py3.10.egg-info/PKG-INFO
-rw-r--r-- root/root usr/lib/python3.10/site-packages/lit-18.1.4.dev0-py3.10.egg-info/SOURCES.txt
-rw-r--r-- root/root usr/lib/python3.10/site-packages/lit-18.1.4.dev0-py3.10.egg-info/dependency_links.txt
-rw-r--r-- root/root usr/lib/python3.10/site-packages/lit-18.1.4.dev0-py3.10.egg-info/entry_points.txt
-rw-r--r-- root/root usr/lib/python3.10/site-packages/lit-18.1.4.dev0-py3.10.egg-info/not-zip-safe
-rw-r--r-- root/root usr/lib/python3.10/site-packages/lit-18.1.4.dev0-py3.10.egg-info/top_level.txt
drwxr-xr-x root/root usr/lib/python3.10/site-packages/lit-18.1.5.dev0-py3.10.egg-info/
-rw-r--r-- root/root usr/lib/python3.10/site-packages/lit-18.1.5.dev0-py3.10.egg-info/PKG-INFO
-rw-r--r-- root/root usr/lib/python3.10/site-packages/lit-18.1.5.dev0-py3.10.egg-info/SOURCES.txt
-rw-r--r-- root/root usr/lib/python3.10/site-packages/lit-18.1.5.dev0-py3.10.egg-info/dependency_links.txt
-rw-r--r-- root/root usr/lib/python3.10/site-packages/lit-18.1.5.dev0-py3.10.egg-info/entry_points.txt
-rw-r--r-- root/root usr/lib/python3.10/site-packages/lit-18.1.5.dev0-py3.10.egg-info/not-zip-safe
-rw-r--r-- root/root usr/lib/python3.10/site-packages/lit-18.1.5.dev0-py3.10.egg-info/top_level.txt
drwxr-xr-x root/root usr/lib/python3.10/site-packages/lit/
-rw-r--r-- root/root usr/lib/python3.10/site-packages/lit/BooleanExpression.py
-rw-r--r-- root/root usr/lib/python3.10/site-packages/lit/LitConfig.py
Expand Down
2 changes: 1 addition & 1 deletion llvm/Pkgfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Optional: lld

name=llvm
version=18.1.4
version=18.1.5
release=1
source=(https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/$name-$version.src.tar.xz
https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/cmake-$version.src.tar.xz
Expand Down
194 changes: 87 additions & 107 deletions rust/.footprint

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions rust/0001-bootstrap-Change-libexec-dir.patch
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ Subject: [PATCH] bootstrap: Change libexec dir
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs
index f50026368dab..6940e0c50752 100644
index 012d64e53443..a077e67e49dc 100644
--- a/src/bootstrap/src/core/build_steps/dist.rs
+++ b/src/bootstrap/src/core/build_steps/dist.rs
@@ -423,7 +423,7 @@ fn prepare_image(builder: &Builder<'_>, compiler: Compiler, image: &Path) {
@@ -424,7 +424,7 @@ fn prepare_image(builder: &Builder<'_>, compiler: Compiler, image: &Path) {
},
builder.kind,
) {
Expand All @@ -22,15 +22,15 @@ index f50026368dab..6940e0c50752 100644

let libdir_relative = builder.libdir_relative(compiler);
diff --git a/src/bootstrap/src/core/build_steps/tool.rs b/src/bootstrap/src/core/build_steps/tool.rs
index 5d8d10a7debc..f52315416bd4 100644
index 3c2001121037..17c816c6230a 100644
--- a/src/bootstrap/src/core/build_steps/tool.rs
+++ b/src/bootstrap/src/core/build_steps/tool.rs
@@ -682,7 +682,7 @@ fn run(self, builder: &Builder<'_>) -> Option<PathBuf> {
@@ -684,7 +684,7 @@ fn run(self, builder: &Builder<'_>) -> Option<PathBuf> {

// Copy `rust-analyzer-proc-macro-srv` to `<sysroot>/libexec/`
// so that r-a can use it.
- let libexec_path = builder.sysroot(self.compiler).join("libexec");
+ let libexec_path = builder.sysroot(self.compiler).join("lib");
t!(fs::create_dir_all(&libexec_path));
builder.copy(&path, &libexec_path.join("rust-analyzer-proc-macro-srv"));
builder.copy_link(&path, &libexec_path.join("rust-analyzer-proc-macro-srv"));

23 changes: 0 additions & 23 deletions rust/0001-cargo-Change-libexec-dir.patch

This file was deleted.

6 changes: 3 additions & 3 deletions rust/0002-bootstrap-Change-bash-completion-dir.patch
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ Subject: [PATCH] bootstrap: Change bash-completion dir
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs
index 6940e0c50752..d45daad3a829 100644
index a077e67e49dc..eac689560808 100644
--- a/src/bootstrap/src/core/build_steps/dist.rs
+++ b/src/bootstrap/src/core/build_steps/dist.rs
@@ -1071,7 +1071,11 @@ fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
@@ -1072,7 +1072,11 @@ fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {

tarball.add_file(&cargo, "bin", 0o755);
tarball.add_file(cargo, "bin", 0o755);
tarball.add_file(etc.join("_cargo"), "share/zsh/site-functions", 0o644);
- tarball.add_renamed_file(etc.join("cargo.bashcomp.sh"), "etc/bash_completion.d", "cargo");
+ tarball.add_renamed_file(
Expand Down
59 changes: 0 additions & 59 deletions rust/0002-compiler-Change-LLVM-targets.patch

This file was deleted.

59 changes: 20 additions & 39 deletions rust/0003-compiler-Change-LLVM-targets.patch
Original file line number Diff line number Diff line change
Expand Up @@ -17,47 +17,28 @@ targets, as things break when this is done:
`rustc --version --verbose`) is different from the target triple
(from `rustc --print target-list`) that best matches autoconf.
---
compiler/rustc_session/src/config.rs | 2 +-
compiler/rustc_target/src/spec/mod.rs | 9 +++++++++
.../src/spec/targets/i686_unknown_linux_gnu.rs | 2 +-
.../src/spec/targets/x86_64_unknown_linux_gnu.rs | 2 +-
4 files changed, 12 insertions(+), 3 deletions(-)
compiler/rustc_session/src/config.rs | 4 ++++
.../rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs | 2 +-
.../rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/compiler/rustc_session/src/config.rs b/compiler/rustc_session/src/config.rs
index d35f951e2aea..7841c4d19094 100644
index b7ee2c980254..3be7b748718d 100644
--- a/compiler/rustc_session/src/config.rs
+++ b/compiler/rustc_session/src/config.rs
@@ -2221,7 +2221,7 @@ pub fn parse_target_triple(early_dcx: &EarlyDiagCtxt, matches: &getopts::Matches
@@ -2222,6 +2222,10 @@ pub fn parse_target_triple(early_dcx: &EarlyDiagCtxt, matches: &getopts::Matches
early_dcx.early_fatal(format!("target file {path:?} does not exist"))
})
}
- Some(target) => TargetTriple::TargetTriple(target),
+ Some(target) => TargetTriple::from_alias(target),
+ Some(s) if &s == "x86_64-pc-linux-gnu" => {
+ TargetTriple::from_triple("x86_64-unknown-linux-gnu")
+ }
+ Some(s) if &s == "i686-pc-linux-gnu" => TargetTriple::from_triple("i686-unknown-linux-gnu"),
Some(target) => TargetTriple::TargetTriple(target),
_ => TargetTriple::from_triple(host_triple()),
}
}
diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
index 6c698c5b01dd..4a1c2dd18b8d 100644
--- a/compiler/rustc_target/src/spec/mod.rs
+++ b/compiler/rustc_target/src/spec/mod.rs
@@ -3453,6 +3453,15 @@ pub fn from_path(path: &Path) -> Result<Self, io::Error> {
Ok(TargetTriple::TargetJson { path_for_rustdoc: canonicalized_path, triple, contents })
}

+ /// Creates a target triple from its alias
+ pub fn from_alias(triple: String) -> Self {
+ match triple.as_str() {
+ "x86_64-pc-linux-gnu" => TargetTriple::from_triple("x86_64-unknown-linux-gnu"),
+ "i686-pc-linux-gnu" => TargetTriple::from_triple("i686-unknown-linux-gnu"),
+ _ => TargetTriple::TargetTriple(triple),
+ }
+ }
+
/// Returns a string triple for this target.
///
/// If this target is a path, the file name (without extension) is returned.
diff --git a/compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs
index 9bc38a72f4d3..a7a36eb3c9d6 100644
index 1d4916cabfdf..4caab818efdb 100644
--- a/compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs
+++ b/compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs
@@ -9,7 +9,7 @@ pub fn target() -> Target {
Expand All @@ -66,19 +47,19 @@ index 9bc38a72f4d3..a7a36eb3c9d6 100644
Target {
- llvm_target: "i686-unknown-linux-gnu".into(),
+ llvm_target: "i686-pc-linux-gnu".into(),
pointer_width: 32,
data_layout: "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-\
i128:128-f64:32:64-f80:32-n8:16:32-S128"
metadata: crate::spec::TargetMetadata {
description: None,
tier: None,
diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs
index 2296b58f45dc..a54dbf573dd6 100644
index 98374023dc57..0e08b8c32229 100644
--- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs
+++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs
@@ -17,7 +17,7 @@ pub fn target() -> Target {
@@ -18,7 +18,7 @@ pub fn target() -> Target {
base.supports_xray = true;

Target {
- llvm_target: "x86_64-unknown-linux-gnu".into(),
+ llvm_target: "x86_64-pc-linux-gnu".into(),
pointer_width: 64,
data_layout:
"e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128".into(),
metadata: crate::spec::TargetMetadata {
description: None,
tier: None,
21 changes: 13 additions & 8 deletions rust/Pkgfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
# Optional: ccache libgit2 lld polly sccache

name=rust
version=1.77.2
_date=2024-02-08
_rustc=1.76.0
version=1.78.0
_date=2024-03-21
_rustc=1.77.0
_cargo=$_rustc
release=1

Expand Down Expand Up @@ -64,13 +64,13 @@ build() {

cd "${name}c-$version-src"

patch -p1 -i $SRC/0001-bootstrap-Change-libexec-dir.patch
patch -p1 -i $SRC/0002-bootstrap-Change-bash-completion-dir.patch
patch -p1 -i $SRC/0003-compiler-Change-LLVM-targets.patch
patch -p1 -i $SRC/0004-compiler-Use-wasm-ld-for-wasm-targets.patch
patch -p1 -i $SRC/0001-bootstrap-Change-libexec-dir.patch
patch -p1 -i $SRC/0002-bootstrap-Change-bash-completion-dir.patch
patch -p1 -i $SRC/0003-compiler-Change-LLVM-targets.patch
patch -p1 -i $SRC/0004-compiler-Use-wasm-ld-for-wasm-targets.patch

cat <<- EOF > $SRC/config.toml
change-id = 118703
change-id = 121754

[llvm]
ninja = true
Expand All @@ -87,13 +87,16 @@ cat <<- EOF > $SRC/config.toml
# http://blog.llvm.org/2019/09/closing-gap-cross-language-lto-between.html
# https://github.com/rust-lang/rust/issues/54872
codegen-units-std = 1
debuginfo-level = 1
debuginfo-level-std = 2
codegen-tests = false

description = "CRUX"
channel = "stable"
parallel-compiler = false
rpath = false
frame-pointers = true
deny-warnings = false
optimize = true
@LLD@

Expand Down Expand Up @@ -169,6 +172,8 @@ EOF
# = note: `-D dead-code` implied by `-D warnings`
export RUSTFLAGS+=' -A dead_code'

unset CFLAGS CXXFLAGS

{ [ ! -e /usr/include/libssh2.h ] ||
export LIBSSH2_SYS_USE_PKG_CONFIG=1; }
export RUST_BACKTRACE=full
Expand Down
Loading

0 comments on commit 1a1f18d

Please sign in to comment.