From 69b22d1fc02ef57128ad1f01dbfba31ed97b10df Mon Sep 17 00:00:00 2001
From: Philipp Oppermann <dev@phil-opp.com>
Date: Sun, 29 May 2016 18:00:29 +0200
Subject: [PATCH] Use the `panic=abort` option instead of `-Z no-landing-pads`

(cherry picked from commit 725c452157bf93a4bd9de863637bb678870bdc42)
---
 Cargo.toml | 6 ++++++
 Makefile   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index a5503538..47cbd1af 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,3 +22,9 @@ version = "0.7.0"
 
 [lib]
 crate-type = ["staticlib"]
+
+[profile.dev]
+panic = "abort"
+
+[profile.release]
+panic = "abort"
diff --git a/Makefile b/Makefile
index 6d802500..e8ca5629 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ $(kernel): cargo $(rust_os) $(assembly_object_files) $(linker_script)
 	@ld -n --gc-sections -T $(linker_script) -o $(kernel) $(assembly_object_files) $(rust_os)
 
 cargo:
-	@cargo rustc --target $(target) -- -Z no-landing-pads
+	@cargo build --target $(target)
 
 # compile assembly files
 build/arch/$(arch)/%.o: src/arch/$(arch)/%.asm