cleanup

Signed-off-by: YdrMaster <[email protected]>

Author: YdrMaster

bench-kernel/build.rs

@@ -4,6 +4,7 @@ fn main() {
     let ld = PathBuf::from(env::var_os("OUT_DIR").unwrap()).join("linker.ld");
     fs::write(&ld, LINKER).unwrap();
     println!("cargo:rerun-if-changed=build.rs");
+    println!("cargo:rerun-if-env-changed=LOG");
     println!("cargo:rustc-link-arg=-T{}", ld.display());
 }
 
@@ -14,29 +15,25 @@ MEMORY {
     DRAM : ORIGIN = 0x80200000, LENGTH = 64M
 }
 SECTIONS {
-    .text : ALIGN(4) {
+    .text : {
         *(.text.entry)
         *(.text .text.*)
     } > DRAM
-    .rodata : ALIGN(8) {
-        srodata = .;
+    .rodata : {
         *(.rodata .rodata.*)
         *(.srodata .srodata.*)
-        . = ALIGN(8);
-        erodata = .;
     } > DRAM
-    .data : ALIGN(8) {
-        sdata = .;
+    .data : {
         *(.data .data.*)
         *(.sdata .sdata.*)
-        . = ALIGN(8);
-        edata = .;
     } > DRAM
-    .bss (NOLOAD) : ALIGN(8) {
+    .bss (NOLOAD) : {
         *(.bss.uninit)
+        . = ALIGN(8);
         sbss = .;
         *(.bss .bss.*)
         *(.sbss .sbss.*)
+        . = ALIGN(8);
         ebss = .;
     } > DRAM
     /DISCARD/ : {

rustsbi-qemu/build.rs

@@ -4,6 +4,7 @@ fn main() {
     let ld = &PathBuf::from(env::var_os("OUT_DIR").unwrap()).join("linker.ld");
     fs::write(ld, LINKER).unwrap();
     println!("cargo:rerun-if-changed=build.rs");
+    println!("cargo:rerun-if-env-changed=LOG");
     println!("cargo:rustc-link-arg=-T{}", ld.display());
 }
 

test-kernel/build.rs

@@ -4,6 +4,7 @@ fn main() {
     let ld = PathBuf::from(env::var_os("OUT_DIR").unwrap()).join("linker.ld");
     fs::write(&ld, LINKER).unwrap();
     println!("cargo:rerun-if-changed=build.rs");
+    println!("cargo:rerun-if-env-changed=LOG");
     println!("cargo:rustc-link-arg=-T{}", ld.display());
 }
 
@@ -14,29 +15,25 @@ MEMORY {
     DRAM : ORIGIN = 0x80200000, LENGTH = 64M
 }
 SECTIONS {
-    .text : ALIGN(4) {
+    .text : {
         *(.text.entry)
         *(.text .text.*)
     } > DRAM
-    .rodata : ALIGN(8) {
-        srodata = .;
+    .rodata : {
         *(.rodata .rodata.*)
         *(.srodata .srodata.*)
-        . = ALIGN(8);
-        erodata = .;
     } > DRAM
-    .data : ALIGN(8) {
-        sdata = .;
+    .data : {
         *(.data .data.*)
         *(.sdata .sdata.*)
-        . = ALIGN(8);
-        edata = .;
     } > DRAM
-    .bss (NOLOAD) : ALIGN(8) {
+    .bss (NOLOAD) : {
         *(.bss.uninit)
+        . = ALIGN(8);
         sbss = .;
         *(.bss .bss.*)
         *(.sbss .sbss.*)
+        . = ALIGN(8);
         ebss = .;
     } > DRAM
     /DISCARD/ : {