Lubuntu/qt6-base
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

support M68k

Browse Source 
backport upstream commit ac17a394a5701174c705050640e26c9cb95d289b
This commit is contained in:
Pino Toscano 2022-10-10 10:50:19 +02:00
parent b538114d2f
commit 8a8e2b35d2
3 changed files with 87 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -3,6 +3,8 @@ qt6-base (6.4.0+dfsg-4) UNRELEASED; urgency=medium
[ Pino Toscano ] [ Pino Toscano ]
* Backport upstream commit e81cba0cd33339c2e5f5e3c670741605264b21c2 to support * Backport upstream commit e81cba0cd33339c2e5f5e3c670741605264b21c2 to support
HPPA; patch upstream_Add-HPPA-detection.patch. (Closes: #1021404) HPPA; patch upstream_Add-HPPA-detection.patch. (Closes: #1021404)
* Backport upstream commit ac17a394a5701174c705050640e26c9cb95d289b to support
M68k; patch upstream_Add-M68k-detection.patch.
-- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sat, 08 Oct 2022 08:25:51 +0200 -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sat, 08 Oct 2022 08:25:51 +0200

1
debian/patches/series vendored
View File

@ -1,5 +1,6 @@
# fixed in 6.5 # fixed in 6.5
upstream_Add-HPPA-detection.patch upstream_Add-HPPA-detection.patch
upstream_Add-M68k-detection.patch
# Debian specific # Debian specific
remove_privacy_breaches.diff remove_privacy_breaches.diff

84
debian/patches/upstream_Add-M68k-detection.patch vendored Normal file
View File

@ -0,0 +1,84 @@
From ac17a394a5701174c705050640e26c9cb95d289b Mon Sep 17 00:00:00 2001
From: Pino Toscano <toscano.pino@tiscali.it>
Date: Thu, 6 Oct 2022 23:17:57 +0200
Subject: [PATCH] Add M68k detection
- detect the M68k architecture (Motorola 68000) and define
Q_PROCESSOR_M68K
- set the right machine type in QElfParser for M68k ELF files
Change-Id: Ie5694abbe1ae2bfeb5692defba0ca6062c1d60ac
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
src/corelib/global/archdetect.cpp | 2 ++
src/corelib/global/qprocessordetection.h | 9 +++++++++
src/corelib/global/qprocessordetection.qdoc | 9 +++++++++
src/corelib/plugin/qelfparser_p.cpp | 3 +++
4 files changed, 23 insertions(+)
--- a/src/corelib/global/archdetect.cpp
+++ b/src/corelib/global/archdetect.cpp
@@ -23,6 +23,8 @@
# define ARCH_PROCESSOR "x86_64"
#elif defined(Q_PROCESSOR_IA64)
# define ARCH_PROCESSOR "ia64"
+#elif defined(Q_PROCESSOR_M68K)
+# define ARCH_PROCESSOR "m68k"
#elif defined(Q_PROCESSOR_MIPS_64)
# define ARCH_PROCESSOR "mips64"
#elif defined(Q_PROCESSOR_MIPS)
--- a/src/corelib/global/qprocessordetection.h
+++ b/src/corelib/global/qprocessordetection.h
@@ -188,6 +188,15 @@
// Q_BYTE_ORDER not defined, use endianness auto-detection
/*
+ Motorola 68000 family, no revisions or variants
+
+ M68K is big-endian.
+*/
+#elif defined(__m68k__)
+# define Q_PROCESSOR_M68K
+# define Q_BYTE_ORDER Q_BIG_ENDIAN
+
+/*
MIPS family, known revisions: I, II, III, IV, 32, 64
MIPS is bi-endian, use endianness auto-detection implemented below.
--- a/src/corelib/plugin/qelfparser_p.cpp
+++ b/src/corelib/plugin/qelfparser_p.cpp
@@ -115,6 +115,8 @@ struct ElfMachineCheck
EM_BLACKFIN
#elif defined(Q_PROCESSOR_IA64)
EM_IA_64
+#elif defined(Q_PROCESSOR_M68K)
+ EM_68K
#elif defined(Q_PROCESSOR_MIPS)
EM_MIPS
#elif defined(Q_PROCESSOR_POWER_32)
@@ -373,6 +375,7 @@ Q_DECL_UNUSED Q_DECL_COLD_FUNCTION stati
switch (r.machine) {
// list definitely not exhaustive!
case EM_NONE: d << ", no machine"; break;
+ case EM_68K: d << ", MC68000"; break;
case EM_ARM: d << ", ARM"; break;
case EM_AARCH64: d << ", AArch64"; break;
#ifdef EM_BLACKFIN
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -1801,6 +1801,15 @@ bool qSharedBuild() noexcept
*/
/*!
+ \macro Q_PROCESSOR_M68K
+ \relates <QtGlobal>
+
+ Defined if the application is compiled for Motorola 68000 processors.
+
+ \sa QSysInfo::buildCpuArchitecture()
+*/
+
+/*!
\macro Q_PROCESSOR_MIPS
\relates <QtGlobal>