Cleanup

Author: antoyo

build_system/src/test.rs

@@ -694,9 +694,9 @@ fn test_libcore(env: &Env, args: &TestArg) -> Result<(), String> {
     let _ = remove_dir_all(path.join("target"));
     let mut env = env.clone();
     env.insert("RUSTC_LOG".to_string(), "rustc_codegen_ssa::back::link=info".to_string());
-    let rustflags =
+    /*let rustflags =
         env.entry("RUSTFLAGS".to_string())
-        .or_default();
+        .or_default();*/
     //rustflags.push_str(" -C link-arg=-Wl,--verbose");
     //rustflags.push_str(" -C link-arg=-Wl,--fatal-warnings");
     //rustflags.push_str(" -C link-arg=-Wl,--warn-unresolved-symbols");

src/back/write.rs

@@ -6,7 +6,7 @@ use rustc_codegen_ssa::back::write::{BitcodeSection, CodegenContext, EmitObj, Mo
 use rustc_codegen_ssa::{CompiledModule, ModuleCodegen};
 use rustc_errors::DiagCtxtHandle;
 use rustc_fs_util::link_or_copy;
-use rustc_session::config::{Lto, OutputType};
+use rustc_session::config::OutputType;
 use rustc_span::fatal_error::FatalError;
 use rustc_target::spec::SplitDebuginfo;
 
@@ -96,7 +96,6 @@ pub(crate) unsafe fn codegen(
                 if config.emit_obj == EmitObj::ObjectCode(BitcodeSection::Full) {
                     // TODO: we might want to emit to emit an error here, saying to set the
                     // environment variable EMBED_LTO_BITCODE.
-                    unreachable!();
                     let _timer = cgcx
                         .prof
                         .generic_activity_with_arg("GCC_module_codegen_embed_bitcode", &*module.name);
@@ -233,16 +232,11 @@ pub(crate) fn save_temp_bitcode(
 
 fn create_msvc_imps<'gcc>(
     cgcx: &CodegenContext<GccCodegenBackend>,
-    context: &Context<'gcc>,
+    _context: &Context<'gcc>,
 ) {
     if !cgcx.msvc_imps_needed {
         return;
     }
-    // The x86 ABI seems to require that leading underscores are added to symbol
-    // names, so we need an extra underscore on x86. There's also a leading
-    // '\x01' here which disables LLVM's symbol mangling (e.g., no extra
-    // underscores added in front).
-    let prefix = if cgcx.target_arch == "x86" { "\x01__imp__" } else { "\x01__imp_" };
 
     /*unsafe {
         let ptr_ty = Type::ptr_llcx(llcx);

src/consts.rs

@@ -1,6 +1,6 @@
 #[cfg(feature = "master")]
 use gccjit::{FnAttribute, VarAttribute, Visibility};
-use gccjit::{Function, FunctionType, GlobalKind, LValue, RValue, ToRValue, Type};
+use gccjit::{Function, GlobalKind, LValue, RValue, ToRValue, Type};
 use rustc_codegen_ssa::traits::{
     BaseTypeCodegenMethods, ConstCodegenMethods, StaticCodegenMethods,
 };