From 56266f6601b930f3cd0a7a97f840748e2f638795 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Fri, 5 Jul 2024 07:42:15 +0200 Subject: [PATCH] temporarily support armv4 --- debian/changelog | 3 +++ debian/patches/armv4.diff | 26 ++++++++++++++++++++++++++ debian/patches/series | 5 ++++- 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 debian/patches/armv4.diff diff --git a/debian/changelog b/debian/changelog index 46643c6..6c06314 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,9 @@ qt6-base (6.6.2+dfsg-9) UNRELEASED; urgency=medium * Backport upstream commit f319895389705a3db7c2134d1ed47ceade1b204e to fix the build on the Hurd; patch upstream_IPC-add-PATH_MAX-less-fallback-definition-for-MAX_PA.patch. + * Copy/import the patch armv4.diff from Qt5 to support ARMv4; it is needed + to be able to build Qt6 bits with clang 16 and older, which in Debian still + defaults to ARMv4. -- Debian Qt/KDE Maintainers Sat, 22 Jun 2024 17:18:30 +0200 diff --git a/debian/patches/armv4.diff b/debian/patches/armv4.diff new file mode 100644 index 0000000..531a29b --- /dev/null +++ b/debian/patches/armv4.diff @@ -0,0 +1,26 @@ +Description: support ARMv4 architecture, needed for armel builds +Author: Dmitry Shachnev +Forwarded: no +Last-Update: 2016-07-01 + +--- a/src/corelib/global/qprocessordetection.h ++++ b/src/corelib/global/qprocessordetection.h +@@ -132,6 +132,8 @@ + # elif defined(__ARM_ARCH_5TEJ__) \ + || defined(__ARM_ARCH_5TE__) + # define Q_PROCESSOR_ARM 5 ++# elif defined(__ARM_ARCH_4T__) ++# define Q_PROCESSOR_ARM 4 + # else + # define Q_PROCESSOR_ARM 0 + # endif +@@ -146,6 +148,9 @@ + # endif + # if Q_PROCESSOR_ARM >= 5 + # define Q_PROCESSOR_ARM_V5 ++# endif ++# if Q_PROCESSOR_ARM >= 4 ++# define Q_PROCESSOR_ARM_V4 + # else + # error "ARM architecture too old" + # endif diff --git a/debian/patches/series b/debian/patches/series index 2613337..36eebd3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -15,5 +15,8 @@ remove_rpath_from_examples.patch forkfd_grow_stack_upwards_on_hppa.patch enable_skip_plugins.patch -# Don't use yield on CPUs that might not support it +# Support old ARM architectures +# - Don't use yield on CPUs that might not support it armel-noyield.patch +# - Support ARMv4 until clang < 17 is available in Debian +armv4.diff