Compare commits
No commits in common. "c8-stream-rhel8" and "c8s-stream-rhel8" have entirely different histories.
c8-stream-
...
c8s-stream
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,2 +1,2 @@
|
|||||||
SOURCES/rustc-1.75.0-src.tar.xz
|
SOURCES/rustc-1.66.1-src.tar.xz
|
||||||
SOURCES/wasi-libc-bd950eb128bff337153de217b11270f948d04bb4.tar.gz
|
SOURCES/wasi-libc-wasi-sdk-17.tar.gz
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
9ad7bb54dc9572c103b855cdcc823addbb34d15d SOURCES/rustc-1.75.0-src.tar.xz
|
a8cc02cc11a942bddf67f1cfdcdd2bd867296f8e SOURCES/rustc-1.66.1-src.tar.xz
|
||||||
55eaa32c99cc8ec970f2db2d340a605724589f9b SOURCES/wasi-libc-bd950eb128bff337153de217b11270f948d04bb4.tar.gz
|
1f4561760c6c7e9f9f30c8cf0d156b8d551e04e2 SOURCES/wasi-libc-wasi-sdk-17.tar.gz
|
||||||
|
302
SOURCES/0001-Improve-generating-Custom-entry-function.patch
Normal file
302
SOURCES/0001-Improve-generating-Custom-entry-function.patch
Normal file
@ -0,0 +1,302 @@
|
|||||||
|
From 9f0a8620bd7d325e6d42417b08daff3e55cb88f6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ayush Singh <ayushsingh1325@gmail.com>
|
||||||
|
Date: Sat, 5 Nov 2022 14:36:38 +0530
|
||||||
|
Subject: [PATCH] Improve generating Custom entry function
|
||||||
|
|
||||||
|
This commit is aimed at making compiler generated entry functions
|
||||||
|
(Basically just C `main` right now) more generic so other targets can do
|
||||||
|
similar things for custom entry. This was initially implemented as part
|
||||||
|
of https://github.com/rust-lang/rust/pull/100316.
|
||||||
|
|
||||||
|
Currently, this moves the entry function name and Call convention to the
|
||||||
|
target spec.
|
||||||
|
|
||||||
|
Signed-off-by: Ayush Singh <ayushsingh1325@gmail.com>
|
||||||
|
---
|
||||||
|
compiler/rustc_codegen_llvm/src/abi.rs | 40 +++++++++++--------
|
||||||
|
compiler/rustc_codegen_llvm/src/context.rs | 10 ++++-
|
||||||
|
compiler/rustc_codegen_llvm/src/declare.rs | 22 ++++++++++
|
||||||
|
.../src/back/symbol_export.rs | 3 +-
|
||||||
|
compiler/rustc_target/src/abi/call/mod.rs | 28 +++++++++++++
|
||||||
|
compiler/rustc_target/src/json.rs | 25 ++++++++++++
|
||||||
|
compiler/rustc_target/src/spec/mod.rs | 27 +++++++++++++
|
||||||
|
7 files changed, 135 insertions(+), 20 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/compiler/rustc_codegen_llvm/src/abi.rs b/compiler/rustc_codegen_llvm/src/abi.rs
|
||||||
|
index d478efc863a9..a6fd2a7de6bd 100644
|
||||||
|
--- a/compiler/rustc_codegen_llvm/src/abi.rs
|
||||||
|
+++ b/compiler/rustc_codegen_llvm/src/abi.rs
|
||||||
|
@@ -398,23 +398,7 @@ fn ptr_to_llvm_type(&self, cx: &CodegenCx<'ll, 'tcx>) -> &'ll Type {
|
||||||
|
}
|
||||||
|
|
||||||
|
fn llvm_cconv(&self) -> llvm::CallConv {
|
||||||
|
- match self.conv {
|
||||||
|
- Conv::C | Conv::Rust | Conv::CCmseNonSecureCall => llvm::CCallConv,
|
||||||
|
- Conv::RustCold => llvm::ColdCallConv,
|
||||||
|
- Conv::AmdGpuKernel => llvm::AmdGpuKernel,
|
||||||
|
- Conv::AvrInterrupt => llvm::AvrInterrupt,
|
||||||
|
- Conv::AvrNonBlockingInterrupt => llvm::AvrNonBlockingInterrupt,
|
||||||
|
- Conv::ArmAapcs => llvm::ArmAapcsCallConv,
|
||||||
|
- Conv::Msp430Intr => llvm::Msp430Intr,
|
||||||
|
- Conv::PtxKernel => llvm::PtxKernel,
|
||||||
|
- Conv::X86Fastcall => llvm::X86FastcallCallConv,
|
||||||
|
- Conv::X86Intr => llvm::X86_Intr,
|
||||||
|
- Conv::X86Stdcall => llvm::X86StdcallCallConv,
|
||||||
|
- Conv::X86ThisCall => llvm::X86_ThisCall,
|
||||||
|
- Conv::X86VectorCall => llvm::X86_VectorCall,
|
||||||
|
- Conv::X86_64SysV => llvm::X86_64_SysV,
|
||||||
|
- Conv::X86_64Win64 => llvm::X86_64_Win64,
|
||||||
|
- }
|
||||||
|
+ self.conv.into()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn apply_attrs_llfn(&self, cx: &CodegenCx<'ll, 'tcx>, llfn: &'ll Value) {
|
||||||
|
@@ -596,3 +580,25 @@ fn get_param(&mut self, index: usize) -> Self::Value {
|
||||||
|
llvm::get_param(self.llfn(), index as c_uint)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+impl From<Conv> for llvm::CallConv {
|
||||||
|
+ fn from(conv: Conv) -> Self {
|
||||||
|
+ match conv {
|
||||||
|
+ Conv::C | Conv::Rust | Conv::CCmseNonSecureCall => llvm::CCallConv,
|
||||||
|
+ Conv::RustCold => llvm::ColdCallConv,
|
||||||
|
+ Conv::AmdGpuKernel => llvm::AmdGpuKernel,
|
||||||
|
+ Conv::AvrInterrupt => llvm::AvrInterrupt,
|
||||||
|
+ Conv::AvrNonBlockingInterrupt => llvm::AvrNonBlockingInterrupt,
|
||||||
|
+ Conv::ArmAapcs => llvm::ArmAapcsCallConv,
|
||||||
|
+ Conv::Msp430Intr => llvm::Msp430Intr,
|
||||||
|
+ Conv::PtxKernel => llvm::PtxKernel,
|
||||||
|
+ Conv::X86Fastcall => llvm::X86FastcallCallConv,
|
||||||
|
+ Conv::X86Intr => llvm::X86_Intr,
|
||||||
|
+ Conv::X86Stdcall => llvm::X86StdcallCallConv,
|
||||||
|
+ Conv::X86ThisCall => llvm::X86_ThisCall,
|
||||||
|
+ Conv::X86VectorCall => llvm::X86_VectorCall,
|
||||||
|
+ Conv::X86_64SysV => llvm::X86_64_SysV,
|
||||||
|
+ Conv::X86_64Win64 => llvm::X86_64_Win64,
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
diff --git a/compiler/rustc_codegen_llvm/src/context.rs b/compiler/rustc_codegen_llvm/src/context.rs
|
||||||
|
index 79ddfd884dfa..f3ef618fff54 100644
|
||||||
|
--- a/compiler/rustc_codegen_llvm/src/context.rs
|
||||||
|
+++ b/compiler/rustc_codegen_llvm/src/context.rs
|
||||||
|
@@ -570,8 +570,14 @@ fn apply_target_cpu_attr(&self, llfn: &'ll Value) {
|
||||||
|
}
|
||||||
|
|
||||||
|
fn declare_c_main(&self, fn_type: Self::Type) -> Option<Self::Function> {
|
||||||
|
- if self.get_declared_value("main").is_none() {
|
||||||
|
- Some(self.declare_cfn("main", llvm::UnnamedAddr::Global, fn_type))
|
||||||
|
+ let entry_name = self.sess().target.entry_name.as_ref();
|
||||||
|
+ if self.get_declared_value(entry_name).is_none() {
|
||||||
|
+ Some(self.declare_entry_fn(
|
||||||
|
+ entry_name,
|
||||||
|
+ self.sess().target.entry_abi.into(),
|
||||||
|
+ llvm::UnnamedAddr::Global,
|
||||||
|
+ fn_type,
|
||||||
|
+ ))
|
||||||
|
} else {
|
||||||
|
// If the symbol already exists, it is an error: for example, the user wrote
|
||||||
|
// #[no_mangle] extern "C" fn main(..) {..}
|
||||||
|
diff --git a/compiler/rustc_codegen_llvm/src/declare.rs b/compiler/rustc_codegen_llvm/src/declare.rs
|
||||||
|
index f79ef11720df..dc21a02cec44 100644
|
||||||
|
--- a/compiler/rustc_codegen_llvm/src/declare.rs
|
||||||
|
+++ b/compiler/rustc_codegen_llvm/src/declare.rs
|
||||||
|
@@ -90,6 +90,28 @@ pub fn declare_cfn(
|
||||||
|
declare_raw_fn(self, name, llvm::CCallConv, unnamed, visibility, fn_type)
|
||||||
|
}
|
||||||
|
|
||||||
|
+ /// Declare an entry Function
|
||||||
|
+ ///
|
||||||
|
+ /// The ABI of this function can change depending on the target (although for now the same as
|
||||||
|
+ /// `declare_cfn`)
|
||||||
|
+ ///
|
||||||
|
+ /// If there’s a value with the same name already declared, the function will
|
||||||
|
+ /// update the declaration and return existing Value instead.
|
||||||
|
+ pub fn declare_entry_fn(
|
||||||
|
+ &self,
|
||||||
|
+ name: &str,
|
||||||
|
+ callconv: llvm::CallConv,
|
||||||
|
+ unnamed: llvm::UnnamedAddr,
|
||||||
|
+ fn_type: &'ll Type,
|
||||||
|
+ ) -> &'ll Value {
|
||||||
|
+ let visibility = if self.tcx.sess.target.default_hidden_visibility {
|
||||||
|
+ llvm::Visibility::Hidden
|
||||||
|
+ } else {
|
||||||
|
+ llvm::Visibility::Default
|
||||||
|
+ };
|
||||||
|
+ declare_raw_fn(self, name, callconv, unnamed, visibility, fn_type)
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
/// Declare a Rust function.
|
||||||
|
///
|
||||||
|
/// If there’s a value with the same name already declared, the function will
|
||||||
|
diff --git a/compiler/rustc_codegen_ssa/src/back/symbol_export.rs b/compiler/rustc_codegen_ssa/src/back/symbol_export.rs
|
||||||
|
index 752f6b1ef40c..22f534d909ab 100644
|
||||||
|
--- a/compiler/rustc_codegen_ssa/src/back/symbol_export.rs
|
||||||
|
+++ b/compiler/rustc_codegen_ssa/src/back/symbol_export.rs
|
||||||
|
@@ -180,7 +180,8 @@ fn exported_symbols_provider_local<'tcx>(
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
if tcx.entry_fn(()).is_some() {
|
||||||
|
- let exported_symbol = ExportedSymbol::NoDefId(SymbolName::new(tcx, "main"));
|
||||||
|
+ let exported_symbol =
|
||||||
|
+ ExportedSymbol::NoDefId(SymbolName::new(tcx, tcx.sess.target.entry_name.as_ref()));
|
||||||
|
|
||||||
|
symbols.push((
|
||||||
|
exported_symbol,
|
||||||
|
diff --git a/compiler/rustc_target/src/abi/call/mod.rs b/compiler/rustc_target/src/abi/call/mod.rs
|
||||||
|
index 9e5f0e4d158b..c622bd36b00c 100644
|
||||||
|
--- a/compiler/rustc_target/src/abi/call/mod.rs
|
||||||
|
+++ b/compiler/rustc_target/src/abi/call/mod.rs
|
||||||
|
@@ -3,6 +3,7 @@
|
||||||
|
use crate::spec::{self, HasTargetSpec};
|
||||||
|
use rustc_span::Symbol;
|
||||||
|
use std::fmt;
|
||||||
|
+use std::str::FromStr;
|
||||||
|
|
||||||
|
mod aarch64;
|
||||||
|
mod amdgpu;
|
||||||
|
@@ -735,6 +736,33 @@ pub fn adjust_for_foreign_abi<C>(
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+impl FromStr for Conv {
|
||||||
|
+ type Err = String;
|
||||||
|
+
|
||||||
|
+ fn from_str(s: &str) -> Result<Self, Self::Err> {
|
||||||
|
+ match s {
|
||||||
|
+ "C" => Ok(Conv::C),
|
||||||
|
+ "Rust" => Ok(Conv::Rust),
|
||||||
|
+ "RustCold" => Ok(Conv::Rust),
|
||||||
|
+ "ArmAapcs" => Ok(Conv::ArmAapcs),
|
||||||
|
+ "CCmseNonSecureCall" => Ok(Conv::CCmseNonSecureCall),
|
||||||
|
+ "Msp430Intr" => Ok(Conv::Msp430Intr),
|
||||||
|
+ "PtxKernel" => Ok(Conv::PtxKernel),
|
||||||
|
+ "X86Fastcall" => Ok(Conv::X86Fastcall),
|
||||||
|
+ "X86Intr" => Ok(Conv::X86Intr),
|
||||||
|
+ "X86Stdcall" => Ok(Conv::X86Stdcall),
|
||||||
|
+ "X86ThisCall" => Ok(Conv::X86ThisCall),
|
||||||
|
+ "X86VectorCall" => Ok(Conv::X86VectorCall),
|
||||||
|
+ "X86_64SysV" => Ok(Conv::X86_64SysV),
|
||||||
|
+ "X86_64Win64" => Ok(Conv::X86_64Win64),
|
||||||
|
+ "AmdGpuKernel" => Ok(Conv::AmdGpuKernel),
|
||||||
|
+ "AvrInterrupt" => Ok(Conv::AvrInterrupt),
|
||||||
|
+ "AvrNonBlockingInterrupt" => Ok(Conv::AvrNonBlockingInterrupt),
|
||||||
|
+ _ => Err(format!("'{}' is not a valid value for entry function call convetion.", s)),
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
// Some types are used a lot. Make sure they don't unintentionally get bigger.
|
||||||
|
#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
|
||||||
|
mod size_asserts {
|
||||||
|
diff --git a/compiler/rustc_target/src/json.rs b/compiler/rustc_target/src/json.rs
|
||||||
|
index b5d926352122..75bb76a9de08 100644
|
||||||
|
--- a/compiler/rustc_target/src/json.rs
|
||||||
|
+++ b/compiler/rustc_target/src/json.rs
|
||||||
|
@@ -89,3 +89,28 @@ fn to_json(&self) -> Json {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+impl ToJson for crate::abi::call::Conv {
|
||||||
|
+ fn to_json(&self) -> Json {
|
||||||
|
+ let s = match self {
|
||||||
|
+ Self::C => "C",
|
||||||
|
+ Self::Rust => "Rust",
|
||||||
|
+ Self::RustCold => "RustCold",
|
||||||
|
+ Self::ArmAapcs => "ArmAapcs",
|
||||||
|
+ Self::CCmseNonSecureCall => "CCmseNonSecureCall",
|
||||||
|
+ Self::Msp430Intr => "Msp430Intr",
|
||||||
|
+ Self::PtxKernel => "PtxKernel",
|
||||||
|
+ Self::X86Fastcall => "X86Fastcall",
|
||||||
|
+ Self::X86Intr => "X86Intr",
|
||||||
|
+ Self::X86Stdcall => "X86Stdcall",
|
||||||
|
+ Self::X86ThisCall => "X86ThisCall",
|
||||||
|
+ Self::X86VectorCall => "X86VectorCall",
|
||||||
|
+ Self::X86_64SysV => "X86_64SysV",
|
||||||
|
+ Self::X86_64Win64 => "X86_64Win64",
|
||||||
|
+ Self::AmdGpuKernel => "AmdGpuKernel",
|
||||||
|
+ Self::AvrInterrupt => "AvrInterrupt",
|
||||||
|
+ Self::AvrNonBlockingInterrupt => "AvrNonBlockingInterrupt",
|
||||||
|
+ };
|
||||||
|
+ Json::String(s.to_owned())
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
|
||||||
|
index 72b088d663b1..617de46a55aa 100644
|
||||||
|
--- a/compiler/rustc_target/src/spec/mod.rs
|
||||||
|
+++ b/compiler/rustc_target/src/spec/mod.rs
|
||||||
|
@@ -34,6 +34,7 @@
|
||||||
|
//! the target's settings, though `target-feature` and `link-args` will *add*
|
||||||
|
//! to the list specified by the target, rather than replace.
|
||||||
|
|
||||||
|
+use crate::abi::call::Conv;
|
||||||
|
use crate::abi::Endian;
|
||||||
|
use crate::json::{Json, ToJson};
|
||||||
|
use crate::spec::abi::{lookup as lookup_abi, Abi};
|
||||||
|
@@ -1668,6 +1669,14 @@ pub struct TargetOptions {
|
||||||
|
/// Whether the target supports stack canary checks. `true` by default,
|
||||||
|
/// since this is most common among tier 1 and tier 2 targets.
|
||||||
|
pub supports_stack_protector: bool,
|
||||||
|
+
|
||||||
|
+ // The name of entry function.
|
||||||
|
+ // Default value is "main"
|
||||||
|
+ pub entry_name: StaticCow<str>,
|
||||||
|
+
|
||||||
|
+ // The ABI of entry function.
|
||||||
|
+ // Default value is `Conv::C`, i.e. C call convention
|
||||||
|
+ pub entry_abi: Conv,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Add arguments for the given flavor and also for its "twin" flavors
|
||||||
|
@@ -1884,6 +1893,8 @@ fn default() -> TargetOptions {
|
||||||
|
c_enum_min_bits: 32,
|
||||||
|
generate_arange_section: true,
|
||||||
|
supports_stack_protector: true,
|
||||||
|
+ entry_name: "main".into(),
|
||||||
|
+ entry_abi: Conv::C,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -2401,6 +2412,18 @@ macro_rules! key {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} );
|
||||||
|
+ ($key_name:ident, Conv) => ( {
|
||||||
|
+ let name = (stringify!($key_name)).replace("_", "-");
|
||||||
|
+ obj.remove(&name).and_then(|o| o.as_str().and_then(|s| {
|
||||||
|
+ match Conv::from_str(s) {
|
||||||
|
+ Ok(c) => {
|
||||||
|
+ base.$key_name = c;
|
||||||
|
+ Some(Ok(()))
|
||||||
|
+ }
|
||||||
|
+ Err(e) => Some(Err(e))
|
||||||
|
+ }
|
||||||
|
+ })).unwrap_or(Ok(()))
|
||||||
|
+ } );
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some(j) = obj.remove("target-endian") {
|
||||||
|
@@ -2520,6 +2543,8 @@ macro_rules! key {
|
||||||
|
key!(c_enum_min_bits, u64);
|
||||||
|
key!(generate_arange_section, bool);
|
||||||
|
key!(supports_stack_protector, bool);
|
||||||
|
+ key!(entry_name);
|
||||||
|
+ key!(entry_abi, Conv)?;
|
||||||
|
|
||||||
|
if base.is_builtin {
|
||||||
|
// This can cause unfortunate ICEs later down the line.
|
||||||
|
@@ -2770,6 +2795,8 @@ macro_rules! target_option_val {
|
||||||
|
target_option_val!(c_enum_min_bits);
|
||||||
|
target_option_val!(generate_arange_section);
|
||||||
|
target_option_val!(supports_stack_protector);
|
||||||
|
+ target_option_val!(entry_name);
|
||||||
|
+ target_option_val!(entry_abi);
|
||||||
|
|
||||||
|
if let Some(abi) = self.default_adjusted_cabi {
|
||||||
|
d.insert("default-adjusted-cabi".into(), Abi::name(abi).to_json());
|
||||||
|
--
|
||||||
|
2.38.1
|
||||||
|
|
@ -1,53 +0,0 @@
|
|||||||
From 184d61d2c12aa2db01de9a14ccb2be0cfae5039b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Josh Stone <jistone@redhat.com>
|
|
||||||
Date: Fri, 9 Jun 2023 15:23:08 -0700
|
|
||||||
Subject: [PATCH] Let environment variables override some default CPUs
|
|
||||||
|
|
||||||
---
|
|
||||||
.../src/spec/targets/powerpc64le_unknown_linux_gnu.rs | 2 +-
|
|
||||||
.../rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs | 2 +-
|
|
||||||
.../rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs | 2 +-
|
|
||||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_gnu.rs
|
|
||||||
index 194c3170e683..9806ca78297c 100644
|
|
||||||
--- a/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_gnu.rs
|
|
||||||
+++ b/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_gnu.rs
|
|
||||||
@@ -2,7 +2,7 @@
|
|
||||||
|
|
||||||
pub fn target() -> Target {
|
|
||||||
let mut base = base::linux_gnu::opts();
|
|
||||||
- base.cpu = "ppc64le".into();
|
|
||||||
+ base.cpu = option_env!("RUSTC_TARGET_CPU_PPC64LE").unwrap_or("ppc64le").into();
|
|
||||||
base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m64"]);
|
|
||||||
base.max_atomic_width = Some(64);
|
|
||||||
base.stack_probes = StackProbeType::Inline;
|
|
||||||
diff --git a/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs
|
|
||||||
index 6fc410eb2235..c8f84edb9715 100644
|
|
||||||
--- a/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs
|
|
||||||
+++ b/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs
|
|
||||||
@@ -5,7 +5,7 @@ pub fn target() -> Target {
|
|
||||||
let mut base = base::linux_gnu::opts();
|
|
||||||
base.endian = Endian::Big;
|
|
||||||
// z10 is the oldest CPU supported by LLVM
|
|
||||||
- base.cpu = "z10".into();
|
|
||||||
+ base.cpu = option_env!("RUSTC_TARGET_CPU_S390X").unwrap_or("z10").into();
|
|
||||||
// FIXME: The ABI implementation in cabi_s390x.rs is for now hard-coded to assume the no-vector
|
|
||||||
// ABI. Pass the -vector feature string to LLVM to respect this assumption. On LLVM < 16, we
|
|
||||||
// also strip v128 from the data_layout below to match the older LLVM's expectation.
|
|
||||||
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 80e267c163fa..8436a00e66d5 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
|
|
||||||
@@ -2,7 +2,7 @@
|
|
||||||
|
|
||||||
pub fn target() -> Target {
|
|
||||||
let mut base = base::linux_gnu::opts();
|
|
||||||
- base.cpu = "x86-64".into();
|
|
||||||
+ base.cpu = option_env!("RUSTC_TARGET_CPU_X86_64").unwrap_or("x86-64").into();
|
|
||||||
base.plt_by_default = false;
|
|
||||||
base.max_atomic_width = Some(64);
|
|
||||||
base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m64"]);
|
|
||||||
--
|
|
||||||
2.41.0
|
|
||||||
|
|
34
SOURCES/0001-Mangle-main-as-__main_void-on-wasm32-wasi.patch
Normal file
34
SOURCES/0001-Mangle-main-as-__main_void-on-wasm32-wasi.patch
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
From 98ae83daae67e9e7663b8345eced1de8c667271f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Dan Gohman <dev@sunfishcode.online>
|
||||||
|
Date: Thu, 8 Dec 2022 10:35:46 -0800
|
||||||
|
Subject: [PATCH] Mangle "main" as "__main_void" on wasm32-wasi
|
||||||
|
|
||||||
|
On wasm, the age-old C trick of having a main function which can either have
|
||||||
|
no arguments or argc+argv doesn't work, because wasm requires caller and
|
||||||
|
callee signatures to match. WASI's current strategy is to have compilers
|
||||||
|
mangle main's name to indicate which signature they're using. Rust uses the
|
||||||
|
no-argument form, which should be mangled as `__main_void`.
|
||||||
|
|
||||||
|
This is needed on wasm32-wasi as of #105395.
|
||||||
|
---
|
||||||
|
compiler/rustc_target/src/spec/wasm32_wasi.rs | 4 ++++
|
||||||
|
1 file changed, 4 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/compiler/rustc_target/src/spec/wasm32_wasi.rs b/compiler/rustc_target/src/spec/wasm32_wasi.rs
|
||||||
|
index 6f0bbf0672d4..a0476d542e64 100644
|
||||||
|
--- a/compiler/rustc_target/src/spec/wasm32_wasi.rs
|
||||||
|
+++ b/compiler/rustc_target/src/spec/wasm32_wasi.rs
|
||||||
|
@@ -104,6 +104,10 @@ pub fn target() -> Target {
|
||||||
|
// `args::args()` makes the WASI API calls itself.
|
||||||
|
options.main_needs_argc_argv = false;
|
||||||
|
|
||||||
|
+ // And, WASI mangles the name of "main" to distinguish between different
|
||||||
|
+ // signatures.
|
||||||
|
+ options.entry_name = "__main_void".into();
|
||||||
|
+
|
||||||
|
Target {
|
||||||
|
llvm_target: "wasm32-wasi".into(),
|
||||||
|
pointer_width: 32,
|
||||||
|
--
|
||||||
|
2.38.1
|
||||||
|
|
26
SOURCES/0001-Use-lld-provided-by-system-for-wasm.patch
Normal file
26
SOURCES/0001-Use-lld-provided-by-system-for-wasm.patch
Normal file
@ -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
|
|
||||||
|
|
@ -1,33 +0,0 @@
|
|||||||
From 776146e9ebb6bbe17a37bfad955f3dac95317275 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Josh Stone <jistone@redhat.com>
|
|
||||||
Date: Thu, 16 Nov 2023 10:42:23 -0800
|
|
||||||
Subject: [PATCH] bootstrap: only show PGO warnings when verbose
|
|
||||||
|
|
||||||
Building rustc with `--rust-profile-use` is currently dumping a lot of
|
|
||||||
warnings of "no profile data available for function" from `rustc_smir`
|
|
||||||
and `stable_mir`. These simply aren't exercised by the current profile-
|
|
||||||
gathering steps, but that's to be expected for new or experimental
|
|
||||||
functionality. I think for most people, these warnings will be just
|
|
||||||
noise, so it makes sense to only have them in verbose builds.
|
|
||||||
---
|
|
||||||
src/bootstrap/src/core/build_steps/compile.rs | 4 +++-
|
|
||||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
|
|
||||||
index af69860df1c5..51e4195827fc 100644
|
|
||||||
--- a/src/bootstrap/src/core/build_steps/compile.rs
|
|
||||||
+++ b/src/bootstrap/src/core/build_steps/compile.rs
|
|
||||||
@@ -887,7 +887,9 @@ fn run(self, builder: &Builder<'_>) {
|
|
||||||
} else if let Some(path) = &builder.config.rust_profile_use {
|
|
||||||
if compiler.stage == 1 {
|
|
||||||
cargo.rustflag(&format!("-Cprofile-use={path}"));
|
|
||||||
- cargo.rustflag("-Cllvm-args=-pgo-warn-missing-function");
|
|
||||||
+ if builder.is_verbose() {
|
|
||||||
+ cargo.rustflag("-Cllvm-args=-pgo-warn-missing-function");
|
|
||||||
+ }
|
|
||||||
true
|
|
||||||
} else {
|
|
||||||
false
|
|
||||||
--
|
|
||||||
2.43.0
|
|
||||||
|
|
@ -0,0 +1,185 @@
|
|||||||
|
From 2bdbc5fbf7f84c62f8c7b1007f3b6fd6d3da06f6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Josh Stone <jistone@redhat.com>
|
||||||
|
Date: Fri, 14 Oct 2022 16:11:28 -0700
|
||||||
|
Subject: [PATCH] compiletest: set the dylib path when gathering target cfg
|
||||||
|
|
||||||
|
If the compiler is built with `rpath = false`, then it won't find its
|
||||||
|
own libraries unless the library search path is set. We already do that
|
||||||
|
while running the actual compiletests, but #100260 added another rustc
|
||||||
|
command for getting the target cfg.
|
||||||
|
|
||||||
|
Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
|
||||||
|
thread 'main' panicked at 'error: failed to get cfg info from "[...]/build/x86_64-unknown-linux-gnu/stage1/bin/rustc"
|
||||||
|
--- stdout
|
||||||
|
|
||||||
|
--- stderr
|
||||||
|
[...]/build/x86_64-unknown-linux-gnu/stage1/bin/rustc: error while loading shared libraries: librustc_driver-a2a76dc626cd02d2.so: cannot open shared object file: No such file or directory
|
||||||
|
', src/tools/compiletest/src/common.rs:476:13
|
||||||
|
|
||||||
|
Now the library path is set here as well, so it works without rpath.
|
||||||
|
|
||||||
|
(cherry picked from commit f8a0cc2ca8a644ddb63867526711ba17cb7508c8)
|
||||||
|
---
|
||||||
|
src/tools/compiletest/src/common.rs | 20 +++++++++++---------
|
||||||
|
src/tools/compiletest/src/runtest.rs | 27 +++------------------------
|
||||||
|
src/tools/compiletest/src/util.rs | 23 +++++++++++++++++++++++
|
||||||
|
3 files changed, 37 insertions(+), 33 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/tools/compiletest/src/common.rs b/src/tools/compiletest/src/common.rs
|
||||||
|
index 0260f6848386..9a432f11f82f 100644
|
||||||
|
--- a/src/tools/compiletest/src/common.rs
|
||||||
|
+++ b/src/tools/compiletest/src/common.rs
|
||||||
|
@@ -2,11 +2,12 @@
|
||||||
|
|
||||||
|
use std::ffi::OsString;
|
||||||
|
use std::fmt;
|
||||||
|
+use std::iter;
|
||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
use std::process::Command;
|
||||||
|
use std::str::FromStr;
|
||||||
|
|
||||||
|
-use crate::util::PathBufExt;
|
||||||
|
+use crate::util::{add_dylib_path, PathBufExt};
|
||||||
|
use lazycell::LazyCell;
|
||||||
|
use test::ColorConfig;
|
||||||
|
|
||||||
|
@@ -385,8 +386,7 @@ pub fn run_enabled(&self) -> bool {
|
||||||
|
}
|
||||||
|
|
||||||
|
fn target_cfg(&self) -> &TargetCfg {
|
||||||
|
- self.target_cfg
|
||||||
|
- .borrow_with(|| TargetCfg::new(&self.rustc_path, &self.target, &self.target_rustcflags))
|
||||||
|
+ self.target_cfg.borrow_with(|| TargetCfg::new(self))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn matches_arch(&self, arch: &str) -> bool {
|
||||||
|
@@ -457,21 +457,23 @@ pub enum Endian {
|
||||||
|
}
|
||||||
|
|
||||||
|
impl TargetCfg {
|
||||||
|
- fn new(rustc_path: &Path, target: &str, target_rustcflags: &Vec<String>) -> TargetCfg {
|
||||||
|
- let output = match Command::new(rustc_path)
|
||||||
|
+ fn new(config: &Config) -> TargetCfg {
|
||||||
|
+ let mut command = Command::new(&config.rustc_path);
|
||||||
|
+ add_dylib_path(&mut command, iter::once(&config.compile_lib_path));
|
||||||
|
+ let output = match command
|
||||||
|
.arg("--print=cfg")
|
||||||
|
.arg("--target")
|
||||||
|
- .arg(target)
|
||||||
|
- .args(target_rustcflags)
|
||||||
|
+ .arg(&config.target)
|
||||||
|
+ .args(&config.target_rustcflags)
|
||||||
|
.output()
|
||||||
|
{
|
||||||
|
Ok(output) => output,
|
||||||
|
- Err(e) => panic!("error: failed to get cfg info from {:?}: {e}", rustc_path),
|
||||||
|
+ Err(e) => panic!("error: failed to get cfg info from {:?}: {e}", config.rustc_path),
|
||||||
|
};
|
||||||
|
if !output.status.success() {
|
||||||
|
panic!(
|
||||||
|
"error: failed to get cfg info from {:?}\n--- stdout\n{}\n--- stderr\n{}",
|
||||||
|
- rustc_path,
|
||||||
|
+ config.rustc_path,
|
||||||
|
String::from_utf8(output.stdout).unwrap(),
|
||||||
|
String::from_utf8(output.stderr).unwrap(),
|
||||||
|
);
|
||||||
|
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
|
||||||
|
index 8af5f1da694b..f8903f754f09 100644
|
||||||
|
--- a/src/tools/compiletest/src/runtest.rs
|
||||||
|
+++ b/src/tools/compiletest/src/runtest.rs
|
||||||
|
@@ -13,7 +13,7 @@
|
||||||
|
use crate::header::TestProps;
|
||||||
|
use crate::json;
|
||||||
|
use crate::read2::read2_abbreviated;
|
||||||
|
-use crate::util::{logv, PathBufExt};
|
||||||
|
+use crate::util::{add_dylib_path, dylib_env_var, logv, PathBufExt};
|
||||||
|
use crate::ColorConfig;
|
||||||
|
use regex::{Captures, Regex};
|
||||||
|
use rustfix::{apply_suggestions, get_suggestions_from_json, Filter};
|
||||||
|
@@ -26,6 +26,7 @@
|
||||||
|
use std::hash::{Hash, Hasher};
|
||||||
|
use std::io::prelude::*;
|
||||||
|
use std::io::{self, BufReader};
|
||||||
|
+use std::iter;
|
||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
use std::process::{Child, Command, ExitStatus, Output, Stdio};
|
||||||
|
use std::str;
|
||||||
|
@@ -72,19 +73,6 @@ fn disable_error_reporting<F: FnOnce() -> R, R>(f: F) -> R {
|
||||||
|
f()
|
||||||
|
}
|
||||||
|
|
||||||
|
-/// The name of the environment variable that holds dynamic library locations.
|
||||||
|
-pub fn dylib_env_var() -> &'static str {
|
||||||
|
- if cfg!(windows) {
|
||||||
|
- "PATH"
|
||||||
|
- } else if cfg!(target_os = "macos") {
|
||||||
|
- "DYLD_LIBRARY_PATH"
|
||||||
|
- } else if cfg!(target_os = "haiku") {
|
||||||
|
- "LIBRARY_PATH"
|
||||||
|
- } else {
|
||||||
|
- "LD_LIBRARY_PATH"
|
||||||
|
- }
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
/// The platform-specific library name
|
||||||
|
pub fn get_lib_name(lib: &str, dylib: bool) -> String {
|
||||||
|
// In some casess (e.g. MUSL), we build a static
|
||||||
|
@@ -1811,16 +1799,7 @@ fn compose_and_run(
|
||||||
|
|
||||||
|
// Need to be sure to put both the lib_path and the aux path in the dylib
|
||||||
|
// search path for the child.
|
||||||
|
- let mut path =
|
||||||
|
- env::split_paths(&env::var_os(dylib_env_var()).unwrap_or_default()).collect::<Vec<_>>();
|
||||||
|
- if let Some(p) = aux_path {
|
||||||
|
- path.insert(0, PathBuf::from(p))
|
||||||
|
- }
|
||||||
|
- path.insert(0, PathBuf::from(lib_path));
|
||||||
|
-
|
||||||
|
- // Add the new dylib search path var
|
||||||
|
- let newpath = env::join_paths(&path).unwrap();
|
||||||
|
- command.env(dylib_env_var(), newpath);
|
||||||
|
+ add_dylib_path(&mut command, iter::once(lib_path).chain(aux_path));
|
||||||
|
|
||||||
|
let mut child = disable_error_reporting(|| command.spawn())
|
||||||
|
.unwrap_or_else(|_| panic!("failed to exec `{:?}`", &command));
|
||||||
|
diff --git a/src/tools/compiletest/src/util.rs b/src/tools/compiletest/src/util.rs
|
||||||
|
index e5ff0906be8a..ec36f1e4fb72 100644
|
||||||
|
--- a/src/tools/compiletest/src/util.rs
|
||||||
|
+++ b/src/tools/compiletest/src/util.rs
|
||||||
|
@@ -2,6 +2,7 @@
|
||||||
|
use std::env;
|
||||||
|
use std::ffi::OsStr;
|
||||||
|
use std::path::PathBuf;
|
||||||
|
+use std::process::Command;
|
||||||
|
|
||||||
|
use tracing::*;
|
||||||
|
|
||||||
|
@@ -111,3 +112,25 @@ fn with_extra_extension<S: AsRef<OsStr>>(&self, extension: S) -> PathBuf {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+/// The name of the environment variable that holds dynamic library locations.
|
||||||
|
+pub fn dylib_env_var() -> &'static str {
|
||||||
|
+ if cfg!(windows) {
|
||||||
|
+ "PATH"
|
||||||
|
+ } else if cfg!(target_os = "macos") {
|
||||||
|
+ "DYLD_LIBRARY_PATH"
|
||||||
|
+ } else if cfg!(target_os = "haiku") {
|
||||||
|
+ "LIBRARY_PATH"
|
||||||
|
+ } else {
|
||||||
|
+ "LD_LIBRARY_PATH"
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/// Adds a list of lookup paths to `cmd`'s dynamic library lookup path.
|
||||||
|
+/// If the dylib_path_var is already set for this cmd, the old value will be overwritten!
|
||||||
|
+pub fn add_dylib_path(cmd: &mut Command, paths: impl Iterator<Item = impl Into<PathBuf>>) {
|
||||||
|
+ let path_env = env::var_os(dylib_env_var());
|
||||||
|
+ let old_paths = path_env.as_ref().map(env::split_paths);
|
||||||
|
+ let new_paths = paths.map(Into::into).chain(old_paths.into_iter().flatten());
|
||||||
|
+ cmd.env(dylib_env_var(), env::join_paths(new_paths).unwrap());
|
||||||
|
+}
|
||||||
|
--
|
||||||
|
2.38.1
|
||||||
|
|
@ -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
|
|
||||||
|
|
@ -5,47 +5,17 @@
|
|||||||
# https://github.com/rust-lang/cargo/issues/6397
|
# https://github.com/rust-lang/cargo/issues/6397
|
||||||
# But we can set CARGO_HOME locally, which is a good idea anyway to make sure
|
# But we can set CARGO_HOME locally, which is a good idea anyway to make sure
|
||||||
# it never writes to ~/.cargo during rpmbuild.
|
# it never writes to ~/.cargo during rpmbuild.
|
||||||
%__cargo /usr/bin/env CARGO_HOME=.cargo RUSTFLAGS='%{build_rustflags}' /usr/bin/cargo
|
%__cargo %{_bindir}/env CARGO_HOME=.cargo %{_bindir}/cargo
|
||||||
%__rustc /usr/bin/rustc
|
%__rustc %{_bindir}/rustc
|
||||||
%__rustdoc /usr/bin/rustdoc
|
%__rustdoc %{_bindir}/rustdoc
|
||||||
|
|
||||||
# rustflags_opt_level: default optimization level
|
# Enable optimization, debuginfo, and link hardening.
|
||||||
#
|
%__global_rustflags -Copt-level=3 -Cdebuginfo=2 -Clink-arg=-Wl,-z,relro,-z,now
|
||||||
# It corresponds to the "-Copt-level" rustc command line option.
|
|
||||||
%rustflags_opt_level 3
|
|
||||||
|
|
||||||
# rustflags_debuginfo: default verbosity of debug information
|
%__global_rustflags_toml [%{lua:
|
||||||
#
|
for arg in string.gmatch(rpm.expand("%{__global_rustflags}"), "%S+") do
|
||||||
# It corresponds to the "-Cdebuginfo" rustc command line option.
|
print('"' .. arg .. '", ')
|
||||||
# In some cases, it might be required to override this macro with "1" or even
|
end}]
|
||||||
# "0", if memory usage gets too high during builds on some resource-constrained
|
|
||||||
# architectures (most likely on 32-bit architectures), which will however
|
|
||||||
# reduce the quality of the produced debug symbols.
|
|
||||||
%rustflags_debuginfo 2
|
|
||||||
|
|
||||||
# rustflags_codegen_units: default number of parallel code generation units
|
|
||||||
#
|
|
||||||
# The default value of "1" results in generation of better code, but comes at
|
|
||||||
# the cost of longer build times.
|
|
||||||
%rustflags_codegen_units 1
|
|
||||||
|
|
||||||
# build_rustflags: default compiler flags for rustc (RUSTFLAGS)
|
|
||||||
#
|
|
||||||
# -Copt-level: set optimization level (default: highest optimization level)
|
|
||||||
# -Cdebuginfo: set debuginfo verbosity (default: full debug information)
|
|
||||||
# -Ccodegen-units: set number of parallel code generation units (default: 1)
|
|
||||||
#
|
|
||||||
# ref. https://doc.rust-lang.org/rustc/codegen-options/index.html
|
|
||||||
%build_rustflags %{shrink:
|
|
||||||
-Copt-level=%rustflags_opt_level
|
|
||||||
-Cdebuginfo=%rustflags_debuginfo
|
|
||||||
-Ccodegen-units=%rustflags_codegen_units
|
|
||||||
}
|
|
||||||
|
|
||||||
# __cargo_common_opts: common command line flags for cargo
|
|
||||||
#
|
|
||||||
# _smp_mflags: run builds and tests in parallel
|
|
||||||
%__cargo_common_opts %{?_smp_mflags}
|
|
||||||
|
|
||||||
%cargo_prep(V:) (\
|
%cargo_prep(V:) (\
|
||||||
%{__mkdir} -p .cargo \
|
%{__mkdir} -p .cargo \
|
||||||
@ -53,11 +23,7 @@ cat > .cargo/config << EOF \
|
|||||||
[build]\
|
[build]\
|
||||||
rustc = "%{__rustc}"\
|
rustc = "%{__rustc}"\
|
||||||
rustdoc = "%{__rustdoc}"\
|
rustdoc = "%{__rustdoc}"\
|
||||||
\
|
rustflags = %{__global_rustflags_toml}\
|
||||||
[env]\
|
|
||||||
CFLAGS = "%{build_cflags}"\
|
|
||||||
CXXFLAGS = "%{build_cxxflags}"\
|
|
||||||
LDFLAGS = "%{build_ldflags}"\
|
|
||||||
\
|
\
|
||||||
[install]\
|
[install]\
|
||||||
root = "%{buildroot}%{_prefix}"\
|
root = "%{buildroot}%{_prefix}"\
|
||||||
@ -78,104 +44,8 @@ EOF\
|
|||||||
%endif\
|
%endif\
|
||||||
)
|
)
|
||||||
|
|
||||||
# __cargo_parse_opts: function-like macro which parses common flags into the
|
%cargo_build %__cargo build --release %{?_smp_mflags}
|
||||||
# equivalent command-line flags for cargo
|
|
||||||
%__cargo_parse_opts(naf:) %{shrink:\
|
|
||||||
%{-f:%{-a:%{error:Can't specify both -f(%{-f*}) and -a}}} \
|
|
||||||
%{-n:--no-default-features} \
|
|
||||||
%{-a:--all-features} \
|
|
||||||
%{-f:--features %{-f*}} \
|
|
||||||
%{nil}
|
|
||||||
}
|
|
||||||
|
|
||||||
# NB: cargo_build/test/install do not use the -n/-a/-f argument parsing like
|
%cargo_test %__cargo test --release %{?_smp_mflags} --no-fail-fast
|
||||||
# Fedora's rust-packaging, because that change would break anyone that's
|
|
||||||
# already passing arguments directly to cargo after the macro. Instead, one can
|
|
||||||
# explicitly use --no-default-features, --all-features, or --features XYZ.
|
|
||||||
|
|
||||||
# cargo_build: builds the crate with cargo
|
%cargo_install %__cargo install --no-track --path .
|
||||||
%cargo_build \
|
|
||||||
%{shrink:\
|
|
||||||
%{__cargo} build \
|
|
||||||
%{__cargo_common_opts} \
|
|
||||||
--release \
|
|
||||||
}
|
|
||||||
|
|
||||||
# cargo_test: runs the test suite with cargo
|
|
||||||
#
|
|
||||||
# To pass command-line arguments to the cargo test runners directly (for
|
|
||||||
# example, to skip certain tests during package builds), the
|
|
||||||
# "cargo test" argument parsing need to be bypassed,
|
|
||||||
# i.e. "%%cargo_test -- --skip foo" for skipping all tests with names that
|
|
||||||
# match "foo".
|
|
||||||
%cargo_test \
|
|
||||||
%{shrink:\
|
|
||||||
%{__cargo} test \
|
|
||||||
%{__cargo_common_opts} \
|
|
||||||
--release \
|
|
||||||
--no-fail-fast \
|
|
||||||
}
|
|
||||||
|
|
||||||
# cargo_install: install files into the buildroot
|
|
||||||
#
|
|
||||||
# For "binary" crates, this macro installs all "bin" build targets to _bindir
|
|
||||||
# inside the buildroot. The "--no-track" option prevents the creation of the
|
|
||||||
# "$CARGO_HOME/.crates.toml" file, which is used to keep track of which version
|
|
||||||
# of a specific binary has been installed, but which conflicts between builds
|
|
||||||
# of different Rust applications and is not needed when building RPM packages.
|
|
||||||
%cargo_install \
|
|
||||||
%{shrink: \
|
|
||||||
%{__cargo} install \
|
|
||||||
%{__cargo_common_opts} \
|
|
||||||
--no-track \
|
|
||||||
--path . \
|
|
||||||
} \
|
|
||||||
|
|
||||||
# cargo_license: print license information for all crate dependencies
|
|
||||||
#
|
|
||||||
# The "no-build,no-dev,no-proc-macro" argument results in only crates which are
|
|
||||||
# linked into the final binary to be considered.
|
|
||||||
#
|
|
||||||
# Additionally, deprecated SPDX syntax ("/" instead of "OR") is normalized
|
|
||||||
# before sorting the results to ensure reproducible output of this macro.
|
|
||||||
#
|
|
||||||
# This macro must be called with the same feature flags as other cargo macros,
|
|
||||||
# in particular, "cargo_build", otherwise its output will be incomplete.
|
|
||||||
#
|
|
||||||
# The "cargo tree" command called by this macro will fail if there are missing
|
|
||||||
# (optional) dependencies.
|
|
||||||
%cargo_license(naf:)\
|
|
||||||
%{shrink:\
|
|
||||||
%{__cargo} tree \
|
|
||||||
--workspace \
|
|
||||||
--offline \
|
|
||||||
--edges no-build,no-dev,no-proc-macro \
|
|
||||||
--no-dedupe \
|
|
||||||
--target all \
|
|
||||||
%{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}} \
|
|
||||||
--prefix none \
|
|
||||||
--format "{l}: {p}" \
|
|
||||||
| sed -e "s: ($(pwd)[^)]*)::g" -e "s: / :/:g" -e "s:/: OR :g" \
|
|
||||||
| sort -u
|
|
||||||
}
|
|
||||||
|
|
||||||
# cargo_license_summary: print license summary for all crate dependencies
|
|
||||||
#
|
|
||||||
# This macro works in the same way as cargo_license, except that it only prints
|
|
||||||
# a list of licenses, and not the complete license information for every crate
|
|
||||||
# in the dependency tree. This is useful for determining the correct License
|
|
||||||
# tag for packages that contain compiled Rust binaries.
|
|
||||||
%cargo_license_summary(naf:)\
|
|
||||||
%{shrink:\
|
|
||||||
%{__cargo} tree \
|
|
||||||
--workspace \
|
|
||||||
--offline \
|
|
||||||
--edges no-build,no-dev,no-proc-macro \
|
|
||||||
--no-dedupe \
|
|
||||||
--target all \
|
|
||||||
%{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}} \
|
|
||||||
--prefix none \
|
|
||||||
--format "# {l}" \
|
|
||||||
| sed -e "s: / :/:g" -e "s:/: OR :g" \
|
|
||||||
| sort -u \
|
|
||||||
}
|
|
||||||
|
18
SOURCES/rustc-1.61.0-rust-gdb-substitute-path.patch
Normal file
18
SOURCES/rustc-1.61.0-rust-gdb-substitute-path.patch
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
--- rustc-1.61.0-src/src/etc/rust-gdb.orig 2022-05-17 18:29:36.000000000 -0700
|
||||||
|
+++ rustc-1.61.0-src/src/etc/rust-gdb 2022-05-18 11:18:13.732709661 -0700
|
||||||
|
@@ -14,6 +14,9 @@ fi
|
||||||
|
RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)"
|
||||||
|
GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
|
||||||
|
|
||||||
|
+RUST_STD_BUILD="@BUILDDIR@/library/"
|
||||||
|
+RUST_STD_SRC="$RUSTC_SYSROOT/lib/rustlib/src/rust/library/"
|
||||||
|
+
|
||||||
|
# Run GDB with the additional arguments that load the pretty printers
|
||||||
|
# Set the environment variable `RUST_GDB` to overwrite the call to a
|
||||||
|
# different/specific command (defaults to `gdb`).
|
||||||
|
@@ -21,4 +24,5 @@ RUST_GDB="${RUST_GDB:-gdb}"
|
||||||
|
PYTHONPATH="$PYTHONPATH:$GDB_PYTHON_MODULE_DIRECTORY" exec ${RUST_GDB} \
|
||||||
|
--directory="$GDB_PYTHON_MODULE_DIRECTORY" \
|
||||||
|
-iex "add-auto-load-safe-path $GDB_PYTHON_MODULE_DIRECTORY" \
|
||||||
|
+ -iex "set substitute-path $RUST_STD_BUILD $RUST_STD_SRC" \
|
||||||
|
"$@"
|
90
SOURCES/rustc-1.65.0-disable-http2.patch
Normal file
90
SOURCES/rustc-1.65.0-disable-http2.patch
Normal file
@ -0,0 +1,90 @@
|
|||||||
|
--- rustc-beta-src/Cargo.lock.orig 2022-10-04 10:55:48.797517289 -0700
|
||||||
|
+++ rustc-beta-src/Cargo.lock 2022-10-04 10:55:48.799517248 -0700
|
||||||
|
@@ -1026,7 +1026,6 @@
|
||||||
|
dependencies = [
|
||||||
|
"cc",
|
||||||
|
"libc",
|
||||||
|
- "libnghttp2-sys",
|
||||||
|
"libz-sys",
|
||||||
|
"openssl-sys",
|
||||||
|
"pkg-config",
|
||||||
|
@@ -1993,16 +1992,6 @@
|
||||||
|
checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
-name = "libnghttp2-sys"
|
||||||
|
-version = "0.1.4+1.41.0"
|
||||||
|
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "03624ec6df166e79e139a2310ca213283d6b3c30810c54844f307086d4488df1"
|
||||||
|
-dependencies = [
|
||||||
|
- "cc",
|
||||||
|
- "libc",
|
||||||
|
-]
|
||||||
|
-
|
||||||
|
-[[package]]
|
||||||
|
name = "libz-sys"
|
||||||
|
version = "1.1.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2022-10-04 10:55:48.799517248 -0700
|
||||||
|
+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2022-10-04 11:00:55.057162743 -0700
|
||||||
|
@@ -21,7 +21,7 @@
|
||||||
|
cargo-platform = { path = "crates/cargo-platform", version = "0.1.2" }
|
||||||
|
cargo-util = { path = "crates/cargo-util", version = "0.2.1" }
|
||||||
|
crates-io = { path = "crates/crates-io", version = "0.34.0" }
|
||||||
|
-curl = { version = "0.4.43", features = ["http2"] }
|
||||||
|
+curl = { version = "0.4.43", features = [] }
|
||||||
|
curl-sys = "0.4.55"
|
||||||
|
env_logger = "0.9.0"
|
||||||
|
pretty_env_logger = { version = "0.4", optional = true }
|
||||||
|
--- rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs.orig 2022-09-24 10:23:17.000000000 -0700
|
||||||
|
+++ rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs 2022-10-04 10:55:48.799517248 -0700
|
||||||
|
@@ -192,16 +192,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;
|
||||||
|
|
||||||
|
self.config
|
||||||
|
.shell()
|
||||||
|
--- rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs.orig 2022-09-24 10:23:17.000000000 -0700
|
||||||
|
+++ rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs 2022-10-04 10:55:48.800517227 -0700
|
||||||
|
@@ -403,16 +403,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
|
||||||
|
@@ -658,7 +651,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);
|
||||||
|
}
|
43
SOURCES/rustc-1.65.0-disable-libssh2.patch
Normal file
43
SOURCES/rustc-1.65.0-disable-libssh2.patch
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
--- rustc-beta-src/Cargo.lock.orig 2022-09-24 10:20:14.000000000 -0700
|
||||||
|
+++ rustc-beta-src/Cargo.lock 2022-10-04 10:26:35.490270607 -0700
|
||||||
|
@@ -1971,7 +1971,6 @@
|
||||||
|
dependencies = [
|
||||||
|
"cc",
|
||||||
|
"libc",
|
||||||
|
- "libssh2-sys",
|
||||||
|
"libz-sys",
|
||||||
|
"openssl-sys",
|
||||||
|
"pkg-config",
|
||||||
|
@@ -2004,20 +2003,6 @@
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
-name = "libssh2-sys"
|
||||||
|
-version = "0.2.23"
|
||||||
|
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "b094a36eb4b8b8c8a7b4b8ae43b2944502be3e59cd87687595cf6b0a71b3f4ca"
|
||||||
|
-dependencies = [
|
||||||
|
- "cc",
|
||||||
|
- "libc",
|
||||||
|
- "libz-sys",
|
||||||
|
- "openssl-sys",
|
||||||
|
- "pkg-config",
|
||||||
|
- "vcpkg",
|
||||||
|
-]
|
||||||
|
-
|
||||||
|
-[[package]]
|
||||||
|
name = "libz-sys"
|
||||||
|
version = "1.1.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
--- rustc-beta-src/vendor/git2/Cargo.toml.orig 2022-10-04 10:26:35.490270607 -0700
|
||||||
|
+++ rustc-beta-src/vendor/git2/Cargo.toml 2022-10-04 10:28:14.002187686 -0700
|
||||||
|
@@ -58,9 +58,7 @@
|
||||||
|
|
||||||
|
[features]
|
||||||
|
default = [
|
||||||
|
- "ssh",
|
||||||
|
"https",
|
||||||
|
- "ssh_key_from_memory",
|
||||||
|
]
|
||||||
|
https = [
|
||||||
|
"libgit2-sys/https",
|
43
SOURCES/rustc-1.65.0-no-default-pie.patch
Normal file
43
SOURCES/rustc-1.65.0-no-default-pie.patch
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
--- rustc-beta-src/compiler/rustc_codegen_ssa/src/back/link.rs.orig 2022-09-24 10:20:14.000000000 -0700
|
||||||
|
+++ rustc-beta-src/compiler/rustc_codegen_ssa/src/back/link.rs 2022-10-05 11:24:21.759564185 -0700
|
||||||
|
@@ -755,7 +755,7 @@
|
||||||
|
&& cmd.get_args().iter().any(|e| e.to_string_lossy() == "-no-pie")
|
||||||
|
{
|
||||||
|
info!("linker output: {:?}", out);
|
||||||
|
- warn!("Linker does not support -no-pie command line option. Retrying without.");
|
||||||
|
+ info!("Linker does not support -no-pie command line option. Retrying without.");
|
||||||
|
for arg in cmd.take_args() {
|
||||||
|
if arg.to_string_lossy() != "-no-pie" {
|
||||||
|
cmd.arg(arg);
|
||||||
|
@@ -774,7 +774,7 @@
|
||||||
|
&& cmd.get_args().iter().any(|e| e.to_string_lossy() == "-static-pie")
|
||||||
|
{
|
||||||
|
info!("linker output: {:?}", out);
|
||||||
|
- warn!(
|
||||||
|
+ info!(
|
||||||
|
"Linker does not support -static-pie command line option. Retrying with -static instead."
|
||||||
|
);
|
||||||
|
// Mirror `add_(pre,post)_link_objects` to replace CRT objects.
|
||||||
|
@@ -1520,15 +1520,15 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
fn link_output_kind(sess: &Session, crate_type: CrateType) -> LinkOutputKind {
|
||||||
|
- let kind = match (crate_type, sess.crt_static(Some(crate_type)), sess.relocation_model()) {
|
||||||
|
+ // Only use PIE if explicitly specified.
|
||||||
|
+ #[allow(rustc::bad_opt_access)]
|
||||||
|
+ let explicit_pic =
|
||||||
|
+ matches!(sess.opts.cg.relocation_model, Some(RelocModel::Pic | RelocModel::Pie));
|
||||||
|
+ let kind = match (crate_type, sess.crt_static(Some(crate_type)), explicit_pic) {
|
||||||
|
(CrateType::Executable, _, _) if sess.is_wasi_reactor() => LinkOutputKind::WasiReactorExe,
|
||||||
|
- (CrateType::Executable, false, RelocModel::Pic | RelocModel::Pie) => {
|
||||||
|
- LinkOutputKind::DynamicPicExe
|
||||||
|
- }
|
||||||
|
+ (CrateType::Executable, false, true) => LinkOutputKind::DynamicPicExe,
|
||||||
|
(CrateType::Executable, false, _) => LinkOutputKind::DynamicNoPicExe,
|
||||||
|
- (CrateType::Executable, true, RelocModel::Pic | RelocModel::Pie) => {
|
||||||
|
- LinkOutputKind::StaticPicExe
|
||||||
|
- }
|
||||||
|
+ (CrateType::Executable, true, true) => LinkOutputKind::StaticPicExe,
|
||||||
|
(CrateType::Executable, true, _) => LinkOutputKind::StaticNoPicExe,
|
||||||
|
(_, true, _) => LinkOutputKind::StaticDylib,
|
||||||
|
(_, false, _) => LinkOutputKind::DynamicDylib,
|
@ -1,21 +0,0 @@
|
|||||||
diff --git a/src/etc/rust-gdb b/src/etc/rust-gdb
|
|
||||||
index 9abed30ea6f7..e4bf55df3688 100755
|
|
||||||
--- a/src/etc/rust-gdb
|
|
||||||
+++ b/src/etc/rust-gdb
|
|
||||||
@@ -13,8 +13,6 @@ fi
|
|
||||||
# Find out where the pretty printer Python module is
|
|
||||||
RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)"
|
|
||||||
GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
|
|
||||||
-# Get the commit hash for path remapping
|
|
||||||
-RUSTC_COMMIT_HASH="$("$RUSTC" -vV | sed -n 's/commit-hash: \([a-zA-Z0-9_]*\)/\1/p')"
|
|
||||||
|
|
||||||
# Run GDB with the additional arguments that load the pretty printers
|
|
||||||
# Set the environment variable `RUST_GDB` to overwrite the call to a
|
|
||||||
@@ -23,6 +21,6 @@ RUST_GDB="${RUST_GDB:-gdb}"
|
|
||||||
PYTHONPATH="$PYTHONPATH:$GDB_PYTHON_MODULE_DIRECTORY" exec ${RUST_GDB} \
|
|
||||||
--directory="$GDB_PYTHON_MODULE_DIRECTORY" \
|
|
||||||
-iex "add-auto-load-safe-path $GDB_PYTHON_MODULE_DIRECTORY" \
|
|
||||||
- -iex "set substitute-path /rustc/$RUSTC_COMMIT_HASH $RUSTC_SYSROOT/lib/rustlib/src/rust" \
|
|
||||||
+ -iex "set substitute-path @BUILDDIR@ $RUSTC_SYSROOT/lib/rustlib/src/rust" \
|
|
||||||
"$@"
|
|
||||||
|
|
@ -1,42 +0,0 @@
|
|||||||
--- ./rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2023-11-12 12:24:35.000000000 -0800
|
|
||||||
+++ rustc-beta-src/src/tools/cargo/Cargo.lock 2023-11-14 17:01:32.010125953 -0800
|
|
||||||
@@ -2027,7 +2027,6 @@
|
|
||||||
dependencies = [
|
|
||||||
"cc",
|
|
||||||
"libc",
|
|
||||||
- "libssh2-sys",
|
|
||||||
"libz-sys",
|
|
||||||
"openssl-sys",
|
|
||||||
"pkg-config",
|
|
||||||
@@ -2060,20 +2059,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.9"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
--- ./rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2023-11-14 17:01:32.010125953 -0800
|
|
||||||
+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2023-11-14 17:02:44.645097701 -0800
|
|
||||||
@@ -40,7 +40,7 @@
|
|
||||||
curl-sys = "0.4.68"
|
|
||||||
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.55.2", 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" ] }
|
|
699
SPECS/rust.spec
699
SPECS/rust.spec
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user