]> rtime.felk.cvut.cz Git - coffee/buildroot.git/commit
qt5webkit: fix build issue with 32-bits armv8-a
authorGaël PORTAY <gael.portay@savoirfairelinux.com>
Fri, 2 Mar 2018 16:28:12 +0000 (11:28 -0500)
committerPeter Korsgaard <peter@korsgaard.com>
Sun, 8 Apr 2018 15:00:40 +0000 (17:00 +0200)
commit885496dae99ca664b542741c707ebaa5a1f1008e
tree902619a9b3f24c3763fef99ff36505130b3c605a
parent66238cb41351c9393fa2c68120bcb8218d90705a
qt5webkit: fix build issue with 32-bits armv8-a

Adds WTF platform support for the 32-bits armv8-a architectures.

Fixes:

In file included from ./config.h:30:0,
                 from ...
./wtf/Platform.h:323:6: error: #error "Not supported ARM architecture"
 #    error "Not supported ARM architecture"
      ^~~~~
from this defconfig:

BR2_arm=y
BR2_cortex_a72=y
BR2_ARM_FPU_VFPV3D16=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_INIT_NONE=y
BR2_PACKAGE_QT5=y
BR2_PACKAGE_QT5WEBKIT=y

The patch is an adaptation of an upstream fix in version 5.212 of
qtwebkit[1].

Unfortunately, the commit cannot be backported and has to be fixed since
the toolchain does not define __ARM_ARCH_8__ but __ARM_ARCH_8A__.

$ host/bin/arm-buildroot-linux-gnueabihf-g++ -dM -E - < /dev/null | grep ARM_ARCH
#define __ARM_ARCH_ISA_ARM 1
#define __ARM_ARCH_8A__ 1
#define __ARM_ARCH_PROFILE 65
#define __ARM_ARCH_ISA_THUMB 2
#define __ARM_ARCH 8
#define __ARM_ARCH_EXT_IDIV__ 1

[1]: https://github.com/qt/qtwebkit/blob/35655d5f4bad248ead1700b59c381cc568b4e98b/Source/WTF/wtf/Platform.h#L241-L242

Cc: Arnout Vandecappelle <arnout@mind.be>
Reported-by: Brock Williams <brock@cottonwoodcomputer.com>
Reviewed-by: Adrian Perez de Castro <aperez@igalia.com>
Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
(cherry picked from commit cea7aa873aa1b6034c3ac93aec21d74d9901b270)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/qt5/qt5webkit/5.6.3/0005-Detect-32-bits-armv8-a-architecture.patch [new file with mode: 0644]
package/qt5/qt5webkit/5.9.1/0003-Detect-32-bits-armv8-a-architecture.patch [new file with mode: 0644]