diff --git a/aarch64/__init__.py b/aarch64/__init__.py
index 35f8797b..4fae757b 100644
--- a/aarch64/__init__.py
+++ b/aarch64/__init__.py
@@ -84,7 +84,11 @@ def amend_rts(self, rts_profile, conf):
         # switch and does so by doing lazy context switches: this restores
         # the registers only when they are used by apps. This means that if
         # a FPU register is used out of context, then we're doomed.
-        conf.build_flags["common_gnarl_flags"] += ["-mgeneral-regs-only"]
+        conf.build_flags["common_gnarl_flags"] += [
+            "-mgeneral-regs-only"
+            if not using_llvm_compiler()
+            else "-mno-implicit-float"
+        ]
 
     def dump_runtime_xml(self, rts_name, rts):
         cnt = super(Aarch64Target, self).dump_runtime_xml(rts_name, rts)