user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rollup merge of #146343 - madsmtm:fix-platform_version, r=tgross35

Browse source 
Weakly export `platform_version` symbols

The symbols `__isPlatformVersionAtLeast` and `__isOSVersionAtLeast`. This should allow linking both `compiler-rt` and `std`, which fixes https://github.com/rust-lang/rust/pull/138944#issuecomment-3266574582.

r? tgross35
CC ``@zmodem,`` could you please verify that this works for you?
This commit is contained in:
Stuart Cook 2025-09-09 14:35:07 +10:00 • committed by GitHub
commit 8b9ea589fb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
library/std/src/sys/platform_version/darwin/public_extern.rs
View file

@ -77,6 +77,10 @@ use super::{current_version, pack_i32_os_version};
// NOTE: This symbol has a workaround in the compiler's symbol mangling to avoid mangling it, while
// still not exposing it from non-cdylib (like `#[no_mangle]` would).
#[rustc_std_internal_symbol]
// NOTE: Making this a weak symbol might not be entirely the right solution for this, `compiler_rt`
// doesn't do that, it instead makes the symbol have "hidden" visibility. But since this is placed
// in `libstd`, which might be used as a dylib, we cannot do the same here.
#[linkage = "weak"]
// extern "C" is correct, Clang assumes the function cannot unwind:
// https://github.com/llvm/llvm-project/blob/llvmorg-20.1.0/clang/lib/CodeGen/CGObjC.cpp#L3980
//
@ -145,6 +149,7 @@ pub(super) extern "C" fn __isPlatformVersionAtLeast(
/// Old entry point for availability. Used when compiling with older Clang versions.
// SAFETY: Same as for `__isPlatformVersionAtLeast`.
#[rustc_std_internal_symbol]
#[linkage = "weak"]
pub(super) extern "C" fn __isOSVersionAtLeast(major: i32, minor: i32, subminor: i32) -> i32 {
let version = pack_i32_os_version(major, minor, subminor);
(version <= current_version()) as i32

6
library/std/src/sys/platform_version/darwin/tests.rs
View file

@ -28,6 +28,9 @@ fn compare_against_sw_vers() {
let subminor: i32 = sw_vers.next().unwrap_or("0").parse().unwrap();
assert_eq!(sw_vers.count(), 0);
// Test directly against the lookup
assert_eq!(lookup_version().get(), pack_os_version(major as _, minor as _, subminor as _));
// Current version is available
assert_eq!(__isOSVersionAtLeast(major, minor, subminor), 1);
@ -40,9 +43,6 @@ fn compare_against_sw_vers() {
assert_eq!(__isOSVersionAtLeast(major, minor, subminor + 1), 0);
assert_eq!(__isOSVersionAtLeast(major, minor + 1, subminor), 0);
assert_eq!(__isOSVersionAtLeast(major + 1, minor, subminor), 0);
// Test directly against the lookup
assert_eq!(lookup_version().get(), pack_os_version(major as _, minor as _, subminor as _));
}
#[test]