diff options
| author | bors <bors@rust-lang.org> | 2024-12-06 10:48:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-12-06 10:48:10 +0000 |
| commit | bc145cec4565a97a1b08df52d26ddf48ce3d7d0a (patch) | |
| tree | 30f783c50c112664ad05afd584d81073773a8502 /compiler/rustc_codegen_gcc/src | |
| parent | acf48426b64d24f372d534f634072de1f4c7e588 (diff) | |
| parent | 875df6c59c6870d37ffa175172a6dafca94e1198 (diff) | |
| download | rust-bc145cec4565a97a1b08df52d26ddf48ce3d7d0a.tar.gz rust-bc145cec4565a97a1b08df52d26ddf48ce3d7d0a.zip | |
Auto merge of #133950 - matthiaskrgr:rollup-b7g5p73, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #130777 (rust_for_linux: -Zreg-struct-return commandline flag for X86 (#116973)) - #133211 (Extend Miri to correctly pass mutable pointers through FFI) - #133790 (Improve documentation for Vec::extend_from_within) - #133930 (rustbook: update to use new mdbook-trpl package from The Book) - #133931 (Only allow PassMode::Direct for aggregates on wasm when using the C ABI) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_gcc/src')
| -rw-r--r-- | compiler/rustc_codegen_gcc/src/context.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_gcc/src/context.rs b/compiler/rustc_codegen_gcc/src/context.rs index 3846d025537..f67dcf0cb11 100644 --- a/compiler/rustc_codegen_gcc/src/context.rs +++ b/compiler/rustc_codegen_gcc/src/context.rs @@ -544,7 +544,10 @@ impl<'gcc, 'tcx> HasWasmCAbiOpt for CodegenCx<'gcc, 'tcx> { impl<'gcc, 'tcx> HasX86AbiOpt for CodegenCx<'gcc, 'tcx> { fn x86_abi_opt(&self) -> X86Abi { - X86Abi { regparm: self.tcx.sess.opts.unstable_opts.regparm } + X86Abi { + regparm: self.tcx.sess.opts.unstable_opts.regparm, + reg_struct_return: self.tcx.sess.opts.unstable_opts.reg_struct_return, + } } } |