Merge pull request #170 from rust-osdev/nightly-fix

phil-opp · web-flow · commit b49ccae5f557 · 2021-05-21T14:39:46.000+02:00
Make bootloader v0.10 compatible with latest Rust nightlies by updating `uefi-rs` dependency
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -34,7 +34,7 @@ x86_64 = { version = "0.13.2", optional = true, default-features = false, featur
 usize_conversions = { version = "0.2.0", optional = true }
 bit_field = { version = "0.10.0", optional = true }
 log = { version = "0.4.8", optional = true }
-uefi = { version = "0.9.0", optional = true }
+uefi = { version = "0.11.0", optional = true }
 argh = { version = "0.1.3", optional = true }
 displaydoc = { version = "0.1.7", optional = true }
 conquer-once = { version = "0.2.1", optional = true, default-features = false }
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,8 @@
 # Unreleased
 
+- Fix build on latest Rust nightlies by updating `uefi-rs` dependency ([#170](https://github.com/rust-osdev/bootloader/pull/170))
+  - Also: Fix warnings about `.intel_syntax` attribute in assembly code
+
 # 0.10.4 – 2021-05-14
 
 - Fix build on latest Rust nightly by updating to `uefi` v0.9.0 ([#162](https://github.com/rust-osdev/bootloader/pull/162))
diff --git a/src/asm/e820.s b/src/asm/e820.s
@@ -1,5 +1,4 @@
 .section .boot, "awx"
-.intel_syntax noprefix
 .code16
 
 # From http://wiki.osdev.org/Detecting_Memory_(x86)#Getting_an_E820_Memory_Map
diff --git a/src/asm/stage_1.s b/src/asm/stage_1.s
@@ -1,6 +1,5 @@
 .section .boot-first-stage, "awx"
 .global _start
-.intel_syntax noprefix
 .code16
 
 # This stage initializes the stack, enables the A20 line, loads the rest of
diff --git a/src/asm/stage_2.s b/src/asm/stage_2.s
@@ -1,5 +1,4 @@
 .section .boot, "awx"
-.intel_syntax noprefix
 .code16
 
 # This stage sets the target operating mode, loads the kernel from disk,
diff --git a/src/asm/stage_3.s b/src/asm/stage_3.s
@@ -1,5 +1,4 @@
 .section .boot, "awx"
-.intel_syntax noprefix
 .code32
 
 # This stage performs some checks on the CPU (cpuid, long mode), sets up an
diff --git a/src/asm/vesa.s b/src/asm/vesa.s
@@ -3,7 +3,6 @@
 # Copyright (c) 2017 Redox OS, licensed under MIT License
 
 .section .boot, "awx"
-.intel_syntax noprefix
 .code16
 
 vesa:
diff --git a/tests/test_kernels/higher_half/src/bin/verify_higher_half.rs b/tests/test_kernels/higher_half/src/bin/verify_higher_half.rs
@@ -17,6 +17,9 @@ fn kernel_main(_boot_info: &'static mut BootInfo) -> ! {
 
 /// This function is called on panic.
 #[panic_handler]
-fn panic(_info: &PanicInfo) -> ! {
+fn panic(info: &PanicInfo) -> ! {
+    use core::fmt::Write;
+
+    let _ = writeln!(test_kernel_higher_half::serial(), "PANIC: {}", info);
     exit_qemu(QemuExitCode::Failed);
 }
diff --git a/tests/test_kernels/higher_half/x86_64-higher_half.json b/tests/test_kernels/higher_half/x86_64-higher_half.json
@@ -13,6 +13,6 @@
     "disable-redzone": true,
     "features": "-mmx,-sse,+soft-float",
     "pre-link-args": {
-      "ld.lld": ["--image-base", "0xFFFF800000000000"]
+      "ld.lld": ["--image-base", "0xFFFF800000000000", "--gc-sections"]
     }
   }
diff --git a/x86_64-bootloader.json b/x86_64-bootloader.json
@@ -5,8 +5,9 @@
     "linker": "rust-lld",
     "pre-link-args": {
         "ld.lld": [
-	    "--script=linker.ld"
-	]
+            "--script=linker.ld",
+            "--gc-sections"
+        ]
     },
     "target-endian": "little",
     "target-pointer-width": "64",
@@ -17,5 +18,5 @@
     "disable-redzone": true,
     "panic-strategy": "abort",
     "executables": true,
-	"relocation_model": "static"
+    "relocation_model": "static"
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`.section .boot, "awx"`
`2`		`-.intel_syntax noprefix`
`3`	`2`	`.code16`
`4`	`3`
`5`	`4`	`# From http://wiki.osdev.org/Detecting_Memory_(x86)#Getting_an_E820_Memory_Map`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@`
`13`	`13`	`"disable-redzone": true,`
`14`	`14`	`"features": "-mmx,-sse,+soft-float",`
`15`	`15`	`"pre-link-args": {`
`16`		`- "ld.lld": ["--image-base", "0xFFFF800000000000"]`
	`16`	`+ "ld.lld": ["--image-base", "0xFFFF800000000000", "--gc-sections"]`
`17`	`17`	`}`
`18`	`18`	`}`