More cleanup

Author: antoyo

build_system/src/build.rs

@@ -178,7 +178,7 @@ pub fn build_sysroot(env: &HashMap<String, String>, config: &ConfigInfo) -> Resu
     //rustflags.push_str(" -Clink-arg=--ld-path=/usr/bin/mold");
     //rustflags.push_str(" -Clink-arg=--ld-path=/usr/bin/ld.bfd");
     //rustflags.push_str(" -Clink-arg=--ld-path=/usr/bin/ld.gold");
-    env.insert("RUSTC_LOG".to_string(), "rustc_codegen_ssa::back::link=info".to_string());
+    //env.insert("RUSTC_LOG".to_string(), "rustc_codegen_ssa::back::link=info".to_string());
     env.insert("RUSTFLAGS".to_string(), rustflags);
     run_command_with_output_and_env(&args, Some(&start_dir), Some(&env))?;
 

build_system/src/test.rs

@@ -692,8 +692,8 @@ fn test_libcore(env: &Env, args: &TestArg) -> Result<(), String> {
     println!("[TEST] libcore");
     let path = get_sysroot_dir().join("sysroot_src/library/core/tests");
     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 mut env = env.clone();
+    env.insert("RUSTC_LOG".to_string(), "rustc_codegen_ssa::back::link=info".to_string());*/
     /*let rustflags =
         env.entry("RUSTFLAGS".to_string())
         .or_default();*/
@@ -718,7 +718,7 @@ fn test_libcore(env: &Env, args: &TestArg) -> Result<(), String> {
     //rustflags.push_str(" -C link-arg=-Wl,--trace-symbol=_ZN6memchr4arch6x86_646memchr10memchr_raw2FN17haaf621f7b8ca567eE");
     //rustflags.push_str(" -C link-arg=-Wl,--print-map");
     //rustflags.push_str(" -Clink-arg=-not-an-arg");
-    run_cargo_command(&[&"test"], Some(&path), &env, args)?;
+    run_cargo_command(&[&"test"], Some(&path), env, args)?;
     Ok(())
 }
 

src/consts.rs

@@ -98,7 +98,7 @@ impl<'gcc, 'tcx> StaticCodegenMethods for CodegenCx<'gcc, 'tcx> {
         let var_name = format!("{:?}", global);
         if var_name.contains("FN") && var_name.contains("memchr") {
             //println!("Var name: {:?}", var_name);
-            println!("INITIALIZE: {:?} = {:?}", var_name, value);
+            //println!("INITIALIZE: {:?} = {:?}", var_name, value);
 
             /*
             let ptr_type = value.get_type().make_pointer();
@@ -168,7 +168,7 @@ impl<'gcc, 'tcx> StaticCodegenMethods for CodegenCx<'gcc, 'tcx> {
             //let value = self.context.new_bitcast(None, value, fn_ptr_type); // Also WORKS
             let value = self.context.new_bitcast(None, value, val_llty);*/
             global.global_set_initializer_rvalue(value);
-            println!("=== AFTER INITIALIZE");
+            //println!("=== AFTER INITIALIZE");
         }
         else {
             global.global_set_initializer_rvalue(value);
@@ -329,9 +329,9 @@ impl<'gcc, 'tcx> CodegenCx<'gcc, 'tcx> {
             }
 
             let is_tls = fn_attrs.flags.contains(CodegenFnAttrFlags::THREAD_LOCAL);
-            if sym.contains("memchr") && sym.contains("FN") {
+            /*if sym.contains("memchr") && sym.contains("FN") {
                 println!("** DECLARE");
-            }
+            }*/
             let global = self.declare_global(
                 sym,
                 gcc_type,

src/declare.rs

@@ -70,9 +70,9 @@ impl<'gcc, 'tcx> CodegenCx<'gcc, 'tcx> {
         is_tls: bool,
         link_section: Option<Symbol>,
     ) -> LValue<'gcc> {
-        if name.contains("memchr") && name.contains("FN") {
+        /*if name.contains("memchr") && name.contains("FN") {
             println!("{}: {:?}: {:?}", self.codegen_unit.name(), name, global_kind);
-        }
+        }*/
         let global = self.context.new_global(None, global_kind, ty, name);
         if is_tls {
             global.set_tls_model(self.tls_model);

src/mono_item.rs

@@ -32,9 +32,9 @@ impl<'gcc, 'tcx> PreDefineCodegenMethods<'tcx> for CodegenCx<'gcc, 'tcx> {
         let gcc_type = self.layout_of(ty).gcc_type(self);
 
         let is_tls = attrs.flags.contains(CodegenFnAttrFlags::THREAD_LOCAL);
-        if symbol_name.contains("memchr") && symbol_name.contains("FN") {
+        /*if symbol_name.contains("memchr") && symbol_name.contains("FN") {
             println!("** DECLARE static");
-        }
+        }*/
         let global = self.define_global(symbol_name, gcc_type, is_tls, attrs.link_section);
         #[cfg(feature = "master")]
         global.add_attribute(VarAttribute::Visibility(base::visibility_to_gcc(visibility)));