Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 10:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

introduce AArch64 support

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2020-11-19 13:20:24 +02:00
parent c2df906709
commit 25d8d4e2e9
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/debian/rules
View file

@ -2,7 +2,7 @@
KATIE_CROSS_EXEC="" KATIE_CROSS_EXEC=""
ifneq ($(DEB_HOST_ARCH_CPU),$(DEB_BUILD_ARCH_CPU)) ifneq ($(DEB_HOST_ARCH_CPU),$(DEB_BUILD_ARCH_CPU))
KATIE_CROSS_EXEC="qemu-$(DEB_HOST_ARCH_CPU)-static" KATIE_CROSS_EXEC="qemu-$(DEB_HOST_GNU_CPU)-static"
endif endif
KATIE_BUILD_DIR="$(shell pwd)/obj-$(DEB_HOST_GNU_TYPE)" KATIE_BUILD_DIR="$(shell pwd)/obj-$(DEB_HOST_GNU_TYPE)"

15
src/core/global/qglobal.h
View file

@ -51,7 +51,7 @@
ALPHA - ... ALPHA - ...
ARM - ... ARM - ...
ARMV6 - ... ARM64 - ...
AVR32 - ... AVR32 - ...
BFIN - ... BFIN - ...
I386 - ... I386 - ...
@ -75,9 +75,8 @@
# define QT_ARCH_ALPHA # define QT_ARCH_ALPHA
#elif defined(__arm__) #elif defined(__arm__)
# define QT_ARCH_ARM # define QT_ARCH_ARM
# if defined(__ARM_ARCH_6__) #elif defined(__aarch64__)
# define QT_ARCH_ARMV6 # define QT_ARCH_ARM64
# endif
#elif defined(__avr__) #elif defined(__avr__)
# define QT_ARCH_AVR32 # define QT_ARCH_AVR32
#elif defined(__bfin__) #elif defined(__bfin__)
@ -100,9 +99,6 @@
# define QT_ARCH_SPARC # define QT_ARCH_SPARC
#elif defined(__sh__) #elif defined(__sh__)
# define QT_ARCH_SH # define QT_ARCH_SH
# if defined(__SH4__)
# define QT_ARCH_SH4A
# endif
#elif defined(__x86_64__) #elif defined(__x86_64__)
# define QT_ARCH_X86_64 # define QT_ARCH_X86_64
#else #else
@ -390,8 +386,11 @@ QT_END_INCLUDE_NAMESPACE
#endif #endif
// This logic must match the one in qmetatype.h // This logic must match the one in qmetatype.h
#if defined(QT_ARCH_ARM) || defined(QT_ARCH_ARMV6) || defined(QT_ARCH_AVR32) || defined(QT_ARCH_SH) || defined(QT_ARCH_SH4A) #if !defined(QT_NO_FPU) && defined(QT_ARCH_ARM) || defined(QT_ARCH_AVR32) || defined(QT_ARCH_SH)
# define QT_NO_FPU # define QT_NO_FPU
#endif
#if defined(QT_NO_FPU)
typedef float qreal; typedef float qreal;
#else #else
typedef double qreal; typedef double qreal;

2
tests/auto/qwaitcondition/tst_qwaitcondition.cpp
View file

@ -64,7 +64,7 @@ private slots:
static const int iterations = 10; static const int iterations = 10;
// Note: some tests rely on ThreadCount being multiple of 2 // Note: some tests rely on ThreadCount being multiple of 2
#if defined(Q_OS_SOLARIS) || ( defined(Q_OS_LINUX) && defined(QT_ARCH_ARMV6) ) #if defined(Q_OS_SOLARIS) || (defined(Q_OS_LINUX) && defined(QT_ARCH_ARM))
static const int ThreadCount = 4; static const int ThreadCount = 4;
#else #else
static const int ThreadCount = 10; static const int ThreadCount = 10;