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

Revert "Fix LTO tests"

Browse source 
This reverts commit 2d123d08c9.
This commit is contained in:
Antoni Boucher 2024-07-05 11:35:16 -04:00
parent 2d123d08c9
commit bc8520d98e
8 changed files with 33 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/back/write.rs
View file

@ -32,12 +32,12 @@ pub(crate) unsafe fn codegen(
// NOTE: Only generate object files with GIMPLE when this environment variable is set for
// now because this requires a particular setup (same gcc/lto1/lto-wrapper commit as libgccjit).
// TODO: remove this environment variable.
let fat_lto = module.module_llvm.fat_lto;
let fat_lto = env::var("EMBED_LTO_BITCODE").as_deref() == Ok("1");
let bc_out = cgcx.output_filenames.temp_path(OutputType::Bitcode, module_name);
let obj_out = cgcx.output_filenames.temp_path(OutputType::Object, module_name);
if config.bitcode_needed() {
if config.bitcode_needed() && fat_lto {
let _timer = cgcx
.prof
.generic_activity_with_arg("GCC_module_codegen_make_bitcode", &*module.name);
@ -57,8 +57,6 @@ pub(crate) unsafe fn codegen(
.generic_activity_with_arg("GCC_module_codegen_emit_bitcode", &*module.name);
context.add_command_line_option("-flto=auto");
context.add_command_line_option("-flto-partition=one");
// TODO: remove since we don't want fat objects when it is for Bitcode only.
context.add_command_line_option("-ffat-lto-objects");
context
.compile_to_file(OutputKind::ObjectFile, bc_out.to_str().expect("path to str"));
}
@ -120,11 +118,11 @@ pub(crate) unsafe fn codegen(
if fat_lto {
context.add_command_line_option("-flto=auto");
context.add_command_line_option("-flto-partition=one");
}
// NOTE: without -fuse-linker-plugin, we get the following error:
// lto1: internal compiler error: decompressed stream: Destination buffer is too small
//context.add_driver_option("-fuse-linker-plugin");
// NOTE: without -fuse-linker-plugin, we get the following error:
// lto1: internal compiler error: decompressed stream: Destination buffer is too small
context.add_driver_option("-fuse-linker-plugin");
}
context.add_driver_option("-Wl,-r");
// NOTE: we need -nostdlib, otherwise, we get the following error:
@ -137,6 +135,7 @@ pub(crate) unsafe fn codegen(
obj_out.to_str().expect("path to str"),
);
} else {
//println!("Combining to object file");
context.compile_to_file(
OutputKind::ObjectFile,
obj_out.to_str().expect("path to str"),