Skip to content

Commit 714c820

Browse files
authored
Rollup merge of #130777 - azhogin:azhogin/reg-struct-return, r=workingjubilee
rust_for_linux: -Zreg-struct-return commandline flag for X86 (#116973) Command line flag `-Zreg-struct-return` for X86 (32-bit) for rust-for-linux. This flag enables the same behavior as the `abi_return_struct_as_int` target spec key. - Tracking issue: rust-lang/rust#116973
2 parents a3a4245 + 3ee22a4 commit 714c820

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/context.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,10 @@ impl<'gcc, 'tcx> HasWasmCAbiOpt for CodegenCx<'gcc, 'tcx> {
544544

545545
impl<'gcc, 'tcx> HasX86AbiOpt for CodegenCx<'gcc, 'tcx> {
546546
fn x86_abi_opt(&self) -> X86Abi {
547-
X86Abi { regparm: self.tcx.sess.opts.unstable_opts.regparm }
547+
X86Abi {
548+
regparm: self.tcx.sess.opts.unstable_opts.regparm,
549+
reg_struct_return: self.tcx.sess.opts.unstable_opts.reg_struct_return,
550+
}
548551
}
549552
}
550553

0 commit comments

Comments
 (0)