From 6ee1bec7f4dbea21382590e04c046182156f6317 Mon Sep 17 00:00:00 2001 From: Steve Klabnik Date: Tue, 6 Mar 2018 16:34:51 +0000 Subject: [PATCH 1/2] re-organize order of target spec to match blog post --- x86_64-blog_os.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/x86_64-blog_os.json b/x86_64-blog_os.json index 83d1a54d7..b9ca5ca3a 100644 --- a/x86_64-blog_os.json +++ b/x86_64-blog_os.json @@ -1,14 +1,15 @@ { - "llvm-target": "x86_64-unknown-linux-gnu", + "llvm-target": "x86_64-unknown-none", "data-layout": "e-m:e-i64:64-f80:128-n8:16:32:64-S128", "arch": "x86_64", "target-endian": "little", "target-pointer-width": "64", "target-c-int-width": "32", "os": "none", - "linker-flavor": "ld.lld", "executables": true, - "features": "-mmx,-sse,+soft-float", + "linker-flavor": "ld", + "linker": "ld.lld", + "panic-strategy": "abort", "disable-redzone": true, - "panic-strategy": "abort" + "features": "-mmx,-sse,+soft-float" } From de98393b3663cb4841fc0182911ef34a7b49708f Mon Sep 17 00:00:00 2001 From: Steve Klabnik Date: Tue, 6 Mar 2018 16:37:07 +0000 Subject: [PATCH 2/2] adjust blog post to reflect json changes --- .../second-edition/posts/02-minimal-rust-kernel/index.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/blog/content/second-edition/posts/02-minimal-rust-kernel/index.md b/blog/content/second-edition/posts/02-minimal-rust-kernel/index.md index 37508129c..d63590049 100644 --- a/blog/content/second-edition/posts/02-minimal-rust-kernel/index.md +++ b/blog/content/second-edition/posts/02-minimal-rust-kernel/index.md @@ -182,8 +182,7 @@ Our target specification file now looks like this: "target-c-int-width": "32", "os": "none", "executables": true, - "linker-flavor": "ld", - "linker": "ld.lld", + "linker-flavor": "ld.lld", "panic-strategy": "abort", "disable-redzone": true, "features": "-mmx,-sse,+soft-float"