Merge branch 'post-02' into post-03

Merge pull request #1436 from phil-opp/post-02-fix-target
Fix: `target-pointer-width` field now expects an integer
2025-12-16 22:37:49 +00:00 · 2025-09-03 17:58:28 +02:00 · 2025-09-03 17:56:38 +02:00 · 2025-09-03 17:53:14 +02:00 · 2025-09-03 17:52:56 +02:00 · 2025-08-18 09:43:39 +02:00
4 changed files with 22 additions and 11 deletions
--- a/Cargo.lock
+++ b/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 = "blog_os"
@@ -8,23 +8,23 @@ version = "0.1.0"
 dependencies = [
 "bootloader",
 "lazy_static",
- "spin",
+ "spin 0.5.2",
 "volatile",
 ]

 [[package]]
 name = "bootloader"
-version = "0.9.29"
+version = "0.9.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "365861702868e2a37b4247aaecc7bd8f4389baec8d025497ad8ba7ff37ee9440"
+checksum = "7bdfddac270bbdd45903296bc1caf29a7fdce6b326aaf0bbab7f04c5f98b7447"

 [[package]]
 name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 dependencies = [
- "spin",
+ "spin 0.9.8",
 ]

 [[package]]
@@ -33,6 +33,12 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"

+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+
 [[package]]
 name = "volatile"
 version = "0.2.7"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,7 @@
 name = "blog_os"
 version = "0.1.0"
 authors = ["Philipp Oppermann <dev@phil-opp.com>"]
-edition = "2018"
+edition = "2024"

 [dependencies]
 bootloader = "0.9"
@@ -12,3 +12,8 @@ spin = "0.5.2"
 [dependencies.lazy_static]
 version = "1.0"
 features = ["spin_no_std"]
+
+[[bin]]
+name = "blog_os"
+test = false
+bench = false
--- a/src/main.rs
+++ b/src/main.rs
@@ -5,7 +5,7 @@ use core::panic::PanicInfo;

 mod vga_buffer;

-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn _start() -> ! {
    println!("Hello World{}", "!");

--- a/x86_64-blog_os.json
+++ b/x86_64-blog_os.json
@@ -3,8 +3,8 @@
    "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
    "arch": "x86_64",
    "target-endian": "little",
-    "target-pointer-width": "64",
-    "target-c-int-width": "32",
+    "target-pointer-width": 64,
+    "target-c-int-width": 32,
    "os": "none",
    "executables": true,
    "linker-flavor": "ld.lld",
Author	SHA1	Message	Date
Philipp Oppermann	93d0daa1e0	Merge branch 'post-02' into post-03	2025-09-03 17:58:28 +02:00
Philipp Oppermann	83e6c0bc00	Merge pull request #1436 from phil-opp/post-02-fix-target Fix: `target-pointer-width` field now expects an integer	2025-09-03 17:56:38 +02:00
Philipp Oppermann	2b11ad8397	Fix: `target-pointer-width` field now expects an integer	2025-09-03 17:53:14 +02:00
Philipp Oppermann	fa51f3adbf	Update to latest bootloader version	2025-09-03 17:52:56 +02:00
Philipp Oppermann	1f097bba71	Run cargo update	2025-08-18 09:43:39 +02:00
Philipp Oppermann	99fbbad9b0	Merge branch 'post-02' into post-03	2025-08-18 09:43:25 +02:00
Philipp Oppermann	94d14d8d62	Run cargo update for bootloader crate	2025-08-18 09:42:41 +02:00
Philipp Oppermann	6f0be666f3	Merge branch 'post-02' into post-03	2025-08-07 13:09:45 +02:00
Philipp Oppermann	d9fa84edd6	Merge pull request #1425 from phil-opp/post-02-fix-target Fix: `target-c-int-width` field now expects an integer	2025-08-07 13:09:35 +02:00
Philipp Oppermann	97de98df33	Merge branch 'post-02' into post-03	2025-08-07 13:07:41 +02:00
Philipp Oppermann	9684f75819	Merge branch 'post-01' into post-02	2025-08-07 13:07:09 +02:00
Philipp Oppermann	d6cc562907	Fix: `target-c-int-width` field now expects an integer	2025-08-07 12:25:03 +02:00
Philipp Oppermann	b44d8ab7fc	Merge pull request #1412 from tigeryant/post-01 Added [[bin]] section to Cargo.toml	2025-05-09 15:46:51 +02:00
John Davies	c551fec1ce	Added [[bin]] section to Cargo.toml with test and bench set to false to prevent duplicate definition of lang item	2025-05-02 00:35:50 +07:00
Philipp Oppermann	e2a3e76a32	Merge branch 'post-02' into post-03	2025-03-27 15:07:41 +01:00
Philipp Oppermann	16bbb8f972	Merge branch 'post-01' into post-02	2025-03-27 15:07:24 +01:00
Philipp Oppermann	430e2143f8	Fix: `no_mangle` is an unsafe attribute since Rust 2024	2025-03-27 15:06:17 +01:00
Philipp Oppermann	86ffa24e8e	Update to Rust 2024 edition	2025-03-27 15:05:58 +01:00
Philipp Oppermann	df0c0b5783	Merge branch 'post-02' into post-03	2025-03-24 11:09:21 +01:00
Philipp Oppermann	c27eb1da9c	Run cargo update for bootloader crate	2025-03-24 11:08:41 +01:00
Philipp Oppermann	2a61f88d8a	Merge branch 'post-02' into post-03	2025-02-10 12:35:54 +01:00
Philipp Oppermann	a90a8bea67	Run cargo update for bootloader crate	2025-02-10 12:35:16 +01:00