Merge branch 'v0.9-base' into new_asm_for_0_9

Author: phil-opp

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "bootloader"
-version = "0.9.19"
+version = "0.9.20"
 authors = ["Philipp Oppermann <[email protected]>"]
 license = "MIT/Apache-2.0"
 description = "An experimental pure-Rust x86 bootloader."
@@ -14,7 +14,7 @@ required-features = ["binary"]
 
 [dependencies]
 xmas-elf = { version = "0.6.2", optional = true }
-x86_64 = { version = "0.13.2", optional = true, default-features = false, features = ["instructions", "inline_asm"] }
+x86_64 = { version = "0.14.7", optional = true, default-features = false, features = ["instructions", "inline_asm"] }
 usize_conversions = { version = "0.2.0", optional = true }
 fixedvec = { version = "0.2.4", optional = true }
 bit_field = { version = "0.10.0", optional = true }

Cargo.toml

@@ -1,5 +1,9 @@
 # Unreleased
 
+# 0.9.20 – 2021-12-20
+
+- Update x86_64 dependency to v0.14.7 to fix nightly breakage ([#208](https://github.com/rust-osdev/bootloader/pull/208))
+
 # 0.9.19 – 2021-08-09
 
 - Set `relocation-model: static` and `panic-strategy: abort` and `fix .intel_syntax` warnings [#185](https://github.com/rust-osdev/bootloader/pull/185)

Changelog.md

@@ -5,4 +5,4 @@ authors = ["Philipp Oppermann <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-x86_64 = { version = "0.13.2", default-features = false, features = ["instructions", "inline_asm"] }
+x86_64 = { version = "0.14.7", default-features = false, features = ["instructions", "inline_asm"] }

example-kernel/Cargo.toml

@@ -11,8 +11,7 @@ extern crate rlibc;
 
 use bootloader::bootinfo::{BootInfo, FrameRange};
 use core::arch::asm;
-use core::convert::TryInto;
-use core::panic::PanicInfo;
+use core::{arch::global_asm, convert::TryInto, panic::PanicInfo};
 use core::{mem, slice};
 use fixedvec::alloc_stack;
 use usize_conversions::usize_from;

src/main.rs

@@ -5,4 +5,4 @@ authors = ["Philipp Oppermann <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-x86_64 = { version = "0.13.2", default-features = false, features = ["instructions", "inline_asm"] }
+x86_64 = { version = "0.14.7", default-features = false, features = ["instructions", "inline_asm"] }