[Buildroot] [PATCH] mongrel2: disable polarssl assembly as we do in the polarssl package

[Buildroot] [PATCH] mongrel2: disable polarssl assembly as we do in the polarssl package

[Vicente Olivert Riera]

mongrel2 bundles polarssl so it has the same problem as the polarssl
with the assembly optimization, so let's use the same solution here.

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
 package/mongrel2/mongrel2.mk | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/package/mongrel2/mongrel2.mk b/package/mongrel2/mongrel2.mk
index 0be4832..d0640c9 100644
--- a/package/mongrel2/mongrel2.mk
+++ b/package/mongrel2/mongrel2.mk
@@ -13,6 +13,21 @@ MONGREL2_LICENSE = BSD-3c
 MONGREL2_LICENSE_FILES = LICENSE
 MONGREL2_DEPENDENCIES = sqlite zeromq
 
+define MONGREL2_POLARSSL_DISABLE_ASM
+	$(SED) '/^#define POLARSSL_HAVE_ASM/d' $(@D)/src/polarssl/include/polarssl/config.h
+endef
+
+# ARM in thumb mode breaks debugging with asm optimizations
+# Microblaze asm optimizations are broken in general
+# MIPS R6 asm is not yet supported
+ifeq ($(BR2_ENABLE_DEBUG)$(BR2_ARM_INSTRUCTIONS_THUMB)$(BR2_ARM_INSTRUCTIONS_THUMB2),yy)
+MONGREL2_POST_CONFIGURE_HOOKS += MONGREL2_POLARSSL_DISABLE_ASM
+else ifeq ($(BR2_microblaze),y)
+MONGREL2_POST_CONFIGURE_HOOKS += MONGREL2_POLARSSL_DISABLE_ASM
+else ifeq ($(BR2_mips_32r6)$(BR2_mips_64r6),y)
+MONGREL2_POST_CONFIGURE_HOOKS += MONGREL2_POLARSSL_DISABLE_ASM
+endif
+
 define MONGREL2_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
 		PREFIX=/usr all
-- 
2.4.10

[Buildroot] [PATCH] mongrel2: disable polarssl assembly as we do in the polarssl package

[Vicente Olivert Riera]

Hi Peter,

On 27/11/15 13:54, Vicente Olivert Riera wrote:
> mongrel2 bundles polarssl so it has the same problem as the polarssl
> with the assembly optimization, so let's use the same solution here.

could you please add this autobuilder reference when you apply it?

http://autobuild.buildroot.net/results/a92292a1defd441938d3de6c5049473d520ebc4e/

Thanks,

Vincent.

[Buildroot] [PATCH] mongrel2: disable polarssl assembly as we do in the polarssl package

[Peter Korsgaard]

>>>>> "Vicente" == Vicente Olivert Riera <Vincent.Riera@imgtec.com> writes:

 > mongrel2 bundles polarssl so it has the same problem as the polarssl
 > with the assembly optimization, so let's use the same solution here.

 > Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard