Merge f894fb15d5 into bc7335ce6c

This additional field is required by the Rust compiler since https://github.com/rust-lang/rust/pull/136146 .

Cargo.lock

@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "bit_field"
@@ -31,9 +31,9 @@ dependencies = [
 
 [[package]]
 name = "bootloader"
-version = "0.9.29"
+version = "0.9.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "365861702868e2a37b4247aaecc7bd8f4389baec8d025497ad8ba7ff37ee9440"
+checksum = "8a9c8b93781debeb5bc44a12adc4be812aa9feb659d60eeafcd7e9bedb549561"
 
 [[package]]
 name = "lazy_static"

tests/heap_allocation.rs

@@ -9,6 +9,7 @@ extern crate alloc;
 use alloc::{boxed::Box, vec::Vec};
 use blog_os::allocator::HEAP_SIZE;
 use bootloader::{entry_point, BootInfo};
+use core::hint::black_box;
 use core::panic::PanicInfo;
 
 entry_point!(main);
@@ -61,6 +62,7 @@ fn many_boxes_long_lived() {
         let x = Box::new(i);
         assert_eq!(*x, i);
     }
+    black_box(&long_lived); // new - ensures long_lived isn't optimized away
     assert_eq!(*long_lived, 1); // new
 }
 

x86_64-blog_os.json

@@ -11,5 +11,6 @@
     "linker": "rust-lld",
     "panic-strategy": "abort",
     "disable-redzone": true,
-    "features": "-mmx,-sse,+soft-float"
+    "features": "-mmx,-sse,+soft-float",
+    "rustc-abi": "x86-softfloat"
   }