Skip to content
Snippets Groups Projects
Commit 4d28e91e authored by Dmitry Shachnev's avatar Dmitry Shachnev :penguin:
Browse files

Drop debian/patches/armv4.diff.

parent b252b0fb
No related branches found
No related tags found
No related merge requests found
......@@ -2,6 +2,7 @@ qtbase-opensource-src (5.14.1+dfsg-4) UNRELEASED; urgency=medium
[ Dmitry Shachnev ]
* Merge 5.12.5+dfsg-9 upload from unstable.
* Drop armv4.diff. The armel baseline is armv5te now (see #882174).
-- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 27 Feb 2020 18:47:48 +0300
......
Description: support ARMv4 architecture, needed for armel builds
Author: Dmitry Shachnev <mitya57@debian.org>
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
......@@ -10,6 +10,5 @@ no_htmlinfo_example.diff
remove_privacy_breaches.diff
link_fbclient.diff
gnukfreebsd_linker_warnings.diff
armv4.diff
nonlinux_utime.diff
qdoc_default_incdirs.diff
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment