mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't override -masm option if set in the command arguments

Browse Source
This commit is contained in:
Guillaume Gomez 2022-10-18 22:45:22 +02:00
parent 1b60286103
commit 5484c131a5
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/base.rs
View File

@ -87,8 +87,6 @@ pub fn compile_codegen_unit<'tcx>(tcx: TyCtxt<'tcx>, cgu_name: Symbol, supports_
// Instantiate monomorphizations without filling out definitions yet... // Instantiate monomorphizations without filling out definitions yet...
//let llvm_module = ModuleLlvm::new(tcx, &cgu_name.as_str()); //let llvm_module = ModuleLlvm::new(tcx, &cgu_name.as_str());
let context = Context::default(); let context = Context::default();
// TODO(antoyo): only set on x86 platforms.
context.add_command_line_option("-masm=intel");
// TODO(antoyo): only add the following cli argument if the feature is supported. // TODO(antoyo): only add the following cli argument if the feature is supported.
context.add_command_line_option("-msse2"); context.add_command_line_option("-msse2");
context.add_command_line_option("-mavx2"); context.add_command_line_option("-mavx2");
@ -111,15 +109,21 @@ pub fn compile_codegen_unit<'tcx>(tcx: TyCtxt<'tcx>, cgu_name: Symbol, supports_
context.add_command_line_option("-mvpclmulqdq"); context.add_command_line_option("-mvpclmulqdq");
context.add_command_line_option("-mavx"); context.add_command_line_option("-mavx");
let mut has_set_asm_syntax = false;
for arg in &tcx.sess.opts.cg.llvm_args { for arg in &tcx.sess.opts.cg.llvm_args {
if arg.starts_with("--x86-asm-syntax=") { if arg.starts_with("--x86-asm-syntax=") {
// LLVM uses the two same arguments as GCC: `att` and `intel`. // LLVM uses the two same arguments as GCC: `att` and `intel`.
let syntax = arg.splitn(2, '=').skip(1).next().expect("missing argument"); let syntax = arg.splitn(2, '=').skip(1).next().expect("missing argument");
context.add_command_line_option(&format!("-masm={}", syntax)); context.add_command_line_option(&format!("-masm={}", syntax));
has_set_asm_syntax = true;
} else { } else {
context.add_command_line_option(arg); context.add_command_line_option(arg);
} }
} }
if !has_set_asm_syntax {
// TODO(antoyo): only set on x86 platforms.
context.add_command_line_option("-masm=intel");
}
// NOTE: This is needed to compile the file src/intrinsic/archs.rs during a bootstrap of rustc. // NOTE: This is needed to compile the file src/intrinsic/archs.rs during a bootstrap of rustc.
context.add_command_line_option("-fno-var-tracking-assignments"); context.add_command_line_option("-fno-var-tracking-assignments");
// NOTE: an optimization (https://github.com/rust-lang/rustc_codegen_gcc/issues/53). // NOTE: an optimization (https://github.com/rust-lang/rustc_codegen_gcc/issues/53).