Commit 130ca81b authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Thomas Petazzoni
Browse files

polarssl: disable assembly for more scenarios 

Disable assembly optimizations for:
Microblaze in general (previously a patch).
ARM with debugging in Thumb1/2 mode. This one fixes:
http://autobuild.buildroot.net/results/31e/31e8c4e29d51039cd5d213c2fe176a9cc39879da/



Do so in a nicer way with a one-liner sed and drop the patch.

And rename patches around, numbering was off.

Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent beb20c54

package/polarssl/polarssl-0003-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch→package/polarssl/polarssl-0002-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch

+0 −0

File moved.

View file

package/polarssl/polarssl-02-disable-microblaze-asm.patch

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
Microblaze assembly seems to be broken, fixes:



http://autobuild.buildroot.net/results/4d5/4d54958ded61a0d929d992e4ca0bb31c996953cb/



Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>



diff -Nura polarssl-1.2.11.orig/include/polarssl/bn_mul.h polarssl-1.2.11/include/polarssl/bn_mul.h

--- polarssl-1.2.11.orig/include/polarssl/bn_mul.h	2014-07-30 15:47:27.381658434 -0300

+++ polarssl-1.2.11/include/polarssl/bn_mul.h	2014-07-30 15:48:52.616543074 -0300

@@ -480,7 +480,7 @@

 

 #endif /* SPARCv8 */

 

-#if defined(__microblaze__) || defined(microblaze)

+#if 0 && defined(__microblaze__) || defined(microblaze)

 

 #define MULADDC_INIT                    \

     asm(                                \

package/polarssl/polarssl.mk

+12 −0
Original line number Diff line number Diff line
@@ -14,4 +14,16 @@ POLARSSL_INSTALL_STAGING = YES 
POLARSSL_LICENSE = GPLv2

POLARSSL_LICENSE_FILES = LICENSE



define POLARSSL_DISABLE_ASM

	$(SED) '/^#define POLARSSL_HAVE_ASM/d' $(@D)/include/polarssl/config.h

endef



# ARM in thumb mode breaks debugging with asm optimizations

# Microblaze asm optimizations are broken in general

ifeq ($(BR2_ENABLE_DEBUG)$(BR2_ARM_INSTRUCTIONS_THUMB)$(BR2_ARM_INSTRUCTIONS_THUMB2),yy)

POLARSSL_POST_CONFIGURE_HOOKS += POLARSSL_DISABLE_ASM

else ifeq ($(BR2_microblaze),y)

POLARSSL_POST_CONFIGURE_HOOKS += POLARSSL_DISABLE_ASM

endif



$(eval $(cmake-package))