Переглянути джерело

package/wolfssl: disable assembly when not supported

wolfssl contains some assembly code and its configure.ac script
enables the assembly code depending on the CPU architecture. However,
the detection logic is not sufficient and leads to using the assembly
code in situation where it should not.

Here are two examples:

 - As soon as the architecture is mips64/mips64el, it uses assembly
   code, but that assembly code is not mips64r6 compatible.

 - As soon as the architecture is RISC-V, it uses assembly code, but
   that assembly code uses multiplication instructions, without paying
   attention that the "M" extension may not be available in the RISC-V
   CPU instruction set.

In order to avoid this, we introduce a
BR2_PACKAGE_WOLFSSL_ASM_SUPPORTS hidden boolean to decide when to
enable/disable assembly code. We set an initial value with the
supported CPU architectures, with the exclusion of the problematic
cases described above.

It is pretty likely that this variable will need tuning progressively,
as it is difficult to determine which CPU variants exactly are
supported by the assembly code in wolfssl.

Fixes:

 - MIPS64 case: http://autobuild.buildroot.net/results/43e/43ee1a457cbeb986d958c9a70cac0676377661c0/
 - RISC-V case: http://autobuild.buildroot.net/results/f05/f056ebe7749a69994afba39a9d4967e2774c45ea/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Thomas Petazzoni 2 роки тому
батько
коміт
d8dc5315eb
2 змінених файлів з 18 додано та 0 видалено
  1. 12 0
      package/wolfssl/Config.in
  2. 6 0
      package/wolfssl/wolfssl.mk

+ 12 - 0
package/wolfssl/Config.in

@@ -1,3 +1,15 @@
+config BR2_PACKAGE_WOLFSSL_ASM_SUPPORTS
+	bool
+	default y if BR2_aarch64
+	default y if BR2_arm || BR2_armeb
+	default y if BR2_powerpc
+	default y if BR2_powerpc64 || BR2_powerpc64le
+	default y if BR2_mips64 && !BR2_MIPS_CPU_MIPS32R6
+	default y if BR2_mips64el && !BR2_MIPS_CPU_MIPS32R6
+	default y if BR2_mips || BR2_mipsel
+	default y if BR2_riscv && BR2_RISCV_ISA_RVM
+	default y if BR2_s390x
+
 config BR2_PACKAGE_WOLFSSL
 config BR2_PACKAGE_WOLFSSL
 	bool "wolfssl"
 	bool "wolfssl"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_TOOLCHAIN_HAS_THREADS

+ 6 - 0
package/wolfssl/wolfssl.mk

@@ -32,6 +32,12 @@ else
 WOLFSSL_CONF_OPTS += --disable-sslv3
 WOLFSSL_CONF_OPTS += --disable-sslv3
 endif
 endif
 
 
+ifeq ($(BR2_PACKAGE_WOLFSSL_ASM_SUPPORTS),y)
+WOLFSSL_CONF_OPTS += --enable-asm
+else
+WOLFSSL_CONF_OPTS += --disable-asm
+endif
+
 # enable ARMv8 hardware acceleration
 # enable ARMv8 hardware acceleration
 ifeq ($(BR2_aarch64),y)
 ifeq ($(BR2_aarch64),y)
 WOLFSSL_CONF_OPTS += --enable-armasm
 WOLFSSL_CONF_OPTS += --enable-armasm