diff --git a/01_wait_forever/Makefile b/01_wait_forever/Makefile
index 8ef00caa..a6ca4d44 100644
--- a/01_wait_forever/Makefile
+++ b/01_wait_forever/Makefile
@@ -9,13 +9,13 @@ endif
 
 # BSP-specific arguments
 ifeq ($(BSP),bsp_rpi3)
-	TARGET = aarch64-unknown-none
+	TARGET = aarch64-unknown-none-softfloat
 	OUTPUT = kernel8.img
 	QEMU_BINARY = qemu-system-aarch64
 	QEMU_MACHINE_TYPE = raspi3
 	QEMU_MISC_ARGS = -d in_asm
 	LINKER_FILE = src/bsp/rpi3/link.ld
-	RUSTC_MISC_ARGS = -C target-feature=-fp-armv8 -C target-cpu=cortex-a53
+	RUSTC_MISC_ARGS = -C target-cpu=cortex-a53
 endif
 
 SOURCES = $(wildcard **/*.rs) $(wildcard **/*.S) $(wildcard **/*.ld)
diff --git a/01_wait_forever/README.md b/01_wait_forever/README.md
index 6263c618..8198a9f6 100644
--- a/01_wait_forever/README.md
+++ b/01_wait_forever/README.md
@@ -5,7 +5,7 @@
 Project skeleton is set up; Code just halts all CPU cores.
 
 - Toolchain: `cargo xbuild` tools (`xrustc`, `xclippy`) and the
-  `aarch64-unknown-none` target are used for building `AArch64` bare-metal code.
+  `aarch64-unknown-none-softfloat` target are used for building `AArch64` bare-metal code.
 - `Makefile` targets:
     - `doc`: Generate documentation.
     - `qemu`: Run the `kernel` in QEMU
diff --git a/01_wait_forever/kernel b/01_wait_forever/kernel
index 259d4610..c4419788 100755
Binary files a/01_wait_forever/kernel and b/01_wait_forever/kernel differ
diff --git a/02_runtime_init/Makefile b/02_runtime_init/Makefile
index 8ef00caa..a6ca4d44 100644
--- a/02_runtime_init/Makefile
+++ b/02_runtime_init/Makefile
@@ -9,13 +9,13 @@ endif
 
 # BSP-specific arguments
 ifeq ($(BSP),bsp_rpi3)
-	TARGET = aarch64-unknown-none
+	TARGET = aarch64-unknown-none-softfloat
 	OUTPUT = kernel8.img
 	QEMU_BINARY = qemu-system-aarch64
 	QEMU_MACHINE_TYPE = raspi3
 	QEMU_MISC_ARGS = -d in_asm
 	LINKER_FILE = src/bsp/rpi3/link.ld
-	RUSTC_MISC_ARGS = -C target-feature=-fp-armv8 -C target-cpu=cortex-a53
+	RUSTC_MISC_ARGS = -C target-cpu=cortex-a53
 endif
 
 SOURCES = $(wildcard **/*.rs) $(wildcard **/*.S) $(wildcard **/*.ld)
diff --git a/02_runtime_init/kernel b/02_runtime_init/kernel
index 5341909d..0932bd0d 100644
Binary files a/02_runtime_init/kernel and b/02_runtime_init/kernel differ
diff --git a/02_runtime_init/kernel8.img b/02_runtime_init/kernel8.img
index 4fd35eef..75d3126f 100755
Binary files a/02_runtime_init/kernel8.img and b/02_runtime_init/kernel8.img differ
diff --git a/03_hacky_hello_world/Makefile b/03_hacky_hello_world/Makefile
index b3693e18..a811b598 100644
--- a/03_hacky_hello_world/Makefile
+++ b/03_hacky_hello_world/Makefile
@@ -9,13 +9,13 @@ endif
 
 # BSP-specific arguments
 ifeq ($(BSP),bsp_rpi3)
-	TARGET = aarch64-unknown-none
+	TARGET = aarch64-unknown-none-softfloat
 	OUTPUT = kernel8.img
 	QEMU_BINARY = qemu-system-aarch64
 	QEMU_MACHINE_TYPE = raspi3
 	QEMU_MISC_ARGS = -serial null -serial stdio
 	LINKER_FILE = src/bsp/rpi3/link.ld
-	RUSTC_MISC_ARGS = -C target-feature=-fp-armv8 -C target-cpu=cortex-a53
+	RUSTC_MISC_ARGS = -C target-cpu=cortex-a53
 endif
 
 SOURCES = $(wildcard **/*.rs) $(wildcard **/*.S) $(wildcard **/*.ld)
diff --git a/03_hacky_hello_world/kernel b/03_hacky_hello_world/kernel
index feb2f283..61386840 100755
Binary files a/03_hacky_hello_world/kernel and b/03_hacky_hello_world/kernel differ
diff --git a/03_hacky_hello_world/kernel8.img b/03_hacky_hello_world/kernel8.img
index 2bcbe9c6..237d2837 100755
Binary files a/03_hacky_hello_world/kernel8.img and b/03_hacky_hello_world/kernel8.img differ
diff --git a/04_zero_overhead_abstraction/Makefile b/04_zero_overhead_abstraction/Makefile
index b3693e18..a811b598 100644
--- a/04_zero_overhead_abstraction/Makefile
+++ b/04_zero_overhead_abstraction/Makefile
@@ -9,13 +9,13 @@ endif
 
 # BSP-specific arguments
 ifeq ($(BSP),bsp_rpi3)
-	TARGET = aarch64-unknown-none
+	TARGET = aarch64-unknown-none-softfloat
 	OUTPUT = kernel8.img
 	QEMU_BINARY = qemu-system-aarch64
 	QEMU_MACHINE_TYPE = raspi3
 	QEMU_MISC_ARGS = -serial null -serial stdio
 	LINKER_FILE = src/bsp/rpi3/link.ld
-	RUSTC_MISC_ARGS = -C target-feature=-fp-armv8 -C target-cpu=cortex-a53
+	RUSTC_MISC_ARGS = -C target-cpu=cortex-a53
 endif
 
 SOURCES = $(wildcard **/*.rs) $(wildcard **/*.S) $(wildcard **/*.ld)
diff --git a/04_zero_overhead_abstraction/kernel b/04_zero_overhead_abstraction/kernel
index 6bb49b1d..04f2c470 100755
Binary files a/04_zero_overhead_abstraction/kernel and b/04_zero_overhead_abstraction/kernel differ
diff --git a/04_zero_overhead_abstraction/kernel8.img b/04_zero_overhead_abstraction/kernel8.img
index 8198c546..37798266 100755
Binary files a/04_zero_overhead_abstraction/kernel8.img and b/04_zero_overhead_abstraction/kernel8.img differ