Skip to contentSkip to conversation

mongrel2: disable polarssl assembly as we do in the polarssl package

PATCH New Vicente Olivert Riera 2 participants 3 messages Nov 27, 2015

lore
Share & tools
lore

Vicente Olivert Riera

author
#0 lore raw

PATCH 1/1 mongrel2: disable polarssl assembly as we do in the polarssl package

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 <[email protected]>
---
 package/mongrel2/mongrel2.mk | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
package/mongrel2/mongrel2.mk +15 -0
index 0be4832..d0640c9 100644
@@ -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
Signature · 1 line
2.4.10
#2 lore raw

PATCH 1/1 mongrel2: disable polarssl assembly as we do in the polarssl package

In reply to Vicente Olivert Riera
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Vicente" == Vicente Olivert Riera <[email protected]> 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 <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard