-
Notifications
You must be signed in to change notification settings - Fork 13.7k
Weakly export platform_version
symbols
#146343
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
The symbols __isPlatformVersionAtLeast and __isOSVersionAtLeast. This allows the user to link both compiler_rt and std.
Whoops, I should have caught this during review. Thanks for the fix! @bors r+ |
@madsmtm if you get the chance, could you run |
No problem! I actually included it in the initial version of the PR, but I think I got confused about what
$ objdump -t build/host/stage1-std/aarch64-apple-darwin/release/deps/libstd-*.dylib | rg "__isPlatformVersionAtLeast|__isOSVersionAtLeast"
000000000003179c d *UND* ___isOSVersionAtLeast
0000000000031824 d *UND* ___isPlatformVersionAtLeast
000000000003179c w F __TEXT,__text ___isOSVersionAtLeast
0000000000031824 w F __TEXT,__text ___isPlatformVersionAtLeast (I think the |
…ross35 Weakly export `platform_version` symbols The symbols `__isPlatformVersionAtLeast` and `__isOSVersionAtLeast`. This should allow linking both `compiler-rt` and `std`, which fixes rust-lang#138944 (comment). r? tgross35 CC `@zmodem,` could you please verify that this works for you?
Rollup of 11 pull requests Successful merges: - #145177 (std: move `thread` into `sys`) - #146018 (compiler: Add Windows resources to rustc-main and rustc_driver) - #146025 (compiler: Include span of too huge array with `-Cdebuginfo=2`) - #146184 (In the rustc_llvm build script, don't consider arm64* to be 32-bit) - #146195 (fix partial urlencoded link support) - #146300 (Implement `Sum` and `Product` for `f16` and `f128`.) - #146314 (mark `format_args_nl!` as `#[doc(hidden)]`) - #146324 (const-eval: disable pointer fragment support) - #146326 (simplify the declaration of the legacy integer modules (`std::u32` etc.)) - #146339 (Update books) - #146343 (Weakly export `platform_version` symbols) r? `@ghost` `@rustbot` modify labels: rollup
…ross35 Weakly export `platform_version` symbols The symbols `__isPlatformVersionAtLeast` and `__isOSVersionAtLeast`. This should allow linking both `compiler-rt` and `std`, which fixes rust-lang#138944 (comment). r? tgross35 CC ```@zmodem,``` could you please verify that this works for you?
Rollup of 11 pull requests Successful merges: - #139593 (add sitemap to rust docs) - #145819 (Port limit attributes to the new attribute parsing infrastructure) - #146025 (compiler: Include span of too huge array with `-Cdebuginfo=2`) - #146184 (In the rustc_llvm build script, don't consider arm64* to be 32-bit) - #146195 (fix partial urlencoded link support) - #146300 (Implement `Sum` and `Product` for `f16` and `f128`.) - #146314 (mark `format_args_nl!` as `#[doc(hidden)]`) - #146324 (const-eval: disable pointer fragment support) - #146326 (simplify the declaration of the legacy integer modules (`std::u32` etc.)) - #146339 (Update books) - #146343 (Weakly export `platform_version` symbols) r? `@ghost` `@rustbot` modify labels: rollup
It seems like it should. It's easiest to wait for this to land, then our CI will pick it up automatically. |
Rollup of 11 pull requests Successful merges: - #139593 (add sitemap to rust docs) - #145819 (Port limit attributes to the new attribute parsing infrastructure) - #146025 (compiler: Include span of too huge array with `-Cdebuginfo=2`) - #146184 (In the rustc_llvm build script, don't consider arm64* to be 32-bit) - #146195 (fix partial urlencoded link support) - #146300 (Implement `Sum` and `Product` for `f16` and `f128`.) - #146314 (mark `format_args_nl!` as `#[doc(hidden)]`) - #146324 (const-eval: disable pointer fragment support) - #146326 (simplify the declaration of the legacy integer modules (`std::u32` etc.)) - #146339 (Update books) - #146343 (Weakly export `platform_version` symbols) r? `@ghost` `@rustbot` modify labels: rollup
Rollup merge of #146343 - madsmtm:fix-platform_version, r=tgross35 Weakly export `platform_version` symbols The symbols `__isPlatformVersionAtLeast` and `__isOSVersionAtLeast`. This should allow linking both `compiler-rt` and `std`, which fixes #138944 (comment). r? tgross35 CC ``@zmodem,`` could you please verify that this works for you?
Confirmed, the CI turned green. |
The symbols
__isPlatformVersionAtLeast
and__isOSVersionAtLeast
. This should allow linking bothcompiler-rt
andstd
, which fixes #138944 (comment).r? tgross35
CC @zmodem, could you please verify that this works for you?