| Message ID | 20200229220642.24367-1-ps.report@gmx.net |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [RFC,v1] package/qt5webengine: fix chromium arm compile flags | expand |
On Sat, 29 Feb 2020 23:06:42 +0100, Peter Seiderer <ps.report@gmx.net> wrote: > The qt5webengine configure simple takes QT_ARCH ('arm') to determine the > chromium compiler flags and uses some hard coded ARMv7 default values > for the compiler command line: '... -march=armv7-a -mfloat-abi=hard > -mtune=generic-armv7-a -mfpu=vfpv3-d16 ...'. > > This results e.g. in an illegal instruction failure for rpi zero > (reported on the mailing list, see [1]). > > Custom values could be set in the file src/3rdparty/chromium/build/config/arm.gni > (as tested by an proof-of-concept patch [2]). > > [1] http://lists.busybox.net/pipermail/buildroot/2020-February/274587.html > [2] http://lists.busybox.net/pipermail/buildroot/2020-February/274586.html > > Signed-off-by: Peter Seiderer <ps.report@gmx.net> > --- > Notes: > - did not spot how the gcc default arch 'armv6kz+fp' is determined > for the rpi zero case in buildroot (or is it some gcc built-in > magic? If so a new buildroot parameter is needed?), so used simple > armv4, armv5, armv6, armv7-a, armv7-m and armv8-a for the > arm.gni-/gcc-march-value. > - not yet run-time tested (the rpi zero compile is still running) And compile failed with: {standard input}: Assembler messages: {standard input}:2322: Error: selected processor does not support `yield' in ARM mode The combination of '-march=armv6 -mfloat-abi=hard -mfpu=vfp' seems to be invalid for qt5webengine....., so -march=armv6kz+fp seems to be needed... Regards, Peter > --- > package/qt5/qt5webengine/qt5webengine.mk | 78 ++++++++++++++++++++++++ > 1 file changed, 78 insertions(+) > > diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk > index 898725937b..f4ecf6ca3c 100644 > --- a/package/qt5/qt5webengine/qt5webengine.mk > +++ b/package/qt5/qt5webengine/qt5webengine.mk > @@ -63,7 +63,85 @@ QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_CREATE_HOST_PKG_CONFIG > QT5WEBENGINE_ENV += GN_PKG_CONFIG_HOST=$(@D)/host-bin/host-pkg-config > endif > > +# configure arm architecture paramter for chromium compile > +ifeq ($(BR2_arm),y) > +ifeq ($(BR2_ARM_CPU_ARMV4),y) > +define QT5WEBENGINE_CONFIGURE_ARM_CPU > + $(SED) 's/^ arm_version = 7$$/ arm_version = 4/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > + $(SED) 's/^ arm_arch = ""$$/ arm_arch = "armv4"/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > +endef > +endif > + > +ifeq ($(BR2_ARM_CPU_ARMV5),y) > +define QT5WEBENGINE_CONFIGURE_ARM_CPU > + $(SED) 's/^ arm_version = 7$$/ arm_version = 5/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > + $(SED) 's/^ arm_arch = ""$$/ arm_arch = "armv5"/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > +endef > +endif > + > +ifeq ($(BR2_ARM_CPU_ARMV6),y) > +define QT5WEBENGINE_CONFIGURE_ARM_CPU > + $(SED) 's/^ arm_version = 7$$/ arm_version = 6/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > + $(SED) 's/^ arm_arch = ""$$/ arm_arch = "armv6"/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > +endef > +endif > + > +ifeq ($(BR2_ARM_CPU_ARMV7A),y) > +define QT5WEBENGINE_CONFIGURE_ARM_CPU > + $(SED) 's/^ arm_arch = ""$$/ arm_arch = "armv7-a"/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > +endef > +endif > + > +ifeq ($(BR2_ARM_CPU_ARMV7M),y) > +define QT5WEBENGINE_CONFIGURE_ARM_CPU > + $(SED) 's/^ arm_arch = ""$$/ arm_arch = "armv7-m"/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > +endef > +endif > + > +ifeq ($(BR2_ARM_CPU_ARMV8A),y) > +define QT5WEBENGINE_CONFIGURE_ARM_CPU > + $(SED) 's/^ arm_version = 7$$/ arm_version = 8/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > + $(SED) 's/^ arm_arch = ""$$/ arm_arch = "armv8-a"/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > +endef > +endif > + > +define QT5WEBENGINE_CONFIGURE_ARM_FPU > + $(SED) 's/^ arm_fpu = ""$$/ arm_fpu = $(BR2_GCC_TARGET_FPU)/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > +endef > + > +define QT5WEBENGINE_CONFIGURE_ARM_FLOAT_ABI > + $(SED) 's/^ arm_float_abi = ""$$/ arm_float_abi = $(BR2_GCC_TARGET_FLOAT_ABI)/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > +endef > + > +define QT5WEBENGINE_CONFIGURE_ARM_TUNE > + $(SED) 's/^ arm_tune = ""$$/ arm_tune = $(BR2_GCC_TARGET_CPU)/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > +endef > + > +ifeq ($(BR2_ARM_CPU_HAS_NEON),y) > +define QT5WEBENGINE_CONFIGURE_ARM_NEON > + $(SED) 's/^ arm_use_neon = ""$$/ arm_use_neon = "true"/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > + $(SED) 's/^ arm_optionally_use_neon = false$$/ arm_optionally_use_neon = true/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > +endef > +else > +define QT5WEBENGINE_CONFIGURE_ARM_NEON > + $(SED) 's/^ arm_use_neon = ""$$/ arm_use_neon = "false"/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > +endef > +endif > + > +ifeq ($(BR2_ARM_CPU_HAS_THUMB),) > +define QT5WEBENGINE_CONFIGURE_ARM_THUMB > + $(SED) 's/^ arm_use_thumb = true$$/ arm_use_thumb = false/' $(@D)/src/3rdparty/chromium/build/config/arm.gni > +endef > +endif > +endif > + > define QT5WEBENGINE_CONFIGURE_CMDS > + $(QT5WEBENGINE_CONFIGURE_ARM_CPU) > + $(QT5WEBENGINE_CONFIGURE_ARM_FPU) > + $(QT5WEBENGINE_CONFIGURE_ARM_FLOAT_ABI) > + $(QT5WEBENGINE_CONFIGURE_ARM_TUNE) > + $(QT5WEBENGINE_CONFIGURE_ARM_NEON) > + $(QT5WEBENGINE_CONFIGURE_ARM_THUMB) > (cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBENGINE_ENV) $(HOST_DIR)/bin/qmake $(QT5WEBENGINE_QMAKEFLAGS)) > endef >
diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index 898725937b..f4ecf6ca3c 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -63,7 +63,85 @@ QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_CREATE_HOST_PKG_CONFIG QT5WEBENGINE_ENV += GN_PKG_CONFIG_HOST=$(@D)/host-bin/host-pkg-config endif +# configure arm architecture paramter for chromium compile +ifeq ($(BR2_arm),y) +ifeq ($(BR2_ARM_CPU_ARMV4),y) +define QT5WEBENGINE_CONFIGURE_ARM_CPU + $(SED) 's/^ arm_version = 7$$/ arm_version = 4/' $(@D)/src/3rdparty/chromium/build/config/arm.gni + $(SED) 's/^ arm_arch = ""$$/ arm_arch = "armv4"/' $(@D)/src/3rdparty/chromium/build/config/arm.gni +endef +endif + +ifeq ($(BR2_ARM_CPU_ARMV5),y) +define QT5WEBENGINE_CONFIGURE_ARM_CPU + $(SED) 's/^ arm_version = 7$$/ arm_version = 5/' $(@D)/src/3rdparty/chromium/build/config/arm.gni + $(SED) 's/^ arm_arch = ""$$/ arm_arch = "armv5"/' $(@D)/src/3rdparty/chromium/build/config/arm.gni +endef +endif + +ifeq ($(BR2_ARM_CPU_ARMV6),y) +define QT5WEBENGINE_CONFIGURE_ARM_CPU + $(SED) 's/^ arm_version = 7$$/ arm_version = 6/' $(@D)/src/3rdparty/chromium/build/config/arm.gni + $(SED) 's/^ arm_arch = ""$$/ arm_arch = "armv6"/' $(@D)/src/3rdparty/chromium/build/config/arm.gni +endef +endif + +ifeq ($(BR2_ARM_CPU_ARMV7A),y) +define QT5WEBENGINE_CONFIGURE_ARM_CPU + $(SED) 's/^ arm_arch = ""$$/ arm_arch = "armv7-a"/' $(@D)/src/3rdparty/chromium/build/config/arm.gni +endef +endif + +ifeq ($(BR2_ARM_CPU_ARMV7M),y) +define QT5WEBENGINE_CONFIGURE_ARM_CPU + $(SED) 's/^ arm_arch = ""$$/ arm_arch = "armv7-m"/' $(@D)/src/3rdparty/chromium/build/config/arm.gni +endef +endif + +ifeq ($(BR2_ARM_CPU_ARMV8A),y) +define QT5WEBENGINE_CONFIGURE_ARM_CPU + $(SED) 's/^ arm_version = 7$$/ arm_version = 8/' $(@D)/src/3rdparty/chromium/build/config/arm.gni + $(SED) 's/^ arm_arch = ""$$/ arm_arch = "armv8-a"/' $(@D)/src/3rdparty/chromium/build/config/arm.gni +endef +endif + +define QT5WEBENGINE_CONFIGURE_ARM_FPU + $(SED) 's/^ arm_fpu = ""$$/ arm_fpu = $(BR2_GCC_TARGET_FPU)/' $(@D)/src/3rdparty/chromium/build/config/arm.gni +endef + +define QT5WEBENGINE_CONFIGURE_ARM_FLOAT_ABI + $(SED) 's/^ arm_float_abi = ""$$/ arm_float_abi = $(BR2_GCC_TARGET_FLOAT_ABI)/' $(@D)/src/3rdparty/chromium/build/config/arm.gni +endef + +define QT5WEBENGINE_CONFIGURE_ARM_TUNE + $(SED) 's/^ arm_tune = ""$$/ arm_tune = $(BR2_GCC_TARGET_CPU)/' $(@D)/src/3rdparty/chromium/build/config/arm.gni +endef + +ifeq ($(BR2_ARM_CPU_HAS_NEON),y) +define QT5WEBENGINE_CONFIGURE_ARM_NEON + $(SED) 's/^ arm_use_neon = ""$$/ arm_use_neon = "true"/' $(@D)/src/3rdparty/chromium/build/config/arm.gni + $(SED) 's/^ arm_optionally_use_neon = false$$/ arm_optionally_use_neon = true/' $(@D)/src/3rdparty/chromium/build/config/arm.gni +endef +else +define QT5WEBENGINE_CONFIGURE_ARM_NEON + $(SED) 's/^ arm_use_neon = ""$$/ arm_use_neon = "false"/' $(@D)/src/3rdparty/chromium/build/config/arm.gni +endef +endif + +ifeq ($(BR2_ARM_CPU_HAS_THUMB),) +define QT5WEBENGINE_CONFIGURE_ARM_THUMB + $(SED) 's/^ arm_use_thumb = true$$/ arm_use_thumb = false/' $(@D)/src/3rdparty/chromium/build/config/arm.gni +endef +endif +endif + define QT5WEBENGINE_CONFIGURE_CMDS + $(QT5WEBENGINE_CONFIGURE_ARM_CPU) + $(QT5WEBENGINE_CONFIGURE_ARM_FPU) + $(QT5WEBENGINE_CONFIGURE_ARM_FLOAT_ABI) + $(QT5WEBENGINE_CONFIGURE_ARM_TUNE) + $(QT5WEBENGINE_CONFIGURE_ARM_NEON) + $(QT5WEBENGINE_CONFIGURE_ARM_THUMB) (cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBENGINE_ENV) $(HOST_DIR)/bin/qmake $(QT5WEBENGINE_QMAKEFLAGS)) endef
The qt5webengine configure simple takes QT_ARCH ('arm') to determine the chromium compiler flags and uses some hard coded ARMv7 default values for the compiler command line: '... -march=armv7-a -mfloat-abi=hard -mtune=generic-armv7-a -mfpu=vfpv3-d16 ...'. This results e.g. in an illegal instruction failure for rpi zero (reported on the mailing list, see [1]). Custom values could be set in the file src/3rdparty/chromium/build/config/arm.gni (as tested by an proof-of-concept patch [2]). [1] http://lists.busybox.net/pipermail/buildroot/2020-February/274587.html [2] http://lists.busybox.net/pipermail/buildroot/2020-February/274586.html Signed-off-by: Peter Seiderer <ps.report@gmx.net> --- Notes: - did not spot how the gcc default arch 'armv6kz+fp' is determined for the rpi zero case in buildroot (or is it some gcc built-in magic? If so a new buildroot parameter is needed?), so used simple armv4, armv5, armv6, armv7-a, armv7-m and armv8-a for the arm.gni-/gcc-march-value. - not yet run-time tested (the rpi zero compile is still running) --- package/qt5/qt5webengine/qt5webengine.mk | 78 ++++++++++++++++++++++++ 1 file changed, 78 insertions(+)