Compare commits
No commits in common. 'c9' and 'i8c-stream-rhel8' have entirely different histories.
c9
...
i8c-stream
@ -1,2 +1,2 @@
|
|||||||
SOURCES/rustc-1.76.0-src.tar.xz
|
SOURCES/rustc-1.71.1-src.tar.xz
|
||||||
SOURCES/wasi-libc-03b228e46bb02fcc5927253e1b8ad715072b1ae4.tar.gz
|
SOURCES/wasi-libc-wasi-sdk-20.tar.gz
|
||||||
|
|||||||
@ -1,2 +1,2 @@
|
|||||||
755339e8131d618d3c1095a581f27afc573ad310 SOURCES/rustc-1.76.0-src.tar.xz
|
ffa03139b447604322d689eefe4e157a49c39f51 SOURCES/rustc-1.71.1-src.tar.xz
|
||||||
124d114ffb627ada36bfa1df0216bcea0f55a15e SOURCES/wasi-libc-03b228e46bb02fcc5927253e1b8ad715072b1ae4.tar.gz
|
8678e3510c88ef1de4d8c2940fa8ddad8f4eb084 SOURCES/wasi-libc-wasi-sdk-20.tar.gz
|
||||||
|
|||||||
@ -0,0 +1,142 @@
|
|||||||
|
From f2fd2d01f96b50b039402c9ab4278230687f7922 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Josh Stone <jistone@redhat.com>
|
||||||
|
Date: Tue, 25 Jul 2023 13:11:50 -0700
|
||||||
|
Subject: [PATCH] Allow using external builds of the compiler-rt profile lib
|
||||||
|
|
||||||
|
This changes the bootstrap config `target.*.profiler` from a plain bool
|
||||||
|
to also allow a string, which will be used as a path to the pre-built
|
||||||
|
profiling runtime for that target. Then `profiler_builtins/build.rs`
|
||||||
|
reads that in a `LLVM_PROFILER_RT_LIB` environment variable.
|
||||||
|
---
|
||||||
|
config.example.toml | 6 ++++--
|
||||||
|
library/profiler_builtins/build.rs | 6 ++++++
|
||||||
|
src/bootstrap/compile.rs | 4 ++++
|
||||||
|
src/bootstrap/config.rs | 30 ++++++++++++++++++++++++------
|
||||||
|
4 files changed, 38 insertions(+), 8 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/config.example.toml b/config.example.toml
|
||||||
|
index d0eaa9fd7ffa..e0e991e679af 100644
|
||||||
|
--- a/config.example.toml
|
||||||
|
+++ b/config.example.toml
|
||||||
|
@@ -745,8 +745,10 @@ changelog-seen = 2
|
||||||
|
# This option will override the same option under [build] section.
|
||||||
|
#sanitizers = build.sanitizers (bool)
|
||||||
|
|
||||||
|
-# Build the profiler runtime for this target(required when compiling with options that depend
|
||||||
|
-# on this runtime, such as `-C profile-generate` or `-C instrument-coverage`).
|
||||||
|
+# When true, build the profiler runtime for this target(required when compiling
|
||||||
|
+# with options that depend on this runtime, such as `-C profile-generate` or
|
||||||
|
+# `-C instrument-coverage`). This may also be given a path to an existing build
|
||||||
|
+# of the profiling runtime library from LLVM's compiler-rt.
|
||||||
|
# This option will override the same option under [build] section.
|
||||||
|
#profiler = build.profiler (bool)
|
||||||
|
|
||||||
|
diff --git a/library/profiler_builtins/build.rs b/library/profiler_builtins/build.rs
|
||||||
|
index 1b1f11798d74..d14d0b82229a 100644
|
||||||
|
--- a/library/profiler_builtins/build.rs
|
||||||
|
+++ b/library/profiler_builtins/build.rs
|
||||||
|
@@ -6,6 +6,12 @@
|
||||||
|
use std::path::Path;
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
+ println!("cargo:rerun-if-env-changed=LLVM_PROFILER_RT_LIB");
|
||||||
|
+ if let Ok(rt) = env::var("LLVM_PROFILER_RT_LIB") {
|
||||||
|
+ println!("cargo:rustc-link-lib=static:+verbatim={rt}");
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
let target = env::var("TARGET").expect("TARGET was not set");
|
||||||
|
let cfg = &mut cc::Build::new();
|
||||||
|
|
||||||
|
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
|
||||||
|
index 33addb90da37..1d8b3c6e5435 100644
|
||||||
|
--- a/src/bootstrap/compile.rs
|
||||||
|
+++ b/src/bootstrap/compile.rs
|
||||||
|
@@ -305,6 +305,10 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
|
||||||
|
cargo.env("MACOSX_DEPLOYMENT_TARGET", target);
|
||||||
|
}
|
||||||
|
|
||||||
|
+ if let Some(path) = builder.config.profiler_path(target) {
|
||||||
|
+ cargo.env("LLVM_PROFILER_RT_LIB", path);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
// Determine if we're going to compile in optimized C intrinsics to
|
||||||
|
// the `compiler-builtins` crate. These intrinsics live in LLVM's
|
||||||
|
// `compiler-rt` repository, but our `src/llvm-project` submodule isn't
|
||||||
|
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
|
||||||
|
index e192cda9a9a7..a4803db0a470 100644
|
||||||
|
--- a/src/bootstrap/config.rs
|
||||||
|
+++ b/src/bootstrap/config.rs
|
||||||
|
@@ -467,7 +467,7 @@ pub struct Target {
|
||||||
|
pub linker: Option<PathBuf>,
|
||||||
|
pub ndk: Option<PathBuf>,
|
||||||
|
pub sanitizers: Option<bool>,
|
||||||
|
- pub profiler: Option<bool>,
|
||||||
|
+ pub profiler: Option<StringOrBool>,
|
||||||
|
pub rpath: Option<bool>,
|
||||||
|
pub crt_static: Option<bool>,
|
||||||
|
pub musl_root: Option<PathBuf>,
|
||||||
|
@@ -796,9 +796,9 @@ struct Dist {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
-#[derive(Debug, Deserialize)]
|
||||||
|
+#[derive(Clone, Debug, Deserialize)]
|
||||||
|
#[serde(untagged)]
|
||||||
|
-enum StringOrBool {
|
||||||
|
+pub enum StringOrBool {
|
||||||
|
String(String),
|
||||||
|
Bool(bool),
|
||||||
|
}
|
||||||
|
@@ -809,6 +809,12 @@ fn default() -> StringOrBool {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+impl StringOrBool {
|
||||||
|
+ fn is_string_or_true(&self) -> bool {
|
||||||
|
+ matches!(self, Self::String(_) | Self::Bool(true))
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
define_config! {
|
||||||
|
/// TOML representation of how the Rust build is configured.
|
||||||
|
struct Rust {
|
||||||
|
@@ -880,7 +886,7 @@ struct TomlTarget {
|
||||||
|
llvm_libunwind: Option<String> = "llvm-libunwind",
|
||||||
|
android_ndk: Option<String> = "android-ndk",
|
||||||
|
sanitizers: Option<bool> = "sanitizers",
|
||||||
|
- profiler: Option<bool> = "profiler",
|
||||||
|
+ profiler: Option<StringOrBool> = "profiler",
|
||||||
|
rpath: Option<bool> = "rpath",
|
||||||
|
crt_static: Option<bool> = "crt-static",
|
||||||
|
musl_root: Option<String> = "musl-root",
|
||||||
|
@@ -1744,12 +1750,24 @@ pub fn any_sanitizers_enabled(&self) -> bool {
|
||||||
|
self.target_config.values().any(|t| t.sanitizers == Some(true)) || self.sanitizers
|
||||||
|
}
|
||||||
|
|
||||||
|
+ pub fn profiler_path(&self, target: TargetSelection) -> Option<&str> {
|
||||||
|
+ match self.target_config.get(&target)?.profiler.as_ref()? {
|
||||||
|
+ StringOrBool::String(s) => Some(s),
|
||||||
|
+ StringOrBool::Bool(_) => None,
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
pub fn profiler_enabled(&self, target: TargetSelection) -> bool {
|
||||||
|
- self.target_config.get(&target).map(|t| t.profiler).flatten().unwrap_or(self.profiler)
|
||||||
|
+ self.target_config
|
||||||
|
+ .get(&target)
|
||||||
|
+ .and_then(|t| t.profiler.as_ref())
|
||||||
|
+ .map(StringOrBool::is_string_or_true)
|
||||||
|
+ .unwrap_or(self.profiler)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn any_profiler_enabled(&self) -> bool {
|
||||||
|
- self.target_config.values().any(|t| t.profiler == Some(true)) || self.profiler
|
||||||
|
+ self.target_config.values().any(|t| matches!(&t.profiler, Some(p) if p.is_string_or_true()))
|
||||||
|
+ || self.profiler
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn rpath_enabled(&self, target: TargetSelection) -> bool {
|
||||||
|
--
|
||||||
|
2.41.0
|
||||||
|
|
||||||
@ -0,0 +1,26 @@
|
|||||||
|
From 37cb177eb53145103ae72b67562884782dde01c3 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ivan Mironov <mironov.ivan@gmail.com>
|
||||||
|
Date: Sun, 8 Dec 2019 17:23:08 +0500
|
||||||
|
Subject: [PATCH] Use lld provided by system for wasm
|
||||||
|
|
||||||
|
---
|
||||||
|
compiler/rustc_target/src/spec/wasm_base.rs | 3 +--
|
||||||
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/compiler/rustc_target/src/spec/wasm_base.rs b/compiler/rustc_target/src/spec/wasm_base.rs
|
||||||
|
index 528a84a8b37c..353d742161d1 100644
|
||||||
|
--- a/compiler/rustc_target/src/spec/wasm_base.rs
|
||||||
|
+++ b/compiler/rustc_target/src/spec/wasm_base.rs
|
||||||
|
@@ -89,8 +89,7 @@ macro_rules! args {
|
||||||
|
// arguments just yet
|
||||||
|
limit_rdylib_exports: false,
|
||||||
|
|
||||||
|
- // we use the LLD shipped with the Rust toolchain by default
|
||||||
|
- linker: Some("rust-lld".into()),
|
||||||
|
+ linker: Some("lld".into()),
|
||||||
|
linker_flavor: LinkerFlavor::WasmLld(Cc::No),
|
||||||
|
|
||||||
|
pre_link_args,
|
||||||
|
--
|
||||||
|
2.38.1
|
||||||
|
|
||||||
@ -1,53 +0,0 @@
|
|||||||
From 61b5cc96337da2121221dd1bcdb63fd36551d065 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Josh Stone <jistone@redhat.com>
|
|
||||||
Date: Wed, 1 Nov 2023 15:21:15 -0700
|
|
||||||
Subject: [PATCH] Use lld provided by system
|
|
||||||
|
|
||||||
---
|
|
||||||
compiler/rustc_target/src/spec/base/wasm.rs | 3 +--
|
|
||||||
compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs | 2 +-
|
|
||||||
compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs | 1 +
|
|
||||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/compiler/rustc_target/src/spec/base/wasm.rs b/compiler/rustc_target/src/spec/base/wasm.rs
|
|
||||||
index 87ade9e58cf4..2ddff95febab 100644
|
|
||||||
--- a/compiler/rustc_target/src/spec/base/wasm.rs
|
|
||||||
+++ b/compiler/rustc_target/src/spec/base/wasm.rs
|
|
||||||
@@ -91,8 +91,7 @@ macro_rules! args {
|
|
||||||
// arguments just yet
|
|
||||||
limit_rdylib_exports: false,
|
|
||||||
|
|
||||||
- // we use the LLD shipped with the Rust toolchain by default
|
|
||||||
- linker: Some("rust-lld".into()),
|
|
||||||
+ linker: Some("lld".into()),
|
|
||||||
linker_flavor: LinkerFlavor::WasmLld(Cc::No),
|
|
||||||
|
|
||||||
pre_link_args,
|
|
||||||
diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs
|
|
||||||
index 9aa95a35f8e5..a9172f9441b7 100644
|
|
||||||
--- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs
|
|
||||||
+++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs
|
|
||||||
@@ -17,7 +17,7 @@ pub fn target() -> Target {
|
|
||||||
static_position_independent_executables: true,
|
|
||||||
relro_level: RelroLevel::Full,
|
|
||||||
linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes),
|
|
||||||
- linker: Some("rust-lld".into()),
|
|
||||||
+ linker: Some("lld".into()),
|
|
||||||
features:
|
|
||||||
"-mmx,-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-3dnow,-3dnowa,-avx,-avx2,+soft-float"
|
|
||||||
.into(),
|
|
||||||
diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs
|
|
||||||
index 5abfb8162f70..13cb43bda1a4 100644
|
|
||||||
--- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs
|
|
||||||
+++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs
|
|
||||||
@@ -16,6 +16,7 @@ pub fn target() -> Target {
|
|
||||||
base.plt_by_default = false;
|
|
||||||
base.max_atomic_width = Some(64);
|
|
||||||
base.entry_abi = Conv::X86_64Win64;
|
|
||||||
+ base.linker = Some("lld".into());
|
|
||||||
|
|
||||||
// We disable MMX and SSE for now, even though UEFI allows using them. Problem is, you have to
|
|
||||||
// enable these CPU features explicitly before their first use, otherwise their instructions
|
|
||||||
--
|
|
||||||
2.41.0
|
|
||||||
|
|
||||||
@ -1,102 +0,0 @@
|
|||||||
From df0d6f1d8b46db82d7599ca8eff6e8f844cf52f2 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Josh Stone <jistone@redhat.com>
|
|
||||||
Date: Thu, 28 Sep 2023 18:14:28 -0700
|
|
||||||
Subject: [PATCH 1/2] bootstrap: allow disabling target self-contained
|
|
||||||
|
|
||||||
---
|
|
||||||
config.example.toml | 5 +++++
|
|
||||||
src/bootstrap/src/core/build_steps/compile.rs | 4 ++++
|
|
||||||
src/bootstrap/src/core/config/config.rs | 8 ++++++++
|
|
||||||
src/bootstrap/src/lib.rs | 5 +++++
|
|
||||||
4 files changed, 22 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/config.example.toml b/config.example.toml
|
|
||||||
index e5df28a49af6..2fcd8b8cb057 100644
|
|
||||||
--- a/config.example.toml
|
|
||||||
+++ b/config.example.toml
|
|
||||||
@@ -807,6 +807,11 @@ change-id = 116881
|
|
||||||
# target triples containing `-none`, `nvptx`, `switch`, or `-uefi`.
|
|
||||||
#no-std = <platform-specific> (bool)
|
|
||||||
|
|
||||||
+# Copy libc and CRT objects into the target lib/self-contained/ directory.
|
|
||||||
+# Enabled by default on `musl`, `wasi`, and `windows-gnu` targets. Other
|
|
||||||
+# targets may ignore this setting if they have nothing to be contained.
|
|
||||||
+#self-contained = <platform-specific> (bool)
|
|
||||||
+
|
|
||||||
# =============================================================================
|
|
||||||
# Distribution options
|
|
||||||
#
|
|
||||||
diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
|
|
||||||
index 7021a9543582..11555c65ca87 100644
|
|
||||||
--- a/src/bootstrap/src/core/build_steps/compile.rs
|
|
||||||
+++ b/src/bootstrap/src/core/build_steps/compile.rs
|
|
||||||
@@ -302,6 +302,10 @@ fn copy_self_contained_objects(
|
|
||||||
compiler: &Compiler,
|
|
||||||
target: TargetSelection,
|
|
||||||
) -> Vec<(PathBuf, DependencyType)> {
|
|
||||||
+ if builder.self_contained(target) != Some(true) {
|
|
||||||
+ return vec![];
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
let libdir_self_contained = builder.sysroot_libdir(*compiler, target).join("self-contained");
|
|
||||||
t!(fs::create_dir_all(&libdir_self_contained));
|
|
||||||
let mut target_deps = vec![];
|
|
||||||
diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
|
|
||||||
index 0a9175aa3ea5..a2e028b25036 100644
|
|
||||||
--- a/src/bootstrap/src/core/config/config.rs
|
|
||||||
+++ b/src/bootstrap/src/core/config/config.rs
|
|
||||||
@@ -533,6 +533,7 @@ pub struct Target {
|
|
||||||
pub wasi_root: Option<PathBuf>,
|
|
||||||
pub qemu_rootfs: Option<PathBuf>,
|
|
||||||
pub no_std: bool,
|
|
||||||
+ pub self_contained: bool,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Target {
|
|
||||||
@@ -541,6 +542,9 @@ pub fn from_triple(triple: &str) -> Self {
|
|
||||||
if triple.contains("-none") || triple.contains("nvptx") || triple.contains("switch") {
|
|
||||||
target.no_std = true;
|
|
||||||
}
|
|
||||||
+ if triple.contains("-musl") || triple.contains("-wasi") || triple.contains("-windows-gnu") {
|
|
||||||
+ target.self_contained = true;
|
|
||||||
+ }
|
|
||||||
target
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1051,6 +1055,7 @@ struct TomlTarget {
|
|
||||||
wasi_root: Option<String> = "wasi-root",
|
|
||||||
qemu_rootfs: Option<String> = "qemu-rootfs",
|
|
||||||
no_std: Option<bool> = "no-std",
|
|
||||||
+ self_contained: Option<bool> = "self-contained",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1600,6 +1605,9 @@ fn get_table(option: &str) -> Result<TomlConfig, toml::de::Error> {
|
|
||||||
if let Some(s) = cfg.no_std {
|
|
||||||
target.no_std = s;
|
|
||||||
}
|
|
||||||
+ if let Some(s) = cfg.self_contained {
|
|
||||||
+ target.self_contained = s;
|
|
||||||
+ }
|
|
||||||
target.cc = cfg.cc.map(PathBuf::from);
|
|
||||||
target.cxx = cfg.cxx.map(PathBuf::from);
|
|
||||||
target.ar = cfg.ar.map(PathBuf::from);
|
|
||||||
diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
|
|
||||||
index 33b8f1a7ce72..f36e53187576 100644
|
|
||||||
--- a/src/bootstrap/src/lib.rs
|
|
||||||
+++ b/src/bootstrap/src/lib.rs
|
|
||||||
@@ -1335,6 +1335,11 @@ fn no_std(&self, target: TargetSelection) -> Option<bool> {
|
|
||||||
self.config.target_config.get(&target).map(|t| t.no_std)
|
|
||||||
}
|
|
||||||
|
|
||||||
+ /// Returns `true` if this is a self-contained `target`, if defined
|
|
||||||
+ fn self_contained(&self, target: TargetSelection) -> Option<bool> {
|
|
||||||
+ self.config.target_config.get(&target).map(|t| t.self_contained)
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
/// Returns `true` if the target will be tested using the `remote-test-client`
|
|
||||||
/// and `remote-test-server` binaries.
|
|
||||||
fn remote_tested(&self, target: TargetSelection) -> bool {
|
|
||||||
--
|
|
||||||
2.41.0
|
|
||||||
|
|
||||||
@ -0,0 +1,36 @@
|
|||||||
|
From a627c8f54cab6880dc7d36c55092a94c6f750a6e Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ariadne Conill <ariadne@dereferenced.org>
|
||||||
|
Date: Thu, 3 Aug 2023 15:05:40 -0700
|
||||||
|
Subject: [PATCH] bootstrap: config: fix version comparison bug
|
||||||
|
|
||||||
|
Rust requires a previous version of Rust to build, such as the current version, or the
|
||||||
|
previous version. However, the version comparison logic did not take patch releases
|
||||||
|
into consideration when doing the version comparison for the current branch, e.g.
|
||||||
|
Rust 1.71.1 could not be built by Rust 1.71.0 because it is neither an exact version
|
||||||
|
match, or the previous version.
|
||||||
|
|
||||||
|
Adjust the version comparison logic to tolerate mismatches in the patch version.
|
||||||
|
|
||||||
|
Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
|
||||||
|
(cherry picked from commit 31a81a08786826cc6e832bd0b49fb8b934e29648)
|
||||||
|
---
|
||||||
|
src/bootstrap/config.rs | 3 ++-
|
||||||
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
|
||||||
|
index e192cda9a9a7..2b5d0b94e968 100644
|
||||||
|
--- a/src/bootstrap/config.rs
|
||||||
|
+++ b/src/bootstrap/config.rs
|
||||||
|
@@ -1805,7 +1805,8 @@ pub fn check_build_rustc_version(&self) {
|
||||||
|
.unwrap();
|
||||||
|
if !(source_version == rustc_version
|
||||||
|
|| (source_version.major == rustc_version.major
|
||||||
|
- && source_version.minor == rustc_version.minor + 1))
|
||||||
|
+ && (source_version.minor == rustc_version.minor
|
||||||
|
+ || source_version.minor == rustc_version.minor + 1)))
|
||||||
|
{
|
||||||
|
let prev_version = format!("{}.{}.x", source_version.major, source_version.minor - 1);
|
||||||
|
eprintln!(
|
||||||
|
--
|
||||||
|
2.41.0
|
||||||
|
|
||||||
@ -1,78 +0,0 @@
|
|||||||
From 79bb610c8fc5d9df7dd4720ae847b8f17e7b1ad4 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Josh Stone <jistone@redhat.com>
|
|
||||||
Date: Thu, 28 Sep 2023 18:18:16 -0700
|
|
||||||
Subject: [PATCH 2/2] set an external library path for wasm32-wasi
|
|
||||||
|
|
||||||
---
|
|
||||||
compiler/rustc_codegen_ssa/src/back/link.rs | 9 +++++++++
|
|
||||||
compiler/rustc_target/src/spec/mod.rs | 2 ++
|
|
||||||
compiler/rustc_target/src/spec/targets/wasm32_wasi.rs | 6 +++++-
|
|
||||||
3 files changed, 16 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs
|
|
||||||
index dd9d277fb775..3d0f0502f255 100644
|
|
||||||
--- a/compiler/rustc_codegen_ssa/src/back/link.rs
|
|
||||||
+++ b/compiler/rustc_codegen_ssa/src/back/link.rs
|
|
||||||
@@ -1496,6 +1496,12 @@ fn get_object_file_path(sess: &Session, name: &str, self_contained: bool) -> Pat
|
|
||||||
return file_path;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+ if let Some(lib_path) = &sess.target.options.external_lib_path {
|
|
||||||
+ let file_path = Path::new(lib_path.as_ref()).join(name);
|
|
||||||
+ if file_path.exists() {
|
|
||||||
+ return file_path;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
for search_path in fs.search_paths() {
|
|
||||||
let file_path = search_path.dir.join(name);
|
|
||||||
if file_path.exists() {
|
|
||||||
@@ -1982,6 +1988,9 @@ fn add_library_search_dirs(cmd: &mut dyn Linker, sess: &Session, self_contained:
|
|
||||||
let lib_path = sess.target_filesearch(PathKind::All).get_self_contained_lib_path();
|
|
||||||
cmd.include_path(&fix_windows_verbatim_for_gcc(&lib_path));
|
|
||||||
}
|
|
||||||
+ if let Some(lib_path) = &sess.target.options.external_lib_path {
|
|
||||||
+ cmd.include_path(Path::new(lib_path.as_ref()));
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Add options making relocation sections in the produced ELF files read-only
|
|
||||||
diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
|
|
||||||
index f04799482c83..25410b37ba24 100644
|
|
||||||
--- a/compiler/rustc_target/src/spec/mod.rs
|
|
||||||
+++ b/compiler/rustc_target/src/spec/mod.rs
|
|
||||||
@@ -1874,6 +1874,7 @@ pub struct TargetOptions {
|
|
||||||
/// Objects to link before and after all other object code.
|
|
||||||
pub pre_link_objects: CrtObjects,
|
|
||||||
pub post_link_objects: CrtObjects,
|
|
||||||
+ pub external_lib_path: Option<StaticCow<str>>,
|
|
||||||
/// Same as `(pre|post)_link_objects`, but when self-contained linking mode is enabled.
|
|
||||||
pub pre_link_objects_self_contained: CrtObjects,
|
|
||||||
pub post_link_objects_self_contained: CrtObjects,
|
|
||||||
@@ -2352,6 +2353,7 @@ fn default() -> TargetOptions {
|
|
||||||
relro_level: RelroLevel::None,
|
|
||||||
pre_link_objects: Default::default(),
|
|
||||||
post_link_objects: Default::default(),
|
|
||||||
+ external_lib_path: None,
|
|
||||||
pre_link_objects_self_contained: Default::default(),
|
|
||||||
post_link_objects_self_contained: Default::default(),
|
|
||||||
link_self_contained: LinkSelfContainedDefault::False,
|
|
||||||
diff --git a/compiler/rustc_target/src/spec/targets/wasm32_wasi.rs b/compiler/rustc_target/src/spec/targets/wasm32_wasi.rs
|
|
||||||
index 6dbcb01ea436..2151f86d0648 100644
|
|
||||||
--- a/compiler/rustc_target/src/spec/targets/wasm32_wasi.rs
|
|
||||||
+++ b/compiler/rustc_target/src/spec/targets/wasm32_wasi.rs
|
|
||||||
@@ -86,7 +86,11 @@ pub fn target() -> Target {
|
|
||||||
options.post_link_objects_self_contained = crt_objects::post_wasi_self_contained();
|
|
||||||
|
|
||||||
// FIXME: Figure out cases in which WASM needs to link with a native toolchain.
|
|
||||||
- options.link_self_contained = LinkSelfContainedDefault::True;
|
|
||||||
+ options.link_self_contained = LinkSelfContainedDefault::False;
|
|
||||||
+
|
|
||||||
+ options.pre_link_objects = options.pre_link_objects_self_contained.clone();
|
|
||||||
+ options.post_link_objects = options.post_link_objects_self_contained.clone();
|
|
||||||
+ options.external_lib_path = Some("/usr/wasm32-wasi/lib/wasm32-wasi".into());
|
|
||||||
|
|
||||||
// Right now this is a bit of a workaround but we're currently saying that
|
|
||||||
// the target by default has a static crt which we're taking as a signal
|
|
||||||
--
|
|
||||||
2.41.0
|
|
||||||
|
|
||||||
@ -1,2 +0,0 @@
|
|||||||
%__cargo_vendor_path ^%{_defaultlicensedir}(/[^/]+)+/cargo-vendor.txt$
|
|
||||||
%__cargo_vendor_provides %{_rpmconfigdir}/cargo_vendor.prov
|
|
||||||
@ -1,127 +0,0 @@
|
|||||||
#! /usr/bin/python3 -s
|
|
||||||
# Stripped down replacement for cargo2rpm parse-vendor-manifest
|
|
||||||
|
|
||||||
import re
|
|
||||||
import subprocess
|
|
||||||
import sys
|
|
||||||
from typing import Optional
|
|
||||||
|
|
||||||
|
|
||||||
VERSION_REGEX = re.compile(
|
|
||||||
r"""
|
|
||||||
^
|
|
||||||
(?P<major>0|[1-9]\d*)
|
|
||||||
\.(?P<minor>0|[1-9]\d*)
|
|
||||||
\.(?P<patch>0|[1-9]\d*)
|
|
||||||
(?:-(?P<pre>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?
|
|
||||||
(?:\+(?P<build>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$
|
|
||||||
""",
|
|
||||||
re.VERBOSE,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class Version:
|
|
||||||
"""
|
|
||||||
Version that adheres to the "semantic versioning" format.
|
|
||||||
"""
|
|
||||||
|
|
||||||
def __init__(self, major: int, minor: int, patch: int, pre: Optional[str] = None, build: Optional[str] = None):
|
|
||||||
self.major: int = major
|
|
||||||
self.minor: int = minor
|
|
||||||
self.patch: int = patch
|
|
||||||
self.pre: Optional[str] = pre
|
|
||||||
self.build: Optional[str] = build
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def parse(version: str) -> "Version":
|
|
||||||
"""
|
|
||||||
Parses a version string and return a `Version` object.
|
|
||||||
Raises a `ValueError` if the string does not match the expected format.
|
|
||||||
"""
|
|
||||||
|
|
||||||
match = VERSION_REGEX.match(version)
|
|
||||||
if not match:
|
|
||||||
raise ValueError(f"Invalid version: {version!r}")
|
|
||||||
|
|
||||||
matches = match.groupdict()
|
|
||||||
|
|
||||||
major_str = matches["major"]
|
|
||||||
minor_str = matches["minor"]
|
|
||||||
patch_str = matches["patch"]
|
|
||||||
pre = matches["pre"]
|
|
||||||
build = matches["build"]
|
|
||||||
|
|
||||||
major = int(major_str)
|
|
||||||
minor = int(minor_str)
|
|
||||||
patch = int(patch_str)
|
|
||||||
|
|
||||||
return Version(major, minor, patch, pre, build)
|
|
||||||
|
|
||||||
def to_rpm(self) -> str:
|
|
||||||
"""
|
|
||||||
Formats the `Version` object as an equivalent RPM version string.
|
|
||||||
Characters that are invalid in RPM versions are replaced ("-" -> "_")
|
|
||||||
|
|
||||||
Build metadata (the optional `Version.build` attribute) is dropped, so
|
|
||||||
the conversion is not lossless for versions where this attribute is not
|
|
||||||
`None`. However, build metadata is not intended to be part of the
|
|
||||||
version (and is not even considered when doing version comparison), so
|
|
||||||
dropping it when converting to the RPM version format is correct.
|
|
||||||
"""
|
|
||||||
|
|
||||||
s = f"{self.major}.{self.minor}.{self.patch}"
|
|
||||||
if self.pre:
|
|
||||||
s += f"~{self.pre.replace('-', '_')}"
|
|
||||||
return s
|
|
||||||
|
|
||||||
|
|
||||||
def break_the_build(error: str):
|
|
||||||
"""
|
|
||||||
This function writes a string that is an invalid RPM dependency specifier,
|
|
||||||
which causes dependency generators to fail and break the build. The
|
|
||||||
additional error message is printed to stderr.
|
|
||||||
"""
|
|
||||||
|
|
||||||
print("*** FATAL ERROR ***")
|
|
||||||
print(error, file=sys.stderr)
|
|
||||||
|
|
||||||
|
|
||||||
def get_cargo_vendor_txt_paths_from_stdin() -> set[str]: # pragma nocover
|
|
||||||
"""
|
|
||||||
Read lines from standard input and filter out lines that look like paths
|
|
||||||
to `cargo-vendor.txt` files. This is how RPM generators pass lists of files.
|
|
||||||
"""
|
|
||||||
|
|
||||||
lines = {line.rstrip("\n") for line in sys.stdin.readlines()}
|
|
||||||
return {line for line in lines if line.endswith("/cargo-vendor.txt")}
|
|
||||||
|
|
||||||
|
|
||||||
def action_parse_vendor_manifest():
|
|
||||||
paths = get_cargo_vendor_txt_paths_from_stdin()
|
|
||||||
|
|
||||||
for path in paths:
|
|
||||||
with open(path) as file:
|
|
||||||
manifest = file.read()
|
|
||||||
|
|
||||||
for line in manifest.strip().splitlines():
|
|
||||||
crate, version = line.split(" v")
|
|
||||||
print(f"bundled(crate({crate})) = {Version.parse(version).to_rpm()}")
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
|
||||||
try:
|
|
||||||
action_parse_vendor_manifest()
|
|
||||||
exit(0)
|
|
||||||
|
|
||||||
# print an error message that is not a valid RPM dependency
|
|
||||||
# to cause the generator to break the build
|
|
||||||
except (IOError, ValueError) as exc:
|
|
||||||
break_the_build(str(exc))
|
|
||||||
exit(1)
|
|
||||||
|
|
||||||
break_the_build("Uncaught exception: This should not happen, please report a bug.")
|
|
||||||
exit(1)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
main()
|
|
||||||
@ -0,0 +1,92 @@
|
|||||||
|
--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2023-07-07 17:30:04.817452621 -0700
|
||||||
|
+++ rustc-beta-src/src/tools/cargo/Cargo.lock 2023-07-07 17:30:27.777988139 -0700
|
||||||
|
@@ -734,7 +734,6 @@
|
||||||
|
dependencies = [
|
||||||
|
"cc",
|
||||||
|
"libc",
|
||||||
|
- "libnghttp2-sys",
|
||||||
|
"libz-sys",
|
||||||
|
"openssl-sys",
|
||||||
|
"pkg-config",
|
||||||
|
@@ -1954,16 +1953,6 @@
|
||||||
|
checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
-name = "libnghttp2-sys"
|
||||||
|
-version = "0.1.7+1.45.0"
|
||||||
|
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "57ed28aba195b38d5ff02b9170cbff627e336a20925e43b4945390401c5dc93f"
|
||||||
|
-dependencies = [
|
||||||
|
- "cc",
|
||||||
|
- "libc",
|
||||||
|
-]
|
||||||
|
-
|
||||||
|
-[[package]]
|
||||||
|
name = "libz-sys"
|
||||||
|
version = "1.1.8"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2023-07-07 17:30:04.819452581 -0700
|
||||||
|
+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2023-07-07 17:30:24.133061874 -0700
|
||||||
|
@@ -118,7 +118,7 @@
|
||||||
|
cargo-util.workspace = true
|
||||||
|
clap = { workspace = true, features = ["wrap_help"] }
|
||||||
|
crates-io.workspace = true
|
||||||
|
-curl = { workspace = true, features = ["http2"] }
|
||||||
|
+curl = { workspace = true, features = [] }
|
||||||
|
curl-sys.workspace = true
|
||||||
|
env_logger.workspace = true
|
||||||
|
filetime.workspace = true
|
||||||
|
--- rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs.orig 2023-06-24 10:27:37.000000000 -0700
|
||||||
|
+++ rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs 2023-07-07 17:30:04.819452581 -0700
|
||||||
|
@@ -407,16 +407,9 @@
|
||||||
|
sources: SourceMap<'cfg>,
|
||||||
|
config: &'cfg Config,
|
||||||
|
) -> CargoResult<PackageSet<'cfg>> {
|
||||||
|
- // We've enabled the `http2` feature of `curl` in Cargo, so treat
|
||||||
|
- // failures here as fatal as it would indicate a build-time problem.
|
||||||
|
- let mut multi = Multi::new();
|
||||||
|
- let multiplexing = config.http_config()?.multiplexing.unwrap_or(true);
|
||||||
|
- multi
|
||||||
|
- .pipelining(false, multiplexing)
|
||||||
|
- .with_context(|| "failed to enable multiplexing/pipelining in curl")?;
|
||||||
|
-
|
||||||
|
- // let's not flood crates.io with connections
|
||||||
|
- multi.set_max_host_connections(2)?;
|
||||||
|
+ // Multiplexing is disabled because the system libcurl doesn't support it.
|
||||||
|
+ let multi = Multi::new();
|
||||||
|
+ let multiplexing = false;
|
||||||
|
|
||||||
|
Ok(PackageSet {
|
||||||
|
packages: package_ids
|
||||||
|
--- rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs.orig 2023-06-24 10:27:37.000000000 -0700
|
||||||
|
+++ rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs 2023-07-07 17:30:04.819452581 -0700
|
||||||
|
@@ -229,16 +229,8 @@
|
||||||
|
}
|
||||||
|
self.fetch_started = true;
|
||||||
|
|
||||||
|
- // We've enabled the `http2` feature of `curl` in Cargo, so treat
|
||||||
|
- // failures here as fatal as it would indicate a build-time problem.
|
||||||
|
- self.multiplexing = self.config.http_config()?.multiplexing.unwrap_or(true);
|
||||||
|
-
|
||||||
|
- self.multi
|
||||||
|
- .pipelining(false, self.multiplexing)
|
||||||
|
- .with_context(|| "failed to enable multiplexing/pipelining in curl")?;
|
||||||
|
-
|
||||||
|
- // let's not flood the server with connections
|
||||||
|
- self.multi.set_max_host_connections(2)?;
|
||||||
|
+ // Multiplexing is disabled because the system libcurl doesn't support it.
|
||||||
|
+ self.multiplexing = false;
|
||||||
|
|
||||||
|
if !self.quiet {
|
||||||
|
self.config
|
||||||
|
--- rustc-beta-src/src/tools/cargo/src/cargo/util/network/mod.rs.orig 2023-06-24 10:27:37.000000000 -0700
|
||||||
|
+++ rustc-beta-src/src/tools/cargo/src/cargo/util/network/mod.rs 2023-07-07 17:30:04.819452581 -0700
|
||||||
|
@@ -26,7 +26,7 @@
|
||||||
|
macro_rules! try_old_curl {
|
||||||
|
($e:expr, $msg:expr) => {
|
||||||
|
let result = $e;
|
||||||
|
- if cfg!(target_os = "macos") {
|
||||||
|
+ if cfg!(any(target_os = "linux", target_os = "macos")) {
|
||||||
|
if let Err(e) = result {
|
||||||
|
warn!("ignoring libcurl {} error: {}", $msg, e);
|
||||||
|
}
|
||||||
@ -0,0 +1,42 @@
|
|||||||
|
--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2023-06-24 10:27:37.000000000 -0700
|
||||||
|
+++ rustc-beta-src/src/tools/cargo/Cargo.lock 2023-07-07 17:12:23.406932870 -0700
|
||||||
|
@@ -1942,7 +1942,6 @@
|
||||||
|
dependencies = [
|
||||||
|
"cc",
|
||||||
|
"libc",
|
||||||
|
- "libssh2-sys",
|
||||||
|
"libz-sys",
|
||||||
|
"openssl-sys",
|
||||||
|
"pkg-config",
|
||||||
|
@@ -1965,20 +1964,6 @@
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
-name = "libssh2-sys"
|
||||||
|
-version = "0.3.0"
|
||||||
|
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee"
|
||||||
|
-dependencies = [
|
||||||
|
- "cc",
|
||||||
|
- "libc",
|
||||||
|
- "libz-sys",
|
||||||
|
- "openssl-sys",
|
||||||
|
- "pkg-config",
|
||||||
|
- "vcpkg",
|
||||||
|
-]
|
||||||
|
-
|
||||||
|
-[[package]]
|
||||||
|
name = "libz-sys"
|
||||||
|
version = "1.1.8"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2023-06-24 10:27:37.000000000 -0700
|
||||||
|
+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2023-07-07 17:12:00.688392750 -0700
|
||||||
|
@@ -31,7 +31,7 @@
|
||||||
|
filetime = "0.2.9"
|
||||||
|
flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] }
|
||||||
|
fwdansi = "1.1.0"
|
||||||
|
-git2 = "0.17.1"
|
||||||
|
+git2 = { version = "0.17.1", default-features = false, features = ["https"] }
|
||||||
|
git2-curl = "0.18.0"
|
||||||
|
gix = { version = "0.44.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree"] }
|
||||||
|
gix-features-for-configuration-only = { version = "0.29.0", package = "gix-features", features = [ "parallel" ] }
|
||||||
@ -1,42 +0,0 @@
|
|||||||
--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2024-01-07 18:12:08.000000000 -0800
|
|
||||||
+++ rustc-beta-src/src/tools/cargo/Cargo.lock 2024-01-09 15:25:51.519781381 -0800
|
|
||||||
@@ -2071,7 +2071,6 @@
|
|
||||||
dependencies = [
|
|
||||||
"cc",
|
|
||||||
"libc",
|
|
||||||
- "libssh2-sys",
|
|
||||||
"libz-sys",
|
|
||||||
"openssl-sys",
|
|
||||||
"pkg-config",
|
|
||||||
@@ -2113,20 +2112,6 @@
|
|
||||||
"pkg-config",
|
|
||||||
"vcpkg",
|
|
||||||
]
|
|
||||||
-
|
|
||||||
-[[package]]
|
|
||||||
-name = "libssh2-sys"
|
|
||||||
-version = "0.3.0"
|
|
||||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
-checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee"
|
|
||||||
-dependencies = [
|
|
||||||
- "cc",
|
|
||||||
- "libc",
|
|
||||||
- "libz-sys",
|
|
||||||
- "openssl-sys",
|
|
||||||
- "pkg-config",
|
|
||||||
- "vcpkg",
|
|
||||||
-]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "libz-sys"
|
|
||||||
--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2024-01-09 15:23:02.369032291 -0800
|
|
||||||
+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2024-01-09 15:24:44.015679666 -0800
|
|
||||||
@@ -40,7 +40,7 @@
|
|
||||||
curl-sys = "0.4.70"
|
|
||||||
filetime = "0.2.22"
|
|
||||||
flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] }
|
|
||||||
-git2 = "0.18.1"
|
|
||||||
+git2 = { version = "0.18.1", default-features = false, features = ["https"] }
|
|
||||||
git2-curl = "0.19.0"
|
|
||||||
gix = { version = "0.56.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] }
|
|
||||||
gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] }
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2024-01-07 18:12:08.000000000 -0800
|
|
||||||
+++ rustc-beta-src/src/tools/cargo/Cargo.lock 2024-01-09 15:36:23.808367445 -0800
|
|
||||||
@@ -2109,7 +2109,6 @@
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716"
|
|
||||||
dependencies = [
|
|
||||||
- "cc",
|
|
||||||
"pkg-config",
|
|
||||||
"vcpkg",
|
|
||||||
]
|
|
||||||
--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2024-01-07 18:12:08.000000000 -0800
|
|
||||||
+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2024-01-09 15:36:18.534437627 -0800
|
|
||||||
@@ -73,7 +73,7 @@
|
|
||||||
pulldown-cmark = { version = "0.9.3", default-features = false }
|
|
||||||
rand = "0.8.5"
|
|
||||||
regex = "1.10.2"
|
|
||||||
-rusqlite = { version = "0.30.0", features = ["bundled"] }
|
|
||||||
+rusqlite = { version = "0.30.0", features = [] }
|
|
||||||
rustfix = { version = "0.7.0", path = "crates/rustfix" }
|
|
||||||
same-file = "1.0.6"
|
|
||||||
security-framework = "2.9.2"
|
|
||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue