1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add/enable Alpha detection

Browse Source 
- uncomment the Alpha detection defining Q_PROCESSOR_ALPHA, which is
  already used/documented in few places
- set the right machine type in QElfParser for Alpha ELF files

Pick-to: 6.5
Change-Id: I072bdee8b73ad3c86591c764aa7075c114967fd9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>
This commit is contained in:
Pino Toscano 2022-11-15 07:15:44 +01:00 committed by Thiago Macieira
parent 07c234ae0b
commit eeb66b99df
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/global/qprocessordetection.h
View File

@ -51,8 +51,8 @@
Alpha is bi-endian, use endianness auto-detection implemented below. Alpha is bi-endian, use endianness auto-detection implemented below.
*/ */
// #elif defined(__alpha__) || defined(_M_ALPHA) #if defined(__alpha__) || defined(_M_ALPHA)
// # define Q_PROCESSOR_ALPHA # define Q_PROCESSOR_ALPHA
// Q_BYTE_ORDER not defined, use endianness auto-detection // Q_BYTE_ORDER not defined, use endianness auto-detection
/* /*
@ -61,7 +61,7 @@
ARM is bi-endian, detect using __ARMEL__ or __ARMEB__, falling back to ARM is bi-endian, detect using __ARMEL__ or __ARMEB__, falling back to
auto-detection implemented below. auto-detection implemented below.
*/ */
#if defined(__arm__) || defined(__TARGET_ARCH_ARM) || defined(_M_ARM) || defined(_M_ARM64) || defined(__aarch64__) || defined(__ARM64__) #elif defined(__arm__) || defined(__TARGET_ARCH_ARM) || defined(_M_ARM) || defined(_M_ARM64) || defined(__aarch64__) || defined(__ARM64__)
# if defined(__aarch64__) || defined(__ARM64__) || defined(_M_ARM64) # if defined(__aarch64__) || defined(__ARM64__) || defined(_M_ARM64)
# define Q_PROCESSOR_ARM_64 # define Q_PROCESSOR_ARM_64
# define Q_PROCESSOR_WORDSIZE 8 # define Q_PROCESSOR_WORDSIZE 8

3
src/corelib/plugin/qelfparser_p.cpp
View File

@ -112,6 +112,8 @@ struct ElfMachineCheck
static const Elf32_Half ExpectedMachine = static const Elf32_Half ExpectedMachine =
#if 0 #if 0
// nothing // nothing
#elif defined(Q_PROCESSOR_ALPHA)
EM_ALPHA
#elif defined(Q_PROCESSOR_ARM_32) #elif defined(Q_PROCESSOR_ARM_32)
EM_ARM EM_ARM
#elif defined(Q_PROCESSOR_ARM_64) #elif defined(Q_PROCESSOR_ARM_64)
@ -382,6 +384,7 @@ Q_DECL_UNUSED Q_DECL_COLD_FUNCTION static QDebug &operator<<(QDebug &d, ElfHeade
switch (r.machine) { switch (r.machine) {
// list definitely not exhaustive! // list definitely not exhaustive!
case EM_NONE: d << ", no machine"; break; case EM_NONE: d << ", no machine"; break;
case EM_ALPHA: d << ", Alpha"; break;
case EM_68K: d << ", MC68000"; break; case EM_68K: d << ", MC68000"; break;
case EM_ARM: d << ", ARM"; break; case EM_ARM: d << ", ARM"; break;
case EM_AARCH64: d << ", AArch64"; break; case EM_AARCH64: d << ", AArch64"; break;