dmalloc: Force arm mode instead of Thumb1 mode
dmalloc has some assembly that doesn't exist in thumb1 mode. So, force arm mode for dmalloc. Signed-off-by: Richard Genoud <richard.genoud@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
5bda8c9681
commit
88f3034651
@ -14,6 +14,7 @@ DMALLOC_LICENSE_FILES = dmalloc.h.1
|
|||||||
|
|
||||||
DMALLOC_INSTALL_STAGING = YES
|
DMALLOC_INSTALL_STAGING = YES
|
||||||
DMALLOC_CONF_OPTS = --enable-shlib
|
DMALLOC_CONF_OPTS = --enable-shlib
|
||||||
|
DMALLOC_CFLAGS = $(TARGET_CFLAGS)
|
||||||
|
|
||||||
ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
|
ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
|
||||||
DMALLOC_CONF_OPTS += --enable-cxx
|
DMALLOC_CONF_OPTS += --enable-cxx
|
||||||
@ -27,6 +28,15 @@ else
|
|||||||
DMALLOC_CONF_OPTS += --disable-threads
|
DMALLOC_CONF_OPTS += --disable-threads
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
# dmalloc has some assembly function that are not present in thumb1 mode:
|
||||||
|
# Error: lo register required -- `str lr,[sp,#4]'
|
||||||
|
# so, we desactivate thumb mode
|
||||||
|
ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y)
|
||||||
|
DMALLOC_CFLAGS += -marm
|
||||||
|
endif
|
||||||
|
|
||||||
|
DMALLOC_CONF_ENV = CFLAGS="$(DMALLOC_CFLAGS)"
|
||||||
|
|
||||||
define DMALLOC_POST_PATCH
|
define DMALLOC_POST_PATCH
|
||||||
$(SED) 's/^ac_cv_page_size=0$$/ac_cv_page_size=12/' $(@D)/configure
|
$(SED) 's/^ac_cv_page_size=0$$/ac_cv_page_size=12/' $(@D)/configure
|
||||||
$(SED) 's/(ld -/($${LD-ld} -/' $(@D)/configure
|
$(SED) 's/(ld -/($${LD-ld} -/' $(@D)/configure
|
||||||
|
Loading…
Reference in New Issue
Block a user