Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 660ba372 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "Fix arm emulator "D register out of range for selected VFP version" build failure."

parents b5186598 cb7aae16

debuggerd/Android.mk

+7 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk 


include $(BUILD_EXECUTABLE)







include $(CLEAR_VARS)

LOCAL_SRC_FILES := crasher.c

LOCAL_SRC_FILES_arm    := arm/crashglue.S
@@ -52,6 +54,11 @@ LOCAL_CFLAGS += -fstack-protector-all -Werror -Wno-free-nonheap-object 
#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

debuggerd/arm/crashglue.S

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ crash1: 
	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 @@ crash1: 
	fconstd   d29, #29

	fconstd   d30, #30

	fconstd   d31, #31

#endif



	mov lr, #0

	ldr lr, [lr]