Skip to content

Commit 2d0ea79

Browse files
committedNov 20, 2024
Auto merge of #133261 - matthiaskrgr:rollup-ekui4we, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #129838 (uefi: process: Add args support) - #130800 (Mark `get_mut` and `set_position` in `std::io::Cursor` as const.) - #132708 (Point at `const` definition when used instead of a binding in a `let` statement) - #133226 (Make `PointerLike` opt-in instead of built-in) - #133244 (Account for `wasm32v1-none` when exporting TLS symbols) - #133257 (Add `UnordMap::clear` method) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 3fee0f1 + 71d07dd commit 2d0ea79

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+627
-266
lines changed
 

‎compiler/rustc_codegen_ssa/src/back/linker.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1279,7 +1279,7 @@ impl<'a> WasmLd<'a> {
12791279
let mut wasm_ld = WasmLd { cmd, sess };
12801280
if sess.target_features.contains(&sym::atomics) {
12811281
wasm_ld.link_args(&["--shared-memory", "--max-memory=1073741824", "--import-memory"]);
1282-
if sess.target.os == "unknown" {
1282+
if sess.target.os == "unknown" || sess.target.os == "none" {
12831283
wasm_ld.link_args(&[
12841284
"--export=__wasm_init_tls",
12851285
"--export=__tls_size",
@@ -1403,7 +1403,7 @@ impl<'a> Linker for WasmLd<'a> {
14031403
// symbols explicitly passed via the `--export` flags above and hides all
14041404
// others. Various bits and pieces of wasm32-unknown-unknown tooling use
14051405
// this, so be sure these symbols make their way out of the linker as well.
1406-
if self.sess.target.os == "unknown" {
1406+
if self.sess.target.os == "unknown" || self.sess.target.os == "none" {
14071407
self.link_args(&["--export=__heap_base", "--export=__data_end"]);
14081408
}
14091409
}

‎compiler/rustc_data_structures/src/unord.rs

+5
Original file line numberDiff line numberDiff line change
@@ -602,6 +602,11 @@ impl<K: Eq + Hash, V> UnordMap<K, V> {
602602
.into_iter()
603603
.map(|(_, v)| v)
604604
}
605+
606+
#[inline]
607+
pub fn clear(&mut self) {
608+
self.inner.clear()
609+
}
605610
}
606611

607612
impl<K, Q: ?Sized, V> Index<&Q> for UnordMap<K, V>

0 commit comments

Comments
 (0)
Please sign in to comment.