diff --git a/debuggerd/Android.mk b/debuggerd/Android.mk
index 191e283..c33b263 100644
--- a/debuggerd/Android.mk
+++ b/debuggerd/Android.mk
@@ -38,6 +38,8 @@
 
 include $(BUILD_EXECUTABLE)
 
+
+
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := crasher.c
 LOCAL_SRC_FILES_arm    := arm/crashglue.S
@@ -52,6 +54,11 @@
 #LOCAL_FORCE_STATIC_EXECUTABLE := true
 LOCAL_SHARED_LIBRARIES := libcutils liblog libc
 
+# The arm emulator has VFP but not VFPv3-D32.
+ifeq ($(ARCH_ARM_HAVE_VFP_D32),true)
+LOCAL_ASFLAGS_arm += -DHAS_VFP_D32
+endif
+
 LOCAL_MODULE := crasher
 LOCAL_MODULE_STEM_32 := crasher
 LOCAL_MODULE_STEM_64 := crasher64
diff --git a/debuggerd/arm/crashglue.S b/debuggerd/arm/crashglue.S
index 8649056..4fbfd6e 100644
--- a/debuggerd/arm/crashglue.S
+++ b/debuggerd/arm/crashglue.S
@@ -32,6 +32,7 @@
 	fconstd   d13, #13
 	fconstd   d14, #14
 	fconstd   d15, #15
+#if defined(HAS_VFP_D32)
 	fconstd   d16, #16
 	fconstd   d17, #17
 	fconstd   d18, #18
@@ -48,6 +49,7 @@
 	fconstd   d29, #29
 	fconstd   d30, #30
 	fconstd   d31, #31
+#endif
 
 	mov lr, #0
 	ldr lr, [lr]