Merge pull request #1425 from phil-opp/post-02-fix-target

Fix: `target-c-int-width` field now expects an integer
Merge branch 'post-01' into post-02
2025-12-16 22:37:49 +00:00 · 2025-08-07 13:09:35 +02:00 · 2025-08-07 13:07:09 +02:00 · 2025-08-07 12:25:03 +02:00 · 2025-05-09 15:46:51 +02:00 · 2025-05-02 00:35:50 +07:00
7 changed files with 21 additions and 20 deletions
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,5 +1,6 @@
 [unstable]
 build-std = ["core", "compiler_builtins"]
+build-std-features = ["compiler-builtins-mem"]

 [build]
 target = "x86_64-blog_os.json"
--- a/.github/workflows/build-code.yml
+++ b/.github/workflows/build-code.yml
@@ -1,4 +1,4 @@
-name: Build Code
+name: Code

 on:
  push:
@@ -16,6 +16,7 @@ jobs:
  check:
    name: Check
    strategy:
+      fail-fast: false
      matrix:
        platform: [
          ubuntu-latest,
@@ -41,6 +42,7 @@ jobs:
  test:
    name: Test
    strategy:
+      fail-fast: false
      matrix:
        platform: [
          ubuntu-latest,
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,21 +1,16 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 4
+
 [[package]]
 name = "blog_os"
 version = "0.1.0"
 dependencies = [
 "bootloader",
- "rlibc",
 ]

 [[package]]
 name = "bootloader"
-version = "0.9.8"
+version = "0.9.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ad686b9b47363de7d36c05fb6885f17d08d0f2d15b1bc782a101fe3c94a2c7c"
-
-[[package]]
-name = "rlibc"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc874b127765f014d792f16763a81245ab80500e2ad921ed4ee9e82481ee08fe"
+checksum = "974e79cf1b0b737839f01330fb5393095daf1124d52693696494e32523ae9ef5"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,8 +2,12 @@
 name = "blog_os"
 version = "0.1.0"
 authors = ["Philipp Oppermann <dev@phil-opp.com>"]
-edition = "2018"
+edition = "2024"

 [dependencies]
-bootloader = "0.9.8"
-rlibc = "1.0.0"
+bootloader = "0.9"
+
+[[bin]]
+name = "blog_os"
+test = false
+bench = false
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Blog OS (A Minimal Rust Kernel)

-[![Build Status](https://github.com/phil-opp/blog_os/workflows/Build%20Code/badge.svg?branch=post-02)](https://github.com/phil-opp/blog_os/actions?query=workflow%3A%22Build+Code%22+branch%3Apost-02)
+[![Build Status](https://github.com/phil-opp/blog_os/workflows/Code/badge.svg?branch=post-02)](https://github.com/phil-opp/blog_os/actions?query=workflow%3A%22Code%22+branch%3Apost-02)

 This repository contains the source code for the [A Minimal Rust Kernel][post] post of the [Writing an OS in Rust](https://os.phil-opp.com) series.

--- a/src/main.rs
+++ b/src/main.rs
@@ -1,13 +1,11 @@
 #![no_std]
 #![no_main]

-extern crate rlibc;
-
 use core::panic::PanicInfo;

 static HELLO: &[u8] = b"Hello World!";

-#[no_mangle]
+#[unsafe(no_mangle)]
 pub extern "C" fn _start() -> ! {
    let vga_buffer = 0xb8000 as *mut u8;

--- a/x86_64-blog_os.json
+++ b/x86_64-blog_os.json
@@ -1,15 +1,16 @@
 {
    "llvm-target": "x86_64-unknown-none",
-    "data-layout": "e-m:e-i64:64-f80:128-n8:16:32:64-S128",
+    "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-c-int-width": 32,
    "os": "none",
    "executables": true,
    "linker-flavor": "ld.lld",
    "linker": "rust-lld",
    "panic-strategy": "abort",
    "disable-redzone": true,
-    "features": "-mmx,-sse,+soft-float"
+    "features": "-mmx,-sse,+soft-float",
+    "rustc-abi": "x86-softfloat"
  }
Author	SHA1	Message	Date
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	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	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	c27eb1da9c	Run cargo update for bootloader crate	2025-03-24 11:08:41 +01:00
Philipp Oppermann	a90a8bea67	Run cargo update for bootloader crate	2025-02-10 12:35:16 +01:00
Philipp Oppermann	688a21e4ed	Set `rustc-abi: x86-softfloat` in target JSON This additional field is required by the Rust compiler since https://github.com/rust-lang/rust/pull/136146 .	2025-02-10 11:16:14 +01:00
Philipp Oppermann	2265ddecad	Run cargo update	2024-04-30 15:37:30 +02:00
Philipp Oppermann	38604da92f	Update bootloader version to v0.9.27 in Cargo.lock	2024-02-16 15:59:13 +01:00
Philipp Oppermann	c6990cb52d	Don't specify patch version in Cargo.toml Avoids confusion for people that don't know that cargo always chooses the latest patch version.	2024-02-16 13:21:21 +01:00
Philipp Oppermann	2bc4490404	Update bootloader version to v0.9.26 in Cargo.lock	2024-02-16 13:13:31 +01:00
Philipp Oppermann	7959b77ebd	Update data layout for LLVM 18 Fixes build on latest rustc nightly.	2024-02-16 12:38:32 +01:00
Philipp Oppermann	bebad6d5a9	Update bootloader version in Cargo.lock	2024-02-16 12:36:31 +01:00
Philipp Oppermann	b99c3f6d1d	Use latest data layout for custom target	2024-01-28 11:44:35 +01:00
Philipp Oppermann	66c1792034	Update bootloader version in Cargo.lock	2024-01-28 11:44:23 +01:00
Philipp Oppermann	6393247a3b	Update bootloader version in Cargo.lock	2022-09-25 11:29:38 +02:00
Philipp Oppermann	faa8d15cb7	Run cargo update for bootloader crate	2022-01-18 10:05:56 +01:00
Philipp Oppermann	26f1f5b896	Run cargo update for bootloader crate	2021-12-22 09:27:00 +01:00
Philipp Oppermann	1f49e2e9fe	Merge branch 'post-01' into post-02	2021-05-21 19:53:49 +02:00
Philipp Oppermann	8708b54756	Readme: Update workflow name in badge	2021-05-21 19:53:01 +02:00
Philipp Oppermann	021762cf30	Run `cargo update` for bootloader	2021-05-20 14:32:27 +02:00
Philipp Oppermann	d8f280315f	Run cargo update for bootloader crate	2021-05-17 11:28:54 +02:00
Philipp Oppermann	066c278277	Merge branch 'post-01' into post-02	2021-03-10 09:23:02 +01:00
Philipp Oppermann	bdb6a424a8	CI: Rename 'Build Code' workflow to 'Code'	2021-03-10 09:22:57 +01:00
Philipp Oppermann	96844f6519	Merge branch 'post-01' into post-02	2021-03-10 09:15:58 +01:00
Philipp Oppermann	1501669819	Update lockfile format	2021-03-10 09:15:54 +01:00
Philipp Oppermann	1b86d7fd62	Merge branch 'post-01' into post-02	2021-03-10 09:13:39 +01:00
Philipp Oppermann	deb0f63dff	Ci: Don't fail fast	2021-03-10 09:13:00 +01:00
Philipp Oppermann	d658949f5b	Run cargo update for bootloader crate	2021-03-10 08:53:21 +01:00
Philipp Oppermann	0e52ccbebb	Run cargo update for bootloader crate	2021-02-02 10:51:03 +01:00
Rob Gries	4e38e7ddf8	Remove rlibc and use compiler-builtins-mem feature (#865 )	2020-10-02 23:14:25 +02:00
Philipp Oppermann	49dce7ada7	`cargo update` the `bootloader`crate to fix nightly breakage	2020-09-29 12:19:48 +02:00
Philipp Oppermann	c42cee8d89	Update bootloader to 0.9.10	2020-09-24 10:09:57 +02:00
Philipp Oppermann	ebb9f0b8a7	Run cargo update	2020-09-24 09:07:45 +02:00