openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am d0fa7342: am 660ba372: Merge "Fix arm emulator "D register out of range for selected VFP version" build failure." 

* commit 'd0fa7342c536180519ddc475fbf6f5219b0424d9':
  Fix arm emulator "D register out of range for selected VFP version" build failure.
This commit is contained in:
Elliott Hughes 2014-07-10 00:16:12 +00:00 committed by Android Git Automerger
parent b237f5fb5d d0fa7342c5
commit 75b3d8c07b
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debuggerd/Android.mk
View File

@ -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

2
debuggerd/arm/crashglue.S
View File

@ -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]