diff options
| author | Fabrice Fontaine <fontaine.fabrice@gmail.com> | 2019-08-20 20:40:39 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@bootlin.com> | 2020-02-05 17:38:56 +0100 |
| commit | 4d0f3dd8709f9f31a81eaa8a62cb35ef6ddddeaf (patch) | |
| tree | e40562f3cd726f2e24fdf780b64fa8e98f217845 | |
| parent | 10fae9624b3c58e00e5406e8b489c4674d680380 (diff) | |
| download | buildroot-4d0f3dd8709f9f31a81eaa8a62cb35ef6ddddeaf.tar.bz2 | |
package/opencv3: disable VFPv3 options
Commit a17402e42d8c996af239cfdb536e74188d6c6245 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>
| -rw-r--r-- | package/opencv3/opencv3.mk | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk index 89ed8f4278..c99e84a29f 100644 --- a/package/opencv3/opencv3.mk +++ b/package/opencv3/opencv3.mk @@ -104,17 +104,15 @@ OPENCV3_CONF_OPTS += \ # Hardware support options. # -# * PowerPC support is turned off since its only effect is altering CFLAGS, -# adding '-mcpu=G3 -mtune=G5' to them, which is already handled by Buildroot. +# * PowerPC and VFPv3 support are turned off since their only effects +# 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 += \ -DENABLE_POWERPC=OFF \ - -DENABLE_NEON=$(if $(BR2_ARM_CPU_HAS_NEON),ON,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 + -DENABLE_NEON=$(if $(BR2_ARM_CPU_HAS_NEON),ON,OFF) \ + -DENABLE_VFPV3=OFF # Cuda stuff OPENCV3_CONF_OPTS += \ |