Commit 88f30346 authored by Richard Genoud's avatar Richard Genoud Committed by Thomas Petazzoni
Browse files

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: default avatarRichard Genoud <richard.genoud@gmail.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 5bda8c96

package/dmalloc/dmalloc.mk

+10 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ DMALLOC_LICENSE_FILES = dmalloc.h.1 


DMALLOC_INSTALL_STAGING = YES

DMALLOC_CONF_OPTS = --enable-shlib

DMALLOC_CFLAGS = $(TARGET_CFLAGS)



ifeq ($(BR2_INSTALL_LIBSTDCPP),y)

DMALLOC_CONF_OPTS += --enable-cxx
@@ -27,6 +28,15 @@ else 
DMALLOC_CONF_OPTS += --disable-threads

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

	$(SED) 's/^ac_cv_page_size=0$$/ac_cv_page_size=12/' $(@D)/configure

	$(SED) 's/(ld -/($${LD-ld} -/' $(@D)/configure