mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-19 16:40:46 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/opencv3: disable VFPv3 options

Browse Source 
Commit a17402e42d has conditionally
enabled NEON and VFPv3 optimizations. However, the VFPv3 logic is
causing issues on some targets such as Cortex-A5 with VFPv4-D16 but
not VFPv4.

Since the ENABLE_VFPV3=ON option only adds CFLAGS, we can always set
it to OFF, and let Buildroot pass appropriate CFLAGS.

However, the ENABLE_NEON option also adds the build of NEON-specific
code, so we keep this logic.

Fixes:
 - https://bugs.buildroot.org/show_bug.cgi?id=11996

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 4d0f3dd870)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine
2019-08-20 20:40:39 +02:00
committed by Peter Korsgaard
parent 8db898a338
commit 1641835c71
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
package/opencv3/opencv3.mk
View File

@@ -104,17 +104,15 @@ OPENCV3_CONF_OPTS += \
# Hardware support options. # Hardware support options.
# #
# * PowerPC support is turned off since its only effect is altering CFLAGS, # * PowerPC and VFPv3 support are turned off since their only effects
# adding '-mcpu=G3 -mtune=G5' to them, which is already handled by Buildroot. # are altering CFLAGS, adding '-mcpu=G3 -mtune=G5' or '-mfpu=vfpv3'
# to them, which is already handled by Buildroot.
# * NEON logic is needed as it is not only used to add CFLAGS, but
# also to enable additional NEON code.
OPENCV3_CONF_OPTS += \ OPENCV3_CONF_OPTS += \
-DENABLE_POWERPC=OFF \ -DENABLE_POWERPC=OFF \
-DENABLE_NEON=$(if $(BR2_ARM_CPU_HAS_NEON),ON,OFF) -DENABLE_NEON=$(if $(BR2_ARM_CPU_HAS_NEON),ON,OFF) \
-DENABLE_VFPV3=OFF
ifeq ($(BR2_ARCH_IS_64):$(BR2_ARM_CPU_HAS_VFPV3),:y)
OPENCV3_CONF_OPTS += -DENABLE_VFPV3=ON
else
OPENCV3_CONF_OPTS += -DENABLE_VFPV3=OFF
endif
# Cuda stuff # Cuda stuff
OPENCV3_CONF_OPTS += \ OPENCV3_CONF_OPTS += \